ubergames/gtkradiant
0
0
Fork 0
mirror of https://github.com/UberGames/GtkRadiant.git synced 2024-11-23 04:12:06 +00:00
Code Issues Projects Releases Packages Wiki Activity

Added feature:

Browse source 
camera strafing while holding ctrl
additional forward movement when holding shift

Tester: Shaderman

git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/trunk@101 8a3a26a2-13c4-0310-b231-cf6edde360e5
This commit is contained in:
namespace 2006-09-09 15:03:05 +00:00
parent 3f1cbdde23
commit 041f7e0998
2 changed files with 41 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
TODO
View file

@ -150,7 +150,6 @@ Selection: Customisable manipulator size - +/- to change the size of the transla
Selection: Add optional screen-relative control for constrained rotations. Selection: Add optional screen-relative control for constrained rotations.
Clipper: Change selection/manipulation to be consistent with other component editing. Clipper: Change selection/manipulation to be consistent with other component editing.
Filtering: Either deselect filtered nodes, or render filtered nodes that are selected. Filtering: Either deselect filtered nodes, or render filtered nodes that are selected.
Camera: Strafe while holding ctrl.
Texdef: Make texdef formats abstract, add conversion between texdef formats (use generic affine-texture-matrix format for conversions). Texdef: Make texdef formats abstract, add conversion between texdef formats (use generic affine-texture-matrix format for conversions).
Textures Window: Precise display of texture size when selecting. (tooltip, possibly) Textures Window: Precise display of texture size when selecting. (tooltip, possibly)
Status: 'Size of brush' display on status bar. Status: 'Size of brush' display on status bar.

56
radiant/camwindow.cpp
View file

@ -137,6 +137,9 @@ struct camera_t
Matrix4 projection; Matrix4 projection;
Matrix4 modelview; Matrix4 modelview;
bool m_strafe; // true when in strafemode toggled by the ctrl-key
bool m_strafe_forward; // true when in strafemode by ctrl-key and shift is pressed for forward strafing
unsigned int movementflags; // movement flags unsigned int movementflags; // movement flags
Timer m_keycontrol_timer; Timer m_keycontrol_timer;
guint m_keymove_handler; guint m_keymove_handler;
@ -278,23 +281,38 @@ void Camera_setAngles(camera_t& camera, const Vector3& angles)
void Camera_FreeMove(camera_t& camera, int dx, int dy) void Camera_FreeMove(camera_t& camera, int dx, int dy)
{ {
float dtime = 0.1f; // free strafe mode, toggled by the ctrl key with optional shift for forward movement
if (g_camwindow_globals_private.m_bCamInverseMouse) if(camera.m_strafe)
camera.angles[CAMERA_PITCH] -= dy * dtime * g_camwindow_globals_private.m_nAngleSpeed; {
else const float strafespeed = 0.65f;
camera.angles[CAMERA_PITCH] += dy * dtime * g_camwindow_globals_private.m_nAngleSpeed;
camera.angles[CAMERA_YAW] += dx * dtime * g_camwindow_globals_private.m_nAngleSpeed; camera.origin -= camera.vright * strafespeed * dx;
if(camera.m_strafe_forward)
camera.origin += camera.vpn * strafespeed * dy;
else
camera.origin += camera.vup * strafespeed * dy;
}
else// free rotation
{
const float dtime = 0.1f;
if (camera.angles[CAMERA_PITCH] > 90) if (g_camwindow_globals_private.m_bCamInverseMouse)
camera.angles[CAMERA_PITCH] = 90; camera.angles[CAMERA_PITCH] -= dy * dtime * g_camwindow_globals_private.m_nAngleSpeed;
else if (camera.angles[CAMERA_PITCH] < -90) else
camera.angles[CAMERA_PITCH] = -90; camera.angles[CAMERA_PITCH] += dy * dtime * g_camwindow_globals_private.m_nAngleSpeed;
if (camera.angles[CAMERA_YAW] >= 360) camera.angles[CAMERA_YAW] += dx * dtime * g_camwindow_globals_private.m_nAngleSpeed;
camera.angles[CAMERA_YAW] -=360;
else if (camera.angles[CAMERA_YAW] <= 0) if (camera.angles[CAMERA_PITCH] > 90)
camera.angles[CAMERA_YAW] +=360; camera.angles[CAMERA_PITCH] = 90;
else if (camera.angles[CAMERA_PITCH] < -90)
camera.angles[CAMERA_PITCH] = -90;
if (camera.angles[CAMERA_YAW] >= 360)
camera.angles[CAMERA_YAW] -=360;
else if (camera.angles[CAMERA_YAW] <= 0)
camera.angles[CAMERA_YAW] +=360;
}
Camera_updateModelview(camera); Camera_updateModelview(camera);
Camera_Freemove_updateAxes(camera); Camera_Freemove_updateAxes(camera);
@ -638,7 +656,15 @@ public:
void Camera_motionDelta(int x, int y, unsigned int state, void* data) void Camera_motionDelta(int x, int y, unsigned int state, void* data)
{ {
reinterpret_cast<camera_t*>(data)->m_mouseMove.motion_delta(x, y, state); 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;
} }
class CamWnd class CamWnd