quick/netradiant-custom
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

strafe mode option

Browse Source 
git-svn-id: svn://svn.icculus.org/netradiant/trunk@91 61c419a2-8eb2-4b30-bcec-8cead039b335
This commit is contained in:
rpolzer 2008-09-18 18:01:27 +00:00
parent 8401d4c6c6
commit d9f68dedb0
2 changed files with 35 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2008-09-19 Rudolf Polzer divVerent(at)alientrap.org
* radiant: add a "Strafe Mode" option
* radiant: ctrl-tab now focuses all XYZ views in the three-part view (as
that is what the user is likely to want there)
2008-09-18 Rudolf Polzer divVerent(at)alientrap.org
* radiant: handle missing anisotropy extension; fixes display bug on
Windows XP software renderer

36
radiant/camwindow.cpp
View File

@ -82,6 +82,7 @@ struct camwindow_globals_private_t
bool m_bCamDiscrete;
bool m_bCubicClipping;
bool m_showStats;
int m_nStrafeMode;
camwindow_globals_private_t() :
m_nMoveSpeed(100),
@ -90,7 +91,8 @@ struct camwindow_globals_private_t
m_bCamInverseMouse(false),
m_bCamDiscrete(true),
m_bCubicClipping(true),
m_showStats(true)
m_showStats(true),
m_nStrafeMode(0)
{
}
@ -671,12 +673,25 @@ void Camera_motionDelta(int x, int y, unsigned int state, void* data)
camera_t* cam = reinterpret_cast<camera_t*>(data);
cam->m_mouseMove.motion_delta(x, y, state);
cam->m_strafe = (state & GDK_CONTROL_MASK) != 0;
if(cam->m_strafe)
cam->m_strafe_forward = (state & GDK_SHIFT_MASK) != 0;
else
cam->m_strafe_forward = false;
switch(g_camwindow_globals_private.m_nStrafeMode)
{
case 0:
cam->m_strafe = (state & GDK_CONTROL_MASK) != 0;
if(cam->m_strafe)
cam->m_strafe_forward = (state & GDK_SHIFT_MASK) != 0;
else
cam->m_strafe_forward = false;
break;
case 1:
cam->m_strafe = (state & GDK_CONTROL_MASK) != 0 && (state & GDK_SHIFT_MASK) == 0;
cam->m_strafe_forward = false;
break;
case 2:
cam->m_strafe = (state & GDK_CONTROL_MASK) != 0 && (state & GDK_SHIFT_MASK) == 0;
cam->m_strafe_forward = cam->m_strafe;
break;
}
}
class CamWnd
@ -1989,6 +2004,14 @@ void Camera_constructPreferences(PreferencesPage& page)
IntExportCallback(RenderModeExportCaller())
);
}
const char* strafe_mode[] = { "Both", "Forward", "Up" };
page.appendCombo(
"Strafe Mode",
g_camwindow_globals_private.m_nStrafeMode,
STRING_ARRAY_RANGE(strafe_mode)
);
}
void Camera_constructPage(PreferenceGroup& group)
{
@ -2080,6 +2103,7 @@ void CamWnd_Construct()
GlobalPreferenceSystem().registerPreference("SI_Colors4", Vector3ImportStringCaller(g_camwindow_globals.color_cameraback), Vector3ExportStringCaller(g_camwindow_globals.color_cameraback));
GlobalPreferenceSystem().registerPreference("SI_Colors12", Vector3ImportStringCaller(g_camwindow_globals.color_selbrushes3d), Vector3ExportStringCaller(g_camwindow_globals.color_selbrushes3d));
GlobalPreferenceSystem().registerPreference("CameraRenderMode", makeIntStringImportCallback(RenderModeImportCaller()), makeIntStringExportCallback(RenderModeExportCaller()));
GlobalPreferenceSystem().registerPreference("StrafeMode", IntImportStringCaller(g_camwindow_globals_private.m_nStrafeMode), IntExportStringCaller(g_camwindow_globals_private.m_nStrafeMode));
CamWnd_constructStatic();