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