- file renaming and includes done

- removed some more Visual Studio junk
- Genesis3D now compiles static and shared
- GBSPLib now compiles static and shared
! some ASM instructions must be converted

diff --git a/CMakeLists.txt b/CMakeLists.txt
index efa50ca..43997fb 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -18,12 +18,12 @@ MESSAGE                 ("C-COMPILER: ${CMAKE_C_COMPILER}")
 MESSAGE                 ("CXX-COMPILER: ${CMAKE_CXX_COMPILER}")
 IF                      (${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
 MESSAGE                     ("Unix-like system: ${CMAKE_SYSTEM_NAME}")
 MESSAGE                 ("CXX-COMPILER: ${CMAKE_CXX_COMPILER}")
 IF                      (${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
 MESSAGE                     ("Unix-like system: ${CMAKE_SYSTEM_NAME}")

-SET                         (CMAKE_CXX_FLAGS "-m32 -std=c++1y -fno-builtin -fdiagnostics-color=always -W -Wall -Wextra -Os")
-SET                         (CMAKE_C_FLAGS "-m32 -std=c11 -fno-builtin -fdiagnostics-color=always -W -Wall -Wextra -Os")
+SET                         (CMAKE_CXX_FLAGS "-m32 -std=c++1y -fPIC -fno-builtin -fdiagnostics-color=always -DNDEBUG -W -Wall -Wextra -Os")
+SET                         (CMAKE_C_FLAGS "-m32 -std=c11 -fPIC -fno-builtin -fdiagnostics-color=always -DNDEBUG -W -Wall -Wextra -Os")

 ELSEIF                  (${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
 MESSAGE                     ("Windows-like system: ${CMAKE_SYSTEM_NAME}")
 ELSEIF                  (${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
 MESSAGE                     ("Windows-like system: ${CMAKE_SYSTEM_NAME}")

-SET                         (CMAKE_CXX_FLAGS "-std=c++1y -W -Wall -Wextra -Os")
-SET                         (CMAKE_C_FLAGS "-std=c11 -W -Wall -Wextra -Os")
+SET                         (CMAKE_CXX_FLAGS "-m32 -std=c++1y -fPIC -fno-builtin -W -Wall -Wextra -Os")
+SET                         (CMAKE_C_FLAGS "-m32 -std=c11 -fPIC -fno-builtin -W -Wall -Wextra -Os")

 ELSE                    ()
 MESSAGE                     (FATAL_ERROR "unsupported system: ${CMAKE_SYSTEM_NAME}")
 ENDIF                   ()
 ELSE                    ()
 MESSAGE                     (FATAL_ERROR "unsupported system: ${CMAKE_SYSTEM_NAME}")
 ENDIF                   ()

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

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

diff --git a/G3D/Actor/actor.c b/G3D/Actor.c
similarity index 96%
rename from G3D/Actor/actor.c
rename to G3D/Actor.c
index 5d128f3..c740f75 100644 (file)
--- a/G3D/Actor/actor.c
+++ b/G3D/Actor.c
@@ -34,7 +34,7 @@
 #include <math.h>       // fabs()\r
 #include <stdio.h>      //sscanf\r
 \r
 #include <math.h>       // fabs()\r
 #include <stdio.h>      //sscanf\r
 \r

-#include "world.h"     // to expose _Render apis in actor.h\r
+#include "World.h"     // to expose _Render apis in actor.h\r

 \r
 #include "Actor.h"\r
 #include "Ram.h"\r
 \r
 #include "Actor.h"\r
 #include "Ram.h"\r


@@ -42,7 +42,7 @@
 #include "Body.h"\r
 #include "Motion.h"\r
 #include "ErrorLog.h"\r
 #include "Body.h"\r
 #include "Motion.h"\r
 #include "ErrorLog.h"\r

-#include "strblock.h"\r
+#include "StrBlock.h"\r

 #ifdef _DEBUG\r
 #include <crtdbg.h>\r
 #endif\r
 #ifdef _DEBUG\r
 #include <crtdbg.h>\r
 #endif\r


@@ -417,7 +417,8 @@ GENESISAPI geBoolean GENESISCC geActor_DestroyDirect(geActor **pA)
                gePose_Destroy( &( CurrentActor->Pose ) );\r
                geMotion_Destroy(&(CurrentActor->CueMotion));\r
 \r
                gePose_Destroy( &( CurrentActor->Pose ) );\r
                geMotion_Destroy(&(CurrentActor->CueMotion));\r
 \r

-               assert( _CrtIsValidPointer( &CurrentActor->ActorDefinition, sizeof(CurrentActor->ActorDefinition), FALSE ) );\r
+        // FIXME: _CrtIsValidHeapPointer ?\r
+               //assert( _CrtIsValidPointer( &CurrentActor->ActorDefinition, sizeof(CurrentActor->ActorDefinition), FALSE ) );\r

 \r
                if(geActor_DefIsValid(CurrentActor->ActorDefinition)==GE_TRUE )\r
                {\r
 \r
                if(geActor_DefIsValid(CurrentActor->ActorDefinition)==GE_TRUE )\r
                {\r

diff --git a/G3D/Actor.h b/G3D/Actor.h
index e840384..7e947e6 100644 (file)
--- a/G3D/Actor.h
+++ b/G3D/Actor.h
@@ -91,7 +91,7 @@
 #include "Motion.h"\r
 \r
 #ifdef GE_WORLD_H\r
 #include "Motion.h"\r
 \r
 #ifdef GE_WORLD_H\r

-#include "camera.h"\r
+#include "Camera.h"\r

 #include "Frustum.h"\r
 #endif\r
 \r
 #include "Frustum.h"\r
 #endif\r
 \r

diff --git a/G3D/Actor/actor.h b/G3D/Actor/actor.h
deleted file mode 100644 (file)
index 82cf213..0000000
--- a/G3D/Actor/actor.h
+++ /dev/null
@@ -1,478 +0,0 @@
-/****************************************************************************************/\r
-/*  ACTOR.H                                                                             */\r
-/*                                                                                      */\r
-/*  Author: Mike Sandige                                                                   */\r
-/*  Description:  Actor 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
-/*  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
-/*   Actor\r
-       \r
-       This object is designed to support character animation.\r
-       There are two basic objects to deal with.  \r
-       \r
-       Actor Definition (geActor_Def)\r
-               A geActor_Def embodies the geometry (polygon, and bone information), \r
-               and a library of motions that can be applied to that geometry.\r
-\r
-       Actor\r
-               A geActor is an instance of an actor definition.  The definition is used for \r
-               the geometry, but all additional settings, such as the bone pose, lighting information,\r
-               and cuing information is unique for a geActor.\r
-// GENESIS_PRIVATE_API\r
-       An Actor Definition is created either from an existing Actor Definition file, or from scratch by \r
-       first creating a geBody and geMotions and selecting these into an Actor.  If the Actor Definition\r
-       is constructed from scratch, the objects selected into it (via SetBody and AddMotion) are\r
-       then 'owned' by the actor and will be destroyed along with the Actor when it is destroyed.\r
-    Of course, when the Actor is loaded from a file, the Body and Motion it creates as it is\r
-       loaded are cleaned up when the Actor is destroyed.\r
-\r
-       Once an Actor is created, prepare it for rendering and animating by calling \r
-       Actor_RenderPrep().  This must be called (and it must succeed) before any render or\r
-       pose setting functions can be called.\r
-// GENESIS_PUBLIC_API\r
-\r
-       There are two ways to use an Actor.\r
-       Direct Control\r
-               One method is to directly control the skeleton configuration.  Use _SetPose() to set its \r
-               skeleton using a geMotion animation.  The pose is positioned in world space relative to the \r
-               transform given in SetPose().  Whenever a new skeleton pose is required, call _SetPose() \r
-               to reposition the skeleton for a new point in time. \r
-\r
-               More complex positioning can be achieved by blending more than one animation.  Use\r
-               _BlendPose() after a _SetPose() to blend the second geMotion into the first.  Additional\r
-               blends can be applied by additional _BlendPose() calls.  Each blend is performed on the\r
-               the existing skeleton (the results of any previous blends).\r
-       Cuing\r
-               Another method is to 'cue' up motions that are applied with parameterized blending over time.\r
-               A cued motion takes effect 'now' in time.  The Actor advances in time and repositions itself\r
-               according to its currently cued motions with a call to _AnimationStep().  AnimationStep() \r
-               redefines what the actor thinks 'now' is.  This causes historical cues to be forgotten, and \r
-               motions that are no longer valid are cleaned up.  AnimationTestStep() can be used to position \r
-               the actor for potential queries with its currently cued motions at some arbitrary future time \r
-               - relative to the last AnimationTestStep() call.  AnimationNudge() applies a given transform \r
-               'instantly' to the current actor's cue list.  This is usefull for moving the actor as a \r
-               result of a collision with another object.\r
-\r
-       If a motion contains joint information that does not exactly match the Actor's skeleton \r
-       joints, only the joints that match by name are applied.  So a geMotion can be applied to\r
-       a portion of the Actor, or a geMotion that has more joint information than the skeleton can\r
-       be applied and the extra joint information is ignored.  \r
-        \r
-       Examples of this:  If the Actor is a biped and has no tail, but the motion is for a \r
-       biped with a tail, the geMotion can be applied, but the tail information will be ignored.\r
-       Also if there is a geMotion for only a left arm, it can be applied and it will only affect\r
-       the left arm of the Actor, and consequently its left hand and fingers, but no other \r
-       bones that are not children of the affected bones will be changed.\r
-\r
-               \r
-*/\r
-#ifndef GE_ACTOR_H\r
-#define GE_ACTOR_H\r
-\r
-#include "genesis.h"                           \r
-#include "basetype.h"\r
-#include "extbox.h"\r
-#include "bitmap.h"\r
-\r
-#include "Motion.h"\r
-\r
-#ifdef GE_WORLD_H\r
-#include "camera.h"\r
-#include "Frustum.h"\r
-#endif\r
-\r
-#include "Body.h"\r
-\r
-#ifdef __cplusplus\r
-extern "C" {\r
-#endif\r
-\r
-// GENESIS_PUBLIC_APIS\r
-\r
-#ifndef GE_ACTOR_ENUMS\r
-#define GE_ACTOR_ENUMS\r
-typedef enum \r
-{\r
-               GE_ACTOR_BLEND_LINEAR,          // Treats the blending amount as a linear value\r
-               GE_ACTOR_BLEND_HERMITE          // Applies a parametric smoothing curve to the blending amount\r
-                                                                       //  so that a linear change in BlendAmount parameters will\r
-                                                                       //  result in a smooth (non-linear) change in blending.\r
-} geActor_BlendingType;\r
-\r
-#endif\r
-\r
-typedef struct geActor geActor;                        // an instance of an actor\r
-typedef struct geActor_Def geActor_Def;                // the deinition of an actor's geometry/bone structure\r
-\r
-\r
-// GENESIS_PRIVATE_APIS\r
-\r
-//---------------------------------------------------------------------------------\r
-//   Creation/Destruction functions\r
-//---------------------------------------------------------------------------------\r
-       // Create an 'empty' Actor Definition.\r
-GENESISAPI geActor_Def *GENESISCC geActor_DefCreate(void);\r
-\r
-       // Create an Actor Definition from a file image.\r
-GENESISAPI geActor_Def *GENESISCC geActor_DefCreateFromFile(geVFile *pFile);\r
-\r
-       // Create an additional reference (owner) for the Actor_Definition\r
-GENESISAPI void GENESISCC geActor_DefCreateRef(geActor_Def *pActorDefinition);\r
-\r
-       // Destroy a geActor_Def (its geBody and its geMotions)  Actors that rely on this definition become invalid.\r
-       // can fail if there are actors still referencing this definition.\r
-GENESISAPI geBoolean GENESISCC geActor_DefDestroy(geActor_Def **pActorDefinition);\r
-\r
-       // Create an Actor instance associated with the given Actor Definition \r
-GENESISAPI geActor *GENESISCC geActor_Create(geActor_Def *ActorDefinition);\r
-\r
-       // Create an additional reference (owner) for the Actor\r
-GENESISAPI void GENESISCC geActor_CreateRef(geActor *Actor);\r
-\r
-       // Give the Actor Definition a Body.  geActor becomes responsible for its destruction.\r
-       // sets up default materials as referenced by the Body.\r
-GENESISAPI geBoolean GENESISCC geActor_SetBody( geActor_Def *ActorDefinition, geBody *geBodyGeometry);\r
-\r
-       // Adds a geMotion to the Actor Definition's library.  The ActorDefinition becomes responsible for its destruction.\r
-       // returns the library index to the new geMotion.\r
-GENESISAPI geBoolean GENESISCC geActor_AddMotion(geActor_Def *ActorDefinition, geMotion *M, int *Index);\r
-\r
-       // Destroy an Actor.  \r
-GENESISAPI geBoolean GENESISCC geActor_Destroy(geActor **pA);\r
-\r
-GENESISAPI geBoolean GENESISCC geActor_DestroyDirect(geActor **pA);\r
-\r
-GENESISAPI geBoolean GENESISCC geActor_DefIsValid(const geActor_Def *A);\r
-GENESISAPI geBoolean GENESISCC geActor_IsValid(const geActor *A);\r
-\r
-// GENESIS_PUBLIC_APIS\r
-//---------------------------------------------------------------------------------\r
-//   Queries \r
-//---------------------------------------------------------------------------------\r
-// GENESIS_PRIVATE_APIS\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 Actor Definition associated with Actor A\r
-GENESISAPI geActor_Def *GENESISCC geActor_GetActorDef(const geActor *A);\r
-\r
-       // Writes an existing geActor to a file image.  Returns GE_TRUE on success, GE_FALSE on failure.\r
-GENESISAPI geBoolean GENESISCC geActor_DefWriteToFile(const geActor_Def *A, geVFile *pFile);\r
-       \r
-       // Returns a geBody pointer from the geActor \r
-GENESISAPI geBody *GENESISCC geActor_GetBody(const geActor_Def *ActorDefinition);\r
-\r
-       // Returns GE_TRUE if the actor definition has a bone named 'Name'\r
-GENESISAPI geBoolean GENESISCC geActor_DefHasBoneNamed(const geActor_Def *Ad, const char *Name );\r
-\r
-       // Selects a blending type.  BlendingType only affects the meaning of the \r
-       // BlendAmount parameter for the blend functions.  Can be changed anytime.\r
-GENESISAPI void GENESISCC geActor_SetBlendingType( geActor *A, geActor_BlendingType BlendingType );\r
-\r
-// GENESIS_PUBLIC_APIS\r
-\r
-       // Returns the number of geMotions in the geActors geMotion library.\r
-GENESISAPI int GENESISCC geActor_GetMotionCount(const geActor_Def *ActorDefinition);\r
-\r
-       // Returns a geMotion pointer from the geActors geMotion library\r
-       //   This is an aliased pointer - Not a copy.  Changes to this motion will be reflected\r
-       //   in the actor.  Destroying this return motion will confuse the actor.\r
-       // Index must be in range [0..geActor_GetMotionCount-1]\r
-GENESISAPI geMotion *GENESISCC geActor_GetMotionByIndex(const geActor_Def *ActorDefinition, int Index );\r
-\r
-       // Returns a geMotion pointer from the geActors geMotion library\r
-       //   This is an aliased pointer - Not a copy.  Changes to this motion will be reflected\r
-       //   in the actor.  Destroying this return motion will confuse the actor.\r
-       // if there is no motion that matches the given name, the return value will be NULL\r
-GENESISAPI geMotion *GENESISCC geActor_GetMotionByName(const geActor_Def *ActorDefinition, const char *Name );\r
-\r
-       // Returns a motion name given an ActorDef and a motion index.\r
-GENESISAPI const char *GENESISCC geActor_GetMotionName(const geActor_Def *ActorDefinition, int Index );\r
-\r
-       // Returns the number of materials for an instance of an actor.\r
-GENESISAPI int GENESISCC geActor_GetMaterialCount(const geActor *A);\r
-\r
-       // Returns the current material for an instance of an actor\r
-GENESISAPI geBoolean GENESISCC geActor_GetMaterial(const geActor *Actor, int MaterialIndex,\r
-                                                                               geBitmap **Bitmap, geFloat *Red, geFloat *Green, geFloat *Blue);\r
-\r
-       // Allows a material to be overriden in an actor instance\r
-GENESISAPI geBoolean GENESISCC geActor_SetMaterial(geActor *Actor, int MaterialIndex,\r
-                                                                               geBitmap *Bitmap,  geFloat Red,  geFloat Green,  geFloat Blue);\r
-\r
-\r
-\r
-       // Gets the current transform for a single bone in A.  (actor space->world space transform)\r
-       // with a NULL BoneName, this returns the current 'root' transform\r
-GENESISAPI geBoolean GENESISCC geActor_GetBoneTransform(const geActor *A, const char *BoneName, geXForm3d *Transform);\r
-       \r
-       // Gets the extent box (axial-aligned bounding box) for a given bone (for the current pose)\r
-       // if BoneName is NULL, gets the a general bounding box from the body of the actor if it has been set.\r
-GENESISAPI geBoolean GENESISCC geActor_GetBoneExtBox(const geActor *A,\r
-                                                                                const char *BoneName,geExtBox *ExtBox);\r
-\r
-       // Gets the non-axial-aligned bounding box for a given bone (for the current pose)\r
-       //  The box is specified by a corner, and\r
-       //  a non-normalized orientation transform.  Add DX,DY,DZ components \r
-       //  of the orientation to get other corners of the box\r
-       // if BoneName is NULL, gets the a general bounding box from the body of the actor if it has been set.\r
-GENESISAPI geBoolean GENESISCC geActor_GetBoneBoundingBox(const geActor *A,\r
-                                                                                                                const char *BoneName,\r
-                                                                                                                geVec3d *Corner,\r
-                                                                                                                geVec3d *DX,\r
-                                                                                                                geVec3d *DY,\r
-                                                                                                                geVec3d *DZ);\r
-\r
-       // Gets the current axial-aligned bounding box for an actor's bone configuration\r
-       // takes all bones into account\r
-GENESISAPI geBoolean GENESISCC geActor_GetDynamicExtBox( const geActor *A, geExtBox *ExtBox);\r
-       \r
-       // Gets an assigned general non changing bounding box from the actor\r
-GENESISAPI geBoolean GENESISCC geActor_GetExtBox(const geActor *A, geExtBox *ExtBox);\r
-\r
-       // Sets an assigned general non changing bounding box from the actor\r
-GENESISAPI geBoolean GENESISCC geActor_SetExtBox(geActor *A, const geExtBox *ExtBox,\r
-                                       const char *CenterBoxOnThisNamedBone);          // NULL uses root position of actor\r
-\r
-       // Gets the rendering hint bounding box from the actor\r
-       //   if the RenderHintExtBox is disabled, Enabled is GE_FALSE, and the box returned has zero dimensions, \r
-       //   centered at the root position of the actor.  If the RenderHintExtBox is enabled, Enabled is\r
-       //   GE_TRUE, and the box returned is the one set with _SetRenderHintExtBox, offset by the \r
-       //   bone position of the bone named in _SetRenderHintExtBox().\r
-GENESISAPI geBoolean GENESISCC geActor_GetRenderHintExtBox(const geActor *A, geExtBox *Box, geBoolean *Enabled);\r
-\r
-       // Sets a rendering hint bounding box from the actor.  Increases performance by \r
-       //   enabling the rendering of the actor to occur only if the box is visible.\r
-       //   If the box is not visible, a detailed analysis of the actor's current geometry is avoided.\r
-       //   This does allow errors to occur: \r
-       //   If the actor has a bit of geometry that extends outside this box for some\r
-       //   animation, that extended geometry may not be drawn, if the box if off-screen.   \r
-       //   If the render hint box is not set, the engine will make no conservative assumptions \r
-       //   about the visibility of an actor - it will always be drawn if any portion of it is\r
-       //   visible.\r
-       //   To attach the box to the 'root' bone, pass NULL for CenterBoxOnThisNamedBone\r
-       //   For disabling the hint box: (disabled is default) pass Box with zero mins and maxs\r
-GENESISAPI geBoolean GENESISCC geActor_SetRenderHintExtBox(geActor *A, const geExtBox *Box,\r
-                                                                                               const char *CenterBoxOnThisNamedBone );\r
-\r
-\r
-       // Returns the pointer which was set with geActor_SetUserData.  NULL if not set.\r
-GENESISAPI void *GENESISCC geActor_GetUserData(const geActor *A);\r
-\r
-       // Sets the actors user data pointer to the given value.  For clients only.\r
-GENESISAPI void GENESISCC geActor_SetUserData(geActor *A, void *UserData);\r
-\r
-\r
-//--------------------------------------------------------------------------------\r
-//   Posing and Rendering\r
-//--------------------------------------------------------------------------------\r
-\r
-// GENESIS_PRIVATE_APIS\r
-\r
-#ifdef GE_WORLD_H\r
-       // Prepares the geActor for rendering and posing.  Call Once once the actor is fully created.\r
-       // Must be called prior to render/pose/setworldtransform \r
-geBoolean GENESISCC geActor_RenderPrep( geActor *A, geWorld *World);\r
-\r
-       // Draws the geActor.  (RenderPrep must be called first)\r
-geBoolean GENESISCC geActor_RenderThroughFrustum(const geActor *A, geEngine *Engine, geWorld *World, geCamera *Camera, Frustum_Info *FInfo);\r
-geBoolean GENESISCC geActor_Render(const geActor *A, geEngine *Engine, geWorld *World, geCamera *Camera);\r
-#endif\r
-\r
-// GENESIS_PUBLIC_APIS\r
-\r
-       // Poses the actor in its default pose\r
-       // Transform is where to position the root for this pose.\r
-       //  if Transform is NULL, the root for the pose is assumed to be the root of the actor.\r
-GENESISAPI void GENESISCC geActor_ClearPose(geActor *A, const geXForm3d *Transform);\r
-\r
-       // Poses the actor using given motion M at a time offset of Time\r
-       // Transform is where to position the root for this pose.\r
-       //  if Transform is NULL, the root for the pose is assumed to be the root of the actor.\r
-GENESISAPI void GENESISCC geActor_SetPose(geActor *A, const geMotion *Motion, geFloat Time, const geXForm3d *Transform);\r
-\r
-       // Blends the current pose of the geActor with \r
-       //  a new pose using motion M at a time offset of Time\r
-       // A BlendAmount of 0 will result in the existing pose, A BlendAmount of 1 will\r
-       // result in the new pose from M.  The BlendingType set by _SetBlendingType() determines\r
-       // the blending function between 0 and 1\r
-       // Transform is where to position the root for this pose.\r
-       //  if Transform is NULL, the root for the pose is assumed to be the root of the actor.\r
-GENESISAPI void GENESISCC geActor_BlendPose(geActor *A, const geMotion *Motion, geFloat Time,\r
-                                               const geXForm3d *Transform, geFloat BlendAmount);\r
-\r
-\r
-GENESISAPI geBoolean GENESISCC geActor_GetBoneAttachment(const geActor *A, const char *BoneName, geXForm3d *Transform);\r
-GENESISAPI geBoolean GENESISCC geActor_SetBoneAttachment(geActor *A, const char *BoneName, geXForm3d *Transform);\r
-\r
-// GENESIS_PRIVATE_APIS\r
-\r
-GENESISAPI geBoolean GENESISCC geActor_Attach( geActor *Slave,  const char *SlaveBoneName,\r
-                                               const geActor *Master, const char *MasterBoneName, \r
-                                               const geXForm3d *Attachment);\r
-\r
-GENESISAPI void GENESISCC geActor_Detach(geActor *Slave);\r
-\r
-//Environmental mapping...\r
-GENESISAPI void GENESISCC geActor_SetEnvironOptions( geActor *A, geEnvironmentOptions *opts );\r
-\r
-GENESISAPI geEnvironmentOptions GENESISCC geActor_GetEnvironOptions( geActor *A );\r
-\r
-// GENESIS_PUBLIC_APIS\r
-GENESISAPI geBoolean GENESISCC geActor_SetLightingOptions(geActor *A,\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
-                                                                       geFloat AmbientLightRed,                        // 0 .. 255\r
-                                                                       geFloat AmbientLightGreen,                      // 0 .. 255\r
-                                                                       geFloat AmbientLightBlue,                       // 0 .. 255\r
-                                                                       geBoolean AmbientLightFromFloor,        // GE_TRUE or GE_FALSE\r
-                                                                       int MaximumDynamicLightsToUse,          // 0 for none\r
-                                                                       const char *LightReferenceBoneName, //NULL for root\r
-                                                                       geBoolean PerBoneLighting);                     \r
-                                                                       // if GE_TRUE, then dynamic lighting attenuation and direction is computed\r
-                                                                       // for each bone.  if GE_FALSE, then the computations are relative to the \r
-                                                                       // single bone named by the LightReferenceBoneName\r
-\r
-GENESISAPI geBoolean GENESISCC geActor_GetLightingOptions(const geActor *A,\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
-                                                                       geFloat *AmbientLightRed,                       // 0 .. 255\r
-                                                                       geFloat *AmbientLightGreen,                     // 0 .. 255\r
-                                                                       geFloat *AmbientLightBlue,                      // 0 .. 255\r
-                                                                       geBoolean *UseAmbientLightFromFloor,// GE_TRUE or GE_FALSE\r
-                                                                       int *MaximumDynamicLightsToUse,         \r
-                                                                       const char **LightReferenceBoneName,\r
-                                                                       geBoolean *PerBoneLighting);            // NULL for root\r
-\r
-\r
-GENESISAPI void GENESISCC geActor_SetScale(geActor *A, geFloat ScaleX,geFloat ScaleY,geFloat ScaleZ);\r
-\r
-// LWM_ACTOR_RENDERING:\r
-GENESISAPI geFloat GENESISCC geActor_GetAlpha(const geActor *A) ;\r
-// LWM_ACTOR_RENDERING:\r
-GENESISAPI void GENESISCC geActor_SetAlpha(geActor *A, geFloat Alpha) ;\r
-\r
-GENESISAPI geBoolean GENESISCC geActor_GetStaticLightingOptions(const geActor *Actor,  geBoolean *UseAmbientLightFromStaticLights,     geBoolean *TestRayCollision,    int *MaxStaticLightsToUse       );\r
-GENESISAPI geBoolean GENESISCC geActor_SetStaticLightingOptions(geActor    *A,\r
-   geBoolean AmbientLightFromStaticLights,\r
-   geBoolean TestRayCollision,\r
-   int MaxStaticLightsToUse\r
-   );\r
-\r
-GENESISAPI geBoolean GENESISCC geActor_SetShadow(geActor *A, \r
-                                               geBoolean DoShadow, \r
-                                               geFloat Radius,\r
-                                               const geBitmap *ShadowMap,\r
-                                               const char * BoneName);\r
-\r
-//  Animation Cuing API:\r
-// high level Actor animation:  The principle is that motions can be applied to an actor\r
-// and the actor will keep track of which motions are currently appropriate.  Call \r
-//     _AnimationStep() to compute a new pose for an elapsed time interval.  The new pose\r
-//  will take into account all motions that are 'currently' cued up to be set or blended.\r
-\r
-\r
-       // cue up a new motion.  The motion begins at the current time.  The motion can be \r
-       // blended in or out over time and time scaled.  If the return value is GE_FALSE, the \r
-       // animation was not cued up (failure implies Actor is incompletely initialized).\r
-GENESISAPI geBoolean GENESISCC geActor_AnimationCue( \r
-               geActor *A,                                             // actor to apply animation to\r
-               geMotion *Motion,                               // motion to Cue\r
-               geFloat TimeScaleFactor,                // time scale to apply to cued motion\r
-               geFloat TimeIntoMotion,                 // time offset to begin motion with (Not TimeScaled)\r
-               geFloat BlendTime,                              // time to apply a blend. \r
-               geFloat BlendFromAmount,                // blend value at current time\r
-               geFloat BlendToAmount,                  // blend value after BlendTime time has elapsed\r
-               const geXForm3d *MotionTransform);      // local transform to adjust motion by (NULL implies NO transform)\r
-\r
-       // removes the last animation cue that was cued up.  Can be called repeatedly to successively\r
-       // remove older and older cues.  Returns GE_TRUE when a cue was removed, GE_FALSE if there \r
-       // are no cues to remove.\r
-GENESISAPI geBoolean GENESISCC geActor_AnimationRemoveLastCue( geActor *A );\r
-\r
-       // applies a time step to actor A.  re-poses the actor according to all currently applicable\r
-       // Animation Cues. (failure implies Actor is incompletely initialized)\r
-GENESISAPI geBoolean GENESISCC geActor_AnimationStep(geActor *A, geFloat DeltaTime );\r
-\r
-       // applies a 'temporary' time step to actor A.  re-poses the actor according to all \r
-       // currently appliciable cues.  (failure implies Actor is incompletely initialized)\r
-       // DeltaTime is always relative to the the last AnimationStep()\r
-GENESISAPI geBoolean GENESISCC geActor_AnimationTestStep(geActor *A, geFloat DeltaTime);\r
-\r
-       // optimized version of geActor_AnimationStep.  Limits calculations to the bone named BoneName, and it's \r
-       // parents.  BoneName will be correctly computed, but the other bones will be wrong.  This is usefull for \r
-       // moving and animating an actor that is not actually visible.  Rendering and queries will be 'optimized'\r
-       // until the actor is given any pose or animation that doesn't go through geActor_AnimationStepBoneOptimized() or \r
-       //  geActor_AnimationTestStepBoneOptimized().  BoneName can be NULL to compute only 'root' bone.\r
-GENESISAPI geBoolean GENESISCC geActor_AnimationStepBoneOptimized(geActor *A, geFloat DeltaTime, const char *BoneName );\r
-\r
-       // optimized version of geActor_AnimationTestStep.  Limits calculations to the bone named BoneName, and it's \r
-       // parents.  BoneName will be correctly computed, but the other bones will be wrong.  This is usefull for \r
-       // moving and animating an actor that is not actually visible.  Rendering and queries will be 'optimized'\r
-       // until the actor is given any pose or animation that doesn't go through geActor_AnimationStepBoneOptimized() or \r
-       //  geActor_AnimationTestStepBoneOptimized().  BoneName can be NULL to compute only 'root' bone.\r
-GENESISAPI geBoolean GENESISCC geActor_AnimationTestStepBoneOptimized(geActor *A, geFloat DeltaTime, const char *BoneName);\r
-\r
-\r
-       // applies an 'immediate' offset to the animated actor\r
-GENESISAPI geBoolean GENESISCC geActor_AnimationNudge(geActor *A, geXForm3d *Offset);\r
-\r
-\r
-GENESISAPI geBoolean GENESISCC geActor_GetAnimationEvent(geActor *A,                                           \r
-       const char **ppEventString);            // Return data, if return value is GE_TRUE\r
-\r
-       // returns number of actors that are currently created.\r
-GENESISAPI int GENESISCC geActor_GetCount(void);\r
-\r
-//     eaa3 07/21/2000 Mods for detailed collision detection\r
-\r
-GENESISAPI geBoolean GENESISCC geActor_GetBoneExtBoxByIndex(\r
-       const geActor *A, \r
-       int BoneIndex,\r
-       geExtBox *ExtBox);\r
-\r
-GENESISAPI geBoolean GENESISCC geActor_GetBoneTransformByIndex(const geActor *A, int BoneIndex, geXForm3d *Transform);\r
-\r
-GENESISAPI int geActor_GetBoneCount(const geActor *A);\r
-\r
-//MRB BEGIN    \r
-// Unlike geActor_GetExtBox, this gets the bounding box in non-world coordinates.      \r
-// Whatever you put in with geActor_SetExtBox, you get out with this function.\r
-GENESISAPI void GENESISCC geActor_GetNonWorldExtBox(const geActor *A, geExtBox *ExtBox);\r
-GENESISAPI void GENESISCC geActor_GetPosition(const geActor *A, geVec3d *Pos);\r
-//MRB END\r
-\r
-// GENESIS_PRIVATE_APIS\r
-       // call setscale and setshadow after preparing the actor for rendering (renderprep)\r
-\r
-\r
-#ifdef __cplusplus\r
-}\r
-#endif\r
-\r
-\r
-#endif\r
-\r

diff --git a/G3D/Actor/body.h b/G3D/Actor/body.h
deleted file mode 100644 (file)
index 186e3fc..0000000
--- a/G3D/Actor/body.h
+++ /dev/null
@@ -1,136 +0,0 @@
-/****************************************************************************************/\r
-/*  BODY.H                                                                              */\r
-/*                                                                                      */\r
-/*  Author: Mike Sandige                                                                   */\r
-/*  Description: Actor body 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
-/*  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_BODY_H\r
-#define GE_BODY_H \r
-\r
-/* This object is for managing the data associated with a skeletal-based mesh, \r
-   a 'body'.\r
-   This object holds the geometry for the body and the list of materials needed.\r
-*/\r
-\r
-#include "basetype.h"\r
-#include "xform3d.h"\r
-#include "vfile.h"\r
-#include "bitmap.h"\r
-\r
-#ifdef __cplusplus\r
-extern "C" {\r
-#endif\r
-\r
-#define GE_BODY_NUMBER_OF_LOD                  (4)             // 0 is highest detail\r
-#define GE_BODY_NO_PARENT_BONE         (-1)   \r
-#define GE_BODY_HIGHEST_LOD            (0)\r
-\r
-#define GE_BODY_ROOT                                   (-1)    // for specifying 'root' bounding box.\r
-\r
-typedef struct geBody geBody;\r
-\r
-\r
-\r
-geBody *GENESISCC geBody_Create(void);\r
-\r
-void GENESISCC geBody_Destroy(geBody **B);\r
-\r
-geBoolean GENESISCC geBody_IsValid(const geBody *B);\r
-\r
-\r
-geBoolean GENESISCC geBody_GetGeometryStats(const geBody *B, int lod, int *Vertices, int *Faces, int *Normals);\r
-\r
-geBoolean GENESISCC geBody_AddFace(    geBody *B,\r
-                                                               const geVec3d *Vertex1, const geVec3d *Normal1, \r
-                                                               geFloat U1, geFloat V1, int BoneIndex1,\r
-                                                               const geVec3d *Vertex2, const geVec3d *Normal2, \r
-                                                                       geFloat U2, geFloat V2, int BoneIndex2,\r
-                                                               const geVec3d *Vertex3, const geVec3d *Normal3, \r
-                                                                       geFloat U3, geFloat V3, int BoneIndex3,\r
-                                                               int MaterialIndex);\r
-\r
-                       // Bitmap is added to body.  It's reference count is increased.  Caller still owns a pointer\r
-                       // to the bitmap, and is responsible for destroying it.\r
-geBoolean GENESISCC geBody_AddMaterial( geBody *B, \r
-                                                                       const char *MaterialName, \r
-                                                                       geBitmap *Bitmap,\r
-                                                                       geFloat Red, \r
-                                                                       geFloat Green, \r
-                                                                       geFloat Blue,\r
-                                                                       int *MaterialIndex);\r
-\r
-                       // returned bitmap is a pointer to the bitmap in the body's list.  It may not be destroyed.\r
-                       // if caller would like to 'own' a copy of that bitmap pointer, it should call geBitmap_CreateRef()\r
-geBoolean GENESISCC geBody_GetMaterial(const geBody *Body, int MaterialIndex,\r
-                                                                               const char **MaterialName,\r
-                                                                               geBitmap **Bitmap, geFloat *Red, geFloat *Green, geFloat *Blue);\r
-\r
-                       // Bitmap is set into the body.  It's reference count is increased.  Caller still owns a pointer\r
-                       // to the bitmap, and is responsible for destroying it.\r
-geBoolean GENESISCC geBody_SetMaterial(geBody *Body, int MaterialIndex,\r
-                                                                               geBitmap *Bitmap,  geFloat Red,  geFloat Green,  geFloat Blue);\r
-\r
-int GENESISCC geBody_GetMaterialCount(const geBody *B);\r
-\r
-geBoolean GENESISCC geBody_AddBone( geBody *B, \r
-                                                       int ParentBoneIndex,\r
-                                                       const char *BoneName, \r
-                                                       const geXForm3d *AttachmentMatrix,\r
-                                                       int *BoneIndex);\r
-\r
-geBoolean GENESISCC geBody_ComputeLevelsOfDetail( geBody *B ,int Levels);\r
-\r
-int GENESISCC geBody_GetBoneCount(const geBody *B);\r
-\r
-void GENESISCC geBody_GetBone( const geBody *B, \r
-                                               int BoneIndex, \r
-                                               const char **BoneName,\r
-                                               geXForm3d *Attachment, \r
-                                               int *ParentBoneIndex);\r
-\r
-int32 GENESISCC geBody_GetBoneNameChecksum(const geBody *B);\r
-\r
-void GENESISCC geBody_SetBoundingBox( geBody *B,\r
-                                                       int BoneIndex,          // GE_BODY_ROOT for specifing 'root' bounding box.\r
-                                                       const geVec3d *MinimumBoxCorner,\r
-                                                       const geVec3d *MaximumBoxCorner);\r
- \r
-\r
-geBoolean GENESISCC geBody_GetBoundingBox( const geBody *B, \r
-                                                       int BoneIndex,          // GE_BODY_ROOT for specifing 'root' bounding box.\r
-                                                       geVec3d *MinimumBoxCorner,\r
-                                                       geVec3d *MaximumBoxCorner);\r
-\r
-geBoolean GENESISCC geBody_GetBoneByName(const geBody* B,\r
-       const char* BoneName,\r
-       int* pBoneIndex,\r
-       geXForm3d* Attachment,\r
-       int* pParentBoneIndex);\r
-\r
-geBoolean GENESISCC geBody_WriteToFile(const geBody *B, geVFile *pFile);\r
-geBody  *GENESISCC  geBody_CreateFromFile(geVFile *pFile);\r
-\r
-\r
-\r
-\r
-#ifdef __cplusplus\r
-}\r
-#endif\r
-\r
-#endif\r
-                                       
\ No newline at end of file

diff --git a/G3D/Actor/motion.h b/G3D/Actor/motion.h
deleted file mode 100644 (file)
index de4fbea..0000000
--- a/G3D/Actor/motion.h
+++ /dev/null
@@ -1,180 +0,0 @@
-/****************************************************************************************/\r
-/*  MOTION.H                                                                           */\r
-/*                                                                                      */\r
-/*  Author: Mike Sandige                                                                   */\r
-/*  Description: Motion 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
-/*  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_MOTION_H\r
-#define GE_MOTION_H\r
-\r
-/*     motion\r
-\r
-       This object is a list of named Path objects\r
-\r
-*/\r
-\r
-#include <stdio.h>\r
-#include "basetype.h"\r
-#include "path.h"\r
-#include "vfile.h"\r
-\r
-#ifdef __cplusplus\r
-extern "C" {\r
-#endif\r
-\r
-// GENESIS_PUBLIC_APIS\r
-typedef struct geMotion geMotion;\r
-\r
-GENESISAPI geMotion *GENESISCC geMotion_Create(geBoolean ManageNames);\r
-\r
-GENESISAPI void GENESISCC geMotion_Destroy(geMotion **PM);\r
-\r
-// GENESIS_PRIVATE_APIS\r
-\r
-GENESISAPI geBoolean GENESISCC geMotion_IsValid(const geMotion *M);\r
-\r
-       // AddPath adds a reference of P to the motion M.  Ownership is shared - The caller must destroy P.\r
-GENESISAPI geBoolean GENESISCC geMotion_AddPath(geMotion *M, gePath *P,const char *Name,int *Index);\r
-\r
-GENESISAPI geBoolean GENESISCC geMotion_HasNames(const geMotion *M);\r
-GENESISAPI int32 GENESISCC geMotion_GetNameChecksum(const geMotion *M);\r
-\r
-GENESISAPI geBoolean GENESISCC geMotion_RemoveNames(geMotion *M);\r
-\r
-GENESISAPI void GENESISCC geMotion_SampleChannels(const geMotion *M, int PathIndex, geFloat Time, geQuaternion *Rotation, geVec3d *Translation);\r
-GENESISAPI geBoolean GENESISCC geMotion_SampleChannelsNamed(const geMotion *M, const char *PathName, geFloat Time, geQuaternion *Rotation, geVec3d *Translation);\r
-\r
-GENESISAPI void GENESISCC geMotion_Sample(const geMotion *M, int PathIndex, geFloat Time, geXForm3d *Transform);\r
-GENESISAPI geBoolean GENESISCC geMotion_SampleNamed(const geMotion *M, const char *PathName, geFloat Time, geXForm3d *Transform);\r
-\r
-       // the returned Paths from _Get functions should not be destroyed.  \r
-       // if ownership is desired, call gePath_CreateRef() 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 method to relinquish ownership\r
-GENESISAPI gePath *GENESISCC geMotion_GetPathNamed(const geMotion *M,const char *Name);\r
-GENESISAPI const char *GENESISCC geMotion_GetNameOfPath(const geMotion *M, int Index);\r
-\r
-// GENESIS_PUBLIC_APIS\r
-GENESISAPI gePath *GENESISCC geMotion_GetPath(const geMotion *M,int Index);\r
-GENESISAPI int GENESISCC geMotion_GetPathCount(const geMotion *M);\r
-\r
-\r
-GENESISAPI geBoolean GENESISCC geMotion_SetName(geMotion *M, const char * Name);\r
-GENESISAPI const char *GENESISCC geMotion_GetName(const geMotion *M);\r
-\r
-// GENESIS_PRIVATE_APIS\r
-\r
-       // support for compound motions.  A motion can either have sub-motions, or be single motion.\r
-       // these functions support motions that have sub-motions.\r
-GENESISAPI int GENESISCC geMotion_GetSubMotionCount(const geMotion*M);\r
-\r
-       // the returned motions from these _Get functions should not be destroyed.  \r
-       // if ownership is desired, call geMotion_CreateRef() 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 method to relinquish ownership\r
-GENESISAPI geMotion *GENESISCC geMotion_GetSubMotion(const geMotion *M,int Index);\r
-GENESISAPI geMotion *GENESISCC geMotion_GetSubMotionNamed(const geMotion *M,const char *Name);\r
-GENESISAPI geBoolean GENESISCC geMotion_AddSubMotion(\r
-                                                               geMotion *ParentMotion,\r
-                                                               geFloat TimeScale,                      // Scale factor for this submotion\r
-                                                               geFloat TimeOffset,                     // Time in parent motion when submotion should start\r
-                                                               geMotion *SubMotion,\r
-                                                               geFloat StartTime,                      // Blend start time (relative to submotion)\r
-                                                               geFloat StartMagnitude,         // Blend start magnitude (0..1)\r
-                                                               geFloat EndTime,                        // Blend ending time (relative to submotion)\r
-                                                               geFloat EndMagnitude,           // Blend ending magnitude (0..1)\r
-                                                               const geXForm3d *Transform,     // Base transform to apply to this submotion\r
-                                                               int *Index);                            // returned motion index\r
-\r
-GENESISAPI geMotion *GENESISCC  geMotion_RemoveSubMotion(geMotion *ParentMotion, int SubMotionIndex);\r
-\r
-// Get/Set submotion time offset.  The time offset is the offset into the \r
-// compound (parent) motion at which the submotion should start.\r
-GENESISAPI geFloat   GENESISCC  geMotion_GetTimeOffset( const geMotion *M,int SubMotionIndex );\r
-GENESISAPI geBoolean  GENESISCC geMotion_SetTimeOffset( geMotion *M,int SubMotionIndex,geFloat TimeOffset );\r
-\r
-// Get/Set submotion time scale.  Time scaling is applied to the submotion after the TimeOffset\r
-// is applied.  The formula is:  (CurrentTime - TimeOffset) * TimeScale\r
-GENESISAPI geFloat   GENESISCC  geMotion_GetTimeScale( const geMotion *M,int SubMotionIndex );\r
-GENESISAPI geBoolean  GENESISCC geMotion_SetTimeScale( geMotion *M,int SubMotionIndex,geFloat TimeScale );\r
-\r
-// Get blending amount for a particular submotion.  The Time parameter is parent-relative.\r
-GENESISAPI geFloat    GENESISCC geMotion_GetBlendAmount( const geMotion *M, int SubMotionIndex, geFloat Time);\r
-\r
-// Get/Set blending path.  The keyframe times in the blend path are relative to the submotion.\r
-GENESISAPI gePath    *GENESISCC geMotion_GetBlendPath( const geMotion *M,int SubMotionIndex );\r
-GENESISAPI geBoolean  GENESISCC geMotion_SetBlendPath( geMotion *M,int SubMotionIndex, gePath *Blend );\r
-\r
-GENESISAPI const geXForm3d *GENESISCC geMotion_GetBaseTransform( const geMotion *M,int SubMotionIndex );\r
-GENESISAPI geBoolean  GENESISCC geMotion_SetBaseTransform( geMotion *M,int SubMotionIndex, geXForm3d *BaseTransform );\r
-GENESISAPI geBoolean  GENESISCC geMotion_GetTransform(const geMotion *M, geFloat Time, geXForm3d *Transform);\r
-// GENESIS_PUBLIC_APIS\r
-\r
-       // gets time of first key and time of last key (as if motion did not loop)\r
-       // if there are no paths in the motion: returns GE_FALSE and times are not set\r
-       // otherwise returns GE_TRUE\r
-       //\r
-       // For a compound motion, GetTimeExtents will return the extents of the scaled submotions.\r
-       // For a single motion, no scaling is applied.\r
-GENESISAPI geBoolean GENESISCC geMotion_GetTimeExtents(const geMotion *M,geFloat *StartTime,geFloat *EndTime);\r
-\r
-// Only one event is allowed per time key.\r
-\r
-GENESISAPI geBoolean GENESISCC geMotion_InsertEvent(geMotion *M, geFloat tKey, const char* String);\r
-       // Inserts the new event and corresponding string.\r
-\r
-GENESISAPI geBoolean GENESISCC geMotion_DeleteEvent(geMotion *M, geFloat tKey);\r
-       // Deletes the event\r
-\r
-GENESISAPI void GENESISCC geMotion_SetupEventIterator(\r
-       geMotion *M,\r
-       geFloat StartTime,                              // Inclusive search start\r
-       geFloat EndTime);                               // Non-inclusive search stop\r
-       // For searching or querying the array for events between two times\r
-       // times are compaired [StartTime,EndTime), '[' is inclusive, ')' is \r
-       // non-inclusive.  This prepares the geMotion_GetNextEvent() function.\r
-\r
-GENESISAPI geBoolean GENESISCC geMotion_GetNextEvent(\r
-       geMotion *M,                                            // Event list to iterate\r
-       geFloat *pTime,                         // Return time, if found\r
-       const char **ppEventString);    // Return data, if found\r
-       // Iterates from StartTime to EndTime as setup in geMotion_SetupEventIterator()\r
-       // and for each event between these times [StartTime,EndTime)\r
-       // this function will return Time and EventString returned for that event\r
-       // and the iterator will be positioned for the next search.  When there \r
-       // are no more events in the range, this function will return GE_FALSE (Time\r
-       // will be 0 and ppEventString will be empty).\r
-\r
-GENESISAPI geBoolean GENESISCC geMotion_GetEventExtents(const geMotion *M,\r
-                       geFloat *FirstEventTime,\r
-                       geFloat *LastEventTime);\r
-       // returns the time associated with the first and last events \r
-       // returns GE_FALSE if there are no events (and Times are not set)\r
-\r
-\r
-// GENESIS_PRIVATE_APIS\r
-GENESISAPI geMotion *GENESISCC geMotion_CreateFromFile(geVFile *f);\r
-GENESISAPI geBoolean GENESISCC geMotion_WriteToFile(const geMotion *M, geVFile *f);\r
-GENESISAPI geBoolean GENESISCC geMotion_WriteToBinaryFile(const geMotion *M,geVFile *pFile);\r
-\r
-#ifdef __cplusplus\r
-}\r
-#endif\r
-\r
-\r
-#endif\r

diff --git a/G3D/Actor/path.h b/G3D/Actor/path.h
deleted file mode 100644 (file)
index 6052947..0000000
--- a/G3D/Actor/path.h
+++ /dev/null
@@ -1,153 +0,0 @@
-/****************************************************************************************/\r
-/*  PATH.H                                                                                                                                                             */\r
-/*                                                                                      */\r
-/*  Author: Mike Sandige                                                                   */\r
-/*  Description: Time-indexed keyframe creation, maintenance, and sampling.                            */\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_PATH_H\r
-#define GE_PATH_H\r
-\r
-#include "basetype.h"\r
-#include "xform3d.h"\r
-#include "quatern.h"\r
-#include "vfile.h"\r
-\r
-#ifdef __cplusplus\r
-       extern "C" {\r
-#endif\r
-\r
-\r
-// GENESIS_PUBLIC_APIS\r
-typedef struct _gePath gePath;\r
-\r
-#define GE_PATH_ROTATION_CHANNEL    1\r
-#define GE_PATH_TRANSLATION_CHANNEL 2\r
-\r
-#define GE_PATH_ALL_CHANNELS (GE_PATH_ROTATION_CHANNEL | GE_PATH_TRANSLATION_CHANNEL)\r
-\r
-#ifndef GE_PATH_ENUMS\r
-       #define GE_PATH_ENUMS\r
-       typedef enum \r
-       {\r
-               GE_PATH_INTERPOLATE_LINEAR  = 0,        // linear blend for translation or rotation channel\r
-               GE_PATH_INTERPOLATE_HERMITE,            // hermite cubic spline for translation channel\r
-               GE_PATH_INTERPOLATE_SLERP,                      // spherical-linear blend for rotation channel\r
-               GE_PATH_INTERPOLATE_SQUAD,                      // higher order blend for rotation channel 'G1' continuity\r
-               //GE_PATH_INTEROPLATE_TRIPOD,            // not supported yet.\r
-               GE_PATH_INTERPOLATE_HERMITE_ZERO_DERIV = 7      // hermite cubic with zero derivative at keyframes ('easing' curve)\r
-       }gePath_Interpolator;\r
-#endif\r
-\r
-GENESISAPI void GENESISCC gePath_CreateRef( gePath *P );\r
-\r
-GENESISAPI gePath *GENESISCC gePath_Create(\r
-       gePath_Interpolator TranslationInterpolation,   // type of interpolation for translation channel\r
-       gePath_Interpolator RotationInterpolation,      // type of interpolation for rotation channel\r
-       geBoolean Looped);                              // True if end of path is connected to head\r
-       // creates new gePath\r
-       //  A looping path should have the same first & last point.  The path\r
-       //  generator will choose arbitrarily between these points for a \r
-       //  sample exactly at the end of the loop.\r
-\r
-GENESISAPI gePath *GENESISCC gePath_CreateCopy( const gePath *P );\r
-       \r
-GENESISAPI void GENESISCC gePath_Destroy(gePath **PP);         \r
-       // destroys path *PP\r
-\r
-//------------------ time based keyframe operations\r
-GENESISAPI geBoolean GENESISCC gePath_InsertKeyframe(\r
-       gePath *P, \r
-       int ChannelMask, \r
-       geFloat Time, \r
-       const geXForm3d *Matrix); \r
-       // inserts a keyframe at a specific time.\r
-       \r
-GENESISAPI geBoolean GENESISCC gePath_DeleteKeyframe(\r
-       gePath *P,\r
-       int Index,\r
-       int ChannelMask); \r
-       // deletes the nth keyframe\r
-\r
-GENESISAPI geBoolean GENESISCC gePath_GetTimeExtents(\r
-       const gePath *P,\r
-       geFloat *StartTime, \r
-       geFloat *EndTime);\r
-       // gets the time for the first and last keys in the path (ignoring looping)\r
-       // if there are no keys, return GE_FALSE and times are not set.\r
-       // returns GE_TRUE if there are keys.\r
-\r
-//----------------- index based keyframe operations\r
-GENESISAPI void GENESISCC gePath_GetKeyframe(\r
-       const gePath *P, \r
-       int Index,                              // gets keyframe[index]\r
-       int Channel,                    // for this channel\r
-       geFloat *Time,                  // returns the time of the keyframe\r
-       geXForm3d *Matrix);             // returns the matrix of the keyframe\r
-       // retrieves keyframe[index], and it's time\r
-\r
-GENESISAPI int GENESISCC gePath_GetKeyframeCount(const gePath *P,int Channel);\r
-       // retrieves count of keyframes for a specific channel\r
-\r
-GENESISAPI int GENESISCC gePath_GetKeyframeIndex(const gePath *P, int Channel, geFloat Time);\r
-       // retrieves the index of the keyframe at a specific time for a specific channel\r
-\r
-//----------------- sampling a path  (time based)\r
-GENESISAPI void GENESISCC gePath_Sample(const gePath *P, geFloat Time,geXForm3d *Matrix);\r
-       // returns a transform matrix sampled at 'Time'.\r
-       // p is not const because information is cached in p for next sample\r
-\r
-// GENESIS_PRIVATE_APIS\r
-void GENESISCC gePath_SampleChannels(\r
-       const gePath *P, \r
-       geFloat Time, \r
-       geQuaternion *Rotation, \r
-       geVec3d *Translation);\r
-       // returns a rotation and a translation for the path at 'Time'\r
-       // p is not const because information is cached in p for next sample\r
-\r
-GENESISAPI geBoolean GENESISCC gePath_OffsetTimes(gePath *P, \r
-       int StartingIndex, int ChannelMask, geFloat TimeOffset );\r
-               // slides all samples in path starting with StartingIndex down by TimeOffset\r
-\r
-GENESISAPI geBoolean GENESISCC gePath_ModifyKeyframe(\r
-       gePath *P,\r
-       int Index,\r
-       int ChannelMask,\r
-       const geXForm3d *Matrix);\r
-       \r
-\r
-// GENESIS_PUBLIC_APIS\r
-\r
-//------------------ saving/loading a path\r
-GENESISAPI gePath* GENESISCC gePath_CreateFromFile(geVFile *F);\r
-       // loads a file  (binary or ascii)\r
-\r
-GENESISAPI geBoolean GENESISCC gePath_WriteToFile(const gePath *P, geVFile *F);\r
-       // dumps formatted ascii to the file.  \r
-\r
-GENESISAPI geBoolean GENESISCC gePath_WriteToBinaryFile(const gePath *P, geVFile *F);\r
-       // dumps a minimal binary image for fastest reading\r
-\r
-\r
-\r
-#ifdef __cplusplus\r
-       }\r
-#endif\r
-\r
-\r
-#endif\r

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

diff --git a/G3D/Bitmap/bitmap.__h b/G3D/Bitmap.__h
similarity index 97%
rename from G3D/Bitmap/bitmap.__h
rename to G3D/Bitmap.__h
index 8d754ef..5b54987 100644 (file)
--- a/G3D/Bitmap/bitmap.__h
+++ b/G3D/Bitmap.__h
@@ -22,8 +22,8 @@
 /*                                                                                      */\r
 /****************************************************************************************/\r
 \r
 /*                                                                                      */\r
 /****************************************************************************************/\r
 \r

-#include "bitmap.h"\r
-#include "bitmap._h"\r
+#include "Bitmap.h"\r
+#include "Bitmap._h"\r

 \r
 // Hey ! \r
 // this is bitmap.__h : for inclusion by bitmap friends ONLY!\r
 \r
 // Hey ! \r
 // this is bitmap.__h : for inclusion by bitmap friends ONLY!\r

diff --git a/G3D/Bitmap/bitmap._h b/G3D/Bitmap._h
similarity index 96%
rename from G3D/Bitmap/bitmap._h
rename to G3D/Bitmap._h
index f1f5625..e733358 100644 (file)
--- a/G3D/Bitmap/bitmap._h
+++ b/G3D/Bitmap._h
@@ -24,8 +24,8 @@
 /****************************************************************************************/\r
 \r
 \r
 /****************************************************************************************/\r
 \r
 \r

-#include       "bitmap.h"\r
-#include       "dcommon.h"\r
+#include       "Bitmap.h"\r
+#include       "DCommon.h"\r

 \r
 #ifdef __cplusplus\r
 extern "C" {\r
 \r
 #ifdef __cplusplus\r
 extern "C" {\r

diff --git a/G3D/Bitmap/bitmap.c b/G3D/Bitmap.c
similarity index 95%
rename from G3D/Bitmap/bitmap.c
rename to G3D/Bitmap.c
index 9fc6cd0..868dfb5 100644 (file)
--- a/G3D/Bitmap/bitmap.c
+++ b/G3D/Bitmap.c
@@ -56,26 +56,23 @@ see {} for notes/long-term-todos
 #include       <stdlib.h>\r
 #include       <string.h>\r
 \r
 #include       <stdlib.h>\r
 #include       <string.h>\r
 \r

-#include       "basetype.h"\r
-#include       "getypes.h"\r
-#include       "ram.h"\r
-\r
-#include       "vfile.h"\r
+#include       "BaseType.h"\r
+#include       "GeTypes.h"\r
+#include       "Ram.h"\r
+#include       "VFile.h"\r

 #include       "ErrorLog.h"\r
 #include       "Log.h"\r
 #include       "ErrorLog.h"\r
 #include       "Log.h"\r

-#include       "mempool.h"\r
-\r
-#include       "bitmap.h"\r
-#include       "bitmap._h"\r
-#include       "bitmap.__h"\r
-#include       "bitmap_blitdata.h"\r
-#include       "bitmap_gamma.h"\r
-\r
-#include       "palcreate.h"\r
-#include       "palettize.h"\r
+#include       "MemPool.h"\r
+#include       "Bitmap.h"\r
+#include       "Bitmap._h"\r
+#include       "Bitmap.__h"\r
+#include       "BitmapBlitData.h"\r
+#include       "BitmapGamma.h"\r
+#include       "PALCreate.h"\r
+#include       "Palettize.h"\r

 \r
 #ifdef DO_TIMER\r
 \r
 #ifdef DO_TIMER\r

-#include       "timer.h"\r
+#include       "Timer.h"\r

 #endif\r
 \r
 #define allocate(ptr)  ptr = geRam_Allocate(sizeof(*ptr))\r
 #endif\r
 \r
 #define allocate(ptr)  ptr = geRam_Allocate(sizeof(*ptr))\r

diff --git a/G3D/Bitmap/PixelFormat.h b/G3D/Bitmap/PixelFormat.h
deleted file mode 100644 (file)
index d8bf5ad..0000000
--- a/G3D/Bitmap/PixelFormat.h
+++ /dev/null
@@ -1,152 +0,0 @@
-#ifndef        PIXELFORMAT_H\r
-#define        PIXELFORMAT_H\r
-\r
-/****************************************************************************************/\r
-/*  PixelFormat.h                                                                       */\r
-/*                                                                                      */\r
-/*  Author: Charles Bloom                                                               */\r
-/*  Description:  The abstract Pixel primitives                                         */\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
-\r
-#include "basetype.h"\r
-\r
-#ifdef __cplusplus\r
-extern "C" {\r
-#endif\r
-\r
-typedef enum           // all supported formats (including shifts)\r
-{\r
-       GE_PIXELFORMAT_NO_DATA = 0,\r
-       GE_PIXELFORMAT_8BIT,                            // PAL\r
-       GE_PIXELFORMAT_8BIT_GRAY,               // no palette (intensity from bit value)\r
-       GE_PIXELFORMAT_16BIT_555_RGB,\r
-       GE_PIXELFORMAT_16BIT_555_BGR,\r
-       GE_PIXELFORMAT_16BIT_565_RGB,   // #5\r
-       GE_PIXELFORMAT_16BIT_565_BGR, \r
-       GE_PIXELFORMAT_16BIT_4444_ARGB, // #7\r
-       GE_PIXELFORMAT_16BIT_1555_ARGB, \r
-       GE_PIXELFORMAT_24BIT_RGB,               // #9\r
-       GE_PIXELFORMAT_24BIT_BGR,\r
-       GE_PIXELFORMAT_24BIT_YUV,               // * see note below\r
-       GE_PIXELFORMAT_32BIT_RGBX, \r
-       GE_PIXELFORMAT_32BIT_XRGB, \r
-       GE_PIXELFORMAT_32BIT_BGRX, \r
-       GE_PIXELFORMAT_32BIT_XBGR,\r
-       GE_PIXELFORMAT_32BIT_RGBA, \r
-       GE_PIXELFORMAT_32BIT_ARGB,              // #17\r
-       GE_PIXELFORMAT_32BIT_BGRA, \r
-       GE_PIXELFORMAT_32BIT_ABGR,\r
-       \r
-       GE_PIXELFORMAT_WAVELET,                 // #20 , Wavelet Compression\r
-\r
-       GE_PIXELFORMAT_COUNT\r
-} gePixelFormat;\r
-       \r
-/******\r
-\r
-there's something wacked out about these format names :\r
-\r
-       for 16 bit & 32 bit , the _RGB or _BGR refers to their order\r
-               *in the word or dword* ; since we're on intel, this means\r
-               the bytes in the data file have the *opposite* order !!\r
-               (for example the 32 bit _ARGB is actually B,G,R,A in raw bytes)\r
-       for 24 bit , the _RGB or _BGR refers to their order in the\r
-               actual bytes, so that windows bitmaps actually have\r
-               _RGB order in a dword !!\r
-\r
-* YUV : the pixelformat ops here are identical to those of 24bit_RGB ;\r
-               this is just a place-keeper to notify you that you should to a YUV_to_RGB conversion\r
-\r
-*********/\r
-\r
-#define GE_PIXELFORMAT_8BIT_PAL GE_PIXELFORMAT_8BIT\r
-\r
-typedef uint32 (*gePixelFormat_Composer   )(int R,int G,int B,int A);\r
-typedef void   (*gePixelFormat_Decomposer )(uint32 Pixel,int *R,int *G,int *B,int *A);\r
-\r
-typedef void   (*gePixelFormat_ColorGetter)(uint8 **ppData,int *R,int *G,int *B,int *A);\r
-typedef void   (*gePixelFormat_ColorPutter)(uint8 **ppData,int  R,int  G,int  B,int  A);\r
-\r
-typedef uint32 (*gePixelFormat_PixelGetter)(uint8 **ppData);\r
-typedef void   (*gePixelFormat_PixelPutter)(uint8 **ppData,uint32 Pixel);\r
-\r
-typedef struct gePixelFormat_Operations\r
-{\r
-       uint32  RMask;\r
-       uint32  GMask;\r
-       uint32  BMask;\r
-       uint32  AMask;\r
-\r
-       int             RShift;\r
-       int             GShift;\r
-       int             BShift;\r
-       int             AShift;\r
-\r
-       int             RAdd;\r
-       int             GAdd;\r
-       int             BAdd;\r
-       int             AAdd;\r
-\r
-       int                     BytesPerPel;\r
-       geBoolean       HasPalette;\r
-       char *          Description;\r
-       \r
-       gePixelFormat_Composer          ComposePixel;\r
-       gePixelFormat_Decomposer        DecomposePixel;\r
-\r
-       gePixelFormat_ColorGetter       GetColor;\r
-       gePixelFormat_ColorPutter       PutColor;\r
-\r
-       gePixelFormat_PixelGetter       GetPixel;\r
-       gePixelFormat_PixelPutter       PutPixel;\r
-} gePixelFormat_Operations;\r
-\r
-       // the Masks double as boolean "HaveAlpha" .. etc..\r
-\r
-GENESISAPI const gePixelFormat_Operations * GENESISCC gePixelFormat_GetOperations( gePixelFormat Format );\r
-\r
-       // quick accessors to _GetOps\r
-GENESISAPI geBoolean   GENESISCC gePixelFormat_IsValid(                gePixelFormat Format);\r
-GENESISAPI unsigned int GENESISCC gePixelFormat_BytesPerPel(   gePixelFormat Format );\r
-GENESISAPI geBoolean   GENESISCC gePixelFormat_HasPalette(             gePixelFormat Format );\r
-GENESISAPI geBoolean   GENESISCC gePixelFormat_HasAlpha(               gePixelFormat Format );\r
-GENESISAPI geBoolean   GENESISCC gePixelFormat_HasGoodAlpha(   gePixelFormat Format ); // more than 1 bit of alpha\r
-GENESISAPI const char * GENESISCC gePixelFormat_Description(   gePixelFormat Format );\r
-GENESISAPI geBoolean   GENESISCC gePixelFormat_IsRaw(                  gePixelFormat Format );\r
-                                                                       // 'Raw' means pixels can be made with the Compose operations\r
-\r
-GENESISAPI uint32              GENESISCC gePixelFormat_ComposePixel(   gePixelFormat Format,int R,int G,int B,int A);\r
-GENESISAPI void                        GENESISCC gePixelFormat_DecomposePixel( gePixelFormat Format,uint32 Pixel,int *R,int *G,int *B,int *A);\r
-                       \r
-                                                                                                                       // these four functions move ppData to the next pixel\r
-\r
-GENESISAPI void                        GENESISCC gePixelFormat_GetColor(gePixelFormat Format,uint8 **ppData,int *R,int *G,int *B,int *A);\r
-GENESISAPI void                        GENESISCC gePixelFormat_PutColor(gePixelFormat Format,uint8 **ppData,int R,int G,int B,int A);\r
-\r
-GENESISAPI uint32              GENESISCC gePixelFormat_GetPixel(gePixelFormat Format,uint8 **ppData);\r
-GENESISAPI void                        GENESISCC gePixelFormat_PutPixel(gePixelFormat Format,uint8 **ppData,uint32 Pixel);\r
-       \r
-GENESISAPI uint32              GENESISCC gePixelFormat_ConvertPixel(gePixelFormat Format,uint32 Pixel,gePixelFormat ToFormat);\r
-\r
-\r
-#ifdef __cplusplus\r
-}\r
-#endif\r
-\r
-#endif\r
-\r

diff --git a/G3D/Bitmap/bitmap.h b/G3D/Bitmap/bitmap.h
deleted file mode 100644 (file)
index 9263a42..0000000
--- a/G3D/Bitmap/bitmap.h
+++ /dev/null
@@ -1,627 +0,0 @@
-#ifndef BITMAP_H\r
-#define BITMAP_H\r
-\r
-/****************************************************************************************/\r
-/*  Bitmap.h                                                                            */\r
-/*                                                                                      */\r
-/*  Author: Charles Bloom                                                               */\r
-/*  Description:  Abstract Bitmap system                                                */\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
-\r
-#include "basetype.h"\r
-#include "pixelformat.h"\r
-#include "vfile.h"\r
-\r
-#ifdef __cplusplus\r
-extern "C" {\r
-#endif\r
-\r
-/***********************************************************************************/\r
-\r
-typedef struct geBitmap                        geBitmap;\r
-typedef struct geBitmap_Palette        geBitmap_Palette;\r
-\r
-typedef struct geBitmap_Info\r
-{\r
-       int                                             Width;\r
-       int                                             Height;\r
-       int                                             Stride;         // stride is in *pixels* ; it is the step to the next line : Stride >= Width\r
-       gePixelFormat                   Format;\r
-       int                                             MinimumMip;     //*including* minimumMip == 0 often\r
-       int                                             MaximumMip;     //*including* maximumMip == nummips-1\r
-       geBoolean                               HasColorKey;\r
-       uint32                                  ColorKey;       // meaningless unless HasColorKey ; the ColorKey is a Pixel in Format\r
-       geBitmap_Palette *              Palette;\r
-} geBitmap_Info;\r
-\r
-/***********************************************************************************/          \r
-// Bitmap methods\r
-\r
-// see a big comment at the end of this file\r
-\r
-/************************************************************************/\r
-\r
-GENESISAPI geBitmap *  GENESISCC       geBitmap_Create(int Width, int Height, int MipCount, gePixelFormat Format ); \r
-GENESISAPI void                        GENESISCC       geBitmap_CreateRef(geBitmap *Bmp);\r
-\r
-GENESISAPI geBitmap *  GENESISCC       geBitmap_CreateFromInfo(const geBitmap_Info * pInfo);\r
-\r
-GENESISAPI geBitmap *  GENESISCC       geBitmap_CreateFromFile( geVFile *F );\r
-GENESISAPI geBitmap *  GENESISCC       geBitmap_CreateFromFileName(const geVFile *BaseFS,const char *Name);\r
-GENESISAPI geBoolean   GENESISCC       geBitmap_WriteToFile( const geBitmap *Bmp, geVFile *F );\r
-GENESISAPI geBoolean   GENESISCC       geBitmap_WriteToFileName(const geBitmap * Bmp,const geVFile *BaseFS,const char *Name);\r
-                                                                               // BaseFS is not really const if it is a virtual file;\r
-                                                                               //  it *is* const if it is a dos directory\r
-\r
-GENESISAPI geBoolean   GENESISCC       geBitmap_Destroy(geBitmap **Bmp);\r
-       // returns whether Bmp was actually destroyed : not success/failure\r
-\r
-GENESISAPI geBoolean   GENESISCC       geBitmap_GetInfo(const geBitmap *Bmp, geBitmap_Info *Info, geBitmap_Info *SecondaryInfo);\r
-       //LockForWrite returns data in Info's format\r
-\r
-GENESISAPI geBoolean   GENESISCC       geBitmap_Blit(const     geBitmap *Src, int SrcPositionX, int SrcPositionY,\r
-                                                                               geBitmap *Dst, int DstPositionX, int DstPositionY,\r
-                                                                               int SizeX, int SizeY );\r
-\r
-GENESISAPI geBoolean   GENESISCC       geBitmap_BlitMip(const geBitmap * Src, int SrcMip, geBitmap * Dst, int DstMip );\r
-                                                                               // don't use this with Src == Dst, use UpdateMips instead !\r
-\r
-GENESISAPI geBoolean   GENESISCC       geBitmap_BlitBitmap(const geBitmap * Src, geBitmap * Dst);\r
-\r
-GENESISAPI geBoolean   GENESISCC       geBitmap_BlitBestMip(const geBitmap * Src, geBitmap * Dst);\r
-                                                                               // blits the largest mip from Src that fits in Dst\r
-\r
-GENESISAPI geBoolean   GENESISCC       geBitmap_LockForRead(           // a non-exclusive lock\r
-       const geBitmap *        Bmp,\r
-       geBitmap **                     Target,\r
-       int                                     MinimumMip,\r
-       int                                     MaximumMip,\r
-       gePixelFormat           Format,\r
-       geBoolean                       RespectColorKey,\r
-       uint32                          ColorKey);\r
-                                                                       // not really const, stores lock-count, but *data* is const\r
-                                                                       // will do a format conversion!\r
-\r
-GENESISAPI geBoolean   GENESISCC       geBitmap_LockForReadNative(\r
-       const geBitmap *        Bmp,\r
-       geBitmap **                     Target,\r
-       int                                     MinimumMip,\r
-       int                                     MaximumMip);\r
-                                                                       // lock for read in a format that gaurantee no conversions\r
-                                                                       // then do GetInfo on the locks to see what you have!\r
-\r
-GENESISAPI geBoolean   GENESISCC       geBitmap_LockForWrite(  // an exclusive lock\r
-       geBitmap *                      Bmp,\r
-       geBitmap **                     Target,\r
-       int                                     MinimumMip,\r
-       int                                     MaximumMip);\r
-\r
-GENESISAPI geBoolean   GENESISCC       geBitmap_LockForWriteFormat(\r
-       geBitmap *                      Bmp,\r
-       geBitmap **                     Target,\r
-       int                                     MinimumMip,\r
-       int                                     MaximumMip,\r
-       gePixelFormat           Format);\r
-                                                                       // Format must be one of the two returned in GetInfo !!\r
-\r
-GENESISAPI geBoolean   GENESISCC       geBitmap_UnLock(geBitmap *Bmp); // must be done on All locked mips\r
-GENESISAPI geBoolean   GENESISCC       geBitmap_UnLockArray(geBitmap **Locks,int Size);\r
-\r
-GENESISAPI geBoolean   GENESISCC       geBitmap_SetFormat(geBitmap *Bmp, \r
-                                                       gePixelFormat NewFormat, \r
-                                                       geBoolean RespectColorKey, uint32 ColorKey,\r
-                                                       const geBitmap_Palette * Palette);\r
-       // _SetFormat may cause you to lose color information!\r
-       // SetFormat does a conversion!\r
-       // if NewFormat is palettized and Palette is NULL, we create a palette for the bitmap!\r
-\r
-GENESISAPI geBoolean   GENESISCC       geBitmap_SetFormatMin(geBitmap *Bmp,gePixelFormat NewFormat);\r
-                                                               // the Min version keeps colorkey & palette from the old format\r
-\r
-GENESISAPI geBoolean   GENESISCC       geBitmap_SetColorKey(geBitmap *Bmp, geBoolean HasColorKey, uint32 ColorKey, geBoolean Smart);\r
-       // SetColorKey discards old colorkey information!\r
-       //      does not do a conversion (changes the colorkey in the current data\r
-       // if 'Smart' is on, we don't set HasColorKey to true unless it is actually used!\r
-\r
-GENESISAPI geBoolean   GENESISCC       geBitmap_GetAverageColor(const geBitmap *Bmp,int *pR,int *pG,int *pB);\r
-       // tells you the average color; computes it and caches it out\r
-\r
-GENESISAPI geBitmap_Palette *  GENESISCC       geBitmap_GetPalette(const geBitmap *Bmp);\r
-GENESISAPI geBoolean                   GENESISCC       geBitmap_SetPalette(geBitmap *Bmp, const geBitmap_Palette *Palette);\r
-       // _SetPal tries to _CreateRef your Palette, so no copy occurs & palettes may be shared\r
-       // you may _Destroy() palette after using it to set (though its bits may not be freed)\r
-       //      (hence Palette is *not* const)\r
-       // Warning : SetPalette on any mip changes the palette of ALL mips !\r
-       // see Palette note at _UnLock\r
-       // _SetPal destroys the bitmap's original palette and refs the new one, \r
-       //              so if you setpal with the bitmap's palette, there is no net change in ref counts (good!)\r
-\r
-GENESISAPI geBoolean   GENESISCC       geBitmap_HasAlpha(const geBitmap * Bmp);\r
-       // returns true if bitmap has *any* type of alpha\r
-\r
-GENESISAPI geBitmap *  GENESISCC       geBitmap_GetAlpha(const geBitmap *Bmp);\r
-GENESISAPI geBoolean   GENESISCC       geBitmap_SetAlpha(geBitmap *Bmp, const geBitmap *AlphaBmp);\r
-       // we Ref the AlphaBmp, so you may destroy it after calling Set()\r
-       // it may be NULL\r
-       // there's only one Alpha per bitmap (for the top Mip) right now\r
-\r
-GENESISAPI geBoolean   GENESISCC       geBitmap_SetGammaCorrection(geBitmap *Bmp,geFloat Gamma,geBoolean Apply);\r
-       // this Gamma does not change the *original* (system/secondary) bits\r
-       //      it only affects the appearance when drawn\r
-       // note : if you write to the gamma corrected bits, you must gamma correct manually if you\r
-       //      wish to fit in smoothly with the previous data\r
-       // warning : if you use this function with many different gammas, performance will suffer!\r
-       //      use one global gamma for all bitmaps!  try to let the engine manage gamma for you,\r
-       //      via geEngine_SetGamma !\r
-\r
-GENESISAPI geBoolean           GENESISCC       geBitmap_SetPreferredFormat(geBitmap *Bmp,gePixelFormat Format);\r
-GENESISAPI gePixelFormat       GENESISCC       geBitmap_GetPreferredFormat(const geBitmap *Bmp);\r
-\r
-GENESISAPI void *              GENESISCC       geBitmap_GetBits(geBitmap *Bmp);        // works only on a Lock()\r
-\r
-GENESISAPI geBoolean   GENESISCC       geBitmap_RefreshMips(geBitmap *Bmp);    // rebuilds mips; *tries* to be smart & not overwrite manually-fixed mips\r
-                                                                                               // RefreshMips does *not* build mips that don't exist\r
-GENESISAPI geBoolean   GENESISCC       geBitmap_UpdateMips(geBitmap *Bmp,int SourceMip,int TargetMip); \r
-                                                                                               // will create the target if it doesn't exist;\r
-                                                                                               // will overwrite manually-fixed mips!\r
-GENESISAPI geBoolean   GENESISCC       geBitmap_SetMipCount(geBitmap *Bmp,int Count);\r
-                                                                                               // creates or destroys to match the new count\r
-\r
-GENESISAPI geBoolean   GENESISCC       geBitmap_ClearMips(geBitmap *Bmp);      // Destroy all mips (except the first) !\r
-                                                                                               // use with care! this is not polite!\r
-\r
-// Shortcuts\r
-GENESISAPI int                 GENESISCC       geBitmap_Width(const geBitmap *Bitmap);\r
-GENESISAPI int                 GENESISCC       geBitmap_Height(const geBitmap *Bitmap);\r
-GENESISAPI uint32              GENESISCC       geBitmap_MipBytes(const geBitmap * Bitmap,int mip);\r
-\r
-/**\r
-*\r
-* if Bitmap is a lock for read, functions that modify it return failure\r
-* if Bitmap is a lock for write, functions that modify it attempt to\r
-*      modify the owner of the lock\r
-*\r
-* warning : if you lock multiple mips for write, and then modify one of the mips\r
-*              (such as via SetPalette) it may affect the owner and all sibling mips!\r
-*              doing different SetPalettes with different palettes on different locked mips \r
-*              has undefined behavior!\r
-*\r
-**/\r
-\r
-#ifdef _DEBUG\r
-\r
-GENESISAPI uint32              GENESISCC       geBitmap_Debug_GetCount(void);\r
-\r
-GENESISAPI uint32              GENESISCC       geBitmap_Debug_GetRefs(void);\r
-       // assert this is zero before you shutdown !\r
-\r
-#endif\r
-\r
-/***********************************************************************************/\r
-\r
-typedef enum\r
-{\r
-       GE_BITMAP_STREAMING_ERROR=0,\r
-       GE_BITMAP_STREAMING_NOT,\r
-       GE_BITMAP_STREAMING_STARTED,\r
-       GE_BITMAP_STREAMING_IDLE,\r
-       GE_BITMAP_STREAMING_CHANGED,\r
-       GE_BITMAP_STREAMING_DATADONE,\r
-       GE_BITMAP_STREAMING_DONE,\r
-} geBitmap_StreamingStatus;\r
-\r
-GENESISAPI geBitmap_StreamingStatus GENESISCC geBitmap_GetStreamingStatus(const geBitmap *Bmp);\r
-\r
-               /** on a file which is streaming, the sequence of returns looks like :\r
-\r
-                       GE_BITMAP_STREAMING_IDLE\r
-                       GE_BITMAP_STREAMING_CHANGED\r
-                       GE_BITMAP_STREAMING_IDLE\r
-                       GE_BITMAP_STREAMING_IDLE\r
-                       GE_BITMAP_STREAMING_CHANGED\r
-                       ...\r
-                       GE_BITMAP_STREAMING_DONE\r
-                       GE_BITMAP_STREAMING_NOT\r
-                       GE_BITMAP_STREAMING_NOT\r
-                       GE_BITMAP_STREAMING_NOT\r
-                       ...\r
-\r
-               Status >= GE_BITMAP_STREAMING_STARTED means streaming has started & is in progress\r
-\r
-               the user should never see _STARTED or _DATADONE\r
-\r
-               ***/\r
-\r
-/***********************************************************************************/\r
-\r
-// palette methods :\r
-\r
-GENESISAPI geBitmap_Palette *  GENESISCC       geBitmap_Palette_Create(gePixelFormat Format,int Size);\r
-\r
-GENESISAPI geBitmap_Palette *  GENESISCC       geBitmap_Palette_CreateCopy(const geBitmap_Palette *Palette);\r
-\r
-GENESISAPI geBitmap_Palette *  GENESISCC       geBitmap_Palette_CreateFromFile(geVFile *F);\r
-\r
-GENESISAPI geBitmap_Palette *  GENESISCC       geBitmap_Palette_CreateFromBitmap(geBitmap * Bmp,geBoolean Slow);\r
-                                                                                               // does GetPalette, and if NULL, then\r
-                                                                                               // it create an optimal palette for a\r
-                                                                                               //      non-palettized bitmap\r
-                                                                                               //      (this is a create, you must destroy later!)\r
-                                                                                               // put Slow == TRUE for higher quality & slower\r
-\r
-GENESISAPI geBoolean           GENESISCC       geBitmap_Palette_SortColors(geBitmap_Palette * P,geBoolean Slower);\r
-\r
-GENESISAPI geBoolean           GENESISCC       geBitmap_Palette_CreateRef(geBitmap_Palette *Palette);\r
-\r
-GENESISAPI geBoolean           GENESISCC       geBitmap_Palette_Destroy(geBitmap_Palette ** ppPalette);\r
-\r
-GENESISAPI geBoolean           GENESISCC       geBitmap_Palette_WriteToFile(const geBitmap_Palette *Palette,geVFile *F);\r
-\r
-GENESISAPI geBoolean           GENESISCC       geBitmap_Palette_SetFormat(geBitmap_Palette * Palette,gePixelFormat Format);\r
-\r
-GENESISAPI geBoolean           GENESISCC       geBitmap_Palette_Copy(const geBitmap_Palette * Src,geBitmap_Palette * Target);\r
-\r
-GENESISAPI geBoolean           GENESISCC       geBitmap_Palette_GetInfo(const  geBitmap_Palette *P,geBitmap_Info *Into);\r
-                                                                                               // get the info as if it were a bitmap; Into->Height == 1\r
-\r
-GENESISAPI geBoolean           GENESISCC       geBitmap_Palette_Lock(geBitmap_Palette *Palette, void **pBits, gePixelFormat *pFormat,int *pSize);\r
-                                                                                               // pFormat & pSize are optional\r
-\r
-GENESISAPI geBoolean           GENESISCC       geBitmap_Palette_UnLock(geBitmap_Palette *Palette);\r
-                                                                                       // palette unlock does NOT notify the bitmap that the palette has changed.\r
-                                                                                       // call Bitmap_SetPalette() with the same palette pointer \r
-                                                                                       //      to tell the bitmap that it must to some processing\r
-                                                                                       // (don't worry, it won't duplicate it or copy it onto itself)\r
-\r
-GENESISAPI geBoolean           GENESISCC       geBitmap_Palette_GetData(const geBitmap_Palette *P,      void *Into,gePixelFormat Format,int Colors);\r
-GENESISAPI geBoolean           GENESISCC       geBitmap_Palette_SetData(      geBitmap_Palette *P,const void *From,gePixelFormat Format,int Colors);\r
-                                                                                       // does Lock/UnLock for you\r
-                                                                                       // From and Into are arrays of Colors*gePixelFormat_BytesPerPel bytes\r
-\r
-GENESISAPI geBoolean           GENESISCC       geBitmap_Palette_SetEntryColor(      geBitmap_Palette *P,int Color,int R,int G,int B,int A);\r
-GENESISAPI geBoolean           GENESISCC       geBitmap_Palette_GetEntryColor(const geBitmap_Palette *P,int Color,int *R,int *G,int *B,int *A);\r
-                                                                                       // Set/Get does Lock/Unlock for you ; these are slow! do not use these to work on all the colors!\r
-\r
-GENESISAPI geBoolean           GENESISCC       geBitmap_Palette_SetEntry(      geBitmap_Palette *P,int Color,uint32 Pixel);\r
-GENESISAPI geBoolean           GENESISCC       geBitmap_Palette_GetEntry(const geBitmap_Palette *P,int Color,uint32 *Pixel);\r
-\r
-/***********************************************************************************/\r
-\r
-/************************************************************************\r
-\r
-A brief tutorial on the Bitmap system, by Charles Bloom, cbloom@wildtangent.com\r
-\r
-The Bitmap is a smart wrapper for complex functionality.  You give it hints to\r
-the opaque Bitmap object, and it tries its best to follow those hints, but it\r
-may not always do so.  The Bitmap is the owner of its bits; you must Lock the\r
-bitmap to get permission to touch those bits, and UnLock to tell the bitmap\r
-you are done.  The format may change between two Locks.  Bitmaps can also be\r
-multiply owned, so you should account for the fact that others may touch your\r
-bitmap between your uses.\r
-\r
-The Bitmap contains one or two pixel-sets representing an image.  The "primary" is\r
-a fast-blitting version of the image, and the "secondary" is a storage version\r
-(eventually wavelet compressed) which can be used to rebuild the primary if it is\r
-freed or damaged.  Both cary a generalized format.\r
-\r
-Let's do an example.  I want to load a bitmap, set it up for drawing with the\r
-genesis Engine, and then blit some interactive stuff into it.\r
-\r
-************************************************************************/\r
-\r
-#if 0\r
-// {\r
-//-----------------------------------------------------------------------------\r
-\r
-void Init(geEngine * Engine);\r
-void Shutdown(void);\r
-void Draw(void);\r
-void DrawPolite(void);\r
-\r
-static geBitmap * myBM = NULL;\r
-static geEngine * myEngine = NULL;\r
-\r
-void Init(geEngine * Engine)\r
-{\r
-geBoolean success;\r
-geBitmap_Info Info;\r
-\r
-       myEngine = Engine;      // this is not looked well upon; for ease of demonstration only!\r
-       assert(Engine);\r
-\r
-       myBM = geBitmap_CreateFromFileName(NULL,"mybitmap.bmp");\r
-\r
-       // CreateFromFile can load windows BMP files, or custom GeBm files.\r
-\r
-       assert(myBM);\r
-\r
-       // get the main info; I don't care about the secondary, so leave it NULL\r
-\r
-       success = geBitmap_GetInfo(myBM,&Info,NULL);\r
-       assert(success);\r
-\r
-       // make sure I loaded a bitmap in the format I understand !\r
-\r
-       if ( Info.Format == GE_PIXELFORMAT_8BIT_PAL )\r
-       {\r
-               // I want palette index 255 to act as transparency, so I must use SetColorKey\r
-\r
-               success = geBitmap_SetColorKey(myBM,GE_TRUE,255);\r
-               assert(success);\r
-\r
-               // just for fun, let's modify the palette:\r
-               if (1)\r
-               {\r
-               geBitmap_Palette * Pal;\r
-\r
-                       // get the palette ; I don't care if its primary or secondary, so\r
-                       /// I don't use the Info.Palette field\r
-\r
-                       Pal = geBitmap_GetPalette(myBM);\r
-                       assert(Pal);\r
-\r
-                       // I'm only fiddling one entry, so don't bother with a full Lock() UnLock()\r
-                       //  sequence on the palette\r
-\r
-                       // make palette index zero bright red; we use alpha = 255 for opaque\r
-\r
-                       success = geBitmap_Palette_SetEntryColor(Pal,0,255,0,0,255);\r
-                       assert(success);\r
-\r
-                       // tell the bitmap system you've changed the palette; this function\r
-                       //  is smart enough to not do unecessary copies or whatever.\r
-\r
-                       success = geBitmap_SetPalette(myBM,Pal);\r
-                       assert(success);\r
-               }\r
-\r
-       }\r
-       else\r
-       {\r
-               // otherwise, treat black as transparent, in whatever format I have\r
-\r
-               success = geBitmap_SetColorKey(myBM,GE_TRUE,gePixelFormat_ComposePixel(Info.Format,0,0,0,0));\r
-               assert(success);\r
-       }       \r
-\r
-       // note that I did NOT use SetFormat.  SetFormat may do a conversion, and since the original\r
-       //      bitmap was created without colorkey, it would have been converted to a new format but\r
-       //      kept its property of having no colorkey!\r
-       // (SetFormat will fiddle the bits and whatever way necessary to keep bitmaps as visually similar\r
-       //              as possible)\r
-\r
-       // I want to fiddle the fast format in 565 later, so cue the bitmap to try to give me that format.\r
-\r
-       success = geBitmap_SetPreferredFormat(myBM,GE_PIXELFORMAT_16BIT_565_RGB);\r
-       assert(success);\r
-\r
-       // Add it to the engine so it can be used for drawing.\r
-\r
-       success = geEngine_AddBitmap(myEngine,myBM);\r
-       assert(success);\r
-}\r
-\r
-void Shutdown(void)\r
-{\r
-geBoolean WasDestroyed;\r
-\r
-       assert(myBM);\r
-       \r
-       // clean up\r
-\r
-       geEngine_RemoveBitmap(myEngine,myBM);\r
-\r
-       WasDestroyed = geBitmap_Destroy(&myBM);\r
-\r
-       // someone else might have done _CreateRef on our bitmap,\r
-       //  so we can't be sure it's actually destroyed.\r
-       // this code is still ready to be run again with a new call to Init()\r
-\r
-       //assert(WasDestroyed);\r
-\r
-       myBM = NULL;\r
-       myEngine = NULL;\r
-}\r
-\r
-void Draw(void)\r
-{\r
-geBitmap * Lock;\r
-geBoolean success;\r
-geBitmap_Info Info;\r
-uint16 *bits,*bptr;\r
-int x,y;\r
-\r
-       // lets fiddle the bits.\r
-       // we need to lock the bitmap for write.\r
-       //      LockForWrite is an exclusive lock, unlike LockForRead which is non-blocking\r
-       // request our favorite format, and only lock Mip 0 (the full size bitmap)\r
-\r
-       success = geBitmap_LockForWriteFormat(myBM,&Lock,0,0,GE_PIXELFORMAT_16BIT_565_RGB);\r
-       if ( ! success )\r
-       {\r
-               // well, we tried to be nice; if we were very polite, we would do a LockForWrite\r
-               // here, and try to fiddle the bits in whatever format we got; However, we aren't\r
-               // that polite, so we just do a _SetFormat\r
-               //\r
-               // note that we are destroying the original bitmap by changing its format\r
-               // we should only do this if we are going to draw into the bitmap\r
-\r
-               success = geBitmap_SetFormat(myBM,GE_PIXELFORMAT_16BIT_565_RGB,GE_TRUE,0,NULL);\r
-               assert(success);\r
-\r
-               // now we should be able to get the bits we want, *but* they may not be the\r
-               // primary (fast) format; oh well, it's the best we can do...\r
-               // (if you must have the fastest bits, then use only _LockForWrite, never LockForWriteFormat,\r
-               // which might have to do a conversion)\r
-\r
-               success = geBitmap_LockForWriteFormat(myBM,&Lock,0,0,GE_PIXELFORMAT_16BIT_565_RGB);\r
-               assert(success);\r
-       }\r
-\r
-       // now Lock is our bitmap in 565\r
-       // we do a GetInfo because the Lock's info could be different than\r
-       //      the original bitmap's (particularly the Palette & the Stride)\r
-\r
-       success = geBitmap_GetInfo(Lock,&Info,NULL);\r
-       assert(success);\r
-\r
-       // you can only call _GetBits on a locked bitmap\r
-\r
-       bits = geBitmap_GetBits(Lock);\r
-       assert( bits );\r
-\r
-       bptr = bits;\r
-       for(y=0; y < Info.Height; y++)\r
-       {\r
-               for(x=0; x < Info.Width; x++)\r
-               {\r
-               uint16 R,G,B;\r
-                       // make a silly 565 gradient\r
-                       R = x & 0x1F;\r
-                       G = x & 0x3F;\r
-                       B = y & 0x1F;\r
-\r
-                       *bptr++ = (R<<11) + (G<<5) + B;\r
-               }\r
-\r
-               // note that bptr is a word pointer, and Stride is in pixels :\r
-\r
-               bptr += Info.Stride -  Info.Width;\r
-       }\r
-       bits = bptr = NULL;\r
-\r
-       // you call Unlock on all the mips you locked - not on the original bitmap!\r
-\r
-       success = geBitmap_UnLock(Lock);\r
-       assert(success);\r
-\r
-       // now, we only fiddled the full-size Mip, and there might be more,\r
-       //  so lets percolate the changes into the smaller mips:\r
-\r
-       success = geBitmap_RefreshMips(myBM);\r
-       assert(success);\r
-\r
-       // a null rect means use the whole bitmap;\r
-       // Engine_DrawBitmap blits a 2d decal to the framebuffer (fast)\r
-\r
-       success = geEngine_DrawBitmap(myEngine,myBM,NULL,0,0);\r
-       assert(success);\r
-\r
-}\r
-\r
-void DrawPolite(void)\r
-{\r
-geBitmap * Lock;\r
-geBoolean success;\r
-geBitmap_Info Info;\r
-void *bits;\r
-int x,y;\r
-\r
-       // this function does the same thing as Draw() , but is more polite\r
-       // lock in the fastest format (whatever it is)\r
-       // because we did SetPreferred, this should be 565_RGB, but might not be\r
-\r
-       success = geBitmap_LockForWrite(myBM,&Lock,0,0);\r
-       assert(success);\r
-\r
-       success = geBitmap_GetInfo(Lock,&Info,NULL);\r
-       assert(success);\r
-\r
-       bits = geBitmap_GetBits(Lock);\r
-       assert( bits );\r
-\r
-       if ( Info.Format == GE_PIXELFORMAT_16BIT_565_RGB )\r
-       {\r
-       uint16 *wptr;\r
-\r
-               // our favorite format\r
-\r
-               wptr = bits;\r
-               for(y=0; y < Info.Height; y++)\r
-               {\r
-                       for(x=0; x < Info.Width; x++)\r
-                       {\r
-                       uint16 R,G,B;\r
-                               // make a silly 565 gradient\r
-                               R = x & 0x1F;\r
-                               G = x & 0x3F;\r
-                               B = y & 0x1F;\r
-\r
-                               *wptr++ = (R<<11) + (G<<5) + B;\r
-                       }\r
-                       wptr += Info.Stride -  Info.Width;\r
-               }\r
-       }\r
-       else\r
-       {\r
-       uint8 * bptr;\r
-\r
-               // oh well, do our best\r
-               // bitmaps must have had a good reason to not give us the format we preferred,\r
-\r
-               bptr = bits;\r
-               for(y=0; y < Info.Height; y++)\r
-               {\r
-                       for(x=0; x < Info.Width; x++)\r
-                       {\r
-                       uint32 R,G,B;\r
-\r
-                               // put a color in any format\r
-\r
-                               R = (x & 0x1F)<<3;\r
-                               G = (x & 0x3F)<<2;\r
-                               B = (y & 0x1F)<<3;\r
-\r
-                               // we use alpha of 255 for opaque\r
-\r
-                               gePixelFormat_PutColor(Info.Format,&bptr,R,G,B,255);\r
-                       }\r
-\r
-                       bptr += (Info.Stride -  Info.Width) * gePixelFormat_BytesPerPel(Info.Format);\r
-               }\r
-       }\r
-       bits = NULL;\r
-\r
-       // same as before:\r
-\r
-       success = geBitmap_UnLock(Lock);\r
-       assert(success);\r
-\r
-       success = geBitmap_RefreshMips(myBM);\r
-       assert(success);\r
-\r
-       success = geEngine_DrawBitmap(myEngine,myBM,NULL,0,0);\r
-       assert(success);\r
-\r
-}\r
-\r
-// end tutorial on the Bitmap system\r
-//-----------------------------------------------------------------------------\r
-// }\r
-\r
-/***********************************************************************************/\r
-\r
-#endif\r
-#ifdef __cplusplus\r
-}\r
-#endif\r
-\r
-\r
-#endif\r
-\r
-\r

diff --git a/G3D/Bitmap/bitmap_blitdata.c b/G3D/BitmapBlitData.c
similarity index 92%
rename from G3D/Bitmap/bitmap_blitdata.c
rename to G3D/BitmapBlitData.c
index 314c337..7ab07cc 100644 (file)
--- a/G3D/Bitmap/bitmap_blitdata.c
+++ b/G3D/BitmapBlitData.c
@@ -30,22 +30,18 @@
 #include       <stdlib.h>\r
 #include       <string.h>\r
 \r
 #include       <stdlib.h>\r
 #include       <string.h>\r
 \r

-#include       "basetype.h"\r
-#include       "getypes.h"\r
-#include       "ram.h"\r
-\r
-#include       "bitmap.h"\r
-#include       "bitmap._h"\r
-#include       "bitmap.__h"\r
-#include       "bitmap_blitdata.h"\r
-\r
-#include       "vfile.h"\r
+#include       "BaseType.h"\r
+#include       "GeTypes.h"\r
+#include       "Ram.h"\r
+#include       "Bitmap.h"\r
+#include       "Bitmap._h"\r
+#include       "Bitmap.__h"\r
+#include       "BitmapBlitData.h"\r
+#include       "VFile.h"\r

 #include       "ErrorLog.h"\r
 #include       "ErrorLog.h"\r

-\r
-#include       "palcreate.h"\r
-#include       "palettize.h"\r
-\r
-#include       "tsc.h"\r
+#include       "PALCreate.h"\r
+#include       "Palettize.h"\r
+#include       "TSC.h"\r

 \r
 #ifdef DO_TIMER\r
 #include       "timer.h"\r
 \r
 #ifdef DO_TIMER\r
 #include       "timer.h"\r


@@ -1456,7 +1452,8 @@ geBoolean BlitData_DePalettize(void)
                                for(y=SizeY;y--;)\r
                                {\r
 \r
                                for(y=SizeY;y--;)\r
                                {\r
 \r

-                                       #ifdef DONT_USE_ASM\r
+                    // FIXME: asm code\r
+                                       //#ifdef DONT_USE_ASM\r

 \r
                                        for(x=SizeX;x--;)\r
                                        {\r
 \r
                                        for(x=SizeX;x--;)\r
                                        {\r


@@ -1464,7 +1461,7 @@ geBoolean BlitData_DePalettize(void)
                                                *DstPtr++ = PalData[pal];\r
                                        }\r
 \r
                                                *DstPtr++ = PalData[pal];\r
                                        }\r
 \r

-                                       #else\r
+                                       /*#else\r

 \r
                                        #pragma message("Bitmap_Blitdata :using assembly DePalettize code")\r
                                        // {} is this minimal push safe in _fastcall ? aparently so!\r
 \r
                                        #pragma message("Bitmap_Blitdata :using assembly DePalettize code")\r
                                        // {} is this minimal push safe in _fastcall ? aparently so!\r


@@ -1499,7 +1496,7 @@ geBoolean BlitData_DePalettize(void)
                                        SrcPtr += SizeX;\r
                                        DstPtr += SizeX;\r
 \r
                                        SrcPtr += SizeX;\r
                                        DstPtr += SizeX;\r
 \r

-                                       #endif\r
+                                       #endif*/\r

 \r
                                        SrcPtr += SrcXtra;\r
                                        DstPtr += DstXtra;\r
 \r
                                        SrcPtr += SrcXtra;\r
                                        DstPtr += DstXtra;\r


@@ -1525,7 +1522,8 @@ geBoolean BlitData_DePalettize(void)
 \r
                                for(y=SizeY;y--;)\r
                                {\r
 \r
                                for(y=SizeY;y--;)\r
                                {\r

-                                       #ifdef DONT_USE_ASM\r
+                    // FIXME: asm code\r
+                                       //#ifdef DONT_USE_ASM\r

 \r
                                        for(x=SizeX;x--;)\r
                                        {\r
 \r
                                        for(x=SizeX;x--;)\r
                                        {\r


@@ -1533,7 +1531,7 @@ geBoolean BlitData_DePalettize(void)
                                                *DstPtr++ = PalData[pal];\r
                                        }\r
 \r
                                                *DstPtr++ = PalData[pal];\r
                                        }\r
 \r

-                                       #else\r
+                                       /*#else\r

 \r
                                        #if 1 // {\r
                                        if ( (SizeX&1) == 0 )\r
 \r
                                        #if 1 // {\r
                                        if ( (SizeX&1) == 0 )\r


@@ -1579,40 +1577,6 @@ geBoolean BlitData_DePalettize(void)
                                                        sub ecx,2\r
                                                        jnz moredata2_z\r
 \r
                                                        sub ecx,2\r
                                                        jnz moredata2_z\r
 \r

-#if 0 //{ \r
-                                               // the old bad way:\r
-                                               // 0.000710 secs\r
-                                               moredata2_z:\r
-\r
-                                                       //xor edx,edx   //xor edx,0 ; sneaky trick?\r
-\r
-                                                       //mov al, BYTE PTR [esi]\r
-                                                       movzx eax, BYTE PTR [esi]\r
-                                                       inc esi\r
-\r
-                                                       movzx edx, WORD PTR [ebp + eax*2]\r
-                                                       //mov dx, WORD PTR [ebp + eax*2]\r
-\r
-                                                       movzx eax, BYTE PTR [esi]\r
-                                                       inc esi\r
-\r
-                                                       // make room fo a new dx\r
-                                                       //shl edx,16\r
-                                                       //mov dx, WORD PTR [ebp + eax*2]        // !! STALL !! ; movzx eax, [] instead?\r
-                                                       // byte order is wrong; fix with rol; 1 clock\r
-                                                       //rol edx,16\r
-\r
-                                                       movzx eax, WORD PTR [ebp + eax*2]       // can I do this?\r
-                                                       shl eax,16\r
-                                                       xor edx,eax\r
-\r
-                                                       mov DWORD PTR [edi], edx\r
-                                                       add edi,4\r
-\r
-                                                       sub ecx,2\r
-                                                       jnz moredata2_z\r
-#endif //}\r
-\r

                                                        pop ebp\r
                                                        //popa\r
                                                }\r
                                                        pop ebp\r
                                                        //popa\r
                                                }\r


@@ -1659,7 +1623,7 @@ geBoolean BlitData_DePalettize(void)
                                        SrcPtr += SizeX;\r
                                        DstPtr += SizeX;\r
 \r
                                        SrcPtr += SizeX;\r
                                        DstPtr += SizeX;\r
 \r

-                                       #endif\r
+                                       #endif */\r

 \r
                                        SrcPtr += SrcXtra;\r
                                        DstPtr += DstXtra;\r
 \r
                                        SrcPtr += SrcXtra;\r
                                        DstPtr += DstXtra;\r


@@ -1704,7 +1668,8 @@ geBoolean BlitData_DePalettize(void)
                                for(y=SizeY;y--;)\r
                                {\r
 \r
                                for(y=SizeY;y--;)\r
                                {\r
 \r

-                                       #ifdef DONT_USE_ASM\r
+                    // FIXME: asm code\r
+                                       //#ifdef DONT_USE_ASM\r

                                        {\r
                                        uint8 *PalPtr;\r
 \r
                                        {\r
                                        uint8 *PalPtr;\r
 \r


@@ -1718,7 +1683,7 @@ geBoolean BlitData_DePalettize(void)
                                                }\r
 \r
                                        }\r
                                                }\r
 \r
                                        }\r

-                                       #else\r
+                                       /*#else\r

 \r
                                        __asm\r
                                        {\r
 \r
                                        __asm\r
                                        {\r


@@ -1758,7 +1723,7 @@ geBoolean BlitData_DePalettize(void)
                                        SrcPtr += SizeX;\r
                                        DstPtr += SizeX*3;\r
 \r
                                        SrcPtr += SizeX;\r
                                        DstPtr += SizeX*3;\r
 \r

-                                       #endif\r
+                                       #endif */\r

 \r
                                        SrcPtr += SrcXtra;\r
                                        DstPtr += DstXtra;\r
 \r
                                        SrcPtr += SrcXtra;\r
                                        DstPtr += DstXtra;\r


@@ -1775,7 +1740,8 @@ geBoolean BlitData_DePalettize(void)
                                DstPtr  = (uint32 *)DstData;\r
                                for(y=SizeY;y--;)\r
                                {\r
                                DstPtr  = (uint32 *)DstData;\r
                                for(y=SizeY;y--;)\r
                                {\r

-                                       #ifdef DONT_USE_ASM\r
+                    // FIXME: asm code\r
+                                       //#ifdef DONT_USE_ASM\r

 \r
                                        for(x=SizeX;x--;)\r
                                        {\r
 \r
                                        for(x=SizeX;x--;)\r
                                        {\r


@@ -1783,7 +1749,7 @@ geBoolean BlitData_DePalettize(void)
                                                *DstPtr++ = PalData[pal];\r
                                        }\r
 \r
                                                *DstPtr++ = PalData[pal];\r
                                        }\r
 \r

-                                       #else\r
+                                       /*#else\r

 \r
                                        assert( (((uint32)PalData)&3) == 0);\r
                                        assert( (((uint32)DstPtr)&3) == 0);\r
 \r
                                        assert( (((uint32)PalData)&3) == 0);\r
                                        assert( (((uint32)DstPtr)&3) == 0);\r


@@ -1817,7 +1783,7 @@ geBoolean BlitData_DePalettize(void)
                                        SrcPtr += SizeX;\r
                                        DstPtr += SizeX;\r
 \r
                                        SrcPtr += SizeX;\r
                                        DstPtr += SizeX;\r
 \r

-                                       #endif\r
+                                       #endif*/\r

 \r
                                        SrcPtr += SrcXtra;\r
                                        DstPtr += DstXtra;\r
 \r
                                        SrcPtr += SrcXtra;\r
                                        DstPtr += DstXtra;\r

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

diff --git a/G3D/Bitmap/bitmap_gamma.c b/G3D/BitmapGamma.c
similarity index 94%
rename from G3D/Bitmap/bitmap_gamma.c
rename to G3D/BitmapGamma.c
index fe17bdb..60fbb81 100644 (file)
--- a/G3D/Bitmap/bitmap_gamma.c
+++ b/G3D/BitmapGamma.c
@@ -21,14 +21,13 @@
 /*                                                                                      */\r
 /****************************************************************************************/\r
 \r
 /*                                                                                      */\r
 /****************************************************************************************/\r
 \r

-\r
-#include "bitmap._h"\r
-#include "bitmap.__h"\r
-#include "bitmap_gamma.h"\r
-#include "pixelformat.h"\r
-#include "errorlog.h"\r

 #include <assert.h>\r
 #include <math.h>\r
 #include <assert.h>\r
 #include <math.h>\r

+#include "Bitmap._h"\r
+#include "Bitmap.__h"\r
+#include "BitmapGamma.h"\r
+#include "PixelFormat.h"\r
+#include "ErrorLog.h"\r

 \r
 /*}{*******************************************************/\r
 \r
 \r
 /*}{*******************************************************/\r
 \r

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

diff --git a/G3D/Engine/BitmapList.c b/G3D/BitmapList.c
similarity index 95%
rename from G3D/Engine/BitmapList.c
rename to G3D/BitmapList.c
index 9e05bb6..6b573de 100644 (file)
--- a/G3D/Engine/BitmapList.c
+++ b/G3D/BitmapList.c
@@ -19,12 +19,10 @@
 /*  Copyright (C) 1999 WildTangent, Inc. All Rights Reserved           */\r
 /*                                                                                      */\r
 /****************************************************************************************/\r
 /*  Copyright (C) 1999 WildTangent, Inc. All Rights Reserved           */\r
 /*                                                                                      */\r
 /****************************************************************************************/\r

-#include <Assert.h>\r
-\r
+#include <assert.h>\r

 #ifdef _DEBUG\r
 #include <windows.h>\r
 #endif\r
 #ifdef _DEBUG\r
 #include <windows.h>\r
 #endif\r

-\r

 #include <stdio.h>\r
 #include <memory.h>\r
 \r
 #include <stdio.h>\r
 #include <memory.h>\r
 \r


@@ -33,10 +31,10 @@
 #include "DCommon.h"\r
 #include "Bitmap.h"\r
 #include "Bitmap._h"\r
 #include "DCommon.h"\r
 #include "Bitmap.h"\r
 #include "Bitmap._h"\r

-#include "list.h"\r
-#include "mempool.h"\r
-#include "errorlog.h"\r
-#include "ram.h"\r
+#include "List.h"\r
+#include "MemPool.h"\r
+#include "ErrorLog.h"\r
+#include "Ram.h"\r

 //#include "tsc.h"\r
 \r
 struct BitmapList\r
 //#include "tsc.h"\r
 \r
 struct BitmapList\r

diff --git a/G3D/Engine/BitmapList.h b/G3D/BitmapList.h
similarity index 95%
rename from G3D/Engine/BitmapList.h
rename to G3D/BitmapList.h
index f84c329..dcf09d2 100644 (file)
--- a/G3D/Engine/BitmapList.h
+++ b/G3D/BitmapList.h
@@ -22,9 +22,9 @@
 #ifndef BITMAPLIST_H\r
 #define BITMAPLIST_H\r
 \r
 #ifndef BITMAPLIST_H\r
 #define BITMAPLIST_H\r
 \r

-#include "G3D/GeTypes.h"\r
-#include "G3D/Engine/Drivers/DCommon.h"\r
-#include "G3D/Bitmap.h"\r
+#include "GeTypes.h"\r
+#include "DCommon.h"\r
+#include "Bitmap.h"\r

 \r
 typedef struct BitmapList              BitmapList;\r
 \r
 \r
 typedef struct BitmapList              BitmapList;\r
 \r

diff --git a/G3D/Actor/body._h b/G3D/Body._h
similarity index 92%
rename from G3D/Actor/body._h
rename to G3D/Body._h
index 06f7db2..9ccf476 100644 (file)
--- a/G3D/Actor/body._h
+++ b/G3D/Body._h
@@ -22,11 +22,11 @@
 #ifndef GE_BODY__H\r
 #define GE_BODY__H \r
 \r
 #ifndef GE_BODY__H\r
 #define GE_BODY__H \r
 \r

-#include "basetype.h"\r
-#include "xform3d.h"\r
-#include "body.h"\r
-#include "strblock.h"\r
-#include "bitmap.h"\r
+#include "BaseType.h"\r
+#include "XForm3d.h"\r
+#include "Body.h"\r
+#include "StrBlock.h"\r
+#include "Bitmap.h"\r

 \r
 \r
 #ifdef __cplusplus\r
 \r
 \r
 #ifdef __cplusplus\r


@@ -112,7 +112,7 @@ typedef struct geBody
 } geBody;\r
 \r
 #if defined(DEBUG) || !defined(NDEBUG)\r
 } geBody;\r
 \r
 #if defined(DEBUG) || !defined(NDEBUG)\r

-geBoolean GENESISCC geBody_SanityCheck(const geBody *B);\r
+static geBoolean GENESISCC geBody_SanityCheck(const geBody *B);\r

 #endif\r
 \r
 \r
 #endif\r
 \r
 \r

diff --git a/G3D/Actor/body.c b/G3D/Body.c
similarity index 96%
rename from G3D/Actor/body.c
rename to G3D/Body.c
index a002942..df40233 100644 (file)
--- a/G3D/Actor/body.c
+++ b/G3D/Body.c
@@ -21,13 +21,13 @@
 /****************************************************************************************/\r
 #include <assert.h>                                            //assert()\r
 #include <string.h>                                            //strlen(), strcpy()\r
 /****************************************************************************************/\r
 #include <assert.h>                                            //assert()\r
 #include <string.h>                                            //strlen(), strcpy()\r

-#include <math.h>                                              //fabs()\r
+#include <math.h>                                              //fabs()\r

 #include <stdio.h>                                             //sscanf\r
 \r
 #include <stdio.h>                                             //sscanf\r
 \r

-#include "body.h"\r
-#include "body._h"\r
-#include "ram.h"\r
-#include "errorlog.h"\r
+#include "Body.h"\r
+#include "Body._h"\r
+#include "Ram.h"\r
+#include "ErrorLog.h"\r

 \r
 \r
 #define MAX(aa,bb)   ( (aa)>(bb)?(aa):(bb) )\r
 \r
 \r
 #define MAX(aa,bb)   ( (aa)>(bb)?(aa):(bb) )\r


@@ -37,7 +37,7 @@
 \r
 \r
 #if defined(DEBUG) || !defined(NDEBUG)\r
 \r
 \r
 #if defined(DEBUG) || !defined(NDEBUG)\r

-static geBoolean GENESISCC geBody_SanityCheck(const geBody *B)\r
+geBoolean GENESISCC geBody_SanityCheck(const geBody *B)\r

 {\r
        int i,j,k;\r
        int Lod,FaceCount,VertexCount,NormalCount,BoneCount;\r
 {\r
        int i,j,k;\r
        int Lod,FaceCount,VertexCount,NormalCount,BoneCount;\r

diff --git a/G3D/Actor/bodyinst.c b/G3D/BodyInst.c
similarity index 95%
rename from G3D/Actor/bodyinst.c
rename to G3D/BodyInst.c
index 48bf919..c659b5b 100644 (file)
--- a/G3D/Actor/bodyinst.c
+++ b/G3D/BodyInst.c
@@ -21,11 +21,11 @@
 /****************************************************************************************/\r
 #include <assert.h>                                            //assert()\r
 \r
 /****************************************************************************************/\r
 #include <assert.h>                                            //assert()\r
 \r

-#include "body._h"\r
-#include "bodyinst.h"\r
-#include "ram.h"\r
-#include "errorlog.h"\r
-#include "strblock.h"\r
+#include "Body._h"\r
+#include "BodyInst.h"\r
+#include "Ram.h"\r
+#include "ErrorLog.h"\r
+#include "StrBlock.h"\r

 \r
 \r
 \r
 \r
 \r
 \r

diff --git a/G3D/Actor/bodyinst.h b/G3D/BodyInst.h
similarity index 95%
rename from G3D/Actor/bodyinst.h
rename to G3D/BodyInst.h
index f079679..0119cd6 100644 (file)
--- a/G3D/Actor/bodyinst.h
+++ b/G3D/BodyInst.h
@@ -32,11 +32,11 @@
  */\r
 \r
 \r
  */\r
 \r
 \r

-#include "basetype.h"\r
-#include "xform3d.h"\r
-#include "body.h"\r
+#include "BaseType.h"\r
+#include "XForm3d.h"\r
+#include "Body.h"\r

 #include "XFArray.h"\r
 #include "XFArray.h"\r

-#include "camera.h"\r
+#include "Camera.h"\r

 \r
 \r
 #ifdef __cplusplus\r
 \r
 \r
 #ifdef __cplusplus\r


@@ -125,4 +125,4 @@ const geBodyInst_Geometry *GENESISCC geBodyInst_GetGeometry(
 #endif\r
 \r
 #endif\r
 #endif\r
 \r
 #endif\r

-               
\ No newline at end of file
+               \r

diff --git a/G3D/CMakeLists.txt b/G3D/CMakeLists.txt
index f4881ce..8be8d20 100644 (file)
--- a/G3D/CMakeLists.txt
+++ b/G3D/CMakeLists.txt
@@ -1,2 +1,16 @@
-ADD_LIBRARY             (Genesis3D STATIC Box.c CRC32.c CSNetMgr.c Camera.c Entities.c ErrorLog.c ExtBox.c Font.c Ge.c
-                                   GeAssert.c Log.c Matrix33.c MemPool.c NetPlay.c)
+SET                     (GENESIS3D_SOURCE ACorona.c AStreak.c Actor.c BMP.c Bitmap.c BitmapBlitData.c BitmapGamma.c
+                                          BitmapList.c Body.c BodyInst.c Box.c CRC32.c CSNetMgr.c Camera.c Corona.c
+                                          DirTree.c DirTreeCommon.c Electric.c Engine.c Entities.c ErrorLog.c
+                                          ExtBox.c Fog.c Font.c FontBmp.c Frustum.c FsDos.c FsMemory.c FsVfs.c
+                                          GBSPFile.c Ge.c GeAssert.c Genesis3d.c Light.c List.c Log.c Logo.c LogoActor.c
+                                          Matrix33.c MemPool.c Motion.c NetPlay.c PALCreate.c PALOptimize.c Palettize.c
+                                          Path.c PhysicsJoint.c PhysicsObject.c PhysicsSystem.c PixelFormat.c Plane.c
+                                          Pose.c PoweredBy.c Puppet.c QKFrame.c Quaternion.c Ram.c RamDLL.c Sound.c
+                                          Sound3d.c Sprite.c StrBlock.c Streak.c Surface.c System.c TClip.c TKArray.c
+                                          TKEvents.c TSC.c Timer.c Trace.c User.c VFile.c VKFrame.c Vec3d.c Vis.c
+                                          WBitmap.c WebUrl.c WgClip.c World.c XFArray.c XForm3d.c YUV.c)
+
+ADD_LIBRARY             (G3D STATIC ${GENESIS3D_SOURCE})
+
+ADD_LIBRARY             (Genesis3D SHARED ${GENESIS3D_SOURCE})
+TARGET_LINK_LIBRARIES   (Genesis3D dplay dplayx gdi32 msvcrt ole32 winmm)

diff --git a/G3D/Camera.c b/G3D/Camera.c
index 5a86985..48f73a7 100644 (file)
--- a/G3D/Camera.c
+++ b/G3D/Camera.c
@@ -26,7 +26,7 @@
 #include "Camera.h"\r
 #include "Ram.h"\r
 #include "ErrorLog.h"\r
 #include "Camera.h"\r
 #include "Ram.h"\r
 #include "ErrorLog.h"\r

-#include "G3D/Engine/Drivers/DCommon.h"\r
+#include "DCommon.h"\r

 \r
 typedef struct geCamera \r
 {\r
 \r
 typedef struct geCamera \r
 {\r

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

diff --git a/G3D/Engine/Drivers/DCommon.h b/G3D/DCommon.h
similarity index 100%
rename from G3D/Engine/Drivers/DCommon.h
rename to G3D/DCommon.h

diff --git a/G3D/DirTree.c b/G3D/DirTree.c
index 6d7764a..5d3acfb 100644 (file)
--- a/G3D/DirTree.c
+++ b/G3D/DirTree.c
@@ -25,11 +25,10 @@
 #include       <stdlib.h>\r
 #include       <string.h>\r
 \r
 #include       <stdlib.h>\r
 #include       <string.h>\r
 \r

-#include       "basetype.h"\r
-#include       "ram.h"\r
-\r
-#include       "dirtree.h"\r
-#include       "dirtree-common.h"\r
+#include       "BaseType.h"\r
+#include       "Ram.h"\r
+#include       "DirTree.h"\r
+#include       "DirTreeCommon.h"\r

 \r
 #define        DIRTREE_FILE_SIGNATURE  MAKEFOURCC('D', 'T', '0', '1')\r
 static int DirTree_SignatureBase=0x696C6345;\r
 \r
 #define        DIRTREE_FILE_SIGNATURE  MAKEFOURCC('D', 'T', '0', '1')\r
 static int DirTree_SignatureBase=0x696C6345;\r

diff --git a/G3D/DirTree.h b/G3D/DirTree.h
index 2610be5..6f88e5a 100644 (file)
--- a/G3D/DirTree.h
+++ b/G3D/DirTree.h
@@ -22,7 +22,7 @@
 #ifndef        DIRTREE_H\r
 #define        DIRTREE_H\r
 \r
 #ifndef        DIRTREE_H\r
 #define        DIRTREE_H\r
 \r

-#include       "vfile.h"\r
+#include       "VFile.h"\r

 \r
 typedef struct DirTree                 DirTree;\r
 typedef struct DirTree_Finder  DirTree_Finder;\r
 \r
 typedef struct DirTree                 DirTree;\r
 typedef struct DirTree_Finder  DirTree_Finder;\r

diff --git a/G3D/DirTreeCommon.c b/G3D/DirTreeCommon.c
index 8137354..2d2b318 100644 (file)
--- a/G3D/DirTreeCommon.c
+++ b/G3D/DirTreeCommon.c
@@ -23,8 +23,8 @@
 #include       <assert.h>\r
 #include       <string.h>\r
 \r
 #include       <assert.h>\r
 #include       <string.h>\r
 \r

-#include       "ram.h"\r
-#include       "dirtree-common.h"\r
+#include       "Ram.h"\r
+#include       "DirTreeCommon.h"\r

 \r
 char * DuplicateString(const char *String)\r
 {\r
 \r
 char * DuplicateString(const char *String)\r
 {\r


@@ -103,4 +103,4 @@ void        indent(int i)
        while   (i--)\r
                printf(" ");\r
 }\r
        while   (i--)\r
                printf(" ");\r
 }\r

-#endif
\ No newline at end of file
+#endif\r

diff --git a/G3D/DirTreeCommon.h b/G3D/DirTreeCommon.h
index 46da5ae..4972c81 100644 (file)
--- a/G3D/DirTreeCommon.h
+++ b/G3D/DirTreeCommon.h
@@ -23,7 +23,7 @@
 #define        DIRTREE_COMMON_H\r
 \r
 \r
 #define        DIRTREE_COMMON_H\r
 \r
 \r

-#include       "vfile.h"\r
+#include       "VFile.h"\r

 \r
 typedef        struct  DirTree_Header\r
 {\r
 \r
 typedef        struct  DirTree_Header\r
 {\r


@@ -50,4 +50,4 @@ geBoolean     PathHasDir(const char *Path);
 static void    indent(int i);\r
 #endif\r
 \r
 static void    indent(int i);\r
 #endif\r
 \r

-#endif
\ No newline at end of file
+#endif\r

diff --git a/G3D/Engine/Drivers/D3D7xDrv/D3D_ERR.CPP b/G3D/Drivers/D3D7xDrv/D3D_ERR.CPP
similarity index 100%
rename from G3D/Engine/Drivers/D3D7xDrv/D3D_ERR.CPP
rename to G3D/Drivers/D3D7xDrv/D3D_ERR.CPP

diff --git a/G3D/Engine/Drivers/D3D7xDrv/D3D_ERR.H b/G3D/Drivers/D3D7xDrv/D3D_ERR.H
similarity index 100%
rename from G3D/Engine/Drivers/D3D7xDrv/D3D_ERR.H
rename to G3D/Drivers/D3D7xDrv/D3D_ERR.H

diff --git a/G3D/Engine/Drivers/D3D7xDrv/D3d_fx.cpp b/G3D/Drivers/D3D7xDrv/D3d_fx.cpp
similarity index 100%
rename from G3D/Engine/Drivers/D3D7xDrv/D3d_fx.cpp
rename to G3D/Drivers/D3D7xDrv/D3d_fx.cpp

diff --git a/G3D/Engine/Drivers/D3D7xDrv/D3d_fx.h b/G3D/Drivers/D3D7xDrv/D3d_fx.h
similarity index 100%
rename from G3D/Engine/Drivers/D3D7xDrv/D3d_fx.h
rename to G3D/Drivers/D3D7xDrv/D3d_fx.h

diff --git a/G3D/Engine/Drivers/D3D7xDrv/D3d_main.cpp b/G3D/Drivers/D3D7xDrv/D3d_main.cpp
similarity index 100%
rename from G3D/Engine/Drivers/D3D7xDrv/D3d_main.cpp
rename to G3D/Drivers/D3D7xDrv/D3d_main.cpp

diff --git a/G3D/Engine/Drivers/D3D7xDrv/D3d_main.h b/G3D/Drivers/D3D7xDrv/D3d_main.h
similarity index 100%
rename from G3D/Engine/Drivers/D3D7xDrv/D3d_main.h
rename to G3D/Drivers/D3D7xDrv/D3d_main.h

diff --git a/G3D/Engine/Drivers/D3D7xDrv/D3dcache.cpp b/G3D/Drivers/D3D7xDrv/D3dcache.cpp
similarity index 100%
rename from G3D/Engine/Drivers/D3D7xDrv/D3dcache.cpp
rename to G3D/Drivers/D3D7xDrv/D3dcache.cpp

diff --git a/G3D/Engine/Drivers/D3D7xDrv/D3dcache.h b/G3D/Drivers/D3D7xDrv/D3dcache.h
similarity index 100%
rename from G3D/Engine/Drivers/D3D7xDrv/D3dcache.h
rename to G3D/Drivers/D3D7xDrv/D3dcache.h

diff --git a/G3D/Engine/Drivers/D3D7xDrv/D3ddrv7x.cpp b/G3D/Drivers/D3D7xDrv/D3ddrv7x.cpp
similarity index 100%
rename from G3D/Engine/Drivers/D3D7xDrv/D3ddrv7x.cpp
rename to G3D/Drivers/D3D7xDrv/D3ddrv7x.cpp

diff --git a/G3D/Engine/Drivers/D3D7xDrv/D3ddrv7x.h b/G3D/Drivers/D3D7xDrv/D3ddrv7x.h
similarity index 100%
rename from G3D/Engine/Drivers/D3D7xDrv/D3ddrv7x.h
rename to G3D/Drivers/D3D7xDrv/D3ddrv7x.h

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

diff --git a/G3D/Engine/Drivers/D3D7xDrv/DDMemMgr.h b/G3D/Drivers/D3D7xDrv/DDMemMgr.h
similarity index 100%
rename from G3D/Engine/Drivers/D3D7xDrv/DDMemMgr.h
rename to G3D/Drivers/D3D7xDrv/DDMemMgr.h

diff --git a/G3D/Engine/Drivers/D3D7xDrv/GSPAN.H b/G3D/Drivers/D3D7xDrv/GSPAN.H
similarity index 100%
rename from G3D/Engine/Drivers/D3D7xDrv/GSPAN.H
rename to G3D/Drivers/D3D7xDrv/GSPAN.H

diff --git a/G3D/Engine/Drivers/D3D7xDrv/Gspan.cpp b/G3D/Drivers/D3D7xDrv/Gspan.cpp
similarity index 100%
rename from G3D/Engine/Drivers/D3D7xDrv/Gspan.cpp
rename to G3D/Drivers/D3D7xDrv/Gspan.cpp

diff --git a/G3D/Engine/Drivers/D3D7xDrv/Pcache.cpp b/G3D/Drivers/D3D7xDrv/Pcache.cpp
similarity index 100%
rename from G3D/Engine/Drivers/D3D7xDrv/Pcache.cpp
rename to G3D/Drivers/D3D7xDrv/Pcache.cpp

diff --git a/G3D/Engine/Drivers/D3D7xDrv/Pcache.h b/G3D/Drivers/D3D7xDrv/Pcache.h
similarity index 100%
rename from G3D/Engine/Drivers/D3D7xDrv/Pcache.h
rename to G3D/Drivers/D3D7xDrv/Pcache.h

diff --git a/G3D/Engine/Drivers/D3D7xDrv/RENDER.H b/G3D/Drivers/D3D7xDrv/RENDER.H
similarity index 100%
rename from G3D/Engine/Drivers/D3D7xDrv/RENDER.H
rename to G3D/Drivers/D3D7xDrv/RENDER.H

diff --git a/G3D/Engine/Drivers/D3D7xDrv/Render.cpp b/G3D/Drivers/D3D7xDrv/Render.cpp
similarity index 100%
rename from G3D/Engine/Drivers/D3D7xDrv/Render.cpp
rename to G3D/Drivers/D3D7xDrv/Render.cpp

diff --git a/G3D/Engine/Drivers/D3D7xDrv/SCENE.H b/G3D/Drivers/D3D7xDrv/SCENE.H
similarity index 100%
rename from G3D/Engine/Drivers/D3D7xDrv/SCENE.H
rename to G3D/Drivers/D3D7xDrv/SCENE.H

diff --git a/G3D/Engine/Drivers/D3D7xDrv/Scene.cpp b/G3D/Drivers/D3D7xDrv/Scene.cpp
similarity index 100%
rename from G3D/Engine/Drivers/D3D7xDrv/Scene.cpp
rename to G3D/Drivers/D3D7xDrv/Scene.cpp

diff --git a/G3D/Engine/Drivers/D3D7xDrv/THandle.cpp b/G3D/Drivers/D3D7xDrv/THandle.cpp
similarity index 100%
rename from G3D/Engine/Drivers/D3D7xDrv/THandle.cpp
rename to G3D/Drivers/D3D7xDrv/THandle.cpp

diff --git a/G3D/Engine/Drivers/D3D7xDrv/THandle.h b/G3D/Drivers/D3D7xDrv/THandle.h
similarity index 100%
rename from G3D/Engine/Drivers/D3D7xDrv/THandle.h
rename to G3D/Drivers/D3D7xDrv/THandle.h

diff --git a/G3D/Engine/Drivers/D3D7xDrv/TPage.h b/G3D/Drivers/D3D7xDrv/TPage.h
similarity index 100%
rename from G3D/Engine/Drivers/D3D7xDrv/TPage.h
rename to G3D/Drivers/D3D7xDrv/TPage.h

diff --git a/G3D/Engine/Drivers/D3D7xDrv/tpage.cpp b/G3D/Drivers/D3D7xDrv/tpage.cpp
similarity index 100%
rename from G3D/Engine/Drivers/D3D7xDrv/tpage.cpp
rename to G3D/Drivers/D3D7xDrv/tpage.cpp

diff --git a/G3D/Engine/Drivers/D3D8Drv/D3DDRV.H b/G3D/Drivers/D3D8Drv/D3DDRV.H
similarity index 100%
rename from G3D/Engine/Drivers/D3D8Drv/D3DDRV.H
rename to G3D/Drivers/D3D8Drv/D3DDRV.H

diff --git a/G3D/Engine/Drivers/D3D8Drv/D3D_ERR.CPP b/G3D/Drivers/D3D8Drv/D3D_ERR.CPP
similarity index 100%
rename from G3D/Engine/Drivers/D3D8Drv/D3D_ERR.CPP
rename to G3D/Drivers/D3D8Drv/D3D_ERR.CPP

diff --git a/G3D/Engine/Drivers/D3D8Drv/D3D_ERR.H b/G3D/Drivers/D3D8Drv/D3D_ERR.H
similarity index 100%
rename from G3D/Engine/Drivers/D3D8Drv/D3D_ERR.H
rename to G3D/Drivers/D3D8Drv/D3D_ERR.H

diff --git a/G3D/Engine/Drivers/D3D8Drv/D3D_FX.H b/G3D/Drivers/D3D8Drv/D3D_FX.H
similarity index 100%
rename from G3D/Engine/Drivers/D3D8Drv/D3D_FX.H
rename to G3D/Drivers/D3D8Drv/D3D_FX.H

diff --git a/G3D/Engine/Drivers/D3D8Drv/D3d_fx.cpp b/G3D/Drivers/D3D8Drv/D3d_fx.cpp
similarity index 100%
rename from G3D/Engine/Drivers/D3D8Drv/D3d_fx.cpp
rename to G3D/Drivers/D3D8Drv/D3d_fx.cpp

diff --git a/G3D/Engine/Drivers/D3D8Drv/D3d_main.cpp b/G3D/Drivers/D3D8Drv/D3d_main.cpp
similarity index 100%
rename from G3D/Engine/Drivers/D3D8Drv/D3d_main.cpp
rename to G3D/Drivers/D3D8Drv/D3d_main.cpp

diff --git a/G3D/Engine/Drivers/D3D8Drv/D3d_main.h b/G3D/Drivers/D3D8Drv/D3d_main.h
similarity index 100%
rename from G3D/Engine/Drivers/D3D8Drv/D3d_main.h
rename to G3D/Drivers/D3D8Drv/D3d_main.h

diff --git a/G3D/Engine/Drivers/D3D8Drv/D3dcache.cpp b/G3D/Drivers/D3D8Drv/D3dcache.cpp
similarity index 100%
rename from G3D/Engine/Drivers/D3D8Drv/D3dcache.cpp
rename to G3D/Drivers/D3D8Drv/D3dcache.cpp

diff --git a/G3D/Engine/Drivers/D3D8Drv/D3dcache.h b/G3D/Drivers/D3D8Drv/D3dcache.h
similarity index 100%
rename from G3D/Engine/Drivers/D3D8Drv/D3dcache.h
rename to G3D/Drivers/D3D8Drv/D3dcache.h

diff --git a/G3D/Engine/Drivers/D3D8Drv/D3ddrv.cpp b/G3D/Drivers/D3D8Drv/D3ddrv.cpp
similarity index 100%
rename from G3D/Engine/Drivers/D3D8Drv/D3ddrv.cpp
rename to G3D/Drivers/D3D8Drv/D3ddrv.cpp

diff --git a/G3D/Engine/Drivers/D3D8Drv/DDMemMgr.cpp b/G3D/Drivers/D3D8Drv/DDMemMgr.cpp
similarity index 100%
rename from G3D/Engine/Drivers/D3D8Drv/DDMemMgr.cpp
rename to G3D/Drivers/D3D8Drv/DDMemMgr.cpp

diff --git a/G3D/Engine/Drivers/D3D8Drv/DDMemMgr.h b/G3D/Drivers/D3D8Drv/DDMemMgr.h
similarity index 100%
rename from G3D/Engine/Drivers/D3D8Drv/DDMemMgr.h
rename to G3D/Drivers/D3D8Drv/DDMemMgr.h

diff --git a/G3D/Engine/Drivers/D3D8Drv/GSPAN.CPP b/G3D/Drivers/D3D8Drv/GSPAN.CPP
similarity index 100%
rename from G3D/Engine/Drivers/D3D8Drv/GSPAN.CPP
rename to G3D/Drivers/D3D8Drv/GSPAN.CPP

diff --git a/G3D/Engine/Drivers/D3D8Drv/GSPAN.H b/G3D/Drivers/D3D8Drv/GSPAN.H
similarity index 100%
rename from G3D/Engine/Drivers/D3D8Drv/GSPAN.H
rename to G3D/Drivers/D3D8Drv/GSPAN.H

diff --git a/G3D/Engine/Drivers/D3D8Drv/Pcache.cpp b/G3D/Drivers/D3D8Drv/Pcache.cpp
similarity index 100%
rename from G3D/Engine/Drivers/D3D8Drv/Pcache.cpp
rename to G3D/Drivers/D3D8Drv/Pcache.cpp

diff --git a/G3D/Engine/Drivers/D3D8Drv/Pcache.h b/G3D/Drivers/D3D8Drv/Pcache.h
similarity index 100%
rename from G3D/Engine/Drivers/D3D8Drv/Pcache.h
rename to G3D/Drivers/D3D8Drv/Pcache.h

diff --git a/G3D/Engine/Drivers/D3D8Drv/RENDER.H b/G3D/Drivers/D3D8Drv/RENDER.H
similarity index 100%
rename from G3D/Engine/Drivers/D3D8Drv/RENDER.H
rename to G3D/Drivers/D3D8Drv/RENDER.H

diff --git a/G3D/Engine/Drivers/D3D8Drv/Render.cpp b/G3D/Drivers/D3D8Drv/Render.cpp
similarity index 100%
rename from G3D/Engine/Drivers/D3D8Drv/Render.cpp
rename to G3D/Drivers/D3D8Drv/Render.cpp

diff --git a/G3D/Engine/Drivers/D3D8Drv/SCENE.H b/G3D/Drivers/D3D8Drv/SCENE.H
similarity index 100%
rename from G3D/Engine/Drivers/D3D8Drv/SCENE.H
rename to G3D/Drivers/D3D8Drv/SCENE.H

diff --git a/G3D/Engine/Drivers/D3D8Drv/Scene.cpp b/G3D/Drivers/D3D8Drv/Scene.cpp
similarity index 100%
rename from G3D/Engine/Drivers/D3D8Drv/Scene.cpp
rename to G3D/Drivers/D3D8Drv/Scene.cpp

diff --git a/G3D/Engine/Drivers/D3D8Drv/THandle.cpp b/G3D/Drivers/D3D8Drv/THandle.cpp
similarity index 100%
rename from G3D/Engine/Drivers/D3D8Drv/THandle.cpp
rename to G3D/Drivers/D3D8Drv/THandle.cpp

diff --git a/G3D/Engine/Drivers/D3D8Drv/THandle.h b/G3D/Drivers/D3D8Drv/THandle.h
similarity index 100%
rename from G3D/Engine/Drivers/D3D8Drv/THandle.h
rename to G3D/Drivers/D3D8Drv/THandle.h

diff --git a/G3D/Engine/Drivers/D3D8Drv/TPage.h b/G3D/Drivers/D3D8Drv/TPage.h
similarity index 100%
rename from G3D/Engine/Drivers/D3D8Drv/TPage.h
rename to G3D/Drivers/D3D8Drv/TPage.h

diff --git a/G3D/Engine/Drivers/D3D8Drv/tpage.cpp b/G3D/Drivers/D3D8Drv/tpage.cpp
similarity index 100%
rename from G3D/Engine/Drivers/D3D8Drv/tpage.cpp
rename to G3D/Drivers/D3D8Drv/tpage.cpp

diff --git a/G3D/Engine/Drivers/D3DDrv/D3DDRV.H b/G3D/Drivers/D3DDrv/D3DDRV.H
similarity index 100%
rename from G3D/Engine/Drivers/D3DDrv/D3DDRV.H
rename to G3D/Drivers/D3DDrv/D3DDRV.H

diff --git a/G3D/Engine/Drivers/D3DDrv/D3D_ERR.CPP b/G3D/Drivers/D3DDrv/D3D_ERR.CPP
similarity index 100%
rename from G3D/Engine/Drivers/D3DDrv/D3D_ERR.CPP
rename to G3D/Drivers/D3DDrv/D3D_ERR.CPP

diff --git a/G3D/Engine/Drivers/D3DDrv/D3D_ERR.H b/G3D/Drivers/D3DDrv/D3D_ERR.H
similarity index 100%
rename from G3D/Engine/Drivers/D3DDrv/D3D_ERR.H
rename to G3D/Drivers/D3DDrv/D3D_ERR.H

diff --git a/G3D/Engine/Drivers/D3DDrv/D3d_fx.cpp b/G3D/Drivers/D3DDrv/D3d_fx.cpp
similarity index 100%
rename from G3D/Engine/Drivers/D3DDrv/D3d_fx.cpp
rename to G3D/Drivers/D3DDrv/D3d_fx.cpp

diff --git a/G3D/Engine/Drivers/D3DDrv/D3d_fx.h b/G3D/Drivers/D3DDrv/D3d_fx.h
similarity index 100%
rename from G3D/Engine/Drivers/D3DDrv/D3d_fx.h
rename to G3D/Drivers/D3DDrv/D3d_fx.h

diff --git a/G3D/Engine/Drivers/D3DDrv/D3d_main.cpp b/G3D/Drivers/D3DDrv/D3d_main.cpp
similarity index 100%
rename from G3D/Engine/Drivers/D3DDrv/D3d_main.cpp
rename to G3D/Drivers/D3DDrv/D3d_main.cpp

diff --git a/G3D/Engine/Drivers/D3DDrv/D3d_main.h b/G3D/Drivers/D3DDrv/D3d_main.h
similarity index 100%
rename from G3D/Engine/Drivers/D3DDrv/D3d_main.h
rename to G3D/Drivers/D3DDrv/D3d_main.h

diff --git a/G3D/Engine/Drivers/D3DDrv/D3dcache.cpp b/G3D/Drivers/D3DDrv/D3dcache.cpp
similarity index 100%
rename from G3D/Engine/Drivers/D3DDrv/D3dcache.cpp
rename to G3D/Drivers/D3DDrv/D3dcache.cpp

diff --git a/G3D/Engine/Drivers/D3DDrv/D3dcache.h b/G3D/Drivers/D3DDrv/D3dcache.h
similarity index 100%
rename from G3D/Engine/Drivers/D3DDrv/D3dcache.h
rename to G3D/Drivers/D3DDrv/D3dcache.h

diff --git a/G3D/Engine/Drivers/D3DDrv/D3ddrv.cpp b/G3D/Drivers/D3DDrv/D3ddrv.cpp
similarity index 100%
rename from G3D/Engine/Drivers/D3DDrv/D3ddrv.cpp
rename to G3D/Drivers/D3DDrv/D3ddrv.cpp

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

diff --git a/G3D/Engine/Drivers/D3DDrv/DDMemMgr.h b/G3D/Drivers/D3DDrv/DDMemMgr.h
similarity index 100%
rename from G3D/Engine/Drivers/D3DDrv/DDMemMgr.h
rename to G3D/Drivers/D3DDrv/DDMemMgr.h

diff --git a/G3D/Engine/Drivers/D3DDrv/GSPAN.CPP b/G3D/Drivers/D3DDrv/GSPAN.CPP
similarity index 100%
rename from G3D/Engine/Drivers/D3DDrv/GSPAN.CPP
rename to G3D/Drivers/D3DDrv/GSPAN.CPP

diff --git a/G3D/Engine/Drivers/D3DDrv/GSPAN.H b/G3D/Drivers/D3DDrv/GSPAN.H
similarity index 100%
rename from G3D/Engine/Drivers/D3DDrv/GSPAN.H
rename to G3D/Drivers/D3DDrv/GSPAN.H

diff --git a/G3D/Engine/Drivers/D3DDrv/Pcache.cpp b/G3D/Drivers/D3DDrv/Pcache.cpp
similarity index 100%
rename from G3D/Engine/Drivers/D3DDrv/Pcache.cpp
rename to G3D/Drivers/D3DDrv/Pcache.cpp

diff --git a/G3D/Engine/Drivers/D3DDrv/Pcache.h b/G3D/Drivers/D3DDrv/Pcache.h
similarity index 100%
rename from G3D/Engine/Drivers/D3DDrv/Pcache.h
rename to G3D/Drivers/D3DDrv/Pcache.h

diff --git a/G3D/Engine/Drivers/D3DDrv/README.NOW b/G3D/Drivers/D3DDrv/README.NOW
similarity index 100%
rename from G3D/Engine/Drivers/D3DDrv/README.NOW
rename to G3D/Drivers/D3DDrv/README.NOW

diff --git a/G3D/Engine/Drivers/D3DDrv/RENDER.H b/G3D/Drivers/D3DDrv/RENDER.H
similarity index 100%
rename from G3D/Engine/Drivers/D3DDrv/RENDER.H
rename to G3D/Drivers/D3DDrv/RENDER.H

diff --git a/G3D/Engine/Drivers/D3DDrv/Render.cpp b/G3D/Drivers/D3DDrv/Render.cpp
similarity index 100%
rename from G3D/Engine/Drivers/D3DDrv/Render.cpp
rename to G3D/Drivers/D3DDrv/Render.cpp

diff --git a/G3D/Engine/Drivers/D3DDrv/SCENE.H b/G3D/Drivers/D3DDrv/SCENE.H
similarity index 100%
rename from G3D/Engine/Drivers/D3DDrv/SCENE.H
rename to G3D/Drivers/D3DDrv/SCENE.H

diff --git a/G3D/Engine/Drivers/D3DDrv/Scene.cpp b/G3D/Drivers/D3DDrv/Scene.cpp
similarity index 100%
rename from G3D/Engine/Drivers/D3DDrv/Scene.cpp
rename to G3D/Drivers/D3DDrv/Scene.cpp

diff --git a/G3D/Engine/Drivers/D3DDrv/THandle.cpp b/G3D/Drivers/D3DDrv/THandle.cpp
similarity index 100%
rename from G3D/Engine/Drivers/D3DDrv/THandle.cpp
rename to G3D/Drivers/D3DDrv/THandle.cpp

diff --git a/G3D/Engine/Drivers/D3DDrv/THandle.h b/G3D/Drivers/D3DDrv/THandle.h
similarity index 100%
rename from G3D/Engine/Drivers/D3DDrv/THandle.h
rename to G3D/Drivers/D3DDrv/THandle.h

diff --git a/G3D/Engine/Drivers/D3DDrv/TPage.h b/G3D/Drivers/D3DDrv/TPage.h
similarity index 100%
rename from G3D/Engine/Drivers/D3DDrv/TPage.h
rename to G3D/Drivers/D3DDrv/TPage.h

diff --git a/G3D/Engine/Drivers/D3DDrv/tpage.cpp b/G3D/Drivers/D3DDrv/tpage.cpp
similarity index 100%
rename from G3D/Engine/Drivers/D3DDrv/tpage.cpp
rename to G3D/Drivers/D3DDrv/tpage.cpp

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

diff --git a/G3D/Engine/Drivers/GlideDrv/GCache.h b/G3D/Drivers/GlideDrv/GCache.h
similarity index 100%
rename from G3D/Engine/Drivers/GlideDrv/GCache.h
rename to G3D/Drivers/GlideDrv/GCache.h

diff --git a/G3D/Engine/Drivers/GlideDrv/GLIDEDRV.H b/G3D/Drivers/GlideDrv/GLIDEDRV.H
similarity index 100%
rename from G3D/Engine/Drivers/GlideDrv/GLIDEDRV.H
rename to G3D/Drivers/GlideDrv/GLIDEDRV.H

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

diff --git a/G3D/Engine/Drivers/GlideDrv/GMain.h b/G3D/Drivers/GlideDrv/GMain.h
similarity index 100%
rename from G3D/Engine/Drivers/GlideDrv/GMain.h
rename to G3D/Drivers/GlideDrv/GMain.h

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

diff --git a/G3D/Engine/Drivers/GlideDrv/GMemMgr.h b/G3D/Drivers/GlideDrv/GMemMgr.h
similarity index 100%
rename from G3D/Engine/Drivers/GlideDrv/GMemMgr.h
rename to G3D/Drivers/GlideDrv/GMemMgr.h

diff --git a/G3D/Engine/Drivers/GlideDrv/GSpan.cpp b/G3D/Drivers/GlideDrv/GSpan.cpp
similarity index 100%
rename from G3D/Engine/Drivers/GlideDrv/GSpan.cpp
rename to G3D/Drivers/GlideDrv/GSpan.cpp

diff --git a/G3D/Engine/Drivers/GlideDrv/GSpan.h b/G3D/Drivers/GlideDrv/GSpan.h
similarity index 100%
rename from G3D/Engine/Drivers/GlideDrv/GSpan.h
rename to G3D/Drivers/GlideDrv/GSpan.h

diff --git a/G3D/Engine/Drivers/GlideDrv/GTHandle.h b/G3D/Drivers/GlideDrv/GTHandle.h
similarity index 100%
rename from G3D/Engine/Drivers/GlideDrv/GTHandle.h
rename to G3D/Drivers/GlideDrv/GTHandle.h

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

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

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

diff --git a/G3D/Engine/Drivers/GlideDrv/Render.h b/G3D/Drivers/GlideDrv/Render.h
similarity index 100%
rename from G3D/Engine/Drivers/GlideDrv/Render.h
rename to G3D/Drivers/GlideDrv/Render.h

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

diff --git a/G3D/Engine/Drivers/OpenGl/OGLDrv.h b/G3D/Drivers/OpenGl/OGLDrv.h
similarity index 100%
rename from G3D/Engine/Drivers/OpenGl/OGLDrv.h
rename to G3D/Drivers/OpenGl/OGLDrv.h

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

diff --git a/G3D/Engine/Drivers/OpenGl/OglMisc.h b/G3D/Drivers/OpenGl/OglMisc.h
similarity index 100%
rename from G3D/Engine/Drivers/OpenGl/OglMisc.h
rename to G3D/Drivers/OpenGl/OglMisc.h

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

diff --git a/G3D/Engine/Drivers/OpenGl/Render.h b/G3D/Drivers/OpenGl/Render.h
similarity index 100%
rename from G3D/Engine/Drivers/OpenGl/Render.h
rename to G3D/Drivers/OpenGl/Render.h

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

diff --git a/G3D/Engine/Drivers/OpenGl/THandle.h b/G3D/Drivers/OpenGl/THandle.h
similarity index 100%
rename from G3D/Engine/Drivers/OpenGl/THandle.h
rename to G3D/Drivers/OpenGl/THandle.h

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

diff --git a/G3D/Engine/Drivers/OpenGl/Win32.h b/G3D/Drivers/OpenGl/Win32.h
similarity index 100%
rename from G3D/Engine/Drivers/OpenGl/Win32.h
rename to G3D/Drivers/OpenGl/Win32.h

diff --git a/G3D/Engine/Drivers/OpenGl/glext.h b/G3D/Drivers/OpenGl/glext.h
similarity index 100%
rename from G3D/Engine/Drivers/OpenGl/glext.h
rename to G3D/Drivers/OpenGl/glext.h

diff --git a/G3D/Engine/Drivers/SoftDrv/3dnowspan.h b/G3D/Drivers/SoftDrv/3dnowspan.h
similarity index 100%
rename from G3D/Engine/Drivers/SoftDrv/3dnowspan.h
rename to G3D/Drivers/SoftDrv/3dnowspan.h

diff --git a/G3D/Engine/Drivers/SoftDrv/REGISTER.H b/G3D/Drivers/SoftDrv/REGISTER.H
similarity index 100%
rename from G3D/Engine/Drivers/SoftDrv/REGISTER.H
rename to G3D/Drivers/SoftDrv/REGISTER.H

diff --git a/G3D/Engine/Drivers/SoftDrv/RENDER.H b/G3D/Drivers/SoftDrv/RENDER.H
similarity index 100%
rename from G3D/Engine/Drivers/SoftDrv/RENDER.H
rename to G3D/Drivers/SoftDrv/RENDER.H

diff --git a/G3D/Engine/Drivers/SoftDrv/SAL.H b/G3D/Drivers/SoftDrv/SAL.H
similarity index 100%
rename from G3D/Engine/Drivers/SoftDrv/SAL.H
rename to G3D/Drivers/SoftDrv/SAL.H

diff --git a/G3D/Engine/Drivers/SoftDrv/SCENE.H b/G3D/Drivers/SoftDrv/SCENE.H
similarity index 100%
rename from G3D/Engine/Drivers/SoftDrv/SCENE.H
rename to G3D/Drivers/SoftDrv/SCENE.H

diff --git a/G3D/Engine/Drivers/SoftDrv/SOFTDRV.H b/G3D/Drivers/SoftDrv/SOFTDRV.H
similarity index 100%
rename from G3D/Engine/Drivers/SoftDrv/SOFTDRV.H
rename to G3D/Drivers/SoftDrv/SOFTDRV.H

diff --git a/G3D/Engine/Drivers/SoftDrv/SPAN.H b/G3D/Drivers/SoftDrv/SPAN.H
similarity index 100%
rename from G3D/Engine/Drivers/SoftDrv/SPAN.H
rename to G3D/Drivers/SoftDrv/SPAN.H

diff --git a/G3D/Engine/Drivers/SoftDrv/SYSTEM.H b/G3D/Drivers/SoftDrv/SYSTEM.H
similarity index 100%
rename from G3D/Engine/Drivers/SoftDrv/SYSTEM.H
rename to G3D/Drivers/SoftDrv/SYSTEM.H

diff --git a/G3D/Engine/Drivers/SoftDrv/W32SAL.CPP b/G3D/Drivers/SoftDrv/W32SAL.CPP
similarity index 100%
rename from G3D/Engine/Drivers/SoftDrv/W32SAL.CPP
rename to G3D/Drivers/SoftDrv/W32SAL.CPP

diff --git a/G3D/Engine/Drivers/SoftDrv/amdspan.asm b/G3D/Drivers/SoftDrv/amdspan.asm
similarity index 100%
rename from G3D/Engine/Drivers/SoftDrv/amdspan.asm
rename to G3D/Drivers/SoftDrv/amdspan.asm

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

diff --git a/G3D/Engine/Drivers/SoftDrv/dmodes.h b/G3D/Drivers/SoftDrv/dmodes.h
similarity index 100%
rename from G3D/Engine/Drivers/SoftDrv/dmodes.h
rename to G3D/Drivers/SoftDrv/dmodes.h

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

diff --git a/G3D/Engine/Drivers/SoftDrv/drawspan.h b/G3D/Drivers/SoftDrv/drawspan.h
similarity index 100%
rename from G3D/Engine/Drivers/SoftDrv/drawspan.h
rename to G3D/Drivers/SoftDrv/drawspan.h

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

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

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

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

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

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

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

diff --git a/G3D/Engine/Drivers/SoftDrv/x86span555.h b/G3D/Drivers/SoftDrv/x86span555.h
similarity index 100%
rename from G3D/Engine/Drivers/SoftDrv/x86span555.h
rename to G3D/Drivers/SoftDrv/x86span555.h

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

diff --git a/G3D/Engine/Drivers/SoftDrv/x86span565.h b/G3D/Drivers/SoftDrv/x86span565.h
similarity index 100%
rename from G3D/Engine/Drivers/SoftDrv/x86span565.h
rename to G3D/Drivers/SoftDrv/x86span565.h

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

diff --git a/G3D/Engine/Drivers/SoftDrv2/CPUInfo.h b/G3D/Drivers/SoftDrv2/CPUInfo.h
similarity index 100%
rename from G3D/Engine/Drivers/SoftDrv2/CPUInfo.h
rename to G3D/Drivers/SoftDrv2/CPUInfo.h

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

diff --git a/G3D/Engine/Drivers/SoftDrv2/DDRAWDisplay.h b/G3D/Drivers/SoftDrv2/DDRAWDisplay.h
similarity index 100%
rename from G3D/Engine/Drivers/SoftDrv2/DDRAWDisplay.h
rename to G3D/Drivers/SoftDrv2/DDRAWDisplay.h

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

diff --git a/G3D/Engine/Drivers/SoftDrv2/DIBDisplay.h b/G3D/Drivers/SoftDrv2/DIBDisplay.h
similarity index 100%
rename from G3D/Engine/Drivers/SoftDrv2/DIBDisplay.h
rename to G3D/Drivers/SoftDrv2/DIBDisplay.h

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

diff --git a/G3D/Engine/Drivers/SoftDrv2/DisplayModeInfo.h b/G3D/Drivers/SoftDrv2/DisplayModeInfo.h
similarity index 100%
rename from G3D/Engine/Drivers/SoftDrv2/DisplayModeInfo.h
rename to G3D/Drivers/SoftDrv2/DisplayModeInfo.h

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

diff --git a/G3D/Engine/Drivers/SoftDrv2/DrawDecal.h b/G3D/Drivers/SoftDrv2/DrawDecal.h
similarity index 100%
rename from G3D/Engine/Drivers/SoftDrv2/DrawDecal.h
rename to G3D/Drivers/SoftDrv2/DrawDecal.h

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

diff --git a/G3D/Engine/Drivers/SoftDrv2/SWTHandle.h b/G3D/Drivers/SoftDrv2/SWTHandle.h
similarity index 100%
rename from G3D/Engine/Drivers/SoftDrv2/SWTHandle.h
rename to G3D/Drivers/SoftDrv2/SWTHandle.h

diff --git a/G3D/Engine/Drivers/SoftDrv2/Softdrv.h b/G3D/Drivers/SoftDrv2/Softdrv.h
similarity index 100%
rename from G3D/Engine/Drivers/SoftDrv2/Softdrv.h
rename to G3D/Drivers/SoftDrv2/Softdrv.h

diff --git a/G3D/Engine/Drivers/SoftDrv2/Span.h b/G3D/Drivers/SoftDrv2/Span.h
similarity index 100%
rename from G3D/Engine/Drivers/SoftDrv2/Span.h
rename to G3D/Drivers/SoftDrv2/Span.h

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

diff --git a/G3D/Engine/Drivers/SoftDrv2/SpanBuffer.h b/G3D/Drivers/SoftDrv2/SpanBuffer.h
similarity index 100%
rename from G3D/Engine/Drivers/SoftDrv2/SpanBuffer.h
rename to G3D/Drivers/SoftDrv2/SpanBuffer.h

diff --git a/G3D/Engine/Drivers/SoftDrv2/SpanEdges_Factory.h b/G3D/Drivers/SoftDrv2/SpanEdges_Factory.h
similarity index 100%
rename from G3D/Engine/Drivers/SoftDrv2/SpanEdges_Factory.h
rename to G3D/Drivers/SoftDrv2/SpanEdges_Factory.h

diff --git a/G3D/Engine/Drivers/SoftDrv2/Span_AffineLoop.h b/G3D/Drivers/SoftDrv2/Span_AffineLoop.h
similarity index 100%
rename from G3D/Engine/Drivers/SoftDrv2/Span_AffineLoop.h
rename to G3D/Drivers/SoftDrv2/Span_AffineLoop.h

diff --git a/G3D/Engine/Drivers/SoftDrv2/Span_Factory.h b/G3D/Drivers/SoftDrv2/Span_Factory.h
similarity index 100%
rename from G3D/Engine/Drivers/SoftDrv2/Span_Factory.h
rename to G3D/Drivers/SoftDrv2/Span_Factory.h

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

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

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

diff --git a/G3D/Engine/Drivers/SoftDrv2/display.h b/G3D/Drivers/SoftDrv2/display.h
similarity index 100%
rename from G3D/Engine/Drivers/SoftDrv2/display.h
rename to G3D/Drivers/SoftDrv2/display.h

diff --git a/G3D/Engine/Drivers/SoftDrv2/rop.h b/G3D/Drivers/SoftDrv2/rop.h
similarity index 100%
rename from G3D/Engine/Drivers/SoftDrv2/rop.h
rename to G3D/Drivers/SoftDrv2/rop.h

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

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

diff --git a/G3D/Engine/Drivers/SoftDrv2/traster.h b/G3D/Drivers/SoftDrv2/traster.h
similarity index 100%
rename from G3D/Engine/Drivers/SoftDrv2/traster.h
rename to G3D/Drivers/SoftDrv2/traster.h

diff --git a/G3D/Engine/Drivers/SoftDrv2/triangle.h b/G3D/Drivers/SoftDrv2/triangle.h
similarity index 100%
rename from G3D/Engine/Drivers/SoftDrv2/triangle.h
rename to G3D/Drivers/SoftDrv2/triangle.h

diff --git a/G3D/Engine/Drivers/WireFrame/D3d_err.cpp b/G3D/Drivers/WireFrame/D3d_err.cpp
similarity index 100%
rename from G3D/Engine/Drivers/WireFrame/D3d_err.cpp
rename to G3D/Drivers/WireFrame/D3d_err.cpp

diff --git a/G3D/Engine/Drivers/WireFrame/D3d_err.h b/G3D/Drivers/WireFrame/D3d_err.h
similarity index 100%
rename from G3D/Engine/Drivers/WireFrame/D3d_err.h
rename to G3D/Drivers/WireFrame/D3d_err.h

diff --git a/G3D/Engine/Drivers/WireFrame/D3d_fx.cpp b/G3D/Drivers/WireFrame/D3d_fx.cpp
similarity index 100%
rename from G3D/Engine/Drivers/WireFrame/D3d_fx.cpp
rename to G3D/Drivers/WireFrame/D3d_fx.cpp

diff --git a/G3D/Engine/Drivers/WireFrame/D3d_fx.h b/G3D/Drivers/WireFrame/D3d_fx.h
similarity index 100%
rename from G3D/Engine/Drivers/WireFrame/D3d_fx.h
rename to G3D/Drivers/WireFrame/D3d_fx.h

diff --git a/G3D/Engine/Drivers/WireFrame/D3d_main.cpp b/G3D/Drivers/WireFrame/D3d_main.cpp
similarity index 100%
rename from G3D/Engine/Drivers/WireFrame/D3d_main.cpp
rename to G3D/Drivers/WireFrame/D3d_main.cpp

diff --git a/G3D/Engine/Drivers/WireFrame/D3d_main.h b/G3D/Drivers/WireFrame/D3d_main.h
similarity index 100%
rename from G3D/Engine/Drivers/WireFrame/D3d_main.h
rename to G3D/Drivers/WireFrame/D3d_main.h

diff --git a/G3D/Engine/Drivers/WireFrame/D3dcache.cpp b/G3D/Drivers/WireFrame/D3dcache.cpp
similarity index 100%
rename from G3D/Engine/Drivers/WireFrame/D3dcache.cpp
rename to G3D/Drivers/WireFrame/D3dcache.cpp

diff --git a/G3D/Engine/Drivers/WireFrame/D3dcache.h b/G3D/Drivers/WireFrame/D3dcache.h
similarity index 100%
rename from G3D/Engine/Drivers/WireFrame/D3dcache.h
rename to G3D/Drivers/WireFrame/D3dcache.h

diff --git a/G3D/Engine/Drivers/WireFrame/D3ddrv.cpp b/G3D/Drivers/WireFrame/D3ddrv.cpp
similarity index 100%
rename from G3D/Engine/Drivers/WireFrame/D3ddrv.cpp
rename to G3D/Drivers/WireFrame/D3ddrv.cpp

diff --git a/G3D/Engine/Drivers/WireFrame/D3ddrv.h b/G3D/Drivers/WireFrame/D3ddrv.h
similarity index 100%
rename from G3D/Engine/Drivers/WireFrame/D3ddrv.h
rename to G3D/Drivers/WireFrame/D3ddrv.h

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

diff --git a/G3D/Engine/Drivers/WireFrame/DDMemMgr.h b/G3D/Drivers/WireFrame/DDMemMgr.h
similarity index 100%
rename from G3D/Engine/Drivers/WireFrame/DDMemMgr.h
rename to G3D/Drivers/WireFrame/DDMemMgr.h

diff --git a/G3D/Engine/Drivers/WireFrame/Gspan.cpp b/G3D/Drivers/WireFrame/Gspan.cpp
similarity index 100%
rename from G3D/Engine/Drivers/WireFrame/Gspan.cpp
rename to G3D/Drivers/WireFrame/Gspan.cpp

diff --git a/G3D/Engine/Drivers/WireFrame/Gspan.h b/G3D/Drivers/WireFrame/Gspan.h
similarity index 100%
rename from G3D/Engine/Drivers/WireFrame/Gspan.h
rename to G3D/Drivers/WireFrame/Gspan.h

diff --git a/G3D/Engine/Drivers/WireFrame/Pcache.cpp b/G3D/Drivers/WireFrame/Pcache.cpp
similarity index 100%
rename from G3D/Engine/Drivers/WireFrame/Pcache.cpp
rename to G3D/Drivers/WireFrame/Pcache.cpp

diff --git a/G3D/Engine/Drivers/WireFrame/Pcache.h b/G3D/Drivers/WireFrame/Pcache.h
similarity index 100%
rename from G3D/Engine/Drivers/WireFrame/Pcache.h
rename to G3D/Drivers/WireFrame/Pcache.h

diff --git a/G3D/Engine/Drivers/WireFrame/Readme.now b/G3D/Drivers/WireFrame/Readme.now
similarity index 100%
rename from G3D/Engine/Drivers/WireFrame/Readme.now
rename to G3D/Drivers/WireFrame/Readme.now

diff --git a/G3D/Engine/Drivers/WireFrame/Render.cpp b/G3D/Drivers/WireFrame/Render.cpp
similarity index 100%
rename from G3D/Engine/Drivers/WireFrame/Render.cpp
rename to G3D/Drivers/WireFrame/Render.cpp

diff --git a/G3D/Engine/Drivers/WireFrame/Render.h b/G3D/Drivers/WireFrame/Render.h
similarity index 100%
rename from G3D/Engine/Drivers/WireFrame/Render.h
rename to G3D/Drivers/WireFrame/Render.h

diff --git a/G3D/Engine/Drivers/WireFrame/Scene.cpp b/G3D/Drivers/WireFrame/Scene.cpp
similarity index 100%
rename from G3D/Engine/Drivers/WireFrame/Scene.cpp
rename to G3D/Drivers/WireFrame/Scene.cpp

diff --git a/G3D/Engine/Drivers/WireFrame/Scene.h b/G3D/Drivers/WireFrame/Scene.h
similarity index 100%
rename from G3D/Engine/Drivers/WireFrame/Scene.h
rename to G3D/Drivers/WireFrame/Scene.h

diff --git a/G3D/Engine/Drivers/WireFrame/THandle.cpp b/G3D/Drivers/WireFrame/THandle.cpp
similarity index 100%
rename from G3D/Engine/Drivers/WireFrame/THandle.cpp
rename to G3D/Drivers/WireFrame/THandle.cpp

diff --git a/G3D/Engine/Drivers/WireFrame/THandle.h b/G3D/Drivers/WireFrame/THandle.h
similarity index 100%
rename from G3D/Engine/Drivers/WireFrame/THandle.h
rename to G3D/Drivers/WireFrame/THandle.h

diff --git a/G3D/Engine/Drivers/WireFrame/TPage.h b/G3D/Drivers/WireFrame/TPage.h
similarity index 100%
rename from G3D/Engine/Drivers/WireFrame/TPage.h
rename to G3D/Drivers/WireFrame/TPage.h

diff --git a/G3D/Engine/Drivers/WireFrame/tpage.cpp b/G3D/Drivers/WireFrame/tpage.cpp
similarity index 100%
rename from G3D/Engine/Drivers/WireFrame/tpage.cpp
rename to G3D/Drivers/WireFrame/tpage.cpp

diff --git a/G3D/Engine/Logo/electric.c b/G3D/Electric.c
similarity index 95%
rename from G3D/Engine/Logo/electric.c
rename to G3D/Electric.c
index 6dca954..88a24e7 100644 (file)
--- a/G3D/Engine/Logo/electric.c
+++ b/G3D/Electric.c
@@ -23,11 +23,10 @@
 #include       <math.h>\r
 #include       <assert.h>\r
 \r
 #include       <math.h>\r
 #include       <assert.h>\r
 \r

-#include       "genesis.h"\r
+#include       "Genesis.h"\r

 #include       "ErrorLog.h"\r
 #include       "ErrorLog.h"\r

-\r

 #include       "Electric.h"\r
 #include       "Electric.h"\r

-#include       "ram.h"\r
+#include       "Ram.h"\r

 \r
 static int             logBase2(int n)\r
 {\r
 \r
 static int             logBase2(int n)\r
 {\r

diff --git a/G3D/Engine/Logo/electric.h b/G3D/Electric.h
similarity index 100%
rename from G3D/Engine/Logo/electric.h
rename to G3D/Electric.h

diff --git a/G3D/Engine/Engine.c b/G3D/Engine.c
similarity index 96%
rename from G3D/Engine/Engine.c
rename to G3D/Engine.c
index 77d2cb5..835f63e 100644 (file)
--- a/G3D/Engine/Engine.c
+++ b/G3D/Engine.c
@@ -29,15 +29,14 @@
 #include <stdlib.h> // _MAX_PATH\r
 #include <direct.h>    // getcwd\r
 \r
 #include <stdlib.h> // _MAX_PATH\r
 #include <direct.h>    // getcwd\r
 \r

-#include "engine.h"\r
-\r
-#include "Errorlog.h"\r
+#include "Engine.h"\r
+#include "ErrorLog.h"\r

 #include "DCommon.h"\r
 #include "BitmapList.h"\r
 #include "Bitmap.h"\r
 #include "Bitmap._h"\r
 #include "World.h"\r
 #include "DCommon.h"\r
 #include "BitmapList.h"\r
 #include "Bitmap.h"\r
 #include "Bitmap._h"\r
 #include "World.h"\r

-#include "log.h"\r
+#include "Log.h"\r

 \r
 //#define DO_ADDREMOVE_MESSAGES\r
 #ifndef _DEBUG\r
 \r
 //#define DO_ADDREMOVE_MESSAGES\r
 #ifndef _DEBUG\r


@@ -1984,7 +1983,8 @@ static void Engine_DrawFontBuffer(geEngine *Engine)
 \r
 static void SubLarge(LARGE_INTEGER *start, LARGE_INTEGER *end, LARGE_INTEGER *delta)\r
 {\r
 \r
 static void SubLarge(LARGE_INTEGER *start, LARGE_INTEGER *end, LARGE_INTEGER *delta)\r
 {\r

-       _asm {\r
+    // FIXME: replace this by gcc acm code or real C\r
+       /*_asm {\r

                mov ebx,dword ptr [start]\r
                mov esi,dword ptr [end]\r
 \r
                mov ebx,dword ptr [start]\r
                mov esi,dword ptr [end]\r
 \r


@@ -1997,7 +1997,7 @@ static void SubLarge(LARGE_INTEGER *start, LARGE_INTEGER *end, LARGE_INTEGER *de
                mov ebx,dword ptr [delta]\r
                mov dword ptr [ebx+0],eax\r
                mov dword ptr [ebx+4],edx\r
                mov ebx,dword ptr [delta]\r
                mov dword ptr [ebx+0],eax\r
                mov dword ptr [ebx+4],edx\r

-       }\r
+       }*/\r

 }\r
 \r
 \r
 }\r
 \r
 \r

diff --git a/G3D/Engine/Engine.h b/G3D/Engine.h
similarity index 96%
rename from G3D/Engine/Engine.h
rename to G3D/Engine.h
index 77d8fd5..ebf052a 100644 (file)
--- a/G3D/Engine/Engine.h
+++ b/G3D/Engine.h
@@ -23,10 +23,10 @@
 #ifndef GE_ENGINE_H\r
 #define GE_ENGINE_H\r
 \r
 #ifndef GE_ENGINE_H\r
 #define GE_ENGINE_H\r
 \r

-#include "include/Genesis.h"\r
+#include "Genesis.h"\r

 #include "System.h"\r
 #include "System.h"\r

-#include "G3D/World/World.h"\r
-#include "include/Bitmap.h"\r
+#include "World.h"\r
+#include "Bitmap.h"\r

 #include "BitmapList.h"\r
 \r
 #ifdef __cplusplus\r
 #include "BitmapList.h"\r
 \r
 #ifdef __cplusplus\r

diff --git a/G3D/Engine/Drivers/D3D7xDrv/D3DDrv.mak b/G3D/Engine/Drivers/D3D7xDrv/D3DDrv.mak
deleted file mode 100644 (file)
index 454edfc..0000000
--- a/G3D/Engine/Drivers/D3D7xDrv/D3DDrv.mak
+++ /dev/null
@@ -1,284 +0,0 @@
-# Microsoft Developer Studio Generated NMAKE File, Based on D3DDrv.dsp\r
-!IF "$(CFG)" == ""\r
-CFG=D3DDrv - Win32 Debug\r
-!MESSAGE No configuration specified. Defaulting to D3DDrv - Win32 Debug.\r
-!ENDIF \r
-\r
-!IF "$(CFG)" != "D3DDrv - Win32 Release" && "$(CFG)" != "D3DDrv - Win32 Debug"\r
-!MESSAGE Invalid configuration "$(CFG)" specified.\r
-!MESSAGE You can specify a configuration when running NMAKE\r
-!MESSAGE by defining the macro CFG on the command line. For example:\r
-!MESSAGE \r
-!MESSAGE NMAKE /f "D3DDrv.mak" CFG="D3DDrv - Win32 Debug"\r
-!MESSAGE \r
-!MESSAGE Possible choices for configuration are:\r
-!MESSAGE \r
-!MESSAGE "D3DDrv - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")\r
-!MESSAGE "D3DDrv - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")\r
-!MESSAGE \r
-!ERROR An invalid configuration is specified.\r
-!ENDIF \r
-\r
-!IF "$(OS)" == "Windows_NT"\r
-NULL=\r
-!ELSE \r
-NULL=nul\r
-!ENDIF \r
-\r
-CPP=cl.exe\r
-MTL=midl.exe\r
-RSC=rc.exe\r
-\r
-!IF  "$(CFG)" == "D3DDrv - Win32 Release"\r
-\r
-OUTDIR=.\Release\r
-INTDIR=.\Release\r
-# Begin Custom Macros\r
-OutDir=.\Release\r
-# End Custom Macros\r
-\r
-ALL : "$(OUTDIR)\D3DDrv.dll"\r
-\r
-\r
-CLEAN :\r
-       -@erase "$(INTDIR)\D3d_err.obj"\r
-       -@erase "$(INTDIR)\D3d_fx.obj"\r
-       -@erase "$(INTDIR)\D3d_main.obj"\r
-       -@erase "$(INTDIR)\D3dcache.obj"\r
-       -@erase "$(INTDIR)\D3ddrv.obj"\r
-       -@erase "$(INTDIR)\DDMemMgr.obj"\r
-       -@erase "$(INTDIR)\Gspan.obj"\r
-       -@erase "$(INTDIR)\Pcache.obj"\r
-       -@erase "$(INTDIR)\Render.obj"\r
-       -@erase "$(INTDIR)\Scene.obj"\r
-       -@erase "$(INTDIR)\THandle.obj"\r
-       -@erase "$(INTDIR)\tpage.obj"\r
-       -@erase "$(INTDIR)\vc60.idb"\r
-       -@erase "$(OUTDIR)\D3DDrv.dll"\r
-       -@erase "$(OUTDIR)\D3DDrv.exp"\r
-       -@erase "$(OUTDIR)\D3DDrv.lib"\r
-\r
-"$(OUTDIR)" :\r
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"\r
-\r
-CPP_PROJ=/nologo /MT /W3 /GX /O2 /X /I "..\..\.." /I "..\..\..\..\SdkDx6Sdk\Include" /I "..\\" /I "..\..\..\..\Sdk\Dx6Sdk\Include" /I "..\D3DDrv" /I "..\..\..\Support" /I "..\..\..\..\MsDev60\Include" /I "..\..\..\Math" /I "..\..\..\Bitmap" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "D3DDRV_EXPORTS" /Fp"$(INTDIR)\D3DDrv.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c \r
-MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32 \r
-BSC32=bscmake.exe\r
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\D3DDrv.bsc" \r
-BSC32_SBRS= \\r
-       \r
-LINK32=link.exe\r
-LINK32_FLAGS=/nologo /dll /incremental:no /pdb:"$(OUTDIR)\D3DDrv.pdb" /machine:I386 /nodefaultlib /out:"$(OUTDIR)\D3DDrv.dll" /implib:"$(OUTDIR)\D3DDrv.lib" \r
-LINK32_OBJS= \\r
-       "$(INTDIR)\D3d_err.obj" \\r
-       "$(INTDIR)\D3d_fx.obj" \\r
-       "$(INTDIR)\D3d_main.obj" \\r
-       "$(INTDIR)\D3dcache.obj" \\r
-       "$(INTDIR)\D3ddrv.obj" \\r
-       "$(INTDIR)\DDMemMgr.obj" \\r
-       "$(INTDIR)\Gspan.obj" \\r
-       "$(INTDIR)\Pcache.obj" \\r
-       "$(INTDIR)\Render.obj" \\r
-       "$(INTDIR)\Scene.obj" \\r
-       "$(INTDIR)\THandle.obj" \\r
-       "$(INTDIR)\tpage.obj" \\r
-       "..\..\..\..\MSDev60\lib\Wininet.lib" \\r
-       "..\..\..\..\MSDev60\lib\Comdlg32.lib" \\r
-       "..\..\..\..\MSDev60\lib\Gdi32.lib" \\r
-       "..\..\..\..\MSDev60\lib\Kernel32.lib" \\r
-       "..\..\..\..\MSDev60\lib\Libcmt.lib" \\r
-       "..\..\..\..\MSDev60\lib\Oldnames.lib" \\r
-       "..\..\..\..\MSDev60\lib\Shell32.lib" \\r
-       "..\..\..\..\MSDev60\lib\User32.lib" \\r
-       "..\..\..\..\MSDev60\lib\Uuid.lib" \\r
-       "..\..\..\..\MSDev60\lib\Advapi32.lib" \\r
-       "..\..\..\..\Sdk\Dx6sdk\Lib\dxguid.lib" \\r
-       "..\..\..\..\Sdk\Dx6sdk\Lib\ddraw.lib" \\r
-       "..\..\..\..\Sdk\Dx6sdk\Lib\d3dim.lib"\r
-\r
-"$(OUTDIR)\D3DDrv.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)\r
-    $(LINK32) @<<\r
-  $(LINK32_FLAGS) $(LINK32_OBJS)\r
-<<\r
-\r
-!ELSEIF  "$(CFG)" == "D3DDrv - Win32 Debug"\r
-\r
-OUTDIR=.\Debug\r
-INTDIR=.\Debug\r
-# Begin Custom Macros\r
-OutDir=.\Debug\r
-# End Custom Macros\r
-\r
-ALL : "$(OUTDIR)\D3DDrv.dll"\r
-\r
-\r
-CLEAN :\r
-       -@erase "$(INTDIR)\D3d_err.obj"\r
-       -@erase "$(INTDIR)\D3d_fx.obj"\r
-       -@erase "$(INTDIR)\D3d_main.obj"\r
-       -@erase "$(INTDIR)\D3dcache.obj"\r
-       -@erase "$(INTDIR)\D3ddrv.obj"\r
-       -@erase "$(INTDIR)\DDMemMgr.obj"\r
-       -@erase "$(INTDIR)\Gspan.obj"\r
-       -@erase "$(INTDIR)\Pcache.obj"\r
-       -@erase "$(INTDIR)\Render.obj"\r
-       -@erase "$(INTDIR)\Scene.obj"\r
-       -@erase "$(INTDIR)\THandle.obj"\r
-       -@erase "$(INTDIR)\tpage.obj"\r
-       -@erase "$(INTDIR)\vc60.idb"\r
-       -@erase "$(INTDIR)\vc60.pdb"\r
-       -@erase "$(OUTDIR)\D3DDrv.dll"\r
-       -@erase "$(OUTDIR)\D3DDrv.exp"\r
-       -@erase "$(OUTDIR)\D3DDrv.ilk"\r
-       -@erase "$(OUTDIR)\D3DDrv.lib"\r
-       -@erase "$(OUTDIR)\D3DDrv.pdb"\r
-\r
-"$(OUTDIR)" :\r
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"\r
-\r
-CPP_PROJ=/nologo /MTd /W3 /GX /Zi /Od /X /I "..\..\.." /I "..\..\..\Math" /I "..\\" /I "..\..\..\..\Sdk\Dx6Sdk\Include" /I "..\D3DDrv" /I "..\..\..\Support" /I "..\..\..\..\MsDev60\Include" /I "..\..\..\Bitmap" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "D3DDRV_EXPORTS" /Fp"$(INTDIR)\D3DDrv.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c \r
-MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 \r
-BSC32=bscmake.exe\r
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\D3DDrv.bsc" \r
-BSC32_SBRS= \\r
-       \r
-LINK32=link.exe\r
-LINK32_FLAGS=/nologo /dll /incremental:yes /pdb:"$(OUTDIR)\D3DDrv.pdb" /debug /machine:I386 /nodefaultlib /out:"$(OUTDIR)\D3DDrv.dll" /implib:"$(OUTDIR)\D3DDrv.lib" /pdbtype:sept \r
-LINK32_OBJS= \\r
-       "$(INTDIR)\D3d_err.obj" \\r
-       "$(INTDIR)\D3d_fx.obj" \\r
-       "$(INTDIR)\D3d_main.obj" \\r
-       "$(INTDIR)\D3dcache.obj" \\r
-       "$(INTDIR)\D3ddrv.obj" \\r
-       "$(INTDIR)\DDMemMgr.obj" \\r
-       "$(INTDIR)\Gspan.obj" \\r
-       "$(INTDIR)\Pcache.obj" \\r
-       "$(INTDIR)\Render.obj" \\r
-       "$(INTDIR)\Scene.obj" \\r
-       "$(INTDIR)\THandle.obj" \\r
-       "$(INTDIR)\tpage.obj" \\r
-       "..\..\..\..\MSDev60\lib\Wininet.lib" \\r
-       "..\..\..\..\MSDev60\lib\Comdlg32.lib" \\r
-       "..\..\..\..\MSDev60\lib\Gdi32.lib" \\r
-       "..\..\..\..\MSDev60\lib\Kernel32.lib" \\r
-       "..\..\..\..\MSDev60\lib\Libcmtd.lib" \\r
-       "..\..\..\..\MSDev60\lib\Oldnames.lib" \\r
-       "..\..\..\..\MSDev60\lib\Shell32.lib" \\r
-       "..\..\..\..\MSDev60\lib\User32.lib" \\r
-       "..\..\..\..\MSDev60\lib\Uuid.lib" \\r
-       "..\..\..\..\MSDev60\lib\Advapi32.lib" \\r
-       "..\..\..\..\Sdk\Dx6sdk\Lib\dxguid.lib" \\r
-       "..\..\..\..\Sdk\Dx6sdk\Lib\ddraw.lib" \\r
-       "..\..\..\..\Sdk\Dx6sdk\Lib\d3dim.lib"\r
-\r
-"$(OUTDIR)\D3DDrv.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)\r
-    $(LINK32) @<<\r
-  $(LINK32_FLAGS) $(LINK32_OBJS)\r
-<<\r
-\r
-!ENDIF \r
-\r
-.c{$(INTDIR)}.obj::\r
-   $(CPP) @<<\r
-   $(CPP_PROJ) $< \r
-<<\r
-\r
-.cpp{$(INTDIR)}.obj::\r
-   $(CPP) @<<\r
-   $(CPP_PROJ) $< \r
-<<\r
-\r
-.cxx{$(INTDIR)}.obj::\r
-   $(CPP) @<<\r
-   $(CPP_PROJ) $< \r
-<<\r
-\r
-.c{$(INTDIR)}.sbr::\r
-   $(CPP) @<<\r
-   $(CPP_PROJ) $< \r
-<<\r
-\r
-.cpp{$(INTDIR)}.sbr::\r
-   $(CPP) @<<\r
-   $(CPP_PROJ) $< \r
-<<\r
-\r
-.cxx{$(INTDIR)}.sbr::\r
-   $(CPP) @<<\r
-   $(CPP_PROJ) $< \r
-<<\r
-\r
-\r
-!IF "$(NO_EXTERNAL_DEPS)" != "1"\r
-!IF EXISTS("D3DDrv.dep")\r
-!INCLUDE "D3DDrv.dep"\r
-!ELSE \r
-!MESSAGE Warning: cannot find "D3DDrv.dep"\r
-!ENDIF \r
-!ENDIF \r
-\r
-\r
-!IF "$(CFG)" == "D3DDrv - Win32 Release" || "$(CFG)" == "D3DDrv - Win32 Debug"\r
-SOURCE=.\D3d_err.cpp\r
-\r
-"$(INTDIR)\D3d_err.obj" : $(SOURCE) "$(INTDIR)"\r
-\r
-\r
-SOURCE=.\D3d_fx.cpp\r
-\r
-"$(INTDIR)\D3d_fx.obj" : $(SOURCE) "$(INTDIR)"\r
-\r
-\r
-SOURCE=.\D3d_main.cpp\r
-\r
-"$(INTDIR)\D3d_main.obj" : $(SOURCE) "$(INTDIR)"\r
-\r
-\r
-SOURCE=.\D3dcache.cpp\r
-\r
-"$(INTDIR)\D3dcache.obj" : $(SOURCE) "$(INTDIR)"\r
-\r
-\r
-SOURCE=.\D3ddrv.cpp\r
-\r
-"$(INTDIR)\D3ddrv.obj" : $(SOURCE) "$(INTDIR)"\r
-\r
-\r
-SOURCE=.\DDMemMgr.c\r
-\r
-"$(INTDIR)\DDMemMgr.obj" : $(SOURCE) "$(INTDIR)"\r
-\r
-\r
-SOURCE=.\Gspan.cpp\r
-\r
-"$(INTDIR)\Gspan.obj" : $(SOURCE) "$(INTDIR)"\r
-\r
-\r
-SOURCE=.\Pcache.cpp\r
-\r
-"$(INTDIR)\Pcache.obj" : $(SOURCE) "$(INTDIR)"\r
-\r
-\r
-SOURCE=.\Render.cpp\r
-\r
-"$(INTDIR)\Render.obj" : $(SOURCE) "$(INTDIR)"\r
-\r
-\r
-SOURCE=.\Scene.cpp\r
-\r
-"$(INTDIR)\Scene.obj" : $(SOURCE) "$(INTDIR)"\r
-\r
-\r
-SOURCE=.\THandle.cpp\r
-\r
-"$(INTDIR)\THandle.obj" : $(SOURCE) "$(INTDIR)"\r
-\r
-\r
-SOURCE=.\tpage.cpp\r
-\r
-"$(INTDIR)\tpage.obj" : $(SOURCE) "$(INTDIR)"\r
-\r
-\r
-\r
-!ENDIF \r
-\r

diff --git a/G3D/Engine/Drivers/D3D7xDrv/D3DDrv.ncb b/G3D/Engine/Drivers/D3D7xDrv/D3DDrv.ncb
deleted file mode 100644 (file)
index c9427db..0000000
Binary files a/G3D/Engine/Drivers/D3D7xDrv/D3DDrv.ncb and /dev/null differ

diff --git a/G3D/Engine/Drivers/D3D7xDrv/D3DDrv.opt b/G3D/Engine/Drivers/D3D7xDrv/D3DDrv.opt
deleted file mode 100644 (file)
index d3ac452..0000000
Binary files a/G3D/Engine/Drivers/D3D7xDrv/D3DDrv.opt and /dev/null differ

diff --git a/G3D/Engine/Drivers/D3D7xDrv/D3DDrv7x.dsp b/G3D/Engine/Drivers/D3D7xDrv/D3DDrv7x.dsp
deleted file mode 100644 (file)
index b7bd355..0000000
--- a/G3D/Engine/Drivers/D3D7xDrv/D3DDrv7x.dsp
+++ /dev/null
@@ -1,206 +0,0 @@
-# Microsoft Developer Studio Project File - Name="D3DDrv7x" - Package Owner=<4>\r
-# Microsoft Developer Studio Generated Build File, Format Version 6.00\r
-# ** DO NOT EDIT **\r
-\r
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102\r
-\r
-CFG=D3DDrv7x - Win32 Debug\r
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,\r
-!MESSAGE use the Export Makefile command and run\r
-!MESSAGE \r
-!MESSAGE NMAKE /f "D3DDrv7x.mak".\r
-!MESSAGE \r
-!MESSAGE You can specify a configuration when running NMAKE\r
-!MESSAGE by defining the macro CFG on the command line. For example:\r
-!MESSAGE \r
-!MESSAGE NMAKE /f "D3DDrv7x.mak" CFG="D3DDrv7x - Win32 Debug"\r
-!MESSAGE \r
-!MESSAGE Possible choices for configuration are:\r
-!MESSAGE \r
-!MESSAGE "D3DDrv7x - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")\r
-!MESSAGE "D3DDrv7x - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")\r
-!MESSAGE \r
-\r
-# Begin Project\r
-# PROP AllowPerConfigDependencies 0\r
-# PROP Scc_ProjName ""$/Genesis10/Source/Engine/Drivers/D3DDrv7x", DVPBAAAA"\r
-# PROP Scc_LocalPath "."\r
-CPP=cl.exe\r
-MTL=midl.exe\r
-RSC=rc.exe\r
-\r
-!IF  "$(CFG)" == "D3DDrv7x - Win32 Release"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 0\r
-# PROP BASE Output_Dir "Release"\r
-# PROP BASE Intermediate_Dir "Release"\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 0\r
-# PROP Output_Dir "Release"\r
-# PROP Intermediate_Dir "Release"\r
-# PROP Ignore_Export_Lib 0\r
-# PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "D3DDRV7x_EXPORTS" /YX /FD /c\r
-# ADD CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "D3DDRV_EXPORTS" /YX /FD /c\r
-# SUBTRACT CPP /X\r
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32\r
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32\r
-# ADD BASE RSC /l 0x409 /d "NDEBUG"\r
-# ADD RSC /l 0x409 /d "NDEBUG"\r
-# SUBTRACT RSC /x\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo\r
-LINK32=link.exe\r
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386\r
-# ADD LINK32 Wininet.lib comdlg32.lib gdi32.lib kernel32.lib libcmt.lib libcmtd.lib oldnames.lib shell32.lib user32.lib uuid.lib advapi32.lib dxguid.lib ddraw.lib d3dim.lib /nologo /dll /machine:I386\r
-# SUBTRACT LINK32 /nodefaultlib\r
-\r
-!ELSEIF  "$(CFG)" == "D3DDrv7x - Win32 Debug"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 1\r
-# PROP BASE Output_Dir "Debug"\r
-# PROP BASE Intermediate_Dir "Debug"\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 1\r
-# PROP Output_Dir "Debug"\r
-# PROP Intermediate_Dir "Debug"\r
-# PROP Ignore_Export_Lib 0\r
-# PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "D3DDRV7x_EXPORTS" /YX /FD /GZ /c\r
-# ADD CPP /nologo /MTd /W3 /GX /Zi /Od /X /I "..\..\.." /I "..\..\..\Math" /I "..\\" /I "e:\mssdk7a\include" /I "..\D3DDrv7x" /I "..\..\..\Support" /I "e:\program files\microsoft visual studio\vc98\include" /I "..\..\..\Bitmap" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "D3DDRV7x_EXPORTS" /YX /FD /GZ /c\r
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32\r
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32\r
-# ADD BASE RSC /l 0x409 /d "_DEBUG"\r
-# ADD RSC /l 0x409 /x /d "_DEBUG"\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo\r
-LINK32=link.exe\r
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept\r
-# ADD LINK32 /nologo /dll /debug /machine:I386 /nodefaultlib /pdbtype:sept\r
-\r
-!ENDIF \r
-\r
-# Begin Target\r
-\r
-# Name "D3DDrv7x - Win32 Release"\r
-# Name "D3DDrv7x - Win32 Debug"\r
-# Begin Group "Source Files"\r
-\r
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"\r
-# Begin Source File\r
-\r
-SOURCE=.\D3d_err.cpp\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\D3d_err.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\D3d_fx.cpp\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\D3d_fx.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\D3d_main.cpp\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\D3d_main.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\D3dcache.cpp\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\D3dcache.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\D3ddrv7x.cpp\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\D3ddrv7x.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\Dcommon.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\DDMemMgr.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\DDMemMgr.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\Gspan.cpp\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\Gspan.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\Pcache.cpp\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\Pcache.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\Render.cpp\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\Render.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\Scene.cpp\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\Scene.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\THandle.cpp\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\THandle.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\tpage.cpp\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\TPage.h\r
-# End Source File\r
-# End Group\r
-# Begin Group "Resource Files"\r
-\r
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"\r
-# End Group\r
-# Begin Group "Libraries"\r
-\r
-# PROP Default_Filter ""\r
-# End Group\r
-# End Target\r
-# End Project\r

diff --git a/G3D/Engine/Drivers/D3D7xDrv/D3DDrv7x.dsw b/G3D/Engine/Drivers/D3D7xDrv/D3DDrv7x.dsw
deleted file mode 100644 (file)
index f94560c..0000000
--- a/G3D/Engine/Drivers/D3D7xDrv/D3DDrv7x.dsw
+++ /dev/null
@@ -1,29 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00\r
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!\r
-\r
-###############################################################################\r
-\r
-Project: "D3DDrv7x"=".\D3DDrv7x.dsp" - Package Owner=<4>\r
-\r
-Package=<5>\r
-{{{\r
-}}}\r
-\r
-Package=<4>\r
-{{{\r
-}}}\r
-\r
-###############################################################################\r
-\r
-Global:\r
-\r
-Package=<5>\r
-{{{\r
-}}}\r
-\r
-Package=<3>\r
-{{{\r
-}}}\r
-\r
-###############################################################################\r
-\r

diff --git a/G3D/Engine/Drivers/D3D7xDrv/D3DDrv7x.ncb b/G3D/Engine/Drivers/D3D7xDrv/D3DDrv7x.ncb
deleted file mode 100644 (file)
index e6d0618..0000000
Binary files a/G3D/Engine/Drivers/D3D7xDrv/D3DDrv7x.ncb and /dev/null differ

diff --git a/G3D/Engine/Drivers/D3D7xDrv/D3DDrv7x.opt b/G3D/Engine/Drivers/D3D7xDrv/D3DDrv7x.opt
deleted file mode 100644 (file)
index f2d6278..0000000
Binary files a/G3D/Engine/Drivers/D3D7xDrv/D3DDrv7x.opt and /dev/null differ

diff --git a/G3D/Engine/Drivers/D3D7xDrv/D3DDrv7x.plg b/G3D/Engine/Drivers/D3D7xDrv/D3DDrv7x.plg
deleted file mode 100644 (file)
index a6cfd82..0000000
--- a/G3D/Engine/Drivers/D3D7xDrv/D3DDrv7x.plg
+++ /dev/null
@@ -1,44 +0,0 @@
-<html>\r
-<body>\r
-<pre>\r
-<h1>Build Log</h1>\r
-<h3>\r
---------------------Configuration: D3DDrv7x - Win32 Release--------------------\r
-</h3>\r
-<h3>Command Lines</h3>\r
-Creating temporary file "C:\DOCUME~1\RALPHD~1\LOCALS~1\Temp\RSP1D.tmp" with contents\r
-[\r
-/nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "D3DDRV_EXPORTS" /Fp"Release/D3DDrv7x.pch" /YX /Fo"Release/" /Fd"Release/" /FD /c \r
-"D:\Release\G3D\Engine\Drivers\D3D7xDrv\D3d_main.cpp"\r
-]\r
-Creating command line "cl.exe @C:\DOCUME~1\RALPHD~1\LOCALS~1\Temp\RSP1D.tmp" \r
-Creating temporary file "C:\DOCUME~1\RALPHD~1\LOCALS~1\Temp\RSP1E.tmp" with contents\r
-[\r
-Wininet.lib comdlg32.lib gdi32.lib kernel32.lib libcmt.lib libcmtd.lib oldnames.lib shell32.lib user32.lib uuid.lib advapi32.lib dxguid.lib ddraw.lib d3dim.lib /nologo /dll /incremental:no /pdb:"Release/D3DDrv7x.pdb" /machine:I386 /out:"Release/D3DDrv7x.dll" /implib:"Release/D3DDrv7x.lib" \r
-.\Release\D3d_err.obj\r
-.\Release\D3d_fx.obj\r
-.\Release\D3d_main.obj\r
-.\Release\D3dcache.obj\r
-.\Release\D3ddrv7x.obj\r
-.\Release\DDMemMgr.obj\r
-.\Release\Gspan.obj\r
-.\Release\Pcache.obj\r
-.\Release\Render.obj\r
-.\Release\Scene.obj\r
-.\Release\THandle.obj\r
-.\Release\tpage.obj\r
-]\r
-Creating command line "link.exe @C:\DOCUME~1\RALPHD~1\LOCALS~1\Temp\RSP1E.tmp"\r
-<h3>Output Window</h3>\r
-Compiling...\r
-D3d_main.cpp\r
-Linking...\r
-   Creating library Release/D3DDrv7x.lib and object Release/D3DDrv7x.exp\r
-\r
-\r
-\r
-<h3>Results</h3>\r
-D3DDrv7x.dll - 0 error(s), 0 warning(s)\r
-</pre>\r
-</body>\r
-</html>\r

diff --git a/G3D/Engine/Drivers/D3D7xDrv/mssccprj.scc b/G3D/Engine/Drivers/D3D7xDrv/mssccprj.scc
deleted file mode 100644 (file)
index 848e217..0000000
--- a/G3D/Engine/Drivers/D3D7xDrv/mssccprj.scc
+++ /dev/null
@@ -1,4 +0,0 @@
-SCC = This is a Source Code Control file\r
-\r
-[D3DDrv.mak]\r
-SCC_Project_Name = "$/Genesis10/Source/Engine/Drivers/D3DDrv", LQQBAAAA\r

diff --git a/G3D/Engine/Drivers/D3D8Drv/D3DDriver.dsp b/G3D/Engine/Drivers/D3D8Drv/D3DDriver.dsp
deleted file mode 100644 (file)
index 48953e3..0000000
--- a/G3D/Engine/Drivers/D3D8Drv/D3DDriver.dsp
+++ /dev/null
@@ -1,199 +0,0 @@
-# Microsoft Developer Studio Project File - Name="D3DDriver" - Package Owner=<4>\r
-# Microsoft Developer Studio Generated Build File, Format Version 6.00\r
-# ** DO NOT EDIT **\r
-\r
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102\r
-\r
-CFG=D3DDriver - Win32 Debug\r
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,\r
-!MESSAGE use the Export Makefile command and run\r
-!MESSAGE \r
-!MESSAGE NMAKE /f "D3DDriver.mak".\r
-!MESSAGE \r
-!MESSAGE You can specify a configuration when running NMAKE\r
-!MESSAGE by defining the macro CFG on the command line. For example:\r
-!MESSAGE \r
-!MESSAGE NMAKE /f "D3DDriver.mak" CFG="D3DDriver - Win32 Debug"\r
-!MESSAGE \r
-!MESSAGE Possible choices for configuration are:\r
-!MESSAGE \r
-!MESSAGE "D3DDriver - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")\r
-!MESSAGE "D3DDriver - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")\r
-!MESSAGE \r
-\r
-# Begin Project\r
-# PROP AllowPerConfigDependencies 0\r
-# PROP Scc_ProjName ""\r
-# PROP Scc_LocalPath ""\r
-CPP=cl.exe\r
-MTL=midl.exe\r
-RSC=rc.exe\r
-\r
-!IF  "$(CFG)" == "D3DDriver - Win32 Release"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 0\r
-# PROP BASE Output_Dir "Release"\r
-# PROP BASE Intermediate_Dir "Release"\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 0\r
-# PROP Output_Dir "Release"\r
-# PROP Intermediate_Dir "Release"\r
-# PROP Ignore_Export_Lib 0\r
-# PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "D3DDRIVER_EXPORTS" /YX /FD /c\r
-# ADD CPP /nologo /MT /W3 /GX /O2 /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "D3DDRIVER_EXPORTS" /D "STRICT" /D "D3DDRV_EXPORTS" /YX /FD /c\r
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32\r
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32\r
-# ADD BASE RSC /l 0x409 /d "NDEBUG"\r
-# ADD RSC /l 0x409 /d "NDEBUG"\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo\r
-LINK32=link.exe\r
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386\r
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib dxguid.lib ddraw.lib d3d8.lib /nologo /dll /machine:I386 /out:"..\Release\D3DDrv.dll" /libpath:"..\geGlobals\Lib"\r
-\r
-!ELSEIF  "$(CFG)" == "D3DDriver - Win32 Debug"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 1\r
-# PROP BASE Output_Dir "Debug"\r
-# PROP BASE Intermediate_Dir "Debug"\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 1\r
-# PROP Output_Dir "Debug"\r
-# PROP Intermediate_Dir "Debug"\r
-# PROP Ignore_Export_Lib 0\r
-# PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "D3DDRIVER_EXPORTS" /YX /FD /GZ /c\r
-# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\geGlobals\Include" /I "..\geGlobals\GenesisInclude" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "D3DDRIVER_EXPORTS" /D "STRICT" /D "D3DDRV_EXPORTS" /YX /FD /GZ /c\r
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32\r
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32\r
-# ADD BASE RSC /l 0x409 /d "_DEBUG"\r
-# ADD RSC /l 0x409 /d "_DEBUG"\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo\r
-LINK32=link.exe\r
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept\r
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib dxguid.lib ddraw.lib /nologo /dll /debug /machine:I386 /out:"..\Binaries\Debug\D3DDrv.dll" /pdbtype:sept /libpath:"..\geGlobals\Lib"\r
-\r
-!ENDIF \r
-\r
-# Begin Target\r
-\r
-# Name "D3DDriver - Win32 Release"\r
-# Name "D3DDriver - Win32 Debug"\r
-# Begin Group "Source Files"\r
-\r
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"\r
-# Begin Source File\r
-\r
-SOURCE=.\D3D_ERR.CPP\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\D3d_fx.cpp\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\D3d_main.cpp\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\D3dcache.cpp\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\D3ddrv.cpp\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\DDMemMgr.cpp\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\GSPAN.CPP\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\Pcache.cpp\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\Render.cpp\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\Scene.cpp\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\THandle.cpp\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\tpage.cpp\r
-# End Source File\r
-# End Group\r
-# Begin Group "Header Files"\r
-\r
-# PROP Default_Filter "h;hpp;hxx;hm;inl"\r
-# Begin Source File\r
-\r
-SOURCE=.\D3D_ERR.H\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\D3D_FX.H\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\D3d_main.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\D3dcache.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\D3DDRV.H\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\DDMemMgr.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\GSPAN.H\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\Pcache.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\RENDER.H\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\SCENE.H\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\THandle.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\TPage.h\r
-# End Source File\r
-# End Group\r
-# Begin Group "Resource Files"\r
-\r
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"\r
-# End Group\r
-# End Target\r
-# End Project\r

diff --git a/G3D/Engine/Drivers/D3D8Drv/D3DDriver.dsw b/G3D/Engine/Drivers/D3D8Drv/D3DDriver.dsw
deleted file mode 100644 (file)
index 6109fe3..0000000
--- a/G3D/Engine/Drivers/D3D8Drv/D3DDriver.dsw
+++ /dev/null
@@ -1,29 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00\r
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!\r
-\r
-###############################################################################\r
-\r
-Project: "D3DDriver"=.\D3DDriver.dsp - Package Owner=<4>\r
-\r
-Package=<5>\r
-{{{\r
-}}}\r
-\r
-Package=<4>\r
-{{{\r
-}}}\r
-\r
-###############################################################################\r
-\r
-Global:\r
-\r
-Package=<5>\r
-{{{\r
-}}}\r
-\r
-Package=<3>\r
-{{{\r
-}}}\r
-\r
-###############################################################################\r
-\r

diff --git a/G3D/Engine/Drivers/D3D8Drv/D3DDriver.ncb b/G3D/Engine/Drivers/D3D8Drv/D3DDriver.ncb
deleted file mode 100644 (file)
index e9fea99..0000000
Binary files a/G3D/Engine/Drivers/D3D8Drv/D3DDriver.ncb and /dev/null differ

diff --git a/G3D/Engine/Drivers/D3D8Drv/D3DDriver.opt b/G3D/Engine/Drivers/D3D8Drv/D3DDriver.opt
deleted file mode 100644 (file)
index c9c20e8..0000000
Binary files a/G3D/Engine/Drivers/D3D8Drv/D3DDriver.opt and /dev/null differ

diff --git a/G3D/Engine/Drivers/D3D8Drv/D3DDriver.plg b/G3D/Engine/Drivers/D3D8Drv/D3DDriver.plg
deleted file mode 100644 (file)
index e4e67e9..0000000
--- a/G3D/Engine/Drivers/D3D8Drv/D3DDriver.plg
+++ /dev/null
@@ -1,44 +0,0 @@
-<html>\r
-<body>\r
-<pre>\r
-<h1>Build Log</h1>\r
-<h3>\r
---------------------Configuration: D3DDriver - Win32 Release--------------------\r
-</h3>\r
-<h3>Command Lines</h3>\r
-Creating temporary file "C:\DOCUME~1\RALPHD~1\LOCALS~1\Temp\RSP35.tmp" with contents\r
-[\r
-/nologo /MT /W3 /GX /O2 /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "D3DDRIVER_EXPORTS" /D "STRICT" /D "D3DDRV_EXPORTS" /Fp"Release/D3DDriver.pch" /YX /Fo"Release/" /Fd"Release/" /FD /c \r
-"D:\Release\G3D\Engine\Drivers\D3D8Drv\D3d_main.cpp"\r
-]\r
-Creating command line "cl.exe @C:\DOCUME~1\RALPHD~1\LOCALS~1\Temp\RSP35.tmp" \r
-Creating temporary file "C:\DOCUME~1\RALPHD~1\LOCALS~1\Temp\RSP36.tmp" with contents\r
-[\r
-kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib dxguid.lib ddraw.lib d3d8.lib /nologo /dll /incremental:no /pdb:"Release/D3DDrv.pdb" /machine:I386 /out:"..\Release\D3DDrv.dll" /implib:"Release/D3DDrv.lib" /libpath:"..\geGlobals\Lib" \r
-.\Release\D3D_ERR.OBJ\r
-.\Release\D3d_fx.obj\r
-.\Release\D3d_main.obj\r
-.\Release\D3dcache.obj\r
-.\Release\D3ddrv.obj\r
-.\Release\DDMemMgr.obj\r
-.\Release\GSPAN.OBJ\r
-.\Release\Pcache.obj\r
-.\Release\Render.obj\r
-.\Release\Scene.obj\r
-.\Release\THandle.obj\r
-.\Release\tpage.obj\r
-]\r
-Creating command line "link.exe @C:\DOCUME~1\RALPHD~1\LOCALS~1\Temp\RSP36.tmp"\r
-<h3>Output Window</h3>\r
-Compiling...\r
-D3d_main.cpp\r
-Linking...\r
-   Creating library Release/D3DDrv.lib and object Release/D3DDrv.exp\r
-\r
-\r
-\r
-<h3>Results</h3>\r
-D3DDrv.dll - 0 error(s), 0 warning(s)\r
-</pre>\r
-</body>\r
-</html>\r

diff --git a/G3D/Engine/Drivers/D3DDrv/D3DDrv.dsp b/G3D/Engine/Drivers/D3DDrv/D3DDrv.dsp
deleted file mode 100644 (file)
index 931f9f9..0000000
--- a/G3D/Engine/Drivers/D3DDrv/D3DDrv.dsp
+++ /dev/null
@@ -1,207 +0,0 @@
-# Microsoft Developer Studio Project File - Name="D3DDrv" - Package Owner=<4>\r
-# Microsoft Developer Studio Generated Build File, Format Version 6.00\r
-# ** DO NOT EDIT **\r
-\r
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102\r
-\r
-CFG=D3DDrv - Win32 Debug\r
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,\r
-!MESSAGE use the Export Makefile command and run\r
-!MESSAGE \r
-!MESSAGE NMAKE /f "D3DDrv.mak".\r
-!MESSAGE \r
-!MESSAGE You can specify a configuration when running NMAKE\r
-!MESSAGE by defining the macro CFG on the command line. For example:\r
-!MESSAGE \r
-!MESSAGE NMAKE /f "D3DDrv.mak" CFG="D3DDrv - Win32 Debug"\r
-!MESSAGE \r
-!MESSAGE Possible choices for configuration are:\r
-!MESSAGE \r
-!MESSAGE "D3DDrv - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")\r
-!MESSAGE "D3DDrv - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")\r
-!MESSAGE \r
-\r
-# Begin Project\r
-# PROP AllowPerConfigDependencies 0\r
-# PROP Scc_ProjName ""$/Genesis10/Source/Engine/Drivers/D3DDrv", DVPBAAAA"\r
-# PROP Scc_LocalPath "."\r
-CPP=cl.exe\r
-MTL=midl.exe\r
-RSC=rc.exe\r
-\r
-!IF  "$(CFG)" == "D3DDrv - Win32 Release"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 0\r
-# PROP BASE Output_Dir "Release"\r
-# PROP BASE Intermediate_Dir "Release"\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 0\r
-# PROP Output_Dir "Release"\r
-# PROP Intermediate_Dir "Release"\r
-# PROP Ignore_Export_Lib 0\r
-# PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "D3DDRV_EXPORTS" /YX /FD /c\r
-# ADD CPP /nologo /G5 /MT /W3 /GX /Ox /Ot /Ow /Og /Oi /Op /Ob2 /I "..\..\.." /I "..\\" /I "..\D3DDrv" /I "..\..\..\Support" /I "..\..\..\Math" /I "..\..\..\Bitmap" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "D3DDRV_EXPORTS" /FD /c\r
-# SUBTRACT CPP /X /YX\r
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32\r
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32\r
-# ADD BASE RSC /l 0x409 /d "NDEBUG"\r
-# ADD RSC /l 0x409 /x /d "NDEBUG"\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo\r
-LINK32=link.exe\r
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386\r
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib winmm.lib vfw32.lib dxguid.lib ddraw.lib d3dim.lib /nologo /dll /machine:I386\r
-# SUBTRACT LINK32 /nodefaultlib\r
-\r
-!ELSEIF  "$(CFG)" == "D3DDrv - Win32 Debug"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 1\r
-# PROP BASE Output_Dir "Debug"\r
-# PROP BASE Intermediate_Dir "Debug"\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 1\r
-# PROP Output_Dir "Debug"\r
-# PROP Intermediate_Dir "Debug"\r
-# PROP Ignore_Export_Lib 0\r
-# PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "D3DDRV_EXPORTS" /YX /FD /GZ /c\r
-# ADD CPP /nologo /G5 /MTd /W3 /GX /Zi /Od /I "..\..\.." /I "..\..\..\Math" /I "..\\" /I "..\D3DDrv" /I "..\..\..\Support" /I "..\..\..\Bitmap" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "D3DDRV_EXPORTS" /YX /FD /GZ /c\r
-# SUBTRACT CPP /X\r
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32\r
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32\r
-# ADD BASE RSC /l 0x409 /d "_DEBUG"\r
-# ADD RSC /l 0x409 /x /d "_DEBUG"\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo\r
-LINK32=link.exe\r
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept\r
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib winmm.lib vfw32.lib dxguid.lib ddraw.lib d3dim.lib /nologo /dll /debug /machine:I386 /pdbtype:sept\r
-# SUBTRACT LINK32 /nodefaultlib\r
-\r
-!ENDIF \r
-\r
-# Begin Target\r
-\r
-# Name "D3DDrv - Win32 Release"\r
-# Name "D3DDrv - Win32 Debug"\r
-# Begin Group "Source Files"\r
-\r
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"\r
-# Begin Source File\r
-\r
-SOURCE=.\D3d_err.cpp\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\D3d_err.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\D3d_fx.cpp\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\D3d_fx.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\D3d_main.cpp\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\D3d_main.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\D3dcache.cpp\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\D3dcache.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\D3ddrv.cpp\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\D3ddrv.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\Dcommon.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\DDMemMgr.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\DDMemMgr.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\Gspan.cpp\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\Gspan.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\Pcache.cpp\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\Pcache.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\Render.cpp\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\Render.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\Scene.cpp\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\Scene.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\THandle.cpp\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\THandle.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\tpage.cpp\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\TPage.h\r
-# End Source File\r
-# End Group\r
-# Begin Group "Resource Files"\r
-\r
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"\r
-# End Group\r
-# Begin Group "Libraries"\r
-\r
-# PROP Default_Filter ""\r
-# End Group\r
-# End Target\r
-# End Project\r

diff --git a/G3D/Engine/Drivers/D3DDrv/D3DDrv.dsw b/G3D/Engine/Drivers/D3DDrv/D3DDrv.dsw
deleted file mode 100644 (file)
index 262da56..0000000
--- a/G3D/Engine/Drivers/D3DDrv/D3DDrv.dsw
+++ /dev/null
@@ -1,29 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00\r
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!\r
-\r
-###############################################################################\r
-\r
-Project: "D3DDrv"=.\D3DDrv.dsp - Package Owner=<4>\r
-\r
-Package=<5>\r
-{{{\r
-}}}\r
-\r
-Package=<4>\r
-{{{\r
-}}}\r
-\r
-###############################################################################\r
-\r
-Global:\r
-\r
-Package=<5>\r
-{{{\r
-}}}\r
-\r
-Package=<3>\r
-{{{\r
-}}}\r
-\r
-###############################################################################\r
-\r

diff --git a/G3D/Engine/Drivers/D3DDrv/D3DDrv.mak b/G3D/Engine/Drivers/D3DDrv/D3DDrv.mak
deleted file mode 100644 (file)
index 454edfc..0000000
--- a/G3D/Engine/Drivers/D3DDrv/D3DDrv.mak
+++ /dev/null
@@ -1,284 +0,0 @@
-# Microsoft Developer Studio Generated NMAKE File, Based on D3DDrv.dsp\r
-!IF "$(CFG)" == ""\r
-CFG=D3DDrv - Win32 Debug\r
-!MESSAGE No configuration specified. Defaulting to D3DDrv - Win32 Debug.\r
-!ENDIF \r
-\r
-!IF "$(CFG)" != "D3DDrv - Win32 Release" && "$(CFG)" != "D3DDrv - Win32 Debug"\r
-!MESSAGE Invalid configuration "$(CFG)" specified.\r
-!MESSAGE You can specify a configuration when running NMAKE\r
-!MESSAGE by defining the macro CFG on the command line. For example:\r
-!MESSAGE \r
-!MESSAGE NMAKE /f "D3DDrv.mak" CFG="D3DDrv - Win32 Debug"\r
-!MESSAGE \r
-!MESSAGE Possible choices for configuration are:\r
-!MESSAGE \r
-!MESSAGE "D3DDrv - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")\r
-!MESSAGE "D3DDrv - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")\r
-!MESSAGE \r
-!ERROR An invalid configuration is specified.\r
-!ENDIF \r
-\r
-!IF "$(OS)" == "Windows_NT"\r
-NULL=\r
-!ELSE \r
-NULL=nul\r
-!ENDIF \r
-\r
-CPP=cl.exe\r
-MTL=midl.exe\r
-RSC=rc.exe\r
-\r
-!IF  "$(CFG)" == "D3DDrv - Win32 Release"\r
-\r
-OUTDIR=.\Release\r
-INTDIR=.\Release\r
-# Begin Custom Macros\r
-OutDir=.\Release\r
-# End Custom Macros\r
-\r
-ALL : "$(OUTDIR)\D3DDrv.dll"\r
-\r
-\r
-CLEAN :\r
-       -@erase "$(INTDIR)\D3d_err.obj"\r
-       -@erase "$(INTDIR)\D3d_fx.obj"\r
-       -@erase "$(INTDIR)\D3d_main.obj"\r
-       -@erase "$(INTDIR)\D3dcache.obj"\r
-       -@erase "$(INTDIR)\D3ddrv.obj"\r
-       -@erase "$(INTDIR)\DDMemMgr.obj"\r
-       -@erase "$(INTDIR)\Gspan.obj"\r
-       -@erase "$(INTDIR)\Pcache.obj"\r
-       -@erase "$(INTDIR)\Render.obj"\r
-       -@erase "$(INTDIR)\Scene.obj"\r
-       -@erase "$(INTDIR)\THandle.obj"\r
-       -@erase "$(INTDIR)\tpage.obj"\r
-       -@erase "$(INTDIR)\vc60.idb"\r
-       -@erase "$(OUTDIR)\D3DDrv.dll"\r
-       -@erase "$(OUTDIR)\D3DDrv.exp"\r
-       -@erase "$(OUTDIR)\D3DDrv.lib"\r
-\r
-"$(OUTDIR)" :\r
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"\r
-\r
-CPP_PROJ=/nologo /MT /W3 /GX /O2 /X /I "..\..\.." /I "..\..\..\..\SdkDx6Sdk\Include" /I "..\\" /I "..\..\..\..\Sdk\Dx6Sdk\Include" /I "..\D3DDrv" /I "..\..\..\Support" /I "..\..\..\..\MsDev60\Include" /I "..\..\..\Math" /I "..\..\..\Bitmap" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "D3DDRV_EXPORTS" /Fp"$(INTDIR)\D3DDrv.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c \r
-MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32 \r
-BSC32=bscmake.exe\r
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\D3DDrv.bsc" \r
-BSC32_SBRS= \\r
-       \r
-LINK32=link.exe\r
-LINK32_FLAGS=/nologo /dll /incremental:no /pdb:"$(OUTDIR)\D3DDrv.pdb" /machine:I386 /nodefaultlib /out:"$(OUTDIR)\D3DDrv.dll" /implib:"$(OUTDIR)\D3DDrv.lib" \r
-LINK32_OBJS= \\r
-       "$(INTDIR)\D3d_err.obj" \\r
-       "$(INTDIR)\D3d_fx.obj" \\r
-       "$(INTDIR)\D3d_main.obj" \\r
-       "$(INTDIR)\D3dcache.obj" \\r
-       "$(INTDIR)\D3ddrv.obj" \\r
-       "$(INTDIR)\DDMemMgr.obj" \\r
-       "$(INTDIR)\Gspan.obj" \\r
-       "$(INTDIR)\Pcache.obj" \\r
-       "$(INTDIR)\Render.obj" \\r
-       "$(INTDIR)\Scene.obj" \\r
-       "$(INTDIR)\THandle.obj" \\r
-       "$(INTDIR)\tpage.obj" \\r
-       "..\..\..\..\MSDev60\lib\Wininet.lib" \\r
-       "..\..\..\..\MSDev60\lib\Comdlg32.lib" \\r
-       "..\..\..\..\MSDev60\lib\Gdi32.lib" \\r
-       "..\..\..\..\MSDev60\lib\Kernel32.lib" \\r
-       "..\..\..\..\MSDev60\lib\Libcmt.lib" \\r
-       "..\..\..\..\MSDev60\lib\Oldnames.lib" \\r
-       "..\..\..\..\MSDev60\lib\Shell32.lib" \\r
-       "..\..\..\..\MSDev60\lib\User32.lib" \\r
-       "..\..\..\..\MSDev60\lib\Uuid.lib" \\r
-       "..\..\..\..\MSDev60\lib\Advapi32.lib" \\r
-       "..\..\..\..\Sdk\Dx6sdk\Lib\dxguid.lib" \\r
-       "..\..\..\..\Sdk\Dx6sdk\Lib\ddraw.lib" \\r
-       "..\..\..\..\Sdk\Dx6sdk\Lib\d3dim.lib"\r
-\r
-"$(OUTDIR)\D3DDrv.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)\r
-    $(LINK32) @<<\r
-  $(LINK32_FLAGS) $(LINK32_OBJS)\r
-<<\r
-\r
-!ELSEIF  "$(CFG)" == "D3DDrv - Win32 Debug"\r
-\r
-OUTDIR=.\Debug\r
-INTDIR=.\Debug\r
-# Begin Custom Macros\r
-OutDir=.\Debug\r
-# End Custom Macros\r
-\r
-ALL : "$(OUTDIR)\D3DDrv.dll"\r
-\r
-\r
-CLEAN :\r
-       -@erase "$(INTDIR)\D3d_err.obj"\r
-       -@erase "$(INTDIR)\D3d_fx.obj"\r
-       -@erase "$(INTDIR)\D3d_main.obj"\r
-       -@erase "$(INTDIR)\D3dcache.obj"\r
-       -@erase "$(INTDIR)\D3ddrv.obj"\r
-       -@erase "$(INTDIR)\DDMemMgr.obj"\r
-       -@erase "$(INTDIR)\Gspan.obj"\r
-       -@erase "$(INTDIR)\Pcache.obj"\r
-       -@erase "$(INTDIR)\Render.obj"\r
-       -@erase "$(INTDIR)\Scene.obj"\r
-       -@erase "$(INTDIR)\THandle.obj"\r
-       -@erase "$(INTDIR)\tpage.obj"\r
-       -@erase "$(INTDIR)\vc60.idb"\r
-       -@erase "$(INTDIR)\vc60.pdb"\r
-       -@erase "$(OUTDIR)\D3DDrv.dll"\r
-       -@erase "$(OUTDIR)\D3DDrv.exp"\r
-       -@erase "$(OUTDIR)\D3DDrv.ilk"\r
-       -@erase "$(OUTDIR)\D3DDrv.lib"\r
-       -@erase "$(OUTDIR)\D3DDrv.pdb"\r
-\r
-"$(OUTDIR)" :\r
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"\r
-\r
-CPP_PROJ=/nologo /MTd /W3 /GX /Zi /Od /X /I "..\..\.." /I "..\..\..\Math" /I "..\\" /I "..\..\..\..\Sdk\Dx6Sdk\Include" /I "..\D3DDrv" /I "..\..\..\Support" /I "..\..\..\..\MsDev60\Include" /I "..\..\..\Bitmap" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "D3DDRV_EXPORTS" /Fp"$(INTDIR)\D3DDrv.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c \r
-MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 \r
-BSC32=bscmake.exe\r
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\D3DDrv.bsc" \r
-BSC32_SBRS= \\r
-       \r
-LINK32=link.exe\r
-LINK32_FLAGS=/nologo /dll /incremental:yes /pdb:"$(OUTDIR)\D3DDrv.pdb" /debug /machine:I386 /nodefaultlib /out:"$(OUTDIR)\D3DDrv.dll" /implib:"$(OUTDIR)\D3DDrv.lib" /pdbtype:sept \r
-LINK32_OBJS= \\r
-       "$(INTDIR)\D3d_err.obj" \\r
-       "$(INTDIR)\D3d_fx.obj" \\r
-       "$(INTDIR)\D3d_main.obj" \\r
-       "$(INTDIR)\D3dcache.obj" \\r
-       "$(INTDIR)\D3ddrv.obj" \\r
-       "$(INTDIR)\DDMemMgr.obj" \\r
-       "$(INTDIR)\Gspan.obj" \\r
-       "$(INTDIR)\Pcache.obj" \\r
-       "$(INTDIR)\Render.obj" \\r
-       "$(INTDIR)\Scene.obj" \\r
-       "$(INTDIR)\THandle.obj" \\r
-       "$(INTDIR)\tpage.obj" \\r
-       "..\..\..\..\MSDev60\lib\Wininet.lib" \\r
-       "..\..\..\..\MSDev60\lib\Comdlg32.lib" \\r
-       "..\..\..\..\MSDev60\lib\Gdi32.lib" \\r
-       "..\..\..\..\MSDev60\lib\Kernel32.lib" \\r
-       "..\..\..\..\MSDev60\lib\Libcmtd.lib" \\r
-       "..\..\..\..\MSDev60\lib\Oldnames.lib" \\r
-       "..\..\..\..\MSDev60\lib\Shell32.lib" \\r
-       "..\..\..\..\MSDev60\lib\User32.lib" \\r
-       "..\..\..\..\MSDev60\lib\Uuid.lib" \\r
-       "..\..\..\..\MSDev60\lib\Advapi32.lib" \\r
-       "..\..\..\..\Sdk\Dx6sdk\Lib\dxguid.lib" \\r
-       "..\..\..\..\Sdk\Dx6sdk\Lib\ddraw.lib" \\r
-       "..\..\..\..\Sdk\Dx6sdk\Lib\d3dim.lib"\r
-\r
-"$(OUTDIR)\D3DDrv.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)\r
-    $(LINK32) @<<\r
-  $(LINK32_FLAGS) $(LINK32_OBJS)\r
-<<\r
-\r
-!ENDIF \r
-\r
-.c{$(INTDIR)}.obj::\r
-   $(CPP) @<<\r
-   $(CPP_PROJ) $< \r
-<<\r
-\r
-.cpp{$(INTDIR)}.obj::\r
-   $(CPP) @<<\r
-   $(CPP_PROJ) $< \r
-<<\r
-\r
-.cxx{$(INTDIR)}.obj::\r
-   $(CPP) @<<\r
-   $(CPP_PROJ) $< \r
-<<\r
-\r
-.c{$(INTDIR)}.sbr::\r
-   $(CPP) @<<\r
-   $(CPP_PROJ) $< \r
-<<\r
-\r
-.cpp{$(INTDIR)}.sbr::\r
-   $(CPP) @<<\r
-   $(CPP_PROJ) $< \r
-<<\r
-\r
-.cxx{$(INTDIR)}.sbr::\r
-   $(CPP) @<<\r
-   $(CPP_PROJ) $< \r
-<<\r
-\r
-\r
-!IF "$(NO_EXTERNAL_DEPS)" != "1"\r
-!IF EXISTS("D3DDrv.dep")\r
-!INCLUDE "D3DDrv.dep"\r
-!ELSE \r
-!MESSAGE Warning: cannot find "D3DDrv.dep"\r
-!ENDIF \r
-!ENDIF \r
-\r
-\r
-!IF "$(CFG)" == "D3DDrv - Win32 Release" || "$(CFG)" == "D3DDrv - Win32 Debug"\r
-SOURCE=.\D3d_err.cpp\r
-\r
-"$(INTDIR)\D3d_err.obj" : $(SOURCE) "$(INTDIR)"\r
-\r
-\r
-SOURCE=.\D3d_fx.cpp\r
-\r
-"$(INTDIR)\D3d_fx.obj" : $(SOURCE) "$(INTDIR)"\r
-\r
-\r
-SOURCE=.\D3d_main.cpp\r
-\r
-"$(INTDIR)\D3d_main.obj" : $(SOURCE) "$(INTDIR)"\r
-\r
-\r
-SOURCE=.\D3dcache.cpp\r
-\r
-"$(INTDIR)\D3dcache.obj" : $(SOURCE) "$(INTDIR)"\r
-\r
-\r
-SOURCE=.\D3ddrv.cpp\r
-\r
-"$(INTDIR)\D3ddrv.obj" : $(SOURCE) "$(INTDIR)"\r
-\r
-\r
-SOURCE=.\DDMemMgr.c\r
-\r
-"$(INTDIR)\DDMemMgr.obj" : $(SOURCE) "$(INTDIR)"\r
-\r
-\r
-SOURCE=.\Gspan.cpp\r
-\r
-"$(INTDIR)\Gspan.obj" : $(SOURCE) "$(INTDIR)"\r
-\r
-\r
-SOURCE=.\Pcache.cpp\r
-\r
-"$(INTDIR)\Pcache.obj" : $(SOURCE) "$(INTDIR)"\r
-\r
-\r
-SOURCE=.\Render.cpp\r
-\r
-"$(INTDIR)\Render.obj" : $(SOURCE) "$(INTDIR)"\r
-\r
-\r
-SOURCE=.\Scene.cpp\r
-\r
-"$(INTDIR)\Scene.obj" : $(SOURCE) "$(INTDIR)"\r
-\r
-\r
-SOURCE=.\THandle.cpp\r
-\r
-"$(INTDIR)\THandle.obj" : $(SOURCE) "$(INTDIR)"\r
-\r
-\r
-SOURCE=.\tpage.cpp\r
-\r
-"$(INTDIR)\tpage.obj" : $(SOURCE) "$(INTDIR)"\r
-\r
-\r
-\r
-!ENDIF \r
-\r

diff --git a/G3D/Engine/Drivers/D3DDrv/D3DDrv.ncb b/G3D/Engine/Drivers/D3DDrv/D3DDrv.ncb
deleted file mode 100644 (file)
index 3ba92d0..0000000
Binary files a/G3D/Engine/Drivers/D3DDrv/D3DDrv.ncb and /dev/null differ

diff --git a/G3D/Engine/Drivers/D3DDrv/D3DDrv.opt b/G3D/Engine/Drivers/D3DDrv/D3DDrv.opt
deleted file mode 100644 (file)
index bf28673..0000000
Binary files a/G3D/Engine/Drivers/D3DDrv/D3DDrv.opt and /dev/null differ

diff --git a/G3D/Engine/Drivers/D3DDrv/D3DDrv.plg b/G3D/Engine/Drivers/D3DDrv/D3DDrv.plg
deleted file mode 100644 (file)
index 08d3bef..0000000
--- a/G3D/Engine/Drivers/D3DDrv/D3DDrv.plg
+++ /dev/null
@@ -1,44 +0,0 @@
-<html>\r
-<body>\r
-<pre>\r
-<h1>Build Log</h1>\r
-<h3>\r
---------------------Configuration: D3DDrv - Win32 Release--------------------\r
-</h3>\r
-<h3>Command Lines</h3>\r
-Creating temporary file "C:\DOCUME~1\RALPHD~1\LOCALS~1\Temp\RSP7C.tmp" with contents\r
-[\r
-/nologo /G5 /MT /W3 /GX /Ox /Ot /Ow /Og /Oi /Op /Ob2 /I "..\..\.." /I "..\\" /I "..\D3DDrv" /I "..\..\..\Support" /I "..\..\..\Math" /I "..\..\..\Bitmap" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "D3DDRV_EXPORTS" /Fo"Release/" /Fd"Release/" /FD /c \r
-"D:\Release\G3D\Engine\Drivers\D3DDrv\D3d_main.cpp"\r
-]\r
-Creating command line "cl.exe @C:\DOCUME~1\RALPHD~1\LOCALS~1\Temp\RSP7C.tmp" \r
-Creating temporary file "C:\DOCUME~1\RALPHD~1\LOCALS~1\Temp\RSP7D.tmp" with contents\r
-[\r
-kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib winmm.lib vfw32.lib dxguid.lib ddraw.lib d3dim.lib /nologo /dll /incremental:no /pdb:"Release/D3DDrv.pdb" /machine:I386 /out:"Release/D3DDrv.dll" /implib:"Release/D3DDrv.lib" \r
-.\Release\D3d_err.obj\r
-.\Release\D3d_fx.obj\r
-.\Release\D3d_main.obj\r
-.\Release\D3dcache.obj\r
-.\Release\D3ddrv.obj\r
-.\Release\DDMemMgr.obj\r
-.\Release\Gspan.obj\r
-.\Release\Pcache.obj\r
-.\Release\Render.obj\r
-.\Release\Scene.obj\r
-.\Release\THandle.obj\r
-.\Release\tpage.obj\r
-]\r
-Creating command line "link.exe @C:\DOCUME~1\RALPHD~1\LOCALS~1\Temp\RSP7D.tmp"\r
-<h3>Output Window</h3>\r
-Compiling...\r
-D3d_main.cpp\r
-Linking...\r
-   Creating library Release/D3DDrv.lib and object Release/D3DDrv.exp\r
-\r
-\r
-\r
-<h3>Results</h3>\r
-D3DDrv.dll - 0 error(s), 0 warning(s)\r
-</pre>\r
-</body>\r
-</html>\r

diff --git a/G3D/Engine/Drivers/D3DDrv/mssccprj.scc b/G3D/Engine/Drivers/D3DDrv/mssccprj.scc
deleted file mode 100644 (file)
index 848e217..0000000
--- a/G3D/Engine/Drivers/D3DDrv/mssccprj.scc
+++ /dev/null
@@ -1,4 +0,0 @@
-SCC = This is a Source Code Control file\r
-\r
-[D3DDrv.mak]\r
-SCC_Project_Name = "$/Genesis10/Source/Engine/Drivers/D3DDrv", LQQBAAAA\r

diff --git a/G3D/Engine/Drivers/GlideDrv/GlideDrv.dsp b/G3D/Engine/Drivers/GlideDrv/GlideDrv.dsp
deleted file mode 100644 (file)
index cc4ff6e..0000000
--- a/G3D/Engine/Drivers/GlideDrv/GlideDrv.dsp
+++ /dev/null
@@ -1,229 +0,0 @@
-# Microsoft Developer Studio Project File - Name="GlideDrv" - Package Owner=<4>\r
-# Microsoft Developer Studio Generated Build File, Format Version 6.00\r
-# ** DO NOT EDIT **\r
-\r
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102\r
-\r
-CFG=GlideDrv - Win32 Debug\r
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,\r
-!MESSAGE use the Export Makefile command and run\r
-!MESSAGE \r
-!MESSAGE NMAKE /f "GlideDrv.mak".\r
-!MESSAGE \r
-!MESSAGE You can specify a configuration when running NMAKE\r
-!MESSAGE by defining the macro CFG on the command line. For example:\r
-!MESSAGE \r
-!MESSAGE NMAKE /f "GlideDrv.mak" CFG="GlideDrv - Win32 Debug"\r
-!MESSAGE \r
-!MESSAGE Possible choices for configuration are:\r
-!MESSAGE \r
-!MESSAGE "GlideDrv - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")\r
-!MESSAGE "GlideDrv - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")\r
-!MESSAGE \r
-\r
-# Begin Project\r
-# PROP AllowPerConfigDependencies 0\r
-# PROP Scc_ProjName ""$/Genesis10/Source/Engine/Drivers/GlideDrv", CVPBAAAA"\r
-# PROP Scc_LocalPath "."\r
-CPP=cl.exe\r
-MTL=midl.exe\r
-RSC=rc.exe\r
-\r
-!IF  "$(CFG)" == "GlideDrv - Win32 Release"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 0\r
-# PROP BASE Output_Dir "Release"\r
-# PROP BASE Intermediate_Dir "Release"\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 0\r
-# PROP Output_Dir "Release"\r
-# PROP Intermediate_Dir "Release"\r
-# PROP Ignore_Export_Lib 0\r
-# PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "GLIDEDRV_EXPORTS" /YX /FD /c\r
-# ADD CPP /nologo /MT /W3 /GX /O2 /X /I "..\..\..\Support" /I "..\\" /I "..\..\..\Math" /I "..\..\..\Bitmap" /I "..\..\..\..\MsDev60\Include" /I "..\..\..\..\Sdk\Glide\Include" /I "..\..\..\\" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "GLIDEDRV_EXPORTS" /D "__MSC__" /YX /FD /c\r
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32\r
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32\r
-# ADD BASE RSC /l 0x409 /d "NDEBUG"\r
-# ADD RSC /l 0x409 /d "NDEBUG"\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo\r
-LINK32=link.exe\r
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386\r
-# ADD LINK32 /nologo /dll /machine:I386 /nodefaultlib\r
-\r
-!ELSEIF  "$(CFG)" == "GlideDrv - Win32 Debug"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 1\r
-# PROP BASE Output_Dir "Debug"\r
-# PROP BASE Intermediate_Dir "Debug"\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 1\r
-# PROP Output_Dir "Debug"\r
-# PROP Intermediate_Dir "Debug"\r
-# PROP Ignore_Export_Lib 0\r
-# PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "GLIDEDRV_EXPORTS" /YX /FD /GZ /c\r
-# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /X /I "..\..\..\Support" /I "..\\" /I "..\..\..\Math" /I "..\..\..\Bitmap" /I "..\..\..\..\MsDev60\Include" /I "..\..\..\..\Sdk\Glide\Include" /I "..\..\..\\" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "GLIDEDRV_EXPORTS" /D "__MSC__" /YX /FD /GZ /c\r
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32\r
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32\r
-# ADD BASE RSC /l 0x409 /d "_DEBUG"\r
-# ADD RSC /l 0x409 /d "_DEBUG"\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo\r
-LINK32=link.exe\r
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept\r
-# ADD LINK32 /nologo /dll /debug /machine:I386 /nodefaultlib /pdbtype:sept\r
-\r
-!ENDIF \r
-\r
-# Begin Target\r
-\r
-# Name "GlideDrv - Win32 Release"\r
-# Name "GlideDrv - Win32 Debug"\r
-# Begin Group "Source Files"\r
-\r
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"\r
-# Begin Source File\r
-\r
-SOURCE=..\Bmp.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\Dcommon.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\GCache.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\GCache.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\GlideDrv.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\Glidedrv.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\GMain.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\GMain.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\GMemMgr.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\GMemMgr.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\GSpan.cpp\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\GSpan.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\GThandle.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\GTHandle.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\Render.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\Render.h\r
-# End Source File\r
-# End Group\r
-# Begin Group "Libraries"\r
-\r
-# PROP Default_Filter ""\r
-# Begin Source File\r
-\r
-SOURCE=..\..\..\..\Sdk\Glide\Lib\glide2x.lib\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\..\..\MSDev60\lib\Libcmt.lib\r
-\r
-!IF  "$(CFG)" == "GlideDrv - Win32 Release"\r
-\r
-!ELSEIF  "$(CFG)" == "GlideDrv - Win32 Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ENDIF \r
-\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\..\..\MSDev60\lib\Libcmtd.lib\r
-\r
-!IF  "$(CFG)" == "GlideDrv - Win32 Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "GlideDrv - Win32 Debug"\r
-\r
-!ENDIF \r
-\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\..\..\MSDev60\lib\Winspool.lib\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\..\..\MSDev60\lib\Uuid.lib\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\..\..\MSDev60\lib\Comdlg32.lib\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\..\..\MSDev60\lib\Gdi32.lib\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\..\..\MSDev60\lib\Kernel32.lib\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\..\..\MSDev60\lib\Oldnames.lib\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\..\..\MSDev60\lib\Shell32.lib\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\..\..\MSDev60\lib\User32.lib\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\..\..\MSDev60\lib\Advapi32.lib\r
-# End Source File\r
-# End Group\r
-# End Target\r
-# End Project\r

diff --git a/G3D/Engine/Drivers/GlideDrv/GlideDrv.dsw b/G3D/Engine/Drivers/GlideDrv/GlideDrv.dsw
deleted file mode 100644 (file)
index 5b1db9a..0000000
--- a/G3D/Engine/Drivers/GlideDrv/GlideDrv.dsw
+++ /dev/null
@@ -1,29 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00\r
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!\r
-\r
-###############################################################################\r
-\r
-Project: "GlideDrv"=.\GlideDrv.dsp - Package Owner=<4>\r
-\r
-Package=<5>\r
-{{{\r
-}}}\r
-\r
-Package=<4>\r
-{{{\r
-}}}\r
-\r
-###############################################################################\r
-\r
-Global:\r
-\r
-Package=<5>\r
-{{{\r
-}}}\r
-\r
-Package=<3>\r
-{{{\r
-}}}\r
-\r
-###############################################################################\r
-\r

diff --git a/G3D/Engine/Drivers/GlideDrv/GlideDrv.mak b/G3D/Engine/Drivers/GlideDrv/GlideDrv.mak
deleted file mode 100644 (file)
index d7eb271..0000000
--- a/G3D/Engine/Drivers/GlideDrv/GlideDrv.mak
+++ /dev/null
@@ -1,245 +0,0 @@
-# Microsoft Developer Studio Generated NMAKE File, Based on GlideDrv.dsp\r
-!IF "$(CFG)" == ""\r
-CFG=GlideDrv - Win32 Debug\r
-!MESSAGE No configuration specified. Defaulting to GlideDrv - Win32 Debug.\r
-!ENDIF \r
-\r
-!IF "$(CFG)" != "GlideDrv - Win32 Release" && "$(CFG)" != "GlideDrv - Win32 Debug"\r
-!MESSAGE Invalid configuration "$(CFG)" specified.\r
-!MESSAGE You can specify a configuration when running NMAKE\r
-!MESSAGE by defining the macro CFG on the command line. For example:\r
-!MESSAGE \r
-!MESSAGE NMAKE /f "GlideDrv.mak" CFG="GlideDrv - Win32 Debug"\r
-!MESSAGE \r
-!MESSAGE Possible choices for configuration are:\r
-!MESSAGE \r
-!MESSAGE "GlideDrv - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")\r
-!MESSAGE "GlideDrv - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")\r
-!MESSAGE \r
-!ERROR An invalid configuration is specified.\r
-!ENDIF \r
-\r
-!IF "$(OS)" == "Windows_NT"\r
-NULL=\r
-!ELSE \r
-NULL=nul\r
-!ENDIF \r
-\r
-CPP=cl.exe\r
-MTL=midl.exe\r
-RSC=rc.exe\r
-\r
-!IF  "$(CFG)" == "GlideDrv - Win32 Release"\r
-\r
-OUTDIR=.\Release\r
-INTDIR=.\Release\r
-# Begin Custom Macros\r
-OutDir=.\Release\r
-# End Custom Macros\r
-\r
-ALL : "$(OUTDIR)\GlideDrv.dll"\r
-\r
-\r
-CLEAN :\r
-       -@erase "$(INTDIR)\Bmp.obj"\r
-       -@erase "$(INTDIR)\GCache.obj"\r
-       -@erase "$(INTDIR)\GlideDrv.obj"\r
-       -@erase "$(INTDIR)\GMain.obj"\r
-       -@erase "$(INTDIR)\GMemMgr.obj"\r
-       -@erase "$(INTDIR)\GSpan.obj"\r
-       -@erase "$(INTDIR)\GThandle.obj"\r
-       -@erase "$(INTDIR)\Render.obj"\r
-       -@erase "$(INTDIR)\vc60.idb"\r
-       -@erase "$(OUTDIR)\GlideDrv.dll"\r
-       -@erase "$(OUTDIR)\GlideDrv.exp"\r
-       -@erase "$(OUTDIR)\GlideDrv.lib"\r
-\r
-"$(OUTDIR)" :\r
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"\r
-\r
-CPP_PROJ=/nologo /MT /W3 /GX /O2 /X /I "..\..\..\Support" /I "..\\" /I "..\..\..\Math" /I "..\..\..\Bitmap" /I "..\..\..\..\MsDev60\Include" /I "..\..\..\..\Sdk\Glide\Include" /I "..\..\..\\" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "GLIDEDRV_EXPORTS" /D "__MSC__" /Fp"$(INTDIR)\GlideDrv.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c \r
-MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32 \r
-BSC32=bscmake.exe\r
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\GlideDrv.bsc" \r
-BSC32_SBRS= \\r
-       \r
-LINK32=link.exe\r
-LINK32_FLAGS=/nologo /dll /incremental:no /pdb:"$(OUTDIR)\GlideDrv.pdb" /machine:I386 /nodefaultlib /out:"$(OUTDIR)\GlideDrv.dll" /implib:"$(OUTDIR)\GlideDrv.lib" \r
-LINK32_OBJS= \\r
-       "$(INTDIR)\Bmp.obj" \\r
-       "$(INTDIR)\GCache.obj" \\r
-       "$(INTDIR)\GlideDrv.obj" \\r
-       "$(INTDIR)\GMain.obj" \\r
-       "$(INTDIR)\GMemMgr.obj" \\r
-       "$(INTDIR)\GSpan.obj" \\r
-       "$(INTDIR)\GThandle.obj" \\r
-       "$(INTDIR)\Render.obj" \\r
-       "..\..\..\..\Sdk\Glide\Lib\glide2x.lib" \\r
-       "..\..\..\..\MSDev60\lib\Libcmt.lib" \\r
-       "..\..\..\..\MSDev60\lib\Winspool.lib" \\r
-       "..\..\..\..\MSDev60\lib\Uuid.lib" \\r
-       "..\..\..\..\MSDev60\lib\Comdlg32.lib" \\r
-       "..\..\..\..\MSDev60\lib\Gdi32.lib" \\r
-       "..\..\..\..\MSDev60\lib\Kernel32.lib" \\r
-       "..\..\..\..\MSDev60\lib\Oldnames.lib" \\r
-       "..\..\..\..\MSDev60\lib\Shell32.lib" \\r
-       "..\..\..\..\MSDev60\lib\User32.lib" \\r
-       "..\..\..\..\MSDev60\lib\Advapi32.lib"\r
-\r
-"$(OUTDIR)\GlideDrv.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)\r
-    $(LINK32) @<<\r
-  $(LINK32_FLAGS) $(LINK32_OBJS)\r
-<<\r
-\r
-!ELSEIF  "$(CFG)" == "GlideDrv - Win32 Debug"\r
-\r
-OUTDIR=.\Debug\r
-INTDIR=.\Debug\r
-# Begin Custom Macros\r
-OutDir=.\Debug\r
-# End Custom Macros\r
-\r
-ALL : "$(OUTDIR)\GlideDrv.dll"\r
-\r
-\r
-CLEAN :\r
-       -@erase "$(INTDIR)\Bmp.obj"\r
-       -@erase "$(INTDIR)\GCache.obj"\r
-       -@erase "$(INTDIR)\GlideDrv.obj"\r
-       -@erase "$(INTDIR)\GMain.obj"\r
-       -@erase "$(INTDIR)\GMemMgr.obj"\r
-       -@erase "$(INTDIR)\GSpan.obj"\r
-       -@erase "$(INTDIR)\GThandle.obj"\r
-       -@erase "$(INTDIR)\Render.obj"\r
-       -@erase "$(INTDIR)\vc60.idb"\r
-       -@erase "$(INTDIR)\vc60.pdb"\r
-       -@erase "$(OUTDIR)\GlideDrv.dll"\r
-       -@erase "$(OUTDIR)\GlideDrv.exp"\r
-       -@erase "$(OUTDIR)\GlideDrv.ilk"\r
-       -@erase "$(OUTDIR)\GlideDrv.lib"\r
-       -@erase "$(OUTDIR)\GlideDrv.pdb"\r
-\r
-"$(OUTDIR)" :\r
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"\r
-\r
-CPP_PROJ=/nologo /MTd /W3 /Gm /GX /ZI /Od /X /I "..\..\..\Support" /I "..\\" /I "..\..\..\Math" /I "..\..\..\Bitmap" /I "..\..\..\..\MsDev60\Include" /I "..\..\..\..\Sdk\Glide\Include" /I "..\..\..\\" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "GLIDEDRV_EXPORTS" /D "__MSC__" /Fp"$(INTDIR)\GlideDrv.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c \r
-MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 \r
-BSC32=bscmake.exe\r
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\GlideDrv.bsc" \r
-BSC32_SBRS= \\r
-       \r
-LINK32=link.exe\r
-LINK32_FLAGS=/nologo /dll /incremental:yes /pdb:"$(OUTDIR)\GlideDrv.pdb" /debug /machine:I386 /nodefaultlib /out:"$(OUTDIR)\GlideDrv.dll" /implib:"$(OUTDIR)\GlideDrv.lib" /pdbtype:sept \r
-LINK32_OBJS= \\r
-       "$(INTDIR)\Bmp.obj" \\r
-       "$(INTDIR)\GCache.obj" \\r
-       "$(INTDIR)\GlideDrv.obj" \\r
-       "$(INTDIR)\GMain.obj" \\r
-       "$(INTDIR)\GMemMgr.obj" \\r
-       "$(INTDIR)\GSpan.obj" \\r
-       "$(INTDIR)\GThandle.obj" \\r
-       "$(INTDIR)\Render.obj" \\r
-       "..\..\..\..\Sdk\Glide\Lib\glide2x.lib" \\r
-       "..\..\..\..\MSDev60\lib\Libcmtd.lib" \\r
-       "..\..\..\..\MSDev60\lib\Winspool.lib" \\r
-       "..\..\..\..\MSDev60\lib\Uuid.lib" \\r
-       "..\..\..\..\MSDev60\lib\Comdlg32.lib" \\r
-       "..\..\..\..\MSDev60\lib\Gdi32.lib" \\r
-       "..\..\..\..\MSDev60\lib\Kernel32.lib" \\r
-       "..\..\..\..\MSDev60\lib\Oldnames.lib" \\r
-       "..\..\..\..\MSDev60\lib\Shell32.lib" \\r
-       "..\..\..\..\MSDev60\lib\User32.lib" \\r
-       "..\..\..\..\MSDev60\lib\Advapi32.lib"\r
-\r
-"$(OUTDIR)\GlideDrv.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)\r
-    $(LINK32) @<<\r
-  $(LINK32_FLAGS) $(LINK32_OBJS)\r
-<<\r
-\r
-!ENDIF \r
-\r
-.c{$(INTDIR)}.obj::\r
-   $(CPP) @<<\r
-   $(CPP_PROJ) $< \r
-<<\r
-\r
-.cpp{$(INTDIR)}.obj::\r
-   $(CPP) @<<\r
-   $(CPP_PROJ) $< \r
-<<\r
-\r
-.cxx{$(INTDIR)}.obj::\r
-   $(CPP) @<<\r
-   $(CPP_PROJ) $< \r
-<<\r
-\r
-.c{$(INTDIR)}.sbr::\r
-   $(CPP) @<<\r
-   $(CPP_PROJ) $< \r
-<<\r
-\r
-.cpp{$(INTDIR)}.sbr::\r
-   $(CPP) @<<\r
-   $(CPP_PROJ) $< \r
-<<\r
-\r
-.cxx{$(INTDIR)}.sbr::\r
-   $(CPP) @<<\r
-   $(CPP_PROJ) $< \r
-<<\r
-\r
-\r
-!IF "$(NO_EXTERNAL_DEPS)" != "1"\r
-!IF EXISTS("GlideDrv.dep")\r
-!INCLUDE "GlideDrv.dep"\r
-!ELSE \r
-!MESSAGE Warning: cannot find "GlideDrv.dep"\r
-!ENDIF \r
-!ENDIF \r
-\r
-\r
-!IF "$(CFG)" == "GlideDrv - Win32 Release" || "$(CFG)" == "GlideDrv - Win32 Debug"\r
-SOURCE=..\Bmp.c\r
-\r
-"$(INTDIR)\Bmp.obj" : $(SOURCE) "$(INTDIR)"\r
-       $(CPP) $(CPP_PROJ) $(SOURCE)\r
-\r
-\r
-SOURCE=.\GCache.c\r
-\r
-"$(INTDIR)\GCache.obj" : $(SOURCE) "$(INTDIR)"\r
-\r
-\r
-SOURCE=.\GlideDrv.c\r
-\r
-"$(INTDIR)\GlideDrv.obj" : $(SOURCE) "$(INTDIR)"\r
-\r
-\r
-SOURCE=.\GMain.c\r
-\r
-"$(INTDIR)\GMain.obj" : $(SOURCE) "$(INTDIR)"\r
-\r
-\r
-SOURCE=.\GMemMgr.c\r
-\r
-"$(INTDIR)\GMemMgr.obj" : $(SOURCE) "$(INTDIR)"\r
-\r
-\r
-SOURCE=.\GSpan.cpp\r
-\r
-"$(INTDIR)\GSpan.obj" : $(SOURCE) "$(INTDIR)"\r
-\r
-\r
-SOURCE=.\GThandle.c\r
-\r
-"$(INTDIR)\GThandle.obj" : $(SOURCE) "$(INTDIR)"\r
-\r
-\r
-SOURCE=.\Render.c\r
-\r
-"$(INTDIR)\Render.obj" : $(SOURCE) "$(INTDIR)"\r
-\r
-\r
-\r
-!ENDIF \r
-\r

diff --git a/G3D/Engine/Drivers/GlideDrv/GlideDrv.ncb b/G3D/Engine/Drivers/GlideDrv/GlideDrv.ncb
deleted file mode 100644 (file)
index 44d5199..0000000
Binary files a/G3D/Engine/Drivers/GlideDrv/GlideDrv.ncb and /dev/null differ

diff --git a/G3D/Engine/Drivers/GlideDrv/GlideDrv.opt b/G3D/Engine/Drivers/GlideDrv/GlideDrv.opt
deleted file mode 100644 (file)
index a0ccc2c..0000000
Binary files a/G3D/Engine/Drivers/GlideDrv/GlideDrv.opt and /dev/null differ

diff --git a/G3D/Engine/Drivers/GlideDrv/mssccprj.scc b/G3D/Engine/Drivers/GlideDrv/mssccprj.scc
deleted file mode 100644 (file)
index 05edfc0..0000000
--- a/G3D/Engine/Drivers/GlideDrv/mssccprj.scc
+++ /dev/null
@@ -1,4 +0,0 @@
-SCC = This is a Source Code Control file\r
-\r
-[GlideDrv.mak]\r
-SCC_Project_Name = "$/Genesis10/Source/Engine/Drivers/GlideDrv", MQQBAAAA\r

diff --git a/G3D/Engine/Drivers/OpenGl/OglDrv.dsp b/G3D/Engine/Drivers/OpenGl/OglDrv.dsp
deleted file mode 100644 (file)
index 9b47e37..0000000
--- a/G3D/Engine/Drivers/OpenGl/OglDrv.dsp
+++ /dev/null
@@ -1,209 +0,0 @@
-# Microsoft Developer Studio Project File - Name="OglDrv" - Package Owner=<4>\r
-# Microsoft Developer Studio Generated Build File, Format Version 6.00\r
-# ** DO NOT EDIT **\r
-\r
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102\r
-\r
-CFG=OglDrv - Win32 Release\r
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,\r
-!MESSAGE use the Export Makefile command and run\r
-!MESSAGE \r
-!MESSAGE NMAKE /f "OglDrv.mak".\r
-!MESSAGE \r
-!MESSAGE You can specify a configuration when running NMAKE\r
-!MESSAGE by defining the macro CFG on the command line. For example:\r
-!MESSAGE \r
-!MESSAGE NMAKE /f "OglDrv.mak" CFG="OglDrv - Win32 Release"\r
-!MESSAGE \r
-!MESSAGE Possible choices for configuration are:\r
-!MESSAGE \r
-!MESSAGE "OglDrv - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")\r
-!MESSAGE "OglDrv - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")\r
-!MESSAGE \r
-\r
-# Begin Project\r
-# PROP AllowPerConfigDependencies 0\r
-# PROP Scc_ProjName ""$/Genesis10/Source/Engine/Drivers/OglDrv", CVPBAAAA"\r
-# PROP Scc_LocalPath "."\r
-CPP=cl.exe\r
-MTL=midl.exe\r
-RSC=rc.exe\r
-\r
-!IF  "$(CFG)" == "OglDrv - Win32 Release"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 0\r
-# PROP BASE Output_Dir "Release"\r
-# PROP BASE Intermediate_Dir "Release"\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 0\r
-# PROP Output_Dir "Release"\r
-# PROP Intermediate_Dir "Release"\r
-# PROP Ignore_Export_Lib 0\r
-# PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "OglDrv_EXPORTS" /YX /FD /c\r
-# ADD CPP /nologo /MT /W3 /GX /O2 /Ob2 /X /I "..\..\..\Support" /I "..\\" /I "..\..\..\Math" /I "..\..\..\Bitmap" /I "..\..\..\..\MsDev60\Include" /I "..\..\..\\" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "OglDrv_EXPORTS" /D "__MSC__" /YX /FD /c\r
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32\r
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32\r
-# ADD BASE RSC /l 0x409 /d "NDEBUG"\r
-# ADD RSC /l 0x409 /d "NDEBUG"\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo\r
-LINK32=link.exe\r
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386\r
-# ADD LINK32 glu32.lib opengl32.lib /nologo /dll /machine:I386 /nodefaultlib\r
-\r
-!ELSEIF  "$(CFG)" == "OglDrv - Win32 Debug"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 1\r
-# PROP BASE Output_Dir "Debug"\r
-# PROP BASE Intermediate_Dir "Debug"\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 1\r
-# PROP Output_Dir "Debug"\r
-# PROP Intermediate_Dir "Debug"\r
-# PROP Ignore_Export_Lib 0\r
-# PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "OglDrv_EXPORTS" /YX /FD /GZ /c\r
-# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /X /I "..\..\..\Support" /I "..\\" /I "..\..\..\Math" /I "..\..\..\Bitmap" /I "..\..\..\..\MsDev60\Include" /I "..\..\..\\" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "OglDrv_EXPORTS" /D "__MSC__" /FR /YX /FD /GZ /c\r
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32\r
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32\r
-# ADD BASE RSC /l 0x409 /d "_DEBUG"\r
-# ADD RSC /l 0x409 /d "_DEBUG"\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo\r
-LINK32=link.exe\r
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept\r
-# ADD LINK32 glu32.lib opengl32.lib /nologo /dll /debug /machine:I386 /nodefaultlib /pdbtype:sept\r
-\r
-!ENDIF \r
-\r
-# Begin Target\r
-\r
-# Name "OglDrv - Win32 Release"\r
-# Name "OglDrv - Win32 Debug"\r
-# Begin Group "Source Files"\r
-\r
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"\r
-# Begin Source File\r
-\r
-SOURCE=..\Dcommon.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\glext.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\OglDrv.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\OglDrv.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\OglMisc.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\OglMisc.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\Render.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\Render.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\THandle.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\THandle.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\Win32.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\Win32.h\r
-# End Source File\r
-# End Group\r
-# Begin Group "Libraries"\r
-\r
-# PROP Default_Filter ""\r
-# Begin Source File\r
-\r
-SOURCE=..\..\..\..\MSDev60\lib\Libcmt.lib\r
-\r
-!IF  "$(CFG)" == "OglDrv - Win32 Release"\r
-\r
-!ELSEIF  "$(CFG)" == "OglDrv - Win32 Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ENDIF \r
-\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\..\..\MSDev60\lib\Libcmtd.lib\r
-\r
-!IF  "$(CFG)" == "OglDrv - Win32 Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "OglDrv - Win32 Debug"\r
-\r
-!ENDIF \r
-\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\..\..\MSDev60\lib\Winspool.lib\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\..\..\MSDev60\lib\Uuid.lib\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\..\..\MSDev60\lib\Comdlg32.lib\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\..\..\MSDev60\lib\Gdi32.lib\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\..\..\MSDev60\lib\Kernel32.lib\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\..\..\MSDev60\lib\Oldnames.lib\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\..\..\MSDev60\lib\Shell32.lib\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\..\..\MSDev60\lib\User32.lib\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\..\..\MSDev60\lib\Advapi32.lib\r
-# End Source File\r
-# End Group\r
-# End Target\r
-# End Project\r

diff --git a/G3D/Engine/Drivers/OpenGl/OglDrv.dsw b/G3D/Engine/Drivers/OpenGl/OglDrv.dsw
deleted file mode 100644 (file)
index 21f82aa..0000000
--- a/G3D/Engine/Drivers/OpenGl/OglDrv.dsw
+++ /dev/null
@@ -1,29 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00\r
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!\r
-\r
-###############################################################################\r
-\r
-Project: "OglDrv"=.\OglDrv.dsp - Package Owner=<4>\r
-\r
-Package=<5>\r
-{{{\r
-}}}\r
-\r
-Package=<4>\r
-{{{\r
-}}}\r
-\r
-###############################################################################\r
-\r
-Global:\r
-\r
-Package=<5>\r
-{{{\r
-}}}\r
-\r
-Package=<3>\r
-{{{\r
-}}}\r
-\r
-###############################################################################\r
-\r

diff --git a/G3D/Engine/Drivers/SoftDrv/SoftDrv.dsp b/G3D/Engine/Drivers/SoftDrv/SoftDrv.dsp
deleted file mode 100644 (file)
index e7e030a..0000000
--- a/G3D/Engine/Drivers/SoftDrv/SoftDrv.dsp
+++ /dev/null
@@ -1,304 +0,0 @@
-# Microsoft Developer Studio Project File - Name="SoftDrv" - Package Owner=<4>\r
-# Microsoft Developer Studio Generated Build File, Format Version 6.00\r
-# ** DO NOT EDIT **\r
-\r
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102\r
-\r
-CFG=SoftDrv - Win32 Debug\r
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,\r
-!MESSAGE use the Export Makefile command and run\r
-!MESSAGE \r
-!MESSAGE NMAKE /f "SoftDrv.mak".\r
-!MESSAGE \r
-!MESSAGE You can specify a configuration when running NMAKE\r
-!MESSAGE by defining the macro CFG on the command line. For example:\r
-!MESSAGE \r
-!MESSAGE NMAKE /f "SoftDrv.mak" CFG="SoftDrv - Win32 Debug"\r
-!MESSAGE \r
-!MESSAGE Possible choices for configuration are:\r
-!MESSAGE \r
-!MESSAGE "SoftDrv - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")\r
-!MESSAGE "SoftDrv - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")\r
-!MESSAGE \r
-\r
-# Begin Project\r
-# PROP AllowPerConfigDependencies 0\r
-# PROP Scc_ProjName ""$/Genesis10/Source/Engine/Drivers/SoftDrv", EVPBAAAA"\r
-# PROP Scc_LocalPath "."\r
-CPP=cl.exe\r
-MTL=midl.exe\r
-RSC=rc.exe\r
-\r
-!IF  "$(CFG)" == "SoftDrv - Win32 Release"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 0\r
-# PROP BASE Output_Dir "Release"\r
-# PROP BASE Intermediate_Dir "Release"\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 0\r
-# PROP Output_Dir "Release"\r
-# PROP Intermediate_Dir "Release"\r
-# PROP Ignore_Export_Lib 0\r
-# PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "SOFTDRV_EXPORTS" /YX /FD /c\r
-# ADD CPP /nologo /MT /W3 /GX /O2 /X /I "..\..\.." /I "..\..\..\Support" /I "..\\" /I "..\..\..\Math" /I "..\..\..\Bitmap" /I "..\..\..\..\MsDev60\Include" /I "..\..\..\..\Sdk\Dx6SDK\Include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "SOFTDRV_EXPORTS" /YX /FD /c\r
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32\r
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32\r
-# ADD BASE RSC /l 0x409 /d "NDEBUG"\r
-# ADD RSC /l 0x409 /d "NDEBUG"\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo\r
-LINK32=link.exe\r
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386\r
-# ADD LINK32 /nologo /dll /machine:I386 /nodefaultlib\r
-\r
-!ELSEIF  "$(CFG)" == "SoftDrv - Win32 Debug"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 1\r
-# PROP BASE Output_Dir "Debug"\r
-# PROP BASE Intermediate_Dir "Debug"\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 1\r
-# PROP Output_Dir "Debug"\r
-# PROP Intermediate_Dir "Debug"\r
-# PROP Ignore_Export_Lib 0\r
-# PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "SOFTDRV_EXPORTS" /YX /FD /GZ /c\r
-# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /X /I "..\..\.." /I "..\..\..\Support" /I "..\\" /I "..\..\..\Math" /I "..\..\..\Bitmap" /I "..\..\..\..\MsDev60\Include" /I "..\..\..\..\Sdk\Dx6SDK\Include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "SOFTDRV_EXPORTS" /YX /FD /GZ /c\r
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32\r
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32\r
-# ADD BASE RSC /l 0x409 /d "_DEBUG"\r
-# ADD RSC /l 0x409 /d "_DEBUG"\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo\r
-LINK32=link.exe\r
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept\r
-# ADD LINK32 /nologo /dll /debug /machine:I386 /nodefaultlib /pdbtype:sept\r
-\r
-!ENDIF \r
-\r
-# Begin Target\r
-\r
-# Name "SoftDrv - Win32 Release"\r
-# Name "SoftDrv - Win32 Debug"\r
-# Begin Group "Source Files"\r
-\r
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"\r
-# Begin Source File\r
-\r
-SOURCE=.\3dnowspan.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\amdspan.asm\r
-\r
-!IF  "$(CFG)" == "SoftDrv - Win32 Release"\r
-\r
-# Begin Custom Build\r
-InputPath=.\amdspan.asm\r
-\r
-".\amdspan.obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
-       ..\..\..\..\masm\bin\ml -c -I ..\..\..\..\masm\include -coff amdspan.asm\r
-\r
-# End Custom Build\r
-\r
-!ELSEIF  "$(CFG)" == "SoftDrv - Win32 Debug"\r
-\r
-# Begin Custom Build\r
-InputPath=.\amdspan.asm\r
-\r
-".\amdspan.obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
-       ..\..\..\..\masm\bin\ml -c -I ..\..\..\..\masm\include -coff amdspan.asm\r
-\r
-# End Custom Build\r
-\r
-!ENDIF \r
-\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\dmodes.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\dmodes.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\drawspan.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\drawspan.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\register.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\Register.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\render.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\Render.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\Sal.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\scene.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\Scene.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\softdrv.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\Softdrv.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\span.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\Span.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\system.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\System.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\..\Math\Vec3d.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\..\Math\Vec3d.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\W32sal.cpp\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\x86span555.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\x86span555.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\x86span565.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\x86span565.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\..\Math\Xform3d.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\..\Math\Xform3d.h\r
-# End Source File\r
-# End Group\r
-# Begin Group "Resource Files"\r
-\r
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"\r
-# End Group\r
-# Begin Group "Libraries"\r
-\r
-# PROP Default_Filter ""\r
-# Begin Source File\r
-\r
-SOURCE=..\..\..\..\MSDev60\lib\Winspool.lib\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\..\..\MSDev60\lib\Comdlg32.lib\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\..\..\MSDev60\lib\Gdi32.lib\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\..\..\MSDev60\lib\Kernel32.lib\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\..\..\MSDev60\lib\Libcmt.lib\r
-\r
-!IF  "$(CFG)" == "SoftDrv - Win32 Release"\r
-\r
-!ELSEIF  "$(CFG)" == "SoftDrv - Win32 Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ENDIF \r
-\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\..\..\MSDev60\lib\Libcmtd.lib\r
-\r
-!IF  "$(CFG)" == "SoftDrv - Win32 Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "SoftDrv - Win32 Debug"\r
-\r
-!ENDIF \r
-\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\..\..\MSDev60\lib\Oldnames.lib\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\..\..\MSDev60\lib\Shell32.lib\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\..\..\MSDev60\lib\User32.lib\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\..\..\MSDev60\lib\Uuid.lib\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\..\..\MSDev60\lib\Advapi32.lib\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\..\..\MSDev60\lib\Winmm.lib\r
-# End Source File\r
-# End Group\r
-# End Target\r
-# End Project\r

diff --git a/G3D/Engine/Drivers/SoftDrv/SoftDrv.mak b/G3D/Engine/Drivers/SoftDrv/SoftDrv.mak
deleted file mode 100644 (file)
index f706f17..0000000
--- a/G3D/Engine/Drivers/SoftDrv/SoftDrv.mak
+++ /dev/null
@@ -1,319 +0,0 @@
-# Microsoft Developer Studio Generated NMAKE File, Based on SoftDrv.dsp\r
-!IF "$(CFG)" == ""\r
-CFG=SoftDrv - Win32 Debug\r
-!MESSAGE No configuration specified. Defaulting to SoftDrv - Win32 Debug.\r
-!ENDIF \r
-\r
-!IF "$(CFG)" != "SoftDrv - Win32 Release" && "$(CFG)" != "SoftDrv - Win32 Debug"\r
-!MESSAGE Invalid configuration "$(CFG)" specified.\r
-!MESSAGE You can specify a configuration when running NMAKE\r
-!MESSAGE by defining the macro CFG on the command line. For example:\r
-!MESSAGE \r
-!MESSAGE NMAKE /f "SoftDrv.mak" CFG="SoftDrv - Win32 Debug"\r
-!MESSAGE \r
-!MESSAGE Possible choices for configuration are:\r
-!MESSAGE \r
-!MESSAGE "SoftDrv - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")\r
-!MESSAGE "SoftDrv - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")\r
-!MESSAGE \r
-!ERROR An invalid configuration is specified.\r
-!ENDIF \r
-\r
-!IF "$(OS)" == "Windows_NT"\r
-NULL=\r
-!ELSE \r
-NULL=nul\r
-!ENDIF \r
-\r
-CPP=cl.exe\r
-MTL=midl.exe\r
-RSC=rc.exe\r
-\r
-!IF  "$(CFG)" == "SoftDrv - Win32 Release"\r
-\r
-OUTDIR=.\Release\r
-INTDIR=.\Release\r
-# Begin Custom Macros\r
-OutDir=.\Release\r
-# End Custom Macros\r
-\r
-ALL : "$(OUTDIR)\SoftDrv.dll"\r
-\r
-\r
-CLEAN :\r
-       -@erase "$(INTDIR)\dmodes.obj"\r
-       -@erase "$(INTDIR)\drawspan.obj"\r
-       -@erase "$(INTDIR)\register.obj"\r
-       -@erase "$(INTDIR)\render.obj"\r
-       -@erase "$(INTDIR)\scene.obj"\r
-       -@erase "$(INTDIR)\softdrv.obj"\r
-       -@erase "$(INTDIR)\span.obj"\r
-       -@erase "$(INTDIR)\system.obj"\r
-       -@erase "$(INTDIR)\vc60.idb"\r
-       -@erase "$(INTDIR)\Vec3d.obj"\r
-       -@erase "$(INTDIR)\W32sal.obj"\r
-       -@erase "$(INTDIR)\x86span555.obj"\r
-       -@erase "$(INTDIR)\x86span565.obj"\r
-       -@erase "$(INTDIR)\Xform3d.obj"\r
-       -@erase "$(OUTDIR)\SoftDrv.dll"\r
-       -@erase "$(OUTDIR)\SoftDrv.exp"\r
-       -@erase "$(OUTDIR)\SoftDrv.lib"\r
-\r
-"$(OUTDIR)" :\r
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"\r
-\r
-CPP_PROJ=/nologo /MT /W3 /GX /O2 /X /I "..\..\.." /I "..\..\..\Support" /I "..\\" /I "..\..\..\Math" /I "..\..\..\Bitmap" /I "..\..\..\..\MsDev60\Include" /I "..\..\..\..\Sdk\Dx6SDK\Include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "SOFTDRV_EXPORTS" /Fp"$(INTDIR)\SoftDrv.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c \r
-MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32 \r
-BSC32=bscmake.exe\r
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\SoftDrv.bsc" \r
-BSC32_SBRS= \\r
-       \r
-LINK32=link.exe\r
-LINK32_FLAGS=/nologo /dll /incremental:no /pdb:"$(OUTDIR)\SoftDrv.pdb" /machine:I386 /nodefaultlib /out:"$(OUTDIR)\SoftDrv.dll" /implib:"$(OUTDIR)\SoftDrv.lib" \r
-LINK32_OBJS= \\r
-       "$(INTDIR)\dmodes.obj" \\r
-       "$(INTDIR)\drawspan.obj" \\r
-       "$(INTDIR)\register.obj" \\r
-       "$(INTDIR)\render.obj" \\r
-       "$(INTDIR)\scene.obj" \\r
-       "$(INTDIR)\softdrv.obj" \\r
-       "$(INTDIR)\span.obj" \\r
-       "$(INTDIR)\system.obj" \\r
-       "$(INTDIR)\Vec3d.obj" \\r
-       "$(INTDIR)\W32sal.obj" \\r
-       "$(INTDIR)\x86span555.obj" \\r
-       "$(INTDIR)\x86span565.obj" \\r
-       "$(INTDIR)\Xform3d.obj" \\r
-       "..\..\..\..\MSDev60\lib\Winspool.lib" \\r
-       "..\..\..\..\MSDev60\lib\Comdlg32.lib" \\r
-       "..\..\..\..\MSDev60\lib\Gdi32.lib" \\r
-       "..\..\..\..\MSDev60\lib\Kernel32.lib" \\r
-       "..\..\..\..\MSDev60\lib\Libcmt.lib" \\r
-       "..\..\..\..\MSDev60\lib\Oldnames.lib" \\r
-       "..\..\..\..\MSDev60\lib\Shell32.lib" \\r
-       "..\..\..\..\MSDev60\lib\User32.lib" \\r
-       "..\..\..\..\MSDev60\lib\Uuid.lib" \\r
-       "..\..\..\..\MSDev60\lib\Advapi32.lib" \\r
-       "..\..\..\..\MSDev60\lib\Winmm.lib" \\r
-       ".\amdspan.obj"\r
-\r
-"$(OUTDIR)\SoftDrv.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)\r
-    $(LINK32) @<<\r
-  $(LINK32_FLAGS) $(LINK32_OBJS)\r
-<<\r
-\r
-!ELSEIF  "$(CFG)" == "SoftDrv - Win32 Debug"\r
-\r
-OUTDIR=.\Debug\r
-INTDIR=.\Debug\r
-# Begin Custom Macros\r
-OutDir=.\Debug\r
-# End Custom Macros\r
-\r
-ALL : "$(OUTDIR)\SoftDrv.dll"\r
-\r
-\r
-CLEAN :\r
-       -@erase "$(INTDIR)\dmodes.obj"\r
-       -@erase "$(INTDIR)\drawspan.obj"\r
-       -@erase "$(INTDIR)\register.obj"\r
-       -@erase "$(INTDIR)\render.obj"\r
-       -@erase "$(INTDIR)\scene.obj"\r
-       -@erase "$(INTDIR)\softdrv.obj"\r
-       -@erase "$(INTDIR)\span.obj"\r
-       -@erase "$(INTDIR)\system.obj"\r
-       -@erase "$(INTDIR)\vc60.idb"\r
-       -@erase "$(INTDIR)\vc60.pdb"\r
-       -@erase "$(INTDIR)\Vec3d.obj"\r
-       -@erase "$(INTDIR)\W32sal.obj"\r
-       -@erase "$(INTDIR)\x86span555.obj"\r
-       -@erase "$(INTDIR)\x86span565.obj"\r
-       -@erase "$(INTDIR)\Xform3d.obj"\r
-       -@erase "$(OUTDIR)\SoftDrv.dll"\r
-       -@erase "$(OUTDIR)\SoftDrv.exp"\r
-       -@erase "$(OUTDIR)\SoftDrv.ilk"\r
-       -@erase "$(OUTDIR)\SoftDrv.lib"\r
-       -@erase "$(OUTDIR)\SoftDrv.pdb"\r
-\r
-"$(OUTDIR)" :\r
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"\r
-\r
-CPP_PROJ=/nologo /MTd /W3 /Gm /GX /ZI /Od /X /I "..\..\.." /I "..\..\..\Support" /I "..\\" /I "..\..\..\Math" /I "..\..\..\Bitmap" /I "..\..\..\..\MsDev60\Include" /I "..\..\..\..\Sdk\Dx6SDK\Include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "SOFTDRV_EXPORTS" /Fp"$(INTDIR)\SoftDrv.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c \r
-MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 \r
-BSC32=bscmake.exe\r
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\SoftDrv.bsc" \r
-BSC32_SBRS= \\r
-       \r
-LINK32=link.exe\r
-LINK32_FLAGS=/nologo /dll /incremental:yes /pdb:"$(OUTDIR)\SoftDrv.pdb" /debug /machine:I386 /nodefaultlib /out:"$(OUTDIR)\SoftDrv.dll" /implib:"$(OUTDIR)\SoftDrv.lib" /pdbtype:sept \r
-LINK32_OBJS= \\r
-       "$(INTDIR)\dmodes.obj" \\r
-       "$(INTDIR)\drawspan.obj" \\r
-       "$(INTDIR)\register.obj" \\r
-       "$(INTDIR)\render.obj" \\r
-       "$(INTDIR)\scene.obj" \\r
-       "$(INTDIR)\softdrv.obj" \\r
-       "$(INTDIR)\span.obj" \\r
-       "$(INTDIR)\system.obj" \\r
-       "$(INTDIR)\Vec3d.obj" \\r
-       "$(INTDIR)\W32sal.obj" \\r
-       "$(INTDIR)\x86span555.obj" \\r
-       "$(INTDIR)\x86span565.obj" \\r
-       "$(INTDIR)\Xform3d.obj" \\r
-       "..\..\..\..\MSDev60\lib\Winspool.lib" \\r
-       "..\..\..\..\MSDev60\lib\Comdlg32.lib" \\r
-       "..\..\..\..\MSDev60\lib\Gdi32.lib" \\r
-       "..\..\..\..\MSDev60\lib\Kernel32.lib" \\r
-       "..\..\..\..\MSDev60\lib\Libcmtd.lib" \\r
-       "..\..\..\..\MSDev60\lib\Oldnames.lib" \\r
-       "..\..\..\..\MSDev60\lib\Shell32.lib" \\r
-       "..\..\..\..\MSDev60\lib\User32.lib" \\r
-       "..\..\..\..\MSDev60\lib\Uuid.lib" \\r
-       "..\..\..\..\MSDev60\lib\Advapi32.lib" \\r
-       "..\..\..\..\MSDev60\lib\Winmm.lib" \\r
-       ".\amdspan.obj"\r
-\r
-"$(OUTDIR)\SoftDrv.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)\r
-    $(LINK32) @<<\r
-  $(LINK32_FLAGS) $(LINK32_OBJS)\r
-<<\r
-\r
-!ENDIF \r
-\r
-.c{$(INTDIR)}.obj::\r
-   $(CPP) @<<\r
-   $(CPP_PROJ) $< \r
-<<\r
-\r
-.cpp{$(INTDIR)}.obj::\r
-   $(CPP) @<<\r
-   $(CPP_PROJ) $< \r
-<<\r
-\r
-.cxx{$(INTDIR)}.obj::\r
-   $(CPP) @<<\r
-   $(CPP_PROJ) $< \r
-<<\r
-\r
-.c{$(INTDIR)}.sbr::\r
-   $(CPP) @<<\r
-   $(CPP_PROJ) $< \r
-<<\r
-\r
-.cpp{$(INTDIR)}.sbr::\r
-   $(CPP) @<<\r
-   $(CPP_PROJ) $< \r
-<<\r
-\r
-.cxx{$(INTDIR)}.sbr::\r
-   $(CPP) @<<\r
-   $(CPP_PROJ) $< \r
-<<\r
-\r
-\r
-!IF "$(NO_EXTERNAL_DEPS)" != "1"\r
-!IF EXISTS("SoftDrv.dep")\r
-!INCLUDE "SoftDrv.dep"\r
-!ELSE \r
-!MESSAGE Warning: cannot find "SoftDrv.dep"\r
-!ENDIF \r
-!ENDIF \r
-\r
-\r
-!IF "$(CFG)" == "SoftDrv - Win32 Release" || "$(CFG)" == "SoftDrv - Win32 Debug"\r
-SOURCE=.\amdspan.asm\r
-\r
-!IF  "$(CFG)" == "SoftDrv - Win32 Release"\r
-\r
-InputPath=.\amdspan.asm\r
-\r
-".\amdspan.obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
-       <<tempfile.bat \r
-       @echo off \r
-       ..\..\..\..\masm\bin\ml -c -I ..\..\..\..\masm\include -coff amdspan.asm\r
-<< \r
-       \r
-\r
-!ELSEIF  "$(CFG)" == "SoftDrv - Win32 Debug"\r
-\r
-InputPath=.\amdspan.asm\r
-\r
-".\amdspan.obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
-       <<tempfile.bat \r
-       @echo off \r
-       ..\..\..\..\masm\bin\ml -c -I ..\..\..\..\masm\include -coff amdspan.asm\r
-<< \r
-       \r
-\r
-!ENDIF \r
-\r
-SOURCE=.\dmodes.c\r
-\r
-"$(INTDIR)\dmodes.obj" : $(SOURCE) "$(INTDIR)"\r
-\r
-\r
-SOURCE=.\drawspan.c\r
-\r
-"$(INTDIR)\drawspan.obj" : $(SOURCE) "$(INTDIR)"\r
-\r
-\r
-SOURCE=.\register.c\r
-\r
-"$(INTDIR)\register.obj" : $(SOURCE) "$(INTDIR)"\r
-\r
-\r
-SOURCE=.\render.c\r
-\r
-"$(INTDIR)\render.obj" : $(SOURCE) "$(INTDIR)"\r
-\r
-\r
-SOURCE=.\scene.c\r
-\r
-"$(INTDIR)\scene.obj" : $(SOURCE) "$(INTDIR)"\r
-\r
-\r
-SOURCE=.\softdrv.c\r
-\r
-"$(INTDIR)\softdrv.obj" : $(SOURCE) "$(INTDIR)"\r
-\r
-\r
-SOURCE=.\span.c\r
-\r
-"$(INTDIR)\span.obj" : $(SOURCE) "$(INTDIR)"\r
-\r
-\r
-SOURCE=.\system.c\r
-\r
-"$(INTDIR)\system.obj" : $(SOURCE) "$(INTDIR)"\r
-\r
-\r
-SOURCE=..\..\..\Math\Vec3d.c\r
-\r
-"$(INTDIR)\Vec3d.obj" : $(SOURCE) "$(INTDIR)"\r
-       $(CPP) $(CPP_PROJ) $(SOURCE)\r
-\r
-\r
-SOURCE=.\W32sal.cpp\r
-\r
-"$(INTDIR)\W32sal.obj" : $(SOURCE) "$(INTDIR)"\r
-\r
-\r
-SOURCE=.\x86span555.c\r
-\r
-"$(INTDIR)\x86span555.obj" : $(SOURCE) "$(INTDIR)"\r
-\r
-\r
-SOURCE=.\x86span565.c\r
-\r
-"$(INTDIR)\x86span565.obj" : $(SOURCE) "$(INTDIR)"\r
-\r
-\r
-SOURCE=..\..\..\Math\Xform3d.c\r
-\r
-"$(INTDIR)\Xform3d.obj" : $(SOURCE) "$(INTDIR)"\r
-       $(CPP) $(CPP_PROJ) $(SOURCE)\r
-\r
-\r
-\r
-!ENDIF \r
-\r

diff --git a/G3D/Engine/Drivers/SoftDrv/mssccprj.scc b/G3D/Engine/Drivers/SoftDrv/mssccprj.scc
deleted file mode 100644 (file)
index 44c8175..0000000
--- a/G3D/Engine/Drivers/SoftDrv/mssccprj.scc
+++ /dev/null
@@ -1,4 +0,0 @@
-SCC = This is a Source Code Control file\r
-\r
-[SoftDrv.mak]\r
-SCC_Project_Name = "$/Genesis10/Source/Engine/Drivers/SoftDrv", JSQBAAAA\r

diff --git a/G3D/Engine/Drivers/SoftDrv2/SoftDrv2.dsp b/G3D/Engine/Drivers/SoftDrv2/SoftDrv2.dsp
deleted file mode 100644 (file)
index bb3d37f..0000000
--- a/G3D/Engine/Drivers/SoftDrv2/SoftDrv2.dsp
+++ /dev/null
@@ -1,297 +0,0 @@
-# Microsoft Developer Studio Project File - Name="SoftDrv2" - Package Owner=<4>\r
-# Microsoft Developer Studio Generated Build File, Format Version 6.00\r
-# ** DO NOT EDIT **\r
-\r
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102\r
-\r
-CFG=SoftDrv2 - Win32 Debug\r
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,\r
-!MESSAGE use the Export Makefile command and run\r
-!MESSAGE \r
-!MESSAGE NMAKE /f "SoftDrv2.mak".\r
-!MESSAGE \r
-!MESSAGE You can specify a configuration when running NMAKE\r
-!MESSAGE by defining the macro CFG on the command line. For example:\r
-!MESSAGE \r
-!MESSAGE NMAKE /f "SoftDrv2.mak" CFG="SoftDrv2 - Win32 Debug"\r
-!MESSAGE \r
-!MESSAGE Possible choices for configuration are:\r
-!MESSAGE \r
-!MESSAGE "SoftDrv2 - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")\r
-!MESSAGE "SoftDrv2 - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")\r
-!MESSAGE \r
-\r
-# Begin Project\r
-# PROP AllowPerConfigDependencies 0\r
-# PROP Scc_ProjName ""$/Genesis10/Source/Engine/Drivers/SoftDrv2", QADCAAAA"\r
-# PROP Scc_LocalPath "."\r
-CPP=cl.exe\r
-MTL=midl.exe\r
-RSC=rc.exe\r
-\r
-!IF  "$(CFG)" == "SoftDrv2 - Win32 Release"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 0\r
-# PROP BASE Output_Dir "Release"\r
-# PROP BASE Intermediate_Dir "Release"\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 0\r
-# PROP Output_Dir "Release"\r
-# PROP Intermediate_Dir "Release"\r
-# PROP Ignore_Export_Lib 0\r
-# PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "SOFTDRV2_EXPORTS" /YX /FD /c\r
-# ADD CPP /nologo /MT /W3 /GX /O2 /X /I "..\\" /I "..\..\..\\" /I "..\..\..\support" /I "..\..\..\math" /I "..\..\..\bitmap" /I "..\..\..\..\msdev60\include" /I "..\..\..\..\sdk\dx6sdk\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "SOFTDRV2_EXPORTS" /YX /FD /c\r
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32\r
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32\r
-# ADD BASE RSC /l 0x409 /d "NDEBUG"\r
-# ADD RSC /l 0x409 /x /d "NDEBUG"\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo\r
-LINK32=link.exe\r
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386\r
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /dll /machine:I386 /nodefaultlib /out:".\Release\Softdrv.dll"\r
-\r
-!ELSEIF  "$(CFG)" == "SoftDrv2 - Win32 Debug"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 1\r
-# PROP BASE Output_Dir "Debug"\r
-# PROP BASE Intermediate_Dir "Debug"\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 1\r
-# PROP Output_Dir ""\r
-# PROP Intermediate_Dir "Debug"\r
-# PROP Ignore_Export_Lib 0\r
-# PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "SOFTDRV2_EXPORTS" /YX /FD /GZ /c\r
-# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /X /I "..\\" /I "..\..\..\\" /I "..\..\..\support" /I "..\..\..\math" /I "..\..\..\bitmap" /I "..\..\..\..\msdev60\include" /I "..\..\..\..\sdk\dx6sdk\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "SOFTDRV2_EXPORTS" /YX /FD /GZ /c\r
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32\r
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32\r
-# ADD BASE RSC /l 0x409 /d "_DEBUG"\r
-# ADD RSC /l 0x409 /x /d "_DEBUG"\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo\r
-LINK32=link.exe\r
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept\r
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /dll /debug /machine:I386 /nodefaultlib /out:".\Debug\Softdrv.dll" /pdbtype:sept\r
-\r
-!ENDIF \r
-\r
-# Begin Target\r
-\r
-# Name "SoftDrv2 - Win32 Release"\r
-# Name "SoftDrv2 - Win32 Debug"\r
-# Begin Group "Source Files"\r
-\r
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"\r
-# Begin Source File\r
-\r
-SOURCE=.\CPUInfo.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\DDRAWDisplay.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\DIBDisplay.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\display.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\DisplayModeInfo.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\DrawDecal.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\..\Support\Ram.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\softdrv.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\span.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\SpanBuffer.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\SWTHandle.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\TRaster.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\Triangle.c\r
-# End Source File\r
-# End Group\r
-# Begin Group "Header Files"\r
-\r
-# PROP Default_Filter "h;hpp;hxx;hm;inl"\r
-# Begin Source File\r
-\r
-SOURCE=.\CPUInfo.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\DDRAWDisplay.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\DIBDisplay.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\display.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\DisplayModeInfo.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\DrawDecal.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\..\Support\Ram.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\rop.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\Softdrv.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\Span.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\Span_AffineLoop.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\Span_Factory.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\SpanBuffer.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\SpanEdges_Factory.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\SWTHandle.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\traster.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\triangle.h\r
-# End Source File\r
-# End Group\r
-# Begin Group "Libraries"\r
-\r
-# PROP Default_Filter ""\r
-# Begin Source File\r
-\r
-SOURCE=..\..\..\..\MSDev60\lib\Winmm.lib\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\..\..\MSDev60\lib\Comdlg32.lib\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\..\..\MSDev60\lib\Gdi32.lib\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\..\..\MSDev60\lib\Kernel32.lib\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\..\..\MSDev60\lib\Libcmt.lib\r
-\r
-!IF  "$(CFG)" == "SoftDrv2 - Win32 Release"\r
-\r
-!ELSEIF  "$(CFG)" == "SoftDrv2 - Win32 Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ENDIF \r
-\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\..\..\MSDev60\lib\Libcmtd.lib\r
-\r
-!IF  "$(CFG)" == "SoftDrv2 - Win32 Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "SoftDrv2 - Win32 Debug"\r
-\r
-!ENDIF \r
-\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\..\..\MSDev60\lib\Oldnames.lib\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\..\..\MSDev60\lib\Shell32.lib\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\..\..\MSDev60\lib\User32.lib\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\..\..\MSDev60\lib\Uuid.lib\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\..\..\MSDev60\lib\Advapi32.lib\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\..\..\MSDev60\lib\Winspool.lib\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\..\..\Sdk\Dx6sdk\Lib\dxguid.lib\r
-# End Source File\r
-# End Group\r
-# Begin Source File\r
-\r
-SOURCE=.\SoftDrv2.mak\r
-# End Source File\r
-# End Target\r
-# End Project\r

diff --git a/G3D/Engine/Drivers/SoftDrv2/SoftDrv2.mak b/G3D/Engine/Drivers/SoftDrv2/SoftDrv2.mak
deleted file mode 100644 (file)
index 6de566c..0000000
--- a/G3D/Engine/Drivers/SoftDrv2/SoftDrv2.mak
+++ /dev/null
@@ -1,292 +0,0 @@
-# Microsoft Developer Studio Generated NMAKE File, Based on SoftDrv2.dsp\r
-!IF "$(CFG)" == ""\r
-CFG=SoftDrv2 - Win32 Debug\r
-!MESSAGE No configuration specified. Defaulting to SoftDrv2 - Win32 Debug.\r
-!ENDIF \r
-\r
-!IF "$(CFG)" != "SoftDrv2 - Win32 Release" && "$(CFG)" != "SoftDrv2 - Win32 Debug"\r
-!MESSAGE Invalid configuration "$(CFG)" specified.\r
-!MESSAGE You can specify a configuration when running NMAKE\r
-!MESSAGE by defining the macro CFG on the command line. For example:\r
-!MESSAGE \r
-!MESSAGE NMAKE /f "SoftDrv2.mak" CFG="SoftDrv2 - Win32 Debug"\r
-!MESSAGE \r
-!MESSAGE Possible choices for configuration are:\r
-!MESSAGE \r
-!MESSAGE "SoftDrv2 - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")\r
-!MESSAGE "SoftDrv2 - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")\r
-!MESSAGE \r
-!ERROR An invalid configuration is specified.\r
-!ENDIF \r
-\r
-!IF "$(OS)" == "Windows_NT"\r
-NULL=\r
-!ELSE \r
-NULL=nul\r
-!ENDIF \r
-\r
-CPP=cl.exe\r
-MTL=midl.exe\r
-RSC=rc.exe\r
-\r
-!IF  "$(CFG)" == "SoftDrv2 - Win32 Release"\r
-\r
-OUTDIR=.\Release\r
-INTDIR=.\Release\r
-# Begin Custom Macros\r
-OutDir=.\Release\r
-# End Custom Macros\r
-\r
-ALL : "$(OUTDIR)\Softdrv.dll"\r
-\r
-\r
-CLEAN :\r
-       -@erase "$(INTDIR)\CPUInfo.obj"\r
-       -@erase "$(INTDIR)\DDRAWDisplay.obj"\r
-       -@erase "$(INTDIR)\DIBDisplay.obj"\r
-       -@erase "$(INTDIR)\display.obj"\r
-       -@erase "$(INTDIR)\DisplayModeInfo.obj"\r
-       -@erase "$(INTDIR)\DrawDecal.obj"\r
-       -@erase "$(INTDIR)\Ram.obj"\r
-       -@erase "$(INTDIR)\softdrv.obj"\r
-       -@erase "$(INTDIR)\span.obj"\r
-       -@erase "$(INTDIR)\SpanBuffer.obj"\r
-       -@erase "$(INTDIR)\SWTHandle.obj"\r
-       -@erase "$(INTDIR)\TRaster.obj"\r
-       -@erase "$(INTDIR)\Triangle.obj"\r
-       -@erase "$(INTDIR)\vc60.idb"\r
-       -@erase "$(OUTDIR)\Softdrv.dll"\r
-       -@erase "$(OUTDIR)\Softdrv.exp"\r
-       -@erase "$(OUTDIR)\Softdrv.lib"\r
-\r
-"$(OUTDIR)" :\r
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"\r
-\r
-CPP_PROJ=/nologo /MT /W3 /GX /O2 /X /I "..\\" /I "..\..\..\\" /I "..\..\..\support" /I "..\..\..\math" /I "..\..\..\bitmap" /I "..\..\..\..\msdev60\include" /I "..\..\..\..\sdk\dx6sdk\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "SOFTDRV2_EXPORTS" /Fp"$(INTDIR)\SoftDrv2.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c \r
-MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32 \r
-BSC32=bscmake.exe\r
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\SoftDrv2.bsc" \r
-BSC32_SBRS= \\r
-       \r
-LINK32=link.exe\r
-LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /dll /incremental:no /pdb:"$(OUTDIR)\Softdrv.pdb" /machine:I386 /nodefaultlib /out:"$(OUTDIR)\Softdrv.dll" /implib:"$(OUTDIR)\Softdrv.lib" \r
-LINK32_OBJS= \\r
-       "$(INTDIR)\CPUInfo.obj" \\r
-       "$(INTDIR)\DDRAWDisplay.obj" \\r
-       "$(INTDIR)\DIBDisplay.obj" \\r
-       "$(INTDIR)\display.obj" \\r
-       "$(INTDIR)\DisplayModeInfo.obj" \\r
-       "$(INTDIR)\DrawDecal.obj" \\r
-       "$(INTDIR)\Ram.obj" \\r
-       "$(INTDIR)\softdrv.obj" \\r
-       "$(INTDIR)\span.obj" \\r
-       "$(INTDIR)\SpanBuffer.obj" \\r
-       "$(INTDIR)\SWTHandle.obj" \\r
-       "$(INTDIR)\TRaster.obj" \\r
-       "$(INTDIR)\Triangle.obj" \\r
-       "..\..\..\..\MSDev60\lib\Winmm.lib" \\r
-       "..\..\..\..\MSDev60\lib\Comdlg32.lib" \\r
-       "..\..\..\..\MSDev60\lib\Gdi32.lib" \\r
-       "..\..\..\..\MSDev60\lib\Kernel32.lib" \\r
-       "..\..\..\..\MSDev60\lib\Libcmt.lib" \\r
-       "..\..\..\..\MSDev60\lib\Oldnames.lib" \\r
-       "..\..\..\..\MSDev60\lib\Shell32.lib" \\r
-       "..\..\..\..\MSDev60\lib\User32.lib" \\r
-       "..\..\..\..\MSDev60\lib\Uuid.lib" \\r
-       "..\..\..\..\MSDev60\lib\Advapi32.lib" \\r
-       "..\..\..\..\MSDev60\lib\Winspool.lib" \\r
-       "..\..\..\..\Sdk\Dx6sdk\Lib\dxguid.lib"\r
-\r
-"$(OUTDIR)\Softdrv.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)\r
-    $(LINK32) @<<\r
-  $(LINK32_FLAGS) $(LINK32_OBJS)\r
-<<\r
-\r
-!ELSEIF  "$(CFG)" == "SoftDrv2 - Win32 Debug"\r
-\r
-OUTDIR=.\r
-INTDIR=.\Debug\r
-# Begin Custom Macros\r
-OutDir=.\r
-# End Custom Macros\r
-\r
-ALL : "$(OUTDIR)\Debug\Softdrv.dll"\r
-\r
-\r
-CLEAN :\r
-       -@erase "$(INTDIR)\CPUInfo.obj"\r
-       -@erase "$(INTDIR)\DDRAWDisplay.obj"\r
-       -@erase "$(INTDIR)\DIBDisplay.obj"\r
-       -@erase "$(INTDIR)\display.obj"\r
-       -@erase "$(INTDIR)\DisplayModeInfo.obj"\r
-       -@erase "$(INTDIR)\DrawDecal.obj"\r
-       -@erase "$(INTDIR)\Ram.obj"\r
-       -@erase "$(INTDIR)\softdrv.obj"\r
-       -@erase "$(INTDIR)\span.obj"\r
-       -@erase "$(INTDIR)\SpanBuffer.obj"\r
-       -@erase "$(INTDIR)\SWTHandle.obj"\r
-       -@erase "$(INTDIR)\TRaster.obj"\r
-       -@erase "$(INTDIR)\Triangle.obj"\r
-       -@erase "$(INTDIR)\vc60.idb"\r
-       -@erase "$(INTDIR)\vc60.pdb"\r
-       -@erase "$(OUTDIR)\Debug\Softdrv.dll"\r
-       -@erase "$(OUTDIR)\Debug\Softdrv.ilk"\r
-       -@erase "$(OUTDIR)\Softdrv.exp"\r
-       -@erase "$(OUTDIR)\Softdrv.lib"\r
-       -@erase "$(OUTDIR)\Softdrv.pdb"\r
-\r
-"$(INTDIR)" :\r
-    if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"\r
-\r
-CPP_PROJ=/nologo /MTd /W3 /Gm /GX /ZI /Od /X /I "..\\" /I "..\..\..\\" /I "..\..\..\support" /I "..\..\..\math" /I "..\..\..\bitmap" /I "..\..\..\..\msdev60\include" /I "..\..\..\..\sdk\dx6sdk\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "SOFTDRV2_EXPORTS" /Fp"$(INTDIR)\SoftDrv2.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c \r
-MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 \r
-BSC32=bscmake.exe\r
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\SoftDrv2.bsc" \r
-BSC32_SBRS= \\r
-       \r
-LINK32=link.exe\r
-LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /dll /incremental:yes /pdb:"$(OUTDIR)\Softdrv.pdb" /debug /machine:I386 /nodefaultlib /out:"$(OUTDIR)\Debug\Softdrv.dll" /implib:"$(OUTDIR)\Softdrv.lib" /pdbtype:sept \r
-LINK32_OBJS= \\r
-       "$(INTDIR)\CPUInfo.obj" \\r
-       "$(INTDIR)\DDRAWDisplay.obj" \\r
-       "$(INTDIR)\DIBDisplay.obj" \\r
-       "$(INTDIR)\display.obj" \\r
-       "$(INTDIR)\DisplayModeInfo.obj" \\r
-       "$(INTDIR)\DrawDecal.obj" \\r
-       "$(INTDIR)\Ram.obj" \\r
-       "$(INTDIR)\softdrv.obj" \\r
-       "$(INTDIR)\span.obj" \\r
-       "$(INTDIR)\SpanBuffer.obj" \\r
-       "$(INTDIR)\SWTHandle.obj" \\r
-       "$(INTDIR)\TRaster.obj" \\r
-       "$(INTDIR)\Triangle.obj" \\r
-       "..\..\..\..\MSDev60\lib\Winmm.lib" \\r
-       "..\..\..\..\MSDev60\lib\Comdlg32.lib" \\r
-       "..\..\..\..\MSDev60\lib\Gdi32.lib" \\r
-       "..\..\..\..\MSDev60\lib\Kernel32.lib" \\r
-       "..\..\..\..\MSDev60\lib\Libcmtd.lib" \\r
-       "..\..\..\..\MSDev60\lib\Oldnames.lib" \\r
-       "..\..\..\..\MSDev60\lib\Shell32.lib" \\r
-       "..\..\..\..\MSDev60\lib\User32.lib" \\r
-       "..\..\..\..\MSDev60\lib\Uuid.lib" \\r
-       "..\..\..\..\MSDev60\lib\Advapi32.lib" \\r
-       "..\..\..\..\MSDev60\lib\Winspool.lib" \\r
-       "..\..\..\..\Sdk\Dx6sdk\Lib\dxguid.lib"\r
-\r
-"$(OUTDIR)\Debug\Softdrv.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)\r
-    $(LINK32) @<<\r
-  $(LINK32_FLAGS) $(LINK32_OBJS)\r
-<<\r
-\r
-!ENDIF \r
-\r
-.c{$(INTDIR)}.obj::\r
-   $(CPP) @<<\r
-   $(CPP_PROJ) $< \r
-<<\r
-\r
-.cpp{$(INTDIR)}.obj::\r
-   $(CPP) @<<\r
-   $(CPP_PROJ) $< \r
-<<\r
-\r
-.cxx{$(INTDIR)}.obj::\r
-   $(CPP) @<<\r
-   $(CPP_PROJ) $< \r
-<<\r
-\r
-.c{$(INTDIR)}.sbr::\r
-   $(CPP) @<<\r
-   $(CPP_PROJ) $< \r
-<<\r
-\r
-.cpp{$(INTDIR)}.sbr::\r
-   $(CPP) @<<\r
-   $(CPP_PROJ) $< \r
-<<\r
-\r
-.cxx{$(INTDIR)}.sbr::\r
-   $(CPP) @<<\r
-   $(CPP_PROJ) $< \r
-<<\r
-\r
-\r
-!IF "$(NO_EXTERNAL_DEPS)" != "1"\r
-!IF EXISTS("SoftDrv2.dep")\r
-!INCLUDE "SoftDrv2.dep"\r
-!ELSE \r
-!MESSAGE Warning: cannot find "SoftDrv2.dep"\r
-!ENDIF \r
-!ENDIF \r
-\r
-\r
-!IF "$(CFG)" == "SoftDrv2 - Win32 Release" || "$(CFG)" == "SoftDrv2 - Win32 Debug"\r
-SOURCE=.\CPUInfo.c\r
-\r
-"$(INTDIR)\CPUInfo.obj" : $(SOURCE) "$(INTDIR)"\r
-\r
-\r
-SOURCE=.\DDRAWDisplay.c\r
-\r
-"$(INTDIR)\DDRAWDisplay.obj" : $(SOURCE) "$(INTDIR)"\r
-\r
-\r
-SOURCE=.\DIBDisplay.c\r
-\r
-"$(INTDIR)\DIBDisplay.obj" : $(SOURCE) "$(INTDIR)"\r
-\r
-\r
-SOURCE=.\display.c\r
-\r
-"$(INTDIR)\display.obj" : $(SOURCE) "$(INTDIR)"\r
-\r
-\r
-SOURCE=.\DisplayModeInfo.c\r
-\r
-"$(INTDIR)\DisplayModeInfo.obj" : $(SOURCE) "$(INTDIR)"\r
-\r
-\r
-SOURCE=.\DrawDecal.c\r
-\r
-"$(INTDIR)\DrawDecal.obj" : $(SOURCE) "$(INTDIR)"\r
-\r
-\r
-SOURCE=..\..\..\Support\Ram.c\r
-\r
-"$(INTDIR)\Ram.obj" : $(SOURCE) "$(INTDIR)"\r
-       $(CPP) $(CPP_PROJ) $(SOURCE)\r
-\r
-\r
-SOURCE=.\softdrv.c\r
-\r
-"$(INTDIR)\softdrv.obj" : $(SOURCE) "$(INTDIR)"\r
-\r
-\r
-SOURCE=.\span.c\r
-\r
-"$(INTDIR)\span.obj" : $(SOURCE) "$(INTDIR)"\r
-\r
-\r
-SOURCE=.\SpanBuffer.c\r
-\r
-"$(INTDIR)\SpanBuffer.obj" : $(SOURCE) "$(INTDIR)"\r
-\r
-\r
-SOURCE=.\SWTHandle.c\r
-\r
-"$(INTDIR)\SWTHandle.obj" : $(SOURCE) "$(INTDIR)"\r
-\r
-\r
-SOURCE=.\TRaster.c\r
-\r
-"$(INTDIR)\TRaster.obj" : $(SOURCE) "$(INTDIR)"\r
-\r
-\r
-SOURCE=.\Triangle.c\r
-\r
-"$(INTDIR)\Triangle.obj" : $(SOURCE) "$(INTDIR)"\r
-\r
-\r
-\r
-!ENDIF \r
-\r

diff --git a/G3D/Engine/Drivers/SoftDrv2/mssccprj.scc b/G3D/Engine/Drivers/SoftDrv2/mssccprj.scc
deleted file mode 100644 (file)
index 39a8f66..0000000
--- a/G3D/Engine/Drivers/SoftDrv2/mssccprj.scc
+++ /dev/null
@@ -1,4 +0,0 @@
-SCC = This is a Source Code Control file\r
-\r
-[SoftDrv2.mak]\r
-SCC_Project_Name = "$/Genesis10/Source/Engine/Drivers/SoftDrv2", HBDCAAAA\r

diff --git a/G3D/Engine/Drivers/WireFrame/D3DDrv.dsp b/G3D/Engine/Drivers/WireFrame/D3DDrv.dsp
deleted file mode 100644 (file)
index 591621a..0000000
--- a/G3D/Engine/Drivers/WireFrame/D3DDrv.dsp
+++ /dev/null
@@ -1,207 +0,0 @@
-# Microsoft Developer Studio Project File - Name="D3DDrv" - Package Owner=<4>\r
-# Microsoft Developer Studio Generated Build File, Format Version 6.00\r
-# ** DO NOT EDIT **\r
-\r
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102\r
-\r
-CFG=D3DDrv - Win32 Debug\r
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,\r
-!MESSAGE use the Export Makefile command and run\r
-!MESSAGE \r
-!MESSAGE NMAKE /f "D3DDrv.mak".\r
-!MESSAGE \r
-!MESSAGE You can specify a configuration when running NMAKE\r
-!MESSAGE by defining the macro CFG on the command line. For example:\r
-!MESSAGE \r
-!MESSAGE NMAKE /f "D3DDrv.mak" CFG="D3DDrv - Win32 Debug"\r
-!MESSAGE \r
-!MESSAGE Possible choices for configuration are:\r
-!MESSAGE \r
-!MESSAGE "D3DDrv - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")\r
-!MESSAGE "D3DDrv - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")\r
-!MESSAGE \r
-\r
-# Begin Project\r
-# PROP AllowPerConfigDependencies 0\r
-# PROP Scc_ProjName ""$/Genesis10/Source/Engine/Drivers/D3DDrv", DVPBAAAA"\r
-# PROP Scc_LocalPath "."\r
-CPP=cl.exe\r
-MTL=midl.exe\r
-RSC=rc.exe\r
-\r
-!IF  "$(CFG)" == "D3DDrv - Win32 Release"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 0\r
-# PROP BASE Output_Dir "Release"\r
-# PROP BASE Intermediate_Dir "Release"\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 0\r
-# PROP Output_Dir "Release"\r
-# PROP Intermediate_Dir "Release"\r
-# PROP Ignore_Export_Lib 0\r
-# PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "D3DDRV_EXPORTS" /YX /FD /c\r
-# ADD CPP /nologo /G5 /MT /W3 /GX /Ox /Ot /Ow /Og /Oi /Op /Ob2 /I "..\..\.." /I "..\\" /I "..\D3DDrv" /I "..\..\..\Support" /I "..\..\..\Math" /I "..\..\..\Bitmap" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "D3DDRV_EXPORTS" /FD /c\r
-# SUBTRACT CPP /X /YX\r
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32\r
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32\r
-# ADD BASE RSC /l 0x409 /d "NDEBUG"\r
-# ADD RSC /l 0x409 /x /d "NDEBUG"\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo\r
-LINK32=link.exe\r
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386\r
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib winmm.lib vfw32.lib dxguid.lib ddraw.lib d3dim.lib /nologo /dll /machine:I386 /out:"Release/WireDrv.dll"\r
-# SUBTRACT LINK32 /nodefaultlib\r
-\r
-!ELSEIF  "$(CFG)" == "D3DDrv - Win32 Debug"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 1\r
-# PROP BASE Output_Dir "Debug"\r
-# PROP BASE Intermediate_Dir "Debug"\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 1\r
-# PROP Output_Dir "Debug"\r
-# PROP Intermediate_Dir "Debug"\r
-# PROP Ignore_Export_Lib 0\r
-# PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "D3DDRV_EXPORTS" /YX /FD /GZ /c\r
-# ADD CPP /nologo /G5 /MTd /W3 /GX /Zi /Od /I "..\..\.." /I "..\..\..\Math" /I "..\\" /I "..\D3DDrv" /I "..\..\..\Support" /I "..\..\..\Bitmap" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "D3DDRV_EXPORTS" /YX /FD /GZ /c\r
-# SUBTRACT CPP /X\r
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32\r
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32\r
-# ADD BASE RSC /l 0x409 /d "_DEBUG"\r
-# ADD RSC /l 0x409 /x /d "_DEBUG"\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo\r
-LINK32=link.exe\r
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept\r
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib winmm.lib vfw32.lib dxguid.lib ddraw.lib d3dim.lib /nologo /dll /debug /machine:I386 /out:"Debug/WireDrv.dll" /pdbtype:sept\r
-# SUBTRACT LINK32 /nodefaultlib\r
-\r
-!ENDIF \r
-\r
-# Begin Target\r
-\r
-# Name "D3DDrv - Win32 Release"\r
-# Name "D3DDrv - Win32 Debug"\r
-# Begin Group "Source Files"\r
-\r
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"\r
-# Begin Source File\r
-\r
-SOURCE=.\D3d_err.cpp\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\D3d_err.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\D3d_fx.cpp\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\D3d_fx.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\D3d_main.cpp\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\D3d_main.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\D3dcache.cpp\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\D3dcache.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\D3ddrv.cpp\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\D3ddrv.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\Dcommon.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\DDMemMgr.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\DDMemMgr.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\Gspan.cpp\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\Gspan.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\Pcache.cpp\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\Pcache.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\Render.cpp\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\Render.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\Scene.cpp\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\Scene.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\THandle.cpp\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\THandle.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\tpage.cpp\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\TPage.h\r
-# End Source File\r
-# End Group\r
-# Begin Group "Resource Files"\r
-\r
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"\r
-# End Group\r
-# Begin Group "Libraries"\r
-\r
-# PROP Default_Filter ""\r
-# End Group\r
-# End Target\r
-# End Project\r

diff --git a/G3D/Engine/Drivers/WireFrame/D3DDrv.dsw b/G3D/Engine/Drivers/WireFrame/D3DDrv.dsw
deleted file mode 100644 (file)
index 262da56..0000000
--- a/G3D/Engine/Drivers/WireFrame/D3DDrv.dsw
+++ /dev/null
@@ -1,29 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00\r
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!\r
-\r
-###############################################################################\r
-\r
-Project: "D3DDrv"=.\D3DDrv.dsp - Package Owner=<4>\r
-\r
-Package=<5>\r
-{{{\r
-}}}\r
-\r
-Package=<4>\r
-{{{\r
-}}}\r
-\r
-###############################################################################\r
-\r
-Global:\r
-\r
-Package=<5>\r
-{{{\r
-}}}\r
-\r
-Package=<3>\r
-{{{\r
-}}}\r
-\r
-###############################################################################\r
-\r

diff --git a/G3D/Engine/Drivers/WireFrame/D3DDrv.mak b/G3D/Engine/Drivers/WireFrame/D3DDrv.mak
deleted file mode 100644 (file)
index 454edfc..0000000
--- a/G3D/Engine/Drivers/WireFrame/D3DDrv.mak
+++ /dev/null
@@ -1,284 +0,0 @@
-# Microsoft Developer Studio Generated NMAKE File, Based on D3DDrv.dsp\r
-!IF "$(CFG)" == ""\r
-CFG=D3DDrv - Win32 Debug\r
-!MESSAGE No configuration specified. Defaulting to D3DDrv - Win32 Debug.\r
-!ENDIF \r
-\r
-!IF "$(CFG)" != "D3DDrv - Win32 Release" && "$(CFG)" != "D3DDrv - Win32 Debug"\r
-!MESSAGE Invalid configuration "$(CFG)" specified.\r
-!MESSAGE You can specify a configuration when running NMAKE\r
-!MESSAGE by defining the macro CFG on the command line. For example:\r
-!MESSAGE \r
-!MESSAGE NMAKE /f "D3DDrv.mak" CFG="D3DDrv - Win32 Debug"\r
-!MESSAGE \r
-!MESSAGE Possible choices for configuration are:\r
-!MESSAGE \r
-!MESSAGE "D3DDrv - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")\r
-!MESSAGE "D3DDrv - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")\r
-!MESSAGE \r
-!ERROR An invalid configuration is specified.\r
-!ENDIF \r
-\r
-!IF "$(OS)" == "Windows_NT"\r
-NULL=\r
-!ELSE \r
-NULL=nul\r
-!ENDIF \r
-\r
-CPP=cl.exe\r
-MTL=midl.exe\r
-RSC=rc.exe\r
-\r
-!IF  "$(CFG)" == "D3DDrv - Win32 Release"\r
-\r
-OUTDIR=.\Release\r
-INTDIR=.\Release\r
-# Begin Custom Macros\r
-OutDir=.\Release\r
-# End Custom Macros\r
-\r
-ALL : "$(OUTDIR)\D3DDrv.dll"\r
-\r
-\r
-CLEAN :\r
-       -@erase "$(INTDIR)\D3d_err.obj"\r
-       -@erase "$(INTDIR)\D3d_fx.obj"\r
-       -@erase "$(INTDIR)\D3d_main.obj"\r
-       -@erase "$(INTDIR)\D3dcache.obj"\r
-       -@erase "$(INTDIR)\D3ddrv.obj"\r
-       -@erase "$(INTDIR)\DDMemMgr.obj"\r
-       -@erase "$(INTDIR)\Gspan.obj"\r
-       -@erase "$(INTDIR)\Pcache.obj"\r
-       -@erase "$(INTDIR)\Render.obj"\r
-       -@erase "$(INTDIR)\Scene.obj"\r
-       -@erase "$(INTDIR)\THandle.obj"\r
-       -@erase "$(INTDIR)\tpage.obj"\r
-       -@erase "$(INTDIR)\vc60.idb"\r
-       -@erase "$(OUTDIR)\D3DDrv.dll"\r
-       -@erase "$(OUTDIR)\D3DDrv.exp"\r
-       -@erase "$(OUTDIR)\D3DDrv.lib"\r
-\r
-"$(OUTDIR)" :\r
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"\r
-\r
-CPP_PROJ=/nologo /MT /W3 /GX /O2 /X /I "..\..\.." /I "..\..\..\..\SdkDx6Sdk\Include" /I "..\\" /I "..\..\..\..\Sdk\Dx6Sdk\Include" /I "..\D3DDrv" /I "..\..\..\Support" /I "..\..\..\..\MsDev60\Include" /I "..\..\..\Math" /I "..\..\..\Bitmap" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "D3DDRV_EXPORTS" /Fp"$(INTDIR)\D3DDrv.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c \r
-MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32 \r
-BSC32=bscmake.exe\r
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\D3DDrv.bsc" \r
-BSC32_SBRS= \\r
-       \r
-LINK32=link.exe\r
-LINK32_FLAGS=/nologo /dll /incremental:no /pdb:"$(OUTDIR)\D3DDrv.pdb" /machine:I386 /nodefaultlib /out:"$(OUTDIR)\D3DDrv.dll" /implib:"$(OUTDIR)\D3DDrv.lib" \r
-LINK32_OBJS= \\r
-       "$(INTDIR)\D3d_err.obj" \\r
-       "$(INTDIR)\D3d_fx.obj" \\r
-       "$(INTDIR)\D3d_main.obj" \\r
-       "$(INTDIR)\D3dcache.obj" \\r
-       "$(INTDIR)\D3ddrv.obj" \\r
-       "$(INTDIR)\DDMemMgr.obj" \\r
-       "$(INTDIR)\Gspan.obj" \\r
-       "$(INTDIR)\Pcache.obj" \\r
-       "$(INTDIR)\Render.obj" \\r
-       "$(INTDIR)\Scene.obj" \\r
-       "$(INTDIR)\THandle.obj" \\r
-       "$(INTDIR)\tpage.obj" \\r
-       "..\..\..\..\MSDev60\lib\Wininet.lib" \\r
-       "..\..\..\..\MSDev60\lib\Comdlg32.lib" \\r
-       "..\..\..\..\MSDev60\lib\Gdi32.lib" \\r
-       "..\..\..\..\MSDev60\lib\Kernel32.lib" \\r
-       "..\..\..\..\MSDev60\lib\Libcmt.lib" \\r
-       "..\..\..\..\MSDev60\lib\Oldnames.lib" \\r
-       "..\..\..\..\MSDev60\lib\Shell32.lib" \\r
-       "..\..\..\..\MSDev60\lib\User32.lib" \\r
-       "..\..\..\..\MSDev60\lib\Uuid.lib" \\r
-       "..\..\..\..\MSDev60\lib\Advapi32.lib" \\r
-       "..\..\..\..\Sdk\Dx6sdk\Lib\dxguid.lib" \\r
-       "..\..\..\..\Sdk\Dx6sdk\Lib\ddraw.lib" \\r
-       "..\..\..\..\Sdk\Dx6sdk\Lib\d3dim.lib"\r
-\r
-"$(OUTDIR)\D3DDrv.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)\r
-    $(LINK32) @<<\r
-  $(LINK32_FLAGS) $(LINK32_OBJS)\r
-<<\r
-\r
-!ELSEIF  "$(CFG)" == "D3DDrv - Win32 Debug"\r
-\r
-OUTDIR=.\Debug\r
-INTDIR=.\Debug\r
-# Begin Custom Macros\r
-OutDir=.\Debug\r
-# End Custom Macros\r
-\r
-ALL : "$(OUTDIR)\D3DDrv.dll"\r
-\r
-\r
-CLEAN :\r
-       -@erase "$(INTDIR)\D3d_err.obj"\r
-       -@erase "$(INTDIR)\D3d_fx.obj"\r
-       -@erase "$(INTDIR)\D3d_main.obj"\r
-       -@erase "$(INTDIR)\D3dcache.obj"\r
-       -@erase "$(INTDIR)\D3ddrv.obj"\r
-       -@erase "$(INTDIR)\DDMemMgr.obj"\r
-       -@erase "$(INTDIR)\Gspan.obj"\r
-       -@erase "$(INTDIR)\Pcache.obj"\r
-       -@erase "$(INTDIR)\Render.obj"\r
-       -@erase "$(INTDIR)\Scene.obj"\r
-       -@erase "$(INTDIR)\THandle.obj"\r
-       -@erase "$(INTDIR)\tpage.obj"\r
-       -@erase "$(INTDIR)\vc60.idb"\r
-       -@erase "$(INTDIR)\vc60.pdb"\r
-       -@erase "$(OUTDIR)\D3DDrv.dll"\r
-       -@erase "$(OUTDIR)\D3DDrv.exp"\r
-       -@erase "$(OUTDIR)\D3DDrv.ilk"\r
-       -@erase "$(OUTDIR)\D3DDrv.lib"\r
-       -@erase "$(OUTDIR)\D3DDrv.pdb"\r
-\r
-"$(OUTDIR)" :\r
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"\r
-\r
-CPP_PROJ=/nologo /MTd /W3 /GX /Zi /Od /X /I "..\..\.." /I "..\..\..\Math" /I "..\\" /I "..\..\..\..\Sdk\Dx6Sdk\Include" /I "..\D3DDrv" /I "..\..\..\Support" /I "..\..\..\..\MsDev60\Include" /I "..\..\..\Bitmap" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "D3DDRV_EXPORTS" /Fp"$(INTDIR)\D3DDrv.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c \r
-MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 \r
-BSC32=bscmake.exe\r
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\D3DDrv.bsc" \r
-BSC32_SBRS= \\r
-       \r
-LINK32=link.exe\r
-LINK32_FLAGS=/nologo /dll /incremental:yes /pdb:"$(OUTDIR)\D3DDrv.pdb" /debug /machine:I386 /nodefaultlib /out:"$(OUTDIR)\D3DDrv.dll" /implib:"$(OUTDIR)\D3DDrv.lib" /pdbtype:sept \r
-LINK32_OBJS= \\r
-       "$(INTDIR)\D3d_err.obj" \\r
-       "$(INTDIR)\D3d_fx.obj" \\r
-       "$(INTDIR)\D3d_main.obj" \\r
-       "$(INTDIR)\D3dcache.obj" \\r
-       "$(INTDIR)\D3ddrv.obj" \\r
-       "$(INTDIR)\DDMemMgr.obj" \\r
-       "$(INTDIR)\Gspan.obj" \\r
-       "$(INTDIR)\Pcache.obj" \\r
-       "$(INTDIR)\Render.obj" \\r
-       "$(INTDIR)\Scene.obj" \\r
-       "$(INTDIR)\THandle.obj" \\r
-       "$(INTDIR)\tpage.obj" \\r
-       "..\..\..\..\MSDev60\lib\Wininet.lib" \\r
-       "..\..\..\..\MSDev60\lib\Comdlg32.lib" \\r
-       "..\..\..\..\MSDev60\lib\Gdi32.lib" \\r
-       "..\..\..\..\MSDev60\lib\Kernel32.lib" \\r
-       "..\..\..\..\MSDev60\lib\Libcmtd.lib" \\r
-       "..\..\..\..\MSDev60\lib\Oldnames.lib" \\r
-       "..\..\..\..\MSDev60\lib\Shell32.lib" \\r
-       "..\..\..\..\MSDev60\lib\User32.lib" \\r
-       "..\..\..\..\MSDev60\lib\Uuid.lib" \\r
-       "..\..\..\..\MSDev60\lib\Advapi32.lib" \\r
-       "..\..\..\..\Sdk\Dx6sdk\Lib\dxguid.lib" \\r
-       "..\..\..\..\Sdk\Dx6sdk\Lib\ddraw.lib" \\r
-       "..\..\..\..\Sdk\Dx6sdk\Lib\d3dim.lib"\r
-\r
-"$(OUTDIR)\D3DDrv.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)\r
-    $(LINK32) @<<\r
-  $(LINK32_FLAGS) $(LINK32_OBJS)\r
-<<\r
-\r
-!ENDIF \r
-\r
-.c{$(INTDIR)}.obj::\r
-   $(CPP) @<<\r
-   $(CPP_PROJ) $< \r
-<<\r
-\r
-.cpp{$(INTDIR)}.obj::\r
-   $(CPP) @<<\r
-   $(CPP_PROJ) $< \r
-<<\r
-\r
-.cxx{$(INTDIR)}.obj::\r
-   $(CPP) @<<\r
-   $(CPP_PROJ) $< \r
-<<\r
-\r
-.c{$(INTDIR)}.sbr::\r
-   $(CPP) @<<\r
-   $(CPP_PROJ) $< \r
-<<\r
-\r
-.cpp{$(INTDIR)}.sbr::\r
-   $(CPP) @<<\r
-   $(CPP_PROJ) $< \r
-<<\r
-\r
-.cxx{$(INTDIR)}.sbr::\r
-   $(CPP) @<<\r
-   $(CPP_PROJ) $< \r
-<<\r
-\r
-\r
-!IF "$(NO_EXTERNAL_DEPS)" != "1"\r
-!IF EXISTS("D3DDrv.dep")\r
-!INCLUDE "D3DDrv.dep"\r
-!ELSE \r
-!MESSAGE Warning: cannot find "D3DDrv.dep"\r
-!ENDIF \r
-!ENDIF \r
-\r
-\r
-!IF "$(CFG)" == "D3DDrv - Win32 Release" || "$(CFG)" == "D3DDrv - Win32 Debug"\r
-SOURCE=.\D3d_err.cpp\r
-\r
-"$(INTDIR)\D3d_err.obj" : $(SOURCE) "$(INTDIR)"\r
-\r
-\r
-SOURCE=.\D3d_fx.cpp\r
-\r
-"$(INTDIR)\D3d_fx.obj" : $(SOURCE) "$(INTDIR)"\r
-\r
-\r
-SOURCE=.\D3d_main.cpp\r
-\r
-"$(INTDIR)\D3d_main.obj" : $(SOURCE) "$(INTDIR)"\r
-\r
-\r
-SOURCE=.\D3dcache.cpp\r
-\r
-"$(INTDIR)\D3dcache.obj" : $(SOURCE) "$(INTDIR)"\r
-\r
-\r
-SOURCE=.\D3ddrv.cpp\r
-\r
-"$(INTDIR)\D3ddrv.obj" : $(SOURCE) "$(INTDIR)"\r
-\r
-\r
-SOURCE=.\DDMemMgr.c\r
-\r
-"$(INTDIR)\DDMemMgr.obj" : $(SOURCE) "$(INTDIR)"\r
-\r
-\r
-SOURCE=.\Gspan.cpp\r
-\r
-"$(INTDIR)\Gspan.obj" : $(SOURCE) "$(INTDIR)"\r
-\r
-\r
-SOURCE=.\Pcache.cpp\r
-\r
-"$(INTDIR)\Pcache.obj" : $(SOURCE) "$(INTDIR)"\r
-\r
-\r
-SOURCE=.\Render.cpp\r
-\r
-"$(INTDIR)\Render.obj" : $(SOURCE) "$(INTDIR)"\r
-\r
-\r
-SOURCE=.\Scene.cpp\r
-\r
-"$(INTDIR)\Scene.obj" : $(SOURCE) "$(INTDIR)"\r
-\r
-\r
-SOURCE=.\THandle.cpp\r
-\r
-"$(INTDIR)\THandle.obj" : $(SOURCE) "$(INTDIR)"\r
-\r
-\r
-SOURCE=.\tpage.cpp\r
-\r
-"$(INTDIR)\tpage.obj" : $(SOURCE) "$(INTDIR)"\r
-\r
-\r
-\r
-!ENDIF \r
-\r

diff --git a/G3D/Engine/Drivers/WireFrame/D3DDrv.ncb b/G3D/Engine/Drivers/WireFrame/D3DDrv.ncb
deleted file mode 100644 (file)
index 38431d2..0000000
Binary files a/G3D/Engine/Drivers/WireFrame/D3DDrv.ncb and /dev/null differ

diff --git a/G3D/Engine/Drivers/WireFrame/D3DDrv.opt b/G3D/Engine/Drivers/WireFrame/D3DDrv.opt
deleted file mode 100644 (file)
index c952d50..0000000
Binary files a/G3D/Engine/Drivers/WireFrame/D3DDrv.opt and /dev/null differ

diff --git a/G3D/Engine/Drivers/WireFrame/D3DDrv.plg b/G3D/Engine/Drivers/WireFrame/D3DDrv.plg
deleted file mode 100644 (file)
index ea0e538..0000000
--- a/G3D/Engine/Drivers/WireFrame/D3DDrv.plg
+++ /dev/null
@@ -1,44 +0,0 @@
-<html>\r
-<body>\r
-<pre>\r
-<h1>Build Log</h1>\r
-<h3>\r
---------------------Configuration: D3DDrv - Win32 Release--------------------\r
-</h3>\r
-<h3>Command Lines</h3>\r
-Creating temporary file "C:\WINDOWS\TEMP\RSP2390.TMP" with contents\r
-[\r
-/nologo /G5 /MT /W3 /GX /Ox /Ot /Ow /Og /Oi /Op /Ob2 /I "..\..\.." /I "..\\" /I "..\D3DDrv" /I "..\..\..\Support" /I "..\..\..\Math" /I "..\..\..\Bitmap" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "D3DDRV_EXPORTS" /Fo"Release/" /Fd"Release/" /FD /c \r
-"D:\Release\G3D\Engine\Drivers\WireFrame\D3d_main.cpp"\r
-]\r
-Creating command line "cl.exe @C:\WINDOWS\TEMP\RSP2390.TMP" \r
-Creating temporary file "C:\WINDOWS\TEMP\RSP2391.TMP" with contents\r
-[\r
-kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib winmm.lib vfw32.lib dxguid.lib ddraw.lib d3dim.lib /nologo /dll /incremental:no /pdb:"Release/WireDrv.pdb" /machine:I386 /out:"Release/WireDrv.dll" /implib:"Release/WireDrv.lib" \r
-.\Release\D3d_err.obj\r
-.\Release\D3d_fx.obj\r
-.\Release\D3d_main.obj\r
-.\Release\D3dcache.obj\r
-.\Release\D3ddrv.obj\r
-.\Release\DDMemMgr.obj\r
-.\Release\Gspan.obj\r
-.\Release\Pcache.obj\r
-.\Release\Render.obj\r
-.\Release\Scene.obj\r
-.\Release\THandle.obj\r
-.\Release\tpage.obj\r
-]\r
-Creating command line "link.exe @C:\WINDOWS\TEMP\RSP2391.TMP"\r
-<h3>Output Window</h3>\r
-Compiling...\r
-D3d_main.cpp\r
-Linking...\r
-   Creating library Release/WireDrv.lib and object Release/WireDrv.exp\r
-\r
-\r
-\r
-<h3>Results</h3>\r
-WireDrv.dll - 0 error(s), 0 warning(s)\r
-</pre>\r
-</body>\r
-</html>\r

diff --git a/G3D/Engine/Drivers/WireFrame/mssccprj.scc b/G3D/Engine/Drivers/WireFrame/mssccprj.scc
deleted file mode 100644 (file)
index 848e217..0000000
--- a/G3D/Engine/Drivers/WireFrame/mssccprj.scc
+++ /dev/null
@@ -1,4 +0,0 @@
-SCC = This is a Source Code Control file\r
-\r
-[D3DDrv.mak]\r
-SCC_Project_Name = "$/Genesis10/Source/Engine/Drivers/D3DDrv", LQQBAAAA\r

diff --git a/G3D/Engine/Sound.c b/G3D/Engine/Sound.c
deleted file mode 100644 (file)
index 5f54ed7..0000000
--- a/G3D/Engine/Sound.c
+++ /dev/null
@@ -1,1068 +0,0 @@
-/****************************************************************************************/\r
-/*  Sound.c                                                                             */\r
-/*                                                                                      */\r
-/*  Author: Brian Adelberg                                                              */\r
-/*  Description: DirectSound wrapper                                                    */\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
-/*  Copyright (C) 1996-1999 Eclipse Entertainment, L.L.C. All Rights Reserved           */\r
-/*                                                                                      */\r
-/****************************************************************************************/\r
-#include       <windows.h>\r
-#include       <dsound.h>\r
-#include       <stdio.h>\r
-#include       <assert.h>\r
-\r
-#include       "BaseType.h"\r
-#include       "ErrorLog.h"\r
-#include       "VFile.h"\r
-#include       "Sound.h"\r
-#include       "Ram.h"\r
-\r
-typedef struct SoundManager    SoundManager;\r
-typedef struct  Channel                        Channel;\r
-\r
-\r
-typedef struct geSound_System\r
-{\r
-       geBoolean               Active;\r
-       SoundManager    *SoundM;\r
-       geFloat                 GlobalVolume;\r
-} geSound_System;\r
-\r
-typedef struct geSound_Cfg\r
-{\r
-       geFloat                 Volume;\r
-       geFloat                 Pan;\r
-       geFloat                 Frequency;\r
-} geSound_Cfg;\r
-\r
-\r
-/*\r
-       The interfaces here allow an application to write sound data to\r
-       abstract channels which are then to be mixed.  The interfaces here\r
-       require two things.  First, that the application create only one\r
-       sound manager per instance, and second that the type of sound data\r
-       being passed into the sound channels remains constant.  That is,\r
-       the format of the binary information is all one format from\r
-       one sound to another; the application cannot combine RIFF and WAV\r
-       formats in a single channel.\r
-*/\r
-/*\r
-       Call these ones only once per application:\r
-*/\r
-\r
-static SoundManager *  CreateSoundManager(HWND hWnd);\r
-static void            DestroySoundManager(SoundManager *sm);\r
-\r
-//static BOOL          FillSoundChannel(SoundManager *sm, char* Dir, char *Name, unsigned int* Handle );\r
-static BOOL            FillSoundChannel(SoundManager *sm, geVFile *File, unsigned int* Handle );\r
-//static BOOL          FillSoundChannelMemory(SoundManager *sm, const void *Buffer, unsigned int* Handle );\r
-static BOOL            StartSoundChannel( SoundManager *sm, unsigned int Handle, geSound_Cfg *cfg, int loop, unsigned int* sfx);\r
-static BOOL            StopSoundChannel(Channel *channel);\r
-static BOOL            FreeAllChannels(SoundManager *sm);\r
-static BOOL            FreeChannel(SoundManager *sm, Channel *channel);\r
-static BOOL            ModifyChannel( Channel *channel, geSound_Cfg *cfg );\r
-static int             ChannelPlaying( Channel *channel );\r
-static Channel*        GetChannel( SoundManager *sm, unsigned int ID );\r
-\r
-\r
-typedef struct Channel\r
-{\r
-//     char*                           name;\r
-       LPDIRECTSOUNDBUFFER     buffer;\r
-       unsigned int            ID;\r
-       int                                     BaseFreq;\r
-       geSound_Cfg                     cfg;\r
-       void *                          Data;\r
-       struct Channel          *next;\r
-       struct Channel          *nextDup;\r
-} Channel;\r
-\r
-typedef struct SoundManager\r
-{\r
-       int                                             smChannelCount;\r
-       unsigned int                    smNextChannelID;\r
-\r
-       LPDIRECTSOUNDBUFFER     smPrimaryChannel;\r
-       Channel*                                smChannels;\r
-    //LPDIRECTSOUNDNOTIFY *   smNotify;\r
-}   SoundManager;\r
-\r
-static LPDIRECTSOUND                   lpDirectSound = NULL;\r
-// This isn't really safe as a global.  But it's consistent with the global lpDirectSound.\r
-static  HMODULE                                        hmodDirectSound = NULL;\r
-\r
-//     Added 11/08/1999 Ed Averill to expose DSound object for external code\r
-GENESISAPI void *geSound_GetDSound()\r
-{\r
-  return (void *)lpDirectSound;\r
-}\r
-//     End 11/08/1999 addition\r
-\r
-//=====================================================================================\r
-//     geSound_SystemCreate\r
-//=====================================================================================\r
-GENESISAPI     geSound_System *geSound_CreateSoundSystem(HWND hWnd)\r
-{\r
-       geSound_System          *SoundSystem;\r
-\r
-       SoundSystem = GE_RAM_ALLOCATE_STRUCT(geSound_System);\r
-\r
-       if (!SoundSystem)\r
-       {\r
-               geErrorLog_Add(GE_ERR_OUT_OF_MEMORY, NULL);\r
-               return NULL;\r
-       }\r
-\r
-       memset(SoundSystem, 0, sizeof(geSound_System));\r
-       \r
-       // Initialize the sound system\r
-       SoundSystem->SoundM = CreateSoundManager(hWnd);\r
-\r
-       if (!SoundSystem->SoundM)\r
-       {\r
-               geRam_Free(SoundSystem);\r
-               geErrorLog_Add(GE_ERR_CREATE_SOUND_MANAGER_FAILED, NULL);\r
-               return NULL;\r
-       }\r
-       SoundSystem->GlobalVolume = 1.0f;\r
-\r
-       return SoundSystem;\r
-}\r
-\r
-//=====================================================================================\r
-//     geSound_SystemFree\r
-//=====================================================================================\r
-GENESISAPI     void geSound_DestroySoundSystem(geSound_System *Sound)\r
-{\r
-       assert(Sound != NULL);\r
-\r
-       // Shutdown the sound system\r
-       DestroySoundManager(Sound->SoundM);\r
-\r
-       Sound->SoundM = NULL;\r
-\r
-       geRam_Free(Sound);\r
-}\r
-\r
-//=====================================================================================\r
-//     Sound_LoadSound\r
-//=====================================================================================\r
-//GENESISAPI   geSound_Def *geSound_LoadSoundDef(geSound_System *SoundS, const char *Path, const char *FileName)\r
-GENESISAPI     geSound_Def *geSound_LoadSoundDef(geSound_System *SoundS, geVFile *File)\r
-{\r
-       unsigned int SoundDef = 0;\r
-\r
-       assert(SoundS != NULL);\r
-\r
-//     if (!FillSoundChannel(SoundS->SoundM, (char*)Path, (char*)FileName, &SoundDef))\r
-       if (!FillSoundChannel(SoundS->SoundM, File, &SoundDef))\r
-               return 0;\r
-       \r
-       return (geSound_Def *)SoundDef;\r
-}\r
-\r
-#if 0\r
-//=====================================================================================\r
-//     Sound_LoadSound\r
-//=====================================================================================\r
-GENESISAPI     geSound_Def *geSound_LoadSoundDefFromMemory(\r
-       geSound_System *SoundS,\r
-       const void *Buffer)\r
-{\r
-       unsigned int SoundDef = 0;\r
-\r
-       assert(SoundS != NULL);\r
-       assert(Buffer != NULL);\r
-\r
-       if (!FillSoundChannelMemory(SoundS->SoundM, Buffer, &SoundDef))\r
-               return 0;\r
-       \r
-       return (geSound_Def *)SoundDef;\r
-}\r
-#endif\r
-\r
-//=====================================================================================\r
-//     Sound_FreeSound\r
-//=====================================================================================\r
-GENESISAPI     void geSound_FreeSoundDef(geSound_System *SoundS, geSound_Def *SoundDef)\r
-{\r
-       Channel*        Channel;\r
-\r
-       assert(SoundS != NULL);\r
-       assert(SoundDef != 0);\r
-\r
-       Channel = GetChannel(SoundS->SoundM, (unsigned int)SoundDef);\r
-\r
-       if (!Channel)\r
-               return;\r
-\r
-       FreeChannel(SoundS->SoundM, Channel);\r
-}\r
-\r
-//=====================================================================================\r
-//     Sound_SetGlobalVolume\r
-//=====================================================================================\r
-GENESISAPI     geBoolean geSound_SetMasterVolume( geSound_System *SoundS, geFloat Volume )\r
-{\r
-       if( !SoundS )\r
-               return( GE_FALSE );\r
-       SoundS->GlobalVolume = Volume;\r
-       return( GE_TRUE );\r
-}\r
-       \r
-//=====================================================================================\r
-//     Sound_PlaySound\r
-//=====================================================================================\r
-GENESISAPI     geSound *geSound_PlaySoundDef(geSound_System *SoundS, \r
-                                                       geSound_Def *SoundDef, \r
-                                                       geFloat Volume, \r
-                                                       geFloat Pan, \r
-                                                       geFloat Frequency, \r
-                                                       geBoolean Loop)\r
-{\r
-       unsigned int Sound;\r
-       geSound_Cfg LocalCfg;\r
-\r
-       LocalCfg.Volume         = Volume;\r
-       LocalCfg.Pan            = Pan;\r
-       LocalCfg.Frequency  = Frequency;\r
-\r
-       LocalCfg.Volume *= SoundS->GlobalVolume;\r
-       if (!StartSoundChannel(SoundS->SoundM, (unsigned int)SoundDef, &LocalCfg, (BOOL)Loop, &Sound))\r
-       {\r
-               return 0;\r
-       }\r
-\r
-       return (geSound *)Sound;\r
-}\r
-       \r
-//=====================================================================================\r
-//     Sound_StopSound\r
-//=====================================================================================\r
-GENESISAPI     geBoolean geSound_StopSound(geSound_System *SoundS, geSound *Sound)\r
-{\r
-       Channel*        Channel;\r
-\r
-       assert(SoundS != NULL);\r
-       assert(Sound  != NULL); \r
-\r
-       Channel = GetChannel(SoundS->SoundM, (unsigned int)Sound);\r
-\r
-       if (!Channel)\r
-               return GE_FALSE;\r
-\r
-       return StopSoundChannel(Channel);       \r
-}\r
-\r
-//=====================================================================================\r
-//     Sound_ModifySound\r
-//=====================================================================================\r
-GENESISAPI     geBoolean geSound_ModifySound(geSound_System *SoundS, \r
-                                                               geSound *Sound,geFloat Volume, \r
-                                                               geFloat Pan, \r
-                                                               geFloat Frequency)\r
-{\r
-       Channel*        Channel;\r
-       geSound_Cfg     LocalCfg;\r
-\r
-       assert(SoundS != NULL);\r
-       assert(Sound  != NULL); \r
-\r
-       Channel = GetChannel(SoundS->SoundM, (unsigned int)Sound);\r
-\r
-       if (!Channel)\r
-               return GE_FALSE;\r
-       LocalCfg.Volume    = Volume;\r
-       LocalCfg.Pan       = Pan;\r
-       LocalCfg.Frequency = Frequency;\r
-       LocalCfg.Volume *= SoundS->GlobalVolume;\r
-       return ModifyChannel(Channel, &LocalCfg);\r
-}\r
-\r
-//=====================================================================================\r
-//     Sound_SoundIsPlaying\r
-//=====================================================================================\r
-GENESISAPI     geBoolean geSound_SoundIsPlaying(geSound_System *SoundS, geSound *Sound)\r
-{\r
-       Channel*        Channel;\r
-\r
-       assert(SoundS != NULL);\r
-       assert(Sound  != NULL); \r
-\r
-       Channel = GetChannel(SoundS->SoundM, (unsigned int)Sound);\r
-\r
-       if (!Channel)\r
-               return GE_FALSE;\r
-\r
-       return ChannelPlaying(Channel);\r
-}\r
-\r
-\r
-//=====================================================================================\r
-//=====================================================================================\r
-\r
-static BOOL DSParseWaveResource(const void *pvRes, WAVEFORMATEX **ppWaveHeader,\r
-                         BYTE **ppbWaveData,DWORD *pcbWaveSize)\r
-{\r
-    DWORD *pdw;\r
-    DWORD *pdwEnd;\r
-    DWORD dwRiff;\r
-    DWORD dwType;\r
-    DWORD dwLength;\r
-\r
-    if (ppWaveHeader)\r
-        *ppWaveHeader = NULL;\r
-\r
-    if (ppbWaveData)\r
-        *ppbWaveData = NULL;\r
-\r
-    if (pcbWaveSize)\r
-        *pcbWaveSize = 0;\r
-\r
-    pdw = (DWORD *)pvRes;\r
-    dwRiff = *pdw++;\r
-    dwLength = *pdw++;\r
-    dwType = *pdw++;\r
-\r
-    if (dwRiff != mmioFOURCC('R', 'I', 'F', 'F'))\r
-        goto exit;      // not even RIFF\r
-\r
-    if (dwType != mmioFOURCC('W', 'A', 'V', 'E'))\r
-        goto exit;      // not a WAV\r
-\r
-    pdwEnd = (DWORD *)((BYTE *)pdw + dwLength-4);\r
-\r
-    while (pdw < pdwEnd)\r
-    {\r
-        dwType = *pdw++;\r
-        dwLength = *pdw++;\r
-\r
-        switch (dwType)\r
-        {\r
-        case mmioFOURCC('f', 'm', 't', ' '):\r
-            if (ppWaveHeader && !*ppWaveHeader)\r
-            {\r
-                if (dwLength < sizeof(WAVEFORMAT))\r
-                    goto exit;      // not a WAV\r
-\r
-                *ppWaveHeader = (WAVEFORMATEX *)pdw;\r
-\r
-                if ((!ppbWaveData || *ppbWaveData) &&\r
-                    (!pcbWaveSize || *pcbWaveSize))\r
-                {\r
-                    return TRUE;\r
-                }\r
-            }\r
-            break;\r
-\r
-        case mmioFOURCC('d', 'a', 't', 'a'):\r
-            if ((ppbWaveData && !*ppbWaveData) ||\r
-                (pcbWaveSize && !*pcbWaveSize))\r
-            {\r
-                if (ppbWaveData)\r
-                    *ppbWaveData = (LPBYTE)pdw;\r
-\r
-                if (pcbWaveSize)\r
-                    *pcbWaveSize = dwLength;\r
-\r
-                if (!ppWaveHeader || *ppWaveHeader)\r
-                    return TRUE;\r
-            }\r
-            break;\r
-        }\r
-\r
-        pdw = (DWORD *)((BYTE *)pdw + ((dwLength+1)&~1));\r
-    }\r
-\r
-exit:\r
-    return FALSE;\r
-}\r
-\r
-static BOOL DSFillSoundBuffer(IDirectSoundBuffer *pDSB, BYTE *pbWaveData, DWORD cbWaveSize)\r
-{\r
-\r
-    if (pDSB && pbWaveData && cbWaveSize)\r
-    {\r
-        LPVOID pMem1, pMem2;\r
-        DWORD dwSize1, dwSize2;\r
-\r
-        if (SUCCEEDED(IDirectSoundBuffer_Lock(pDSB, 0, cbWaveSize,\r
-            &pMem1, &dwSize1, &pMem2, &dwSize2, 0)))\r
-        {\r
-            ZeroMemory(pMem1, dwSize1);\r
-            CopyMemory(pMem1, pbWaveData, dwSize1);\r
-\r
-            if ( 0 != dwSize2 )\r
-                CopyMemory(pMem2, pbWaveData+dwSize1, dwSize2);\r
-\r
-            IDirectSoundBuffer_Unlock(pDSB, pMem1, dwSize1, pMem2, dwSize2);\r
-            return TRUE;\r
-        }\r
-    }\r
-    return FALSE;\r
-}\r
-\r
-\r
-DSCAPS                 dsCaps;\r
-static SoundManager *  CreateSoundManager(HWND hWnd )\r
-{\r
-       typedef HRESULT (WINAPI *DS_CREATE_FUNC)(LPGUID, LPDIRECTSOUND *, LPUNKNOWN);\r
-       PCMWAVEFORMAT   pcmwf;\r
-       DSBUFFERDESC    dsbdesc;\r
-       HRESULT                 hres;\r
-       SoundManager *  sm;\r
-       DS_CREATE_FUNC pDirectSoundCreate;\r
-\r
-       // load the DirectSound DLL\r
-       hmodDirectSound = LoadLibrary ("DSOUND.DLL");\r
-       if (hmodDirectSound == NULL)\r
-       {\r
-               // Couldn't load DSOUND.DLL\r
-               return NULL;\r
-       }\r
-\r
-       pDirectSoundCreate = (DS_CREATE_FUNC)GetProcAddress (hmodDirectSound, "DirectSoundCreate");\r
-       if (pDirectSoundCreate == NULL)\r
-       {\r
-               // couldn't find the DirectSoundCreate function\r
-               FreeLibrary (hmodDirectSound);\r
-               return NULL;\r
-       }\r
-\r
-       hres = pDirectSoundCreate(NULL, &lpDirectSound, NULL);\r
-       if      (hres != DS_OK)\r
-       {\r
-               // failed somehow\r
-               FreeLibrary (hmodDirectSound);\r
-               return NULL;\r
-       }\r
-\r
-//     sm = malloc(sizeof(*sm));\r
-       sm = geRam_Allocate(sizeof(*sm));\r
-       if      (!sm)\r
-       {\r
-               IDirectSound_Release(lpDirectSound);\r
-               FreeLibrary (hmodDirectSound);\r
-               return NULL;\r
-       }\r
-       sm->smChannelCount = 0;\r
-       sm->smNextChannelID = 1;\r
-       sm->smChannels = NULL;\r
-\r
-       memset(&pcmwf, 0, sizeof(PCMWAVEFORMAT));\r
-       pcmwf.wf.wFormatTag = WAVE_FORMAT_PCM;\r
-\r
-       //pcmwf.wf.nChannels = 1;\r
-       //pcmwf.wf.nSamplesPerSec = 44050;\r
-       //pcmwf.wf.nBlockAlign = 2;\r
-#if 1  \r
-       pcmwf.wf.nChannels = 2;\r
-       pcmwf.wf.nSamplesPerSec = 44100;\r
-       pcmwf.wf.nBlockAlign = 4;\r
-       pcmwf.wBitsPerSample = 16;\r
-       pcmwf.wf.nAvgBytesPerSec = pcmwf.wf.nSamplesPerSec * pcmwf.wf.nBlockAlign;\r
-#else\r
-       pcmwf.wf.nChannels = 1;\r
-       pcmwf.wf.nSamplesPerSec = 22050;\r
-       pcmwf.wf.nBlockAlign = 1;\r
-       pcmwf.wBitsPerSample = 8;\r
-       pcmwf.wf.nAvgBytesPerSec = pcmwf.wf.nSamplesPerSec * 2;\r
-#endif\r
-\r
-       memset(&dsbdesc, 0, sizeof(DSBUFFERDESC));\r
-       dsbdesc.dwSize = sizeof(DSBUFFERDESC);\r
-       dsbdesc.dwFlags = DSBCAPS_PRIMARYBUFFER;// | DSBCAPS_CTRLDEFAULT;// | DSBCAPS_CTRL3D;\r
-       dsbdesc.dwBufferBytes = 0; //dwBufferBytes and lpwfxFormat must be set this way.\r
-       dsbdesc.lpwfxFormat = NULL;\r
-\r
-#if 1\r
-       if (DS_OK== IDirectSound_SetCooperativeLevel(lpDirectSound, hWnd,DSSCL_NORMAL))\r
-#else\r
-       if (DS_OK== IDirectSound_SetCooperativeLevel(lpDirectSound, hWnd,DSSCL_EXCLUSIVE))\r
-#endif\r
-       {\r
-               if (DS_OK== IDirectSound_CreateSoundBuffer(lpDirectSound, &dsbdesc, &sm->smPrimaryChannel, NULL))\r
-               {\r
-                       return sm;\r
-               }\r
-               IDirectSound_Release(lpDirectSound);\r
-               FreeLibrary (hmodDirectSound);\r
-       }\r
-//     free( sm );\r
-       geRam_Free(sm);\r
-       return NULL;\r
-}\r
-\r
-//static       BOOL CreateChannel( char* Name, DSBUFFERDESC*   dsBD, Channel** chanelPtr)\r
-static BOOL CreateChannel(DSBUFFERDESC*        dsBD, Channel** chanelPtr)\r
-{\r
-       Channel* channel;\r
-\r
-//     channel = malloc( sizeof( Channel ) );\r
-       channel = geRam_Allocate( sizeof( Channel ) );\r
-       if      ( channel == NULL )\r
-       {\r
-               geErrorLog_Add(GE_ERR_OUT_OF_MEMORY, NULL);\r
-               return( FALSE );\r
-       }\r
-       if(DS_OK != IDirectSound_CreateSoundBuffer(lpDirectSound, dsBD, &channel->buffer, NULL))\r
-       {\r
-               geErrorLog_Add(GE_ERR_CREATE_SOUND_BUFFER_FAILED, NULL);\r
-               return FALSE;\r
-       }\r
-       if(DS_OK != IDirectSoundBuffer_GetFrequency(channel->buffer, &channel->BaseFreq) )\r
-       {\r
-               geErrorLog_Add(GE_ERR_DS_ERROR, NULL);\r
-               return FALSE;\r
-       }\r
-       channel->next = NULL;\r
-       channel->nextDup = NULL;\r
-       channel->ID = 0;\r
-       channel->cfg.Volume = 1.0f;\r
-       channel->cfg.Pan = 0.0f;\r
-       channel->cfg.Frequency = 0.0f;\r
-//     channel->name = Name;\r
-\r
-       *chanelPtr = channel;\r
-       return( TRUE );\r
-}\r
-\r
-//static       BOOL GetSoundData( char* Name, unsigned char** dataPtr)\r
-static BOOL GetSoundData( geVFile *File, unsigned char** dataPtr)\r
-{\r
-//     FILE * f;\r
-       int32 Size;\r
-       uint8 *data;\r
-//     int32           CurPos;\r
-\r
-#if 0\r
-       f = fopen(Name, "rb");\r
-       \r
-       if (!f)\r
-       {\r
-               geErrorLog_Add(GE_ERR_FILE_OPEN_ERROR, NULL);\r
-               return FALSE;\r
-       }\r
-#endif\r
-\r
-#if 0\r
-       CurPos = ftell (f);                             // Save the startinf pos into this function\r
-       fseek (f, 0, SEEK_END);                 // Seek to end\r
-       Size = ftell (f);                               // Get End (this will be the size)\r
-       fseek (f, CurPos, SEEK_SET);    // Restore file position\r
-#endif\r
-\r
-       if      (geVFile_Size(File, &Size) == GE_FALSE)\r
-               return FALSE;\r
-\r
-       data = geRam_Allocate(Size);\r
-\r
-       if (!data) \r
-       {\r
-               geErrorLog_Add(GE_ERR_OUT_OF_MEMORY, NULL);\r
-               return FALSE;\r
-       }\r
-       \r
-       if      (geVFile_Read(File, data, Size) == GE_FALSE)\r
-       {\r
-               geRam_Free(data);\r
-               return FALSE;\r
-       }\r
-\r
-//     fread(data, Size, 1, f);\r
-\r
-//     fclose(f);\r
-       *dataPtr = data;\r
-       return( TRUE );\r
-}\r
-\r
-static BOOL ParseData( const uint8* data, DSBUFFERDESC* dsBD, BYTE ** pbWaveData )\r
-{\r
-\r
-       //Parse the Data\r
-       memset(dsBD, 0, sizeof(DSBUFFERDESC));\r
-\r
-       dsBD->dwSize = sizeof(DSBUFFERDESC);\r
-       dsBD->dwFlags = DSBCAPS_STATIC | DSBCAPS_GETCURRENTPOSITION2 | DSBCAPS_CTRLPAN |\r
-                       DSBCAPS_CTRLFREQUENCY | DSBCAPS_CTRLVOLUME;\r
-       if      (!DSParseWaveResource(data, &dsBD->lpwfxFormat, pbWaveData, &dsBD->dwBufferBytes))\r
-       {\r
-               geErrorLog_Add(GE_ERR_INVALID_WAV, NULL);\r
-               return FALSE;\r
-       }\r
-       return( TRUE );\r
-\r
-}\r
-\r
-//static       BOOL FillSoundChannel(SoundManager *sm, char* Dir, char *Name, unsigned int* Handle )\r
-static BOOL FillSoundChannel(SoundManager *sm, geVFile *File, unsigned int* Handle )\r
-{\r
-       DSBUFFERDESC    dsBD;\r
-       INT NumBytes;\r
-       uint8           *data = NULL;\r
-       BYTE *                  pbWaveData;\r
-//     char*   Name2;\r
-       Channel* channel;\r
-\r
-       *Handle = 0;\r
-       if (!sm)\r
-               return TRUE;\r
-\r
-#if 0\r
-       //Open the file\r
-       if (Dir)\r
-       {\r
-               Name2 = malloc( strlen( Name ) + strlen( Dir ) + 3);  // 2 for the "//" and 1 for terminator\r
-               if( !Name2 )\r
-                       return( 0 );\r
-               sprintf(Name2, "%s\\%s", Dir, Name);\r
-       }\r
-       else\r
-       {\r
-               Name2 = malloc( strlen( Name ) + 3);  // 2 for the "//" and 1 for terminator\r
-               if( !Name2 )\r
-                       return( 0 );\r
-\r
-               sprintf(Name2, "%s", Name);\r
-       }\r
-#endif\r
-       if(!GetSoundData( File, &data ))\r
-               return( FALSE );\r
-\r
-       if( !ParseData( data, &dsBD, &pbWaveData ) )\r
-       {\r
-               geRam_Free(data);\r
-               return( FALSE );\r
-       }\r
-\r
-       NumBytes = dsBD.dwBufferBytes;\r
-       \r
-       //Create the channel\r
-//     if( !CreateChannel( Name2, &dsBD, &channel ) )\r
-       if      (!CreateChannel(&dsBD, &channel))\r
-       {\r
-               geRam_Free(data);\r
-               return FALSE;\r
-       }\r
-       channel->next = sm->smChannels;\r
-       channel->ID = sm->smNextChannelID++;\r
-       channel->Data = data;\r
-\r
-       sm->smChannels = channel;\r
-       sm->smChannelCount++;\r
-\r
-       //Fill the channel\r
-       if (!DSFillSoundBuffer(channel->buffer, pbWaveData, NumBytes))\r
-               return FALSE;\r
-       \r
-//     free( data );\r
-//     geRam_Free(data);\r
-\r
-       *Handle = channel->ID;\r
-       return TRUE;\r
-}\r
-\r
-#if 0\r
-static BOOL FillSoundChannelMemory(SoundManager *sm, const void *Buffer, unsigned int* Handle )\r
-{\r
-       DSBUFFERDESC    dsBD;\r
-       INT                     NumBytes;\r
-       BYTE *                  pbWaveData;\r
-       char *                  Name;\r
-       Channel *               channel;\r
-\r
-       *Handle = 0;\r
-       if      (!sm)\r
-               return TRUE;\r
-\r
-       if      (!ParseData(Buffer, &dsBD, &pbWaveData))\r
-               return FALSE;\r
-\r
-       NumBytes = dsBD.dwBufferBytes;\r
-\r
-       Name = malloc(11);\r
-       if      (Name == NULL)\r
-               return FALSE;\r
-       sprintf(Name, "0x%8x", Buffer);\r
-       \r
-       //Create the channel\r
-//     if      (!CreateChannel(Name, &dsBD, &channel))\r
-       if      (!CreateChannel(&dsBD, &channel))\r
-               return FALSE;\r
-\r
-       channel->next = sm->smChannels;\r
-       channel->ID   = sm->smNextChannelID++;\r
-\r
-       sm->smChannels = channel;\r
-       sm->smChannelCount++;\r
-\r
-       //Fill the channel\r
-       if      (!DSFillSoundBuffer(channel->buffer, pbWaveData, NumBytes))\r
-               return FALSE;\r
-       \r
-       *Handle = channel->ID;\r
-       return TRUE;\r
-}\r
-#endif\r
-\r
-static void StopDupBuffers( Channel* channel )\r
-{\r
-       Channel* dupChannel, *prevChannel;\r
-\r
-       assert( channel );\r
-\r
-       dupChannel = channel->nextDup;\r
-       prevChannel = channel;\r
-       while( dupChannel )\r
-       {\r
-               IDirectSoundBuffer_Stop(dupChannel->buffer);\r
-               dupChannel = dupChannel->nextDup;\r
-       }\r
-}\r
-\r
-static void ClearDupBuffers( Channel* channel )\r
-{\r
-       Channel* dupChannel, *prevChannel;\r
-\r
-       if( channel == NULL)\r
-               return;\r
-\r
-       dupChannel = channel->nextDup;\r
-       prevChannel = channel;\r
-       while( dupChannel )\r
-       {\r
-               if( !ChannelPlaying( dupChannel ) )\r
-               {\r
-                       prevChannel->nextDup = dupChannel->nextDup;\r
-                       IDirectSound_Release(dupChannel->buffer);\r
-//                     free( dupChannel );\r
-                       geRam_Free(dupChannel);\r
-                       dupChannel = prevChannel->nextDup;\r
-               }\r
-               else\r
-               {\r
-                       prevChannel = dupChannel;\r
-                       dupChannel = dupChannel->nextDup;\r
-               }\r
-       }\r
-}\r
-\r
-static BOOL FreeAllChannels(SoundManager *sm)\r
-{\r
-       int Error;\r
-       \r
-       Channel* channel, *nextChannel;\r
-\r
-       channel = sm->smChannels;\r
-       while( channel )\r
-       {\r
-               nextChannel = channel->next;\r
-               StopDupBuffers( channel );\r
-               ClearDupBuffers( channel );\r
-               Error = IDirectSoundBuffer_Stop(channel->buffer);\r
-               if (Error != DS_OK)\r
-               {\r
-                       geErrorLog_Add(GE_ERR_DS_ERROR, NULL);\r
-                       return FALSE;\r
-               }\r
-               Error = IDirectSound_Release(channel->buffer);\r
-               if (Error != DS_OK)\r
-               {\r
-                       geErrorLog_Add(GE_ERR_DS_ERROR, NULL);\r
-                       return FALSE;\r
-               }\r
-               \r
-//             if( channel->name )\r
-//                     geRam_Free(channel->name);\r
-//                     free( channel->name );\r
-               if      (channel->Data)\r
-                       geRam_Free(channel->Data);\r
-               geRam_Free(channel);\r
-//             free( channel );\r
-               channel = nextChannel;\r
-       }\r
-       sm->smChannels = NULL;\r
-       sm->smChannelCount = 0;\r
-\r
-       return TRUE;\r
-}\r
-\r
-\r
-static BOOL FreeChannel(SoundManager *sm, Channel* channel)\r
-{\r
-       int Error;\r
-       Channel*prevChannel = NULL, *curChannel;\r
-       if      ( channel )\r
-       {\r
-               StopDupBuffers( channel );\r
-               ClearDupBuffers( channel );\r
-               Error = IDirectSoundBuffer_Stop(channel->buffer);\r
-               if (Error != DS_OK)\r
-               {\r
-                       geErrorLog_Add(GE_ERR_DS_ERROR, NULL);\r
-                       return FALSE;\r
-               }\r
-               Error = IDirectSound_Release(channel->buffer);\r
-               if (Error != DS_OK)\r
-               {\r
-                       geErrorLog_Add(GE_ERR_DS_ERROR, NULL);\r
-                       return FALSE;\r
-               }\r
-//             if( channel->name )\r
-//                     geRam_Free(channel->name);\r
-//                     free( channel->name );\r
-\r
-               if( channel->Data )\r
-                       geRam_Free(channel->Data);\r
-\r
-               curChannel = sm->smChannels;\r
-               while( curChannel && curChannel != channel )\r
-               {\r
-                       prevChannel = curChannel;\r
-                       curChannel = curChannel->next;\r
-               }\r
-               if( curChannel )\r
-               {\r
-                       if( prevChannel )\r
-                               prevChannel->next = curChannel->next;\r
-                       else\r
-                               sm->smChannels = curChannel->next;\r
-                       geRam_Free(curChannel);\r
-//                     free( curChannel );\r
-               }\r
-       }\r
-\r
-       return TRUE;\r
-}\r
-\r
-static Channel* ReloadData(void *Data)\r
-{\r
-       DSBUFFERDESC    dsBD;\r
-       BYTE *                  pbWaveData;\r
-       INT NumBytes;\r
-//     uint8           *data = NULL;\r
-       Channel* channel;\r
-\r
-//     if( !Name )\r
-//             return( NULL );\r
-//     if( !GetSoundData( Data, &data ) )\r
-//             return( NULL );\r
-\r
-       if( !ParseData( Data, &dsBD, &pbWaveData ) )\r
-               return( NULL );\r
-\r
-       NumBytes = dsBD.dwBufferBytes;\r
-       \r
-       //Create the channel\r
-//     if( !CreateChannel( Name, &dsBD, &channel ) )\r
-       if( !CreateChannel(&dsBD, &channel ) )\r
-               return NULL;\r
-\r
-       //Fill the channel\r
-       if ( !DSFillSoundBuffer(channel->buffer, pbWaveData, NumBytes))\r
-               return NULL;\r
-       \r
-//     geRam_Free(data);\r
-//     free( data );\r
-       return( channel );\r
-}\r
-\r
-static BOOL DupChannel( SoundManager *sm, Channel* channel, Channel** dupChannelPtr )\r
-{\r
-       Channel* dupChannel;\r
-       HRESULT Error;\r
-\r
-       *dupChannelPtr = NULL;\r
-//     dupChannel =  malloc( sizeof(Channel ) );\r
-       dupChannel =  geRam_Allocate( sizeof(Channel ) );\r
-       if( dupChannel == NULL )\r
-       {\r
-               geErrorLog_Add(GE_ERR_OUT_OF_MEMORY, NULL );\r
-               return FALSE;\r
-       }\r
-       Error = IDirectSound_DuplicateSoundBuffer( lpDirectSound, channel->buffer, &dupChannel->buffer );\r
-       if( Error != DS_OK )\r
-       {\r
-               geRam_Free(dupChannel);\r
-//             free( dupChannel );\r
-               dupChannel = ReloadData( channel->Data );\r
-               if( dupChannel == NULL )\r
-               {\r
-                       geErrorLog_Add(GE_ERR_DS_ERROR, NULL);\r
-                       return FALSE;\r
-               }\r
-       }\r
-       dupChannel->ID =  sm->smNextChannelID++;\r
-       dupChannel->next = NULL;\r
-       dupChannel->nextDup = channel->nextDup;\r
-       dupChannel->cfg = channel->cfg;\r
-//     dupChannel->name = NULL;\r
-       dupChannel->Data = channel->Data;\r
-       channel->nextDup = dupChannel;\r
-       *dupChannelPtr = dupChannel;\r
-       return( TRUE );\r
-}\r
-\r
-static BOOL    StartSoundChannel( SoundManager *sm, unsigned int Handle, geSound_Cfg *cfg, int loop, unsigned int* sfx)\r
-{\r
-       HRESULT hres;\r
-       Channel* channel, *dupChannel;\r
-       \r
-       if( Handle == 0 )\r
-               return( FALSE );\r
-       channel = GetChannel( sm, Handle );\r
-       //Clear all non-playing duplicate buffers.\r
-       ClearDupBuffers(channel);\r
-       //If the main buffer is playing and all non-playing dups have been cleared\r
-       //we need a new duplicate.\r
-       if( ChannelPlaying( channel ) )\r
-       {\r
-               if(!DupChannel( sm,channel, &dupChannel ) )\r
-                       return( FALSE );\r
-               channel = dupChannel;\r
-       }\r
-       if( !ModifyChannel( channel, cfg ) )\r
-               return( FALSE );\r
-       IDirectSoundBuffer_SetCurrentPosition(channel->buffer, 0);\r
-       hres = IDirectSoundBuffer_Play( channel->buffer,\r
-                                                                  0,\r
-                                                                  0,\r
-                                                                  loop ? DSBPLAY_LOOPING : 0);\r
-\r
-       if      (hres == DS_OK)\r
-       {\r
-               if( sfx )\r
-                       *sfx = channel->ID;\r
-               return TRUE;\r
-       }\r
-       \r
-       geErrorLog_Add(GE_ERR_DS_ERROR, NULL);\r
-       return FALSE;\r
-}\r
-\r
-static BOOL StopSoundChannel(Channel* channel)\r
-{\r
-       HRESULT hres;\r
-\r
-       assert(channel);\r
-\r
-       hres = IDirectSoundBuffer_Stop(channel->buffer);\r
-\r
-       if      (hres == DS_OK)\r
-               return TRUE;\r
-\r
-       geErrorLog_Add(GE_ERR_DS_ERROR, NULL);\r
-       return FALSE;\r
-}\r
-\r
-static void DestroySoundManager(SoundManager *sm)\r
-{\r
-       if (!sm) return;\r
-\r
-       FreeAllChannels( sm );\r
-       if      (sm->smPrimaryChannel != NULL)\r
-               sm->smPrimaryChannel->lpVtbl->Release(sm->smPrimaryChannel);\r
-       if      (lpDirectSound != NULL)\r
-               IDirectSound_Release(lpDirectSound);\r
-       if  (hmodDirectSound != NULL)\r
-               FreeLibrary (hmodDirectSound);\r
-       geRam_Free(sm);\r
-//     free(sm);\r
-}\r
-\r
-static BOOL    ModifyChannel( Channel *channel, geSound_Cfg *cfg )\r
-{\r
-       int Error, Vol, Pan, Freq;\r
-       assert(channel);\r
-       \r
-       if( !cfg )\r
-               return( TRUE );\r
-       ClearDupBuffers(channel);\r
-       if( cfg->Volume != channel->cfg.Volume )\r
-       {\r
-               Vol = (DWORD)((1.0 - cfg->Volume  ) * DSBVOLUME_MIN);\r
-               Error = IDirectSoundBuffer_SetVolume(channel->buffer, Vol);\r
-               if (Error != DS_OK)\r
-               {\r
-                       geErrorLog_Add(GE_ERR_DS_ERROR, NULL);\r
-                       return FALSE;\r
-               }\r
-               channel->cfg.Volume = cfg->Volume;\r
-       }\r
-\r
-       if( cfg->Pan != channel->cfg.Pan )\r
-       {\r
-               Pan = (int)(cfg->Pan  * DSBPAN_RIGHT);\r
-               Error = IDirectSoundBuffer_SetPan(channel->buffer, Pan);\r
-               if (Error != DS_OK)\r
-               {\r
-                       geErrorLog_Add(GE_ERR_DS_ERROR, NULL);\r
-                       return FALSE;\r
-               }\r
-               channel->cfg.Pan = cfg->Pan;\r
-       }\r
-\r
-\r
-       if( cfg->Frequency != channel->cfg.Frequency )\r
-       {\r
-\r
-               Freq = (DWORD)(channel->BaseFreq * cfg->Frequency);\r
-               Error = IDirectSoundBuffer_SetFrequency(channel->buffer, Freq);\r
-               if (Error != DS_OK)\r
-               {\r
-                       geErrorLog_Add(GE_ERR_DS_ERROR, NULL);\r
-                       return FALSE;\r
-               }\r
-               channel->cfg.Frequency = cfg->Frequency;\r
-       }\r
-\r
-       return TRUE;\r
-}\r
-\r
-static int     ChannelPlaying( Channel *channel )\r
-{\r
-       DWORD status, Error;\r
-\r
-       if(!channel)\r
-               return( 0 );\r
-\r
-       Error = IDirectSoundBuffer_GetStatus( channel->buffer, &status);\r
-       if( Error != DS_OK)\r
-               return 0;\r
-       return( status & DSBSTATUS_PLAYING  );\r
-}\r
-\r
-static Channel* GetChannel( SoundManager *sm, unsigned int ID )\r
-{\r
-       Channel* dupChannel;\r
-       Channel* channel = sm->smChannels;\r
-\r
-       while( channel )\r
-       {\r
-               if( channel->ID == ID )\r
-                       break;\r
-               dupChannel = channel->nextDup;\r
-               while( dupChannel )\r
-               {\r
-                       if( dupChannel->ID == ID )\r
-                               break;\r
-                       dupChannel = dupChannel->nextDup;\r
-               }\r
-               if( dupChannel )\r
-                       return( dupChannel );\r
-               channel = channel->next;\r
-       }\r
-       return( channel );\r
-}\r

diff --git a/G3D/Entities.h b/G3D/Entities.h
index 20fc6f0..41856a3 100644 (file)
--- a/G3D/Entities.h
+++ b/G3D/Entities.h
@@ -28,7 +28,7 @@
 #include "BaseType.h"\r
 #include "ErrorLog.h"\r
 #include "Vec3d.h"\r
 #include "BaseType.h"\r
 #include "ErrorLog.h"\r
 #include "Vec3d.h"\r

-#include "G3D/Engine/System.h"\r
+#include "System.h"\r

 #include "World.h"\r
 #include "Ram.h"\r
 \r
 #include "World.h"\r
 #include "Ram.h"\r
 \r

diff --git a/G3D/Fog.c b/G3D/Fog.c
index 84bd28a..cb336f3 100644 (file)
--- a/G3D/Fog.c
+++ b/G3D/Fog.c
@@ -19,8 +19,8 @@
 /*  Copyright (C) 1999 WildTangent, Inc. All Rights Reserved           */\r
 /*                                                                                      */\r
 /****************************************************************************************/\r
 /*  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 "Fog.h"\r
 \r
 \r
 #include "Fog.h"\r
 \r

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

diff --git a/G3D/Frustum.c b/G3D/Frustum.c
index 8a83251..2a6ec3b 100644 (file)
--- a/G3D/Frustum.c
+++ b/G3D/Frustum.c
@@ -19,14 +19,13 @@
 /*  Copyright (C) 1999 WildTangent, Inc. All Rights Reserved           */\r
 /*                                                                                      */\r
 /****************************************************************************************/\r
 /*  Copyright (C) 1999 WildTangent, Inc. All Rights Reserved           */\r
 /*                                                                                      */\r
 /****************************************************************************************/\r

-#include <Assert.h>\r
-#include <Windows.h>\r
-#include <Math.h>\r
+#include <assert.h>\r
+#include <windows.h>\r
+#include <math.h>\r

 \r
 #include "Camera.h"\r
 #include "Frustum.h"\r
 #include "Surface.h"\r
 \r
 #include "Camera.h"\r
 #include "Frustum.h"\r
 #include "Surface.h"\r

-\r

 #include "Vec3d.h"\r
 \r
 //#define RIGHT_HANDED\r
 #include "Vec3d.h"\r
 \r
 //#define RIGHT_HANDED\r

diff --git a/G3D/FsDos.c b/G3D/FsDos.c
index 6157e8a..cf826c9 100644 (file)
--- a/G3D/FsDos.c
+++ b/G3D/FsDos.c
@@ -21,19 +21,16 @@
 /****************************************************************************************/\r
 #define        WIN32_LEAN_AND_MEAN\r
 #include       <windows.h>\r
 /****************************************************************************************/\r
 #define        WIN32_LEAN_AND_MEAN\r
 #include       <windows.h>\r

-\r

 #include       <stdio.h>\r
 #include       <stdlib.h>\r
 #include       <string.h>\r
 #include       <assert.h>\r
 \r
 #include       <stdio.h>\r
 #include       <stdlib.h>\r
 #include       <string.h>\r
 #include       <assert.h>\r
 \r

-#include       "basetype.h"\r
-#include       "ram.h"\r
-\r
-#include       "vfile.h"\r
-#include       "vfile._h"\r
-\r
-#include       "fsdos.h"\r
+#include       "BaseType.h"\r
+#include       "Ram.h"\r
+#include       "VFile.h"\r
+#include       "VFile._h"\r
+#include       "FsDos.h"\r

 \r
 //     "DF01"\r
 #define        DOSFILE_SIGNATURE       0x31304644\r
 \r
 //     "DF01"\r
 #define        DOSFILE_SIGNATURE       0x31304644\r

diff --git a/G3D/FsMemory.c b/G3D/FsMemory.c
index ce5ac4e..a5f24bd 100644 (file)
--- a/G3D/FsMemory.c
+++ b/G3D/FsMemory.c
@@ -22,19 +22,16 @@
 /****************************************************************************************/\r
 #define        WIN32_LEAN_AND_MEAN\r
 #include       <windows.h>\r
 /****************************************************************************************/\r
 #define        WIN32_LEAN_AND_MEAN\r
 #include       <windows.h>\r

-\r

 #include       <stdio.h>\r
 #include       <stdlib.h>\r
 #include       <string.h>\r
 #include       <assert.h>\r
 \r
 #include       <stdio.h>\r
 #include       <stdlib.h>\r
 #include       <string.h>\r
 #include       <assert.h>\r
 \r

-#include       "basetype.h"\r
-#include       "ram.h"\r
-\r
-#include       "vfile.h"\r
-#include       "vfile._h"\r
-\r
-#include       "fsmemory.h"\r
+#include       "BaseType.h"\r
+#include       "Ram.h"\r
+#include       "VFile.h"\r
+#include       "VFile._h"\r
+#include       "FsMemory.h"\r

 \r
 //     "MF01"\r
 #define        MEMORYFILE_SIGNATURE    0x3130464D\r
 \r
 //     "MF01"\r
 #define        MEMORYFILE_SIGNATURE    0x3130464D\r

diff --git a/G3D/FsVfs.c b/G3D/FsVfs.c
index ed7a368..2f8cade 100644 (file)
--- a/G3D/FsVfs.c
+++ b/G3D/FsVfs.c
@@ -24,10 +24,9 @@
 #include       <string.h>\r
 #include       <assert.h>\r
 \r
 #include       <string.h>\r
 #include       <assert.h>\r
 \r

-#include       "ram.h"\r
-\r
-#include       "fsvfs.h"\r
-#include       "dirtree.h"\r
+#include       "Ram.h"\r
+#include       "FsVfs.h"\r
+#include       "DirTree.h"\r

 \r
 //     "VF00"\r
 #define        VFSFILEHEADER_SIGNATURE 0x30304656\r
 \r
 //     "VF00"\r
 #define        VFSFILEHEADER_SIGNATURE 0x30304656\r

diff --git a/G3D/FsVfs.h b/G3D/FsVfs.h
index ed70d2f..e5828f2 100644 (file)
--- a/G3D/FsVfs.h
+++ b/G3D/FsVfs.h
@@ -22,7 +22,7 @@
 #ifndef        FSVFS_H\r
 #define        FSVFS_H\r
 \r
 #ifndef        FSVFS_H\r
 #define        FSVFS_H\r
 \r

-#include "vfile._h"\r
+#include "VFile._h"\r

 \r
 const  geVFile_SystemAPIs * GENESISCC FSVFS_GetAPIs(void);\r
 \r
 \r
 const  geVFile_SystemAPIs * GENESISCC FSVFS_GetAPIs(void);\r
 \r

diff --git a/G3D/GBSPFile.c b/G3D/GBSPFile.c
index 78e20b0..9ac55cd 100644 (file)
--- a/G3D/GBSPFile.c
+++ b/G3D/GBSPFile.c
@@ -19,14 +19,13 @@
 /*  Copyright (C) 1999 WildTangent, Inc. All Rights Reserved           */\r
 /*                                                                                      */\r
 /****************************************************************************************/\r
 /*  Copyright (C) 1999 WildTangent, Inc. All Rights Reserved           */\r
 /*                                                                                      */\r
 /****************************************************************************************/\r

-#include <Stdio.h>\r
+#include <stdio.h>\r

 #include <assert.h>\r
 \r
 #include "GBSPFile.h"\r
 #include "Vec3d.h"\r
 #include "Ram.h"\r
 #include "System.h"\r
 #include <assert.h>\r
 \r
 #include "GBSPFile.h"\r
 #include "Vec3d.h"\r
 #include "Ram.h"\r
 #include "System.h"\r

-\r

 #include "ErrorLog.h"\r
 #include "VFile.h"\r
 \r
 #include "ErrorLog.h"\r
 #include "VFile.h"\r
 \r

diff --git a/G3D/GBSPFile.h b/G3D/GBSPFile.h
index c402f86..570b49e 100644 (file)
--- a/G3D/GBSPFile.h
+++ b/G3D/GBSPFile.h
@@ -23,11 +23,11 @@
 #define GE_GBSPFILE_H\r
 \r
 #include <stdio.h>\r
 #define GE_GBSPFILE_H\r
 \r
 #include <stdio.h>\r

+#include <windows.h>\r

 \r
 #include "G3D/BaseType.h"\r
 #include "G3D/Vec3d.h"\r
 \r
 #include "G3D/BaseType.h"\r
 #include "G3D/Vec3d.h"\r

-#include <windows.h>\r
-#include "G3D/Engine/Drivers/DCommon.h"\r
+#include "DCommon.h"\r

 #include "G3D/VFile.h"\r
 #include "G3D/Motion.h"\r
 \r
 #include "G3D/VFile.h"\r
 #include "G3D/Motion.h"\r
 \r

diff --git a/G3D/Ge.c b/G3D/Ge.c
index 1f4b5ca..0f33bc4 100644 (file)
--- a/G3D/Ge.c
+++ b/G3D/Ge.c
@@ -25,7 +25,7 @@
 #include <assert.h>\r
 \r
 #include "Genesis.h"\r
 #include <assert.h>\r
 \r
 #include "Genesis.h"\r

-#include "G3D/Engine/System.h"\r
+#include "System.h"\r

 #include "Ram.h"\r
 \r
 //#include "Sound.h"\r
 #include "Ram.h"\r
 \r
 //#include "Sound.h"\r

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

diff --git a/G3D/Light.c b/G3D/Light.c
index 905ba13..2783ae7 100644 (file)
--- a/G3D/Light.c
+++ b/G3D/Light.c
@@ -19,9 +19,9 @@
 /*  Copyright (C) 1999 WildTangent, Inc. All Rights Reserved           */\r
 /*                                                                                      */\r
 /****************************************************************************************/\r
 /*  Copyright (C) 1999 WildTangent, Inc. All Rights Reserved           */\r
 /*                                                                                      */\r
 /****************************************************************************************/\r

-#include <Assert.h>\r
-#include <Windows.h>\r
-#include <Math.h>\r
+#include <assert.h>\r
+#include <windows.h>\r
+#include <math.h>\r

 \r
 #include "BaseType.h"\r
 #include "Ram.h"\r
 \r
 #include "BaseType.h"\r
 #include "Ram.h"\r


@@ -32,7 +32,6 @@
 #include "GBSPFile.h"\r
 #include "Plane.h"\r
 #include "World.h"\r
 #include "GBSPFile.h"\r
 #include "Plane.h"\r
 #include "World.h"\r

-\r

 #include "Trace.h"\r
 \r
 #define LIGHT_FRACT            8\r
 #include "Trace.h"\r
 \r
 #define LIGHT_FRACT            8\r

diff --git a/G3D/Light.h b/G3D/Light.h
index e13d199..a4fdd5e 100644 (file)
--- a/G3D/Light.h
+++ b/G3D/Light.h
@@ -25,10 +25,10 @@
 #include <assert.h>\r
 //#include <Windows.h>\r
 \r
 #include <assert.h>\r
 //#include <Windows.h>\r
 \r

-#include "G3D/Genesis.h"\r
-#include "G3D/BaseType.h"\r
-#include "G3D/Engine/System.h"\r
-#include "G3D/Engine/Drivers/DCommon.h"\r
+#include "Genesis.h"\r
+#include "BaseType.h"\r
+#include "System.h"\r
+#include "DCommon.h"\r

 \r
 #ifdef __cplusplus\r
 extern "C" {\r
 \r
 #ifdef __cplusplus\r
 extern "C" {\r

diff --git a/G3D/List.c b/G3D/List.c
index 5b52e17..822ec63 100644 (file)
--- a/G3D/List.c
+++ b/G3D/List.c
@@ -114,9 +114,12 @@ LinkNode *pNode;
 int Len=0;\r
        if ( ! pList )\r
                return 0;\r
 int Len=0;\r
        if ( ! pList )\r
                return 0;\r

-       LN_Walk(pNode,pList) {\r
-               Len++;\r
-       }\r
+    // FIXME: damn macros\r
+    //#define zLN_Walk(Node,List)         for( Node = (List)->Next; (Node) != (List) ; Node = (Node)->Next )\r
+       //LN_Walk(pNode,pList) {\r
+        for (pNode = pList->Next; pNode != pList; pNode = pNode->Next)\r
+                   Len++;\r
+       //}\r

 return Len;\r
 }\r
 \r
 return Len;\r
 }\r
 \r


@@ -1125,12 +1128,15 @@ void Hash_Destroy(Hash *pHash)
                Debug(pHash->Members += 2) // count Head & Tail\r
 \r
                pList = pHash->NodeList;\r
                Debug(pHash->Members += 2) // count Head & Tail\r
 \r
                pList = pHash->NodeList;\r

-               LN_Walk_Editting(pNode,pList,pNext) {\r
+        // FIXME: damn macros\r
+        // #define zLN_Walk_Editting(Node,List,Holder) for( Node = (List)->Next; (Node) != (List) && ((Holder) = (Node)->Next) != NULL ; Node = Holder )\r
+               //LN_Walk_Editting(pNode,pList,pNext) {\r
+        /*for (pNode = (pList)->Next; (pNode != pList) && ((pNext = pNode->Next) != NULL); pNode = pNext) {\r

                        MemPool_FreeHunk(HashNodePool_g,pNode);\r
             // FIXME: where does this member variable come from?!?\r
                        //assert(pHash->Members > 1);\r
                        Debug(pHash->Members --)\r
                        MemPool_FreeHunk(HashNodePool_g,pNode);\r
             // FIXME: where does this member variable come from?!?\r
                        //assert(pHash->Members > 1);\r
                        Debug(pHash->Members --)\r

-               }\r
+               }*/\r

         // FIXME: where does this member variable come from?!?\r
                //assert(pHash->Members == 1);\r
                MemPool_FreeHunk(HashNodePool_g,pList);\r
         // FIXME: where does this member variable come from?!?\r
                //assert(pHash->Members == 1);\r
                MemPool_FreeHunk(HashNodePool_g,pList);\r

diff --git a/G3D/Log.h b/G3D/Log.h
index b112ce2..1b1ec2c 100644 (file)
--- a/G3D/Log.h
+++ b/G3D/Log.h
@@ -35,7 +35,7 @@ void Log_Printf(const char * string, ...);
 \r
 #else  // _LOG\r
 \r
 \r
 #else  // _LOG\r
 \r

-static _inline void Log_Printf(const char * str, ...) { }\r
+static inline void Log_Printf(const char * str, ...) { }\r

 #define Log_Puts(string)\r
 \r
 #endif // _LOG\r
 #define Log_Puts(string)\r
 \r
 #endif // _LOG\r

diff --git a/G3D/Engine/Logo/logo.c b/G3D/Logo.c
similarity index 95%
rename from G3D/Engine/Logo/logo.c
rename to G3D/Logo.c
index 17f7632..2d42211 100644 (file)
--- a/G3D/Engine/Logo/logo.c
+++ b/G3D/Logo.c
@@ -24,15 +24,14 @@
 #include <windows.h>\r
 #include <mmsystem.h> //timeGetTime\r
 #pragma warning(default : 4201 4214 4115)\r
 #include <windows.h>\r
 #include <mmsystem.h> //timeGetTime\r
 #pragma warning(default : 4201 4214 4115)\r

-\r

 #include       <math.h>\r
 \r
 #include       <math.h>\r
 \r

-#include       "genesis.h"\r
-#include       "engine.h"\r
-#include       "bitmap.h"\r
+#include       "Genesis.h"\r
+#include       "Engine.h"\r
+#include       "Bitmap.h"\r

 #include       "PixelFormat.h"\r
 #include       "PixelFormat.h"\r

-#include       "errorlog.h"\r
-#include       "electric.h"\r
+#include       "ErrorLog.h"\r
+#include       "Electric.h"\r

 \r
 extern unsigned char   LogoActor_act[];\r
 extern int                             LogoActor_act_Length;\r
 \r
 extern unsigned char   LogoActor_act[];\r
 extern int                             LogoActor_act_Length;\r


@@ -51,7 +50,8 @@ extern        int                             A_Streak_bmp_Length;
 \r
 static void SubLarge(LARGE_INTEGER *start, LARGE_INTEGER *end, LARGE_INTEGER *delta)\r
 {\r
 \r
 static void SubLarge(LARGE_INTEGER *start, LARGE_INTEGER *end, LARGE_INTEGER *delta)\r
 {\r

-       _asm {\r
+    // FIXME: asm code\r
+       /*_asm {\r

                mov ebx,dword ptr [start]\r
                mov esi,dword ptr [end]\r
 \r
                mov ebx,dword ptr [start]\r
                mov esi,dword ptr [end]\r
 \r


@@ -64,7 +64,7 @@ static void SubLarge(LARGE_INTEGER *start, LARGE_INTEGER *end, LARGE_INTEGER *de
                mov ebx,dword ptr [delta]\r
                mov dword ptr [ebx+0],eax\r
                mov dword ptr [ebx+4],edx\r
                mov ebx,dword ptr [delta]\r
                mov dword ptr [ebx+0],eax\r
                mov dword ptr [ebx+4],edx\r

-       }\r
+       }*/\r

 }\r
 \r
 static geBoolean       GetBonePosition(geActor *Actor, const char *BoneName, geVec3d *Pos)\r
 }\r
 \r
 static geBoolean       GetBonePosition(geActor *Actor, const char *BoneName, geVec3d *Pos)\r

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

diff --git a/G3D/Actor/motion.c b/G3D/Motion.c
similarity index 95%
rename from G3D/Actor/motion.c
rename to G3D/Motion.c
index db825c8..647d9d4 100644 (file)
--- a/G3D/Actor/motion.c
+++ b/G3D/Motion.c
@@ -29,11 +29,11 @@
 #include <assert.h>\r
 #include <string.h>            // strcmp, strnicmp\r
 \r
 #include <assert.h>\r
 #include <string.h>            // strcmp, strnicmp\r
 \r

-#include "basetype.h"\r
-#include "ram.h"\r
-#include "errorlog.h"\r
-#include "motion.h"\r
-#include "tkevents.h"\r
+#include "BaseType.h"\r
+#include "Ram.h"\r
+#include "ErrorLog.h"\r
+#include "Motion.h"\r
+#include "TKEvents.h"\r

 #include "StrBlock.h"\r
 \r
 #pragma warning(disable : 4201)                // we're using nameless structures\r
 #include "StrBlock.h"\r
 \r
 #pragma warning(disable : 4201)                // we're using nameless structures\r

diff --git a/G3D/NetPlay.c b/G3D/NetPlay.c
index da5387f..a5d1a76 100644 (file)
--- a/G3D/NetPlay.c
+++ b/G3D/NetPlay.c
@@ -118,7 +118,7 @@ BOOL InitNetPlay(LPGUID lpGuid)
 //====================================================================================================\r
 BOOL NetPlayEnumSession(LPSTR IPAdress, SESSION_DESC **SessionList, DWORD *SessionNum)\r
 {      \r
 //====================================================================================================\r
 BOOL NetPlayEnumSession(LPSTR IPAdress, SESSION_DESC **SessionList, DWORD *SessionNum)\r
 {      \r

-       HRESULT         hr;\r
+       HRESULT         hr = NULL;\r

 \r
 #if 1\r
        char                                    tempBuf[1024];\r
 \r
 #if 1\r
        char                                    tempBuf[1024];\r


@@ -132,8 +132,9 @@ BOOL NetPlayEnumSession(LPSTR IPAdress, SESSION_DESC **SessionList, DWORD *Sessi
                lpConnectionBuffer = NULL;\r
        }\r
 \r
                lpConnectionBuffer = NULL;\r
        }\r
 \r

-       hr = CoCreateInstance(  &CLSID_DirectPlayLobby, NULL, CLSCTX_INPROC_SERVER,\r
-                                                       &IID_IDirectPlayLobby3A, (LPVOID *) &lpDPL );\r
+    // FIXME: IID_IDirectPlayLobby3A cant be linked to in a shared object? hmm\r
+       //hr = CoCreateInstance(        &CLSID_DirectPlayLobby, NULL, CLSCTX_INPROC_SERVER,\r
+       //                                              &IID_IDirectPlayLobby3A, (LPVOID *) &lpDPL );\r

 \r
        if (hr != DP_OK)\r
        {\r
 \r
        if (hr != DP_OK)\r
        {\r

diff --git a/G3D/Bitmap/Compression/palcreate.c b/G3D/PALCreate.c
similarity index 93%
rename from G3D/Bitmap/Compression/palcreate.c
rename to G3D/PALCreate.c
index f86a0f2..a75929d 100644 (file)
--- a/G3D/Bitmap/Compression/palcreate.c
+++ b/G3D/PALCreate.c
@@ -81,15 +81,15 @@ why this isn't exactly optimal:
 ***********/\r
 /*}{*************************************************/\r
 \r
 ***********/\r
 /*}{*************************************************/\r
 \r

-#include "palcreate.h"\r
-#include "tsc.h"\r
-#include "paloptimize.h"\r
-#include "ram.h"\r
-#include "yuv.h"\r
-#include "mempool.h"\r
-#include "utility.h"           // delete macro\r

 #include <stdlib.h>\r
 #include <assert.h>\r
 #include <stdlib.h>\r
 #include <assert.h>\r

+#include "PALCreate.h"\r
+#include "TSC.h"\r
+#include "PALOptimize.h"\r
+#include "Ram.h"\r
+#include "YUV.h"\r
+#include "MemPool.h"\r
+#include "Utility.h"           // delete macro\r

 \r
 /*******/\r
 \r
 \r
 /*******/\r
 \r


@@ -193,11 +193,11 @@ struct octNode
 \r
 int createOctTree(octNode * root,const geBitmap_Info * Info,const void * Bits,geBoolean doYUV);\r
 geBitmap_Palette * createPaletteGoodSub(const geBitmap_Info * Info,const void * Bits);\r
 \r
 int createOctTree(octNode * root,const geBitmap_Info * Info,const void * Bits,geBoolean doYUV);\r
 geBitmap_Palette * createPaletteGoodSub(const geBitmap_Info * Info,const void * Bits);\r

-void addOctNode(octNode *root,int R,int G,int B,int *nLeavesPtr);\r
-void gatherLeaves(octNode *node,octNode *** leavesPtrPtr,int minCount);\r
-void gatherLeavesCutting(octNode *node,octNode *** leavesPtrPtr);\r
-int leafCompareCount(const void *a,const void *b);\r
-int leafCompareCost(const void *a,const void *b);\r
+static void addOctNode(octNode *root,int R,int G,int B,int *nLeavesPtr);\r
+static void gatherLeaves(octNode *node,octNode *** leavesPtrPtr,int minCount);\r
+static void gatherLeavesCutting(octNode *node,octNode *** leavesPtrPtr);\r
+static int leafCompareCount(const void *a,const void *b);\r
+static int leafCompareCost(const void *a,const void *b);\r

 int findClosest(int R,int G,int B,uint8 *palette,int palEntries,int *foundPalPtr);\r
 void computeOctRGBs(octNode *node);\r
 void computeCutCosts(octNode *node);\r
 int findClosest(int R,int G,int B,uint8 *palette,int palEntries,int *foundPalPtr);\r
 void computeOctRGBs(octNode *node);\r
 void computeCutCosts(octNode *node);\r

diff --git a/G3D/Bitmap/Compression/palcreate.h b/G3D/PALCreate.h
similarity index 96%
rename from G3D/Bitmap/Compression/palcreate.h
rename to G3D/PALCreate.h
index 3591a63..038ba5f 100644 (file)
--- a/G3D/Bitmap/Compression/palcreate.h
+++ b/G3D/PALCreate.h
@@ -1,8 +1,8 @@
 #ifndef GE_BRANDO_PALCREATE_H\r
 #define GE_BRANDO_PALCREATE_H\r
 \r
 #ifndef GE_BRANDO_PALCREATE_H\r
 #define GE_BRANDO_PALCREATE_H\r
 \r

-#include "basetype.h"\r
-#include "bitmap.h"\r
+#include "BaseType.h"\r
+#include "Bitmap.h"\r

 \r
 /****************************************************************************************/\r
 /*  PalCreate                                                                           */\r
 \r
 /****************************************************************************************/\r
 /*  PalCreate                                                                           */\r

diff --git a/G3D/Bitmap/Compression/paloptimize.c b/G3D/PALOptimize.c
similarity index 94%
rename from G3D/Bitmap/Compression/paloptimize.c
rename to G3D/PALOptimize.c
index 47f765c..a60e160 100644 (file)
--- a/G3D/Bitmap/Compression/paloptimize.c
+++ b/G3D/PALOptimize.c
@@ -73,14 +73,13 @@ The problems :
 \r
 **********/\r
 \r
 \r
 **********/\r
 \r

-#include "yuv.h"\r
-#include "palettize.h"\r
-#include "utility.h"\r
-#include "tsc.h"\r
-#include "log.h"\r
-\r
-#include "bitmap.h"\r
-#include "pixelformat.h"\r
+#include "YUV.h"\r
+#include "Palettize.h"\r
+#include "Utility.h"\r
+#include "TSC.h"\r
+#include "Log.h"\r
+#include "Bitmap.h"\r
+#include "PixelFormat.h"\r

 \r
 /*******/\r
 \r
 \r
 /*******/\r
 \r

diff --git a/G3D/Bitmap/Compression/paloptimize.h b/G3D/PALOptimize.h
similarity index 96%
rename from G3D/Bitmap/Compression/paloptimize.h
rename to G3D/PALOptimize.h
index deed9e1..47b9dcd 100644 (file)
--- a/G3D/Bitmap/Compression/paloptimize.h
+++ b/G3D/PALOptimize.h
@@ -23,8 +23,8 @@
 /*                                                                                      */\r
 /****************************************************************************************/\r
 \r
 /*                                                                                      */\r
 /****************************************************************************************/\r
 \r

-#include "basetype.h"\r
-#include "bitmap.h"\r
+#include "BaseType.h"\r
+#include "Bitmap.h"\r

 \r
 #ifdef __cplusplus\r
 extern "C" {\r
 \r
 #ifdef __cplusplus\r
 extern "C" {\r

diff --git a/G3D/Bitmap/Compression/palettize.c b/G3D/Palettize.c
similarity index 95%
rename from G3D/Bitmap/Compression/palettize.c
rename to G3D/Palettize.c
index 269393e..4b25551 100644 (file)
--- a/G3D/Bitmap/Compression/palettize.c
+++ b/G3D/Palettize.c
@@ -36,15 +36,15 @@ we palettize ("inverse colormap") using an octree lookup system
 \r
 **********/\r
 \r
 \r
 **********/\r
 \r

-#include "palettize.h"\r

 #include <stdlib.h>\r
 #include <assert.h>\r
 #include <stdlib.h>\r
 #include <assert.h>\r

-#include "ram.h"\r
-#include "mempool.h"\r
+#include "Palettize.h"\r
+#include "Ram.h"\r
+#include "MemPool.h"\r

 \r
 #ifdef _TSC\r
 #pragma message("palettize using TSC")\r
 \r
 #ifdef _TSC\r
 #pragma message("palettize using TSC")\r

-#include "tsc.h"\r
+#include "TSC.h"\r

 #endif\r
 \r
 /*******/\r
 #endif\r
 \r
 /*******/\r

diff --git a/G3D/Bitmap/Compression/palettize.h b/G3D/Palettize.h
similarity index 96%
rename from G3D/Bitmap/Compression/palettize.h
rename to G3D/Palettize.h
index ab3152b..e6a4928 100644 (file)
--- a/G3D/Bitmap/Compression/palettize.h
+++ b/G3D/Palettize.h
@@ -23,8 +23,8 @@
 /*                                                                                      */\r
 /****************************************************************************************/\r
 \r
 /*                                                                                      */\r
 /****************************************************************************************/\r
 \r

-#include "basetype.h"\r
-#include "bitmap.h"\r
+#include "BaseType.h"\r
+#include "Bitmap.h"\r

 \r
 #ifdef __cplusplus\r
 extern "C" {\r
 \r
 #ifdef __cplusplus\r
 extern "C" {\r

diff --git a/G3D/Actor/path.c b/G3D/Path.c
similarity index 95%
rename from G3D/Actor/path.c
rename to G3D/Path.c
index 2cf105e..b32f35e 100644 (file)
--- a/G3D/Actor/path.c
+++ b/G3D/Path.c
@@ -24,14 +24,14 @@
 #include <string.h>\r
 #include <stdio.h>  //sscanf\r
 \r
 #include <string.h>\r
 #include <stdio.h>  //sscanf\r
 \r

-#include "path.h"\r
-#include "Quatern.h"\r
-#include "errorlog.h"\r
-#include "ram.h"\r
-#include "tkarray.h"\r
+#include "Path.h"\r
+#include "Quaternion.h"\r
+#include "ErrorLog.h"\r
+#include "Ram.h"\r
+#include "TKArray.h"\r

 #include "VKFrame.h"\r
 #include "QKFrame.h"\r
 #include "VKFrame.h"\r
 #include "QKFrame.h"\r

-#include "vec3d.h"\r
+#include "Vec3d.h"\r

 \r
 #define min(aa,bb)  (( (aa)>(bb) ) ? (bb) : (aa) )\r
 #define max(aa,bb)  (( (aa)>(bb) ) ? (aa) : (bb) )\r
 \r
 #define min(aa,bb)  (( (aa)>(bb) ) ? (bb) : (aa) )\r
 #define max(aa,bb)  (( (aa)>(bb) ) ? (aa) : (bb) )\r


@@ -1654,4 +1654,4 @@ static gePath * GENESISCC gePath_CreateFromBinaryFile(geVFile *F,uint32 Header)
        P->Dirty = FLAG_DIRTY;\r
        return P;\r
 }\r
        P->Dirty = FLAG_DIRTY;\r
        return P;\r
 }\r

-               
\ No newline at end of file
+               \r

diff --git a/G3D/Physics/PhysicsJoint.h b/G3D/Physics/PhysicsJoint.h
deleted file mode 100644 (file)
index 776c274..0000000
--- a/G3D/Physics/PhysicsJoint.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/****************************************************************************************/\r
-/*  PHYSICSJOINT.H                                                                      */\r
-/*                                                                                      */\r
-/*  Author: Jason Wood                                                                  */\r
-/*  Description: Rigid body joint 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
-/*  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        PHYSICSJOINT_H\r
-#define PHYSICSJOINT_H\r
-\r
-#ifdef __cplusplus\r
-extern "C" {\r
-#endif\r
-\r
-typedef enum\r
-{\r
-       JT_WORLD = 0,\r
-       JT_SPHERICAL,\r
-       JT_PTTOPATH,\r
-       JT_PTTOSURFACE\r
-}      gePhysicsJoint_Kind;\r
-\r
-typedef struct gePhysicsJoint gePhysicsJoint;\r
-\r
-////////////////////////////////////////////////////////////////////////////////////////////////////\r
-// ctor / dtor\r
-\r
-//gePhysicsJoint* gePhysicsJoint_Create(ItemJoint* pItemJoint);\r
-GENESISAPI gePhysicsJoint * GENESISCC gePhysicsJoint_Create(gePhysicsJoint_Kind Kind, const geVec3d *Location, \r
-       geFloat assemblyRate, gePhysicsObject *PS1, gePhysicsObject *PS2, geFloat physicsScale);\r
-GENESISAPI geBoolean GENESISCC gePhysicsJoint_Destroy(gePhysicsJoint** ppPhysjnt);\r
-\r
-////////////////////////////////////////////////////////////////////////////////////////////////////////////\r
-// functions\r
-\r
-GENESISAPI gePhysicsJoint_Kind GENESISCC gePhysicsJoint_GetType(const gePhysicsJoint* pPhysjnt);\r
-GENESISAPI void GENESISCC gePhysicsJoint_GetLocationA(const gePhysicsJoint* pPhysjnt, geVec3d* pLoc);\r
-GENESISAPI void GENESISCC gePhysicsJoint_GetLocationB(const gePhysicsJoint* pPhysjnt, geVec3d* pLoc);\r
-GENESISAPI void GENESISCC gePhysicsJoint_SetLocationA(gePhysicsJoint* pPhysjnt, const geVec3d* pLoc);\r
-GENESISAPI void GENESISCC gePhysicsJoint_SetLocationB(gePhysicsJoint* pPhysjnt, const geVec3d* pLoc);\r
-GENESISAPI void GENESISCC gePhysicsJoint_GetLocationAInWorldSpace(const gePhysicsJoint* pPhysjnt, geVec3d* pLoc);\r
-GENESISAPI void GENESISCC gePhysicsJoint_GetLocationBInWorldSpace(const gePhysicsJoint* pPhysjnt, geVec3d* pLoc);\r
-GENESISAPI void GENESISCC gePhysicsJoint_SetLocationAInWorldSpace(gePhysicsJoint* pPhysjnt, const geVec3d* pLoc);\r
-GENESISAPI void GENESISCC gePhysicsJoint_SetLocationBInWorldSpace(gePhysicsJoint* pPhysjnt, const geVec3d* pLoc);\r
-GENESISAPI gePhysicsObject* GENESISCC gePhysicsJoint_GetObject1(const gePhysicsJoint* pPhysjnt);\r
-GENESISAPI gePhysicsObject* GENESISCC gePhysicsJoint_GetObject2(const gePhysicsJoint* pPhysjnt);\r
-GENESISAPI geFloat GENESISCC gePhysicsJoint_GetAssemblyRate(const gePhysicsJoint* pPhysjnt);\r
-GENESISAPI void GENESISCC gePhysicsJoint_SetAssemblyRate(gePhysicsJoint* pPhysjnt, geFloat assemblyRate);\r
-\r
-#ifdef __cplusplus\r
-}\r
-#endif\r
-\r
-#endif\r

diff --git a/G3D/Physics/PhysicsObject.h b/G3D/Physics/PhysicsObject.h
deleted file mode 100644 (file)
index 691bb76..0000000
--- a/G3D/Physics/PhysicsObject.h
+++ /dev/null
@@ -1,137 +0,0 @@
-/****************************************************************************************/\r
-/*  PHYSICSOBJECT.H                                                                     */\r
-/*                                                                                      */\r
-/*  Author: Jason Wood                                                                  */\r
-/*  Description: Constrained rigid body 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
-/*  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        PHYSICSOBJECT_H\r
-#define PHYSICSOBJECT_H\r
-\r
-#include "matrix33.h"\r
-\r
-#ifdef __cplusplus\r
-extern "C" {\r
-#endif\r
-\r
-#define PHYSICSOBJECT_GRAVITY                          (-3.9f)\r
-\r
-typedef struct gePhysicsObject gePhysicsObject;\r
-\r
-////////////////////////////////////////////////////////////////////////////////////////////////////////////\r
-// ctor/dtor\r
-\r
-GENESISAPI gePhysicsObject * GENESISCC gePhysicsObject_Create(\r
-       const geVec3d *StartLocation,\r
-       geFloat mass,\r
-       geBoolean IsAffectedByGravity,\r
-       geBoolean RespondsToForces,\r
-       geFloat linearDamping,\r
-       geFloat angularDamping,\r
-       const geVec3d * Mins,\r
-       const geVec3d * Maxs,\r
-       geFloat physicsScale);\r
-GENESISAPI geBoolean GENESISCC gePhysicsObject_Destroy(gePhysicsObject** pPhysob);\r
-\r
-////////////////////////////////////////////////////////////////////////////////////////////////////////////\r
-// functions\r
-\r
-GENESISAPI geBoolean GENESISCC gePhysicsObject_ApplyGlobalFrameForce(gePhysicsObject* pod, geVec3d* force, geVec3d* radiusVector, geBoolean isAppliedForce,\r
-       int configIndex);\r
-GENESISAPI geBoolean GENESISCC gePhysicsObject_ApplyGlobalFrameImpulse(gePhysicsObject* pPhysob, geVec3d* pImpulse, geVec3d* pRadVec, int configIndex);\r
-GENESISAPI geBoolean GENESISCC gePhysicsObject_ComputeForces(gePhysicsObject* pod, int configIndex);\r
-GENESISAPI geBoolean GENESISCC gePhysicsObject_Integrate(gePhysicsObject* pod, geFloat deltaTime, int SourceConfigIndex);\r
-\r
-GENESISAPI geFloat GENESISCC gePhysicsObject_GetMass(const gePhysicsObject* po);\r
-GENESISAPI void GENESISCC gePhysicsObject_SetMass(gePhysicsObject* po, geFloat mass);\r
-\r
-GENESISAPI geFloat GENESISCC gePhysicsObject_GetOneOverMass(const gePhysicsObject* po);\r
-\r
-GENESISAPI void GENESISCC gePhysicsObject_GetXForm(const gePhysicsObject* po, geXForm3d* xform, int configIndex);\r
-GENESISAPI void GENESISCC gePhysicsObject_SetXForm(gePhysicsObject* po, const geXForm3d* xform, int configIndex);\r
-\r
-GENESISAPI void GENESISCC gePhysicsObject_GetXFormInEditorSpace(const gePhysicsObject* po, geXForm3d* xform, int configIndex);\r
-\r
-GENESISAPI void GENESISCC gePhysicsObject_GetOriginalLocation(const gePhysicsObject* po, geVec3d* loc);\r
-GENESISAPI void GENESISCC gePhysicsObject_SetOriginalLocation(gePhysicsObject* po, const geVec3d* loc);\r
-\r
-GENESISAPI void GENESISCC gePhysicsObject_GetLocation(const gePhysicsObject *po, geVec3d *Location, int configIndex);\r
-GENESISAPI void GENESISCC gePhysicsObject_GetLocationInEditorSpace(const gePhysicsObject* po, geVec3d* loc, int configIndex);\r
-\r
-GENESISAPI void GENESISCC gePhysicsObject_GetLinearVelocity(const gePhysicsObject* po, geVec3d* vel, int configIndex);\r
-GENESISAPI void GENESISCC gePhysicsObject_SetLinearVelocity(gePhysicsObject* po, const geVec3d* vel, int configIndex);\r
-\r
-GENESISAPI void GENESISCC gePhysicsObject_GetAngularVelocity(const gePhysicsObject* po, geVec3d* vel, int configIndex);\r
-GENESISAPI void GENESISCC gePhysicsObject_SetAngularVelocity(gePhysicsObject* po, const geVec3d* vel, int configIndex);\r
-\r
-GENESISAPI void GENESISCC gePhysicsObject_GetForce(const gePhysicsObject* po, geVec3d* force, int configIndex);\r
-GENESISAPI void GENESISCC gePhysicsObject_SetForce(gePhysicsObject* po, const geVec3d* force, int configIndex);\r
-\r
-GENESISAPI void GENESISCC gePhysicsObject_GetTorque(const gePhysicsObject* po, geVec3d* torque, int configIndex);\r
-GENESISAPI void GENESISCC gePhysicsObject_SetTorque(gePhysicsObject* po, const geVec3d* torque, int configIndex);\r
-\r
-GENESISAPI void GENESISCC gePhysicsObject_GetAppliedForce(const gePhysicsObject* po, geVec3d* force, int configIndex);\r
-GENESISAPI void GENESISCC gePhysicsObject_SetAppliedForce(gePhysicsObject* po, const geVec3d* force, int configIndex);\r
-\r
-GENESISAPI void GENESISCC gePhysicsObject_GetAppliedTorque(const gePhysicsObject* po, geVec3d* torque, int configIndex);\r
-GENESISAPI void GENESISCC gePhysicsObject_SetAppliedTorque(gePhysicsObject* po, const geVec3d* torque, int configIndex);\r
-\r
-GENESISAPI void GENESISCC gePhysicsObject_ClearForce(gePhysicsObject* po, int configIndex);\r
-GENESISAPI void GENESISCC gePhysicsObject_ClearTorque(gePhysicsObject* po, int configIndex);\r
-\r
-GENESISAPI void GENESISCC gePhysicsObject_ClearAppliedForce(gePhysicsObject* po, int configIndex);\r
-GENESISAPI void GENESISCC gePhysicsObject_ClearAppliedTorque(gePhysicsObject* po, int configIndex);\r
-\r
-GENESISAPI void GENESISCC gePhysicsObject_IncForce(gePhysicsObject* po, const geVec3d* forceInc, int configIndex);\r
-GENESISAPI void GENESISCC gePhysicsObject_IncTorque(gePhysicsObject* po, const geVec3d* torqueInc, int configIndex);\r
-\r
-GENESISAPI void GENESISCC gePhysicsObject_IncAppliedForce(gePhysicsObject* po, const geVec3d* forceInc, int configIndex);\r
-GENESISAPI void GENESISCC gePhysicsObject_IncAppliedTorque(gePhysicsObject* po, const geVec3d* torqueInc, int configIndex);\r
-\r
-GENESISAPI void GENESISCC gePhysicsObject_GetOrientation(const gePhysicsObject* po, geQuaternion* orient, int configIndex);\r
-GENESISAPI void GENESISCC gePhysicsObject_SetOrientation(gePhysicsObject* po, const geQuaternion* orient, int configIndex);\r
-\r
-GENESISAPI void GENESISCC gePhysicsObject_GetInertiaTensor(const gePhysicsObject* po, Matrix33* iTensor);\r
-GENESISAPI void GENESISCC gePhysicsObject_GetInertiaTensorInverse(const gePhysicsObject* po, Matrix33* iTensorInv);\r
-\r
-GENESISAPI void GENESISCC gePhysicsObject_GetInertiaTensorInPhysicsSpace(const gePhysicsObject* pPhysob, Matrix33* pITensor, int configIndex);\r
-GENESISAPI void GENESISCC gePhysicsObject_GetInertiaTensorInverseInPhysicsSpace(const gePhysicsObject* pPhysob, Matrix33* pITensorInv, int configIndex);\r
-\r
-GENESISAPI geBoolean GENESISCC gePhysicsObject_IsAffectedByGravity(const gePhysicsObject* po);\r
-GENESISAPI void GENESISCC gePhysicsObject_SetIsAffectedByGravity(gePhysicsObject* po, geBoolean flag);\r
-\r
-GENESISAPI geBoolean GENESISCC gePhysicsObject_RespondsToForces(const gePhysicsObject* po);\r
-GENESISAPI void GENESISCC gePhysicsObject_SetRespondsToForces(gePhysicsObject* po, geBoolean flag);\r
-\r
-GENESISAPI geFloat GENESISCC gePhysicsObject_GetLinearDamping(const gePhysicsObject* po);\r
-GENESISAPI void GENESISCC gePhysicsObject_SetLinearDamping(gePhysicsObject* po, geFloat linearDamping);\r
-\r
-GENESISAPI geFloat GENESISCC gePhysicsObject_GetAngularDamping(const gePhysicsObject* po);\r
-GENESISAPI void GENESISCC gePhysicsObject_SetAngularDamping(gePhysicsObject* po, geFloat angularDamping);\r
-\r
-GENESISAPI void GENESISCC gePhysicsObject_SetActiveConfig(gePhysicsObject* pPhysob, int configIndex);\r
-GENESISAPI int GENESISCC gePhysicsObject_GetActiveConfig(gePhysicsObject* pPhysob);\r
-\r
-GENESISAPI void GENESISCC gePhysicsObject_SetPhysicsScale(gePhysicsObject* pPhysob, geFloat scale);\r
-GENESISAPI geFloat GENESISCC gePhysicsObject_GetPhysicsScale(gePhysicsObject* pPhysob);\r
-\r
-#ifdef __cplusplus\r
-}\r
-#endif\r
-\r
-#endif\r
-\r

diff --git a/G3D/Physics/PhysicsSystem.h b/G3D/Physics/PhysicsSystem.h
deleted file mode 100644 (file)
index 176fb81..0000000
--- a/G3D/Physics/PhysicsSystem.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/****************************************************************************************/\r
-/*  PHYSICSSYSTEM.H                                                                     */\r
-/*                                                                                      */\r
-/*  Author: Jason Wood                                                                  */\r
-/*  Description: Rigid body, constraint based physics system 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
-/*  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
-#if !defined (PHYSICSSYSTEM_H)\r
-#define PHYSICSSYSTEM_H\r
-\r
-#ifdef __cplusplus\r
-extern "C" {\r
-#endif\r
-\r
-typedef struct gePhysicsSystem gePhysicsSystem;\r
-\r
-////////////////////////////////////////////////////////////////////////////////////////////////////\r
-// ctor / dtor\r
-\r
-GENESISAPI gePhysicsSystem *GENESISCC gePhysicsSystem_Create(void);\r
-GENESISAPI geBoolean GENESISCC gePhysicsSystem_Destroy(gePhysicsSystem** ppSys);\r
-\r
-GENESISAPI geBoolean GENESISCC gePhysicsSystem_Iterate(gePhysicsSystem* psPtr, geFloat Time);\r
-\r
-GENESISAPI geBoolean GENESISCC gePhysicsSystem_AddJoint(gePhysicsSystem *psPtr, gePhysicsJoint *Joint);\r
-GENESISAPI geBoolean GENESISCC gePhysicsSystem_AddObject(gePhysicsSystem *psPtr, gePhysicsObject *Object);\r
-\r
-GENESISAPI int GENESISCC gePhysicsSystem_GetSourceConfigIndex(const gePhysicsSystem* pSys);\r
-GENESISAPI gePhysicsObject** GENESISCC gePhysicsSystem_GetPhysobs(const gePhysicsSystem* pSys);\r
-GENESISAPI gePhysicsJoint** GENESISCC gePhysicsSystem_GetPhysjnts(const gePhysicsSystem* pSys);\r
-GENESISAPI int GENESISCC gePhysicsSystem_GetNumPhysobs(const gePhysicsSystem* pSys);\r
-GENESISAPI int GENESISCC gePhysicsSystem_GetNumPhysjnts(const gePhysicsSystem* pSys);\r
-GENESISAPI int GENESISCC gePhysicsSystem_GetSumOfConstraintDimensions(const gePhysicsSystem* pSys);\r
-\r
-#ifdef __cplusplus\r
-}\r
-#endif\r
-\r
-#endif\r
-\r

diff --git a/G3D/Physics/PhysicsJoint.c b/G3D/PhysicsJoint.c
similarity index 95%
rename from G3D/Physics/PhysicsJoint.c
rename to G3D/PhysicsJoint.c
index a29e6f3..c2af980 100644 (file)
--- a/G3D/Physics/PhysicsJoint.c
+++ b/G3D/PhysicsJoint.c
@@ -22,12 +22,11 @@
 #include <math.h>\r
 #include <assert.h>\r
 \r
 #include <math.h>\r
 #include <assert.h>\r
 \r

-#include "vec3d.h"\r
-#include "xform3d.h"\r
-#include "ram.h"\r
-#include "matrix33.h"\r
-#include "quatern.h"\r
-\r
+#include "Vec3d.h"\r
+#include "XForm3d.h"\r
+#include "Ram.h"\r
+#include "Matrix33.h"\r
+#include "Quaternion.h"\r

 #include "PhysicsObject.h"\r
 #include "PhysicsJoint.h"\r
 \r
 #include "PhysicsObject.h"\r
 #include "PhysicsJoint.h"\r
 \r

diff --git a/G3D/Physics/PhysicsObject.c b/G3D/PhysicsObject.c
similarity index 96%
rename from G3D/Physics/PhysicsObject.c
rename to G3D/PhysicsObject.c
index a2fe0dc..f9ce31d 100644 (file)
--- a/G3D/Physics/PhysicsObject.c
+++ b/G3D/PhysicsObject.c
@@ -23,12 +23,10 @@
 #include <assert.h>\r
 #include <stdio.h>\r
 \r
 #include <assert.h>\r
 #include <stdio.h>\r
 \r

-#include "genesis.h"\r
-#include "ram.h"\r
-#include "matrix33.h"\r
-#include "quatern.h"\r
-\r
-\r
+#include "Genesis.h"\r
+#include "Ram.h"\r
+#include "Matrix33.h"\r
+#include "Quaternion.h"\r

 #include "PhysicsObject.h"\r
 \r
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////\r
 #include "PhysicsObject.h"\r
 \r
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////\r

diff --git a/G3D/PhysicsObject.h b/G3D/PhysicsObject.h
index 691bb76..9114a4b 100644 (file)
--- a/G3D/PhysicsObject.h
+++ b/G3D/PhysicsObject.h
@@ -22,7 +22,7 @@
 #ifndef        PHYSICSOBJECT_H\r
 #define PHYSICSOBJECT_H\r
 \r
 #ifndef        PHYSICSOBJECT_H\r
 #define PHYSICSOBJECT_H\r
 \r

-#include "matrix33.h"\r
+#include "Matrix33.h"\r

 \r
 #ifdef __cplusplus\r
 extern "C" {\r
 \r
 #ifdef __cplusplus\r
 extern "C" {\r

diff --git a/G3D/Physics/PhysicsSystem.c b/G3D/PhysicsSystem.c
similarity index 96%
rename from G3D/Physics/PhysicsSystem.c
rename to G3D/PhysicsSystem.c
index 460ea81..10235c6 100644 (file)
--- a/G3D/Physics/PhysicsSystem.c
+++ b/G3D/PhysicsSystem.c
@@ -25,12 +25,11 @@
 #include <string.h>\r
 #include <float.h>\r
 \r
 #include <string.h>\r
 #include <float.h>\r
 \r

-#include "vec3d.h"\r
-#include "xform3d.h"\r
-#include "ram.h"\r
-#include "matrix33.h"\r
-#include "quatern.h"\r
-\r
+#include "Vec3d.h"\r
+#include "XForm3d.h"\r
+#include "Ram.h"\r
+#include "Matrix33.h"\r
+#include "Quaternion.h"\r

 #include "PhysicsObject.h"\r
 #include "PhysicsJoint.h"\r
 #include "PhysicsSystem.h"\r
 #include "PhysicsObject.h"\r
 #include "PhysicsJoint.h"\r
 #include "PhysicsSystem.h"\r

diff --git a/G3D/Bitmap/PixelFormat.c b/G3D/PixelFormat.c
similarity index 96%
rename from G3D/Bitmap/PixelFormat.c
rename to G3D/PixelFormat.c
index 4a8ec0d..591536f 100644 (file)
--- a/G3D/Bitmap/PixelFormat.c
+++ b/G3D/PixelFormat.c
@@ -36,7 +36,7 @@ this code only work on Intel-Endian CPU's
 \r
 #include <stdlib.h>\r
 #include <assert.h>\r
 \r
 #include <stdlib.h>\r
 #include <assert.h>\r

-#include "pixelformat.h"\r
+#include "PixelFormat.h"\r

 \r
 #define isinrange(x,lo,hi)     ( (x)>=(lo) && (x)<=(hi) )\r
 \r
 \r
 #define isinrange(x,lo,hi)     ( (x)>=(lo) && (x)<=(hi) )\r
 \r

diff --git a/G3D/Plane.c b/G3D/Plane.c
index 2f1bf92..7bc6675 100644 (file)
--- a/G3D/Plane.c
+++ b/G3D/Plane.c
@@ -19,9 +19,9 @@
 /*  Copyright (C) 1999 WildTangent, Inc. All Rights Reserved           */\r
 /*                                                                                      */\r
 /****************************************************************************************/\r
 /*  Copyright (C) 1999 WildTangent, Inc. All Rights Reserved           */\r
 /*                                                                                      */\r
 /****************************************************************************************/\r

-#include <Assert.h>\r
-#include <Windows.h>\r
-#include <Math.h>\r
+#include <assert.h>\r
+#include <windows.h>\r
+#include <math.h>\r

 \r
 #include "BaseType.h"\r
 #include "System.h"\r
 \r
 #include "BaseType.h"\r
 #include "System.h"\r

diff --git a/G3D/Actor/pose.c b/G3D/Pose.c
similarity index 96%
rename from G3D/Actor/pose.c
rename to G3D/Pose.c
index d7a1d1b..3ad63e1 100644 (file)
--- a/G3D/Actor/pose.c
+++ b/G3D/Pose.c
@@ -24,8 +24,8 @@
 #include <assert.h>\r
 #include <string.h>\r
 \r
 #include <assert.h>\r
 #include <string.h>\r
 \r

-#include "ram.h"\r
-#include "errorlog.h"\r
+#include "Ram.h"\r
+#include "ErrorLog.h"\r

 #include "Pose.h"\r
 #include "StrBlock.h"\r
 \r
 #include "Pose.h"\r
 #include "StrBlock.h"\r
 \r

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

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

diff --git a/G3D/Actor/puppet.c b/G3D/Puppet.c
similarity index 95%
rename from G3D/Actor/puppet.c
rename to G3D/Puppet.c
index 25d3f8e..990a899 100644 (file)
--- a/G3D/Actor/puppet.c
+++ b/G3D/Puppet.c
@@ -26,28 +26,26 @@
 #include <math.h>  //fabs()\r
 #include <assert.h>\r
 \r
 #include <math.h>  //fabs()\r
 #include <assert.h>\r
 \r

-#include "light.h"\r
-#include "world.h"\r
-#include "trace.h"             //Trace_WorldCollisionExact2()\r
-#include "surface.h"   // Surf_InSurfBoundingBox()\r
-\r
-#include "xfarray.h"\r
-#include "puppet.h"\r
-#include "pose.h"\r
+#include "Light.h"\r
+#include "World.h"\r
+#include "Trace.h"             //Trace_WorldCollisionExact2()\r
+#include "Surface.h"   // Surf_InSurfBoundingBox()\r
+#include "XFArray.h"\r
+#include "Puppet.h"\r
+#include "Pose.h"\r

 #include "ErrorLog.h"\r
 #include "ErrorLog.h"\r

-#include "ram.h"\r
-#include "tclip.h"\r
-\r
+#include "Ram.h"\r
+#include "TClip.h"\r

 #include "Frustum.h"\r
 #include "ExtBox.h"\r
 #include "Frustum.h"\r
 #include "ExtBox.h"\r

-#include "bodyinst.h"\r
+#include "BodyInst.h"\r

 \r
 #ifdef PROFILE\r
 #include "rdtsc.h"\r
 #endif\r
 \r
 \r
 #ifdef PROFILE\r
 #include "rdtsc.h"\r
 #endif\r
 \r

-#include "bitmap.h"\r
-#include "bitmap._h"\r
+#include "Bitmap.h"\r
+#include "Bitmap._h"\r

 \r
 #define PUPPET_DEFAULT_MAX_DYNAMIC_LIGHTS 3\r
 \r
 \r
 #define PUPPET_DEFAULT_MAX_DYNAMIC_LIGHTS 3\r
 \r

diff --git a/G3D/Actor/puppet.h b/G3D/Puppet.h
similarity index 97%
rename from G3D/Actor/puppet.h
rename to G3D/Puppet.h
index 37531ef..f063c6f 100644 (file)
--- a/G3D/Actor/puppet.h
+++ b/G3D/Puppet.h
@@ -29,7 +29,7 @@
 #include "ExtBox.h"                    // geExtBox for gePuppet_RenderThroughFrustum\r
 \r
 #include "Frustum.h"\r
 #include "ExtBox.h"                    // geExtBox for gePuppet_RenderThroughFrustum\r
 \r
 #include "Frustum.h"\r

-#include "vfile.h"\r
+#include "VFile.h"\r

 \r
 \r
 #ifdef __cplusplus\r
 \r
 \r
 #ifdef __cplusplus\r

diff --git a/G3D/Actor/QKFrame.c b/G3D/QKFrame.c
similarity index 96%
rename from G3D/Actor/QKFrame.c
rename to G3D/QKFrame.c
index 5ce7aa1..f7cc97b 100644 (file)
--- a/G3D/Actor/QKFrame.c
+++ b/G3D/QKFrame.c
@@ -44,10 +44,10 @@
 #include <string.h>\r
 #include <stdio.h>\r
 \r
 #include <string.h>\r
 #include <stdio.h>\r
 \r

-#include "vec3d.h"\r
+#include "Vec3d.h"\r

 #include "QKFrame.h"\r
 #include "QKFrame.h"\r

-#include "errorlog.h"\r
-#include "ram.h"\r
+#include "ErrorLog.h"\r
+#include "Ram.h"\r

 \r
 #define LINEAR_BLEND(a,b,t)  ( (t)*((b)-(a)) + (a) )   \r
                        // linear blend of a and b  0<t<1 where  t=0 ->a and t=1 ->b\r
 \r
 #define LINEAR_BLEND(a,b,t)  ( (t)*((b)-(a)) + (a) )   \r
                        // linear blend of a and b  0<t<1 where  t=0 ->a and t=1 ->b\r

diff --git a/G3D/Actor/QKFrame.h b/G3D/QKFrame.h
similarity index 94%
rename from G3D/Actor/QKFrame.h
rename to G3D/QKFrame.h
index 45ab0bb..089caf6 100644 (file)
--- a/G3D/Actor/QKFrame.h
+++ b/G3D/QKFrame.h
@@ -45,8 +45,8 @@
 \r
 \r
 #include "TKArray.h"\r
 \r
 \r
 #include "TKArray.h"\r

-#include "Quatern.h"\r
-#include "vfile.h"\r
+#include "Quaternion.h"\r
+#include "VFile.h"\r

 \r
 #ifdef __cplusplus\r
 extern "C" {\r
 \r
 #ifdef __cplusplus\r
 extern "C" {\r


@@ -134,9 +134,9 @@ geBoolean GENESISCC geQKFrame_LinearRead(geVFile* pFile, void* geQKFrame);
 geBoolean GENESISCC geQKFrame_SlerpRead(geVFile* pFile, void* geQKFrame);\r
 geBoolean GENESISCC geQKFrame_SquadRead(geVFile* pFile, void* geQKFrame);\r
 \r
 geBoolean GENESISCC geQKFrame_SlerpRead(geVFile* pFile, void* geQKFrame);\r
 geBoolean GENESISCC geQKFrame_SquadRead(geVFile* pFile, void* geQKFrame);\r
 \r

-geBoolean GENESISCC geQKFrame_WriteToFile(geVFile *pFile, void *geQKFrame, \r
+geBoolean GENESISCC geQKFrame_WriteToFile(geVFile *pFile, geTKArray *KeyList, \r

                                                                geQKFrame_InterpolationType InterpolationType, int Looping);\r
                                                                geQKFrame_InterpolationType InterpolationType, int Looping);\r

-geTKArray *GENESISCC geQKFrame_CreateFromFile(geVFile *pFile, geQKFrame_InterpolationType *InterpolationType, int *Looping);\r
+geTKArray *GENESISCC geQKFrame_CreateFromFile(geVFile *pFile, int *InterpolationType, int *Looping);\r

 geTKArray *GENESISCC geQKFrame_CreateFromBinaryFile(geVFile *pFile, int *InterpolationType, int *Looping);\r
 geBoolean GENESISCC geQKFrame_WriteToBinaryFile(geVFile *pFile, geTKArray *KeyList, \r
                geQKFrame_InterpolationType InterpolationType, int Looping);\r
 geTKArray *GENESISCC geQKFrame_CreateFromBinaryFile(geVFile *pFile, int *InterpolationType, int *Looping);\r
 geBoolean GENESISCC geQKFrame_WriteToBinaryFile(geVFile *pFile, geTKArray *KeyList, \r
                geQKFrame_InterpolationType InterpolationType, int Looping);\r


@@ -148,4 +148,4 @@ geBoolean GENESISCC geQKFrame_WriteToBinaryFile(geVFile *pFile, geTKArray *KeyLi
 #endif\r
 \r
 \r
 #endif\r
 \r
 \r

-#endif
\ No newline at end of file
+#endif\r

diff --git a/G3D/Quaternion.c b/G3D/Quaternion.c
index f0ea616..727fbb3 100644 (file)
--- a/G3D/Quaternion.c
+++ b/G3D/Quaternion.c
@@ -21,8 +21,9 @@
 /****************************************************************************************/\r
 #include <assert.h>\r
 #include <math.h>\r
 /****************************************************************************************/\r
 #include <assert.h>\r
 #include <math.h>\r

-#include "basetype.h"\r
-#include "quatern.h"\r
+\r
+#include "BaseType.h"\r
+#include "Quaternion.h"\r

 \r
 \r
 #ifndef NDEBUG\r
 \r
 \r
 #ifndef NDEBUG\r

diff --git a/G3D/Ram.c b/G3D/Ram.c
index 43e41c3..313920b 100644 (file)
--- a/G3D/Ram.c
+++ b/G3D/Ram.c
@@ -28,7 +28,7 @@
 #include <crtdbg.h>\r
 #endif\r
 \r
 #include <crtdbg.h>\r
 #endif\r
 \r

-#include "ram.h"\r
+#include "Ram.h"\r

 \r
 /*\r
   This controls the MINIMAL_CONFIG flag.  Basically, all overflow, underflow,\r
 \r
 /*\r
   This controls the MINIMAL_CONFIG flag.  Basically, all overflow, underflow,\r

diff --git a/G3D/Sound.c b/G3D/Sound.c
index 040b4ae..5f54ed7 100644 (file)
--- a/G3D/Sound.c
+++ b/G3D/Sound.c
@@ -15,8 +15,7 @@
 /*  under the License.                                                                  */\r
 /*                                                                                      */\r
 /*  The Original Code is Genesis3D, released March 25, 1999.                            */\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
+/*  Copyright (C) 1996-1999 Eclipse Entertainment, L.L.C. All Rights Reserved           */\r

 /*                                                                                      */\r
 /****************************************************************************************/\r
 #include       <windows.h>\r
 /*                                                                                      */\r
 /****************************************************************************************/\r
 #include       <windows.h>\r


@@ -24,11 +23,11 @@
 #include       <stdio.h>\r
 #include       <assert.h>\r
 \r
 #include       <stdio.h>\r
 #include       <assert.h>\r
 \r

-#include       "include/BaseType.h"\r
-#include       "include/ErrorLog.h"\r
-#include       "include/VFile.h"\r
+#include       "BaseType.h"\r
+#include       "ErrorLog.h"\r
+#include       "VFile.h"\r

 #include       "Sound.h"\r
 #include       "Sound.h"\r

-#include       "include/Ram.h"\r
+#include       "Ram.h"\r

 \r
 typedef struct SoundManager    SoundManager;\r
 typedef struct  Channel                        Channel;\r
 \r
 typedef struct SoundManager    SoundManager;\r
 typedef struct  Channel                        Channel;\r


@@ -100,7 +99,7 @@ typedef struct       SoundManager
     //LPDIRECTSOUNDNOTIFY *   smNotify;\r
 }   SoundManager;\r
 \r
     //LPDIRECTSOUNDNOTIFY *   smNotify;\r
 }   SoundManager;\r
 \r

-static LPDIRECTSOUND                   lpDirectSound;\r
+static LPDIRECTSOUND                   lpDirectSound = NULL;\r

 // This isn't really safe as a global.  But it's consistent with the global lpDirectSound.\r
 static  HMODULE                                        hmodDirectSound = NULL;\r
 \r
 // This isn't really safe as a global.  But it's consistent with the global lpDirectSound.\r
 static  HMODULE                                        hmodDirectSound = NULL;\r
 \r


@@ -212,16 +211,6 @@ GENESISAPI void geSound_FreeSoundDef(geSound_System *SoundS, geSound_Def *SoundD
        FreeChannel(SoundS->SoundM, Channel);\r
 }\r
 \r
        FreeChannel(SoundS->SoundM, Channel);\r
 }\r
 \r

-//=====================================================================================\r
-//     Sound_FreeAllChannels\r
-//=====================================================================================\r
-GENESISAPI     void geSound_FreeAllChannels(geSound_System *SoundS)\r
-{\r
-       if (!SoundS) return;\r
-\r
-       FreeAllChannels( SoundS->SoundM );\r
-}\r
-\r

 //=====================================================================================\r
 //     Sound_SetGlobalVolume\r
 //=====================================================================================\r
 //=====================================================================================\r
 //     Sound_SetGlobalVolume\r
 //=====================================================================================\r


@@ -310,8 +299,7 @@ GENESISAPI  geBoolean geSound_SoundIsPlaying(geSound_System *SoundS, geSound *Sou
        Channel*        Channel;\r
 \r
        assert(SoundS != NULL);\r
        Channel*        Channel;\r
 \r
        assert(SoundS != NULL);\r

-  if(Sound == NULL)\r
-         return GE_FALSE;                                                                                              // eaa3 05/29/2000 don't assert if NULL handle!\r
+       assert(Sound  != NULL); \r

 \r
        Channel = GetChannel(SoundS->SoundM, (unsigned int)Sound);\r
 \r
 \r
        Channel = GetChannel(SoundS->SoundM, (unsigned int)Sound);\r
 \r


@@ -607,7 +595,8 @@ static      BOOL ParseData( const uint8* data, DSBUFFERDESC* dsBD, BYTE ** pbWaveData
        memset(dsBD, 0, sizeof(DSBUFFERDESC));\r
 \r
        dsBD->dwSize = sizeof(DSBUFFERDESC);\r
        memset(dsBD, 0, sizeof(DSBUFFERDESC));\r
 \r
        dsBD->dwSize = sizeof(DSBUFFERDESC);\r

-       dsBD->dwFlags = DSBCAPS_STATIC | DSBCAPS_GETCURRENTPOSITION2 | DSBCAPS_CTRLPAN | DSBCAPS_CTRLVOLUME | DSBCAPS_CTRLFREQUENCY;\r
+       dsBD->dwFlags = DSBCAPS_STATIC | DSBCAPS_GETCURRENTPOSITION2 | DSBCAPS_CTRLPAN |\r
+                       DSBCAPS_CTRLFREQUENCY | DSBCAPS_CTRLVOLUME;\r

        if      (!DSParseWaveResource(data, &dsBD->lpwfxFormat, pbWaveData, &dsBD->dwBufferBytes))\r
        {\r
                geErrorLog_Add(GE_ERR_INVALID_WAV, NULL);\r
        if      (!DSParseWaveResource(data, &dsBD->lpwfxFormat, pbWaveData, &dsBD->dwBufferBytes))\r
        {\r
                geErrorLog_Add(GE_ERR_INVALID_WAV, NULL);\r


@@ -1030,10 +1019,6 @@ static   BOOL    ModifyChannel( Channel *channel, geSound_Cfg *cfg )
        {\r
 \r
                Freq = (DWORD)(channel->BaseFreq * cfg->Frequency);\r
        {\r
 \r
                Freq = (DWORD)(channel->BaseFreq * cfg->Frequency);\r

-               \r
-               if(Freq < 0)\r
-                       Freq = 0;\r
-\r

                Error = IDirectSoundBuffer_SetFrequency(channel->buffer, Freq);\r
                if (Error != DS_OK)\r
                {\r
                Error = IDirectSoundBuffer_SetFrequency(channel->buffer, Freq);\r
                if (Error != DS_OK)\r
                {\r

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

-#include "G3D/World/Trace.h"\r
-#include "incldue/Vec3d.h"\r
-#include "include/XForm3d.h"\r
+#include "Trace.h"\r
+#include "Vec3d.h"\r
+#include "XForm3d.h"\r

 #include "Camera.h"\r
 #include "Sound3d.h"\r
 \r
 #include "Camera.h"\r
 #include "Sound3d.h"\r
 \r

diff --git a/G3D/Sprite.c b/G3D/Sprite.c
index 7876333..703abf4 100644 (file)
--- a/G3D/Sprite.c
+++ b/G3D/Sprite.c
@@ -19,14 +19,11 @@
 #include <assert.h>\r
 #include <math.h>\r
 \r
 #include <assert.h>\r
 #include <math.h>\r
 \r

-#include "world.h"\r
-#include "trace.h"\r
-\r
-#include "sprite.h"\r
-\r
+#include "World.h"\r
+#include "Trace.h"\r
+#include "Sprite.h"\r

 #include "ErrorLog.h"\r
 \r
 #include "ErrorLog.h"\r
 \r

-\r

 #define BIG_DISTANCE 30000.0f\r
 \r
 extern geBoolean geBitmap_IsValid(const geBitmap *Bmp);\r
 #define BIG_DISTANCE 30000.0f\r
 \r
 extern geBoolean geBitmap_IsValid(const geBitmap *Bmp);\r

diff --git a/G3D/Sprite.h b/G3D/Sprite.h
index 5e54066..660e25c 100644 (file)
--- a/G3D/Sprite.h
+++ b/G3D/Sprite.h
@@ -26,7 +26,7 @@
 #include "Bitmap.h"\r
 \r
 #ifdef GE_WORLD_H\r
 #include "Bitmap.h"\r
 \r
 #ifdef GE_WORLD_H\r

-#include "camera.h"\r
+#include "Camera.h"\r

 #include "Frustum.h"\r
 #endif\r
 \r
 #include "Frustum.h"\r
 #endif\r
 \r

diff --git a/G3D/Actor/strblock.c b/G3D/StrBlock.c
similarity index 95%
rename from G3D/Actor/strblock.c
rename to G3D/StrBlock.c
index 392b90e..7fa0a4c 100644 (file)
--- a/G3D/Actor/strblock.c
+++ b/G3D/StrBlock.c
@@ -29,9 +29,9 @@
 #include <assert.h>\r
 #include <stdio.h>\r
 \r
 #include <assert.h>\r
 #include <stdio.h>\r
 \r

-#include "strblock.h"\r
-#include "ram.h"\r
-#include "errorlog.h"\r
+#include "StrBlock.h"\r
+#include "Ram.h"\r
+#include "ErrorLog.h"\r

 \r
 #define STRBLOCK_MAX_STRINGLEN 255\r
 \r
 \r
 #define STRBLOCK_MAX_STRINGLEN 255\r
 \r

diff --git a/G3D/Actor/strblock.h b/G3D/StrBlock.h
similarity index 96%
rename from G3D/Actor/strblock.h
rename to G3D/StrBlock.h
index 50c02bd..f3f329d 100644 (file)
--- a/G3D/Actor/strblock.h
+++ b/G3D/StrBlock.h
@@ -23,8 +23,8 @@
 #ifndef GE_STRBLOCK_H\r
 #define GE_STRBLOCK_H\r
 \r
 #ifndef GE_STRBLOCK_H\r
 #define GE_STRBLOCK_H\r
 \r

-#include "basetype.h"  // geBoolean\r
-#include "vfile.h"\r
+#include "BaseType.h"  // geBoolean\r
+#include "VFile.h"\r

 \r
 #ifdef __cplusplus\r
 extern "C" {\r
 \r
 #ifdef __cplusplus\r
 extern "C" {\r


@@ -58,4 +58,4 @@ geBoolean GENESISCC geStrBlock_WriteToBinaryFile(const geStrBlock *SB,geVFile *p
 }\r
 #endif\r
 \r
 }\r
 #endif\r
 \r

-#endif
\ No newline at end of file
+#endif\r

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

diff --git a/G3D/Surface.c b/G3D/Surface.c
index 1f9f7c5..283b582 100644 (file)
--- a/G3D/Surface.c
+++ b/G3D/Surface.c
@@ -19,10 +19,9 @@
 /*  Copyright (C) 1999 WildTangent, Inc. All Rights Reserved           */\r
 /*                                                                                      */\r
 /****************************************************************************************/\r
 /*  Copyright (C) 1999 WildTangent, Inc. All Rights Reserved           */\r
 /*                                                                                      */\r
 /****************************************************************************************/\r

-#include <Assert.h>\r
-#include <Windows.h>\r
-#include <Math.h>\r
-\r
+#include <assert.h>\r
+#include <windows.h>\r
+#include <math.h>\r

 \r
 #include "BaseType.h"\r
 #include "System.h"\r
 \r
 #include "BaseType.h"\r
 #include "System.h"\r


@@ -32,7 +31,6 @@
 #include "WBitmap.h"   \r
 #include "Vec3d.h"\r
 #include "Vis.h"\r
 #include "WBitmap.h"   \r
 #include "Vec3d.h"\r
 #include "Vis.h"\r

-\r

 #include "Light.h"\r
 \r
 //================================================================================\r
 #include "Light.h"\r
 \r
 //================================================================================\r

diff --git a/G3D/Surface.h b/G3D/Surface.h
index eb4c5f3..eb93156 100644 (file)
--- a/G3D/Surface.h
+++ b/G3D/Surface.h
@@ -25,10 +25,10 @@
 #include <assert.h>\r
 #include <windows.h>\r
 \r
 #include <assert.h>\r
 #include <windows.h>\r
 \r

-#include "G3D/BaseType.h"\r
-#include "G3D/PtrTypes.h"\r
-#include "G3D/Vec3d.h"\r
-#include "G3D/Engine/Drivers/DCommon.h"\r
+#include "BaseType.h"\r
+#include "PtrTypes.h"\r
+#include "Vec3d.h"\r
+#include "DCommon.h"\r

 \r
 #ifdef __cplusplus\r
 extern "C" {\r
 \r
 #ifdef __cplusplus\r
 extern "C" {\r

diff --git a/G3D/Engine/System.c b/G3D/System.c
similarity index 95%
rename from G3D/Engine/System.c
rename to G3D/System.c
index 90a53ae..87bb67a 100644 (file)
--- a/G3D/Engine/System.c
+++ b/G3D/System.c
@@ -19,16 +19,15 @@
 /*  Copyright (C) 1999 WildTangent, Inc. All Rights Reserved           */\r
 /*                                                                                      */\r
 /****************************************************************************************/\r
 /*  Copyright (C) 1999 WildTangent, Inc. All Rights Reserved           */\r
 /*                                                                                      */\r
 /****************************************************************************************/\r

-#include <Assert.h>\r
+#include <assert.h>\r

 \r
 #include "BaseType.h"\r
 #include "System.h"\r
 #include "Genesis.h"\r
 #include "ErrorLog.h"\r
 #include "Ram.h"\r
 \r
 #include "BaseType.h"\r
 #include "System.h"\r
 #include "Genesis.h"\r
 #include "ErrorLog.h"\r
 #include "Ram.h"\r

-#include "engine.h"\r
-\r
-#include "list.h"\r
+#include "Engine.h"\r
+#include "List.h"\r

 #include "Surface.h"\r
 #include "World.h"\r
 #include "Plane.h"\r
 #include "Surface.h"\r
 #include "World.h"\r
 #include "Plane.h"\r


@@ -38,11 +37,8 @@
 #include "Sound.h"\r
 #include "Entities.h"\r
 #include "User.h"\r
 #include "Sound.h"\r
 #include "Entities.h"\r
 #include "User.h"\r

-\r
-#include "dcommon.h"\r
-\r
-#include "geassert.h"\r
-\r
+#include "DCommon.h"\r
+#include "GeAssert.h"\r

 #include "BitmapList.h"\r
 //#define SKY_HACK\r
 //extern BOOL GlobalReset;\r
 #include "BitmapList.h"\r
 //#define SKY_HACK\r
 //extern BOOL GlobalReset;\r

diff --git a/G3D/Engine/System.h b/G3D/System.h
similarity index 95%
rename from G3D/Engine/System.h
rename to G3D/System.h
index 10bea8b..06a4a85 100644 (file)
--- a/G3D/Engine/System.h
+++ b/G3D/System.h
@@ -24,11 +24,12 @@
 \r
 //#define OLD_FONT\r
 \r
 \r
 //#define OLD_FONT\r
 \r

-#include "G3D/ErrorLog.h"\r
-#include "G3D/Genesis.h"\r

 #include <windows.h>\r
 #include <windows.h>\r

-#include "G3D/Engine/Drivers/DCommon.h"\r
-#include "G3D/Camera.h"\r
+\r
+#include "ErrorLog.h"\r
+#include "Genesis.h"\r
+#include "DCommon.h"\r
+#include "Camera.h"\r

 #include "PtrTypes.h"\r
 \r
 #define                VectorToSUB(a, b) ( *(((geFloat*)&a) + b) )\r
 #include "PtrTypes.h"\r
 \r
 #define                VectorToSUB(a, b) ( *(((geFloat*)&a) + b) )\r

diff --git a/G3D/TClip.c b/G3D/TClip.c
index c9eff9f..0b3dcf8 100644 (file)
--- a/G3D/TClip.c
+++ b/G3D/TClip.c
@@ -68,13 +68,11 @@ TClip_Rasterize      : 0.006183 : 1.$ %
 #include <string.h>\r
 \r
 #include "TClip.h"\r
 #include <string.h>\r
 \r
 #include "TClip.h"\r

-#include "G3D/Engine/Engine.h"\r
-#include "bitmap._h"\r
-\r
-#include "list.h"\r
-#include "ram.h"  \r
-\r
-#include "timer.h"\r
+#include "Engine.h"\r
+#include "Bitmap._h"\r
+#include "List.h"\r
+#include "Ram.h"\r
+#include "Timer.h"\r

 \r
 TIMER_VARS(TClip_Triangle);\r
 \r
 \r
 TIMER_VARS(TClip_Triangle);\r
 \r

diff --git a/G3D/TClip.h b/G3D/TClip.h
index 5fa8819..7166821 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
 #ifndef GE_TCLIP_H\r
 #define GE_TCLIP_H\r
 \r

-#include "include/BaseType.h"\r
-#include "include/GeTypes.h"\r
-#include "include/Bitmap.h"\r
-#include "G3D/Engine/Engine.h"\r
+#include "BaseType.h"\r
+#include "GeTypes.h"\r
+#include "Bitmap.h"\r
+#include "Engine.h"\r

 \r
 #ifdef __cplusplus\r
 extern "C" {\r
 \r
 #ifdef __cplusplus\r
 extern "C" {\r

diff --git a/G3D/Actor/tkarray.c b/G3D/TKArray.c
similarity index 96%
rename from G3D/Actor/tkarray.c
rename to G3D/TKArray.c
index 4c4cd7a..a9781e5 100644 (file)
--- a/G3D/Actor/tkarray.c
+++ b/G3D/TKArray.c
@@ -37,7 +37,7 @@
 \r
 #include "TKArray.h"\r
 #include "ErrorLog.h"\r
 \r
 #include "TKArray.h"\r
 #include "ErrorLog.h"\r

-#include "ram.h"\r
+#include "Ram.h"\r

 \r
 typedef struct geTKArray\r
 {\r
 \r
 typedef struct geTKArray\r
 {\r

diff --git a/G3D/Actor/tkarray.h b/G3D/TKArray.h
similarity index 96%
rename from G3D/Actor/tkarray.h
rename to G3D/TKArray.h
index 7155441..7c51212 100644 (file)
--- a/G3D/Actor/tkarray.h
+++ b/G3D/TKArray.h
@@ -34,8 +34,8 @@
        Error conditions are reported to errorlog\r
 */\r
 \r
        Error conditions are reported to errorlog\r
 */\r
 \r

-#include "basetype.h"\r
-#include "vfile.h"\r
+#include "BaseType.h"\r
+#include "VFile.h"\r

 \r
 #ifdef __cplusplus\r
 extern "C" {\r
 \r
 #ifdef __cplusplus\r
 extern "C" {\r

diff --git a/G3D/Actor/tkevents.c b/G3D/TKEvents.c
similarity index 96%
rename from G3D/Actor/tkevents.c
rename to G3D/TKEvents.c
index 04d1a1a..3e6fc2e 100644 (file)
--- a/G3D/Actor/tkevents.c
+++ b/G3D/TKEvents.c
@@ -29,12 +29,12 @@
 */\r
 #include <assert.h>\r
 #include <stdio.h>\r
 */\r
 #include <assert.h>\r
 #include <stdio.h>\r

+#include <string.h>\r

 \r
 #include "TKEvents.h"\r
 #include "TKArray.h"\r
 #include "ErrorLog.h"\r
 \r
 #include "TKEvents.h"\r
 #include "TKArray.h"\r
 #include "ErrorLog.h"\r

-#include "ram.h"\r
-#include "string.h"\r
+#include "Ram.h"\r

 \r
 typedef struct\r
 {\r
 \r
 typedef struct\r
 {\r

diff --git a/G3D/Actor/tkevents.h b/G3D/TKEvents.h
similarity index 96%
rename from G3D/Actor/tkevents.h
rename to G3D/TKEvents.h
index 15b8b0a..f1f59d4 100644 (file)
--- a/G3D/Actor/tkevents.h
+++ b/G3D/TKEvents.h
@@ -31,8 +31,8 @@
        Error conditions are reported to errorlog\r
 */\r
 \r
        Error conditions are reported to errorlog\r
 */\r
 \r

-#include "basetype.h"\r
-#include "vfile.h"\r
+#include "BaseType.h"\r
+#include "VFile.h"\r

 \r
 #ifdef __cplusplus\r
 extern "C" {\r
 \r
 #ifdef __cplusplus\r
 extern "C" {\r


@@ -99,4 +99,4 @@ GENESISAPI geBoolean GENESISCC geTKEvents_GetExtents(
 \r
 \r
 \r
 \r
 \r
 \r

-#endif // __TKEVENTS_H__
\ No newline at end of file
+#endif // __TKEVENTS_H__\r

diff --git a/G3D/Timer.c b/G3D/Timer.c
index 0e71a72..01b6816 100644 (file)
--- a/G3D/Timer.c
+++ b/G3D/Timer.c
@@ -20,9 +20,10 @@
 /*                                                                                      */\r
 /****************************************************************************************/\r
 \r
 /*                                                                                      */\r
 /****************************************************************************************/\r
 \r

-#include "timer.h"\r
+#include "Timer.h"\r

 \r
 \r

-FILE * timerFP = stdout;\r
+// FIXME: wtf?\r
+//FILE * timerFP = stdout;\r

 \r
 int timerCount = 0;\r
 \r
 \r
 int timerCount = 0;\r
 \r

diff --git a/G3D/Timer.h b/G3D/Timer.h
index 153e1c0..e732f83 100644 (file)
--- a/G3D/Timer.h
+++ b/G3D/Timer.h
@@ -24,7 +24,8 @@
 /****************************************************************************************/\r
 \r
 #include <stdio.h>\r
 /****************************************************************************************/\r
 \r
 #include <stdio.h>\r

-#include "tsc.h"\r
+\r
+#include "TSC.h"\r

 \r
 #ifdef __cplusplus\r
 extern "C" {\r
 \r
 #ifdef __cplusplus\r
 extern "C" {\r

diff --git a/G3D/Trace.c b/G3D/Trace.c
index 4271aa2..753beca 100644 (file)
--- a/G3D/Trace.c
+++ b/G3D/Trace.c
@@ -19,7 +19,7 @@
 /*  Copyright (C) 1999 WildTangent, Inc. All Rights Reserved           */\r
 /*                                                                                      */\r
 /****************************************************************************************/\r
 /*  Copyright (C) 1999 WildTangent, Inc. All Rights Reserved           */\r
 /*                                                                                      */\r
 /****************************************************************************************/\r

-#include <Assert.h>\r
+#include <assert.h>\r

  \r
 #include "XForm3d.h"\r
 #include "BaseType.h"\r
  \r
 #include "XForm3d.h"\r
 #include "BaseType.h"\r


@@ -2356,4 +2356,4 @@ geBoolean Trace_GetTexureName(geWorld *World, const geVec3d *Pos, const geVec3d
        return GE_FALSE;\r
 }\r
 \r
        return GE_FALSE;\r
 }\r
 \r

-// end change texture name
\ No newline at end of file
+// end change texture name\r

diff --git a/G3D/User.c b/G3D/User.c
index 4b174dc..b4c30f7 100644 (file)
--- a/G3D/User.c
+++ b/G3D/User.c
@@ -19,8 +19,8 @@
 /*  Copyright (C) 1999 WildTangent, Inc. All Rights Reserved           */\r
 /*                                                                                      */\r
 /****************************************************************************************/\r
 /*  Copyright (C) 1999 WildTangent, Inc. All Rights Reserved           */\r
 /*                                                                                      */\r
 /****************************************************************************************/\r

-#include <Assert.h>\r
-#include <Windows.h>\r
+#include <assert.h>\r
+#include <windows.h>\r

 \r
 #include "User.h"\r
 #include "World.h"\r
 \r
 #include "User.h"\r
 #include "World.h"\r


@@ -32,9 +32,7 @@
 #include "Camera.h"\r
 #include "Frustum.h"\r
 #include "Plane.h"\r
 #include "Camera.h"\r
 #include "Frustum.h"\r
 #include "Plane.h"\r

-\r

 #include "DCommon.h"\r
 #include "DCommon.h"\r

-\r

 #include "Bitmap._h"\r
 \r
 extern int32   MirrorRecursion;                                        // GLOBAL!!! in World.c\r
 #include "Bitmap._h"\r
 \r
 extern int32   MirrorRecursion;                                        // GLOBAL!!! in World.c\r

diff --git a/G3D/User.h b/G3D/User.h
index f89fef6..ac7f2c2 100644 (file)
--- a/G3D/User.h
+++ b/G3D/User.h
@@ -25,15 +25,14 @@
 #include <assert.h>\r
 #include <windows.h>\r
 \r
 #include <assert.h>\r
 #include <windows.h>\r
 \r

-#include "G3D/BaseType.h"\r
-#include "G3D/Vec3d.h"\r
-#include "G3D/XForm3d.h"\r
-#include "G3D/Camera.h"\r
-#include "G3D/Genesis.h"\r
+#include "BaseType.h"\r
+#include "Vec3d.h"\r
+#include "XForm3d.h"\r
+#include "Camera.h"\r
+#include "Genesis.h"\r

 #include "World.h"\r
 #include "Surface.h"\r
 #include "World.h"\r
 #include "Surface.h"\r

-\r
-#include "G3D/Engine/Drivers/DCommon.h"\r
+#include "DCommon.h"\r

 \r
 #ifdef __cplusplus\r
 extern "C" {\r
 \r
 #ifdef __cplusplus\r
 extern "C" {\r

diff --git a/G3D/Bitmap/Compression/utility.h b/G3D/Utility.h
similarity index 95%
rename from G3D/Bitmap/Compression/utility.h
rename to G3D/Utility.h
index e3872c9..a9c5353 100644 (file)
--- a/G3D/Bitmap/Compression/utility.h
+++ b/G3D/Utility.h
@@ -23,12 +23,12 @@
 /*                                                                                      */\r
 /****************************************************************************************/\r
 \r
 /*                                                                                      */\r
 /****************************************************************************************/\r
 \r

-#include "basetype.h"\r
-#include "ram.h"\r
-#include "errorlog.h"\r

 #include <assert.h>\r
 #include <stdlib.h>\r
 #include <string.h>    // for memcpy,memset\r
 #include <assert.h>\r
 #include <stdlib.h>\r
 #include <string.h>    // for memcpy,memset\r

+#include "BaseType.h"\r
+#include "Ram.h"\r
+#include "ErrorLog.h"\r

 \r
 #ifdef __cplusplus\r
 extern "C" {\r
 \r
 #ifdef __cplusplus\r
 extern "C" {\r

diff --git a/G3D/VFile._h b/G3D/VFile._h
index 04f1771..1022a7e 100644 (file)
--- a/G3D/VFile._h
+++ b/G3D/VFile._h
@@ -22,8 +22,8 @@
 #ifndef        VFILE__H\r
 #define VFILE__H\r
 \r
 #ifndef        VFILE__H\r
 #define VFILE__H\r
 \r

-#include       "basetype.h"\r
-#include       "vfile.h"\r
+#include       "BaseType.h"\r
+#include       "VFile.h"\r

 \r
 typedef void *                 (GENESISCC *geVFile_FinderCreateFN)(geVFile *FileSystem, void *Handle, const char *FileSpec);\r
 typedef geBoolean      (GENESISCC *geVFile_FinderGetNextFileFN)(void *Handle);\r
 \r
 typedef void *                 (GENESISCC *geVFile_FinderCreateFN)(geVFile *FileSystem, void *Handle, const char *FileSpec);\r
 typedef geBoolean      (GENESISCC *geVFile_FinderGetNextFileFN)(void *Handle);\r

diff --git a/G3D/VFile.c b/G3D/VFile.c
index 78b685c..27913f3 100644 (file)
--- a/G3D/VFile.c
+++ b/G3D/VFile.c
@@ -21,21 +21,18 @@
 /****************************************************************************************/\r
 #define        WIN32_LEAN_AND_MEAN\r
 #include       <windows.h>\r
 /****************************************************************************************/\r
 #define        WIN32_LEAN_AND_MEAN\r
 #include       <windows.h>\r

-\r

 #include       <stdio.h>\r
 #include       <assert.h>\r
 #include       <stdarg.h>\r
 #include       <string.h>\r
 \r
 #include       <stdio.h>\r
 #include       <assert.h>\r
 #include       <stdarg.h>\r
 #include       <string.h>\r
 \r

-#include       "basetype.h"\r
-#include       "ram.h"\r
-\r
-#include       "vfile.h"\r
-#include       "vfile._h"\r
-\r
-#include       "fsdos.h"\r
-#include       "fsmemory.h"\r
-#include       "fsvfs.h"\r
+#include       "BaseType.h"\r
+#include       "Ram.h"\r
+#include       "VFile.h"\r
+#include       "VFile._h"\r
+#include       "FsDos.h"\r
+#include       "FsMemory.h"\r
+#include       "FsVfs.h"\r

 //\r
 // add include files for file types here\r
 \r
 //\r
 // add include files for file types here\r
 \r

diff --git a/G3D/Actor/vkframe.c b/G3D/VKFrame.c
similarity index 96%
rename from G3D/Actor/vkframe.c
rename to G3D/VKFrame.c
index 8f24c8c..200fd9c 100644 (file)
--- a/G3D/Actor/vkframe.c
+++ b/G3D/VKFrame.c
@@ -40,10 +40,10 @@
 #include <string.h>\r
 #include <stdio.h>\r
 \r
 #include <string.h>\r
 #include <stdio.h>\r
 \r

-#include "vec3d.h"\r
-#include "vkframe.h"\r
-#include "errorlog.h"\r
-#include "ram.h"\r
+#include "Vec3d.h"\r
+#include "VKFrame.h"\r
+#include "ErrorLog.h"\r
+#include "Ram.h"\r

 \r
 #define LINEAR_BLEND(a,b,t)  ( (t)*((b)-(a)) + (a) )   \r
                        // linear blend of a and b  0<t<1 where  t=0 ->a and t=1 ->b\r
 \r
 #define LINEAR_BLEND(a,b,t)  ( (t)*((b)-(a)) + (a) )   \r
                        // linear blend of a and b  0<t<1 where  t=0 ->a and t=1 ->b\r

diff --git a/G3D/Actor/vkframe.h b/G3D/VKFrame.h
similarity index 92%
rename from G3D/Actor/vkframe.h
rename to G3D/VKFrame.h
index ab637a6..87e79f8 100644 (file)
--- a/G3D/Actor/vkframe.h
+++ b/G3D/VKFrame.h
@@ -40,7 +40,7 @@
 #define GE_VKFRAME_H\r
 \r
 #include "TKArray.h"\r
 #define GE_VKFRAME_H\r
 \r
 #include "TKArray.h"\r

-#include "vfile.h"\r
+#include "VFile.h"\r

 \r
 #ifdef __cplusplus\r
 extern "C" {\r
 \r
 #ifdef __cplusplus\r
 extern "C" {\r


@@ -112,15 +112,15 @@ void GENESISCC geVKFrame_HermiteRecompute(
 geBoolean GENESISCC geVKFrame_LinearRead(geVFile* pFile, void* geVKFrame);\r
 geBoolean GENESISCC geVKFrame_HermiteRead(geVFile* pFile, void* geVKFrame);\r
 \r
 geBoolean GENESISCC geVKFrame_LinearRead(geVFile* pFile, void* geVKFrame);\r
 geBoolean GENESISCC geVKFrame_HermiteRead(geVFile* pFile, void* geVKFrame);\r
 \r

-geBoolean GENESISCC geVKFrame_WriteToFile(geVFile *pFile, void *geVKFrame, \r
+geBoolean GENESISCC geVKFrame_WriteToFile(geVFile *pFile, geTKArray *KeyList, \r

                                                                geVKFrame_InterpolationType InterpolationType,int Looping);\r
                                                                geVKFrame_InterpolationType InterpolationType,int Looping);\r

-geTKArray *GENESISCC geVKFrame_CreateFromFile(geVFile *pFile, geVKFrame_InterpolationType *InterpolationType, int *Looping);\r
-geBoolean GENESISCC geVKFrame_WriteToBinaryFile(geVFile *pFile, void *geVKFrame, \r
+geTKArray *GENESISCC geVKFrame_CreateFromFile(geVFile *pFile, int *InterpolationType, int *Looping);\r
+geBoolean GENESISCC geVKFrame_WriteToBinaryFile(geVFile *pFile, geTKArray *KeyList, \r

                                                                geVKFrame_InterpolationType InterpolationType, int Looping);\r
                                                                geVKFrame_InterpolationType InterpolationType, int Looping);\r

-geTKArray *GENESISCC geVKFrame_CreateFromBinaryFile(geVFile *pFile, geVKFrame_InterpolationType *InterpolationType, int *Looping);\r
+geTKArray *GENESISCC geVKFrame_CreateFromBinaryFile(geVFile *pFile, int *InterpolationType, int *Looping);\r

 \r
 #ifdef __cplusplus\r
 }\r
 #endif\r
 \r
 \r
 #ifdef __cplusplus\r
 }\r
 #endif\r
 \r

-#endif
\ No newline at end of file
+#endif\r

diff --git a/G3D/Vec3d.c b/G3D/Vec3d.c
index 219d5e1..29e908a 100644 (file)
--- a/G3D/Vec3d.c
+++ b/G3D/Vec3d.c
@@ -19,8 +19,9 @@
 /*  Copyright (C) 1999 WildTangent, Inc. All Rights Reserved           */\r
 /*                                                                                      */\r
 /****************************************************************************************/\r
 /*  Copyright (C) 1999 WildTangent, Inc. All Rights Reserved           */\r
 /*                                                                                      */\r
 /****************************************************************************************/\r

-#include <Math.h>\r
+#include <math.h>\r

 #include <assert.h>\r
 #include <assert.h>\r

+\r

 #include "Vec3d.h"\r
 \r
 #define VCOMPARE_EPSILON       (geFloat)0.0005\r
 #include "Vec3d.h"\r
 \r
 #define VCOMPARE_EPSILON       (geFloat)0.0005\r

diff --git a/G3D/Vis.c b/G3D/Vis.c
index 69a9894..79c1a97 100644 (file)
--- a/G3D/Vis.c
+++ b/G3D/Vis.c
@@ -19,7 +19,7 @@
 /*  Copyright (C) 1999 WildTangent, Inc. All Rights Reserved           */\r
 /*                                                                                      */\r
 /****************************************************************************************/\r
 /*  Copyright (C) 1999 WildTangent, Inc. All Rights Reserved           */\r
 /*                                                                                      */\r
 /****************************************************************************************/\r

-#include <Assert.h>\r
+#include <assert.h>\r

 \r
 #include "BaseType.h"\r
 #include "World.h"\r
 \r
 #include "BaseType.h"\r
 #include "World.h"\r


@@ -31,11 +31,10 @@
 #include "Camera.h"\r
 #include "Frustum.h"\r
 #include "System.h"\r
 #include "Camera.h"\r
 #include "Frustum.h"\r
 #include "System.h"\r

-\r

 #include "Fog.h"\r
 \r
 #ifdef _TSC\r
 #include "Fog.h"\r
 \r
 #ifdef _TSC\r

-#include "tsc.h"\r
+#include "TSC.h"\r

 #endif\r
 \r
 //#define SUPER_VIS1\r
 #endif\r
 \r
 //#define SUPER_VIS1\r

diff --git a/G3D/WBitmap.c b/G3D/WBitmap.c
index f5ece18..429cff1 100644 (file)
--- a/G3D/WBitmap.c
+++ b/G3D/WBitmap.c
@@ -19,15 +19,13 @@
 /*  Copyright (C) 1999 WildTangent, Inc. All Rights Reserved           */\r
 /*                                                                                      */\r
 /****************************************************************************************/\r
 /*  Copyright (C) 1999 WildTangent, Inc. All Rights Reserved           */\r
 /*                                                                                      */\r
 /****************************************************************************************/\r

-#include <Assert.h>\r
+#include <assert.h>\r

 \r
 \r

-//=====================================================================================\r
-//=====================================================================================\r

 #include "WBitmap.h"\r
 #include "GBSPFile.h"\r
 #include "Ram.h"\r
 #include "Bitmap.h"\r
 #include "WBitmap.h"\r
 #include "GBSPFile.h"\r
 #include "Ram.h"\r
 #include "Bitmap.h"\r

-#include "Errorlog.h"\r
+#include "ErrorLog.h"\r

 #include "Bitmap._h"\r
 \r
 //     NOTES -\r
 #include "Bitmap._h"\r
 \r
 //     NOTES -\r


@@ -567,4 +565,4 @@ char *geWBitmap_Pool_GetWNameByBitmap(geWBitmap_Pool *Pool, const geBitmap *Bitm
 \r
        return NULL;\r
 }\r
 \r
        return NULL;\r
 }\r

-// end change texture name
\ No newline at end of file
+// end change texture name\r

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

diff --git a/G3D/WgClip.c b/G3D/WgClip.c
index 08209a3..0d2f9a0 100644 (file)
--- a/G3D/WgClip.c
+++ b/G3D/WgClip.c
@@ -28,11 +28,10 @@
 #include <assert.h>\r
 #include <string.h>\r
 \r
 #include <assert.h>\r
 #include <string.h>\r
 \r

-#include "genesis.h"\r
-#include "basetype.h"\r
-#include "extbox.h"\r
-\r
-#include "wgClip.h"\r
+#include "Genesis.h"\r
+#include "BaseType.h"\r
+#include "ExtBox.h"\r
+#include "WgClip.h"\r

 \r
 #pragma warning (disable:4514) // unreferenced inline function (caused by Windows)\r
 \r
 \r
 #pragma warning (disable:4514) // unreferenced inline function (caused by Windows)\r
 \r

diff --git a/G3D/World.c b/G3D/World.c
index a7314f4..698c5cb 100644 (file)
--- a/G3D/World.c
+++ b/G3D/World.c
@@ -19,9 +19,9 @@
 /*  Copyright (C) 1999 WildTangent, Inc. All Rights Reserved           */\r
 /*                                                                                      */\r
 /****************************************************************************************/\r
 /*  Copyright (C) 1999 WildTangent, Inc. All Rights Reserved           */\r
 /*                                                                                      */\r
 /****************************************************************************************/\r

-#include <Assert.h>\r
-#include <Math.h>\r
- \r
+#include <assert.h>\r
+#include <math.h>\r
+\r

 #include "World.h"\r
 #include "System.h"\r
 #include "Ram.h"\r
 #include "World.h"\r
 #include "System.h"\r
 #include "Ram.h"\r


@@ -40,14 +40,10 @@
 #include "Vis.h"\r
 #include "User.h"\r
 #include "VFile.h"\r
 #include "Vis.h"\r
 #include "User.h"\r
 #include "VFile.h"\r

-\r

 #include "Trace.h"\r
 #include "Trace.h"\r

-\r
-#include "list.h"\r
-\r
+#include "List.h"\r

 #include "Bitmap.h"\r
 #include "Bitmap._h"\r
 #include "Bitmap.h"\r
 #include "Bitmap._h"\r

-\r

 #include "Puppet.h"\r
 #include "Body.h"\r
 #include "Motion.h"\r
 #include "Puppet.h"\r
 #include "Body.h"\r
 #include "Motion.h"\r

diff --git a/G3D/World.h b/G3D/World.h
index 0f80f76..34c5eda 100644 (file)
--- a/G3D/World.h
+++ b/G3D/World.h
@@ -22,20 +22,18 @@
 #ifndef GE_WORLD_H\r
 #define GE_WORLD_H\r
 \r
 #ifndef GE_WORLD_H\r
 #define GE_WORLD_H\r
 \r

-#include "G3D/ErrorLog.h"\r
-#include "G3D/PtrTypes.h"\r
-#include "G3D/Genesis.h"\r
+#include "ErrorLog.h"\r
+#include "PtrTypes.h"\r
+#include "Genesis.h"\r

 #include "GBSPFile.h"\r
 #include "GBSPFile.h"\r

-#include "G3D/Motion.h"\r
+#include "Motion.h"\r

 #include "Surface.h"\r
 #include "Fog.h"\r
 #include "WBitmap.h"\r
 #include "User.h"\r
 #include "Light.h"\r
 #include "Surface.h"\r
 #include "Fog.h"\r
 #include "WBitmap.h"\r
 #include "User.h"\r
 #include "Light.h"\r

-\r
-#include "G3D/Engine/BitmapList.h"\r
-\r
-#include "G3D/Actor.h"\r
+#include "BitmapList.h"\r
+#include "Actor.h"\r

 \r
 //MRB BEGIN\r
 //geSprite\r
 \r
 //MRB BEGIN\r
 //geSprite\r

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

diff --git a/G3D/Actor/xfarray.h b/G3D/XFArray.h
similarity index 97%
rename from G3D/Actor/xfarray.h
rename to G3D/XFArray.h
index 21c0db5..575c4dd 100644 (file)
--- a/G3D/Actor/xfarray.h
+++ b/G3D/XFArray.h
@@ -33,7 +33,7 @@
    ...In the name of optimal access to the array.\r
 */\r
 \r
    ...In the name of optimal access to the array.\r
 */\r
 \r

-#include "xform3d.h"\r
+#include "XForm3d.h"\r

 \r
 #ifdef __cplusplus\r
 extern "C" {\r
 \r
 #ifdef __cplusplus\r
 extern "C" {\r

diff --git a/G3D/XForm3d.c b/G3D/XForm3d.c
index f1adcca..fa44d4f 100644 (file)
--- a/G3D/XForm3d.c
+++ b/G3D/XForm3d.c
@@ -395,7 +395,8 @@ GENESISAPI void GENESISCC geXForm3d_TransformArray(const geXForm3d *XForm, const
        if (Count <= 0)                                                         // Early out if possible\r
                return;\r
 \r
        if (Count <= 0)                                                         // Early out if possible\r
                return;\r
 \r

-       _asm \r
+    // FIXME: asm code\r
+       /*_asm \r

        {\r
        mov     ecx,Count                                                       // get item count\r
        mov     esi,Source                                                      // get source array pointer\r
        {\r
        mov     ecx,Count                                                       // get item count\r
        mov     esi,Source                                                      // get source array pointer\r


@@ -454,7 +455,7 @@ Again:
 \r
        cmp ecx, 0\r
        jne Again\r
 \r
        cmp ecx, 0\r
        jne Again\r

-       }\r
+       }*/\r

 \r
        // 34 cycles predicted (per loop)\r
        // 39 cycles measured\r
 \r
        // 34 cycles predicted (per loop)\r
        // 39 cycles measured\r

diff --git a/G3D/Bitmap/Compression/yuv.c b/G3D/YUV.c
similarity index 95%
rename from G3D/Bitmap/Compression/yuv.c
rename to G3D/YUV.c
index 91e0256..ece3aa1 100644 (file)
--- a/G3D/Bitmap/Compression/yuv.c
+++ b/G3D/YUV.c
@@ -1,6 +1,7 @@
-#include "yuv.h"\r
-#include "utility.h"\r
-#include <Assert.h>\r
+#include <assert.h>\r
+\r
+#include "YUV.h"\r
+#include "Utility.h"\r

 \r
 /****************************************************************************************/\r
 /*  Yuv                                                                                 */\r
 \r
 /****************************************************************************************/\r
 /*  Yuv                                                                                 */\r

diff --git a/G3D/Bitmap/Compression/yuv.h b/G3D/YUV.h
similarity index 97%
rename from G3D/Bitmap/Compression/yuv.h
rename to G3D/YUV.h
index 275755a..4a39abe 100644 (file)
--- a/G3D/Bitmap/Compression/yuv.h
+++ b/G3D/YUV.h
@@ -23,7 +23,7 @@
 /*                                                                                      */\r
 /****************************************************************************************/\r
 \r
 /*                                                                                      */\r
 /****************************************************************************************/\r
 \r

-#include "basetype.h"\r
+#include "BaseType.h"\r

 \r
 #ifdef __cplusplus\r
 extern "C" {\r
 \r
 #ifdef __cplusplus\r
 extern "C" {\r

diff --git a/GBSPLib/CMakeLists.txt b/GBSPLib/CMakeLists.txt
index 9c8ef48..54d7611 100644 (file)
--- a/GBSPLib/CMakeLists.txt
+++ b/GBSPLib/CMakeLists.txt
@@ -1,3 +1,8 @@
-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)
+SET                     (GBSPLIB_SOURCE 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)
+
+ADD_LIBRARY             (GBSP STATIC ${GBSPLIB_SOURCE})
+
+ADD_LIBRARY             (GBSPLib SHARED ${GBSPLIB_SOURCE})
+TARGET_LINK_LIBRARIES   (GBSPLib G3D msvcrt)

diff --git a/GBSPLib/Portals.cpp b/GBSPLib/Portals.cpp
index 295fd76..6ab061a 100644 (file)
--- a/GBSPLib/Portals.cpp
+++ b/GBSPLib/Portals.cpp
@@ -35,7 +35,7 @@
 \r
 GBSP_Node      *OutsideNode;\r
 geVec3d                NodeMins, NodeMaxs;\r
 \r
 GBSP_Node      *OutsideNode;\r
 geVec3d                NodeMins, NodeMaxs;\r

-geBoolean      VisPortals;\r
+geBoolean      VPortals;\r

 \r
 geBoolean CreateAllOutsidePortals(GBSP_Node *Node);\r
 void GetNodeMinsMaxs(GBSP_Node *Node);\r
 \r
 geBoolean CreateAllOutsidePortals(GBSP_Node *Node);\r
 void GetNodeMinsMaxs(GBSP_Node *Node);\r


@@ -89,7 +89,7 @@ geBoolean CreatePortals(GBSP_Node *RootNode, GBSP_Model *Model, geBoolean Vis)
        if (Verbose)\r
                GHook.Printf(" --- Create Portals --- \n");\r
 \r
        if (Verbose)\r
                GHook.Printf(" --- Create Portals --- \n");\r
 \r

-       VisPortals = Vis;\r
+       VPortals = Vis;\r

 \r
        OutsideNode = &Model->OutsideNode;\r
 \r
 \r
        OutsideNode = &Model->OutsideNode;\r
 \r


@@ -308,7 +308,7 @@ geBoolean PartitionPortals_r(GBSP_Node *Node)
        if (Node->PlaneNum == PLANENUM_LEAF)\r
                return GE_TRUE;\r
 \r
        if (Node->PlaneNum == PLANENUM_LEAF)\r
                return GE_TRUE;\r
 \r

-       if (VisPortals && Node->Detail)                 // We can stop at detail seperators for the vis tree\r
+       if (VPortals && Node->Detail)                   // We can stop at detail seperators for the vis tree\r

                return GE_TRUE;\r
 \r
        //if (!InitializeNodePortal(Node))\r
                return GE_TRUE;\r
 \r
        //if (!InitializeNodePortal(Node))\r