* fixed output

git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/branches/1.5@304 8a3a26a2-13c4-0310-b231-cf6edde360e5
This commit is contained in:
mattn 2008-08-06 17:53:40 +00:00
parent fbd7c0cf41
commit 34844894df

View file

@ -133,7 +133,7 @@ struct camera_t
Vector3 origin; Vector3 origin;
Vector3 angles; Vector3 angles;
Vector3 color; // background Vector3 color; // background
Vector3 forward, right; // move matrix (TTimo: used to have up but it was not updated) Vector3 forward, right; // move matrix (TTimo: used to have up but it was not updated)
Vector3 vup, vpn, vright; // view matrix (taken from the modelview matrix) Vector3 vup, vpn, vright; // view matrix (taken from the modelview matrix)
@ -493,7 +493,7 @@ void Camera_MoveRight_KeyDown(camera_t& camera)
Camera_setMovementFlags(camera, MOVE_STRAFERIGHT); Camera_setMovementFlags(camera, MOVE_STRAFERIGHT);
} }
void Camera_MoveRight_KeyUp(camera_t& camera) void Camera_MoveRight_KeyUp(camera_t& camera)
{ {
Camera_clearMovementFlags(camera, MOVE_STRAFERIGHT); Camera_clearMovementFlags(camera, MOVE_STRAFERIGHT);
} }
@ -510,7 +510,7 @@ void Camera_MoveDown_KeyDown(camera_t& camera)
Camera_setMovementFlags(camera, MOVE_DOWN); Camera_setMovementFlags(camera, MOVE_DOWN);
} }
void Camera_MoveDown_KeyUp(camera_t& camera) void Camera_MoveDown_KeyUp(camera_t& camera)
{ {
Camera_clearMovementFlags(camera, MOVE_DOWN); Camera_clearMovementFlags(camera, MOVE_DOWN);
} }
@ -527,7 +527,7 @@ void Camera_RotateRight_KeyDown(camera_t& camera)
Camera_setMovementFlags(camera, MOVE_ROTRIGHT); Camera_setMovementFlags(camera, MOVE_ROTRIGHT);
} }
void Camera_RotateRight_KeyUp(camera_t& camera) void Camera_RotateRight_KeyUp(camera_t& camera)
{ {
Camera_clearMovementFlags(camera, MOVE_ROTRIGHT); Camera_clearMovementFlags(camera, MOVE_ROTRIGHT);
} }
@ -544,7 +544,7 @@ void Camera_PitchDown_KeyDown(camera_t& camera)
Camera_setMovementFlags(camera, MOVE_PITCHDOWN); Camera_setMovementFlags(camera, MOVE_PITCHDOWN);
} }
void Camera_PitchDown_KeyUp(camera_t& camera) void Camera_PitchDown_KeyUp(camera_t& camera)
{ {
Camera_clearMovementFlags(camera, MOVE_PITCHDOWN); Camera_clearMovementFlags(camera, MOVE_PITCHDOWN);
} }
@ -1431,7 +1431,7 @@ class CamRenderer: public Renderer
{ {
state_type() : m_highlight(0), m_state(0), m_lights(0) state_type() : m_highlight(0), m_state(0), m_lights(0)
{ {
} }
unsigned int m_highlight; unsigned int m_highlight;
Shader* m_state; Shader* m_state;
const LightList* m_lights; const LightList* m_lights;
@ -1570,7 +1570,7 @@ void CamWnd::Cam_Draw()
diffuse[3] = 1.0f; diffuse[3] = 1.0f;
//material[0] = material[1] = material[2] = 0.8f; //material[0] = material[1] = material[2] = 0.8f;
//material[3] = 1.0f; //material[3] = 1.0f;
inverse_cam_dir[0] = m_Camera.vpn[0]; inverse_cam_dir[0] = m_Camera.vpn[0];
inverse_cam_dir[1] = m_Camera.vpn[1]; inverse_cam_dir[1] = m_Camera.vpn[1];
inverse_cam_dir[2] = m_Camera.vpn[2]; inverse_cam_dir[2] = m_Camera.vpn[2];
@ -1725,7 +1725,7 @@ void CamWnd::BenchMark()
Camera_setAngles(*this, angles); Camera_setAngles(*this, angles);
} }
double dEnd = Sys_DoubleTime(); double dEnd = Sys_DoubleTime();
globalOutputStream() << FloatFormat(dEnd - dStart, 5, 2), " seconds\n"; globalOutputStream() << FloatFormat(dEnd - dStart, 5, 2) << " seconds\n";
} }
@ -1808,7 +1808,7 @@ void CamWnd_constructToolbar(GtkToolbar* toolbar)
void CamWnd_registerShortcuts() void CamWnd_registerShortcuts()
{ {
toggle_add_accelerator("ToggleCubicClip"); toggle_add_accelerator("ToggleCubicClip");
if(g_pGameDescription->mGameType == "doom3") if(g_pGameDescription->mGameType == "doom3")
{ {
command_connect_accelerator("TogglePreview"); command_connect_accelerator("TogglePreview");