Created Entity class

CMakeLists.txt

@@ -38,25 +38,30 @@ if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
     set (WARNINGS "${WARNINGS} -Wno-missing-prototypes -Wno-missing-variable-declarations")
     set (WARNINGS "${WARNINGS} -Wno-disabled-macro-expansion")
     set (WARNINGS "${WARNINGS} -Wno-shorten-64-to-32 -Wno-sign-conversion")
+    set (OpenRaider_CXX_FLAGS "${OpenRaider_CXX_FLAGS} -std=c++11")
+    set (OpenRaider_CXX_FLAGS_DEBUG "${OpenRaider_CXX_FLAGS_DEBUG} -g -O0")
+    set (OpenRaider_CXX_FLAGS_RELEASE "${OpenRaider_CXX_FLAGS_RELEASE} -O2 -fomit-frame-pointer")
+    set (OpenRaider_CXX_FLAGS_RELEASE "${OpenRaider_CXX_FLAGS_RELEASE} -ffast-math -funroll-loops")
 elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
     set (WARNINGS "${WARNINGS} -Wall -Wextra -Wpedantic")
+    set (OpenRaider_CXX_FLAGS "${OpenRaider_CXX_FLAGS} -std=c++11")
+    set (OpenRaider_CXX_FLAGS_DEBUG "${OpenRaider_CXX_FLAGS_DEBUG} -g -O0")
+    set (OpenRaider_CXX_FLAGS_RELEASE "${OpenRaider_CXX_FLAGS_RELEASE} -O2 -fomit-frame-pointer")
+    set (OpenRaider_CXX_FLAGS_RELEASE "${OpenRaider_CXX_FLAGS_RELEASE} -ffast-math -funroll-loops")
 elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
     # TODO Visual C++ compiler flags?
 endif()
 
 # Flags for all builds
-set (OpenRaider_CXX_FLAGS "${OpenRaider_CXX_FLAGS} -std=c++11 ${WARNINGS}")
+set (OpenRaider_CXX_FLAGS "${OpenRaider_CXX_FLAGS} ${WARNINGS}")
 
 # Flags for Debug build
-set (OpenRaider_CXX_FLAGS_DEBUG "${OpenRaider_CXX_FLAGS_DEBUG} -g -O0")
 set (OpenRaider_CXX_FLAGS_DEBUG "${OpenRaider_CXX_FLAGS_DEBUG} -DDEBUG")
 set (OpenRaider_CXX_FLAGS_DEBUG "${OpenRaider_CXX_FLAGS_DEBUG} -DEXPERIMENTAL")
 # set (OpenRaider_CXX_FLAGS_DEBUG "${OpenRaider_CXX_FLAGS_DEBUG} -DMULTITEXTURE")
 
 # Flags for Releasae builds
-set (OpenRaider_CXX_FLAGS_RELEASE "${OpenRaider_CXX_FLAGS_RELEASE} -DNDEBUG -O2")
-set (OpenRaider_CXX_FLAGS_RELEASE "${OpenRaider_CXX_FLAGS_RELEASE} -ffast-math -funroll-loops")
-set (OpenRaider_CXX_FLAGS_RELEASE "${OpenRaider_CXX_FLAGS_RELEASE} -fomit-frame-pointer")
+set (OpenRaider_CXX_FLAGS_RELEASE "${OpenRaider_CXX_FLAGS_RELEASE} -DNDEBUG")
 
 #################################################################
 
@@ -65,15 +70,16 @@ add_subdirectory (src)
 
 #################################################################
 
-# Target for running the setup
-add_custom_target (setup "${PROJECT_SOURCE_DIR}/cmake/setup.sh"
-    WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
-)
+if (${CMAKE_GENERATOR} STREQUAL "Unix Makefiles")
 
-#################################################################
+    # Target for running the setup
+    add_custom_target (setup "${PROJECT_SOURCE_DIR}/cmake/setup.sh"
+        WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
+    )
 
-# Target for running cppcheck
-if (${CMAKE_GENERATOR} STREQUAL "Unix Makefiles")
+    #################################################################
+
+    # Target for running cppcheck
     set (CHECK_STD "--std=c++11" "--std=posix")
     set (CHECK_FLAGS "--quiet" "--force")
     set (CHECK_NORMAL "--enable=information,warning,performance,portability")
@@ -88,12 +94,10 @@ if (${CMAKE_GENERATOR} STREQUAL "Unix Makefiles")
     add_custom_target (checkConfig echo "Checking cppcheck config..."
         COMMAND cppcheck ${CHECK_FLAGS} "-I${PROJECT_SOURCE_DIR}/include" ${CHECK_CONFIG} ${PROJECT_SOURCE_DIR}
     )
-endif (${CMAKE_GENERATOR} STREQUAL "Unix Makefiles")
 
-#################################################################
+    #################################################################
 
-# Generate Doxygen Documentation
-if (${CMAKE_GENERATOR} STREQUAL "Unix Makefiles")
+    # Generate Doxygen Documentation
     find_package (Doxygen)
     if (DOXYGEN_FOUND)
         # Configure the Template Doxyfile for our specific project
@@ -122,8 +126,9 @@ if (${CMAKE_GENERATOR} STREQUAL "Unix Makefiles")
             COMMAND sed -i '' "s/CALL_GRAPH             = YES/CALL_GRAPH             = NO/g" Doxyfile
             COMMAND sed -i '' "s/CALLER_GRAPH           = YES/CALLER_GRAPH           = NO/g" Doxyfile
             SOURCES ${PROJECT_BINARY_DIR}/Doxyfile)
+
+        # Clean doc files
+        set_directory_properties (PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "doc")
     endif (DOXYGEN_FOUND)
 endif (${CMAKE_GENERATOR} STREQUAL "Unix Makefiles")
 
-# Clean doc files
-set_directory_properties (PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "doc")

ChangeLog.md

@@ -2,6 +2,12 @@
 
 ## OpenRaider (0.1.3) xythobuz <xythobuz@xythobuz.de>
 
+    [ 20140515 ]
+    * Slight cmake script improvements
+    * Created Entity class that will also get animation state
+      from SkeletalModel
+    * Removed some unused old code parts
+
     [ 20140507 ]
     * Prepared for Windows support using Visual C++
       - Wrote utils/time implementation for Windows

TODO.md

@@ -18,6 +18,12 @@ There are these DebugModel, DebugMap flags...?
 
 * Using std::vector with [] is not bound checked. Segfaults were caused because the upper bound of the argument was never checked and garbage was returned... Do consistent checks, or use .at() as it throws an exception
 
+## Cmake
+
+* Windows setup script needed, moving to AppData/Roaming
+* Support SSE with other compilers than Clang (src/CMakeLists.txt)
+* Visual C++ compiler flags? (CMakeLists.txt)
+
 ## Future Features
 
 * Use only assets from old TR games?

include/Entity.h

@@ -0,0 +1,56 @@
+/*!
+ * \file include/Entity.h
+ * \brief World Entities
+ *
+ * \author xythobuz
+ */
+
+#ifndef _ENTITY_H_
+#define _ENTITY_H_
+
+#include "math/math.h"
+#include "TombRaider.h"
+
+class Entity {
+public:
+    typedef enum {
+        MoveTypeWalkNoSwim = -1,
+        MoveTypeWalk       = 0,
+        MoveTypeNoClipping = 1,
+        MoveTypeFly        = 2,
+        MoveTypeSwim       = 3
+    } MoveType;
+
+    Entity(TombRaider &tr);
+
+    // Animation State
+
+    unsigned int getAnimationFrame();
+    void setAnimationFrame(unsigned int index);
+
+    unsigned int getBoneFrame();
+    void setBoneFrame(unsigned int index);
+
+    unsigned int getIdleAnimation();
+    void setIdleAnimation(unsigned int index);
+
+private:
+    vec3_t pos;
+    vec3_t angles;
+    int room;
+
+    unsigned int skeletalModel;
+    MoveType moveType;
+
+    int state;
+    int objectId;
+
+    // Animation State
+
+    unsigned int boneFrame;
+    unsigned int animationFrame;
+    unsigned int idleAnimation;
+};
+
+#endif
+

include/Render.h

@@ -121,8 +121,6 @@ public:
 
     void setSkyMesh(int index, bool rot);
 
-    void ViewModel(entity_t *ent, int index);
-
     void addSkeletalModel(SkeletalModel *mdl);
 
     unsigned int getFlags();

include/SkeletalModel.h

@@ -79,11 +79,7 @@ public:
 
     void setIdleAnimation(int index);
 
-    unsigned int flags;
     skeletal_model_t *model; //!< World render model
-    float time;              //!< Interpolation use
-    float lastTime;
-    float rate;              //!< \fixme temp cache this here for old animation system use
 
 private:
     int mBoneFrame;      //!< Bone frame

include/TombRaider.h

@@ -10,6 +10,7 @@
 #define _TOMBRAIDER_H_
 
 #include <cstdint>
+#include <cstdio>
 
 #ifdef WIN32
 typedef uint8_t u_int8_t;

include/World.h

@@ -29,6 +29,23 @@ public:
     ~World();
 
     /*!
+     * \brief Clears all data in world
+     */
+    void destroy();
+
+    void addRoom(Room &room);
+
+    unsigned int sizeRoom();
+
+    Room &getRoom(unsigned int index);
+
+    void addSprite(SpriteSequence &sprite);
+
+    unsigned int sizeSprite();
+
+    SpriteSequence &getSprite(unsigned int index);
+
+    /*!
      * \brief Adds mesh to world
      * \param model mesh to add
      */
@@ -58,18 +75,6 @@ public:
     skeletal_model_t *getModel(int index);
     std::vector<entity_t *> *getEntities();
 
-    void addRoom(Room &room);
-
-    unsigned int sizeRoom();
-
-    Room &getRoom(unsigned int index);
-
-    void addSprite(SpriteSequence &sprite);
-
-    unsigned int sizeSprite();
-
-    SpriteSequence &getSprite(unsigned int index);
-
     /*!
      * \brief Find room a location is in.
      *
@@ -117,6 +122,7 @@ public:
      * \returns sector index of position in room
      */
     int getSector(int room, float x, float z);
+
     int getSector(int room, float x, float z, float *floor, float *ceiling);
 
     unsigned int getRoomInfo(int room);
@@ -138,12 +144,6 @@ public:
      */
     void getHeightAtPosition(int index, float x, float *y, float z);
 
-    /*!
-     * \brief Clears all data in world
-     * \todo in future will check if data is in use before clearing
-     */
-    void destroy();
-
 private:
 
     // Old World
@@ -155,6 +155,8 @@ private:
     std::vector<Room *> mRooms;
     std::vector<SpriteSequence *> mSprites;
 
+    //std::vector<Entity *> mEntities;
+    //std::vector<SkeletalModel *> mModels;
 };
 
 #endif

include/WorldData.h

@@ -51,7 +51,6 @@ typedef struct {
 } model_mesh_t;
 
 typedef struct {
-    int id;                  //!< Unique identifier
     float pos[3];            //!< World position
     float angles[3];         //!< Euler angles (pitch, yaw, roll)
     int room;                //!< Current room entity is in
@@ -60,9 +59,7 @@ typedef struct {
     int state;               //!< State of the Player, AI, or object
     int objectId;            //!< What kind of entity?
 
-    int modelId;             //!< Animation model
     SkeletalModel *tmpHook;
-    bool animate;
 } entity_t;
 
 #endif

src/CMakeLists.txt

@@ -42,6 +42,7 @@ endif (OPENAL_FOUND)
 set (SRCS ${SRCS} "Camera.cpp")
 set (SRCS ${SRCS} "Command.cpp")
 set (SRCS ${SRCS} "Console.cpp")
+set (SRCS ${SRCS} "Entity.cpp")
 set (SRCS ${SRCS} "Game.cpp")
 set (SRCS ${SRCS} "main.cpp")
 set (SRCS ${SRCS} "Menu.cpp")
@@ -141,7 +142,6 @@ if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
     if (NOT "${SSE_FOUND_MSG}" STREQUAL "")
         message (STATUS "Enabled${SSE_FOUND_MSG}...")
     endif (NOT "${SSE_FOUND_MSG}" STREQUAL "")
-# TODO support SSE with other compilers than Clang
 endif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
 
 # Apply Flags

src/Entity.cpp

@@ -0,0 +1,37 @@
+/*!
+ * \file src/Entity.cpp
+ * \brief World Entities
+ *
+ * \author xythobuz
+ */
+
+#include "Entity.h"
+
+Entity::Entity(TombRaider &tr) {
+
+}
+
+unsigned int Entity::getAnimationFrame() {
+    return animationFrame;
+}
+
+void Entity::setAnimationFrame(unsigned int index) {
+    animationFrame = index;
+}
+
+unsigned int Entity::getBoneFrame() {
+    return boneFrame;
+}
+
+void Entity::setBoneFrame(unsigned int index) {
+    boneFrame = index;
+}
+
+unsigned int Entity::getIdleAnimation() {
+    return idleAnimation;
+}
+
+void Entity::setIdleAnimation(unsigned int index) {
+    idleAnimation = index;
+}
+

src/Game.cpp

@@ -189,10 +189,8 @@ void Game::processSprites() {
 
 void Game::processRooms() {
     printf("Processing rooms: ");
-    for (int index = 0; index < mTombRaider.NumRooms(); index++) {
-        Room &room = *new Room(mTombRaider, index);
-        getWorld().addRoom(room);
-    }
+    for (int index = 0; index < mTombRaider.NumRooms(); index++)
+        getWorld().addRoom(*new Room(mTombRaider, index));
     printf("Done! Found %d rooms.\n", mTombRaider.NumRooms());
 }
 
@@ -358,6 +356,7 @@ void Game::processMoveables()
     }
 
     // Get models that aren't items
+    /*
     for (i = 0; i < mTombRaider.NumMoveables(); ++i)
     {
         switch ((int)moveable[i].object_id)
@@ -401,14 +400,24 @@ void Game::processMoveables()
                 }
         }
     }
+    */
 
     printf("Done! Found %d models.\n", mTombRaider.NumMoveables() + statCount);
 }
 
+// index moveable, i item, sometimes both moveable
 void Game::processMoveable(int index, int i, int *ent,
         std::vector<skeletal_model_t *> &cache2,
         std::vector<unsigned int> &cache, int object_id)
 {
+    // This creates both Entity and SkeletalModel
+    // Basic Idea:
+    // - Move animation state from SkeletalModel into Entity
+    // - Check if skeletal model is already stored
+    // - If so tell new Entity to reuse
+    // - Else store new skeletal model, tell new entity to use this one
+
+
     skeletal_model_t *r_model = NULL;
     skeletal_model_t *c_model = NULL;
     animation_frame_t *animation_frame = NULL;
@@ -446,13 +455,13 @@ void Game::processMoveable(int index, int i, int *ent,
     yaw *= 90;
 
     thing = new entity_t;
-    thing->id = (*ent)++;
+    //thing->id = (*ent)++;
     thing->pos[0] = item[i].x;
     thing->pos[1] = item[i].y;
     thing->pos[2] = item[i].z;
     thing->angles[1] = yaw;
     thing->objectId = moveable[index].object_id;
-    thing->animate = false;
+    //thing->animate = false;
 
     sModel = new SkeletalModel();
     getRender().addSkeletalModel(sModel);
@@ -490,13 +499,11 @@ void Game::processMoveable(int index, int i, int *ent,
         switch (mTombRaider.Engine())
         {
             case TR_VERSION_3:
-                mLara->modelId = i;
                 sModel->setAnimation(TR_ANIAMTION_RUN);
                 sModel->setIdleAnimation(TR_ANIAMTION_STAND);
                 r_model->tr4Overlay = false;
                 break;
             case TR_VERSION_4:
-                mLara->modelId = i;
                 sModel->setAnimation(TR_ANIAMTION_RUN);
                 sModel->setIdleAnimation(TR_ANIAMTION_STAND);
                 // Only TR4 lara has 2 layer bone tags/meshes per bone frame
@@ -506,7 +513,6 @@ void Game::processMoveable(int index, int i, int *ent,
             case TR_VERSION_2:
             case TR_VERSION_5:
             case TR_VERSION_UNKNOWN:
-                mLara->modelId = index;
                 sModel->setAnimation(TR_ANIAMTION_RUN);
                 sModel->setIdleAnimation(TR_ANIAMTION_STAND);
                 r_model->tr4Overlay = false;

src/Render.cpp

@@ -1111,26 +1111,6 @@ void Render::setSkyMesh(int index, bool rot)
 }
 
 
-void Render::ViewModel(entity_t *ent, int index)
-{
-    skeletal_model_t *model;
-
-
-    if (!ent)
-    {
-        return;
-    }
-
-    model = getWorld().getModel(index);
-
-    if (model)
-    {
-        ent->modelId = index;
-        printf("Viewmodel skeletal model %i\n", model->id);
-    }
-}
-
-
 void Render::addSkeletalModel(SkeletalModel *mdl)
 {
     mModels.push_back(mdl);

src/SkeletalModel.cpp

@@ -11,17 +11,14 @@
 
 SkeletalModel::SkeletalModel() {
     model = NULL;
-    flags = 0;
     mBoneFrame = 0;
     mAnimationFrame = 0;
     mIdleAnimation = 0;
-    time = 0.0f;
-    lastTime = 0.0f;
-    rate = 0.0f;
 }
 
 SkeletalModel::~SkeletalModel() {
-    //! \fixme Causes "freeing already freed pointer" exceptions or EXEC_BAD_ACCESS
+    // Model is really stored in World and deleted there
+    // Deleting it here causes EXEC_BAD_ACCESS...
     /* if (model) {
         for(std::vector<animation_frame_t>::size_type i = 0; i < model->animation.size(); i++) {
             animation_frame_t *af = model->animation[i];
@@ -76,7 +73,6 @@ void SkeletalModel::setAnimation(int index) {
     if (a) {
         mAnimationFrame = index;
         mBoneFrame = 0;
-        rate = a->rate;
     }
 }