Daniele Bartolini 11 سال پیش
والد
کامیت
d3684d3fbe
6فایلهای تغییر یافته به همراه13 افزوده شده و 22 حذف شده
  1. 1 4
      engine/lua/lua_system.h
  2. 1 2
      engine/physics/controller.h
  3. 1 0
      engine/physics/raycast.cpp
  4. 6 7
      engine/physics/raycast.h
  5. 3 9
      engine/renderers/render_world.h
  6. 1 0
      engine/world/world.h

+ 1 - 4
engine/lua/lua_system.h

@@ -25,15 +25,12 @@ OTHER DEALINGS IN THE SOFTWARE.
 */
 
 #include "types.h"
+#include "math_types.h"
 #include "lua.hpp"
 
 namespace crown
 {
 
-struct Vector3;
-struct Matrix4x4;
-struct Quaternion;
-
 /// Global lua-related functions
 namespace lua_globals
 {

+ 1 - 2
engine/physics/controller.h

@@ -28,6 +28,7 @@ OTHER DEALINGS IN THE SOFTWARE.
 
 #include "physics_callback.h"
 #include "resource_types.h"
+#include "math_types.h"
 #include "PxController.h"
 #include "PxControllerManager.h"
 
@@ -40,9 +41,7 @@ using physx::PxU32;
 namespace crown
 {
 
-struct Vector3;
 struct SceneGraph;
-class PhysicsControllerCallback;
 
 ///
 /// @ingroup Physics

+ 1 - 0
engine/physics/raycast.cpp

@@ -26,6 +26,7 @@ OTHER DEALINGS IN THE SOFTWARE.
 
 #include "raycast.h"
 #include "actor.h"
+#include "array.h"
 #include "string_utils.h"
 #include "PxRigidActor.h"
 

+ 6 - 7
engine/physics/raycast.h

@@ -24,12 +24,12 @@ FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
 OTHER DEALINGS IN THE SOFTWARE.
 */
 
-#include "log.h"
+#include "math_types.h"
+#include "container_types.h"
 #include "physics_types.h"
 #include "PxQueryFiltering.h"
 #include "PxScene.h"
 #include "PxVec3.h"
-#include "event_stream.h"
 
 using physx::PxQueryFilterData;
 using physx::PxQueryFlag;
@@ -43,17 +43,16 @@ using physx::PxVec3;
 namespace crown
 {
 
-struct Vector3;
 struct Actor;
 
 ///
 /// @ingroup Physics
 struct RaycastHit
 {
-	Vector3					position;
-	float					distance;
-	Vector3					normal;
-	Actor*					actor;
+	Vector3 position;
+	float distance;
+	Vector3 normal;
+	Actor* actor;
 };
 
 

+ 3 - 9
engine/renderers/render_world.h

@@ -28,9 +28,9 @@ OTHER DEALINGS IN THE SOFTWARE.
 
 #include "id_array.h"
 #include "container_types.h"
+#include "math_types.h"
+#include "resource_types.h"
 #include "pool_allocator.h"
-#include "resource.h"
-#include "matrix4x4.h"
 #include "render_world_types.h"
 #include "material_manager.h"
 
@@ -42,16 +42,10 @@ namespace crown
 {
 
 struct Material;
-struct MaterialResource;
-struct Mesh;
-struct MeshResource;
 struct SceneGraph;
 struct Sprite;
-struct SpriteResource;
+struct Mesh;
 struct Gui;
-struct Vector2;
-struct Vector3;
-struct GuiResource;
 
 /// @defgroup Graphics Graphics
 

+ 1 - 0
engine/world/world.h

@@ -43,6 +43,7 @@ OTHER DEALINGS IN THE SOFTWARE.
 #include "event_stream.h"
 #include "sprite_animation_player.h"
 #include "resource_types.h"
+#include "quaternion.h"
 
 namespace crown
 {