From: Akiko Date: Sun, 7 Jun 2015 15:12:00 +0000 (+0200) Subject: - another round of filename corrections X-Git-Url: http://community.linux-addicted.net/gitweb/?p=genesis3d.git;a=commitdiff_plain;h=9006addeed096b1ced918ab056cdb9ea3dd5c80c;hp=c754a3a86dbd1377eaac67c2c6620864c429e765 - another round of filename corrections - GBSPLib compiles for Linux/Wine now --- diff --git a/G3D/CMakeLists.txt b/G3D/CMakeLists.txt index cf35af4..e691fc2 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 Camera.c Ge.c) diff --git a/GBSPLib/BSP.CPP b/GBSPLib/BSP.cpp similarity index 95% rename from GBSPLib/BSP.CPP rename to GBSPLib/BSP.cpp index aa30d09..c155625 100644 --- a/GBSPLib/BSP.CPP +++ b/GBSPLib/BSP.cpp @@ -19,9 +19,9 @@ /* Copyright (C) 1999 WildTangent, Inc. All Rights Reserved */ /* */ /****************************************************************************************/ -#include -#include -#include +#include +#include +#include #include "GBSPPrep.h" #include "BSP.h" @@ -36,7 +36,7 @@ #include "Light.h" #include "GBSPFile.h" -#include "Ram.h" +#include "include/Ram.h" // Globals GBSP_Model BSPModels[MAX_BSP_MODELS]; diff --git a/GBSPLib/Bsp.h b/GBSPLib/BSP.h similarity index 96% rename from GBSPLib/Bsp.h rename to GBSPLib/BSP.h index d2fbdde..f26d7a3 100644 --- a/GBSPLib/Bsp.h +++ b/GBSPLib/BSP.h @@ -22,7 +22,7 @@ #ifndef BSP_H #define BSP_H -#include +#include #include "GBSPLib.h" diff --git a/GBSPLib/Bsp2.cpp b/GBSPLib/BSP2.cpp similarity index 95% rename from GBSPLib/Bsp2.cpp rename to GBSPLib/BSP2.cpp index 27f9f41..70ac2da 100644 --- a/GBSPLib/Bsp2.cpp +++ b/GBSPLib/BSP2.cpp @@ -19,11 +19,11 @@ /* Copyright (C) 1999 WildTangent, Inc. All Rights Reserved */ /* */ /****************************************************************************************/ -#include -#include -#include +#include +#include +#include -#include "Mathlib.h" +#include "MathLib.h" #include "Poly.h" #include "BSP.h" #include "GBSPFile.h" @@ -33,8 +33,8 @@ #include "Fill.h" #include "Brush2.h" -#include "Vec3d.h" -#include "Ram.h" +#include "include/Vec3d.h" +#include "include/Ram.h" #define USE_VOLUMES diff --git a/GBSPLib/Brush2.cpp b/GBSPLib/Brush2.cpp index 7fdf94d..f7465a2 100644 --- a/GBSPLib/Brush2.cpp +++ b/GBSPLib/Brush2.cpp @@ -19,18 +19,18 @@ /* Copyright (C) 1999 WildTangent, Inc. All Rights Reserved */ /* */ /****************************************************************************************/ -#include -#include +#include +#include #include "Brush2.h" -#include "Mathlib.h" +#include "MathLib.h" #include "Poly.h" #include "BSP.h" #include "Texture.h" -#include "VFile.h" -#include "Vec3d.h" -#include "Ram.h" +#include "include/VFile.h" +#include "include/Vec3d.h" +#include "include/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 similarity index 94% rename from GBSPLib/BRUSH2.H rename to GBSPLib/Brush2.h index 38530ed..85846b9 100644 --- a/GBSPLib/BRUSH2.H +++ b/GBSPLib/Brush2.h @@ -22,13 +22,13 @@ #ifndef BRUSH2_H #define BRUSH2_H -#include +#include -#include "Mathlib.h" +#include "MathLib.h" #include "Map.h" -#include "VFile.h" -#include "Vec3d.h" +#include "include/VFile.h" +#include "include/Vec3d.h" #define NUM_BRUSH_DEFAULT_SIDES 6 @@ -91,4 +91,4 @@ GBSP_Brush *CSGBrushes(GBSP_Brush *Head); geBoolean OutputBrushes(char *FileName, GBSP_Brush *Brushes); geBoolean OutputMapBrushes(char *FileName, MAP_Brush *Brushes); -#endif \ No newline at end of file +#endif diff --git a/GBSPLib/CMakeLists.txt b/GBSPLib/CMakeLists.txt index f36909c..9c8ef48 100644 --- a/GBSPLib/CMakeLists.txt +++ b/GBSPLib/CMakeLists.txt @@ -1 +1,3 @@ -ADD_LIBRARY (GBSPLib STATIC Brush2.cpp) +ADD_LIBRARY (GBSPLib STATIC BSP.cpp BSP2.cpp Brush2.cpp Fill.cpp GBSPFile.cpp GBSPLib.cpp GBSPPrep.cpp + Leaf.cpp Light.cpp Map.cpp MathLib.cpp Poly.cpp PortFile.cpp Portals.cpp Rad.cpp + TJunct.cpp Texture.cpp Utils.cpp Vis.cpp VisFlood.cpp) diff --git a/GBSPLib/Fill.Cpp b/GBSPLib/Fill.cpp similarity index 95% rename from GBSPLib/Fill.Cpp rename to GBSPLib/Fill.cpp index 40e1f58..a564842 100644 --- a/GBSPLib/Fill.Cpp +++ b/GBSPLib/Fill.cpp @@ -19,8 +19,8 @@ /* Copyright (C) 1999 WildTangent, Inc. All Rights Reserved */ /* */ /****************************************************************************************/ -#include -#include +#include +#include #include "Fill.h" #include "Map.h" @@ -28,7 +28,7 @@ #include "Leaf.h" #include "Poly.h" #include "GBSPFile.h" -#include "Bsp.h" +#include "BSP.h" int32 CurrentFill; geBoolean HitEntity = GE_FALSE; diff --git a/GBSPLib/Fill.h b/GBSPLib/Fill.h index 7005810..bd2dfc9 100644 --- a/GBSPLib/Fill.h +++ b/GBSPLib/Fill.h @@ -22,7 +22,7 @@ #ifndef FILL_H #define FILL_H -#include +#include #include "BSP.h" diff --git a/GBSPLib/GBSPFile.cpp b/GBSPLib/GBSPFile.cpp index 8e7566c..25f46fc 100644 --- a/GBSPLib/GBSPFile.cpp +++ b/GBSPLib/GBSPFile.cpp @@ -19,13 +19,13 @@ /* Copyright (C) 1999 WildTangent, Inc. All Rights Reserved */ /* */ /****************************************************************************************/ -#include -#include +#include +#include -#include "DCommon.h" +#include "G3D/Engine/Drivers/DCommon.h" #include "GBSPFile.h" -#include "VFile.h" -#include "Ram.h" +#include "include/VFile.h" +#include "include/Ram.h" //======================================================================================== // Globals diff --git a/GBSPLib/Gbspfile.h b/GBSPLib/GBSPFile.h similarity index 95% rename from GBSPLib/Gbspfile.h rename to GBSPLib/GBSPFile.h index f2849cd..186549c 100644 --- a/GBSPLib/Gbspfile.h +++ b/GBSPLib/GBSPFile.h @@ -22,14 +22,14 @@ #ifndef GBSPFILE_H #define GBSPFILE_H -#include -#include +#include +#include -#include "DCommon.h" +#include "G3D/Engine/Drivers/DCommon.h" #include "MathLib.h" -#include "vfile.h" -#include "motion.h" -#include "Vec3d.h" +#include "include/VFile.h" +#include "include/Motion.h" +#include "include/Vec3d.h" #define GBSP_VERSION 15 @@ -350,4 +350,4 @@ geBoolean WriteChunk(GBSP_Chunk *Chunk, void *Data, geVFile *f); geBoolean WriteChunks(GBSP_ChunkData *Data, int32 NumChunkData, geVFile *f); -#endif \ No newline at end of file +#endif diff --git a/GBSPLib/Gbsplib.cpp b/GBSPLib/GBSPLib.cpp similarity index 95% rename from GBSPLib/Gbsplib.cpp rename to GBSPLib/GBSPLib.cpp index b2d1959..32feef5 100644 --- a/GBSPLib/Gbsplib.cpp +++ b/GBSPLib/GBSPLib.cpp @@ -19,7 +19,7 @@ /* Copyright (C) 1999 WildTangent, Inc. All Rights Reserved */ /* */ /****************************************************************************************/ -#include +#include #include "GBSPPrep.h" #include "BSP.h" @@ -52,7 +52,7 @@ GBSP_RETVAL GBSP_CreateBSP(char *FileName, BspParms *Parms) GHook.Printf("** Build Date/Time: "__DATE__","__TIME__"\n"); #ifdef HANDLE_EXCEPTIONS - __try + try { if (!CreateBSP(FileName, Parms)) { @@ -64,7 +64,7 @@ GBSP_RETVAL GBSP_CreateBSP(char *FileName, BspParms *Parms) return GBSP_OK; } - __except(1) + catch (...) { // Clean up all errors, free any possible left-over data GHook.Printf("GBSPLib: Fatal error in BSP! Doing Clean-up work.\n"); @@ -109,7 +109,7 @@ GBSP_RETVAL GBSP_SaveGBSPFile(char *FileName) CancelRequest = GE_FALSE; #ifdef HANDLE_EXCEPTIONS - __try + try { if (!ConvertGBSPToFile(FileName)) { @@ -119,7 +119,7 @@ GBSP_RETVAL GBSP_SaveGBSPFile(char *FileName) return GBSP_ERROR; } } - __except(1) + catch (...) { // Clean up all errors, free any possible left-over data GHook.Printf("GBSPLib: Fatal error Saving BSP! Doing Clean-up work.\n"); @@ -170,7 +170,7 @@ GBSP_RETVAL GBSP_VisGBSPFile(char *FileName, VisParms *Parms) CancelRequest = GE_FALSE; #ifdef HANDLE_EXCEPTIONS - __try + try { if (!VisGBSPFile(FileName, Parms)) { @@ -180,7 +180,7 @@ GBSP_RETVAL GBSP_VisGBSPFile(char *FileName, VisParms *Parms) return GBSP_ERROR; } } - __except(1) + catch (...) { // Clean up all errors, free any possible left-over data GHook.Printf("GBSPLib: Fatal error in Vis! Doing Clean-up work.\n"); @@ -209,7 +209,7 @@ GBSP_RETVAL GBSP_LightGBSPFile(char *FileName, LightParms *Parms) CancelRequest = GE_FALSE; #ifdef HANDLE_EXCEPTIONS - __try + try { if (!LightGBSPFile(FileName, Parms)) { @@ -219,7 +219,7 @@ GBSP_RETVAL GBSP_LightGBSPFile(char *FileName, LightParms *Parms) return GBSP_ERROR; } } - __except(1) + catch (...) { // Clean up all errors, free any possible left-over data GHook.Printf("GBSPLib: Fatal error in Radiosity! Doing Clean-up work.\n"); diff --git a/GBSPLib/Gbsplib.h b/GBSPLib/GBSPLib.h similarity index 96% rename from GBSPLib/Gbsplib.h rename to GBSPLib/GBSPLib.h index 1ab5942..9a91564 100644 --- a/GBSPLib/Gbsplib.h +++ b/GBSPLib/GBSPLib.h @@ -22,11 +22,11 @@ #ifndef GBSPLIB_H #define GBSPLIB_H -#include +#include #include "MathLib.h" -#include "Vec3d.h" +#include "include/Vec3d.h" #define GBSP_VERSION_MAJOR 6 #define GBSP_VERSION_MINOR 0 diff --git a/GBSPLib/GBSPPREP.CPP b/GBSPLib/GBSPPrep.cpp similarity index 96% rename from GBSPLib/GBSPPREP.CPP rename to GBSPLib/GBSPPrep.cpp index f01f508..2158fc6 100644 --- a/GBSPLib/GBSPPREP.CPP +++ b/GBSPLib/GBSPPrep.cpp @@ -19,8 +19,8 @@ /* Copyright (C) 1999 WildTangent, Inc. All Rights Reserved */ /* */ /****************************************************************************************/ -#include -#include +#include +#include #include "GBSPPrep.h" @@ -32,8 +32,8 @@ #include "Portals.h" #include "Leaf.h" -#include "VFile.h" -#include "Ram.h" +#include "include/VFile.h" +#include "include/Ram.h" geBoolean SaveGFXModelData(geVFile *f); geBoolean SaveGFXNodes(geVFile *f); diff --git a/GBSPLib/GBSPPREP.H b/GBSPLib/GBSPPrep.h similarity index 96% rename from GBSPLib/GBSPPREP.H rename to GBSPLib/GBSPPrep.h index b757d41..d9d2296 100644 --- a/GBSPLib/GBSPPREP.H +++ b/GBSPLib/GBSPPrep.h @@ -22,8 +22,8 @@ #ifndef GBSPPREP_H #define GBSPPREP_H -#include -#include +#include +#include #include "BSP.h" diff --git a/GBSPLib/Leaf.cpp b/GBSPLib/Leaf.cpp index 4370a49..c961f88 100644 --- a/GBSPLib/Leaf.cpp +++ b/GBSPLib/Leaf.cpp @@ -19,10 +19,10 @@ /* Copyright (C) 1999 WildTangent, Inc. All Rights Reserved */ /* */ /****************************************************************************************/ -#include -#include +#include +#include -#include "Ram.h" +#include "include/Ram.h" #include "Portals.h" #include "GBSPFile.h" #include "BSP.h" @@ -30,7 +30,7 @@ #include "Leaf.h" #include "Brush2.h" -#include "Vec3d.h" +#include "include/Vec3d.h" int32 NumLeafClusters; diff --git a/GBSPLib/Leaf.h b/GBSPLib/Leaf.h index 092c1ba..50ac453 100644 --- a/GBSPLib/Leaf.h +++ b/GBSPLib/Leaf.h @@ -22,7 +22,7 @@ #ifndef LEAF_H #define LEAF_H -#include +#include #include "BSP.h" @@ -40,4 +40,4 @@ geBoolean CreateLeafSides(GBSP_Node *RootNode); geBoolean CreateAreas(GBSP_Node *RootNode); GBSP_Node *FindLeaf(GBSP_Node *Node, geVec3d *Origin); -#endif \ No newline at end of file +#endif diff --git a/GBSPLib/Light.cpp b/GBSPLib/Light.cpp index 68aeafd..9bec9e9 100644 --- a/GBSPLib/Light.cpp +++ b/GBSPLib/Light.cpp @@ -19,11 +19,11 @@ /* Copyright (C) 1999 WildTangent, Inc. All Rights Reserved */ /* */ /****************************************************************************************/ -#include -#include -#include +#include +#include +#include +#include -#include "Math.h" #include "MathLib.h" #include "GBSPFile.h" #include "Light.h" @@ -32,10 +32,9 @@ #include "Utils.h" #include "BSP.h" -#include "Vec3d.h" -#include "XForm3d.h" - -#include "Ram.h" +#include "include/Vec3d.h" +#include "include/XForm3d.h" +#include "include/Ram.h" #define RWM_GOURAUD 1 #define DEBUG_RWM_GOURAUD 1 diff --git a/GBSPLib/Light.h b/GBSPLib/Light.h index 5c7ba31..83b388f 100644 --- a/GBSPLib/Light.h +++ b/GBSPLib/Light.h @@ -22,10 +22,10 @@ #ifndef LIGHT_H #define LIGHT_H -#include -#include +#include +#include -#include "GBSPfile.h" +#include "GBSPFile.h" #include "GBSPLib.h" // Lightparms #include "BSP.h" diff --git a/GBSPLib/Map.cpp b/GBSPLib/Map.cpp index 4dabc02..2b10122 100644 --- a/GBSPLib/Map.cpp +++ b/GBSPLib/Map.cpp @@ -19,21 +19,21 @@ /* Copyright (C) 1999 WildTangent, Inc. All Rights Reserved */ /* */ /****************************************************************************************/ -#include +#include +#include +#include #include "Map.h" #include "GBSPFile.h" #include "Texture.h" #include "BSP.h" -#include "Stdio.h" -#include "Math.h" #include "Brush2.h" #include "Poly.h" -#include "Mathlib.h" +#include "MathLib.h" -#include "Motion.h" // From Genesis (in include path) -#include "Errorlog.h" -#include "Ram.h" +#include "include/Motion.h" // From Genesis (in include path) +#include "include/ErrorLog.h" +#include "include/Ram.h" int32 NumEntities; MAP_Entity Entities[MAX_MAP_ENTITIES]; diff --git a/GBSPLib/Map.h b/GBSPLib/Map.h index 036cba6..c9c6011 100644 --- a/GBSPLib/Map.h +++ b/GBSPLib/Map.h @@ -22,10 +22,10 @@ #ifndef MAP_H #define MAP_H -#include +#include #include "BSP.h" -#include "Motion.h" +#include "include/Motion.h" #define MAX_MAP_ENTITIES 4096*2 #define MAX_MAP_TEXINFO 8192*2 diff --git a/GBSPLib/MATHLIB.CPP b/GBSPLib/MathLib.cpp similarity index 96% rename from GBSPLib/MATHLIB.CPP rename to GBSPLib/MathLib.cpp index 2dfafb3..d1516cc 100644 --- a/GBSPLib/MATHLIB.CPP +++ b/GBSPLib/MathLib.cpp @@ -19,9 +19,9 @@ /* Copyright (C) 1999 WildTangent, Inc. All Rights Reserved */ /* */ /****************************************************************************************/ -#include +#include +#include -#include "Math.h" #include "MathLib.h" geVec3d VecOrigin = {0.0f, 0.0f, 0.0f}; diff --git a/GBSPLib/MATHLIB.H b/GBSPLib/MathLib.h similarity index 97% rename from GBSPLib/MATHLIB.H rename to GBSPLib/MathLib.h index 39fc0ac..ed3afc1 100644 --- a/GBSPLib/MATHLIB.H +++ b/GBSPLib/MathLib.h @@ -22,7 +22,7 @@ #ifndef MATHLIB_H #define MATHLIB_H -#include "Vec3d.h" +#include "include/Vec3d.h" //#define ON_EPSILON (geFloat)0.05 #define ON_EPSILON (geFloat)0.1 diff --git a/GBSPLib/POLY.CPP b/GBSPLib/Poly.cpp similarity index 95% rename from GBSPLib/POLY.CPP rename to GBSPLib/Poly.cpp index c37ad2f..0349fe5 100644 --- a/GBSPLib/POLY.CPP +++ b/GBSPLib/Poly.cpp @@ -19,18 +19,18 @@ /* Copyright (C) 1999 WildTangent, Inc. All Rights Reserved */ /* */ /****************************************************************************************/ -#include +#include #include #include "BSP.h" -#include "Mathlib.h" +#include "MathLib.h" #include "Map.h" #include "Poly.h" #include "Texture.h" #include "GBSPFile.h" #include "Light.h" -#include "Ram.h" +#include "include/Ram.h" int32 NumSubdivides; geFloat SubdivideSize = 235.0f; diff --git a/GBSPLib/POLY.H b/GBSPLib/Poly.h similarity index 97% rename from GBSPLib/POLY.H rename to GBSPLib/Poly.h index 730d233..7299aa9 100644 --- a/GBSPLib/POLY.H +++ b/GBSPLib/Poly.h @@ -22,7 +22,7 @@ #ifndef POLY_H #define POLY_H -#include +#include #include "BSP.h" #include "MathLib.h" diff --git a/GBSPLib/PortFile.cpp b/GBSPLib/PortFile.cpp index 3d09f04..b9987c8 100644 --- a/GBSPLib/PortFile.cpp +++ b/GBSPLib/PortFile.cpp @@ -19,13 +19,13 @@ /* Copyright (C) 1999 WildTangent, Inc. All Rights Reserved */ /* */ /****************************************************************************************/ -#include -#include +#include +#include -#include "Bsp.h" +#include "BSP.h" #include "Portals.h" #include "Leaf.h" -#include "GBspFile.h" +#include "GBSPFile.h" #include "Poly.h" #include "Utils.h" diff --git a/GBSPLib/PORTALS.CPP b/GBSPLib/Portals.cpp similarity index 95% rename from GBSPLib/PORTALS.CPP rename to GBSPLib/Portals.cpp index 1883ab1..b6b6973 100644 --- a/GBSPLib/PORTALS.CPP +++ b/GBSPLib/Portals.cpp @@ -19,19 +19,19 @@ /* Copyright (C) 1999 WildTangent, Inc. All Rights Reserved */ /* */ /****************************************************************************************/ -#include -#include -#include +#include +#include +#include #include "Portals.h" #include "Poly.h" -#include "Bsp.h" +#include "BSP.h" #include "GBSPFile.h" #include "Leaf.h" #include "Utils.h" #include "Map.h" -#include "Ram.h" +#include "include/Ram.h" GBSP_Node *OutsideNode; geVec3d NodeMins, NodeMaxs; diff --git a/GBSPLib/PORTALS.H b/GBSPLib/Portals.h similarity index 97% rename from GBSPLib/PORTALS.H rename to GBSPLib/Portals.h index f9f00f1..4010284 100644 --- a/GBSPLib/PORTALS.H +++ b/GBSPLib/Portals.h @@ -22,7 +22,7 @@ #ifndef PORTALS_H #define PORTALS_H -#include +#include #include "BSP.h" diff --git a/GBSPLib/RAD.CPP b/GBSPLib/Rad.cpp similarity index 95% rename from GBSPLib/RAD.CPP rename to GBSPLib/Rad.cpp index 9d553e1..0db9b89 100644 --- a/GBSPLib/RAD.CPP +++ b/GBSPLib/Rad.cpp @@ -19,19 +19,19 @@ /* Copyright (C) 1999 WildTangent, Inc. All Rights Reserved */ /* */ /****************************************************************************************/ -#include -#include +#include +#include +#include -#include "DCommon.h" +#include "G3D/Engine/Drivers/DCommon.h" #include "BSP.h" #include "GBSPFile.h" -#include "Math.h" #include "MathLib.h" #include "Poly.h" #include "Light.h" #include "Texture.h" -#include "Ram.h" +#include "include/Ram.h" pRAD_Patch *FacePatches; pRAD_Patch *PatchList; diff --git a/GBSPLib/TJunct.cpp b/GBSPLib/TJunct.cpp index c7bc885..4c21a94 100644 --- a/GBSPLib/TJunct.cpp +++ b/GBSPLib/TJunct.cpp @@ -19,15 +19,15 @@ /* Copyright (C) 1999 WildTangent, Inc. All Rights Reserved */ /* */ /****************************************************************************************/ -#include -#include -#include +#include +#include +#include #include "BSP.h" #include "Poly.h" #include "Texture.h" -#include "Ram.h" +#include "include/Ram.h" #define OFF_EPSILON 0.05f @@ -509,4 +509,4 @@ geBoolean FixModelTJunctions(void) } return GE_TRUE; -} \ No newline at end of file +} diff --git a/GBSPLib/TEXTURE.CPP b/GBSPLib/Texture.cpp similarity index 94% rename from GBSPLib/TEXTURE.CPP rename to GBSPLib/Texture.cpp index 0366250..7887565 100644 --- a/GBSPLib/TEXTURE.CPP +++ b/GBSPLib/Texture.cpp @@ -19,19 +19,18 @@ /* Copyright (C) 1999 WildTangent, Inc. All Rights Reserved */ /* */ /****************************************************************************************/ -#include - -#include -#include +#include +#include +#include #include "Map.h" #include "BSP.h" #include "Texture.h" #include "Utils.h" -#include "vfile.h" -#include "bitmap.h" -#include "ram.h" +#include "include/VFile.h" +#include "include/Bitmap.h" +#include "include/Ram.h" int32 NumTextures; GFX_Texture Textures[MAX_MAP_TEXTURES]; diff --git a/GBSPLib/TEXTURE.H b/GBSPLib/Texture.h similarity index 95% rename from GBSPLib/TEXTURE.H rename to GBSPLib/Texture.h index 34436f8..f084c4c 100644 --- a/GBSPLib/TEXTURE.H +++ b/GBSPLib/Texture.h @@ -24,11 +24,11 @@ //#include -#include +#include #include "Map.h" -#include "DCommon.h" +#include "G3D/Engine/Drivers/DCommon.h" #include "GBSPFile.h" -#include "VFile.h" +#include "include/VFile.h" #define TEXTURE_SKYBOX (1<<0) diff --git a/GBSPLib/Utils.cpp b/GBSPLib/Utils.cpp index 7b98780..0f79d44 100644 --- a/GBSPLib/Utils.cpp +++ b/GBSPLib/Utils.cpp @@ -20,11 +20,11 @@ /* */ /****************************************************************************************/ -#include -#include +#include +#include #include "Utils.h" -#include "Basetype.h" +#include "include/BaseType.h" //==================================================================================== // DefaultExtension diff --git a/GBSPLib/Utils.h b/GBSPLib/Utils.h index f6d16b3..d736a0a 100644 --- a/GBSPLib/Utils.h +++ b/GBSPLib/Utils.h @@ -22,7 +22,7 @@ #ifndef UTILS_H #define UTILS_H -#include +#include #define PATH_SEPERATOR '/' @@ -37,4 +37,4 @@ void ExtractFileBase (char *Path, char *Dest); void ExtractFileExtension (char *Path, char *Dest); -#endif \ No newline at end of file +#endif diff --git a/GBSPLib/VIS.CPP b/GBSPLib/Vis.cpp similarity index 96% rename from GBSPLib/VIS.CPP rename to GBSPLib/Vis.cpp index ff34efc..d08835d 100644 --- a/GBSPLib/VIS.CPP +++ b/GBSPLib/Vis.cpp @@ -19,16 +19,16 @@ /* Copyright (C) 1999 WildTangent, Inc. All Rights Reserved */ /* */ /****************************************************************************************/ -#include -#include +#include +#include #include "Utils.h" #include "Vis.h" #include "GBSPFile.h" #include "Poly.h" -#include "Bsp.h" +#include "BSP.h" -#include "Ram.h" +#include "include/Ram.h" int32 NumVisPortals; // Total portals int32 NumVisPortalBytes; // Total portals / 8 @@ -672,4 +672,4 @@ geBoolean CalcPortalInfo(VIS_Portal *Portal) Portal->Radius = BestDist; return GE_TRUE; -} \ No newline at end of file +} diff --git a/GBSPLib/Vis.h b/GBSPLib/Vis.h index 3aa279b..4ee636c 100644 --- a/GBSPLib/Vis.h +++ b/GBSPLib/Vis.h @@ -22,8 +22,8 @@ #ifndef VIS_H #define VIS_H -#include -#include +#include +#include #include "BSP.h" #include "GBSPFile.h" diff --git a/GBSPLib/VISFLOOD.CPP b/GBSPLib/VisFlood.cpp similarity index 95% rename from GBSPLib/VISFLOOD.CPP rename to GBSPLib/VisFlood.cpp index 3f8749a..b6ba8fd 100644 --- a/GBSPLib/VISFLOOD.CPP +++ b/GBSPLib/VisFlood.cpp @@ -19,16 +19,16 @@ /* Copyright (C) 1999 WildTangent, Inc. All Rights Reserved */ /* */ /****************************************************************************************/ -#include -#include +#include +#include #include "Utils.h" #include "Vis.h" #include "GBSPFile.h" #include "Poly.h" -#include "Bsp.h" +#include "BSP.h" -#include "Ram.h" +#include "include/Ram.h" extern int32 NumVisPortals; // Total portals extern int32 NumVisPortalBytes; // Total portals / 8