Changeset 11934 for code/branches

Timestamp:

May 3, 2018, 3:47:08 PM (7 years ago)

Author:

sehirsch

Message:

updated camera and cube pattern

Location:

code/branches/OrxyRoad_FS18

Files:

• data/levels/templates/OrxyRoadPattern.oxt (modified) (1 diff)
• data/levels/templates/spaceshipOrxyRoad.oxt (modified) (1 diff)
• src/modules/orxyroad/OrxyRoad.cc (modified) (2 diffs)
• src/modules/orxyroad/OrxyRoadShip.cc (modified) (1 diff)

code/branches/OrxyRoad_FS18/data/levels/templates/OrxyRoadPattern.oxt

@@ -75 +75 @@
 
 </Template>
+
+<Template name=cokebottle>
+        
+        <OrxyRoadCube position="0,0,0" direction="0,0,0"   scale="1" collisionType=dynamic mass=1 friction=0.01 >
+      <attached>
+        <Model position="0,0,0"                 mesh="cokebottle.mesh"          scale="50"      />
+                
+      </attached>
+      <collisionShapes>
+                <BoxCollisionShape position="0,0,0"                             halfExtents="100,100,100"       />
+                
+      </collisionShapes>
+        </OrxyRoadCube>
+
+</Template>

code/branches/OrxyRoad_FS18/data/levels/templates/spaceshipOrxyRoad.oxt

@@ -80 +80 @@
   <OrxyRoadShip>
     <camerapositions>
-                <CameraPosition position="0,100,180" direction="0, -0.2, -1" drag=false mouselook=true />
+                <CameraPosition position="200,200,360" direction="-0.4, -0.4, -1" yaw="0" drag=false mouselook=true />
                 <CameraPosition position="0,200,250" direction="0, -0.4, -1" drag=false mouselook=true />
                 <CameraPosition position="0,30,150" direction="0, 0, -1" drag=false mouselook=true />

code/branches/OrxyRoad_FS18/src/modules/orxyroad/OrxyRoad.cc

@@ -91 +91 @@
     void OrxyRoad::tick(float dt)
     {
+        SUPER(OrxyRoad, tick, dt);
+        
         OrxyRoadShip* player = this->getPlayer();
         if (player != nullptr)
@@ -148 +150 @@
 
         }
-        SUPER(OrxyRoad, tick, dt);
     }
 

code/branches/OrxyRoad_FS18/src/modules/orxyroad/OrxyRoadShip.cc

@@ -144 +144 @@
         if (camera != nullptr)
         {
-            //camera->setPosition(Vector3(pos1.x - 10 ,50,0));
+           camera->setPosition(Vector3(0 ,50,50)); // try to get side/top view
             //camera->setOrientation(Vector3(-1,-1,0), Degree(45));
             //camera->setOrientation(Vector3(-1,-1,-1), Degree(0));