Changeset 11569
- Timestamp:
- Nov 20, 2017, 2:28:36 PM (7 years ago)
- Location:
- code/branches/SOBv2_HS17
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/SOBv2_HS17/data/levels/SOB.oxw
r11567 r11569 103 103 104 104 105 <SOBFireball collisionType="dynamic" speed= 40 position = "10,0,40">106 <attached> 107 <Model mesh="planets/sol.mesh" position="0,0, 1" scale=3 pitch=90/>108 109 </attached> 110 <collisionShapes> 111 < BoxCollisionShape position="0,0,0" halfExtents="5,5,5" />105 <SOBFireball collisionType="dynamic" speed=80 position = "10,0,40"> 106 <attached> 107 <Model mesh="planets/sol.mesh" position="0,0,0" scale=3 pitch=90/> 108 109 </attached> 110 <collisionShapes> 111 <SphereCollisionShape position="0,0,0" halfExtents="5,5,5" /> 112 112 </collisionShapes> 113 113 </SOBFireball> -
code/branches/SOBv2_HS17/src/modules/superorxobros/SOBFireball.cc
r11567 r11569 57 57 figure_ = nullptr; 58 58 this->enableCollisionCallback(); 59 gravityAcceleration_ = 5.0;59 gravityAcceleration_ = 350.0; 60 60 speed_ = 0; 61 61 hasCollided_=false; … … 67 67 collDisX_ = 0; 68 68 collDisZ_ = 0; 69 hitCounter_ = 0; 69 70 70 71 orxout() << "fireball existed" << endl; … … 120 121 } 121 122 123 hitCounter_++; 124 122 125 123 126 return true; … … 153 156 velocity.z -= gravityAcceleration_*dt; 154 157 velocity.x = dir*speed_; 158 velocity.y = 0; 155 159 setVelocity(velocity); 156 160
Note: See TracChangeset
for help on using the changeset viewer.