diff options
-rw-r--r-- | src/CMakeLists.txt | 10 | ||||
-rw-r--r-- | src/graphics/engine/camera.cpp | 62 |
2 files changed, 67 insertions, 5 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 4025f78..efc871c 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -124,7 +124,7 @@ graphics/opengl/gldevice.cpp # object/motion/motiontoto.cpp # object/motion/motionvehicle.cpp # object/motion/motionworm.cpp -object/object.cpp +# object/object.cpp # object/robotmain.cpp # object/task/task.cpp # object/task/taskadvance.cpp @@ -147,10 +147,10 @@ object/object.cpp # object/task/taskterraform.cpp # object/task/taskturn.cpp # object/task/taskwait.cpp -physics/physics.cpp -script/cbottoken.cpp -script/cmdtoken.cpp -script/script.cpp +# physics/physics.cpp +# script/cbottoken.cpp +# script/cmdtoken.cpp +# script/script.cpp # sound/sound.cpp # ui/button.cpp # ui/check.cpp diff --git a/src/graphics/engine/camera.cpp b/src/graphics/engine/camera.cpp index 78ab808..034c5ea 100644 --- a/src/graphics/engine/camera.cpp +++ b/src/graphics/engine/camera.cpp @@ -28,6 +28,67 @@ #include "object/object.h" #include "physics/physics.h" + +// TODO temporary stubs for CObject and CPhysics + +void CObject::SetTransparency(float) +{ +} + +CObject* CObject::GetFret() +{ + return nullptr; +} + +CObject* CObject::GetPower() +{ + return nullptr; +} + +CObject* CObject::GetTruck() +{ + return nullptr; +} + +ObjectType CObject::GetType() +{ + return OBJECT_NULL; +} + +void CObject::SetGunGoalH(float) +{ +} + +void CObject::GetGlobalSphere(Math::Vector &pos, float &radius) +{ +} + +float CObject::GetAngleY(int) +{ + return 0.0f; +} + +Math::Vector CObject::GetPosition(int) +{ + return Math::Vector(); +} + +void CObject::SetViewFromHere(Math::Vector &eye, float &dirH, float &dirV, + Math::Vector &lookat, Math::Vector &upVec, + Gfx::CameraType type) +{ +} + +CPhysics* CObject::GetPhysics() +{ + return nullptr; +} + +bool CPhysics::GetLand() +{ + return false; +} + //! Changes the level of transparency of an object and objects transported (battery & cargo) void SetTransparency(CObject* obj, float value) { @@ -1658,3 +1719,4 @@ Math::Vector Gfx::CCamera::ExcludeObject(Math::Vector eye, Math::Vector lookat, return eye;*/ } + |