- another round of includes fixing
authorAkiko <akiko@linux-addicted.net>
Sun, 7 Jun 2015 14:23:51 +0000 (16:23 +0200)
committerAkiko <akiko@linux-addicted.net>
Sun, 7 Jun 2015 14:23:51 +0000 (16:23 +0200)
- removed duplicates

19 files changed:
G3D/Camera.h
G3D/Engine/BitmapList.h
G3D/Engine/Drivers/DCommon.h
G3D/Entities.c [moved from G3D/Entities/Entities.c with 100% similarity]
G3D/Entities.h [moved from G3D/Entities/ENTITIES.H with 94% similarity]
G3D/Ge.c
G3D/World/Fog.h
G3D/World/Frustum.h
G3D/World/Light.h
G3D/World/Plane.h
G3D/World/Surface.h
G3D/World/Trace.h
G3D/World/User.h
G3D/World/Vis.h [moved from G3D/World/VIS.H with 96% similarity]
G3D/World/WBitmap.h
G3D/World/World.h
G3D/getypes.h [deleted file]
include/GeTypes.h [moved from include/GETypes.h with 100% similarity]
include/Genesis.h

index 73d87b7..ecceca0 100644 (file)
@@ -25,7 +25,7 @@
 #include "include/BaseType.h"\r
 #include "include/Vec3d.h"\r
 #include "include/XForm3d.h"\r
-#include "include/GETypes.h"\r
+#include "include/GeTypes.h"\r
 \r
 #ifdef __cplusplus\r
 extern "C" {\r
index dcf09d2..30cb47d 100644 (file)
@@ -22,9 +22,9 @@
 #ifndef BITMAPLIST_H\r
 #define BITMAPLIST_H\r
 \r
-#include "GeTypes.h"\r
-#include "DCommon.h"\r
-#include "Bitmap.h"\r
+#include "include/GeTypes.h"\r
+#include "G3D/Engine/Drivers/DCommon.h"\r
+#include "include/Bitmap.h"\r
 \r
 typedef struct BitmapList              BitmapList;\r
 \r
index 459f024..7db6e13 100644 (file)
@@ -29,7 +29,7 @@
 #include "include/XForm3d.h"\r
 #include "include/Vec3d.h"\r
 #include "include/PixelFormat.h"\r
-#include "include/GETypes.h"           // This is a no no\r
+#include "include/GeTypes.h"           // This is a no no\r
 \r
 #ifdef __cplusplus\r
 extern "C" {\r
similarity index 100%
rename from G3D/Entities/Entities.c
rename to G3D/Entities.c
similarity index 94%
rename from G3D/Entities/ENTITIES.H
rename to G3D/Entities.h
index 602a09e..49b2b09 100644 (file)
 #ifndef GE_ENTITIES_H\r
 #define GE_ENTITIES_H\r
 \r
-#include <Assert.h>\r
-#include <Windows.h>\r
-\r
-#include "BaseType.h"\r
-#include "Errorlog.h"\r
-#include "Vec3d.h"\r
-#include "System.h"\r
-#include "World.h"\r
-#include "Ram.h"\r
+#include <assert.h>\r
+#include <windows.h>\r
+\r
+#include "include/BaseType.h"\r
+#include "include/ErrorLog.h"\r
+#include "include/Vec3d.h"\r
+#include "G3D/Engine/System.h"\r
+#include "World/World.h"\r
+#include "include/Ram.h"\r
 \r
 #ifdef __cplusplus\r
 extern "C" {\r
index 9909641..06ed4aa 100644 (file)
--- a/G3D/Ge.c
+++ b/G3D/Ge.c
 //#include "Sound.h"\r
 //#include "Sound3d.h"\r
 \r
-#include "World/World.h"\r
-#include "Surface.h"\r
+#include "G3D/World/World.h"\r
+#include "G3D/World/Surface.h"\r
 //#include "Camera.h"\r
-#include "Light.h"\r
-#include "Plane.h"\r
+#include "G3D/World/Light.h"\r
+#include "G3D/World/Plane.h"\r
 #include "Entities.h"\r
-#include "Trace.h"\r
-#include "User.h"\r
+#include "G3D/World/Trace.h"\r
+#include "G3D/World/User.h"\r
 //#include "Host.h"\r
-#include "Motion.h"\r
-#include "Vis.h"\r
+#include "include/Motion.h"\r
+#include "G3D/World/Vis.h"\r
 \r
 //=====================================================================================\r
 //     local static globals\r
index b76c1fc..6531f02 100644 (file)
 #ifndef GE_FOG_H\r
 #define GE_FOG_H\r
 \r
-#include <Assert.h>\r
+#include <assert.h>\r
 \r
-#include "Vec3d.h"\r
-#include "BaseType.h"\r
-#include "GeTypes.h"\r
-#include "Ram.h"\r
-#include "Errorlog.h"\r
+#include "include/Vec3d.h"\r
+#include "include/BaseType.h"\r
+#include "include/GeTypes.h"\r
+#include "include/Ram.h"\r
+#include "include/ErrorLog.h"\r
 \r
 #ifdef __cplusplus\r
 extern "C" {\r
index 5c15629..aa21648 100644 (file)
 #ifndef GE_FRUSTUM_H\r
 #define GE_FRUSTUM_H\r
 \r
-#include <Assert.h>\r
+#include <assert.h>\r
 //#include <Windows.h>\r
 \r
-#include "BaseType.h"\r
+#include "include/BaseType.h"\r
 #include "GBSPFile.h"\r
-#include "Vec3d.h"\r
-#include "Camera.h"\r
-#include "XForm3d.h"\r
+#include "include/Vec3d.h"\r
+#include "G3D/Camera.h"\r
+#include "include/XForm3d.h"\r
 #include "Surface.h"\r
 \r
 #ifdef __cplusplus\r
index 87a8abc..a18e24a 100644 (file)
 #ifndef GE_LIGHT_H\r
 #define GE_LIGHT_H\r
 \r
-#include <Assert.h>\r
+#include <assert.h>\r
 //#include <Windows.h>\r
 \r
-#include "Genesis.h"\r
-#include "BaseType.h"\r
-#include "System.h"\r
-#include "DCommon.h"\r
+#include "include/Genesis.h"\r
+#include "include/BaseType.h"\r
+#include "G3D/Engine/System.h"\r
+#include "G3D/Engine/Drivers/DCommon.h"\r
 \r
 #ifdef __cplusplus\r
 extern "C" {\r
index 1511f9a..5ade966 100644 (file)
@@ -22,8 +22,8 @@
 #ifndef GE_PLANE_H\r
 #define GE_PLANE_H\r
 \r
-#include <Assert.h>\r
-#include <Windows.h>\r
+#include <assert.h>\r
+#include <windows.h>\r
 \r
 #include "GBSPFile.h"\r
 \r
index c395941..450d19a 100644 (file)
 #ifndef GE_SURFACE_H\r
 #define GE_SURFACE_H\r
 \r
-#include <Assert.h>\r
-#include <Windows.h>\r
+#include <assert.h>\r
+#include <windows.h>\r
 \r
-#include "BaseType.h"\r
-#include "PtrTypes.h"\r
-#include "Vec3d.h"\r
-#include "DCommon.h"\r
+#include "include/BaseType.h"\r
+#include "G3D/PtrTypes.h"\r
+#include "include/Vec3d.h"\r
+#include "G3D/Engine/Drivers/DCommon.h"\r
 \r
 #ifdef __cplusplus\r
 extern "C" {\r
index 3acf577..3a8db35 100644 (file)
 #ifndef GE_TRACE_H\r
 #define GE_TRACE_H\r
 \r
-#include <Assert.h>\r
-#include <Windows.h>\r
+#include <assert.h>\r
+#include <windows.h>\r
 \r
-#include "Genesis.h"\r
-#include "BaseType.h"\r
-#include "Vec3d.h"\r
-#include "World.h"\r
+#include "include/Genesis.h"\r
+#include "include/BaseType.h"\r
+#include "include/Vec3d.h"\r
+#include "World/World.h"\r
 //#include "System.h"\r
 \r
 #ifdef __cplusplus\r
index d13876d..1d13778 100644 (file)
 #ifndef GE_USER_H\r
 #define GE_USER_H\r
 \r
-#include <Assert.h>\r
-#include <Windows.h>\r
-\r
-#include "BaseType.h"\r
-#include "Vec3d.h"\r
-#include "XForm3d.h"\r
-#include "Camera.h"\r
-#include "Genesis.h"\r
+#include <assert.h>\r
+#include <windows.h>\r
+\r
+#include "include/BaseType.h"\r
+#include "include/Vec3d.h"\r
+#include "include/XForm3d.h"\r
+#include "G3D/Camera.h"\r
+#include "include/Genesis.h"\r
 #include "World.h"\r
 #include "Surface.h"\r
 \r
-#include "DCommon.h"\r
+#include "G3D/Engine/Drivers/DCommon.h"\r
 \r
 #ifdef __cplusplus\r
 extern "C" {\r
similarity index 96%
rename from G3D/World/VIS.H
rename to G3D/World/Vis.h
index cadb1d5..e68375a 100644 (file)
@@ -22,8 +22,8 @@
 #ifndef GE_VIS_H\r
 #define GE_VIS_H\r
 \r
-#include "Genesis.h"\r
-#include "BaseType.h"\r
+#include "include/Genesis.h"\r
+#include "include/BaseType.h"\r
 \r
 #include "Frustum.h"\r
 \r
index 727f014..15fd495 100644 (file)
 #ifndef WBITMAP_H\r
 #define WBITMAP_H\r
 \r
-#include <Assert.h>\r
+#include <assert.h>\r
 \r
-#include "BaseType.h"\r
+#include "include/BaseType.h"\r
 #include "GBSPFile.h"\r
-#include "Bitmap.h"\r
+#include "include/Bitmap.h"\r
 \r
 #ifdef __cplusplus\r
 extern "C" {\r
index cffe533..fa49e01 100644 (file)
@@ -33,7 +33,7 @@
 #include "User.h"\r
 #include "Light.h"\r
 \r
-#include "Bitmaplist.h"\r
+#include "G3D/Engine/BitmapList.h"\r
 \r
 #include "include/Actor.h"\r
 \r
diff --git a/G3D/getypes.h b/G3D/getypes.h
deleted file mode 100644 (file)
index b652832..0000000
+++ /dev/null
@@ -1,140 +0,0 @@
-/****************************************************************************************/\r
-/*  GeTypes.h                                                                           */\r
-/*                                                                                      */\r
-/*  Description: Genesis Types (not primitive enough for basetype)                      */\r
-/*                                                                                      */\r
-/*  The contents of this file are subject to the Genesis3D Public License               */\r
-/*  Version 1.01 (the "License"); you may not use this file except in                   */\r
-/*  compliance with the License. You may obtain a copy of the License at                */\r
-/*  http://www.genesis3d.com                                                            */\r
-/*                                                                                      */\r
-/*  Software distributed under the License is distributed on an "AS IS"                 */\r
-/*  basis, WITHOUT WARRANTY OF ANY KIND, either express or implied.  See                */\r
-/*  the License for the specific language governing rights and limitations              */\r
-/*  under the License.                                                                  */\r
-/*                                                                                      */\r
-/*  The Original Code is Genesis3D, released March 25, 1999.                            */\r
-/*  Genesis3D Version 1.1 released November 15, 1999                                 */\r
-/*  Copyright (C) 1999 WildTangent, Inc. All Rights Reserved           */\r
-/*                                                                                      */\r
-/****************************************************************************************/\r
-#ifndef GE_TYPES_H\r
-#define GE_TYPES_H\r
-\r
-#include "BaseType.h"\r
-\r
-\r
-#ifdef __cplusplus\r
-extern "C" {\r
-#endif\r
-\r
-//\r
-//     Collision defines (for geWorld_Collision)\r
-//\r
-#define GE_COLLIDE_MESHES                      (1<<0)\r
-#define GE_COLLIDE_MODELS                      (1<<1)\r
-#define GE_COLLIDE_ACTORS                      (1<<2)\r
-#define GE_COLLIDE_NO_SUB_MODELS       (1<<3)\r
-#define GE_COLLIDE_ALL                         (GE_COLLIDE_MESHES | GE_COLLIDE_MODELS | GE_COLLIDE_ACTORS)\r
-\r
-//\r
-// Actor flags (geWorld_AddActor)\r
-//\r
-#define GE_ACTOR_RENDER_NORMAL                 (1<<0)          // Render in normal views\r
-#define GE_ACTOR_RENDER_MIRRORS                        (1<<1)          // Render in mirror views\r
-#define GE_ACTOR_RENDER_ALWAYS                 (1<<2)          // Render always, skipping all visibility tests\r
-#define GE_ACTOR_COLLIDE                               (1<<3)          // Collide when calling geWorld_Collision\r
-\r
-//MRB BEGIN\r
-//geSprite\r
-//\r
-// Sprite flags (geSprite_AddSprite)\r
-//\r
-#define GE_SPRITE_RENDER_NORMAL                        (1<<0)          // Render in normal views\r
-#define GE_SPRITE_RENDER_MIRRORS               (1<<1)          // Render in mirror views\r
-#define GE_SPRITE_RENDER_ALWAYS                        (1<<2)          // Render always, skipping all visibility tests\r
-#define GE_SPRITE_COLLIDE                                              (1<<3)          // Collide when calling geWorld_Collision\r
-//MRB END\r
-\r
-typedef struct\r
-{\r
-       geBoolean               UseEnvironmentMapping;  //toggle for actor-level environ-map\r
-       geBoolean               Supercede;              //toggle for material-level\r
-       geFloat                 PercentEnvironment;\r
-       geFloat                 PercentMaterial;                //Used when Supercede == GE_FALSE\r
-       geFloat                 PercentPuppet;\r
-} geEnvironmentOptions;\r
-\r
-//\r
-//     Model flags (geWorld_ModelSetFlags)\r
-//\r
-#define GE_MODEL_RENDER_NORMAL                 (1<<0)          // Render in normal views\r
-#define GE_MODEL_RENDER_MIRRORS                        (1<<1)          // Render in mirror views\r
-#define GE_MODEL_RENDER_ALWAYS                 (1<<2)          // Render always, skipping all visibility tests\r
-#define GE_MODEL_COLLIDE                               (1<<3)          // Collide when calling geWorld_Collision\r
-\r
-//MRB BEGIN\r
-typedef struct\r
-{\r
-       geFloat                         r, g, b;\r
-} geColor;\r
-\r
-typedef struct\r
-{\r
-       geFloat                         u, v;\r
-} geUV;\r
-//MRB END\r
-\r
-typedef struct\r
-{\r
-       geFloat r, g, b, a;\r
-} GE_RGBA;\r
-\r
-typedef struct\r
-{\r
-       int32   Left;\r
-       int32   Right;\r
-       int32   Top;\r
-       int32   Bottom;\r
-} GE_Rect;\r
-\r
-typedef struct\r
-{\r
-       geFloat MinX,MaxX;\r
-       geFloat MinY,MaxY;\r
-} geFloatRect;\r
-\r
-//MRB BEGIN\r
-typedef struct\r
-{\r
-       geFloat X;\r
-       geFloat Y;\r
-} geCoordinate;\r
-//MRB END\r
-\r
-// Lit vertex\r
-typedef struct\r
-{\r
-       // FIXME:  Convert 3d X,Y,Z to geVec3d\r
-       geFloat X, Y, Z;                                                                        // 3d vertex\r
-       geFloat u, v;                                                                           // Uv's\r
-       // FIXME:  Convert r,g,b,a to GE_RGBA\r
-       geFloat r, g, b, a;                                                             // color\r
-} GE_LVertex;\r
-\r
-// Transformed Lit vertex\r
-typedef struct\r
-{\r
-       geFloat x, y, z;                                                                        // screen points\r
-       geFloat u, v;                                                                           // Uv's\r
-       geFloat r, g, b, a;                                                             // color\r
-} GE_TLVertex;\r
-\r
-typedef GE_Rect geRect;\r
-\r
-#ifdef __cplusplus\r
-}\r
-#endif\r
-\r
-\r
-#endif GETYPES_H\r
similarity index 100%
rename from include/GETypes.h
rename to include/GeTypes.h
index 1aa48ad..be317bd 100644 (file)
@@ -24,7 +24,7 @@
 #include "BaseType.h"\r
 #include "Vec3d.h"\r
 #include "XForm3d.h"\r
-#include "GETypes.h"\r
+#include "GeTypes.h"\r
 #include "ExtBox.h"\r
 #include "VFile.h"\r
 #include "Bitmap.h"\r