- had to move the include to the G3D directory to start killing the duplicates and...

- removed some duplicated
- GBSPLib compiles again with the changed includes

diff --git a/include/Actor.h b/G3D/Actor.h
similarity index 100%
rename from include/Actor.h
rename to G3D/Actor.h

diff --git a/include/BaseType.h b/G3D/BaseType.h
similarity index 100%
rename from include/BaseType.h
rename to G3D/BaseType.h

diff --git a/G3D/Basetype.h b/G3D/Basetype.h
deleted file mode 100644 (file)
index d219f53..0000000
--- a/G3D/Basetype.h
+++ /dev/null
@@ -1,85 +0,0 @@
-/****************************************************************************************/\r
-/*  BASETYPE.H                                                                          */\r
-/*                                                                                      */\r
-/*  Author:                                                                             */\r
-/*  Description: Basic type definitions and calling convention defines                  */\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_BASETYPE_H\r
-#define GE_BASETYPE_H\r
- \r
-#ifdef __cplusplus\r
-extern "C" {\r
-#endif\r
-\r
-/******** The Genesis Calling Conventions ***********/ \r
-\r
-#define        GENESISCC       _fastcall\r
-\r
-#if    defined(BUILDGENESIS) && defined(GENESISDLLVERSION)\r
-  #define GENESISAPI   _declspec(dllexport)\r
-#else\r
-  #if  defined(GENESISDLLVERSION)\r
-    #define GENESISAPI _declspec(dllimport)\r
-  #else\r
-    #define GENESISAPI\r
-  #endif\r
-#endif\r
-\r
-/******** The Basic Types ****************************/\r
-\r
-typedef signed int geBoolean;\r
-#define GE_FALSE       (0)\r
-#define GE_TRUE                (1)\r
-\r
-typedef float geFloat;\r
-typedef double geDouble;\r
-\r
-#ifndef NULL\r
-/* #define NULL        ((void *)0) */\r
-#define NULL 0\r
-#endif\r
-\r
-typedef signed long     int32;\r
-typedef signed short    int16;\r
-typedef signed char     int8 ;\r
-typedef unsigned long  uint32;\r
-typedef unsigned short uint16;\r
-typedef unsigned char  uint8 ;\r
-\r
-/******** Macros on Genesis basic types *************/\r
-\r
-#define GE_ABS(x)                              ( (x) < 0 ? (-(x)) : (x) )\r
-#define GE_CLAMP(x,lo,hi)              ( (x) < (lo) ? (lo) : ( (x) > (hi) ? (hi) : (x) ) )\r
-#define GE_CLAMP8(x)                   GE_CLAMP(x,0,255)\r
-#define GE_CLAMP16(x)                  GE_CLAMP(x,0,65536)\r
-#define GE_BOOLSAME(x,y)               ( ( (x) && (y) ) || ( !(x) && !(y) ) )\r
-\r
-#define GE_EPSILON                             ((geFloat)0.000797f)\r
-#define GE_FLOATS_EQUAL(x,y)   ( GE_ABS((x) - (y)) < GE_EPSILON )\r
-#define GE_FLOAT_ISZERO(x)             GE_FLOATS_EQUAL(x,0.0f)\r
-\r
-#define        GE_PI                                   ((geFloat)3.14159265358979323846f)\r
-\r
-/****************************************************/\r
-\r
-#ifdef __cplusplus\r
-}\r
-#endif\r
-\r
-#endif\r
- \r

diff --git a/include/Bitmap.h b/G3D/Bitmap.h
similarity index 100%
rename from include/Bitmap.h
rename to G3D/Bitmap.h

diff --git a/G3D/Bitmap/pixelformat.c b/G3D/Bitmap/PixelFormat.c
similarity index 100%
rename from G3D/Bitmap/pixelformat.c
rename to G3D/Bitmap/PixelFormat.c

diff --git a/G3D/Bitmap/pixelformat.h b/G3D/Bitmap/PixelFormat.h
similarity index 100%
rename from G3D/Bitmap/pixelformat.h
rename to G3D/Bitmap/PixelFormat.h

diff --git a/include/Body.h b/G3D/Body.h
similarity index 100%
rename from include/Body.h
rename to G3D/Body.h

diff --git a/G3D/CMakeLists.txt b/G3D/CMakeLists.txt
index e691fc2..b89e02c 100644 (file)
--- a/G3D/CMakeLists.txt
+++ b/G3D/CMakeLists.txt
@@ -1 +1 @@
-ADD_LIBRARY             (Genesis3D STATIC CSNetMgr.c Camera.c Ge.c)
+ADD_LIBRARY             (Genesis3D STATIC CSNetMgr.c)

diff --git a/G3D/CSNetMgr.c b/G3D/CSNetMgr.c
index af06974..58e8717 100644 (file)
--- a/G3D/CSNetMgr.c
+++ b/G3D/CSNetMgr.c
@@ -19,20 +19,18 @@
 /*  Copyright (C) 1999 WildTangent, Inc. All Rights Reserved           */\r
 /*                                                                                      */\r
 /****************************************************************************************/\r
-#include <assert.h>\r
 \r
-//#define INITGUID\r
 #include <windows.h>\r
+#include <initguid.h>\r
 #include <objbase.h>\r
+#include <assert.h>\r
 \r
 #include "CSNetMgr.h"\r
 #include "NetPlay.h"\r
 \r
-#include "include/BaseType.h"\r
-#include "include/Ram.h"\r
-#include "include/ErrorLog.h"\r
-\r
-#include <initguid.h>\r
+#include "BaseType.h"\r
+#include "Ram.h"\r
+#include "ErrorLog.h"\r
 \r
 #pragma message(" some assertions in here would be nice:")\r
 \r

diff --git a/G3D/CSNetMgr.h b/G3D/CSNetMgr.h
index 9a7a668..d2801c6 100644 (file)
--- a/G3D/CSNetMgr.h
+++ b/G3D/CSNetMgr.h
@@ -22,7 +22,7 @@
 #ifndef GE_CSNETMGR_H\r
 #define GE_CSNETMGR_H\r
 \r
-#include "include/BaseType.h"\r
+#include "BaseType.h"\r
 \r
 #ifdef __cplusplus\r
 extern "C" {\r

diff --git a/G3D/drawbbox.c b/G3D/DrawBBox.c
similarity index 100%
rename from G3D/drawbbox.c
rename to G3D/DrawBBox.c

diff --git a/G3D/Engine/Drivers/DCommon.h b/G3D/Engine/Drivers/DCommon.h
index 7db6e13..c4e9ef8 100644 (file)
--- a/G3D/Engine/Drivers/DCommon.h
+++ b/G3D/Engine/Drivers/DCommon.h
@@ -26,10 +26,10 @@
 // If you include Windows it MUST be before dcommon!\r
 \r
 // FIXME:  What should we do with these?\r
-#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 "G3D/XForm3d.h"\r
+#include "G3D/Vec3d.h"\r
+#include "G3D/PixelFormat.h"\r
+#include "G3D/GeTypes.h"               // This is a no no\r
 \r
 #ifdef __cplusplus\r
 extern "C" {\r

diff --git a/G3D/Engine/engine.c b/G3D/Engine/Engine.c
similarity index 100%
rename from G3D/Engine/engine.c
rename to G3D/Engine/Engine.c

diff --git a/G3D/Engine/engine.h b/G3D/Engine/Engine.h
similarity index 96%
rename from G3D/Engine/engine.h
rename to G3D/Engine/Engine.h
index b70601b..77d8fd5 100644 (file)
--- a/G3D/Engine/engine.h
+++ b/G3D/Engine/Engine.h
@@ -23,10 +23,10 @@
 #ifndef GE_ENGINE_H\r
 #define GE_ENGINE_H\r
 \r
-#include "Genesis.h"\r
+#include "include/Genesis.h"\r
 #include "System.h"\r
-#include "world.h"\r
-#include "bitmap.h"\r
+#include "G3D/World/World.h"\r
+#include "include/Bitmap.h"\r
 #include "BitmapList.h"\r
 \r
 #ifdef __cplusplus\r

diff --git a/G3D/Engine/fontbmp.c b/G3D/Engine/FontBmp.c
similarity index 100%
rename from G3D/Engine/fontbmp.c
rename to G3D/Engine/FontBmp.c

diff --git a/G3D/Engine/genesis3d.c b/G3D/Engine/Genesis3d.c
similarity index 100%
rename from G3D/Engine/genesis3d.c
rename to G3D/Engine/Genesis3d.c

diff --git a/G3D/Entities.c b/G3D/Entities.c
index 5ffb034..ef4a32b 100644 (file)
--- a/G3D/Entities.c
+++ b/G3D/Entities.c
@@ -19,18 +19,18 @@
 /*  Copyright (C) 1999 WildTangent, Inc. All Rights Reserved           */\r
 /*                                                                                      */\r
 /****************************************************************************************/\r
-#include <Windows.h>\r
-#include <Assert.h>\r
+#include <windows.h>\r
+#include <assert.h>\r
 \r
 #include "Entities.h"\r
-#include "BaseType.h"\r
-#include "Errorlog.h"\r
-#include "Vec3d.h"\r
-#include "Ram.h"\r
+#include "include/BaseType.h"\r
+#include "include/ErrorLog.h"\r
+#include "include/Vec3d.h"\r
+#include "include/Ram.h"\r
 \r
 // These are temporary until we find a better way to get models pointers into the entity stuff\r
-#include "World.h"\r
-#include "GBSPFile.h"\r
+#include "G3D/World/World.h"\r
+#include "G3D/World/GBSPFile.h"\r
 \r
 \r
 //=====================================================================================\r

diff --git a/include/ErrorLog.h b/G3D/ErrorLog.h
similarity index 100%
rename from include/ErrorLog.h
rename to G3D/ErrorLog.h

diff --git a/include/ExtBox.h b/G3D/ExtBox.h
similarity index 100%
rename from include/ExtBox.h
rename to G3D/ExtBox.h

diff --git a/include/font.H b/G3D/Font.h
similarity index 100%
rename from include/font.H
rename to G3D/Font.h

diff --git a/include/GeTypes.h b/G3D/GeTypes.h
similarity index 100%
rename from include/GeTypes.h
rename to G3D/GeTypes.h

diff --git a/include/Genesis.h b/G3D/Genesis.h
similarity index 100%
rename from include/Genesis.h
rename to G3D/Genesis.h

diff --git a/G3D/genesis.rc b/G3D/Genesis.rc
similarity index 100%
rename from G3D/genesis.rc
rename to G3D/Genesis.rc

diff --git a/G3D/list.c b/G3D/List.c
similarity index 100%
rename from G3D/list.c
rename to G3D/List.c

diff --git a/G3D/list.h b/G3D/List.h
similarity index 100%
rename from G3D/list.h
rename to G3D/List.h

diff --git a/include/matrix33.h b/G3D/Matrix33.h
similarity index 100%
rename from include/matrix33.h
rename to G3D/Matrix33.h

diff --git a/include/Motion.h b/G3D/Motion.h
similarity index 100%
rename from include/Motion.h
rename to G3D/Motion.h

diff --git a/G3D/NetPlay.c b/G3D/NetPlay.c
index b3a9a35..85eeed2 100644 (file)
--- a/G3D/NetPlay.c
+++ b/G3D/NetPlay.c
@@ -21,15 +21,15 @@
 /****************************************************************************************/\r
 #define IDIRECTPLAY2_OR_GREATER\r
 \r
-#include <Windows.H>\r
-#include <Assert.h>\r
+#include <windows.h>\r
+#include <assert.h>\r
 \r
 #include <dplay.h>\r
 #include <dplobby.h>\r
-#include <Stdio.h>\r
+#include <stdio.h>\r
 \r
-#include "netplay.h"\r
-#include "ErrorLog.h"\r
+#include "NetPlay.h"\r
+#include "include/ErrorLog.h"\r
 \r
 //#define INIT_GUID\r
 \r
@@ -79,7 +79,7 @@ BOOL FAR PASCAL DPEnumConnectionsCallback(
                                                DWORD                   dwFlags,\r
                                                LPVOID                  lpContext);\r
 \r
-static void DoDPError(HRESULT Hr);\r
+//static void DoDPError(HRESULT Hr);\r
 \r
 FILE *DebugF;\r
 \r
@@ -644,7 +644,7 @@ FAILURE:
 //====================================================================================================\r
 //     DoDPError\r
 //====================================================================================================\r
-static void DoDPError(HRESULT Hr)\r
+void DoDPError(HRESULT Hr)\r
 {\r
        switch (Hr)\r
        {\r

diff --git a/G3D/NetPlay.h b/G3D/NetPlay.h
index 0e42300..5d058d8 100644 (file)
--- a/G3D/NetPlay.h
+++ b/G3D/NetPlay.h
@@ -25,7 +25,7 @@
 #include <windows.h>\r
 #include <dplay.h>\r
 \r
-#include "include/BaseType.h"\r
+#include "BaseType.h"\r
 \r
 #ifdef __cplusplus\r
 extern "C" {\r
@@ -55,7 +55,7 @@ extern        SP_DESC                                 GlobalSP;                       // Global info about the sp
 extern  SESSION_DESC*                  GlobalSession;          // Global sessions availible\r
 extern LPGUID                                  glpGuid;\r
                                                                                                        \r
-void DoDPError(HRESULT Hr);\r
+static void DoDPError(HRESULT Hr);\r
 BOOL InitNetPlay(LPGUID lpGuid);\r
 BOOL NetPlayEnumSession(LPSTR IPAdress, SESSION_DESC** SessionList, DWORD* SessionNum);\r
 BOOL NetPlayJoinSession(SESSION_DESC* SessionList);\r

diff --git a/include/Path.h b/G3D/Path.h
similarity index 100%
rename from include/Path.h
rename to G3D/Path.h

diff --git a/include/PhysicsJoint.h b/G3D/PhysicsJoint.h
similarity index 100%
rename from include/PhysicsJoint.h
rename to G3D/PhysicsJoint.h

diff --git a/include/PhysicsObject.h b/G3D/PhysicsObject.h
similarity index 100%
rename from include/PhysicsObject.h
rename to G3D/PhysicsObject.h

diff --git a/include/PhysicsSystem.h b/G3D/PhysicsSystem.h
similarity index 100%
rename from include/PhysicsSystem.h
rename to G3D/PhysicsSystem.h

diff --git a/include/PixelFormat.h b/G3D/PixelFormat.h
similarity index 100%
rename from include/PixelFormat.h
rename to G3D/PixelFormat.h

diff --git a/include/Quatern.h b/G3D/Quatern.h
similarity index 100%
rename from include/Quatern.h
rename to G3D/Quatern.h

diff --git a/include/Ram.h b/G3D/Ram.h
similarity index 100%
rename from include/Ram.h
rename to G3D/Ram.h

diff --git a/G3D/resource.h b/G3D/Resource.h
similarity index 100%
rename from G3D/resource.h
rename to G3D/Resource.h

diff --git a/G3D/Sound.c b/G3D/Sound.c
index 58beb4f..040b4ae 100644 (file)
--- a/G3D/Sound.c
+++ b/G3D/Sound.c
@@ -24,11 +24,11 @@
 #include       <stdio.h>\r
 #include       <assert.h>\r
 \r
-#include       "BaseType.h"\r
-#include       "ErrorLog.h"\r
-#include       "VFile.h"\r
+#include       "include/BaseType.h"\r
+#include       "include/ErrorLog.h"\r
+#include       "include/VFile.h"\r
 #include       "Sound.h"\r
-#include       "Ram.h"\r
+#include       "include/Ram.h"\r
 \r
 typedef struct SoundManager    SoundManager;\r
 typedef struct  Channel                        Channel;\r

diff --git a/G3D/Sound3d.c b/G3D/Sound3d.c
index 61e16e7..bae9ca9 100644 (file)
--- a/G3D/Sound3d.c
+++ b/G3D/Sound3d.c
@@ -21,9 +21,9 @@
 /****************************************************************************************/\r
 #include <math.h>\r
 \r
-#include "Trace.h"\r
-#include "Vec3d.h"\r
-#include "XForm3d.h"\r
+#include "G3D/World/Trace.h"\r
+#include "incldue/Vec3d.h"\r
+#include "include/XForm3d.h"\r
 #include "Camera.h"\r
 #include "Sound3d.h"\r
 \r

diff --git a/G3D/sprite.c b/G3D/Sprite.c
similarity index 100%
rename from G3D/sprite.c
rename to G3D/Sprite.c

diff --git a/include/Sprite.h b/G3D/Sprite.h
similarity index 100%
rename from include/Sprite.h
rename to G3D/Sprite.h

diff --git a/G3D/Tclip.c b/G3D/TClip.c
similarity index 96%
rename from G3D/Tclip.c
rename to G3D/TClip.c
index 1dc7816..c9eff9f 100644 (file)
--- a/G3D/Tclip.c
+++ b/G3D/TClip.c
@@ -68,7 +68,7 @@ TClip_Rasterize      : 0.006183 : 1.$ %
 #include <string.h>\r
 \r
 #include "TClip.h"\r
-#include "engine.h"\r
+#include "G3D/Engine/Engine.h"\r
 #include "bitmap._h"\r
 \r
 #include "list.h"\r

diff --git a/G3D/tclip.h b/G3D/TClip.h
similarity index 93%
rename from G3D/tclip.h
rename to G3D/TClip.h
index 231028c..5fa8819 100644 (file)
--- a/G3D/tclip.h
+++ b/G3D/TClip.h
@@ -22,10 +22,10 @@
 #ifndef GE_TCLIP_H\r
 #define GE_TCLIP_H\r
 \r
-#include "basetype.h"\r
-#include "getypes.h"\r
-#include "bitmap.h"\r
-#include "engine.h"\r
+#include "include/BaseType.h"\r
+#include "include/GeTypes.h"\r
+#include "include/Bitmap.h"\r
+#include "G3D/Engine/Engine.h"\r
 \r
 #ifdef __cplusplus\r
 extern "C" {\r

diff --git a/G3D/tsc.c b/G3D/TSC.c
similarity index 100%
rename from G3D/tsc.c
rename to G3D/TSC.c

diff --git a/G3D/tsc.h b/G3D/TSC.h
similarity index 100%
rename from G3D/tsc.h
rename to G3D/TSC.h

diff --git a/G3D/timer.c b/G3D/Timer.c
similarity index 100%
rename from G3D/timer.c
rename to G3D/Timer.c

diff --git a/G3D/timer.h b/G3D/Timer.h
similarity index 100%
rename from G3D/timer.h
rename to G3D/Timer.h

diff --git a/include/VFile.h b/G3D/VFile.h
similarity index 100%
rename from include/VFile.h
rename to G3D/VFile.h

diff --git a/include/Vec3d.h b/G3D/Vec3d.h
similarity index 100%
rename from include/Vec3d.h
rename to G3D/Vec3d.h

diff --git a/include/XForm3d.h b/G3D/XForm3d.h
similarity index 100%
rename from include/XForm3d.h
rename to G3D/XForm3d.h

diff --git a/G3D/sprite.h b/G3D/sprite.h
deleted file mode 100644 (file)
index 66b6002..0000000
--- a/G3D/sprite.h
+++ /dev/null
@@ -1,210 +0,0 @@
-/****************************************************************************************/\r
-/*  SPRITE.H                                                                            */\r
-/*                                                                                      */\r
-/*  Author: Michael R. Brumm                                                             */\r
-/*  Description:  Sprite interface                                                               */\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
-/****************************************************************************************/\r
-\r
-\r
-#ifndef GE_SPRITE_H\r
-#define GE_SPRITE_H\r
-\r
-#include "genesis.h"                           \r
-#include "basetype.h"\r
-#include "extbox.h"\r
-#include "bitmap.h"\r
-\r
-#ifdef GE_WORLD_H\r
-#include "camera.h"\r
-#include "Frustum.h"\r
-#endif\r
-\r
-#ifdef __cplusplus\r
-extern "C" {\r
-#endif\r
-\r
-// GENESIS_PUBLIC_APIS\r
-\r
-typedef struct geSprite geSprite;                      // an instance of a sprite\r
-\r
-\r
-//---------------------------------------------------------------------------------\r
-//   Creation/Destruction functions\r
-//---------------------------------------------------------------------------------\r
-\r
-       // create a sprite instance associated with the given bitmaps as faces\r
-       // pass in a NULL bitmap for a gouraud face\r
-       // backface bitmap can be the same as the front face bitmap\r
-GENESISAPI geSprite *GENESISCC geSprite_Create(geBitmap *SpriteBitmap, geBitmap *SpriteBackfaceBitmap);\r
-\r
-       // create an additional reference (owner) for the sprite\r
-GENESISAPI void GENESISCC geSprite_CreateRef(geSprite *Sprite);\r
-\r
-       // destroy a sprite\r
-GENESISAPI void GENESISCC geSprite_Destroy(geSprite **pS);\r
-\r
-       // returns number of sprites that are currently created\r
-GENESISAPI int32 GENESISCC geSprite_GetCount();\r
-\r
-       // checks to see if a sprite is valid or not\r
-GENESISAPI geBoolean GENESISCC geSprite_IsValid(const geSprite *S);\r
-\r
-//---------------------------------------------------------------------------------\r
-//   Queries \r
-//---------------------------------------------------------------------------------\r
-       // In general: Objects retuned from Get functions should not not be destroyed. \r
-       // if ownership is desired, call the objects _CreateRef() function to create another owner. \r
-       // (An 'owner' has access to the object regardless of the number of other owners, and \r
-       // an owner must call the object's _Destroy() function to relinquish ownership )\r
-\r
-       // Returns the Bitmap associated with the sprite's front face\r
-GENESISAPI geBitmap *GENESISCC geSprite_GetBitmap(const geSprite *S);\r
-\r
-       // Returns the Bitmap associated with the sprite's backface\r
-GENESISAPI geBitmap *GENESISCC geSprite_GetBackfaceBitmap(const geSprite *S);\r
-\r
-       // Gets backface parameters\r
-GENESISAPI void GENESISCC geSprite_GetBackface(const geSprite *S, geBoolean *Enabled, geBoolean *MirrorImage);\r
-\r
-       // Sets the backface parameters\r
-GENESISAPI void GENESISCC geSprite_SetBackface(geSprite *S, const geBoolean Enabled, const geBoolean MirrorImage);\r
-\r
-       // Gets whether the sprite always faces the camera\r
-GENESISAPI void GENESISCC geSprite_GetFaceCamera(const geSprite *S, geBoolean *Enabled);\r
-\r
-       // Sets whether the sprite always faces the camera\r
-GENESISAPI void GENESISCC geSprite_SetFaceCamera(geSprite *S, geBoolean Enabled);\r
-\r
-       // Gets the position of the sprite\r
-GENESISAPI void GENESISCC geSprite_GetPosition(const geSprite *S, geVec3d *Pos);\r
-\r
-       // Sets the position of the sprite\r
-       //\r
-       // For easy modification of the sprite position if the sprite always faces the camera\r
-GENESISAPI void GENESISCC geSprite_SetPosition(geSprite *S, const geVec3d *Pos);\r
-\r
-       // Gets the current transform for the sprite\r
-GENESISAPI void GENESISCC geSprite_GetTransform(const geSprite *S, geXForm3d *Transform);\r
-\r
-       // Sets the current transform for the sprite\r
-       //\r
-       // Rotation information is ignored if the sprite always faces the camera\r
-GENESISAPI void GENESISCC geSprite_SetTransform(geSprite *S, const geXForm3d *Transform);\r
-\r
-       // Gets the internal transform for the sprite\r
-GENESISAPI void GENESISCC geSprite_GetInternalTransform(const geSprite *S, geXForm3d *Transform);\r
-\r
-       // Sets the internal transform for the sprite\r
-       //\r
-       // Allows the sprite to be rendered offset from its main transform. For example,\r
-       // translation could make the bottom of the sprite its center of rotation.\r
-       //\r
-       // This is totally ignored if the sprite always faces the camera\r
-GENESISAPI void GENESISCC geSprite_SetInternalTransform(geSprite *S, const geXForm3d *Transform);\r
-\r
-       // Gets the scale of the sprite (width and height)\r
-GENESISAPI void GENESISCC geSprite_GetScale(const geSprite *S, geFloat *ScaleX, geFloat *ScaleY);\r
-\r
-       // Sets the scale of the sprite (width and height)\r
-GENESISAPI void GENESISCC geSprite_SetScale(geSprite *S, geFloat ScaleX, geFloat ScaleY);\r
-\r
-       // Gets an assigned general non changing bounding box from the sprite\r
-GENESISAPI void GENESISCC geSprite_GetExtBox(const geSprite *S, geExtBox *ExtBox);\r
-\r
-       // Gets the bounding box in non-world coordinates\r
-       // Whatever you put in with geSprite_SetExtBox, you get out with this function\r
-GENESISAPI void GENESISCC geSprite_GetNonWorldExtBox(const geSprite *S, geExtBox *ExtBox);\r
-\r
-       // Sets an assigned general non changing bounding box from the sprite\r
-GENESISAPI void GENESISCC geSprite_SetExtBox(geSprite *S, const geExtBox *ExtBox);\r
-\r
-       // Gets the texture parameters for the sprite\r
-GENESISAPI void GENESISCC geSprite_GetTextureParameters(const geSprite *S,\r
-                                                                       geFloat *OffsetX,\r
-                                                                       geFloat *OffsetY,\r
-                                                                       geFloat *ScaleX,\r
-                                                                       geFloat *ScaleY\r
-                                                                       );\r
-\r
-       // Sets the texture parameters for the sprite\r
-GENESISAPI void GENESISCC geSprite_SetTextureParameters(geSprite *S,\r
-                                                                       geFloat OffsetX,\r
-                                                                       geFloat OffsetY,\r
-                                                                       geFloat ScaleX,\r
-                                                                       geFloat ScaleY\r
-                                                                       );\r
-\r
-       // Gets the lighting options for the sprite\r
-GENESISAPI void GENESISCC geSprite_GetLightingOptions(const geSprite *S,\r
-                                                                       geFloat *AmbientLightRed,                       // 0 .. 255\r
-                                                                       geFloat *AmbientLightGreen,                     // 0 .. 255\r
-                                                                       geFloat *AmbientLightBlue,                      // 0 .. 255\r
-                                                                       geBoolean *UseFillLight,                        // GE_TRUE or GE_FALSE\r
-                                                                       geVec3d *FillLightNormal,                       // normalized vector\r
-                                                                       geFloat *FillLightRed,                          // 0 .. 255\r
-                                                                       geFloat *FillLightGreen,                        // 0 .. 255\r
-                                                                       geFloat *FillLightBlue,                         // 0 .. 255\r
-                                                                       geBoolean *UseLightFromFloor,// GE_TRUE or GE_FALSE\r
-                                                                       int32 *MaximumDynamicLightsToUse\r
-                                                                       );\r
-\r
-       // Sets the lighting options for the sprite\r
-GENESISAPI void GENESISCC geSprite_SetLightingOptions(geSprite *S,\r
-                                                                       geFloat AmbientLightRed,                        // 0 .. 255\r
-                                                                       geFloat AmbientLightGreen,                      // 0 .. 255\r
-                                                                       geFloat AmbientLightBlue,                       // 0 .. 255\r
-                                                                       geBoolean UseFillLight,                         // GE_TRUE or GE_FALSE\r
-                                                                       const geVec3d *FillLightNormal,         // normalized vector\r
-                                                                       geFloat FillLightRed,                           // 0 .. 255\r
-                                                                       geFloat FillLightGreen,                         // 0 .. 255\r
-                                                                       geFloat FillLightBlue,                          // 0 .. 255\r
-                                                                       geBoolean UseLightFromFloor,    // GE_TRUE or GE_FALSE\r
-                                                                       int32 MaximumDynamicLightsToUse         // 0 for none\r
-                                                                       );                      \r
-\r
-       // Gets the alpha transparency of the sprite\r
-GENESISAPI void GENESISCC geSprite_GetAlpha(const geSprite *S, geFloat *Alpha, geFloat *BackfaceAlpha);\r
-\r
-       // Sets the alpha transparency of the sprite\r
-GENESISAPI void GENESISCC geSprite_SetAlpha(geSprite *S, geFloat Alpha, geFloat BackfaceAlpha);\r
-\r
-       // Returns the pointer which was set with geSprite_SetUserData. NULL if not set.\r
-GENESISAPI void *GENESISCC geSprite_GetUserData(const geSprite *S);\r
-\r
-       // Sets the sprites user data pointer to the given value. For clients only.\r
-GENESISAPI void GENESISCC geSprite_SetUserData(geSprite *S, void *UserData);\r
-\r
-\r
-//--------------------------------------------------------------------------------\r
-//   Rendering\r
-//--------------------------------------------------------------------------------\r
-\r
-// GENESIS_PRIVATE_APIS\r
-\r
-#ifdef GE_WORLD_H\r
-       // Prepares the geSprite for rendering and posing.  Call Once once the sprite is fully created.\r
-       // Must be called prior to render/pose/setworldtransform \r
-geBoolean GENESISCC geSprite_RenderPrep( geSprite *A, geWorld *World);\r
-\r
-       // Draws the geSprite.  (RenderPrep must be called first)\r
-geBoolean GENESISCC geSprite_RenderThroughFrustum(geSprite *S, geEngine *Engine, geWorld *World, geCamera *Camera, Frustum_Info *FInfo);\r
-#endif\r
-\r
-\r
-#ifdef __cplusplus\r
-}\r
-#endif\r
-\r
-\r
-#endif\r

diff --git a/GBSPLib/BSP.cpp b/GBSPLib/BSP.cpp
index c155625..434a3d1 100644 (file)
--- a/GBSPLib/BSP.cpp
+++ b/GBSPLib/BSP.cpp
@@ -36,7 +36,7 @@
 #include "Light.h"\r
 #include "GBSPFile.h"\r
 \r
-#include "include/Ram.h"\r
+#include "G3D/Ram.h"\r
 \r
 // Globals\r
 GBSP_Model     BSPModels[MAX_BSP_MODELS];\r

diff --git a/GBSPLib/BSP2.cpp b/GBSPLib/BSP2.cpp
index 70ac2da..248f3db 100644 (file)
--- a/GBSPLib/BSP2.cpp
+++ b/GBSPLib/BSP2.cpp
@@ -33,8 +33,8 @@
 #include "Fill.h"\r
 #include "Brush2.h"\r
 \r
-#include "include/Vec3d.h"\r
-#include "include/Ram.h"\r
+#include "G3D/Vec3d.h"\r
+#include "G3D/Ram.h"\r
 \r
 #define USE_VOLUMES\r
 \r

diff --git a/GBSPLib/Brush2.cpp b/GBSPLib/Brush2.cpp
index f7465a2..daecb94 100644 (file)
--- a/GBSPLib/Brush2.cpp
+++ b/GBSPLib/Brush2.cpp
@@ -28,9 +28,9 @@
 #include "BSP.h"\r
 #include "Texture.h"\r
 \r
-#include "include/VFile.h"\r
-#include "include/Vec3d.h"\r
-#include "include/Ram.h"\r
+#include "G3D/VFile.h"\r
+#include "G3D/Vec3d.h"\r
+#include "G3D/Ram.h"\r
 \r
 #define BSP_BRUSH_SIZE(s) ((sizeof(GBSP_Brush)-sizeof(GBSP_Side[NUM_BRUSH_DEFAULT_SIDES]))+(sizeof(GBSP_Side)*(s)));\r
 #define MAP_BRUSH_SIZE(s) ((sizeof(MAP_Brush)-sizeof(GBSP_Side[NUM_BRUSH_DEFAULT_SIDES]))+(sizeof(GBSP_Side)*(s)));\r

diff --git a/GBSPLib/Brush2.h b/GBSPLib/Brush2.h
index 85846b9..b3b33de 100644 (file)
--- a/GBSPLib/Brush2.h
+++ b/GBSPLib/Brush2.h
@@ -27,8 +27,8 @@
 #include "MathLib.h"\r
 #include "Map.h"\r
 \r
-#include "include/VFile.h"\r
-#include "include/Vec3d.h"\r
+#include "G3D/VFile.h"\r
+#include "G3D/Vec3d.h"\r
 \r
 #define        NUM_BRUSH_DEFAULT_SIDES         6\r
 \r

diff --git a/GBSPLib/GBSPFile.cpp b/GBSPLib/GBSPFile.cpp
index 25f46fc..a2e15de 100644 (file)
--- a/GBSPLib/GBSPFile.cpp
+++ b/GBSPLib/GBSPFile.cpp
@@ -24,8 +24,8 @@
 \r
 #include "G3D/Engine/Drivers/DCommon.h"\r
 #include "GBSPFile.h"\r
-#include "include/VFile.h"\r
-#include "include/Ram.h"\r
+#include "G3D/VFile.h"\r
+#include "G3D/Ram.h"\r
 \r
 //========================================================================================\r
 //     Globals\r

diff --git a/GBSPLib/GBSPFile.h b/GBSPLib/GBSPFile.h
index 186549c..7559a92 100644 (file)
--- a/GBSPLib/GBSPFile.h
+++ b/GBSPLib/GBSPFile.h
@@ -27,9 +27,9 @@
 \r
 #include "G3D/Engine/Drivers/DCommon.h"\r
 #include "MathLib.h"\r
-#include "include/VFile.h"\r
-#include "include/Motion.h"\r
-#include "include/Vec3d.h"\r
+#include "G3D/VFile.h"\r
+#include "G3D/Motion.h"\r
+#include "G3D/Vec3d.h"\r
 \r
 #define GBSP_VERSION                           15\r
 \r

diff --git a/GBSPLib/GBSPLib.h b/GBSPLib/GBSPLib.h
index 9a91564..1240eb2 100644 (file)
--- a/GBSPLib/GBSPLib.h
+++ b/GBSPLib/GBSPLib.h
@@ -26,7 +26,7 @@
 \r
 #include "MathLib.h"\r
 \r
-#include "include/Vec3d.h"\r
+#include "G3D/Vec3d.h"\r
 \r
 #define GBSP_VERSION_MAJOR     6\r
 #define GBSP_VERSION_MINOR     0\r

diff --git a/GBSPLib/GBSPPrep.cpp b/GBSPLib/GBSPPrep.cpp
index 2158fc6..1a73ffb 100644 (file)
--- a/GBSPLib/GBSPPrep.cpp
+++ b/GBSPLib/GBSPPrep.cpp
@@ -32,8 +32,8 @@
 #include "Portals.h"\r
 #include "Leaf.h"\r
 \r
-#include "include/VFile.h"\r
-#include "include/Ram.h"\r
+#include "G3D/VFile.h"\r
+#include "G3D/Ram.h"\r
 \r
 geBoolean      SaveGFXModelData(geVFile *f);\r
 geBoolean      SaveGFXNodes(geVFile *f);\r

diff --git a/GBSPLib/Leaf.cpp b/GBSPLib/Leaf.cpp
index c961f88..ab0dc81 100644 (file)
--- a/GBSPLib/Leaf.cpp
+++ b/GBSPLib/Leaf.cpp
@@ -22,7 +22,7 @@
 #include <windows.h>\r
 #include <stdio.h>\r
 \r
-#include "include/Ram.h"\r
+#include "G3D/Ram.h"\r
 #include "Portals.h"\r
 #include "GBSPFile.h"\r
 #include "BSP.h"\r
@@ -30,7 +30,7 @@
 #include "Leaf.h"\r
 #include "Brush2.h"\r
 \r
-#include "include/Vec3d.h"\r
+#include "G3D/Vec3d.h"\r
 \r
 int32           NumLeafClusters;\r
 \r

diff --git a/GBSPLib/Light.cpp b/GBSPLib/Light.cpp
index 9bec9e9..944d12e 100644 (file)
--- a/GBSPLib/Light.cpp
+++ b/GBSPLib/Light.cpp
@@ -32,9 +32,9 @@
 #include "Utils.h"\r
 #include "BSP.h"\r
 \r
-#include "include/Vec3d.h"\r
-#include "include/XForm3d.h"\r
-#include "include/Ram.h"\r
+#include "G3D/Vec3d.h"\r
+#include "G3D/XForm3d.h"\r
+#include "G3D/Ram.h"\r
 \r
 #define RWM_GOURAUD 1\r
 #define DEBUG_RWM_GOURAUD 1\r

diff --git a/GBSPLib/Map.cpp b/GBSPLib/Map.cpp
index 2b10122..0ab2920 100644 (file)
--- a/GBSPLib/Map.cpp
+++ b/GBSPLib/Map.cpp
@@ -31,9 +31,9 @@
 #include "Poly.h"\r
 #include "MathLib.h"\r
 \r
-#include "include/Motion.h"                            // From Genesis (in include path)\r
-#include "include/ErrorLog.h"\r
-#include "include/Ram.h"\r
+#include "G3D/Motion.h"                                // From Genesis (in include path)\r
+#include "G3D/ErrorLog.h"\r
+#include "G3D/Ram.h"\r
 \r
 int32          NumEntities;\r
 MAP_Entity     Entities[MAX_MAP_ENTITIES];\r

diff --git a/GBSPLib/Map.h b/GBSPLib/Map.h
index c9c6011..3088969 100644 (file)
--- a/GBSPLib/Map.h
+++ b/GBSPLib/Map.h
@@ -25,7 +25,7 @@
 #include <windows.h>\r
 \r
 #include "BSP.h"\r
-#include "include/Motion.h"\r
+#include "G3D/Motion.h"\r
 \r
 #define MAX_MAP_ENTITIES                       4096*2\r
 #define MAX_MAP_TEXINFO                                8192*2\r

diff --git a/GBSPLib/MathLib.h b/GBSPLib/MathLib.h
index ed3afc1..f0e8a09 100644 (file)
--- a/GBSPLib/MathLib.h
+++ b/GBSPLib/MathLib.h
@@ -22,7 +22,7 @@
 #ifndef MATHLIB_H\r
 #define MATHLIB_H\r
 \r
-#include "include/Vec3d.h"\r
+#include "G3D/Vec3d.h"\r
 \r
 //#define      ON_EPSILON                      (geFloat)0.05\r
 #define                ON_EPSILON                      (geFloat)0.1\r

diff --git a/GBSPLib/Poly.cpp b/GBSPLib/Poly.cpp
index 0349fe5..9b82459 100644 (file)
--- a/GBSPLib/Poly.cpp
+++ b/GBSPLib/Poly.cpp
@@ -30,7 +30,7 @@
 #include "GBSPFile.h"\r
 #include "Light.h"\r
 \r
-#include "include/Ram.h"\r
+#include "G3D/Ram.h"\r
 \r
 int32          NumSubdivides;\r
 geFloat                SubdivideSize = 235.0f;\r

diff --git a/GBSPLib/Portals.cpp b/GBSPLib/Portals.cpp
index b6b6973..295fd76 100644 (file)
--- a/GBSPLib/Portals.cpp
+++ b/GBSPLib/Portals.cpp
@@ -31,7 +31,7 @@
 #include "Utils.h"\r
 #include "Map.h"\r
 \r
-#include "include/Ram.h"\r
+#include "G3D/Ram.h"\r
 \r
 GBSP_Node      *OutsideNode;\r
 geVec3d                NodeMins, NodeMaxs;\r

diff --git a/GBSPLib/Rad.cpp b/GBSPLib/Rad.cpp
index 0db9b89..2c351e4 100644 (file)
--- a/GBSPLib/Rad.cpp
+++ b/GBSPLib/Rad.cpp
@@ -31,7 +31,7 @@
 #include "Light.h"\r
 #include "Texture.h"\r
 \r
-#include "include/Ram.h"\r
+#include "G3D/Ram.h"\r
 \r
 pRAD_Patch     *FacePatches;\r
 pRAD_Patch     *PatchList;\r

diff --git a/GBSPLib/TJunct.cpp b/GBSPLib/TJunct.cpp
index 4c21a94..eac45c4 100644 (file)
--- a/GBSPLib/TJunct.cpp
+++ b/GBSPLib/TJunct.cpp
@@ -27,7 +27,7 @@
 #include "Poly.h"\r
 #include "Texture.h"\r
 \r
-#include "include/Ram.h"\r
+#include "G3D/Ram.h"\r
 \r
 #define OFF_EPSILON                                    0.05f\r
 \r

diff --git a/GBSPLib/Texture.cpp b/GBSPLib/Texture.cpp
index 7887565..bb6c0a3 100644 (file)
--- a/GBSPLib/Texture.cpp
+++ b/GBSPLib/Texture.cpp
@@ -28,9 +28,9 @@
 #include "Texture.h"\r
 #include "Utils.h"\r
 \r
-#include "include/VFile.h"\r
-#include "include/Bitmap.h"\r
-#include "include/Ram.h"\r
+#include "G3D/VFile.h"\r
+#include "G3D/Bitmap.h"\r
+#include "G3D/Ram.h"\r
 \r
 int32          NumTextures;\r
 GFX_Texture    Textures[MAX_MAP_TEXTURES];\r

diff --git a/GBSPLib/Texture.h b/GBSPLib/Texture.h
index f084c4c..684ce04 100644 (file)
--- a/GBSPLib/Texture.h
+++ b/GBSPLib/Texture.h
@@ -28,7 +28,7 @@
 #include "Map.h"\r
 #include "G3D/Engine/Drivers/DCommon.h"\r
 #include "GBSPFile.h"\r
-#include "include/VFile.h"\r
+#include "G3D/VFile.h"\r
 \r
 #define TEXTURE_SKYBOX         (1<<0)\r
 \r

diff --git a/GBSPLib/Utils.cpp b/GBSPLib/Utils.cpp
index 0f79d44..d9bc7a3 100644 (file)
--- a/GBSPLib/Utils.cpp
+++ b/GBSPLib/Utils.cpp
@@ -24,7 +24,7 @@
 #include <stdio.h>\r
 \r
 #include "Utils.h"\r
-#include "include/BaseType.h"\r
+#include "G3D/BaseType.h"\r
 \r
 //====================================================================================\r
 //     DefaultExtension\r

diff --git a/GBSPLib/Vis.cpp b/GBSPLib/Vis.cpp
index d08835d..bb92d67 100644 (file)
--- a/GBSPLib/Vis.cpp
+++ b/GBSPLib/Vis.cpp
@@ -28,7 +28,7 @@
 #include "Poly.h"\r
 #include "BSP.h"\r
 \r
-#include "include/Ram.h"\r
+#include "G3D/Ram.h"\r
 \r
 int32          NumVisPortals;                                  // Total portals\r
 int32          NumVisPortalBytes;                              // Total portals / 8\r

diff --git a/GBSPLib/VisFlood.cpp b/GBSPLib/VisFlood.cpp
index b6ba8fd..59f1e85 100644 (file)
--- a/GBSPLib/VisFlood.cpp
+++ b/GBSPLib/VisFlood.cpp
@@ -28,7 +28,7 @@
 #include "Poly.h"\r
 #include "BSP.h"\r
 \r
-#include "include/Ram.h"\r
+#include "G3D/Ram.h"\r
 \r
 extern int32           NumVisPortals;                          // Total portals\r
 extern int32           NumVisPortalBytes;                      // Total portals / 8\r