Changeset 9623 for ps

Timestamp:

06/16/11 23:21:33 (14 years ago)

Author:

ben

Message:

Adds rotation to starting camera (currently unused)

Location:

ps/trunk

Files:

• binaries/data/mods/public/simulation/components/Player.js (modified) (1 diff)
• binaries/data/mods/public/simulation/helpers/Player.js (modified) (1 diff)
• source/graphics/MapReader.cpp (modified) (1 diff)
• source/simulation2/components/ICmpPlayer.cpp (modified) (1 diff)
• source/simulation2/components/ICmpPlayer.h (modified) (1 diff)
• source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Player/Player.cpp (modified) (2 diffs)
• source/tools/atlas/GameInterface/Handlers/CameraCtrlHandlers.cpp (modified) (4 diffs)

ps/trunk/binaries/data/mods/public/simulation/components/Player.js

@@ -227 +227 @@
 };
 
-Player.prototype.GetStartingCamera = function()
-{
-    return this.startCam;
-}
-
-Player.prototype.SetStartingCamera = function(pos)
-{
-    this.startCam = pos;
+Player.prototype.GetStartingCameraPos = function()
+{
+    return this.startCam.position;
+}
+
+Player.prototype.GetStartingCameraRot = function()
+{
+    return this.startCam.rotation;
+}
+
+Player.prototype.SetStartingCamera = function(pos, rot)
+{
+    this.startCam = {"position": pos, "rotation": rot};
 }
 

ps/trunk/binaries/data/mods/public/simulation/helpers/Player.js

@@ -130 +130 @@
             }
             
-            if (getSetting(pData, pDefs, "StartingCamera") !== undefined)
-            {
-                player.SetStartingCamera(getSetting(pData, pDefs, "StartingCamera"));
+            var startCam = getSetting(pData, pDefs, "StartingCamera");
+            if (startCam !== undefined)
+            {
+                player.SetStartingCamera(startCam.Position, startCam.Rotation);
             }
         }

ps/trunk/source/graphics/MapReader.cpp

@@ -289 +289 @@
         // Default to global camera (with constraints)
         pGameView->ResetCameraTarget(pGameView->GetCamera()->GetFocus());
-        
+    
+        // TODO: Starting rotation?
         CmpPtr<ICmpPlayer> cmpPlayer(*pSimulation2, cmpPlayerManager->GetPlayerByID(m_PlayerID));
         if (!cmpPlayer.null() && cmpPlayer->HasStartingCamera())
         {
             // Use player starting camera
-            CFixedVector3D pos = cmpPlayer->GetStartingCamera();
+            CFixedVector3D pos = cmpPlayer->GetStartingCameraPos();
             pGameView->ResetCameraTarget(CVector3D(pos.X.ToFloat(), pos.Y.ToFloat(), pos.Z.ToFloat()));
         }

ps/trunk/source/simulation2/components/ICmpPlayer.cpp

@@ -54 +54 @@
     }
 
-    virtual CFixedVector3D GetStartingCamera()
+    virtual CFixedVector3D GetStartingCameraPos()
     {
-        return m_Script.Call<CFixedVector3D>("GetStartingCamera");
+        return m_Script.Call<CFixedVector3D>("GetStartingCameraPos");
+    }
+
+    virtual CFixedVector3D GetStartingCameraRot()
+    {
+        return m_Script.Call<CFixedVector3D>("GetStartingCameraRot");
     }
 

ps/trunk/source/simulation2/components/ICmpPlayer.h

@@ -37 +37 @@
 
     virtual CColor GetColour() = 0;
-    virtual CFixedVector3D GetStartingCamera() = 0;
+    virtual CFixedVector3D GetStartingCameraPos() = 0;
+    virtual CFixedVector3D GetStartingCameraRot() = 0;
 
     virtual bool HasStartingCamera() = 0;

ps/trunk/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Player/Player.cpp

@@ -624 +624 @@
         if (player["StartingCamera"].defined())
         {
-            AtObj cam = *player["StartingCamera"];
             sCameraInfo info;
-            info.pX = wxAtof(*cam["x"]);
-            info.pY = wxAtof(*cam["y"]);
-            info.pZ = wxAtof(*cam["z"]);
+            AtObj camPos = *player["StartingCamera"]["Position"];
+            info.pX = wxAtof(*camPos["x"]);
+            info.pY = wxAtof(*camPos["y"]);
+            info.pZ = wxAtof(*camPos["z"]);
+            AtObj camRot = *player["StartingCamera"]["Rotation"];
+            info.rX = wxAtof(*camRot["x"]);
+            info.rY = wxAtof(*camRot["y"]);
+            info.rZ = wxAtof(*camRot["z"]);
             
             controls.page->SetCamera(info, true);
@@ -719 +723 @@
         {
             sCameraInfo cam = controls.page->GetCamera();
-            camObj.setDouble("x", cam.pX);
-            camObj.setDouble("y", cam.pY);
-            camObj.setDouble("z", cam.pZ);
+            AtObj camPos;
+            camPos.setDouble("x", cam.pX);
+            camPos.setDouble("y", cam.pY);
+            camPos.setDouble("z", cam.pZ);
+            camObj.set("Position", camPos);
+
+            AtObj camRot;
+            camRot.setDouble("x", cam.rX);
+            camRot.setDouble("y", cam.rY);
+            camRot.setDouble("z", cam.rZ);
+            camObj.set("Rotation", camRot);
         }
         player.set("StartingCamera", camObj);

ps/trunk/source/tools/atlas/GameInterface/Handlers/CameraCtrlHandlers.cpp

@@ -22 +22 @@
 #include "../View.h"
 
+#include "maths/MathUtil.h"
 #include "maths/Vector3D.h"
 #include "maths/Quaternion.h"
@@ -223 +224 @@
 {
     CVector3D focus = g_Game->GetView()->GetCamera()->GetFocus();
-
     sCameraInfo info;
 
@@ -230 +230 @@
     info.pZ = focus.Z;
 
-    // TODO: Rotation
+    CQuaternion quatRot = g_Game->GetView()->GetCamera()->m_Orientation.GetRotation();
+    quatRot.Normalize();
+    CVector3D rotation = quatRot.ToEulerAngles();
+
+    info.rX = RADTODEG(rotation.X); 
+    info.rY = RADTODEG(rotation.Y);
+    info.rZ = RADTODEG(rotation.Z);
 
     msg->info = info;
@@ -246 +252 @@
 
     view->ResetCameraTarget(CVector3D(cam.pX, cam.pY, cam.pZ));
-}
-
-}
+
+    // TODO: Rotation
+}
+
+}