Mirrors/openrw
1
0
Fork 0
mirror of https://github.com/rwengine/openrw.git synced 2024-11-07 03:12:36 +01:00
Code Issues Projects Releases Activity

Move GameObject to objects directory

Browse Source
This commit is contained in:
Daniel Evans 2015-04-27 02:09:56 +01:00
parent d7e122306a
commit 1daa5a6fb2
17 changed files with 14 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rwengine/include/objects/CharacterObject.hpp
View File

@ -1,7 +1,7 @@
#pragma once #pragma once
#ifndef _CHARACTEROBJECT_HPP_ #ifndef _CHARACTEROBJECT_HPP_
#define _CHARACTEROBJECT_HPP_ #define _CHARACTEROBJECT_HPP_
#include <engine/GameObject.hpp> #include <objects/GameObject.hpp>
#include <bullet/BulletDynamics/Character/btKinematicCharacterController.h> #include <bullet/BulletDynamics/Character/btKinematicCharacterController.h>
#include <bullet/btBulletCollisionCommon.h> #include <bullet/btBulletCollisionCommon.h>
#include <BulletCollision/CollisionDispatch/btGhostObject.h> #include <BulletCollision/CollisionDispatch/btGhostObject.h>

2
rwengine/include/objects/CutsceneObject.hpp
View File

@ -1,7 +1,7 @@
#pragma once #pragma once
#ifndef _CUTSCENEOBJECT_HPP_ #ifndef _CUTSCENEOBJECT_HPP_
#define _CUTSCENEOBJECT_HPP_ #define _CUTSCENEOBJECT_HPP_
#include <engine/GameObject.hpp> #include <objects/GameObject.hpp>
/** /**
* @brief Object type used for cutscene animations. * @brief Object type used for cutscene animations.

0
rwengine/include/engine/GameObject.hpp → rwengine/include/objects/GameObject.hpp
View File

2
rwengine/include/objects/InstanceObject.hpp
View File

@ -1,7 +1,7 @@
#pragma once #pragma once
#ifndef _OBJECTINSTANCE_HPP_ #ifndef _OBJECTINSTANCE_HPP_
#define _OBJECTINSTANCE_HPP_ #define _OBJECTINSTANCE_HPP_
#include <engine/GameObject.hpp> #include <objects/GameObject.hpp>
#include <btBulletDynamicsCommon.h> #include <btBulletDynamicsCommon.h>
class CollisionInstance; class CollisionInstance;

2
rwengine/include/objects/PickupObject.hpp
View File

@ -1,7 +1,7 @@
#pragma once #pragma once
#ifndef _PICKUPOBJECT_HPP_ #ifndef _PICKUPOBJECT_HPP_
#define _PICKUPOBJECT_HPP_ #define _PICKUPOBJECT_HPP_
#include <engine/GameObject.hpp> #include <objects/GameObject.hpp>
#include <bullet/btBulletCollisionCommon.h> #include <bullet/btBulletCollisionCommon.h>
#include <BulletCollision/CollisionDispatch/btGhostObject.h> #include <BulletCollision/CollisionDispatch/btGhostObject.h>
#include <glm/glm.hpp> #include <glm/glm.hpp>

2
rwengine/include/objects/ProjectileObject.hpp
View File

@ -1,7 +1,7 @@
#pragma once #pragma once
#ifndef _PROJECTILEOBJECT_HPP_ #ifndef _PROJECTILEOBJECT_HPP_
#define _PROJECTILEOBJECT_HPP_ #define _PROJECTILEOBJECT_HPP_
#include <engine/GameObject.hpp> #include <objects/GameObject.hpp>
#include <data/WeaponData.hpp> #include <data/WeaponData.hpp>
#include <bullet/btBulletDynamicsCommon.h> #include <bullet/btBulletDynamicsCommon.h>
#include <BulletCollision/CollisionDispatch/btGhostObject.h> #include <BulletCollision/CollisionDispatch/btGhostObject.h>

2
rwengine/include/objects/VehicleObject.hpp
View File

@ -1,7 +1,7 @@
#pragma once #pragma once
#ifndef _VEHICLEOBJECT_HPP_ #ifndef _VEHICLEOBJECT_HPP_
#define _VEHICLEOBJECT_HPP_ #define _VEHICLEOBJECT_HPP_
#include <engine/GameObject.hpp> #include <objects/GameObject.hpp>
#include <map> #include <map>
#include <objects/VehicleInfo.hpp> #include <objects/VehicleInfo.hpp>
#include <dynamics/CollisionInstance.hpp> #include <dynamics/CollisionInstance.hpp>

2
rwengine/src/ai/AIGraph.cpp
View File

@ -1,5 +1,5 @@
#include "ai/AIGraph.hpp" #include "ai/AIGraph.hpp"
#include "engine/GameObject.hpp" #include <objects/GameObject.hpp>
#include <ai/AIGraphNode.hpp> #include <ai/AIGraphNode.hpp>
#include <glm/gtx/norm.hpp> #include <glm/gtx/norm.hpp>
#include <iostream> #include <iostream>

2
rwengine/src/ai/TrafficDirector.cpp
View File

@ -2,7 +2,7 @@
#include <ai/AIGraphNode.hpp> #include <ai/AIGraphNode.hpp>
#include <ai/CharacterController.hpp> #include <ai/CharacterController.hpp>
#include <engine/GameWorld.hpp> #include <engine/GameWorld.hpp>
#include <engine/GameObject.hpp> #include <objects/GameObject.hpp>
#include <objects/CharacterObject.hpp> #include <objects/CharacterObject.hpp>
#include <core/Logger.hpp> #include <core/Logger.hpp>

2
rwengine/src/dynamics/CollisionInstance.cpp
View File

@ -1,6 +1,6 @@
#include <dynamics/CollisionInstance.hpp> #include <dynamics/CollisionInstance.hpp>
#include <engine/GameObject.hpp> #include <objects/GameObject.hpp>
#include <engine/GameWorld.hpp> #include <engine/GameWorld.hpp>
#include <engine/GameData.hpp> #include <engine/GameData.hpp>

2
rwengine/src/engine/GameObject.cpp → rwengine/src/objects/GameObject.cpp
View File

@ -1,4 +1,4 @@
#include <engine/GameObject.hpp> #include <objects/GameObject.hpp>
#include <loaders/LoaderIFP.hpp> #include <loaders/LoaderIFP.hpp>
#include <loaders/LoaderDFF.hpp> #include <loaders/LoaderDFF.hpp>
#include <engine/Animator.hpp> #include <engine/Animator.hpp>

2
rwengine/src/script/modules/GameModule.cpp
View File

@ -11,8 +11,6 @@
#include <engine/Animator.hpp> #include <engine/Animator.hpp>
#include <engine/GameState.hpp> #include <engine/GameState.hpp>
#include <engine/GameData.hpp> #include <engine/GameData.hpp>
#include <engine/GameWorld.hpp>
#include <engine/GameWorld.hpp>
#include <ai/PlayerController.hpp> #include <ai/PlayerController.hpp>
#include <ai/DefaultAIController.hpp> #include <ai/DefaultAIController.hpp>

2
rwengine/src/script/modules/ObjectModule.cpp
View File

@ -11,8 +11,6 @@
#include <render/Model.hpp> #include <render/Model.hpp>
#include <render/GameRenderer.hpp> #include <render/GameRenderer.hpp>
#include <engine/Animator.hpp> #include <engine/Animator.hpp>
#include <engine/GameWorld.hpp>
#include <engine/GameWorld.hpp>
#include <ai/PlayerController.hpp> #include <ai/PlayerController.hpp>
#include <ai/DefaultAIController.hpp> #include <ai/DefaultAIController.hpp>

2
rwgame/RWGame.cpp
View File

@ -5,7 +5,7 @@
#include "ingamestate.hpp" #include "ingamestate.hpp"
#include "menustate.hpp" #include "menustate.hpp"
#include <engine/GameObject.hpp> #include <objects/GameObject.hpp>
#include <engine/GameState.hpp> #include <engine/GameState.hpp>
#include <engine/GameWorld.hpp> #include <engine/GameWorld.hpp>
#include <render/GameRenderer.hpp> #include <render/GameRenderer.hpp>

2
rwgame/game.hpp
View File

@ -3,7 +3,7 @@
#include <SFML/Window.hpp> #include <SFML/Window.hpp>
#include <SFML/Graphics.hpp> #include <SFML/Graphics.hpp>
#include <engine/GameObject.hpp> #include <objects/GameObject.hpp>
#include <engine/GameWorld.hpp> #include <engine/GameWorld.hpp>
constexpr double PiOver180 = 3.1415926535897932384626433832795028/180; constexpr double PiOver180 = 3.1415926535897932384626433832795028/180;

2
rwviewer/ViewerWidget.cpp
View File

@ -4,7 +4,7 @@
#include <render/OpenGLRenderer.hpp> #include <render/OpenGLRenderer.hpp>
#include <glm/gtc/type_ptr.hpp> #include <glm/gtc/type_ptr.hpp>
#include <QMouseEvent> #include <QMouseEvent>
#include <engine/GameObject.hpp> #include <objects/GameObject.hpp>
#include <engine/Animator.hpp> #include <engine/Animator.hpp>
#include <QFileDialog> #include <QFileDialog>
#include <algorithm> #include <algorithm>

2
rwviewer/views/ModelViewer.cpp
View File

@ -2,7 +2,7 @@
#include <widgets/ModelFramesWidget.hpp> #include <widgets/ModelFramesWidget.hpp>
#include "ViewerWidget.hpp" #include "ViewerWidget.hpp"
#include <data/Skeleton.hpp> #include <data/Skeleton.hpp>
#include <engine/GameObject.hpp> #include <objects/GameObject.hpp>
#include <QDebug> #include <QDebug>
ModelViewer::ModelViewer(ViewerWidget* viewer, QWidget* parent, Qt::WindowFlags f) ModelViewer::ModelViewer(ViewerWidget* viewer, QWidget* parent, Qt::WindowFlags f)