• R/O
  • SSH
  • HTTPS

gd10: Commit


Commit MetaInfo

Revisão130 (tree)
Hora2019-08-18 06:07:00
Autorhgtterry

Mensagem de Log

jump 170819

Mudança Sumário

Diff

--- Equity10/GD_Player.cpp (revision 129)
+++ Equity10/GD_Player.cpp (revision 130)
@@ -256,9 +256,13 @@
256256 btVector3 basis = xform.getBasis()[2];
257257 vel = -Ground_speed * 10 * basis;
258258 mObject->setLinearVelocity(btVector3(vel[0], cur[1], vel[2]));
259- ////mObject->setLinearVelocity(btVector3(vel[0], 0, vel[2]));
259+
260+ //btVector3 pos = mObject->getWorldTransform().getOrigin();
261+ ////pos[0] = pos[0] + 0.02;
260262
261- App->CL10_Utils->log(cur[1]);
263+ //mObject->translate(btVector3(pos[0], pos[1], pos[2]));
264+
265+ //App->CL10_Utils->log(cur[1]);
262266 Check_Collisions();
263267 }
264268 }
@@ -288,7 +292,7 @@
288292 btVector3 cur = mObject->getLinearVelocity();
289293 btVector3 basis = xform.getBasis()[2];
290294 vel = Ground_speed * 10 * basis; //cur[1],
291- mObject->setLinearVelocity(btVector3(vel[0], -10.2, vel[2]));
295+ mObject->setLinearVelocity(btVector3(vel[0], cur[1], vel[2]));
292296 Check_Collisions();
293297 }
294298 }
@@ -342,13 +346,18 @@
342346 // *************************************************************************
343347 void GD_Player::Jump(const Ogre::Vector3 axis, float force)
344348 {
345- if(PlayerAdded == 1)
349+ btVector3 pos = mObject->getWorldTransform().getOrigin();
350+ pos[1] = pos[1] + 0.2;
351+
352+ mObject->getWorldTransform().setOrigin(btVector3(pos[0], pos[1], pos[2]));
353+
354+ /*if(PlayerAdded == 1)
346355 {
347356 if(mOnGround == 1)
348357 {
349358 mObject->applyForce(btVector3(0,330,0),btVector3(0,0,0));
350359 }
351- }
360+ }*/
352361 }
353362
354363 // *************************************************************************
--- Equity10/VersionNo2.h (revision 129)
+++ Equity10/VersionNo2.h (revision 130)
@@ -39,21 +39,21 @@
3939 #ifndef _VERSIONNO__H_
4040 #define _VERSIONNO__H_
4141
42-#define VERSION_FULL 1.21.228.82
42+#define VERSION_FULL 1.21.228.92
4343
4444 #define VERSION_BASEYEAR 2019
4545 #define VERSION_DATE "2019-08-17"
46-#define VERSION_TIME "21:10:40"
46+#define VERSION_TIME "22:04:59"
4747
4848 #define VERSION_MAJOR 1
4949 #define VERSION_MINOR 21
5050 #define VERSION_BUILDNO 228
51-#define VERSION_EXTEND 82
51+#define VERSION_EXTEND 92
5252
53-#define VERSION_FILE 1,21,228,82
54-#define VERSION_PRODUCT 1,21,228,89
55-#define VERSION_FILESTR "1,21,228,82\0"
56-#define VERSION_PRODUCTSTR "1,21,228,89\0"
53+#define VERSION_FILE 1,21,228,92
54+#define VERSION_PRODUCT 1,21,228,99
55+#define VERSION_FILESTR "1,21,228,92\0"
56+#define VERSION_PRODUCTSTR "1,21,228,99\0"
5757 #define VERSION_EVERSION "0.3.4.0\0"
5858
5959 #endif
\ No newline at end of file
Show on old repository browser