Changeset 7153 for code/branches/presentation3/src/modules

Timestamp:

Jul 12, 2010, 1:08:58 PM (15 years ago)

Author:

scheusso

Message:

• merged network2 branch into presentation3 branch (lots of network traffic and cpu load improvements)
• fixed network related bugs in BigExplosion

Location:

code/branches/presentation3

Files:

• . (modified) (1 prop)
• src/modules/objects/Planet.h (modified) (1 diff)
• src/modules/objects/collisionshapes/BoxCollisionShape.h (modified) (2 diffs)
• src/modules/objects/collisionshapes/ConeCollisionShape.h (modified) (2 diffs)
• src/modules/objects/collisionshapes/PlaneCollisionShape.h (modified) (2 diffs)
• src/modules/objects/collisionshapes/SphereCollisionShape.h (modified) (2 diffs)
• src/modules/pong/PongBall.h (modified) (2 diffs)
• src/modules/pong/PongBat.h (modified) (2 diffs)
• src/modules/weapons/weaponmodes/RocketFire.cc (modified) (1 diff)

code/branches/presentation3/src/modules/objects/Planet.h

@@ -94 +94 @@
 
         protected:
-            void registerVariables();
 
         private:
+            void registerVariables();
 
             void changedMesh();

code/branches/presentation3/src/modules/objects/collisionshapes/BoxCollisionShape.h

@@ -43 +43 @@
             virtual ~BoxCollisionShape();
 
-            void registerVariables();
             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
 
@@ -67 +66 @@
 
         private:
+            void registerVariables();
+
             btCollisionShape* createNewShape() const;
 

code/branches/presentation3/src/modules/objects/collisionshapes/ConeCollisionShape.h

@@ -41 +41 @@
             virtual ~ConeCollisionShape();
 
-            void registerVariables();
             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
 
@@ -55 +54 @@
 
         private:
+            void registerVariables();
+
             btCollisionShape* createNewShape() const;
 

code/branches/presentation3/src/modules/objects/collisionshapes/PlaneCollisionShape.h

@@ -43 +43 @@
             virtual ~PlaneCollisionShape();
 
-            void registerVariables();
             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
 
@@ -57 +56 @@
 
         private:
+            void registerVariables();
+
             btCollisionShape* createNewShape()const;
 

code/branches/presentation3/src/modules/objects/collisionshapes/SphereCollisionShape.h

@@ -41 +41 @@
             virtual ~SphereCollisionShape();
 
-            void registerVariables();
             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
 
@@ -50 +49 @@
 
         private:
+            void registerVariables();
+
             btCollisionShape* createNewShape() const;
 

code/branches/presentation3/src/modules/pong/PongBall.h

@@ -45 +45 @@
             virtual void tick(float dt);
 
-            void registerVariables();
-
             void setFieldDimension(float width, float height)
                 { this->fieldWidth_ = width; this->fieldHeight_ = height; }
@@ -74 +72 @@
 
         private:
+            void registerVariables();
+
             float fieldWidth_;
             float fieldHeight_;

code/branches/presentation3/src/modules/pong/PongBat.h

@@ -41 +41 @@
             virtual ~PongBat() {}
 
-            void registerVariables();
             virtual void tick(float dt);
 
@@ -65 +64 @@
 
         private:
+            void registerVariables();
+
             float movement_;
             bool bMoveLocal_;

code/branches/presentation3/src/modules/weapons/weaponmodes/RocketFire.cc

@@ -66 +66 @@
         rocket->setOrientation(this->getMuzzleOrientation());
         rocket->setPosition(this->getMuzzlePosition());
-        rocket->setVelocity(this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn()->getVelocity() + this->getMuzzleDirection() * this->speed_);
+//         rocket->setVelocity(this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn()->getVelocity() + this->getMuzzleDirection() * this->speed_);
+        rocket->setVelocity(Vector3(1,0,0));
         rocket->scale(2);