From: <Ven...@us...> - 2009-01-07 20:17:12
|
Revision: 2839 http://planeshift.svn.sourceforge.net/planeshift/?rev=2839&view=rev Author: Vengeance2001 Date: 2009-01-07 20:17:02 +0000 (Wed, 07 Jan 2009) Log Message: ----------- Removing speed hack used to test PaladinJr. Modified Paths: -------------- trunk/src/client/psmovement.cpp Modified: trunk/src/client/psmovement.cpp =================================================================== --- trunk/src/client/psmovement.cpp 2009-01-07 19:07:34 UTC (rev 2838) +++ trunk/src/client/psmovement.cpp 2009-01-07 20:17:02 UTC (rev 2839) @@ -341,8 +341,6 @@ base_rotate.x,base_rotate.y,base_rotate.z); #endif - base_move.z *= 1.5; - psMovement* newmove = new psMovement; newmove->id = id; newmove->name = name; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <Kha...@us...> - 2009-12-01 19:57:46
|
Revision: 4860 http://planeshift.svn.sourceforge.net/planeshift/?rev=4860&view=rev Author: Khakilord Date: 2009-12-01 19:57:39 +0000 (Tue, 01 Dec 2009) Log Message: ----------- Removed movement speed restriction on jumping per request by Lanarel. Modified Paths: -------------- trunk/src/client/psmovement.cpp Modified: trunk/src/client/psmovement.cpp =================================================================== --- trunk/src/client/psmovement.cpp 2009-12-01 19:29:00 UTC (rev 4859) +++ trunk/src/client/psmovement.cpp 2009-12-01 19:57:39 UTC (rev 4860) @@ -569,9 +569,6 @@ } else // Airborne { - // restriction - vel *= psVelocity(0.2f,0.5f); - #ifdef MOVE_DEBUG printf("Adding velocity (%.2f,%.2f,%.2f),(%.2f,%.2f,%.2f)\n", vel.move.x,vel.move.y,vel.move.z, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wel...@us...> - 2010-02-17 10:10:10
|
Revision: 5571 http://planeshift.svn.sourceforge.net/planeshift/?rev=5571&view=rev Author: weltall2 Date: 2010-02-17 10:10:01 +0000 (Wed, 17 Feb 2010) Log Message: ----------- fixed movement lock if stopped before stamina drained but the server set exhausted status anyway Modified Paths: -------------- trunk/src/client/psmovement.cpp Modified: trunk/src/client/psmovement.cpp =================================================================== --- trunk/src/client/psmovement.cpp 2010-02-17 09:31:34 UTC (rev 5570) +++ trunk/src/client/psmovement.cpp 2010-02-17 10:10:01 UTC (rev 5571) @@ -149,6 +149,11 @@ if (!actor) return; + //we had a special event we need to unset stationary in case so the client + //queries the server on the status at least one time. + actor->stationary = false; + actor->lastDRUpdateTime = csGetTicks(); + if (v) { StopAllMovement(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rly...@us...> - 2010-07-31 23:55:47
|
Revision: 6078 http://planeshift.svn.sourceforge.net/planeshift/?rev=6078&view=rev Author: rlydontknow Date: 2010-07-31 23:55:40 +0000 (Sat, 31 Jul 2010) Log Message: ----------- indention fixes fixed PS#3401 - free rotation doesn't work while turning the character Modified Paths: -------------- trunk/src/client/psmovement.cpp Modified: trunk/src/client/psmovement.cpp =================================================================== --- trunk/src/client/psmovement.cpp 2010-07-31 23:23:37 UTC (rev 6077) +++ trunk/src/client/psmovement.cpp 2010-07-31 23:55:40 UTC (rev 6078) @@ -609,57 +609,57 @@ void psMovementManager::MouseLook(bool v) { - if (!ready || !actor) - return; + if (!ready || !actor) + return; if(mouseLookCanAct || !v) { - mouseLook = v; - psCamera* camera = psengine->GetPSCamera(); - if( camera->RotateCameraWithPlayer() ) - { - if ( !locked ) - { - if ( !mouseLook ) - { - csVector3 vec(0,0,0); - actor->Movement().SetAngularVelocity(vec); - } - } - } -} + mouseLook = v; + psCamera* camera = psengine->GetPSCamera(); + if( camera->RotateCameraWithPlayer() ) + { + if ( !locked ) + { + if ( !mouseLook ) + { + csVector3 vec(0,0,0); + actor->Movement().SetAngularVelocity(vec); + } + } + } + } mouseLookCanAct = false; } void psMovementManager::UpdateMouseLook() { - if (!ready || !actor) - return; + if (!ready || !actor) + return; - psCamera* camera = psengine->GetPSCamera(); + psCamera* camera = psengine->GetPSCamera(); - if ( !mouseLook ) - { - if ( lastDeltaX == 0 && lastDeltaY == 0 ) - { - return; - } - else - { // mouseLook turned off. Reset. - lastDeltaX = 0; - lastDeltaY = 0; - if ( camera->RotateCameraWithPlayer() ) - { - csVector3 vec(0,0,0); - actor->Movement().SetAngularVelocity(vec); - } - return; - } - } + if ( !mouseLook ) + { + if ( lastDeltaX == 0 && lastDeltaY == 0 ) + { + return; + } + else + { // mouseLook turned off. Reset. + lastDeltaX = 0; + lastDeltaY = 0; + if ( camera->RotateCameraWithPlayer() ) + { + csVector3 vec(0,0,0); + actor->Movement().SetAngularVelocity(vec); + } + return; + } + } iGraphics2D* g2d = psengine->GetG2D(); - if(activeMoves & kbdRotate) + if(activeMoves & kbdRotate && camera->RotateCameraWithPlayer()) { lastDeltaX = 0; lastDeltaY = 0; @@ -709,7 +709,7 @@ float deltaX = float(mouseX - centerX); float deltaY = float(mouseY - centerY); - if (activeMoves & kbdRotate) + if (activeMoves & kbdRotate && camera->RotateCameraWithPlayer()) { lastDeltaX = 0; lastDeltaY = 0; @@ -717,13 +717,13 @@ return; } - if ( deltaX == 0 && deltaY == 0) - {// No actual event but caused by reseting the mouse position - return; - } - // remember the current values. - lastDeltaX = deltaX; - lastDeltaY = deltaY; + if ( deltaX == 0 && deltaY == 0) + {// No actual event but caused by reseting the mouse position + return; + } + // remember the current values. + lastDeltaX = deltaX; + lastDeltaY = deltaY; // Recenter mouse so we don't lose focus g2d->SetMousePosition(centerX, centerY); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wel...@us...> - 2011-01-01 12:03:34
|
Revision: 6690 http://planeshift.svn.sourceforge.net/planeshift/?rev=6690&view=rev Author: weltall2 Date: 2011-01-01 12:03:28 +0000 (Sat, 01 Jan 2011) Log Message: ----------- initialize some uninit variables patch by mikesflowers Modified Paths: -------------- trunk/src/client/psmovement.cpp Modified: trunk/src/client/psmovement.cpp =================================================================== --- trunk/src/client/psmovement.cpp 2011-01-01 11:56:03 UTC (rev 6689) +++ trunk/src/client/psmovement.cpp 2011-01-01 12:03:28 UTC (rev 6690) @@ -96,6 +96,8 @@ runToMarkerID = 0; lastDist = 0.0f; runToDiff = csVector3(0.0f); + lastDeltaX = 0.0f; + lastDeltaY = 0.0f; sensY = 1.0f; sensX = 1.0f; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wel...@us...> - 2011-12-15 16:34:14
|
Revision: 7818 http://planeshift.svn.sourceforge.net/planeshift/?rev=7818&view=rev Author: weltall2 Date: 2011-12-15 16:34:03 +0000 (Thu, 15 Dec 2011) Log Message: ----------- make run the default movement mode Modified Paths: -------------- trunk/src/client/psmovement.cpp Modified: trunk/src/client/psmovement.cpp =================================================================== --- trunk/src/client/psmovement.cpp 2011-12-15 16:14:06 UTC (rev 7817) +++ trunk/src/client/psmovement.cpp 2011-12-15 16:34:03 UTC (rev 7818) @@ -371,7 +371,10 @@ if (kbdrotL && kbdrotR) kbdRotate = (1 << kbdrotL->id) | (1 << kbdrotR->id); - actormode = defaultmode = walk; + //TODO: make this configurable? + defaultmode = walk; + actormode = run; + toggleRun = true; ready = true; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lpa...@us...> - 2012-04-15 13:17:10
|
Revision: 8209 http://planeshift.svn.sourceforge.net/planeshift/?rev=8209&view=rev Author: lpancallo Date: 2012-04-15 13:17:04 +0000 (Sun, 15 Apr 2012) Log Message: ----------- testing jump Modified Paths: -------------- trunk/src/client/psmovement.cpp Modified: trunk/src/client/psmovement.cpp =================================================================== --- trunk/src/client/psmovement.cpp 2012-04-15 12:08:06 UTC (rev 8208) +++ trunk/src/client/psmovement.cpp 2012-04-15 13:17:04 UTC (rev 8209) @@ -34,7 +34,7 @@ #include "effects/pseffectmanager.h" -//#define MOVE_DEBUG +#define MOVE_DEBUG #define RUNTO_EPSILON 0.75f #define USE_EXPERIMENTAL_AUTOMOVE 0 @@ -561,7 +561,10 @@ vel *= actormode->modifier; #ifdef MOVE_DEBUG - printf("Changing velocity to (%.2f,%.2f,%.2f),(%.2f,%.2f,%.2f)\n", + printf("On Ground: Applying velocity modifier (%.2f,%.2f,%.2f),(%.2f,%.2f,%.2f)\n", + actormode->modifier.move.x,actormode->modifier.move.y,actormode->modifier.move.z, + actormode->modifier.rotate.x,actormode->modifier.rotate.y,actormode->modifier.rotate.z); + printf("On Ground: Changing velocity to (%.2f,%.2f,%.2f),(%.2f,%.2f,%.2f)\n", vel.move.x,vel.move.y,vel.move.z, vel.rotate.x,vel.rotate.y,vel.rotate.z); #endif @@ -582,14 +585,15 @@ else // Airborne { #ifdef MOVE_DEBUG - printf("Adding velocity (%.2f,%.2f,%.2f),(%.2f,%.2f,%.2f)\n", + printf("In Air: Adding velocity (%.2f,%.2f,%.2f),(%.2f,%.2f,%.2f)\n", vel.move.x,vel.move.y,vel.move.z, vel.rotate.x,vel.rotate.y,vel.rotate.z); #endif - // Add to existing velocity - if (vel.move.y <= 0 && (vel.move.x != 0 || vel.move.z != 0)) - actor->Movement().SetVelocity(csVector3(vel.move.x,0,vel.move.z)); + // Talad : commented out to fix the jump stopping mid-air (forward inertia) + // Add to existing velocity + //if (vel.move.y <= 0 && (vel.move.x != 0 || vel.move.z != 0)) + // actor->Movement().SetVelocity(csVector3(vel.move.x,0,vel.move.z)); // Set rotation actor->Movement().SetAngularVelocity( vel.rotate ); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lpa...@us...> - 2012-04-15 13:38:12
|
Revision: 8210 http://planeshift.svn.sourceforge.net/planeshift/?rev=8210&view=rev Author: lpancallo Date: 2012-04-15 13:38:06 +0000 (Sun, 15 Apr 2012) Log Message: ----------- fixed jump movement Modified Paths: -------------- trunk/src/client/psmovement.cpp Modified: trunk/src/client/psmovement.cpp =================================================================== --- trunk/src/client/psmovement.cpp 2012-04-15 13:17:04 UTC (rev 8209) +++ trunk/src/client/psmovement.cpp 2012-04-15 13:38:06 UTC (rev 8210) @@ -34,7 +34,7 @@ #include "effects/pseffectmanager.h" -#define MOVE_DEBUG +//#define MOVE_DEBUG #define RUNTO_EPSILON 0.75f #define USE_EXPERIMENTAL_AUTOMOVE 0 @@ -555,10 +555,11 @@ * and to give the limited ability to turn or glide mid-flight. */ onGround = actor->Movement().IsOnGround(); + + // Apply mode's modifier + vel *= actormode->modifier; if (onGround) // Normal { - // Apply mode's modifier - vel *= actormode->modifier; #ifdef MOVE_DEBUG printf("On Ground: Applying velocity modifier (%.2f,%.2f,%.2f),(%.2f,%.2f,%.2f)\n", @@ -590,10 +591,9 @@ vel.rotate.x,vel.rotate.y,vel.rotate.z); #endif - // Talad : commented out to fix the jump stopping mid-air (forward inertia) // Add to existing velocity - //if (vel.move.y <= 0 && (vel.move.x != 0 || vel.move.z != 0)) - // actor->Movement().SetVelocity(csVector3(vel.move.x,0,vel.move.z)); + if (vel.move.y <= 0 && (vel.move.x != 0 || vel.move.z != 0)) + actor->Movement().SetVelocity(csVector3(vel.move.x,0,vel.move.z)); // Set rotation actor->Movement().SetAngularVelocity( vel.rotate ); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ral...@us...> - 2013-10-17 00:50:58
|
Revision: 8878 http://sourceforge.net/p/planeshift/code/8878 Author: ralphcampbell Date: 2013-10-17 00:50:55 +0000 (Thu, 17 Oct 2013) Log Message: ----------- Replace indent by tab with spaces, fix typo in comment. Modified Paths: -------------- trunk/src/client/psmovement.cpp Modified: trunk/src/client/psmovement.cpp =================================================================== --- trunk/src/client/psmovement.cpp 2013-10-16 14:04:37 UTC (rev 8877) +++ trunk/src/client/psmovement.cpp 2013-10-17 00:50:55 UTC (rev 8878) @@ -208,13 +208,13 @@ if (event.Name == event_frame) { - // If we we've returned to the ground, update allowed velocity + // If we've returned to the ground, update allowed velocity if ((!onGround && actor->Movement().IsOnGround()) || - (onGround && !actor->Movement().IsOnGround())) + (onGround && !actor->Movement().IsOnGround())) UpdateVelocity(); - // UpdateMouseLook will take care of "recent mouse-look turning" based on "bool mouseLook" - UpdateMouseLook(); + // UpdateMouseLook will take care of "recent mouse-look turning" based on "bool mouseLook" + UpdateMouseLook(); if (mouseMove) UpdateRunTo(); @@ -559,13 +559,13 @@ */ onGround = actor->Movement().IsOnGround(); - // Apply mode's modifier + // Apply mode's modifier vel *= actormode->modifier; if (onGround) // Normal { #ifdef MOVE_DEBUG - printf("On Ground: Applying velocity modifier (%.2f,%.2f,%.2f),(%.2f,%.2f,%.2f)\n", + printf("On Ground: Applying velocity modifier (%.2f,%.2f,%.2f),(%.2f,%.2f,%.2f)\n", actormode->modifier.move.x,actormode->modifier.move.y,actormode->modifier.move.z, actormode->modifier.rotate.x,actormode->modifier.rotate.y,actormode->modifier.rotate.z); printf("On Ground: Changing velocity to (%.2f,%.2f,%.2f),(%.2f,%.2f,%.2f)\n", @@ -594,9 +594,9 @@ vel.rotate.x,vel.rotate.y,vel.rotate.z); #endif - // Add to existing velocity - if (vel.move.y <= 0 && (vel.move.x != 0 || vel.move.z != 0)) - actor->Movement().SetVelocity(csVector3(vel.move.x,0,vel.move.z)); + // Add to existing velocity + if (vel.move.y <= 0 && (vel.move.x != 0 || vel.move.z != 0)) + actor->Movement().SetVelocity(csVector3(vel.move.x,0,vel.move.z)); // Set rotation actor->Movement().SetAngularVelocity( vel.rotate ); @@ -710,8 +710,8 @@ void psMovementManager::MouseLook(iEvent& ev) { - if (!ready || !actor) - return; + if (!ready || !actor) + return; psCamera* camera = psengine->GetPSCamera(); iGraphics2D* g2d = psengine->GetG2D(); @@ -783,8 +783,8 @@ void psMovementManager::SetRunToPos(psPoint& mouse) { - if (!ready || !actor) - return; + if (!ready || !actor) + return; csVector3 tmp, tmpDiff; iMeshWrapper *mesh = psengine->GetPSCamera()->Get3DPointFrom2D(mouse.x, mouse.y, &tmp, &tmpDiff); @@ -816,8 +816,8 @@ void psMovementManager::UpdateRunTo() { - if (!ready || !actor) - return; + if (!ready || !actor) + return; if (runToMarkerID != 0 && !locked) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |