From bb35995409d9bc1c380f2a56d1b7df43cafdb5e5 Mon Sep 17 00:00:00 2001 From: Akiko Date: Sun, 7 Jun 2015 17:55:05 +0200 Subject: [PATCH] - had to move the include to the G3D directory to start killing the duplicates and to fix the whole includes nightmare - removed some duplicated - GBSPLib compiles again with the changed includes --- {include => G3D}/Actor.h | 0 {include => G3D}/BaseType.h | 0 G3D/Basetype.h | 85 ----------- {include => G3D}/Bitmap.h | 0 G3D/Bitmap/{pixelformat.c => PixelFormat.c} | 0 G3D/Bitmap/{pixelformat.h => PixelFormat.h} | 0 {include => G3D}/Body.h | 0 G3D/CMakeLists.txt | 2 +- G3D/CSNetMgr.c | 12 +- G3D/CSNetMgr.h | 2 +- G3D/{drawbbox.c => DrawBBox.c} | 0 G3D/Engine/Drivers/DCommon.h | 8 +- G3D/Engine/{engine.c => Engine.c} | 0 G3D/Engine/{engine.h => Engine.h} | 6 +- G3D/Engine/{fontbmp.c => FontBmp.c} | 0 G3D/Engine/{genesis3d.c => Genesis3d.c} | 0 G3D/Entities.c | 16 +-- {include => G3D}/ErrorLog.h | 0 {include => G3D}/ExtBox.h | 0 include/font.H => G3D/Font.h | 0 {include => G3D}/GeTypes.h | 0 {include => G3D}/Genesis.h | 0 G3D/{genesis.rc => Genesis.rc} | 0 G3D/{list.c => List.c} | 0 G3D/{list.h => List.h} | 0 include/matrix33.h => G3D/Matrix33.h | 0 {include => G3D}/Motion.h | 0 G3D/NetPlay.c | 14 +- G3D/NetPlay.h | 4 +- {include => G3D}/Path.h | 0 {include => G3D}/PhysicsJoint.h | 0 {include => G3D}/PhysicsObject.h | 0 {include => G3D}/PhysicsSystem.h | 0 {include => G3D}/PixelFormat.h | 0 {include => G3D}/Quatern.h | 0 {include => G3D}/Ram.h | 0 G3D/{resource.h => Resource.h} | 0 G3D/Sound.c | 8 +- G3D/Sound3d.c | 6 +- G3D/{sprite.c => Sprite.c} | 0 {include => G3D}/Sprite.h | 0 G3D/{Tclip.c => TClip.c} | 2 +- G3D/{tclip.h => TClip.h} | 8 +- G3D/{tsc.c => TSC.c} | 0 G3D/{tsc.h => TSC.h} | 0 G3D/{timer.c => Timer.c} | 0 G3D/{timer.h => Timer.h} | 0 {include => G3D}/VFile.h | 0 {include => G3D}/Vec3d.h | 0 {include => G3D}/XForm3d.h | 0 G3D/sprite.h | 210 ---------------------------- GBSPLib/BSP.cpp | 2 +- GBSPLib/BSP2.cpp | 4 +- GBSPLib/Brush2.cpp | 6 +- GBSPLib/Brush2.h | 4 +- GBSPLib/GBSPFile.cpp | 4 +- GBSPLib/GBSPFile.h | 6 +- GBSPLib/GBSPLib.h | 2 +- GBSPLib/GBSPPrep.cpp | 4 +- GBSPLib/Leaf.cpp | 4 +- GBSPLib/Light.cpp | 6 +- GBSPLib/Map.cpp | 6 +- GBSPLib/Map.h | 2 +- GBSPLib/MathLib.h | 2 +- GBSPLib/Poly.cpp | 2 +- GBSPLib/Portals.cpp | 2 +- GBSPLib/Rad.cpp | 2 +- GBSPLib/TJunct.cpp | 2 +- GBSPLib/Texture.cpp | 6 +- GBSPLib/Texture.h | 2 +- GBSPLib/Utils.cpp | 2 +- GBSPLib/Vis.cpp | 2 +- GBSPLib/VisFlood.cpp | 2 +- 73 files changed, 80 insertions(+), 377 deletions(-) rename {include => G3D}/Actor.h (100%) rename {include => G3D}/BaseType.h (100%) delete mode 100644 G3D/Basetype.h rename {include => G3D}/Bitmap.h (100%) rename G3D/Bitmap/{pixelformat.c => PixelFormat.c} (100%) rename G3D/Bitmap/{pixelformat.h => PixelFormat.h} (100%) rename {include => G3D}/Body.h (100%) rename G3D/{drawbbox.c => DrawBBox.c} (100%) rename G3D/Engine/{engine.c => Engine.c} (100%) rename G3D/Engine/{engine.h => Engine.h} (96%) rename G3D/Engine/{fontbmp.c => FontBmp.c} (100%) rename G3D/Engine/{genesis3d.c => Genesis3d.c} (100%) rename {include => G3D}/ErrorLog.h (100%) rename {include => G3D}/ExtBox.h (100%) rename include/font.H => G3D/Font.h (100%) rename {include => G3D}/GeTypes.h (100%) rename {include => G3D}/Genesis.h (100%) rename G3D/{genesis.rc => Genesis.rc} (100%) rename G3D/{list.c => List.c} (100%) rename G3D/{list.h => List.h} (100%) rename include/matrix33.h => G3D/Matrix33.h (100%) rename {include => G3D}/Motion.h (100%) rename {include => G3D}/Path.h (100%) rename {include => G3D}/PhysicsJoint.h (100%) rename {include => G3D}/PhysicsObject.h (100%) rename {include => G3D}/PhysicsSystem.h (100%) rename {include => G3D}/PixelFormat.h (100%) rename {include => G3D}/Quatern.h (100%) rename {include => G3D}/Ram.h (100%) rename G3D/{resource.h => Resource.h} (100%) rename G3D/{sprite.c => Sprite.c} (100%) rename {include => G3D}/Sprite.h (100%) rename G3D/{Tclip.c => TClip.c} (96%) rename G3D/{tclip.h => TClip.h} (93%) rename G3D/{tsc.c => TSC.c} (100%) rename G3D/{tsc.h => TSC.h} (100%) rename G3D/{timer.c => Timer.c} (100%) rename G3D/{timer.h => Timer.h} (100%) rename {include => G3D}/VFile.h (100%) rename {include => G3D}/Vec3d.h (100%) rename {include => G3D}/XForm3d.h (100%) delete mode 100644 G3D/sprite.h 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 index d219f53..0000000 --- a/G3D/Basetype.h +++ /dev/null @@ -1,85 +0,0 @@ -/****************************************************************************************/ -/* BASETYPE.H */ -/* */ -/* Author: */ -/* Description: Basic type definitions and calling convention defines */ -/* */ -/* 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_BASETYPE_H -#define GE_BASETYPE_H - -#ifdef __cplusplus -extern "C" { -#endif - -/******** The Genesis Calling Conventions ***********/ - -#define GENESISCC _fastcall - -#if defined(BUILDGENESIS) && defined(GENESISDLLVERSION) - #define GENESISAPI _declspec(dllexport) -#else - #if defined(GENESISDLLVERSION) - #define GENESISAPI _declspec(dllimport) - #else - #define GENESISAPI - #endif -#endif - -/******** The Basic Types ****************************/ - -typedef signed int geBoolean; -#define GE_FALSE (0) -#define GE_TRUE (1) - -typedef float geFloat; -typedef double geDouble; - -#ifndef NULL -/* #define NULL ((void *)0) */ -#define NULL 0 -#endif - -typedef signed long int32; -typedef signed short int16; -typedef signed char int8 ; -typedef unsigned long uint32; -typedef unsigned short uint16; -typedef unsigned char uint8 ; - -/******** Macros on Genesis basic types *************/ - -#define GE_ABS(x) ( (x) < 0 ? (-(x)) : (x) ) -#define GE_CLAMP(x,lo,hi) ( (x) < (lo) ? (lo) : ( (x) > (hi) ? (hi) : (x) ) ) -#define GE_CLAMP8(x) GE_CLAMP(x,0,255) -#define GE_CLAMP16(x) GE_CLAMP(x,0,65536) -#define GE_BOOLSAME(x,y) ( ( (x) && (y) ) || ( !(x) && !(y) ) ) - -#define GE_EPSILON ((geFloat)0.000797f) -#define GE_FLOATS_EQUAL(x,y) ( GE_ABS((x) - (y)) < GE_EPSILON ) -#define GE_FLOAT_ISZERO(x) GE_FLOATS_EQUAL(x,0.0f) - -#define GE_PI ((geFloat)3.14159265358979323846f) - -/****************************************************/ - -#ifdef __cplusplus -} -#endif - -#endif - 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 --- 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 --- a/G3D/CSNetMgr.c +++ b/G3D/CSNetMgr.c @@ -19,20 +19,18 @@ /* Copyright (C) 1999 WildTangent, Inc. All Rights Reserved */ /* */ /****************************************************************************************/ -#include -//#define INITGUID #include +#include #include +#include #include "CSNetMgr.h" #include "NetPlay.h" -#include "include/BaseType.h" -#include "include/Ram.h" -#include "include/ErrorLog.h" - -#include +#include "BaseType.h" +#include "Ram.h" +#include "ErrorLog.h" #pragma message(" some assertions in here would be nice:") diff --git a/G3D/CSNetMgr.h b/G3D/CSNetMgr.h index 9a7a668..d2801c6 100644 --- a/G3D/CSNetMgr.h +++ b/G3D/CSNetMgr.h @@ -22,7 +22,7 @@ #ifndef GE_CSNETMGR_H #define GE_CSNETMGR_H -#include "include/BaseType.h" +#include "BaseType.h" #ifdef __cplusplus extern "C" { 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 --- 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! // FIXME: What should we do with these? -#include "include/XForm3d.h" -#include "include/Vec3d.h" -#include "include/PixelFormat.h" -#include "include/GeTypes.h" // This is a no no +#include "G3D/XForm3d.h" +#include "G3D/Vec3d.h" +#include "G3D/PixelFormat.h" +#include "G3D/GeTypes.h" // This is a no no #ifdef __cplusplus extern "C" { 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 --- a/G3D/Engine/engine.h +++ b/G3D/Engine/Engine.h @@ -23,10 +23,10 @@ #ifndef GE_ENGINE_H #define GE_ENGINE_H -#include "Genesis.h" +#include "include/Genesis.h" #include "System.h" -#include "world.h" -#include "bitmap.h" +#include "G3D/World/World.h" +#include "include/Bitmap.h" #include "BitmapList.h" #ifdef __cplusplus 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 --- a/G3D/Entities.c +++ b/G3D/Entities.c @@ -19,18 +19,18 @@ /* Copyright (C) 1999 WildTangent, Inc. All Rights Reserved */ /* */ /****************************************************************************************/ -#include -#include +#include +#include #include "Entities.h" -#include "BaseType.h" -#include "Errorlog.h" -#include "Vec3d.h" -#include "Ram.h" +#include "include/BaseType.h" +#include "include/ErrorLog.h" +#include "include/Vec3d.h" +#include "include/Ram.h" // These are temporary until we find a better way to get models pointers into the entity stuff -#include "World.h" -#include "GBSPFile.h" +#include "G3D/World/World.h" +#include "G3D/World/GBSPFile.h" //===================================================================================== 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 --- a/G3D/NetPlay.c +++ b/G3D/NetPlay.c @@ -21,15 +21,15 @@ /****************************************************************************************/ #define IDIRECTPLAY2_OR_GREATER -#include -#include +#include +#include #include #include -#include +#include -#include "netplay.h" -#include "ErrorLog.h" +#include "NetPlay.h" +#include "include/ErrorLog.h" //#define INIT_GUID @@ -79,7 +79,7 @@ BOOL FAR PASCAL DPEnumConnectionsCallback( DWORD dwFlags, LPVOID lpContext); -static void DoDPError(HRESULT Hr); +//static void DoDPError(HRESULT Hr); FILE *DebugF; @@ -644,7 +644,7 @@ FAILURE: //==================================================================================================== // DoDPError //==================================================================================================== -static void DoDPError(HRESULT Hr) +void DoDPError(HRESULT Hr) { switch (Hr) { diff --git a/G3D/NetPlay.h b/G3D/NetPlay.h index 0e42300..5d058d8 100644 --- a/G3D/NetPlay.h +++ b/G3D/NetPlay.h @@ -25,7 +25,7 @@ #include #include -#include "include/BaseType.h" +#include "BaseType.h" #ifdef __cplusplus extern "C" { @@ -55,7 +55,7 @@ extern SP_DESC GlobalSP; // Global info about the sp extern SESSION_DESC* GlobalSession; // Global sessions availible extern LPGUID glpGuid; -void DoDPError(HRESULT Hr); +static void DoDPError(HRESULT Hr); BOOL InitNetPlay(LPGUID lpGuid); BOOL NetPlayEnumSession(LPSTR IPAdress, SESSION_DESC** SessionList, DWORD* SessionNum); BOOL NetPlayJoinSession(SESSION_DESC* SessionList); 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 --- a/G3D/Sound.c +++ b/G3D/Sound.c @@ -24,11 +24,11 @@ #include #include -#include "BaseType.h" -#include "ErrorLog.h" -#include "VFile.h" +#include "include/BaseType.h" +#include "include/ErrorLog.h" +#include "include/VFile.h" #include "Sound.h" -#include "Ram.h" +#include "include/Ram.h" typedef struct SoundManager SoundManager; typedef struct Channel Channel; diff --git a/G3D/Sound3d.c b/G3D/Sound3d.c index 61e16e7..bae9ca9 100644 --- a/G3D/Sound3d.c +++ b/G3D/Sound3d.c @@ -21,9 +21,9 @@ /****************************************************************************************/ #include -#include "Trace.h" -#include "Vec3d.h" -#include "XForm3d.h" +#include "G3D/World/Trace.h" +#include "incldue/Vec3d.h" +#include "include/XForm3d.h" #include "Camera.h" #include "Sound3d.h" 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 --- a/G3D/Tclip.c +++ b/G3D/TClip.c @@ -68,7 +68,7 @@ TClip_Rasterize : 0.006183 : 1.$ % #include #include "TClip.h" -#include "engine.h" +#include "G3D/Engine/Engine.h" #include "bitmap._h" #include "list.h" 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 --- a/G3D/tclip.h +++ b/G3D/TClip.h @@ -22,10 +22,10 @@ #ifndef GE_TCLIP_H #define GE_TCLIP_H -#include "basetype.h" -#include "getypes.h" -#include "bitmap.h" -#include "engine.h" +#include "include/BaseType.h" +#include "include/GeTypes.h" +#include "include/Bitmap.h" +#include "G3D/Engine/Engine.h" #ifdef __cplusplus extern "C" { 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 index 66b6002..0000000 --- a/G3D/sprite.h +++ /dev/null @@ -1,210 +0,0 @@ -/****************************************************************************************/ -/* SPRITE.H */ -/* */ -/* Author: Michael R. Brumm */ -/* Description: Sprite interface */ -/* */ -/* 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. */ -/* */ -/****************************************************************************************/ - - -#ifndef GE_SPRITE_H -#define GE_SPRITE_H - -#include "genesis.h" -#include "basetype.h" -#include "extbox.h" -#include "bitmap.h" - -#ifdef GE_WORLD_H -#include "camera.h" -#include "Frustum.h" -#endif - -#ifdef __cplusplus -extern "C" { -#endif - -// GENESIS_PUBLIC_APIS - -typedef struct geSprite geSprite; // an instance of a sprite - - -//--------------------------------------------------------------------------------- -// Creation/Destruction functions -//--------------------------------------------------------------------------------- - - // create a sprite instance associated with the given bitmaps as faces - // pass in a NULL bitmap for a gouraud face - // backface bitmap can be the same as the front face bitmap -GENESISAPI geSprite *GENESISCC geSprite_Create(geBitmap *SpriteBitmap, geBitmap *SpriteBackfaceBitmap); - - // create an additional reference (owner) for the sprite -GENESISAPI void GENESISCC geSprite_CreateRef(geSprite *Sprite); - - // destroy a sprite -GENESISAPI void GENESISCC geSprite_Destroy(geSprite **pS); - - // returns number of sprites that are currently created -GENESISAPI int32 GENESISCC geSprite_GetCount(); - - // checks to see if a sprite is valid or not -GENESISAPI geBoolean GENESISCC geSprite_IsValid(const geSprite *S); - -//--------------------------------------------------------------------------------- -// Queries -//--------------------------------------------------------------------------------- - // In general: Objects retuned from Get functions should not not be destroyed. - // if ownership is desired, call the objects _CreateRef() function to create another owner. - // (An 'owner' has access to the object regardless of the number of other owners, and - // an owner must call the object's _Destroy() function to relinquish ownership ) - - // Returns the Bitmap associated with the sprite's front face -GENESISAPI geBitmap *GENESISCC geSprite_GetBitmap(const geSprite *S); - - // Returns the Bitmap associated with the sprite's backface -GENESISAPI geBitmap *GENESISCC geSprite_GetBackfaceBitmap(const geSprite *S); - - // Gets backface parameters -GENESISAPI void GENESISCC geSprite_GetBackface(const geSprite *S, geBoolean *Enabled, geBoolean *MirrorImage); - - // Sets the backface parameters -GENESISAPI void GENESISCC geSprite_SetBackface(geSprite *S, const geBoolean Enabled, const geBoolean MirrorImage); - - // Gets whether the sprite always faces the camera -GENESISAPI void GENESISCC geSprite_GetFaceCamera(const geSprite *S, geBoolean *Enabled); - - // Sets whether the sprite always faces the camera -GENESISAPI void GENESISCC geSprite_SetFaceCamera(geSprite *S, geBoolean Enabled); - - // Gets the position of the sprite -GENESISAPI void GENESISCC geSprite_GetPosition(const geSprite *S, geVec3d *Pos); - - // Sets the position of the sprite - // - // For easy modification of the sprite position if the sprite always faces the camera -GENESISAPI void GENESISCC geSprite_SetPosition(geSprite *S, const geVec3d *Pos); - - // Gets the current transform for the sprite -GENESISAPI void GENESISCC geSprite_GetTransform(const geSprite *S, geXForm3d *Transform); - - // Sets the current transform for the sprite - // - // Rotation information is ignored if the sprite always faces the camera -GENESISAPI void GENESISCC geSprite_SetTransform(geSprite *S, const geXForm3d *Transform); - - // Gets the internal transform for the sprite -GENESISAPI void GENESISCC geSprite_GetInternalTransform(const geSprite *S, geXForm3d *Transform); - - // Sets the internal transform for the sprite - // - // Allows the sprite to be rendered offset from its main transform. For example, - // translation could make the bottom of the sprite its center of rotation. - // - // This is totally ignored if the sprite always faces the camera -GENESISAPI void GENESISCC geSprite_SetInternalTransform(geSprite *S, const geXForm3d *Transform); - - // Gets the scale of the sprite (width and height) -GENESISAPI void GENESISCC geSprite_GetScale(const geSprite *S, geFloat *ScaleX, geFloat *ScaleY); - - // Sets the scale of the sprite (width and height) -GENESISAPI void GENESISCC geSprite_SetScale(geSprite *S, geFloat ScaleX, geFloat ScaleY); - - // Gets an assigned general non changing bounding box from the sprite -GENESISAPI void GENESISCC geSprite_GetExtBox(const geSprite *S, geExtBox *ExtBox); - - // Gets the bounding box in non-world coordinates - // Whatever you put in with geSprite_SetExtBox, you get out with this function -GENESISAPI void GENESISCC geSprite_GetNonWorldExtBox(const geSprite *S, geExtBox *ExtBox); - - // Sets an assigned general non changing bounding box from the sprite -GENESISAPI void GENESISCC geSprite_SetExtBox(geSprite *S, const geExtBox *ExtBox); - - // Gets the texture parameters for the sprite -GENESISAPI void GENESISCC geSprite_GetTextureParameters(const geSprite *S, - geFloat *OffsetX, - geFloat *OffsetY, - geFloat *ScaleX, - geFloat *ScaleY - ); - - // Sets the texture parameters for the sprite -GENESISAPI void GENESISCC geSprite_SetTextureParameters(geSprite *S, - geFloat OffsetX, - geFloat OffsetY, - geFloat ScaleX, - geFloat ScaleY - ); - - // Gets the lighting options for the sprite -GENESISAPI void GENESISCC geSprite_GetLightingOptions(const geSprite *S, - geFloat *AmbientLightRed, // 0 .. 255 - geFloat *AmbientLightGreen, // 0 .. 255 - geFloat *AmbientLightBlue, // 0 .. 255 - geBoolean *UseFillLight, // GE_TRUE or GE_FALSE - geVec3d *FillLightNormal, // normalized vector - geFloat *FillLightRed, // 0 .. 255 - geFloat *FillLightGreen, // 0 .. 255 - geFloat *FillLightBlue, // 0 .. 255 - geBoolean *UseLightFromFloor,// GE_TRUE or GE_FALSE - int32 *MaximumDynamicLightsToUse - ); - - // Sets the lighting options for the sprite -GENESISAPI void GENESISCC geSprite_SetLightingOptions(geSprite *S, - geFloat AmbientLightRed, // 0 .. 255 - geFloat AmbientLightGreen, // 0 .. 255 - geFloat AmbientLightBlue, // 0 .. 255 - geBoolean UseFillLight, // GE_TRUE or GE_FALSE - const geVec3d *FillLightNormal, // normalized vector - geFloat FillLightRed, // 0 .. 255 - geFloat FillLightGreen, // 0 .. 255 - geFloat FillLightBlue, // 0 .. 255 - geBoolean UseLightFromFloor, // GE_TRUE or GE_FALSE - int32 MaximumDynamicLightsToUse // 0 for none - ); - - // Gets the alpha transparency of the sprite -GENESISAPI void GENESISCC geSprite_GetAlpha(const geSprite *S, geFloat *Alpha, geFloat *BackfaceAlpha); - - // Sets the alpha transparency of the sprite -GENESISAPI void GENESISCC geSprite_SetAlpha(geSprite *S, geFloat Alpha, geFloat BackfaceAlpha); - - // Returns the pointer which was set with geSprite_SetUserData. NULL if not set. -GENESISAPI void *GENESISCC geSprite_GetUserData(const geSprite *S); - - // Sets the sprites user data pointer to the given value. For clients only. -GENESISAPI void GENESISCC geSprite_SetUserData(geSprite *S, void *UserData); - - -//-------------------------------------------------------------------------------- -// Rendering -//-------------------------------------------------------------------------------- - -// GENESIS_PRIVATE_APIS - -#ifdef GE_WORLD_H - // Prepares the geSprite for rendering and posing. Call Once once the sprite is fully created. - // Must be called prior to render/pose/setworldtransform -geBoolean GENESISCC geSprite_RenderPrep( geSprite *A, geWorld *World); - - // Draws the geSprite. (RenderPrep must be called first) -geBoolean GENESISCC geSprite_RenderThroughFrustum(geSprite *S, geEngine *Engine, geWorld *World, geCamera *Camera, Frustum_Info *FInfo); -#endif - - -#ifdef __cplusplus -} -#endif - - -#endif diff --git a/GBSPLib/BSP.cpp b/GBSPLib/BSP.cpp index c155625..434a3d1 100644 --- a/GBSPLib/BSP.cpp +++ b/GBSPLib/BSP.cpp @@ -36,7 +36,7 @@ #include "Light.h" #include "GBSPFile.h" -#include "include/Ram.h" +#include "G3D/Ram.h" // Globals GBSP_Model BSPModels[MAX_BSP_MODELS]; diff --git a/GBSPLib/BSP2.cpp b/GBSPLib/BSP2.cpp index 70ac2da..248f3db 100644 --- a/GBSPLib/BSP2.cpp +++ b/GBSPLib/BSP2.cpp @@ -33,8 +33,8 @@ #include "Fill.h" #include "Brush2.h" -#include "include/Vec3d.h" -#include "include/Ram.h" +#include "G3D/Vec3d.h" +#include "G3D/Ram.h" #define USE_VOLUMES diff --git a/GBSPLib/Brush2.cpp b/GBSPLib/Brush2.cpp index f7465a2..daecb94 100644 --- a/GBSPLib/Brush2.cpp +++ b/GBSPLib/Brush2.cpp @@ -28,9 +28,9 @@ #include "BSP.h" #include "Texture.h" -#include "include/VFile.h" -#include "include/Vec3d.h" -#include "include/Ram.h" +#include "G3D/VFile.h" +#include "G3D/Vec3d.h" +#include "G3D/Ram.h" #define BSP_BRUSH_SIZE(s) ((sizeof(GBSP_Brush)-sizeof(GBSP_Side[NUM_BRUSH_DEFAULT_SIDES]))+(sizeof(GBSP_Side)*(s))); #define MAP_BRUSH_SIZE(s) ((sizeof(MAP_Brush)-sizeof(GBSP_Side[NUM_BRUSH_DEFAULT_SIDES]))+(sizeof(GBSP_Side)*(s))); diff --git a/GBSPLib/Brush2.h b/GBSPLib/Brush2.h index 85846b9..b3b33de 100644 --- a/GBSPLib/Brush2.h +++ b/GBSPLib/Brush2.h @@ -27,8 +27,8 @@ #include "MathLib.h" #include "Map.h" -#include "include/VFile.h" -#include "include/Vec3d.h" +#include "G3D/VFile.h" +#include "G3D/Vec3d.h" #define NUM_BRUSH_DEFAULT_SIDES 6 diff --git a/GBSPLib/GBSPFile.cpp b/GBSPLib/GBSPFile.cpp index 25f46fc..a2e15de 100644 --- a/GBSPLib/GBSPFile.cpp +++ b/GBSPLib/GBSPFile.cpp @@ -24,8 +24,8 @@ #include "G3D/Engine/Drivers/DCommon.h" #include "GBSPFile.h" -#include "include/VFile.h" -#include "include/Ram.h" +#include "G3D/VFile.h" +#include "G3D/Ram.h" //======================================================================================== // Globals diff --git a/GBSPLib/GBSPFile.h b/GBSPLib/GBSPFile.h index 186549c..7559a92 100644 --- a/GBSPLib/GBSPFile.h +++ b/GBSPLib/GBSPFile.h @@ -27,9 +27,9 @@ #include "G3D/Engine/Drivers/DCommon.h" #include "MathLib.h" -#include "include/VFile.h" -#include "include/Motion.h" -#include "include/Vec3d.h" +#include "G3D/VFile.h" +#include "G3D/Motion.h" +#include "G3D/Vec3d.h" #define GBSP_VERSION 15 diff --git a/GBSPLib/GBSPLib.h b/GBSPLib/GBSPLib.h index 9a91564..1240eb2 100644 --- a/GBSPLib/GBSPLib.h +++ b/GBSPLib/GBSPLib.h @@ -26,7 +26,7 @@ #include "MathLib.h" -#include "include/Vec3d.h" +#include "G3D/Vec3d.h" #define GBSP_VERSION_MAJOR 6 #define GBSP_VERSION_MINOR 0 diff --git a/GBSPLib/GBSPPrep.cpp b/GBSPLib/GBSPPrep.cpp index 2158fc6..1a73ffb 100644 --- a/GBSPLib/GBSPPrep.cpp +++ b/GBSPLib/GBSPPrep.cpp @@ -32,8 +32,8 @@ #include "Portals.h" #include "Leaf.h" -#include "include/VFile.h" -#include "include/Ram.h" +#include "G3D/VFile.h" +#include "G3D/Ram.h" geBoolean SaveGFXModelData(geVFile *f); geBoolean SaveGFXNodes(geVFile *f); diff --git a/GBSPLib/Leaf.cpp b/GBSPLib/Leaf.cpp index c961f88..ab0dc81 100644 --- a/GBSPLib/Leaf.cpp +++ b/GBSPLib/Leaf.cpp @@ -22,7 +22,7 @@ #include #include -#include "include/Ram.h" +#include "G3D/Ram.h" #include "Portals.h" #include "GBSPFile.h" #include "BSP.h" @@ -30,7 +30,7 @@ #include "Leaf.h" #include "Brush2.h" -#include "include/Vec3d.h" +#include "G3D/Vec3d.h" int32 NumLeafClusters; diff --git a/GBSPLib/Light.cpp b/GBSPLib/Light.cpp index 9bec9e9..944d12e 100644 --- a/GBSPLib/Light.cpp +++ b/GBSPLib/Light.cpp @@ -32,9 +32,9 @@ #include "Utils.h" #include "BSP.h" -#include "include/Vec3d.h" -#include "include/XForm3d.h" -#include "include/Ram.h" +#include "G3D/Vec3d.h" +#include "G3D/XForm3d.h" +#include "G3D/Ram.h" #define RWM_GOURAUD 1 #define DEBUG_RWM_GOURAUD 1 diff --git a/GBSPLib/Map.cpp b/GBSPLib/Map.cpp index 2b10122..0ab2920 100644 --- a/GBSPLib/Map.cpp +++ b/GBSPLib/Map.cpp @@ -31,9 +31,9 @@ #include "Poly.h" #include "MathLib.h" -#include "include/Motion.h" // From Genesis (in include path) -#include "include/ErrorLog.h" -#include "include/Ram.h" +#include "G3D/Motion.h" // From Genesis (in include path) +#include "G3D/ErrorLog.h" +#include "G3D/Ram.h" int32 NumEntities; MAP_Entity Entities[MAX_MAP_ENTITIES]; diff --git a/GBSPLib/Map.h b/GBSPLib/Map.h index c9c6011..3088969 100644 --- a/GBSPLib/Map.h +++ b/GBSPLib/Map.h @@ -25,7 +25,7 @@ #include #include "BSP.h" -#include "include/Motion.h" +#include "G3D/Motion.h" #define MAX_MAP_ENTITIES 4096*2 #define MAX_MAP_TEXINFO 8192*2 diff --git a/GBSPLib/MathLib.h b/GBSPLib/MathLib.h index ed3afc1..f0e8a09 100644 --- a/GBSPLib/MathLib.h +++ b/GBSPLib/MathLib.h @@ -22,7 +22,7 @@ #ifndef MATHLIB_H #define MATHLIB_H -#include "include/Vec3d.h" +#include "G3D/Vec3d.h" //#define ON_EPSILON (geFloat)0.05 #define ON_EPSILON (geFloat)0.1 diff --git a/GBSPLib/Poly.cpp b/GBSPLib/Poly.cpp index 0349fe5..9b82459 100644 --- a/GBSPLib/Poly.cpp +++ b/GBSPLib/Poly.cpp @@ -30,7 +30,7 @@ #include "GBSPFile.h" #include "Light.h" -#include "include/Ram.h" +#include "G3D/Ram.h" int32 NumSubdivides; geFloat SubdivideSize = 235.0f; diff --git a/GBSPLib/Portals.cpp b/GBSPLib/Portals.cpp index b6b6973..295fd76 100644 --- a/GBSPLib/Portals.cpp +++ b/GBSPLib/Portals.cpp @@ -31,7 +31,7 @@ #include "Utils.h" #include "Map.h" -#include "include/Ram.h" +#include "G3D/Ram.h" GBSP_Node *OutsideNode; geVec3d NodeMins, NodeMaxs; diff --git a/GBSPLib/Rad.cpp b/GBSPLib/Rad.cpp index 0db9b89..2c351e4 100644 --- a/GBSPLib/Rad.cpp +++ b/GBSPLib/Rad.cpp @@ -31,7 +31,7 @@ #include "Light.h" #include "Texture.h" -#include "include/Ram.h" +#include "G3D/Ram.h" pRAD_Patch *FacePatches; pRAD_Patch *PatchList; diff --git a/GBSPLib/TJunct.cpp b/GBSPLib/TJunct.cpp index 4c21a94..eac45c4 100644 --- a/GBSPLib/TJunct.cpp +++ b/GBSPLib/TJunct.cpp @@ -27,7 +27,7 @@ #include "Poly.h" #include "Texture.h" -#include "include/Ram.h" +#include "G3D/Ram.h" #define OFF_EPSILON 0.05f diff --git a/GBSPLib/Texture.cpp b/GBSPLib/Texture.cpp index 7887565..bb6c0a3 100644 --- a/GBSPLib/Texture.cpp +++ b/GBSPLib/Texture.cpp @@ -28,9 +28,9 @@ #include "Texture.h" #include "Utils.h" -#include "include/VFile.h" -#include "include/Bitmap.h" -#include "include/Ram.h" +#include "G3D/VFile.h" +#include "G3D/Bitmap.h" +#include "G3D/Ram.h" int32 NumTextures; GFX_Texture Textures[MAX_MAP_TEXTURES]; diff --git a/GBSPLib/Texture.h b/GBSPLib/Texture.h index f084c4c..684ce04 100644 --- a/GBSPLib/Texture.h +++ b/GBSPLib/Texture.h @@ -28,7 +28,7 @@ #include "Map.h" #include "G3D/Engine/Drivers/DCommon.h" #include "GBSPFile.h" -#include "include/VFile.h" +#include "G3D/VFile.h" #define TEXTURE_SKYBOX (1<<0) diff --git a/GBSPLib/Utils.cpp b/GBSPLib/Utils.cpp index 0f79d44..d9bc7a3 100644 --- a/GBSPLib/Utils.cpp +++ b/GBSPLib/Utils.cpp @@ -24,7 +24,7 @@ #include #include "Utils.h" -#include "include/BaseType.h" +#include "G3D/BaseType.h" //==================================================================================== // DefaultExtension diff --git a/GBSPLib/Vis.cpp b/GBSPLib/Vis.cpp index d08835d..bb92d67 100644 --- a/GBSPLib/Vis.cpp +++ b/GBSPLib/Vis.cpp @@ -28,7 +28,7 @@ #include "Poly.h" #include "BSP.h" -#include "include/Ram.h" +#include "G3D/Ram.h" int32 NumVisPortals; // Total portals int32 NumVisPortalBytes; // Total portals / 8 diff --git a/GBSPLib/VisFlood.cpp b/GBSPLib/VisFlood.cpp index b6ba8fd..59f1e85 100644 --- a/GBSPLib/VisFlood.cpp +++ b/GBSPLib/VisFlood.cpp @@ -28,7 +28,7 @@ #include "Poly.h" #include "BSP.h" -#include "include/Ram.h" +#include "G3D/Ram.h" extern int32 NumVisPortals; // Total portals extern int32 NumVisPortalBytes; // Total portals / 8 -- 2.15.1