From: Akiko Date: Wed, 10 Jun 2015 08:29:35 +0000 (+0200) Subject: - file renaming and includes done X-Git-Url: http://community.linux-addicted.net/gitweb/?p=genesis3d.git;a=commitdiff_plain;h=bed24c285205e0d4aaaebdd4853ff580346d4006 - 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 --- 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}") -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}") -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 () 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 --- a/G3D/Actor/actor.c +++ b/G3D/Actor.c @@ -34,7 +34,7 @@ #include // fabs() #include //sscanf -#include "world.h" // to expose _Render apis in actor.h +#include "World.h" // to expose _Render apis in actor.h #include "Actor.h" #include "Ram.h" @@ -42,7 +42,7 @@ #include "Body.h" #include "Motion.h" #include "ErrorLog.h" -#include "strblock.h" +#include "StrBlock.h" #ifdef _DEBUG #include #endif @@ -417,7 +417,8 @@ GENESISAPI geBoolean GENESISCC geActor_DestroyDirect(geActor **pA) gePose_Destroy( &( CurrentActor->Pose ) ); geMotion_Destroy(&(CurrentActor->CueMotion)); - assert( _CrtIsValidPointer( &CurrentActor->ActorDefinition, sizeof(CurrentActor->ActorDefinition), FALSE ) ); + // FIXME: _CrtIsValidHeapPointer ? + //assert( _CrtIsValidPointer( &CurrentActor->ActorDefinition, sizeof(CurrentActor->ActorDefinition), FALSE ) ); if(geActor_DefIsValid(CurrentActor->ActorDefinition)==GE_TRUE ) { diff --git a/G3D/Actor.h b/G3D/Actor.h index e840384..7e947e6 100644 --- a/G3D/Actor.h +++ b/G3D/Actor.h @@ -91,7 +91,7 @@ #include "Motion.h" #ifdef GE_WORLD_H -#include "camera.h" +#include "Camera.h" #include "Frustum.h" #endif diff --git a/G3D/Actor/actor.h b/G3D/Actor/actor.h deleted file mode 100644 index 82cf213..0000000 --- a/G3D/Actor/actor.h +++ /dev/null @@ -1,478 +0,0 @@ -/****************************************************************************************/ -/* ACTOR.H */ -/* */ -/* Author: Mike Sandige */ -/* Description: Actor interface */ -/* */ -/* The contents of this file are subject to the Genesis3D Public License */ -/* Version 1.01 (the "License"); you may not use this file except in */ -/* compliance with the License. You may obtain a copy of the License at */ -/* http://www.genesis3d.com */ -/* */ -/* Software distributed under the License is distributed on an "AS IS" */ -/* basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See */ -/* the License for the specific language governing rights and limitations */ -/* under the License. */ -/* */ -/* The Original Code is Genesis3D, released March 25, 1999. */ -/* Genesis3D Version 1.1 released November 15, 1999 */ -/* Copyright (C) 1999 WildTangent, Inc. All Rights Reserved */ -/* */ -/****************************************************************************************/ -/* Actor - - This object is designed to support character animation. - There are two basic objects to deal with. - - Actor Definition (geActor_Def) - A geActor_Def embodies the geometry (polygon, and bone information), - and a library of motions that can be applied to that geometry. - - Actor - A geActor is an instance of an actor definition. The definition is used for - the geometry, but all additional settings, such as the bone pose, lighting information, - and cuing information is unique for a geActor. -// GENESIS_PRIVATE_API - An Actor Definition is created either from an existing Actor Definition file, or from scratch by - first creating a geBody and geMotions and selecting these into an Actor. If the Actor Definition - is constructed from scratch, the objects selected into it (via SetBody and AddMotion) are - then 'owned' by the actor and will be destroyed along with the Actor when it is destroyed. - Of course, when the Actor is loaded from a file, the Body and Motion it creates as it is - loaded are cleaned up when the Actor is destroyed. - - Once an Actor is created, prepare it for rendering and animating by calling - Actor_RenderPrep(). This must be called (and it must succeed) before any render or - pose setting functions can be called. -// GENESIS_PUBLIC_API - - There are two ways to use an Actor. - Direct Control - One method is to directly control the skeleton configuration. Use _SetPose() to set its - skeleton using a geMotion animation. The pose is positioned in world space relative to the - transform given in SetPose(). Whenever a new skeleton pose is required, call _SetPose() - to reposition the skeleton for a new point in time. - - More complex positioning can be achieved by blending more than one animation. Use - _BlendPose() after a _SetPose() to blend the second geMotion into the first. Additional - blends can be applied by additional _BlendPose() calls. Each blend is performed on the - the existing skeleton (the results of any previous blends). - Cuing - Another method is to 'cue' up motions that are applied with parameterized blending over time. - A cued motion takes effect 'now' in time. The Actor advances in time and repositions itself - according to its currently cued motions with a call to _AnimationStep(). AnimationStep() - redefines what the actor thinks 'now' is. This causes historical cues to be forgotten, and - motions that are no longer valid are cleaned up. AnimationTestStep() can be used to position - the actor for potential queries with its currently cued motions at some arbitrary future time - - relative to the last AnimationTestStep() call. AnimationNudge() applies a given transform - 'instantly' to the current actor's cue list. This is usefull for moving the actor as a - result of a collision with another object. - - If a motion contains joint information that does not exactly match the Actor's skeleton - joints, only the joints that match by name are applied. So a geMotion can be applied to - a portion of the Actor, or a geMotion that has more joint information than the skeleton can - be applied and the extra joint information is ignored. - - Examples of this: If the Actor is a biped and has no tail, but the motion is for a - biped with a tail, the geMotion can be applied, but the tail information will be ignored. - Also if there is a geMotion for only a left arm, it can be applied and it will only affect - the left arm of the Actor, and consequently its left hand and fingers, but no other - bones that are not children of the affected bones will be changed. - - -*/ -#ifndef GE_ACTOR_H -#define GE_ACTOR_H - -#include "genesis.h" -#include "basetype.h" -#include "extbox.h" -#include "bitmap.h" - -#include "Motion.h" - -#ifdef GE_WORLD_H -#include "camera.h" -#include "Frustum.h" -#endif - -#include "Body.h" - -#ifdef __cplusplus -extern "C" { -#endif - -// GENESIS_PUBLIC_APIS - -#ifndef GE_ACTOR_ENUMS -#define GE_ACTOR_ENUMS -typedef enum -{ - GE_ACTOR_BLEND_LINEAR, // Treats the blending amount as a linear value - GE_ACTOR_BLEND_HERMITE // Applies a parametric smoothing curve to the blending amount - // so that a linear change in BlendAmount parameters will - // result in a smooth (non-linear) change in blending. -} geActor_BlendingType; - -#endif - -typedef struct geActor geActor; // an instance of an actor -typedef struct geActor_Def geActor_Def; // the deinition of an actor's geometry/bone structure - - -// GENESIS_PRIVATE_APIS - -//--------------------------------------------------------------------------------- -// Creation/Destruction functions -//--------------------------------------------------------------------------------- - // Create an 'empty' Actor Definition. -GENESISAPI geActor_Def *GENESISCC geActor_DefCreate(void); - - // Create an Actor Definition from a file image. -GENESISAPI geActor_Def *GENESISCC geActor_DefCreateFromFile(geVFile *pFile); - - // Create an additional reference (owner) for the Actor_Definition -GENESISAPI void GENESISCC geActor_DefCreateRef(geActor_Def *pActorDefinition); - - // Destroy a geActor_Def (its geBody and its geMotions) Actors that rely on this definition become invalid. - // can fail if there are actors still referencing this definition. -GENESISAPI geBoolean GENESISCC geActor_DefDestroy(geActor_Def **pActorDefinition); - - // Create an Actor instance associated with the given Actor Definition -GENESISAPI geActor *GENESISCC geActor_Create(geActor_Def *ActorDefinition); - - // Create an additional reference (owner) for the Actor -GENESISAPI void GENESISCC geActor_CreateRef(geActor *Actor); - - // Give the Actor Definition a Body. geActor becomes responsible for its destruction. - // sets up default materials as referenced by the Body. -GENESISAPI geBoolean GENESISCC geActor_SetBody( geActor_Def *ActorDefinition, geBody *geBodyGeometry); - - // Adds a geMotion to the Actor Definition's library. The ActorDefinition becomes responsible for its destruction. - // returns the library index to the new geMotion. -GENESISAPI geBoolean GENESISCC geActor_AddMotion(geActor_Def *ActorDefinition, geMotion *M, int *Index); - - // Destroy an Actor. -GENESISAPI geBoolean GENESISCC geActor_Destroy(geActor **pA); - -GENESISAPI geBoolean GENESISCC geActor_DestroyDirect(geActor **pA); - -GENESISAPI geBoolean GENESISCC geActor_DefIsValid(const geActor_Def *A); -GENESISAPI geBoolean GENESISCC geActor_IsValid(const geActor *A); - -// GENESIS_PUBLIC_APIS -//--------------------------------------------------------------------------------- -// Queries -//--------------------------------------------------------------------------------- -// GENESIS_PRIVATE_APIS - - // In general: Objects retuned from Get functions should not not be destroyed. - // if ownership is desired, call the objects _CreateRef() function to create another owner. - // (An 'owner' has access to the object regardless of the number of other owners, and - // an owner must call the object's _Destroy() function to relinquish ownership ) - - // Returns the Actor Definition associated with Actor A -GENESISAPI geActor_Def *GENESISCC geActor_GetActorDef(const geActor *A); - - // Writes an existing geActor to a file image. Returns GE_TRUE on success, GE_FALSE on failure. -GENESISAPI geBoolean GENESISCC geActor_DefWriteToFile(const geActor_Def *A, geVFile *pFile); - - // Returns a geBody pointer from the geActor -GENESISAPI geBody *GENESISCC geActor_GetBody(const geActor_Def *ActorDefinition); - - // Returns GE_TRUE if the actor definition has a bone named 'Name' -GENESISAPI geBoolean GENESISCC geActor_DefHasBoneNamed(const geActor_Def *Ad, const char *Name ); - - // Selects a blending type. BlendingType only affects the meaning of the - // BlendAmount parameter for the blend functions. Can be changed anytime. -GENESISAPI void GENESISCC geActor_SetBlendingType( geActor *A, geActor_BlendingType BlendingType ); - -// GENESIS_PUBLIC_APIS - - // Returns the number of geMotions in the geActors geMotion library. -GENESISAPI int GENESISCC geActor_GetMotionCount(const geActor_Def *ActorDefinition); - - // Returns a geMotion pointer from the geActors geMotion library - // This is an aliased pointer - Not a copy. Changes to this motion will be reflected - // in the actor. Destroying this return motion will confuse the actor. - // Index must be in range [0..geActor_GetMotionCount-1] -GENESISAPI geMotion *GENESISCC geActor_GetMotionByIndex(const geActor_Def *ActorDefinition, int Index ); - - // Returns a geMotion pointer from the geActors geMotion library - // This is an aliased pointer - Not a copy. Changes to this motion will be reflected - // in the actor. Destroying this return motion will confuse the actor. - // if there is no motion that matches the given name, the return value will be NULL -GENESISAPI geMotion *GENESISCC geActor_GetMotionByName(const geActor_Def *ActorDefinition, const char *Name ); - - // Returns a motion name given an ActorDef and a motion index. -GENESISAPI const char *GENESISCC geActor_GetMotionName(const geActor_Def *ActorDefinition, int Index ); - - // Returns the number of materials for an instance of an actor. -GENESISAPI int GENESISCC geActor_GetMaterialCount(const geActor *A); - - // Returns the current material for an instance of an actor -GENESISAPI geBoolean GENESISCC geActor_GetMaterial(const geActor *Actor, int MaterialIndex, - geBitmap **Bitmap, geFloat *Red, geFloat *Green, geFloat *Blue); - - // Allows a material to be overriden in an actor instance -GENESISAPI geBoolean GENESISCC geActor_SetMaterial(geActor *Actor, int MaterialIndex, - geBitmap *Bitmap, geFloat Red, geFloat Green, geFloat Blue); - - - - // Gets the current transform for a single bone in A. (actor space->world space transform) - // with a NULL BoneName, this returns the current 'root' transform -GENESISAPI geBoolean GENESISCC geActor_GetBoneTransform(const geActor *A, const char *BoneName, geXForm3d *Transform); - - // Gets the extent box (axial-aligned bounding box) for a given bone (for the current pose) - // if BoneName is NULL, gets the a general bounding box from the body of the actor if it has been set. -GENESISAPI geBoolean GENESISCC geActor_GetBoneExtBox(const geActor *A, - const char *BoneName,geExtBox *ExtBox); - - // Gets the non-axial-aligned bounding box for a given bone (for the current pose) - // The box is specified by a corner, and - // a non-normalized orientation transform. Add DX,DY,DZ components - // of the orientation to get other corners of the box - // if BoneName is NULL, gets the a general bounding box from the body of the actor if it has been set. -GENESISAPI geBoolean GENESISCC geActor_GetBoneBoundingBox(const geActor *A, - const char *BoneName, - geVec3d *Corner, - geVec3d *DX, - geVec3d *DY, - geVec3d *DZ); - - // Gets the current axial-aligned bounding box for an actor's bone configuration - // takes all bones into account -GENESISAPI geBoolean GENESISCC geActor_GetDynamicExtBox( const geActor *A, geExtBox *ExtBox); - - // Gets an assigned general non changing bounding box from the actor -GENESISAPI geBoolean GENESISCC geActor_GetExtBox(const geActor *A, geExtBox *ExtBox); - - // Sets an assigned general non changing bounding box from the actor -GENESISAPI geBoolean GENESISCC geActor_SetExtBox(geActor *A, const geExtBox *ExtBox, - const char *CenterBoxOnThisNamedBone); // NULL uses root position of actor - - // Gets the rendering hint bounding box from the actor - // if the RenderHintExtBox is disabled, Enabled is GE_FALSE, and the box returned has zero dimensions, - // centered at the root position of the actor. If the RenderHintExtBox is enabled, Enabled is - // GE_TRUE, and the box returned is the one set with _SetRenderHintExtBox, offset by the - // bone position of the bone named in _SetRenderHintExtBox(). -GENESISAPI geBoolean GENESISCC geActor_GetRenderHintExtBox(const geActor *A, geExtBox *Box, geBoolean *Enabled); - - // Sets a rendering hint bounding box from the actor. Increases performance by - // enabling the rendering of the actor to occur only if the box is visible. - // If the box is not visible, a detailed analysis of the actor's current geometry is avoided. - // This does allow errors to occur: - // If the actor has a bit of geometry that extends outside this box for some - // animation, that extended geometry may not be drawn, if the box if off-screen. - // If the render hint box is not set, the engine will make no conservative assumptions - // about the visibility of an actor - it will always be drawn if any portion of it is - // visible. - // To attach the box to the 'root' bone, pass NULL for CenterBoxOnThisNamedBone - // For disabling the hint box: (disabled is default) pass Box with zero mins and maxs -GENESISAPI geBoolean GENESISCC geActor_SetRenderHintExtBox(geActor *A, const geExtBox *Box, - const char *CenterBoxOnThisNamedBone ); - - - // Returns the pointer which was set with geActor_SetUserData. NULL if not set. -GENESISAPI void *GENESISCC geActor_GetUserData(const geActor *A); - - // Sets the actors user data pointer to the given value. For clients only. -GENESISAPI void GENESISCC geActor_SetUserData(geActor *A, void *UserData); - - -//-------------------------------------------------------------------------------- -// Posing and Rendering -//-------------------------------------------------------------------------------- - -// GENESIS_PRIVATE_APIS - -#ifdef GE_WORLD_H - // Prepares the geActor for rendering and posing. Call Once once the actor is fully created. - // Must be called prior to render/pose/setworldtransform -geBoolean GENESISCC geActor_RenderPrep( geActor *A, geWorld *World); - - // Draws the geActor. (RenderPrep must be called first) -geBoolean GENESISCC geActor_RenderThroughFrustum(const geActor *A, geEngine *Engine, geWorld *World, geCamera *Camera, Frustum_Info *FInfo); -geBoolean GENESISCC geActor_Render(const geActor *A, geEngine *Engine, geWorld *World, geCamera *Camera); -#endif - -// GENESIS_PUBLIC_APIS - - // Poses the actor in its default pose - // Transform is where to position the root for this pose. - // if Transform is NULL, the root for the pose is assumed to be the root of the actor. -GENESISAPI void GENESISCC geActor_ClearPose(geActor *A, const geXForm3d *Transform); - - // Poses the actor using given motion M at a time offset of Time - // Transform is where to position the root for this pose. - // if Transform is NULL, the root for the pose is assumed to be the root of the actor. -GENESISAPI void GENESISCC geActor_SetPose(geActor *A, const geMotion *Motion, geFloat Time, const geXForm3d *Transform); - - // Blends the current pose of the geActor with - // a new pose using motion M at a time offset of Time - // A BlendAmount of 0 will result in the existing pose, A BlendAmount of 1 will - // result in the new pose from M. The BlendingType set by _SetBlendingType() determines - // the blending function between 0 and 1 - // Transform is where to position the root for this pose. - // if Transform is NULL, the root for the pose is assumed to be the root of the actor. -GENESISAPI void GENESISCC geActor_BlendPose(geActor *A, const geMotion *Motion, geFloat Time, - const geXForm3d *Transform, geFloat BlendAmount); - - -GENESISAPI geBoolean GENESISCC geActor_GetBoneAttachment(const geActor *A, const char *BoneName, geXForm3d *Transform); -GENESISAPI geBoolean GENESISCC geActor_SetBoneAttachment(geActor *A, const char *BoneName, geXForm3d *Transform); - -// GENESIS_PRIVATE_APIS - -GENESISAPI geBoolean GENESISCC geActor_Attach( geActor *Slave, const char *SlaveBoneName, - const geActor *Master, const char *MasterBoneName, - const geXForm3d *Attachment); - -GENESISAPI void GENESISCC geActor_Detach(geActor *Slave); - -//Environmental mapping... -GENESISAPI void GENESISCC geActor_SetEnvironOptions( geActor *A, geEnvironmentOptions *opts ); - -GENESISAPI geEnvironmentOptions GENESISCC geActor_GetEnvironOptions( geActor *A ); - -// GENESIS_PUBLIC_APIS -GENESISAPI geBoolean GENESISCC geActor_SetLightingOptions(geActor *A, - geBoolean UseFillLight, // GE_TRUE or GE_FALSE - const geVec3d *FillLightNormal, // normalized vector - geFloat FillLightRed, // 0 .. 255 - geFloat FillLightGreen, // 0 .. 255 - geFloat FillLightBlue, // 0 .. 255 - geFloat AmbientLightRed, // 0 .. 255 - geFloat AmbientLightGreen, // 0 .. 255 - geFloat AmbientLightBlue, // 0 .. 255 - geBoolean AmbientLightFromFloor, // GE_TRUE or GE_FALSE - int MaximumDynamicLightsToUse, // 0 for none - const char *LightReferenceBoneName, //NULL for root - geBoolean PerBoneLighting); - // if GE_TRUE, then dynamic lighting attenuation and direction is computed - // for each bone. if GE_FALSE, then the computations are relative to the - // single bone named by the LightReferenceBoneName - -GENESISAPI geBoolean GENESISCC geActor_GetLightingOptions(const geActor *A, - geBoolean *UseFillLight, // GE_TRUE or GE_FALSE - geVec3d *FillLightNormal, // normalized vector - geFloat *FillLightRed, // 0 .. 255 - geFloat *FillLightGreen, // 0 .. 255 - geFloat *FillLightBlue, // 0 .. 255 - geFloat *AmbientLightRed, // 0 .. 255 - geFloat *AmbientLightGreen, // 0 .. 255 - geFloat *AmbientLightBlue, // 0 .. 255 - geBoolean *UseAmbientLightFromFloor,// GE_TRUE or GE_FALSE - int *MaximumDynamicLightsToUse, - const char **LightReferenceBoneName, - geBoolean *PerBoneLighting); // NULL for root - - -GENESISAPI void GENESISCC geActor_SetScale(geActor *A, geFloat ScaleX,geFloat ScaleY,geFloat ScaleZ); - -// LWM_ACTOR_RENDERING: -GENESISAPI geFloat GENESISCC geActor_GetAlpha(const geActor *A) ; -// LWM_ACTOR_RENDERING: -GENESISAPI void GENESISCC geActor_SetAlpha(geActor *A, geFloat Alpha) ; - -GENESISAPI geBoolean GENESISCC geActor_GetStaticLightingOptions(const geActor *Actor, geBoolean *UseAmbientLightFromStaticLights, geBoolean *TestRayCollision, int *MaxStaticLightsToUse ); -GENESISAPI geBoolean GENESISCC geActor_SetStaticLightingOptions(geActor *A, - geBoolean AmbientLightFromStaticLights, - geBoolean TestRayCollision, - int MaxStaticLightsToUse - ); - -GENESISAPI geBoolean GENESISCC geActor_SetShadow(geActor *A, - geBoolean DoShadow, - geFloat Radius, - const geBitmap *ShadowMap, - const char * BoneName); - -// Animation Cuing API: -// high level Actor animation: The principle is that motions can be applied to an actor -// and the actor will keep track of which motions are currently appropriate. Call -// _AnimationStep() to compute a new pose for an elapsed time interval. The new pose -// will take into account all motions that are 'currently' cued up to be set or blended. - - - // cue up a new motion. The motion begins at the current time. The motion can be - // blended in or out over time and time scaled. If the return value is GE_FALSE, the - // animation was not cued up (failure implies Actor is incompletely initialized). -GENESISAPI geBoolean GENESISCC geActor_AnimationCue( - geActor *A, // actor to apply animation to - geMotion *Motion, // motion to Cue - geFloat TimeScaleFactor, // time scale to apply to cued motion - geFloat TimeIntoMotion, // time offset to begin motion with (Not TimeScaled) - geFloat BlendTime, // time to apply a blend. - geFloat BlendFromAmount, // blend value at current time - geFloat BlendToAmount, // blend value after BlendTime time has elapsed - const geXForm3d *MotionTransform); // local transform to adjust motion by (NULL implies NO transform) - - // removes the last animation cue that was cued up. Can be called repeatedly to successively - // remove older and older cues. Returns GE_TRUE when a cue was removed, GE_FALSE if there - // are no cues to remove. -GENESISAPI geBoolean GENESISCC geActor_AnimationRemoveLastCue( geActor *A ); - - // applies a time step to actor A. re-poses the actor according to all currently applicable - // Animation Cues. (failure implies Actor is incompletely initialized) -GENESISAPI geBoolean GENESISCC geActor_AnimationStep(geActor *A, geFloat DeltaTime ); - - // applies a 'temporary' time step to actor A. re-poses the actor according to all - // currently appliciable cues. (failure implies Actor is incompletely initialized) - // DeltaTime is always relative to the the last AnimationStep() -GENESISAPI geBoolean GENESISCC geActor_AnimationTestStep(geActor *A, geFloat DeltaTime); - - // optimized version of geActor_AnimationStep. Limits calculations to the bone named BoneName, and it's - // parents. BoneName will be correctly computed, but the other bones will be wrong. This is usefull for - // moving and animating an actor that is not actually visible. Rendering and queries will be 'optimized' - // until the actor is given any pose or animation that doesn't go through geActor_AnimationStepBoneOptimized() or - // geActor_AnimationTestStepBoneOptimized(). BoneName can be NULL to compute only 'root' bone. -GENESISAPI geBoolean GENESISCC geActor_AnimationStepBoneOptimized(geActor *A, geFloat DeltaTime, const char *BoneName ); - - // optimized version of geActor_AnimationTestStep. Limits calculations to the bone named BoneName, and it's - // parents. BoneName will be correctly computed, but the other bones will be wrong. This is usefull for - // moving and animating an actor that is not actually visible. Rendering and queries will be 'optimized' - // until the actor is given any pose or animation that doesn't go through geActor_AnimationStepBoneOptimized() or - // geActor_AnimationTestStepBoneOptimized(). BoneName can be NULL to compute only 'root' bone. -GENESISAPI geBoolean GENESISCC geActor_AnimationTestStepBoneOptimized(geActor *A, geFloat DeltaTime, const char *BoneName); - - - // applies an 'immediate' offset to the animated actor -GENESISAPI geBoolean GENESISCC geActor_AnimationNudge(geActor *A, geXForm3d *Offset); - - -GENESISAPI geBoolean GENESISCC geActor_GetAnimationEvent(geActor *A, - const char **ppEventString); // Return data, if return value is GE_TRUE - - // returns number of actors that are currently created. -GENESISAPI int GENESISCC geActor_GetCount(void); - -// eaa3 07/21/2000 Mods for detailed collision detection - -GENESISAPI geBoolean GENESISCC geActor_GetBoneExtBoxByIndex( - const geActor *A, - int BoneIndex, - geExtBox *ExtBox); - -GENESISAPI geBoolean GENESISCC geActor_GetBoneTransformByIndex(const geActor *A, int BoneIndex, geXForm3d *Transform); - -GENESISAPI int geActor_GetBoneCount(const geActor *A); - -//MRB BEGIN -// Unlike geActor_GetExtBox, this gets the bounding box in non-world coordinates. -// Whatever you put in with geActor_SetExtBox, you get out with this function. -GENESISAPI void GENESISCC geActor_GetNonWorldExtBox(const geActor *A, geExtBox *ExtBox); -GENESISAPI void GENESISCC geActor_GetPosition(const geActor *A, geVec3d *Pos); -//MRB END - -// GENESIS_PRIVATE_APIS - // call setscale and setshadow after preparing the actor for rendering (renderprep) - - -#ifdef __cplusplus -} -#endif - - -#endif - diff --git a/G3D/Actor/body.h b/G3D/Actor/body.h deleted file mode 100644 index 186e3fc..0000000 --- a/G3D/Actor/body.h +++ /dev/null @@ -1,136 +0,0 @@ -/****************************************************************************************/ -/* BODY.H */ -/* */ -/* Author: Mike Sandige */ -/* Description: Actor body interface. */ -/* */ -/* The contents of this file are subject to the Genesis3D Public License */ -/* Version 1.01 (the "License"); you may not use this file except in */ -/* compliance with the License. You may obtain a copy of the License at */ -/* http://www.genesis3d.com */ -/* */ -/* Software distributed under the License is distributed on an "AS IS" */ -/* basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See */ -/* the License for the specific language governing rights and limitations */ -/* under the License. */ -/* */ -/* The Original Code is Genesis3D, released March 25, 1999. */ -/* Genesis3D Version 1.1 released November 15, 1999 */ -/* Copyright (C) 1999 WildTangent, Inc. All Rights Reserved */ -/* */ -/****************************************************************************************/ -#ifndef GE_BODY_H -#define GE_BODY_H - -/* This object is for managing the data associated with a skeletal-based mesh, - a 'body'. - This object holds the geometry for the body and the list of materials needed. -*/ - -#include "basetype.h" -#include "xform3d.h" -#include "vfile.h" -#include "bitmap.h" - -#ifdef __cplusplus -extern "C" { -#endif - -#define GE_BODY_NUMBER_OF_LOD (4) // 0 is highest detail -#define GE_BODY_NO_PARENT_BONE (-1) -#define GE_BODY_HIGHEST_LOD (0) - -#define GE_BODY_ROOT (-1) // for specifying 'root' bounding box. - -typedef struct geBody geBody; - - - -geBody *GENESISCC geBody_Create(void); - -void GENESISCC geBody_Destroy(geBody **B); - -geBoolean GENESISCC geBody_IsValid(const geBody *B); - - -geBoolean GENESISCC geBody_GetGeometryStats(const geBody *B, int lod, int *Vertices, int *Faces, int *Normals); - -geBoolean GENESISCC geBody_AddFace( geBody *B, - const geVec3d *Vertex1, const geVec3d *Normal1, - geFloat U1, geFloat V1, int BoneIndex1, - const geVec3d *Vertex2, const geVec3d *Normal2, - geFloat U2, geFloat V2, int BoneIndex2, - const geVec3d *Vertex3, const geVec3d *Normal3, - geFloat U3, geFloat V3, int BoneIndex3, - int MaterialIndex); - - // Bitmap is added to body. It's reference count is increased. Caller still owns a pointer - // to the bitmap, and is responsible for destroying it. -geBoolean GENESISCC geBody_AddMaterial( geBody *B, - const char *MaterialName, - geBitmap *Bitmap, - geFloat Red, - geFloat Green, - geFloat Blue, - int *MaterialIndex); - - // returned bitmap is a pointer to the bitmap in the body's list. It may not be destroyed. - // if caller would like to 'own' a copy of that bitmap pointer, it should call geBitmap_CreateRef() -geBoolean GENESISCC geBody_GetMaterial(const geBody *Body, int MaterialIndex, - const char **MaterialName, - geBitmap **Bitmap, geFloat *Red, geFloat *Green, geFloat *Blue); - - // Bitmap is set into the body. It's reference count is increased. Caller still owns a pointer - // to the bitmap, and is responsible for destroying it. -geBoolean GENESISCC geBody_SetMaterial(geBody *Body, int MaterialIndex, - geBitmap *Bitmap, geFloat Red, geFloat Green, geFloat Blue); - -int GENESISCC geBody_GetMaterialCount(const geBody *B); - -geBoolean GENESISCC geBody_AddBone( geBody *B, - int ParentBoneIndex, - const char *BoneName, - const geXForm3d *AttachmentMatrix, - int *BoneIndex); - -geBoolean GENESISCC geBody_ComputeLevelsOfDetail( geBody *B ,int Levels); - -int GENESISCC geBody_GetBoneCount(const geBody *B); - -void GENESISCC geBody_GetBone( const geBody *B, - int BoneIndex, - const char **BoneName, - geXForm3d *Attachment, - int *ParentBoneIndex); - -int32 GENESISCC geBody_GetBoneNameChecksum(const geBody *B); - -void GENESISCC geBody_SetBoundingBox( geBody *B, - int BoneIndex, // GE_BODY_ROOT for specifing 'root' bounding box. - const geVec3d *MinimumBoxCorner, - const geVec3d *MaximumBoxCorner); - - -geBoolean GENESISCC geBody_GetBoundingBox( const geBody *B, - int BoneIndex, // GE_BODY_ROOT for specifing 'root' bounding box. - geVec3d *MinimumBoxCorner, - geVec3d *MaximumBoxCorner); - -geBoolean GENESISCC geBody_GetBoneByName(const geBody* B, - const char* BoneName, - int* pBoneIndex, - geXForm3d* Attachment, - int* pParentBoneIndex); - -geBoolean GENESISCC geBody_WriteToFile(const geBody *B, geVFile *pFile); -geBody *GENESISCC geBody_CreateFromFile(geVFile *pFile); - - - - -#ifdef __cplusplus -} -#endif - -#endif - \ No newline at end of file diff --git a/G3D/Actor/motion.h b/G3D/Actor/motion.h deleted file mode 100644 index de4fbea..0000000 --- a/G3D/Actor/motion.h +++ /dev/null @@ -1,180 +0,0 @@ -/****************************************************************************************/ -/* MOTION.H */ -/* */ -/* Author: Mike Sandige */ -/* Description: Motion interface. */ -/* */ -/* The contents of this file are subject to the Genesis3D Public License */ -/* Version 1.01 (the "License"); you may not use this file except in */ -/* compliance with the License. You may obtain a copy of the License at */ -/* http://www.genesis3d.com */ -/* */ -/* Software distributed under the License is distributed on an "AS IS" */ -/* basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See */ -/* the License for the specific language governing rights and limitations */ -/* under the License. */ -/* */ -/* The Original Code is Genesis3D, released March 25, 1999. */ -/* Genesis3D Version 1.1 released November 15, 1999 */ -/* Copyright (C) 1999 WildTangent, Inc. All Rights Reserved */ -/* */ -/****************************************************************************************/ -#ifndef GE_MOTION_H -#define GE_MOTION_H - -/* motion - - This object is a list of named Path objects - -*/ - -#include -#include "basetype.h" -#include "path.h" -#include "vfile.h" - -#ifdef __cplusplus -extern "C" { -#endif - -// GENESIS_PUBLIC_APIS -typedef struct geMotion geMotion; - -GENESISAPI geMotion *GENESISCC geMotion_Create(geBoolean ManageNames); - -GENESISAPI void GENESISCC geMotion_Destroy(geMotion **PM); - -// GENESIS_PRIVATE_APIS - -GENESISAPI geBoolean GENESISCC geMotion_IsValid(const geMotion *M); - - // AddPath adds a reference of P to the motion M. Ownership is shared - The caller must destroy P. -GENESISAPI geBoolean GENESISCC geMotion_AddPath(geMotion *M, gePath *P,const char *Name,int *Index); - -GENESISAPI geBoolean GENESISCC geMotion_HasNames(const geMotion *M); -GENESISAPI int32 GENESISCC geMotion_GetNameChecksum(const geMotion *M); - -GENESISAPI geBoolean GENESISCC geMotion_RemoveNames(geMotion *M); - -GENESISAPI void GENESISCC geMotion_SampleChannels(const geMotion *M, int PathIndex, geFloat Time, geQuaternion *Rotation, geVec3d *Translation); -GENESISAPI geBoolean GENESISCC geMotion_SampleChannelsNamed(const geMotion *M, const char *PathName, geFloat Time, geQuaternion *Rotation, geVec3d *Translation); - -GENESISAPI void GENESISCC geMotion_Sample(const geMotion *M, int PathIndex, geFloat Time, geXForm3d *Transform); -GENESISAPI geBoolean GENESISCC geMotion_SampleNamed(const geMotion *M, const char *PathName, geFloat Time, geXForm3d *Transform); - - // the returned Paths from _Get functions should not be destroyed. - // if ownership is desired, call gePath_CreateRef() to create another owner. - // an 'owner' has access to the object regardless of the number of other owners, and - // an owner must call the object's destroy method to relinquish ownership -GENESISAPI gePath *GENESISCC geMotion_GetPathNamed(const geMotion *M,const char *Name); -GENESISAPI const char *GENESISCC geMotion_GetNameOfPath(const geMotion *M, int Index); - -// GENESIS_PUBLIC_APIS -GENESISAPI gePath *GENESISCC geMotion_GetPath(const geMotion *M,int Index); -GENESISAPI int GENESISCC geMotion_GetPathCount(const geMotion *M); - - -GENESISAPI geBoolean GENESISCC geMotion_SetName(geMotion *M, const char * Name); -GENESISAPI const char *GENESISCC geMotion_GetName(const geMotion *M); - -// GENESIS_PRIVATE_APIS - - // support for compound motions. A motion can either have sub-motions, or be single motion. - // these functions support motions that have sub-motions. -GENESISAPI int GENESISCC geMotion_GetSubMotionCount(const geMotion*M); - - // the returned motions from these _Get functions should not be destroyed. - // if ownership is desired, call geMotion_CreateRef() to create another owner. - // an 'owner' has access to the object regardless of the number of other owners, and - // an owner must call the object's destroy method to relinquish ownership -GENESISAPI geMotion *GENESISCC geMotion_GetSubMotion(const geMotion *M,int Index); -GENESISAPI geMotion *GENESISCC geMotion_GetSubMotionNamed(const geMotion *M,const char *Name); -GENESISAPI geBoolean GENESISCC geMotion_AddSubMotion( - geMotion *ParentMotion, - geFloat TimeScale, // Scale factor for this submotion - geFloat TimeOffset, // Time in parent motion when submotion should start - geMotion *SubMotion, - geFloat StartTime, // Blend start time (relative to submotion) - geFloat StartMagnitude, // Blend start magnitude (0..1) - geFloat EndTime, // Blend ending time (relative to submotion) - geFloat EndMagnitude, // Blend ending magnitude (0..1) - const geXForm3d *Transform, // Base transform to apply to this submotion - int *Index); // returned motion index - -GENESISAPI geMotion *GENESISCC geMotion_RemoveSubMotion(geMotion *ParentMotion, int SubMotionIndex); - -// Get/Set submotion time offset. The time offset is the offset into the -// compound (parent) motion at which the submotion should start. -GENESISAPI geFloat GENESISCC geMotion_GetTimeOffset( const geMotion *M,int SubMotionIndex ); -GENESISAPI geBoolean GENESISCC geMotion_SetTimeOffset( geMotion *M,int SubMotionIndex,geFloat TimeOffset ); - -// Get/Set submotion time scale. Time scaling is applied to the submotion after the TimeOffset -// is applied. The formula is: (CurrentTime - TimeOffset) * TimeScale -GENESISAPI geFloat GENESISCC geMotion_GetTimeScale( const geMotion *M,int SubMotionIndex ); -GENESISAPI geBoolean GENESISCC geMotion_SetTimeScale( geMotion *M,int SubMotionIndex,geFloat TimeScale ); - -// Get blending amount for a particular submotion. The Time parameter is parent-relative. -GENESISAPI geFloat GENESISCC geMotion_GetBlendAmount( const geMotion *M, int SubMotionIndex, geFloat Time); - -// Get/Set blending path. The keyframe times in the blend path are relative to the submotion. -GENESISAPI gePath *GENESISCC geMotion_GetBlendPath( const geMotion *M,int SubMotionIndex ); -GENESISAPI geBoolean GENESISCC geMotion_SetBlendPath( geMotion *M,int SubMotionIndex, gePath *Blend ); - -GENESISAPI const geXForm3d *GENESISCC geMotion_GetBaseTransform( const geMotion *M,int SubMotionIndex ); -GENESISAPI geBoolean GENESISCC geMotion_SetBaseTransform( geMotion *M,int SubMotionIndex, geXForm3d *BaseTransform ); -GENESISAPI geBoolean GENESISCC geMotion_GetTransform(const geMotion *M, geFloat Time, geXForm3d *Transform); -// GENESIS_PUBLIC_APIS - - // gets time of first key and time of last key (as if motion did not loop) - // if there are no paths in the motion: returns GE_FALSE and times are not set - // otherwise returns GE_TRUE - // - // For a compound motion, GetTimeExtents will return the extents of the scaled submotions. - // For a single motion, no scaling is applied. -GENESISAPI geBoolean GENESISCC geMotion_GetTimeExtents(const geMotion *M,geFloat *StartTime,geFloat *EndTime); - -// Only one event is allowed per time key. - -GENESISAPI geBoolean GENESISCC geMotion_InsertEvent(geMotion *M, geFloat tKey, const char* String); - // Inserts the new event and corresponding string. - -GENESISAPI geBoolean GENESISCC geMotion_DeleteEvent(geMotion *M, geFloat tKey); - // Deletes the event - -GENESISAPI void GENESISCC geMotion_SetupEventIterator( - geMotion *M, - geFloat StartTime, // Inclusive search start - geFloat EndTime); // Non-inclusive search stop - // For searching or querying the array for events between two times - // times are compaired [StartTime,EndTime), '[' is inclusive, ')' is - // non-inclusive. This prepares the geMotion_GetNextEvent() function. - -GENESISAPI geBoolean GENESISCC geMotion_GetNextEvent( - geMotion *M, // Event list to iterate - geFloat *pTime, // Return time, if found - const char **ppEventString); // Return data, if found - // Iterates from StartTime to EndTime as setup in geMotion_SetupEventIterator() - // and for each event between these times [StartTime,EndTime) - // this function will return Time and EventString returned for that event - // and the iterator will be positioned for the next search. When there - // are no more events in the range, this function will return GE_FALSE (Time - // will be 0 and ppEventString will be empty). - -GENESISAPI geBoolean GENESISCC geMotion_GetEventExtents(const geMotion *M, - geFloat *FirstEventTime, - geFloat *LastEventTime); - // returns the time associated with the first and last events - // returns GE_FALSE if there are no events (and Times are not set) - - -// GENESIS_PRIVATE_APIS -GENESISAPI geMotion *GENESISCC geMotion_CreateFromFile(geVFile *f); -GENESISAPI geBoolean GENESISCC geMotion_WriteToFile(const geMotion *M, geVFile *f); -GENESISAPI geBoolean GENESISCC geMotion_WriteToBinaryFile(const geMotion *M,geVFile *pFile); - -#ifdef __cplusplus -} -#endif - - -#endif diff --git a/G3D/Actor/path.h b/G3D/Actor/path.h deleted file mode 100644 index 6052947..0000000 --- a/G3D/Actor/path.h +++ /dev/null @@ -1,153 +0,0 @@ -/****************************************************************************************/ -/* PATH.H */ -/* */ -/* Author: Mike Sandige */ -/* Description: Time-indexed keyframe creation, maintenance, and sampling. */ -/* */ -/* The contents of this file are subject to the Genesis3D Public License */ -/* Version 1.01 (the "License"); you may not use this file except in */ -/* compliance with the License. You may obtain a copy of the License at */ -/* http://www.genesis3d.com */ -/* */ -/* Software distributed under the License is distributed on an "AS IS" */ -/* basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See */ -/* the License for the specific language governing rights and limitations */ -/* under the License. */ -/* */ -/* The Original Code is Genesis3D, released March 25, 1999. */ -/* Genesis3D Version 1.1 released November 15, 1999 */ -/* Copyright (C) 1999 WildTangent, Inc. All Rights Reserved */ -/* */ -/****************************************************************************************/ -#ifndef GE_PATH_H -#define GE_PATH_H - -#include "basetype.h" -#include "xform3d.h" -#include "quatern.h" -#include "vfile.h" - -#ifdef __cplusplus - extern "C" { -#endif - - -// GENESIS_PUBLIC_APIS -typedef struct _gePath gePath; - -#define GE_PATH_ROTATION_CHANNEL 1 -#define GE_PATH_TRANSLATION_CHANNEL 2 - -#define GE_PATH_ALL_CHANNELS (GE_PATH_ROTATION_CHANNEL | GE_PATH_TRANSLATION_CHANNEL) - -#ifndef GE_PATH_ENUMS - #define GE_PATH_ENUMS - typedef enum - { - GE_PATH_INTERPOLATE_LINEAR = 0, // linear blend for translation or rotation channel - GE_PATH_INTERPOLATE_HERMITE, // hermite cubic spline for translation channel - GE_PATH_INTERPOLATE_SLERP, // spherical-linear blend for rotation channel - GE_PATH_INTERPOLATE_SQUAD, // higher order blend for rotation channel 'G1' continuity - //GE_PATH_INTEROPLATE_TRIPOD, // not supported yet. - GE_PATH_INTERPOLATE_HERMITE_ZERO_DERIV = 7 // hermite cubic with zero derivative at keyframes ('easing' curve) - }gePath_Interpolator; -#endif - -GENESISAPI void GENESISCC gePath_CreateRef( gePath *P ); - -GENESISAPI gePath *GENESISCC gePath_Create( - gePath_Interpolator TranslationInterpolation, // type of interpolation for translation channel - gePath_Interpolator RotationInterpolation, // type of interpolation for rotation channel - geBoolean Looped); // True if end of path is connected to head - // creates new gePath - // A looping path should have the same first & last point. The path - // generator will choose arbitrarily between these points for a - // sample exactly at the end of the loop. - -GENESISAPI gePath *GENESISCC gePath_CreateCopy( const gePath *P ); - -GENESISAPI void GENESISCC gePath_Destroy(gePath **PP); - // destroys path *PP - -//------------------ time based keyframe operations -GENESISAPI geBoolean GENESISCC gePath_InsertKeyframe( - gePath *P, - int ChannelMask, - geFloat Time, - const geXForm3d *Matrix); - // inserts a keyframe at a specific time. - -GENESISAPI geBoolean GENESISCC gePath_DeleteKeyframe( - gePath *P, - int Index, - int ChannelMask); - // deletes the nth keyframe - -GENESISAPI geBoolean GENESISCC gePath_GetTimeExtents( - const gePath *P, - geFloat *StartTime, - geFloat *EndTime); - // gets the time for the first and last keys in the path (ignoring looping) - // if there are no keys, return GE_FALSE and times are not set. - // returns GE_TRUE if there are keys. - -//----------------- index based keyframe operations -GENESISAPI void GENESISCC gePath_GetKeyframe( - const gePath *P, - int Index, // gets keyframe[index] - int Channel, // for this channel - geFloat *Time, // returns the time of the keyframe - geXForm3d *Matrix); // returns the matrix of the keyframe - // retrieves keyframe[index], and it's time - -GENESISAPI int GENESISCC gePath_GetKeyframeCount(const gePath *P,int Channel); - // retrieves count of keyframes for a specific channel - -GENESISAPI int GENESISCC gePath_GetKeyframeIndex(const gePath *P, int Channel, geFloat Time); - // retrieves the index of the keyframe at a specific time for a specific channel - -//----------------- sampling a path (time based) -GENESISAPI void GENESISCC gePath_Sample(const gePath *P, geFloat Time,geXForm3d *Matrix); - // returns a transform matrix sampled at 'Time'. - // p is not const because information is cached in p for next sample - -// GENESIS_PRIVATE_APIS -void GENESISCC gePath_SampleChannels( - const gePath *P, - geFloat Time, - geQuaternion *Rotation, - geVec3d *Translation); - // returns a rotation and a translation for the path at 'Time' - // p is not const because information is cached in p for next sample - -GENESISAPI geBoolean GENESISCC gePath_OffsetTimes(gePath *P, - int StartingIndex, int ChannelMask, geFloat TimeOffset ); - // slides all samples in path starting with StartingIndex down by TimeOffset - -GENESISAPI geBoolean GENESISCC gePath_ModifyKeyframe( - gePath *P, - int Index, - int ChannelMask, - const geXForm3d *Matrix); - - -// GENESIS_PUBLIC_APIS - -//------------------ saving/loading a path -GENESISAPI gePath* GENESISCC gePath_CreateFromFile(geVFile *F); - // loads a file (binary or ascii) - -GENESISAPI geBoolean GENESISCC gePath_WriteToFile(const gePath *P, geVFile *F); - // dumps formatted ascii to the file. - -GENESISAPI geBoolean GENESISCC gePath_WriteToBinaryFile(const gePath *P, geVFile *F); - // dumps a minimal binary image for fastest reading - - - -#ifdef __cplusplus - } -#endif - - -#endif 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 --- a/G3D/Bitmap/bitmap.__h +++ b/G3D/Bitmap.__h @@ -22,8 +22,8 @@ /* */ /****************************************************************************************/ -#include "bitmap.h" -#include "bitmap._h" +#include "Bitmap.h" +#include "Bitmap._h" // Hey ! // this is bitmap.__h : for inclusion by bitmap friends ONLY! 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 --- a/G3D/Bitmap/bitmap._h +++ b/G3D/Bitmap._h @@ -24,8 +24,8 @@ /****************************************************************************************/ -#include "bitmap.h" -#include "dcommon.h" +#include "Bitmap.h" +#include "DCommon.h" #ifdef __cplusplus extern "C" { 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 --- a/G3D/Bitmap/bitmap.c +++ b/G3D/Bitmap.c @@ -56,26 +56,23 @@ see {} for notes/long-term-todos #include #include -#include "basetype.h" -#include "getypes.h" -#include "ram.h" - -#include "vfile.h" +#include "BaseType.h" +#include "GeTypes.h" +#include "Ram.h" +#include "VFile.h" #include "ErrorLog.h" #include "Log.h" -#include "mempool.h" - -#include "bitmap.h" -#include "bitmap._h" -#include "bitmap.__h" -#include "bitmap_blitdata.h" -#include "bitmap_gamma.h" - -#include "palcreate.h" -#include "palettize.h" +#include "MemPool.h" +#include "Bitmap.h" +#include "Bitmap._h" +#include "Bitmap.__h" +#include "BitmapBlitData.h" +#include "BitmapGamma.h" +#include "PALCreate.h" +#include "Palettize.h" #ifdef DO_TIMER -#include "timer.h" +#include "Timer.h" #endif #define allocate(ptr) ptr = geRam_Allocate(sizeof(*ptr)) diff --git a/G3D/Bitmap/PixelFormat.h b/G3D/Bitmap/PixelFormat.h deleted file mode 100644 index d8bf5ad..0000000 --- a/G3D/Bitmap/PixelFormat.h +++ /dev/null @@ -1,152 +0,0 @@ -#ifndef PIXELFORMAT_H -#define PIXELFORMAT_H - -/****************************************************************************************/ -/* PixelFormat.h */ -/* */ -/* Author: Charles Bloom */ -/* Description: The abstract Pixel primitives */ -/* */ -/* The contents of this file are subject to the Genesis3D Public License */ -/* Version 1.01 (the "License"); you may not use this file except in */ -/* compliance with the License. You may obtain a copy of the License at */ -/* http://www.genesis3d.com */ -/* */ -/* Software distributed under the License is distributed on an "AS IS" */ -/* basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See */ -/* the License for the specific language governing rights and limitations */ -/* under the License. */ -/* */ -/* The Original Code is Genesis3D, released March 25, 1999. */ -/* Genesis3D Version 1.1 released November 15, 1999 */ -/* Copyright (C) 1999 WildTangent, Inc. All Rights Reserved */ -/* */ -/****************************************************************************************/ - -#include "basetype.h" - -#ifdef __cplusplus -extern "C" { -#endif - -typedef enum // all supported formats (including shifts) -{ - GE_PIXELFORMAT_NO_DATA = 0, - GE_PIXELFORMAT_8BIT, // PAL - GE_PIXELFORMAT_8BIT_GRAY, // no palette (intensity from bit value) - GE_PIXELFORMAT_16BIT_555_RGB, - GE_PIXELFORMAT_16BIT_555_BGR, - GE_PIXELFORMAT_16BIT_565_RGB, // #5 - GE_PIXELFORMAT_16BIT_565_BGR, - GE_PIXELFORMAT_16BIT_4444_ARGB, // #7 - GE_PIXELFORMAT_16BIT_1555_ARGB, - GE_PIXELFORMAT_24BIT_RGB, // #9 - GE_PIXELFORMAT_24BIT_BGR, - GE_PIXELFORMAT_24BIT_YUV, // * see note below - GE_PIXELFORMAT_32BIT_RGBX, - GE_PIXELFORMAT_32BIT_XRGB, - GE_PIXELFORMAT_32BIT_BGRX, - GE_PIXELFORMAT_32BIT_XBGR, - GE_PIXELFORMAT_32BIT_RGBA, - GE_PIXELFORMAT_32BIT_ARGB, // #17 - GE_PIXELFORMAT_32BIT_BGRA, - GE_PIXELFORMAT_32BIT_ABGR, - - GE_PIXELFORMAT_WAVELET, // #20 , Wavelet Compression - - GE_PIXELFORMAT_COUNT -} gePixelFormat; - -/****** - -there's something wacked out about these format names : - - for 16 bit & 32 bit , the _RGB or _BGR refers to their order - *in the word or dword* ; since we're on intel, this means - the bytes in the data file have the *opposite* order !! - (for example the 32 bit _ARGB is actually B,G,R,A in raw bytes) - for 24 bit , the _RGB or _BGR refers to their order in the - actual bytes, so that windows bitmaps actually have - _RGB order in a dword !! - -* YUV : the pixelformat ops here are identical to those of 24bit_RGB ; - this is just a place-keeper to notify you that you should to a YUV_to_RGB conversion - -*********/ - -#define GE_PIXELFORMAT_8BIT_PAL GE_PIXELFORMAT_8BIT - -typedef uint32 (*gePixelFormat_Composer )(int R,int G,int B,int A); -typedef void (*gePixelFormat_Decomposer )(uint32 Pixel,int *R,int *G,int *B,int *A); - -typedef void (*gePixelFormat_ColorGetter)(uint8 **ppData,int *R,int *G,int *B,int *A); -typedef void (*gePixelFormat_ColorPutter)(uint8 **ppData,int R,int G,int B,int A); - -typedef uint32 (*gePixelFormat_PixelGetter)(uint8 **ppData); -typedef void (*gePixelFormat_PixelPutter)(uint8 **ppData,uint32 Pixel); - -typedef struct gePixelFormat_Operations -{ - uint32 RMask; - uint32 GMask; - uint32 BMask; - uint32 AMask; - - int RShift; - int GShift; - int BShift; - int AShift; - - int RAdd; - int GAdd; - int BAdd; - int AAdd; - - int BytesPerPel; - geBoolean HasPalette; - char * Description; - - gePixelFormat_Composer ComposePixel; - gePixelFormat_Decomposer DecomposePixel; - - gePixelFormat_ColorGetter GetColor; - gePixelFormat_ColorPutter PutColor; - - gePixelFormat_PixelGetter GetPixel; - gePixelFormat_PixelPutter PutPixel; -} gePixelFormat_Operations; - - // the Masks double as boolean "HaveAlpha" .. etc.. - -GENESISAPI const gePixelFormat_Operations * GENESISCC gePixelFormat_GetOperations( gePixelFormat Format ); - - // quick accessors to _GetOps -GENESISAPI geBoolean GENESISCC gePixelFormat_IsValid( gePixelFormat Format); -GENESISAPI unsigned int GENESISCC gePixelFormat_BytesPerPel( gePixelFormat Format ); -GENESISAPI geBoolean GENESISCC gePixelFormat_HasPalette( gePixelFormat Format ); -GENESISAPI geBoolean GENESISCC gePixelFormat_HasAlpha( gePixelFormat Format ); -GENESISAPI geBoolean GENESISCC gePixelFormat_HasGoodAlpha( gePixelFormat Format ); // more than 1 bit of alpha -GENESISAPI const char * GENESISCC gePixelFormat_Description( gePixelFormat Format ); -GENESISAPI geBoolean GENESISCC gePixelFormat_IsRaw( gePixelFormat Format ); - // 'Raw' means pixels can be made with the Compose operations - -GENESISAPI uint32 GENESISCC gePixelFormat_ComposePixel( gePixelFormat Format,int R,int G,int B,int A); -GENESISAPI void GENESISCC gePixelFormat_DecomposePixel( gePixelFormat Format,uint32 Pixel,int *R,int *G,int *B,int *A); - - // these four functions move ppData to the next pixel - -GENESISAPI void GENESISCC gePixelFormat_GetColor(gePixelFormat Format,uint8 **ppData,int *R,int *G,int *B,int *A); -GENESISAPI void GENESISCC gePixelFormat_PutColor(gePixelFormat Format,uint8 **ppData,int R,int G,int B,int A); - -GENESISAPI uint32 GENESISCC gePixelFormat_GetPixel(gePixelFormat Format,uint8 **ppData); -GENESISAPI void GENESISCC gePixelFormat_PutPixel(gePixelFormat Format,uint8 **ppData,uint32 Pixel); - -GENESISAPI uint32 GENESISCC gePixelFormat_ConvertPixel(gePixelFormat Format,uint32 Pixel,gePixelFormat ToFormat); - - -#ifdef __cplusplus -} -#endif - -#endif - diff --git a/G3D/Bitmap/bitmap.h b/G3D/Bitmap/bitmap.h deleted file mode 100644 index 9263a42..0000000 --- a/G3D/Bitmap/bitmap.h +++ /dev/null @@ -1,627 +0,0 @@ -#ifndef BITMAP_H -#define BITMAP_H - -/****************************************************************************************/ -/* Bitmap.h */ -/* */ -/* Author: Charles Bloom */ -/* Description: Abstract Bitmap system */ -/* */ -/* The contents of this file are subject to the Genesis3D Public License */ -/* Version 1.01 (the "License"); you may not use this file except in */ -/* compliance with the License. You may obtain a copy of the License at */ -/* http://www.genesis3d.com */ -/* */ -/* Software distributed under the License is distributed on an "AS IS" */ -/* basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See */ -/* the License for the specific language governing rights and limitations */ -/* under the License. */ -/* */ -/* The Original Code is Genesis3D, released March 25, 1999. */ -/* Genesis3D Version 1.1 released November 15, 1999 */ -/* Copyright (C) 1999 WildTangent, Inc. All Rights Reserved */ -/* */ -/****************************************************************************************/ - -#include "basetype.h" -#include "pixelformat.h" -#include "vfile.h" - -#ifdef __cplusplus -extern "C" { -#endif - -/***********************************************************************************/ - -typedef struct geBitmap geBitmap; -typedef struct geBitmap_Palette geBitmap_Palette; - -typedef struct geBitmap_Info -{ - int Width; - int Height; - int Stride; // stride is in *pixels* ; it is the step to the next line : Stride >= Width - gePixelFormat Format; - int MinimumMip; //*including* minimumMip == 0 often - int MaximumMip; //*including* maximumMip == nummips-1 - geBoolean HasColorKey; - uint32 ColorKey; // meaningless unless HasColorKey ; the ColorKey is a Pixel in Format - geBitmap_Palette * Palette; -} geBitmap_Info; - -/***********************************************************************************/ -// Bitmap methods - -// see a big comment at the end of this file - -/************************************************************************/ - -GENESISAPI geBitmap * GENESISCC geBitmap_Create(int Width, int Height, int MipCount, gePixelFormat Format ); -GENESISAPI void GENESISCC geBitmap_CreateRef(geBitmap *Bmp); - -GENESISAPI geBitmap * GENESISCC geBitmap_CreateFromInfo(const geBitmap_Info * pInfo); - -GENESISAPI geBitmap * GENESISCC geBitmap_CreateFromFile( geVFile *F ); -GENESISAPI geBitmap * GENESISCC geBitmap_CreateFromFileName(const geVFile *BaseFS,const char *Name); -GENESISAPI geBoolean GENESISCC geBitmap_WriteToFile( const geBitmap *Bmp, geVFile *F ); -GENESISAPI geBoolean GENESISCC geBitmap_WriteToFileName(const geBitmap * Bmp,const geVFile *BaseFS,const char *Name); - // BaseFS is not really const if it is a virtual file; - // it *is* const if it is a dos directory - -GENESISAPI geBoolean GENESISCC geBitmap_Destroy(geBitmap **Bmp); - // returns whether Bmp was actually destroyed : not success/failure - -GENESISAPI geBoolean GENESISCC geBitmap_GetInfo(const geBitmap *Bmp, geBitmap_Info *Info, geBitmap_Info *SecondaryInfo); - //LockForWrite returns data in Info's format - -GENESISAPI geBoolean GENESISCC geBitmap_Blit(const geBitmap *Src, int SrcPositionX, int SrcPositionY, - geBitmap *Dst, int DstPositionX, int DstPositionY, - int SizeX, int SizeY ); - -GENESISAPI geBoolean GENESISCC geBitmap_BlitMip(const geBitmap * Src, int SrcMip, geBitmap * Dst, int DstMip ); - // don't use this with Src == Dst, use UpdateMips instead ! - -GENESISAPI geBoolean GENESISCC geBitmap_BlitBitmap(const geBitmap * Src, geBitmap * Dst); - -GENESISAPI geBoolean GENESISCC geBitmap_BlitBestMip(const geBitmap * Src, geBitmap * Dst); - // blits the largest mip from Src that fits in Dst - -GENESISAPI geBoolean GENESISCC geBitmap_LockForRead( // a non-exclusive lock - const geBitmap * Bmp, - geBitmap ** Target, - int MinimumMip, - int MaximumMip, - gePixelFormat Format, - geBoolean RespectColorKey, - uint32 ColorKey); - // not really const, stores lock-count, but *data* is const - // will do a format conversion! - -GENESISAPI geBoolean GENESISCC geBitmap_LockForReadNative( - const geBitmap * Bmp, - geBitmap ** Target, - int MinimumMip, - int MaximumMip); - // lock for read in a format that gaurantee no conversions - // then do GetInfo on the locks to see what you have! - -GENESISAPI geBoolean GENESISCC geBitmap_LockForWrite( // an exclusive lock - geBitmap * Bmp, - geBitmap ** Target, - int MinimumMip, - int MaximumMip); - -GENESISAPI geBoolean GENESISCC geBitmap_LockForWriteFormat( - geBitmap * Bmp, - geBitmap ** Target, - int MinimumMip, - int MaximumMip, - gePixelFormat Format); - // Format must be one of the two returned in GetInfo !! - -GENESISAPI geBoolean GENESISCC geBitmap_UnLock(geBitmap *Bmp); // must be done on All locked mips -GENESISAPI geBoolean GENESISCC geBitmap_UnLockArray(geBitmap **Locks,int Size); - -GENESISAPI geBoolean GENESISCC geBitmap_SetFormat(geBitmap *Bmp, - gePixelFormat NewFormat, - geBoolean RespectColorKey, uint32 ColorKey, - const geBitmap_Palette * Palette); - // _SetFormat may cause you to lose color information! - // SetFormat does a conversion! - // if NewFormat is palettized and Palette is NULL, we create a palette for the bitmap! - -GENESISAPI geBoolean GENESISCC geBitmap_SetFormatMin(geBitmap *Bmp,gePixelFormat NewFormat); - // the Min version keeps colorkey & palette from the old format - -GENESISAPI geBoolean GENESISCC geBitmap_SetColorKey(geBitmap *Bmp, geBoolean HasColorKey, uint32 ColorKey, geBoolean Smart); - // SetColorKey discards old colorkey information! - // does not do a conversion (changes the colorkey in the current data - // if 'Smart' is on, we don't set HasColorKey to true unless it is actually used! - -GENESISAPI geBoolean GENESISCC geBitmap_GetAverageColor(const geBitmap *Bmp,int *pR,int *pG,int *pB); - // tells you the average color; computes it and caches it out - -GENESISAPI geBitmap_Palette * GENESISCC geBitmap_GetPalette(const geBitmap *Bmp); -GENESISAPI geBoolean GENESISCC geBitmap_SetPalette(geBitmap *Bmp, const geBitmap_Palette *Palette); - // _SetPal tries to _CreateRef your Palette, so no copy occurs & palettes may be shared - // you may _Destroy() palette after using it to set (though its bits may not be freed) - // (hence Palette is *not* const) - // Warning : SetPalette on any mip changes the palette of ALL mips ! - // see Palette note at _UnLock - // _SetPal destroys the bitmap's original palette and refs the new one, - // so if you setpal with the bitmap's palette, there is no net change in ref counts (good!) - -GENESISAPI geBoolean GENESISCC geBitmap_HasAlpha(const geBitmap * Bmp); - // returns true if bitmap has *any* type of alpha - -GENESISAPI geBitmap * GENESISCC geBitmap_GetAlpha(const geBitmap *Bmp); -GENESISAPI geBoolean GENESISCC geBitmap_SetAlpha(geBitmap *Bmp, const geBitmap *AlphaBmp); - // we Ref the AlphaBmp, so you may destroy it after calling Set() - // it may be NULL - // there's only one Alpha per bitmap (for the top Mip) right now - -GENESISAPI geBoolean GENESISCC geBitmap_SetGammaCorrection(geBitmap *Bmp,geFloat Gamma,geBoolean Apply); - // this Gamma does not change the *original* (system/secondary) bits - // it only affects the appearance when drawn - // note : if you write to the gamma corrected bits, you must gamma correct manually if you - // wish to fit in smoothly with the previous data - // warning : if you use this function with many different gammas, performance will suffer! - // use one global gamma for all bitmaps! try to let the engine manage gamma for you, - // via geEngine_SetGamma ! - -GENESISAPI geBoolean GENESISCC geBitmap_SetPreferredFormat(geBitmap *Bmp,gePixelFormat Format); -GENESISAPI gePixelFormat GENESISCC geBitmap_GetPreferredFormat(const geBitmap *Bmp); - -GENESISAPI void * GENESISCC geBitmap_GetBits(geBitmap *Bmp); // works only on a Lock() - -GENESISAPI geBoolean GENESISCC geBitmap_RefreshMips(geBitmap *Bmp); // rebuilds mips; *tries* to be smart & not overwrite manually-fixed mips - // RefreshMips does *not* build mips that don't exist -GENESISAPI geBoolean GENESISCC geBitmap_UpdateMips(geBitmap *Bmp,int SourceMip,int TargetMip); - // will create the target if it doesn't exist; - // will overwrite manually-fixed mips! -GENESISAPI geBoolean GENESISCC geBitmap_SetMipCount(geBitmap *Bmp,int Count); - // creates or destroys to match the new count - -GENESISAPI geBoolean GENESISCC geBitmap_ClearMips(geBitmap *Bmp); // Destroy all mips (except the first) ! - // use with care! this is not polite! - -// Shortcuts -GENESISAPI int GENESISCC geBitmap_Width(const geBitmap *Bitmap); -GENESISAPI int GENESISCC geBitmap_Height(const geBitmap *Bitmap); -GENESISAPI uint32 GENESISCC geBitmap_MipBytes(const geBitmap * Bitmap,int mip); - -/** -* -* if Bitmap is a lock for read, functions that modify it return failure -* if Bitmap is a lock for write, functions that modify it attempt to -* modify the owner of the lock -* -* warning : if you lock multiple mips for write, and then modify one of the mips -* (such as via SetPalette) it may affect the owner and all sibling mips! -* doing different SetPalettes with different palettes on different locked mips -* has undefined behavior! -* -**/ - -#ifdef _DEBUG - -GENESISAPI uint32 GENESISCC geBitmap_Debug_GetCount(void); - -GENESISAPI uint32 GENESISCC geBitmap_Debug_GetRefs(void); - // assert this is zero before you shutdown ! - -#endif - -/***********************************************************************************/ - -typedef enum -{ - GE_BITMAP_STREAMING_ERROR=0, - GE_BITMAP_STREAMING_NOT, - GE_BITMAP_STREAMING_STARTED, - GE_BITMAP_STREAMING_IDLE, - GE_BITMAP_STREAMING_CHANGED, - GE_BITMAP_STREAMING_DATADONE, - GE_BITMAP_STREAMING_DONE, -} geBitmap_StreamingStatus; - -GENESISAPI geBitmap_StreamingStatus GENESISCC geBitmap_GetStreamingStatus(const geBitmap *Bmp); - - /** on a file which is streaming, the sequence of returns looks like : - - GE_BITMAP_STREAMING_IDLE - GE_BITMAP_STREAMING_CHANGED - GE_BITMAP_STREAMING_IDLE - GE_BITMAP_STREAMING_IDLE - GE_BITMAP_STREAMING_CHANGED - ... - GE_BITMAP_STREAMING_DONE - GE_BITMAP_STREAMING_NOT - GE_BITMAP_STREAMING_NOT - GE_BITMAP_STREAMING_NOT - ... - - Status >= GE_BITMAP_STREAMING_STARTED means streaming has started & is in progress - - the user should never see _STARTED or _DATADONE - - ***/ - -/***********************************************************************************/ - -// palette methods : - -GENESISAPI geBitmap_Palette * GENESISCC geBitmap_Palette_Create(gePixelFormat Format,int Size); - -GENESISAPI geBitmap_Palette * GENESISCC geBitmap_Palette_CreateCopy(const geBitmap_Palette *Palette); - -GENESISAPI geBitmap_Palette * GENESISCC geBitmap_Palette_CreateFromFile(geVFile *F); - -GENESISAPI geBitmap_Palette * GENESISCC geBitmap_Palette_CreateFromBitmap(geBitmap * Bmp,geBoolean Slow); - // does GetPalette, and if NULL, then - // it create an optimal palette for a - // non-palettized bitmap - // (this is a create, you must destroy later!) - // put Slow == TRUE for higher quality & slower - -GENESISAPI geBoolean GENESISCC geBitmap_Palette_SortColors(geBitmap_Palette * P,geBoolean Slower); - -GENESISAPI geBoolean GENESISCC geBitmap_Palette_CreateRef(geBitmap_Palette *Palette); - -GENESISAPI geBoolean GENESISCC geBitmap_Palette_Destroy(geBitmap_Palette ** ppPalette); - -GENESISAPI geBoolean GENESISCC geBitmap_Palette_WriteToFile(const geBitmap_Palette *Palette,geVFile *F); - -GENESISAPI geBoolean GENESISCC geBitmap_Palette_SetFormat(geBitmap_Palette * Palette,gePixelFormat Format); - -GENESISAPI geBoolean GENESISCC geBitmap_Palette_Copy(const geBitmap_Palette * Src,geBitmap_Palette * Target); - -GENESISAPI geBoolean GENESISCC geBitmap_Palette_GetInfo(const geBitmap_Palette *P,geBitmap_Info *Into); - // get the info as if it were a bitmap; Into->Height == 1 - -GENESISAPI geBoolean GENESISCC geBitmap_Palette_Lock(geBitmap_Palette *Palette, void **pBits, gePixelFormat *pFormat,int *pSize); - // pFormat & pSize are optional - -GENESISAPI geBoolean GENESISCC geBitmap_Palette_UnLock(geBitmap_Palette *Palette); - // palette unlock does NOT notify the bitmap that the palette has changed. - // call Bitmap_SetPalette() with the same palette pointer - // to tell the bitmap that it must to some processing - // (don't worry, it won't duplicate it or copy it onto itself) - -GENESISAPI geBoolean GENESISCC geBitmap_Palette_GetData(const geBitmap_Palette *P, void *Into,gePixelFormat Format,int Colors); -GENESISAPI geBoolean GENESISCC geBitmap_Palette_SetData( geBitmap_Palette *P,const void *From,gePixelFormat Format,int Colors); - // does Lock/UnLock for you - // From and Into are arrays of Colors*gePixelFormat_BytesPerPel bytes - -GENESISAPI geBoolean GENESISCC geBitmap_Palette_SetEntryColor( geBitmap_Palette *P,int Color,int R,int G,int B,int A); -GENESISAPI geBoolean GENESISCC geBitmap_Palette_GetEntryColor(const geBitmap_Palette *P,int Color,int *R,int *G,int *B,int *A); - // Set/Get does Lock/Unlock for you ; these are slow! do not use these to work on all the colors! - -GENESISAPI geBoolean GENESISCC geBitmap_Palette_SetEntry( geBitmap_Palette *P,int Color,uint32 Pixel); -GENESISAPI geBoolean GENESISCC geBitmap_Palette_GetEntry(const geBitmap_Palette *P,int Color,uint32 *Pixel); - -/***********************************************************************************/ - -/************************************************************************ - -A brief tutorial on the Bitmap system, by Charles Bloom, cbloom@wildtangent.com - -The Bitmap is a smart wrapper for complex functionality. You give it hints to -the opaque Bitmap object, and it tries its best to follow those hints, but it -may not always do so. The Bitmap is the owner of its bits; you must Lock the -bitmap to get permission to touch those bits, and UnLock to tell the bitmap -you are done. The format may change between two Locks. Bitmaps can also be -multiply owned, so you should account for the fact that others may touch your -bitmap between your uses. - -The Bitmap contains one or two pixel-sets representing an image. The "primary" is -a fast-blitting version of the image, and the "secondary" is a storage version -(eventually wavelet compressed) which can be used to rebuild the primary if it is -freed or damaged. Both cary a generalized format. - -Let's do an example. I want to load a bitmap, set it up for drawing with the -genesis Engine, and then blit some interactive stuff into it. - -************************************************************************/ - -#if 0 -// { -//----------------------------------------------------------------------------- - -void Init(geEngine * Engine); -void Shutdown(void); -void Draw(void); -void DrawPolite(void); - -static geBitmap * myBM = NULL; -static geEngine * myEngine = NULL; - -void Init(geEngine * Engine) -{ -geBoolean success; -geBitmap_Info Info; - - myEngine = Engine; // this is not looked well upon; for ease of demonstration only! - assert(Engine); - - myBM = geBitmap_CreateFromFileName(NULL,"mybitmap.bmp"); - - // CreateFromFile can load windows BMP files, or custom GeBm files. - - assert(myBM); - - // get the main info; I don't care about the secondary, so leave it NULL - - success = geBitmap_GetInfo(myBM,&Info,NULL); - assert(success); - - // make sure I loaded a bitmap in the format I understand ! - - if ( Info.Format == GE_PIXELFORMAT_8BIT_PAL ) - { - // I want palette index 255 to act as transparency, so I must use SetColorKey - - success = geBitmap_SetColorKey(myBM,GE_TRUE,255); - assert(success); - - // just for fun, let's modify the palette: - if (1) - { - geBitmap_Palette * Pal; - - // get the palette ; I don't care if its primary or secondary, so - /// I don't use the Info.Palette field - - Pal = geBitmap_GetPalette(myBM); - assert(Pal); - - // I'm only fiddling one entry, so don't bother with a full Lock() UnLock() - // sequence on the palette - - // make palette index zero bright red; we use alpha = 255 for opaque - - success = geBitmap_Palette_SetEntryColor(Pal,0,255,0,0,255); - assert(success); - - // tell the bitmap system you've changed the palette; this function - // is smart enough to not do unecessary copies or whatever. - - success = geBitmap_SetPalette(myBM,Pal); - assert(success); - } - - } - else - { - // otherwise, treat black as transparent, in whatever format I have - - success = geBitmap_SetColorKey(myBM,GE_TRUE,gePixelFormat_ComposePixel(Info.Format,0,0,0,0)); - assert(success); - } - - // note that I did NOT use SetFormat. SetFormat may do a conversion, and since the original - // bitmap was created without colorkey, it would have been converted to a new format but - // kept its property of having no colorkey! - // (SetFormat will fiddle the bits and whatever way necessary to keep bitmaps as visually similar - // as possible) - - // I want to fiddle the fast format in 565 later, so cue the bitmap to try to give me that format. - - success = geBitmap_SetPreferredFormat(myBM,GE_PIXELFORMAT_16BIT_565_RGB); - assert(success); - - // Add it to the engine so it can be used for drawing. - - success = geEngine_AddBitmap(myEngine,myBM); - assert(success); -} - -void Shutdown(void) -{ -geBoolean WasDestroyed; - - assert(myBM); - - // clean up - - geEngine_RemoveBitmap(myEngine,myBM); - - WasDestroyed = geBitmap_Destroy(&myBM); - - // someone else might have done _CreateRef on our bitmap, - // so we can't be sure it's actually destroyed. - // this code is still ready to be run again with a new call to Init() - - //assert(WasDestroyed); - - myBM = NULL; - myEngine = NULL; -} - -void Draw(void) -{ -geBitmap * Lock; -geBoolean success; -geBitmap_Info Info; -uint16 *bits,*bptr; -int x,y; - - // lets fiddle the bits. - // we need to lock the bitmap for write. - // LockForWrite is an exclusive lock, unlike LockForRead which is non-blocking - // request our favorite format, and only lock Mip 0 (the full size bitmap) - - success = geBitmap_LockForWriteFormat(myBM,&Lock,0,0,GE_PIXELFORMAT_16BIT_565_RGB); - if ( ! success ) - { - // well, we tried to be nice; if we were very polite, we would do a LockForWrite - // here, and try to fiddle the bits in whatever format we got; However, we aren't - // that polite, so we just do a _SetFormat - // - // note that we are destroying the original bitmap by changing its format - // we should only do this if we are going to draw into the bitmap - - success = geBitmap_SetFormat(myBM,GE_PIXELFORMAT_16BIT_565_RGB,GE_TRUE,0,NULL); - assert(success); - - // now we should be able to get the bits we want, *but* they may not be the - // primary (fast) format; oh well, it's the best we can do... - // (if you must have the fastest bits, then use only _LockForWrite, never LockForWriteFormat, - // which might have to do a conversion) - - success = geBitmap_LockForWriteFormat(myBM,&Lock,0,0,GE_PIXELFORMAT_16BIT_565_RGB); - assert(success); - } - - // now Lock is our bitmap in 565 - // we do a GetInfo because the Lock's info could be different than - // the original bitmap's (particularly the Palette & the Stride) - - success = geBitmap_GetInfo(Lock,&Info,NULL); - assert(success); - - // you can only call _GetBits on a locked bitmap - - bits = geBitmap_GetBits(Lock); - assert( bits ); - - bptr = bits; - for(y=0; y < Info.Height; y++) - { - for(x=0; x < Info.Width; x++) - { - uint16 R,G,B; - // make a silly 565 gradient - R = x & 0x1F; - G = x & 0x3F; - B = y & 0x1F; - - *bptr++ = (R<<11) + (G<<5) + B; - } - - // note that bptr is a word pointer, and Stride is in pixels : - - bptr += Info.Stride - Info.Width; - } - bits = bptr = NULL; - - // you call Unlock on all the mips you locked - not on the original bitmap! - - success = geBitmap_UnLock(Lock); - assert(success); - - // now, we only fiddled the full-size Mip, and there might be more, - // so lets percolate the changes into the smaller mips: - - success = geBitmap_RefreshMips(myBM); - assert(success); - - // a null rect means use the whole bitmap; - // Engine_DrawBitmap blits a 2d decal to the framebuffer (fast) - - success = geEngine_DrawBitmap(myEngine,myBM,NULL,0,0); - assert(success); - -} - -void DrawPolite(void) -{ -geBitmap * Lock; -geBoolean success; -geBitmap_Info Info; -void *bits; -int x,y; - - // this function does the same thing as Draw() , but is more polite - // lock in the fastest format (whatever it is) - // because we did SetPreferred, this should be 565_RGB, but might not be - - success = geBitmap_LockForWrite(myBM,&Lock,0,0); - assert(success); - - success = geBitmap_GetInfo(Lock,&Info,NULL); - assert(success); - - bits = geBitmap_GetBits(Lock); - assert( bits ); - - if ( Info.Format == GE_PIXELFORMAT_16BIT_565_RGB ) - { - uint16 *wptr; - - // our favorite format - - wptr = bits; - for(y=0; y < Info.Height; y++) - { - for(x=0; x < Info.Width; x++) - { - uint16 R,G,B; - // make a silly 565 gradient - R = x & 0x1F; - G = x & 0x3F; - B = y & 0x1F; - - *wptr++ = (R<<11) + (G<<5) + B; - } - wptr += Info.Stride - Info.Width; - } - } - else - { - uint8 * bptr; - - // oh well, do our best - // bitmaps must have had a good reason to not give us the format we preferred, - - bptr = bits; - for(y=0; y < Info.Height; y++) - { - for(x=0; x < Info.Width; x++) - { - uint32 R,G,B; - - // put a color in any format - - R = (x & 0x1F)<<3; - G = (x & 0x3F)<<2; - B = (y & 0x1F)<<3; - - // we use alpha of 255 for opaque - - gePixelFormat_PutColor(Info.Format,&bptr,R,G,B,255); - } - - bptr += (Info.Stride - Info.Width) * gePixelFormat_BytesPerPel(Info.Format); - } - } - bits = NULL; - - // same as before: - - success = geBitmap_UnLock(Lock); - assert(success); - - success = geBitmap_RefreshMips(myBM); - assert(success); - - success = geEngine_DrawBitmap(myEngine,myBM,NULL,0,0); - assert(success); - -} - -// end tutorial on the Bitmap system -//----------------------------------------------------------------------------- -// } - -/***********************************************************************************/ - -#endif -#ifdef __cplusplus -} -#endif - - -#endif - - 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 --- a/G3D/Bitmap/bitmap_blitdata.c +++ b/G3D/BitmapBlitData.c @@ -30,22 +30,18 @@ #include #include -#include "basetype.h" -#include "getypes.h" -#include "ram.h" - -#include "bitmap.h" -#include "bitmap._h" -#include "bitmap.__h" -#include "bitmap_blitdata.h" - -#include "vfile.h" +#include "BaseType.h" +#include "GeTypes.h" +#include "Ram.h" +#include "Bitmap.h" +#include "Bitmap._h" +#include "Bitmap.__h" +#include "BitmapBlitData.h" +#include "VFile.h" #include "ErrorLog.h" - -#include "palcreate.h" -#include "palettize.h" - -#include "tsc.h" +#include "PALCreate.h" +#include "Palettize.h" +#include "TSC.h" #ifdef DO_TIMER #include "timer.h" @@ -1456,7 +1452,8 @@ geBoolean BlitData_DePalettize(void) for(y=SizeY;y--;) { - #ifdef DONT_USE_ASM + // FIXME: asm code + //#ifdef DONT_USE_ASM for(x=SizeX;x--;) { @@ -1464,7 +1461,7 @@ geBoolean BlitData_DePalettize(void) *DstPtr++ = PalData[pal]; } - #else + /*#else #pragma message("Bitmap_Blitdata :using assembly DePalettize code") // {} is this minimal push safe in _fastcall ? aparently so! @@ -1499,7 +1496,7 @@ geBoolean BlitData_DePalettize(void) SrcPtr += SizeX; DstPtr += SizeX; - #endif + #endif*/ SrcPtr += SrcXtra; DstPtr += DstXtra; @@ -1525,7 +1522,8 @@ geBoolean BlitData_DePalettize(void) for(y=SizeY;y--;) { - #ifdef DONT_USE_ASM + // FIXME: asm code + //#ifdef DONT_USE_ASM for(x=SizeX;x--;) { @@ -1533,7 +1531,7 @@ geBoolean BlitData_DePalettize(void) *DstPtr++ = PalData[pal]; } - #else + /*#else #if 1 // { if ( (SizeX&1) == 0 ) @@ -1579,40 +1577,6 @@ geBoolean BlitData_DePalettize(void) sub ecx,2 jnz moredata2_z -#if 0 //{ - // the old bad way: - // 0.000710 secs - moredata2_z: - - //xor edx,edx //xor edx,0 ; sneaky trick? - - //mov al, BYTE PTR [esi] - movzx eax, BYTE PTR [esi] - inc esi - - movzx edx, WORD PTR [ebp + eax*2] - //mov dx, WORD PTR [ebp + eax*2] - - movzx eax, BYTE PTR [esi] - inc esi - - // make room fo a new dx - //shl edx,16 - //mov dx, WORD PTR [ebp + eax*2] // !! STALL !! ; movzx eax, [] instead? - // byte order is wrong; fix with rol; 1 clock - //rol edx,16 - - movzx eax, WORD PTR [ebp + eax*2] // can I do this? - shl eax,16 - xor edx,eax - - mov DWORD PTR [edi], edx - add edi,4 - - sub ecx,2 - jnz moredata2_z -#endif //} - pop ebp //popa } @@ -1659,7 +1623,7 @@ geBoolean BlitData_DePalettize(void) SrcPtr += SizeX; DstPtr += SizeX; - #endif + #endif */ SrcPtr += SrcXtra; DstPtr += DstXtra; @@ -1704,7 +1668,8 @@ geBoolean BlitData_DePalettize(void) for(y=SizeY;y--;) { - #ifdef DONT_USE_ASM + // FIXME: asm code + //#ifdef DONT_USE_ASM { uint8 *PalPtr; @@ -1718,7 +1683,7 @@ geBoolean BlitData_DePalettize(void) } } - #else + /*#else __asm { @@ -1758,7 +1723,7 @@ geBoolean BlitData_DePalettize(void) SrcPtr += SizeX; DstPtr += SizeX*3; - #endif + #endif */ SrcPtr += SrcXtra; DstPtr += DstXtra; @@ -1775,7 +1740,8 @@ geBoolean BlitData_DePalettize(void) DstPtr = (uint32 *)DstData; for(y=SizeY;y--;) { - #ifdef DONT_USE_ASM + // FIXME: asm code + //#ifdef DONT_USE_ASM for(x=SizeX;x--;) { @@ -1783,7 +1749,7 @@ geBoolean BlitData_DePalettize(void) *DstPtr++ = PalData[pal]; } - #else + /*#else assert( (((uint32)PalData)&3) == 0); assert( (((uint32)DstPtr)&3) == 0); @@ -1817,7 +1783,7 @@ geBoolean BlitData_DePalettize(void) SrcPtr += SizeX; DstPtr += SizeX; - #endif + #endif*/ SrcPtr += SrcXtra; DstPtr += DstXtra; 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 --- a/G3D/Bitmap/bitmap_gamma.c +++ b/G3D/BitmapGamma.c @@ -21,14 +21,13 @@ /* */ /****************************************************************************************/ - -#include "bitmap._h" -#include "bitmap.__h" -#include "bitmap_gamma.h" -#include "pixelformat.h" -#include "errorlog.h" #include #include +#include "Bitmap._h" +#include "Bitmap.__h" +#include "BitmapGamma.h" +#include "PixelFormat.h" +#include "ErrorLog.h" /*}{*******************************************************/ 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 --- a/G3D/Engine/BitmapList.c +++ b/G3D/BitmapList.c @@ -19,12 +19,10 @@ /* Copyright (C) 1999 WildTangent, Inc. All Rights Reserved */ /* */ /****************************************************************************************/ -#include - +#include #ifdef _DEBUG #include #endif - #include #include @@ -33,10 +31,10 @@ #include "DCommon.h" #include "Bitmap.h" #include "Bitmap._h" -#include "list.h" -#include "mempool.h" -#include "errorlog.h" -#include "ram.h" +#include "List.h" +#include "MemPool.h" +#include "ErrorLog.h" +#include "Ram.h" //#include "tsc.h" struct BitmapList 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 --- a/G3D/Engine/BitmapList.h +++ b/G3D/BitmapList.h @@ -22,9 +22,9 @@ #ifndef BITMAPLIST_H #define BITMAPLIST_H -#include "G3D/GeTypes.h" -#include "G3D/Engine/Drivers/DCommon.h" -#include "G3D/Bitmap.h" +#include "GeTypes.h" +#include "DCommon.h" +#include "Bitmap.h" typedef struct BitmapList BitmapList; 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 --- a/G3D/Actor/body._h +++ b/G3D/Body._h @@ -22,11 +22,11 @@ #ifndef GE_BODY__H #define GE_BODY__H -#include "basetype.h" -#include "xform3d.h" -#include "body.h" -#include "strblock.h" -#include "bitmap.h" +#include "BaseType.h" +#include "XForm3d.h" +#include "Body.h" +#include "StrBlock.h" +#include "Bitmap.h" #ifdef __cplusplus @@ -112,7 +112,7 @@ typedef struct geBody } geBody; #if defined(DEBUG) || !defined(NDEBUG) -geBoolean GENESISCC geBody_SanityCheck(const geBody *B); +static geBoolean GENESISCC geBody_SanityCheck(const geBody *B); #endif 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 --- a/G3D/Actor/body.c +++ b/G3D/Body.c @@ -21,13 +21,13 @@ /****************************************************************************************/ #include //assert() #include //strlen(), strcpy() -#include //fabs() +#include //fabs() #include //sscanf -#include "body.h" -#include "body._h" -#include "ram.h" -#include "errorlog.h" +#include "Body.h" +#include "Body._h" +#include "Ram.h" +#include "ErrorLog.h" #define MAX(aa,bb) ( (aa)>(bb)?(aa):(bb) ) @@ -37,7 +37,7 @@ #if defined(DEBUG) || !defined(NDEBUG) -static geBoolean GENESISCC geBody_SanityCheck(const geBody *B) +geBoolean GENESISCC geBody_SanityCheck(const geBody *B) { int i,j,k; int Lod,FaceCount,VertexCount,NormalCount,BoneCount; 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 --- a/G3D/Actor/bodyinst.c +++ b/G3D/BodyInst.c @@ -21,11 +21,11 @@ /****************************************************************************************/ #include //assert() -#include "body._h" -#include "bodyinst.h" -#include "ram.h" -#include "errorlog.h" -#include "strblock.h" +#include "Body._h" +#include "BodyInst.h" +#include "Ram.h" +#include "ErrorLog.h" +#include "StrBlock.h" 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 --- a/G3D/Actor/bodyinst.h +++ b/G3D/BodyInst.h @@ -32,11 +32,11 @@ */ -#include "basetype.h" -#include "xform3d.h" -#include "body.h" +#include "BaseType.h" +#include "XForm3d.h" +#include "Body.h" #include "XFArray.h" -#include "camera.h" +#include "Camera.h" #ifdef __cplusplus @@ -125,4 +125,4 @@ const geBodyInst_Geometry *GENESISCC geBodyInst_GetGeometry( #endif #endif - \ No newline at end of file + diff --git a/G3D/CMakeLists.txt b/G3D/CMakeLists.txt index f4881ce..8be8d20 100644 --- 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 --- a/G3D/Camera.c +++ b/G3D/Camera.c @@ -26,7 +26,7 @@ #include "Camera.h" #include "Ram.h" #include "ErrorLog.h" -#include "G3D/Engine/Drivers/DCommon.h" +#include "DCommon.h" typedef struct geCamera { 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 --- a/G3D/DirTree.c +++ b/G3D/DirTree.c @@ -25,11 +25,10 @@ #include #include -#include "basetype.h" -#include "ram.h" - -#include "dirtree.h" -#include "dirtree-common.h" +#include "BaseType.h" +#include "Ram.h" +#include "DirTree.h" +#include "DirTreeCommon.h" #define DIRTREE_FILE_SIGNATURE MAKEFOURCC('D', 'T', '0', '1') static int DirTree_SignatureBase=0x696C6345; diff --git a/G3D/DirTree.h b/G3D/DirTree.h index 2610be5..6f88e5a 100644 --- a/G3D/DirTree.h +++ b/G3D/DirTree.h @@ -22,7 +22,7 @@ #ifndef DIRTREE_H #define DIRTREE_H -#include "vfile.h" +#include "VFile.h" typedef struct DirTree DirTree; typedef struct DirTree_Finder DirTree_Finder; diff --git a/G3D/DirTreeCommon.c b/G3D/DirTreeCommon.c index 8137354..2d2b318 100644 --- a/G3D/DirTreeCommon.c +++ b/G3D/DirTreeCommon.c @@ -23,8 +23,8 @@ #include #include -#include "ram.h" -#include "dirtree-common.h" +#include "Ram.h" +#include "DirTreeCommon.h" char * DuplicateString(const char *String) { @@ -103,4 +103,4 @@ void indent(int i) while (i--) printf(" "); } -#endif \ No newline at end of file +#endif diff --git a/G3D/DirTreeCommon.h b/G3D/DirTreeCommon.h index 46da5ae..4972c81 100644 --- a/G3D/DirTreeCommon.h +++ b/G3D/DirTreeCommon.h @@ -23,7 +23,7 @@ #define DIRTREE_COMMON_H -#include "vfile.h" +#include "VFile.h" typedef struct DirTree_Header { @@ -50,4 +50,4 @@ geBoolean PathHasDir(const char *Path); static void indent(int i); #endif -#endif \ No newline at end of file +#endif 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 --- a/G3D/Engine/Logo/electric.c +++ b/G3D/Electric.c @@ -23,11 +23,10 @@ #include #include -#include "genesis.h" +#include "Genesis.h" #include "ErrorLog.h" - #include "Electric.h" -#include "ram.h" +#include "Ram.h" static int logBase2(int n) { 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 --- a/G3D/Engine/Engine.c +++ b/G3D/Engine.c @@ -29,15 +29,14 @@ #include // _MAX_PATH #include // getcwd -#include "engine.h" - -#include "Errorlog.h" +#include "Engine.h" +#include "ErrorLog.h" #include "DCommon.h" #include "BitmapList.h" #include "Bitmap.h" #include "Bitmap._h" #include "World.h" -#include "log.h" +#include "Log.h" //#define DO_ADDREMOVE_MESSAGES #ifndef _DEBUG @@ -1984,7 +1983,8 @@ static void Engine_DrawFontBuffer(geEngine *Engine) static void SubLarge(LARGE_INTEGER *start, LARGE_INTEGER *end, LARGE_INTEGER *delta) { - _asm { + // FIXME: replace this by gcc acm code or real C + /*_asm { mov ebx,dword ptr [start] mov esi,dword ptr [end] @@ -1997,7 +1997,7 @@ static void SubLarge(LARGE_INTEGER *start, LARGE_INTEGER *end, LARGE_INTEGER *de mov ebx,dword ptr [delta] mov dword ptr [ebx+0],eax mov dword ptr [ebx+4],edx - } + }*/ } 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 --- a/G3D/Engine/Engine.h +++ b/G3D/Engine.h @@ -23,10 +23,10 @@ #ifndef GE_ENGINE_H #define GE_ENGINE_H -#include "include/Genesis.h" +#include "Genesis.h" #include "System.h" -#include "G3D/World/World.h" -#include "include/Bitmap.h" +#include "World.h" +#include "Bitmap.h" #include "BitmapList.h" #ifdef __cplusplus diff --git a/G3D/Engine/Drivers/D3D7xDrv/D3DDrv.mak b/G3D/Engine/Drivers/D3D7xDrv/D3DDrv.mak deleted file mode 100644 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 -!IF "$(CFG)" == "" -CFG=D3DDrv - Win32 Debug -!MESSAGE No configuration specified. Defaulting to D3DDrv - Win32 Debug. -!ENDIF - -!IF "$(CFG)" != "D3DDrv - Win32 Release" && "$(CFG)" != "D3DDrv - Win32 Debug" -!MESSAGE Invalid configuration "$(CFG)" specified. -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "D3DDrv.mak" CFG="D3DDrv - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "D3DDrv - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "D3DDrv - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE -!ERROR An invalid configuration is specified. -!ENDIF - -!IF "$(OS)" == "Windows_NT" -NULL= -!ELSE -NULL=nul -!ENDIF - -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "D3DDrv - Win32 Release" - -OUTDIR=.\Release -INTDIR=.\Release -# Begin Custom Macros -OutDir=.\Release -# End Custom Macros - -ALL : "$(OUTDIR)\D3DDrv.dll" - - -CLEAN : - -@erase "$(INTDIR)\D3d_err.obj" - -@erase "$(INTDIR)\D3d_fx.obj" - -@erase "$(INTDIR)\D3d_main.obj" - -@erase "$(INTDIR)\D3dcache.obj" - -@erase "$(INTDIR)\D3ddrv.obj" - -@erase "$(INTDIR)\DDMemMgr.obj" - -@erase "$(INTDIR)\Gspan.obj" - -@erase "$(INTDIR)\Pcache.obj" - -@erase "$(INTDIR)\Render.obj" - -@erase "$(INTDIR)\Scene.obj" - -@erase "$(INTDIR)\THandle.obj" - -@erase "$(INTDIR)\tpage.obj" - -@erase "$(INTDIR)\vc60.idb" - -@erase "$(OUTDIR)\D3DDrv.dll" - -@erase "$(OUTDIR)\D3DDrv.exp" - -@erase "$(OUTDIR)\D3DDrv.lib" - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -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 -MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32 -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\D3DDrv.bsc" -BSC32_SBRS= \ - -LINK32=link.exe -LINK32_FLAGS=/nologo /dll /incremental:no /pdb:"$(OUTDIR)\D3DDrv.pdb" /machine:I386 /nodefaultlib /out:"$(OUTDIR)\D3DDrv.dll" /implib:"$(OUTDIR)\D3DDrv.lib" -LINK32_OBJS= \ - "$(INTDIR)\D3d_err.obj" \ - "$(INTDIR)\D3d_fx.obj" \ - "$(INTDIR)\D3d_main.obj" \ - "$(INTDIR)\D3dcache.obj" \ - "$(INTDIR)\D3ddrv.obj" \ - "$(INTDIR)\DDMemMgr.obj" \ - "$(INTDIR)\Gspan.obj" \ - "$(INTDIR)\Pcache.obj" \ - "$(INTDIR)\Render.obj" \ - "$(INTDIR)\Scene.obj" \ - "$(INTDIR)\THandle.obj" \ - "$(INTDIR)\tpage.obj" \ - "..\..\..\..\MSDev60\lib\Wininet.lib" \ - "..\..\..\..\MSDev60\lib\Comdlg32.lib" \ - "..\..\..\..\MSDev60\lib\Gdi32.lib" \ - "..\..\..\..\MSDev60\lib\Kernel32.lib" \ - "..\..\..\..\MSDev60\lib\Libcmt.lib" \ - "..\..\..\..\MSDev60\lib\Oldnames.lib" \ - "..\..\..\..\MSDev60\lib\Shell32.lib" \ - "..\..\..\..\MSDev60\lib\User32.lib" \ - "..\..\..\..\MSDev60\lib\Uuid.lib" \ - "..\..\..\..\MSDev60\lib\Advapi32.lib" \ - "..\..\..\..\Sdk\Dx6sdk\Lib\dxguid.lib" \ - "..\..\..\..\Sdk\Dx6sdk\Lib\ddraw.lib" \ - "..\..\..\..\Sdk\Dx6sdk\Lib\d3dim.lib" - -"$(OUTDIR)\D3DDrv.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - -!ELSEIF "$(CFG)" == "D3DDrv - Win32 Debug" - -OUTDIR=.\Debug -INTDIR=.\Debug -# Begin Custom Macros -OutDir=.\Debug -# End Custom Macros - -ALL : "$(OUTDIR)\D3DDrv.dll" - - -CLEAN : - -@erase "$(INTDIR)\D3d_err.obj" - -@erase "$(INTDIR)\D3d_fx.obj" - -@erase "$(INTDIR)\D3d_main.obj" - -@erase "$(INTDIR)\D3dcache.obj" - -@erase "$(INTDIR)\D3ddrv.obj" - -@erase "$(INTDIR)\DDMemMgr.obj" - -@erase "$(INTDIR)\Gspan.obj" - -@erase "$(INTDIR)\Pcache.obj" - -@erase "$(INTDIR)\Render.obj" - -@erase "$(INTDIR)\Scene.obj" - -@erase "$(INTDIR)\THandle.obj" - -@erase "$(INTDIR)\tpage.obj" - -@erase "$(INTDIR)\vc60.idb" - -@erase "$(INTDIR)\vc60.pdb" - -@erase "$(OUTDIR)\D3DDrv.dll" - -@erase "$(OUTDIR)\D3DDrv.exp" - -@erase "$(OUTDIR)\D3DDrv.ilk" - -@erase "$(OUTDIR)\D3DDrv.lib" - -@erase "$(OUTDIR)\D3DDrv.pdb" - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -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 -MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\D3DDrv.bsc" -BSC32_SBRS= \ - -LINK32=link.exe -LINK32_FLAGS=/nologo /dll /incremental:yes /pdb:"$(OUTDIR)\D3DDrv.pdb" /debug /machine:I386 /nodefaultlib /out:"$(OUTDIR)\D3DDrv.dll" /implib:"$(OUTDIR)\D3DDrv.lib" /pdbtype:sept -LINK32_OBJS= \ - "$(INTDIR)\D3d_err.obj" \ - "$(INTDIR)\D3d_fx.obj" \ - "$(INTDIR)\D3d_main.obj" \ - "$(INTDIR)\D3dcache.obj" \ - "$(INTDIR)\D3ddrv.obj" \ - "$(INTDIR)\DDMemMgr.obj" \ - "$(INTDIR)\Gspan.obj" \ - "$(INTDIR)\Pcache.obj" \ - "$(INTDIR)\Render.obj" \ - "$(INTDIR)\Scene.obj" \ - "$(INTDIR)\THandle.obj" \ - "$(INTDIR)\tpage.obj" \ - "..\..\..\..\MSDev60\lib\Wininet.lib" \ - "..\..\..\..\MSDev60\lib\Comdlg32.lib" \ - "..\..\..\..\MSDev60\lib\Gdi32.lib" \ - "..\..\..\..\MSDev60\lib\Kernel32.lib" \ - "..\..\..\..\MSDev60\lib\Libcmtd.lib" \ - "..\..\..\..\MSDev60\lib\Oldnames.lib" \ - "..\..\..\..\MSDev60\lib\Shell32.lib" \ - "..\..\..\..\MSDev60\lib\User32.lib" \ - "..\..\..\..\MSDev60\lib\Uuid.lib" \ - "..\..\..\..\MSDev60\lib\Advapi32.lib" \ - "..\..\..\..\Sdk\Dx6sdk\Lib\dxguid.lib" \ - "..\..\..\..\Sdk\Dx6sdk\Lib\ddraw.lib" \ - "..\..\..\..\Sdk\Dx6sdk\Lib\d3dim.lib" - -"$(OUTDIR)\D3DDrv.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - -!ENDIF - -.c{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - - -!IF "$(NO_EXTERNAL_DEPS)" != "1" -!IF EXISTS("D3DDrv.dep") -!INCLUDE "D3DDrv.dep" -!ELSE -!MESSAGE Warning: cannot find "D3DDrv.dep" -!ENDIF -!ENDIF - - -!IF "$(CFG)" == "D3DDrv - Win32 Release" || "$(CFG)" == "D3DDrv - Win32 Debug" -SOURCE=.\D3d_err.cpp - -"$(INTDIR)\D3d_err.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\D3d_fx.cpp - -"$(INTDIR)\D3d_fx.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\D3d_main.cpp - -"$(INTDIR)\D3d_main.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\D3dcache.cpp - -"$(INTDIR)\D3dcache.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\D3ddrv.cpp - -"$(INTDIR)\D3ddrv.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\DDMemMgr.c - -"$(INTDIR)\DDMemMgr.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Gspan.cpp - -"$(INTDIR)\Gspan.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Pcache.cpp - -"$(INTDIR)\Pcache.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Render.cpp - -"$(INTDIR)\Render.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Scene.cpp - -"$(INTDIR)\Scene.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\THandle.cpp - -"$(INTDIR)\THandle.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\tpage.cpp - -"$(INTDIR)\tpage.obj" : $(SOURCE) "$(INTDIR)" - - - -!ENDIF - diff --git a/G3D/Engine/Drivers/D3D7xDrv/D3DDrv.ncb b/G3D/Engine/Drivers/D3D7xDrv/D3DDrv.ncb deleted file mode 100644 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 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 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> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 - -CFG=D3DDrv7x - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "D3DDrv7x.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "D3DDrv7x.mak" CFG="D3DDrv7x - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "D3DDrv7x - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "D3DDrv7x - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName ""$/Genesis10/Source/Engine/Drivers/D3DDrv7x", DVPBAAAA" -# PROP Scc_LocalPath "." -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "D3DDrv7x - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "D3DDRV7x_EXPORTS" /YX /FD /c -# ADD CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "D3DDRV_EXPORTS" /YX /FD /c -# SUBTRACT CPP /X -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -# SUBTRACT RSC /x -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# 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 -# 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 -# SUBTRACT LINK32 /nodefaultlib - -!ELSEIF "$(CFG)" == "D3DDrv7x - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# 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 -# 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 -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /x /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# 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 -# ADD LINK32 /nologo /dll /debug /machine:I386 /nodefaultlib /pdbtype:sept - -!ENDIF - -# Begin Target - -# Name "D3DDrv7x - Win32 Release" -# Name "D3DDrv7x - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=.\D3d_err.cpp -# End Source File -# Begin Source File - -SOURCE=.\D3d_err.h -# End Source File -# Begin Source File - -SOURCE=.\D3d_fx.cpp -# End Source File -# Begin Source File - -SOURCE=.\D3d_fx.h -# End Source File -# Begin Source File - -SOURCE=.\D3d_main.cpp -# End Source File -# Begin Source File - -SOURCE=.\D3d_main.h -# End Source File -# Begin Source File - -SOURCE=.\D3dcache.cpp -# End Source File -# Begin Source File - -SOURCE=.\D3dcache.h -# End Source File -# Begin Source File - -SOURCE=.\D3ddrv7x.cpp -# End Source File -# Begin Source File - -SOURCE=.\D3ddrv7x.h -# End Source File -# Begin Source File - -SOURCE=..\Dcommon.h -# End Source File -# Begin Source File - -SOURCE=.\DDMemMgr.c -# End Source File -# Begin Source File - -SOURCE=.\DDMemMgr.h -# End Source File -# Begin Source File - -SOURCE=.\Gspan.cpp -# End Source File -# Begin Source File - -SOURCE=.\Gspan.h -# End Source File -# Begin Source File - -SOURCE=.\Pcache.cpp -# End Source File -# Begin Source File - -SOURCE=.\Pcache.h -# End Source File -# Begin Source File - -SOURCE=.\Render.cpp -# End Source File -# Begin Source File - -SOURCE=.\Render.h -# End Source File -# Begin Source File - -SOURCE=.\Scene.cpp -# End Source File -# Begin Source File - -SOURCE=.\Scene.h -# End Source File -# Begin Source File - -SOURCE=.\THandle.cpp -# End Source File -# Begin Source File - -SOURCE=.\THandle.h -# End Source File -# Begin Source File - -SOURCE=.\tpage.cpp -# End Source File -# Begin Source File - -SOURCE=.\TPage.h -# End Source File -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# End Group -# Begin Group "Libraries" - -# PROP Default_Filter "" -# End Group -# End Target -# End Project diff --git a/G3D/Engine/Drivers/D3D7xDrv/D3DDrv7x.dsw b/G3D/Engine/Drivers/D3D7xDrv/D3DDrv7x.dsw deleted file mode 100644 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 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "D3DDrv7x"=".\D3DDrv7x.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - diff --git a/G3D/Engine/Drivers/D3D7xDrv/D3DDrv7x.ncb b/G3D/Engine/Drivers/D3D7xDrv/D3DDrv7x.ncb deleted file mode 100644 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 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 index a6cfd82..0000000 --- a/G3D/Engine/Drivers/D3D7xDrv/D3DDrv7x.plg +++ /dev/null @@ -1,44 +0,0 @@ - - -
-
Build Log

-

---------------------Configuration: D3DDrv7x - Win32 Release--------------------
-

-
Command Lines

-Creating temporary file "C:\DOCUME~1\RALPHD~1\LOCALS~1\Temp\RSP1D.tmp" with contents
-[
-/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 
-"D:\Release\G3D\Engine\Drivers\D3D7xDrv\D3d_main.cpp"
-]
-Creating command line "cl.exe @C:\DOCUME~1\RALPHD~1\LOCALS~1\Temp\RSP1D.tmp" 
-Creating temporary file "C:\DOCUME~1\RALPHD~1\LOCALS~1\Temp\RSP1E.tmp" with contents
-[
-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" 
-.\Release\D3d_err.obj
-.\Release\D3d_fx.obj
-.\Release\D3d_main.obj
-.\Release\D3dcache.obj
-.\Release\D3ddrv7x.obj
-.\Release\DDMemMgr.obj
-.\Release\Gspan.obj
-.\Release\Pcache.obj
-.\Release\Render.obj
-.\Release\Scene.obj
-.\Release\THandle.obj
-.\Release\tpage.obj
-]
-Creating command line "link.exe @C:\DOCUME~1\RALPHD~1\LOCALS~1\Temp\RSP1E.tmp"
-
Output Window

-Compiling...
-D3d_main.cpp
-Linking...
-   Creating library Release/D3DDrv7x.lib and object Release/D3DDrv7x.exp
-
-
-
-
Results

-D3DDrv7x.dll - 0 error(s), 0 warning(s)
-
- - diff --git a/G3D/Engine/Drivers/D3D7xDrv/mssccprj.scc b/G3D/Engine/Drivers/D3D7xDrv/mssccprj.scc deleted file mode 100644 index 848e217..0000000 --- a/G3D/Engine/Drivers/D3D7xDrv/mssccprj.scc +++ /dev/null @@ -1,4 +0,0 @@ -SCC = This is a Source Code Control file - -[D3DDrv.mak] -SCC_Project_Name = "$/Genesis10/Source/Engine/Drivers/D3DDrv", LQQBAAAA diff --git a/G3D/Engine/Drivers/D3D8Drv/D3DDriver.dsp b/G3D/Engine/Drivers/D3D8Drv/D3DDriver.dsp deleted file mode 100644 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> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 - -CFG=D3DDriver - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "D3DDriver.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "D3DDriver.mak" CFG="D3DDriver - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "D3DDriver - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "D3DDriver - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "D3DDriver - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "D3DDRIVER_EXPORTS" /YX /FD /c -# 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 -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# 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 -# 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" - -!ELSEIF "$(CFG)" == "D3DDriver - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# 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 -# 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 -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# 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 -# 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" - -!ENDIF - -# Begin Target - -# Name "D3DDriver - Win32 Release" -# Name "D3DDriver - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=.\D3D_ERR.CPP -# End Source File -# Begin Source File - -SOURCE=.\D3d_fx.cpp -# End Source File -# Begin Source File - -SOURCE=.\D3d_main.cpp -# End Source File -# Begin Source File - -SOURCE=.\D3dcache.cpp -# End Source File -# Begin Source File - -SOURCE=.\D3ddrv.cpp -# End Source File -# Begin Source File - -SOURCE=.\DDMemMgr.cpp -# End Source File -# Begin Source File - -SOURCE=.\GSPAN.CPP -# End Source File -# Begin Source File - -SOURCE=.\Pcache.cpp -# End Source File -# Begin Source File - -SOURCE=.\Render.cpp -# End Source File -# Begin Source File - -SOURCE=.\Scene.cpp -# End Source File -# Begin Source File - -SOURCE=.\THandle.cpp -# End Source File -# Begin Source File - -SOURCE=.\tpage.cpp -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Source File - -SOURCE=.\D3D_ERR.H -# End Source File -# Begin Source File - -SOURCE=.\D3D_FX.H -# End Source File -# Begin Source File - -SOURCE=.\D3d_main.h -# End Source File -# Begin Source File - -SOURCE=.\D3dcache.h -# End Source File -# Begin Source File - -SOURCE=.\D3DDRV.H -# End Source File -# Begin Source File - -SOURCE=.\DDMemMgr.h -# End Source File -# Begin Source File - -SOURCE=.\GSPAN.H -# End Source File -# Begin Source File - -SOURCE=.\Pcache.h -# End Source File -# Begin Source File - -SOURCE=.\RENDER.H -# End Source File -# Begin Source File - -SOURCE=.\SCENE.H -# End Source File -# Begin Source File - -SOURCE=.\THandle.h -# End Source File -# Begin Source File - -SOURCE=.\TPage.h -# End Source File -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# End Group -# End Target -# End Project diff --git a/G3D/Engine/Drivers/D3D8Drv/D3DDriver.dsw b/G3D/Engine/Drivers/D3D8Drv/D3DDriver.dsw deleted file mode 100644 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 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "D3DDriver"=.\D3DDriver.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - diff --git a/G3D/Engine/Drivers/D3D8Drv/D3DDriver.ncb b/G3D/Engine/Drivers/D3D8Drv/D3DDriver.ncb deleted file mode 100644 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 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 index e4e67e9..0000000 --- a/G3D/Engine/Drivers/D3D8Drv/D3DDriver.plg +++ /dev/null @@ -1,44 +0,0 @@ - - -
-
Build Log

-

---------------------Configuration: D3DDriver - Win32 Release--------------------
-

-
Command Lines

-Creating temporary file "C:\DOCUME~1\RALPHD~1\LOCALS~1\Temp\RSP35.tmp" with contents
-[
-/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 
-"D:\Release\G3D\Engine\Drivers\D3D8Drv\D3d_main.cpp"
-]
-Creating command line "cl.exe @C:\DOCUME~1\RALPHD~1\LOCALS~1\Temp\RSP35.tmp" 
-Creating temporary file "C:\DOCUME~1\RALPHD~1\LOCALS~1\Temp\RSP36.tmp" with contents
-[
-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" 
-.\Release\D3D_ERR.OBJ
-.\Release\D3d_fx.obj
-.\Release\D3d_main.obj
-.\Release\D3dcache.obj
-.\Release\D3ddrv.obj
-.\Release\DDMemMgr.obj
-.\Release\GSPAN.OBJ
-.\Release\Pcache.obj
-.\Release\Render.obj
-.\Release\Scene.obj
-.\Release\THandle.obj
-.\Release\tpage.obj
-]
-Creating command line "link.exe @C:\DOCUME~1\RALPHD~1\LOCALS~1\Temp\RSP36.tmp"
-
Output Window

-Compiling...
-D3d_main.cpp
-Linking...
-   Creating library Release/D3DDrv.lib and object Release/D3DDrv.exp
-
-
-
-
Results

-D3DDrv.dll - 0 error(s), 0 warning(s)
-
- - diff --git a/G3D/Engine/Drivers/D3DDrv/D3DDrv.dsp b/G3D/Engine/Drivers/D3DDrv/D3DDrv.dsp deleted file mode 100644 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> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 - -CFG=D3DDrv - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "D3DDrv.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "D3DDrv.mak" CFG="D3DDrv - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "D3DDrv - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "D3DDrv - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName ""$/Genesis10/Source/Engine/Drivers/D3DDrv", DVPBAAAA" -# PROP Scc_LocalPath "." -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "D3DDrv - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "D3DDRV_EXPORTS" /YX /FD /c -# 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 -# SUBTRACT CPP /X /YX -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /x /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# 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 -# 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 -# SUBTRACT LINK32 /nodefaultlib - -!ELSEIF "$(CFG)" == "D3DDrv - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# 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 -# 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 -# SUBTRACT CPP /X -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /x /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# 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 -# 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 -# SUBTRACT LINK32 /nodefaultlib - -!ENDIF - -# Begin Target - -# Name "D3DDrv - Win32 Release" -# Name "D3DDrv - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=.\D3d_err.cpp -# End Source File -# Begin Source File - -SOURCE=.\D3d_err.h -# End Source File -# Begin Source File - -SOURCE=.\D3d_fx.cpp -# End Source File -# Begin Source File - -SOURCE=.\D3d_fx.h -# End Source File -# Begin Source File - -SOURCE=.\D3d_main.cpp -# End Source File -# Begin Source File - -SOURCE=.\D3d_main.h -# End Source File -# Begin Source File - -SOURCE=.\D3dcache.cpp -# End Source File -# Begin Source File - -SOURCE=.\D3dcache.h -# End Source File -# Begin Source File - -SOURCE=.\D3ddrv.cpp -# End Source File -# Begin Source File - -SOURCE=.\D3ddrv.h -# End Source File -# Begin Source File - -SOURCE=..\Dcommon.h -# End Source File -# Begin Source File - -SOURCE=.\DDMemMgr.c -# End Source File -# Begin Source File - -SOURCE=.\DDMemMgr.h -# End Source File -# Begin Source File - -SOURCE=.\Gspan.cpp -# End Source File -# Begin Source File - -SOURCE=.\Gspan.h -# End Source File -# Begin Source File - -SOURCE=.\Pcache.cpp -# End Source File -# Begin Source File - -SOURCE=.\Pcache.h -# End Source File -# Begin Source File - -SOURCE=.\Render.cpp -# End Source File -# Begin Source File - -SOURCE=.\Render.h -# End Source File -# Begin Source File - -SOURCE=.\Scene.cpp -# End Source File -# Begin Source File - -SOURCE=.\Scene.h -# End Source File -# Begin Source File - -SOURCE=.\THandle.cpp -# End Source File -# Begin Source File - -SOURCE=.\THandle.h -# End Source File -# Begin Source File - -SOURCE=.\tpage.cpp -# End Source File -# Begin Source File - -SOURCE=.\TPage.h -# End Source File -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# End Group -# Begin Group "Libraries" - -# PROP Default_Filter "" -# End Group -# End Target -# End Project diff --git a/G3D/Engine/Drivers/D3DDrv/D3DDrv.dsw b/G3D/Engine/Drivers/D3DDrv/D3DDrv.dsw deleted file mode 100644 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 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "D3DDrv"=.\D3DDrv.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - diff --git a/G3D/Engine/Drivers/D3DDrv/D3DDrv.mak b/G3D/Engine/Drivers/D3DDrv/D3DDrv.mak deleted file mode 100644 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 -!IF "$(CFG)" == "" -CFG=D3DDrv - Win32 Debug -!MESSAGE No configuration specified. Defaulting to D3DDrv - Win32 Debug. -!ENDIF - -!IF "$(CFG)" != "D3DDrv - Win32 Release" && "$(CFG)" != "D3DDrv - Win32 Debug" -!MESSAGE Invalid configuration "$(CFG)" specified. -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "D3DDrv.mak" CFG="D3DDrv - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "D3DDrv - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "D3DDrv - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE -!ERROR An invalid configuration is specified. -!ENDIF - -!IF "$(OS)" == "Windows_NT" -NULL= -!ELSE -NULL=nul -!ENDIF - -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "D3DDrv - Win32 Release" - -OUTDIR=.\Release -INTDIR=.\Release -# Begin Custom Macros -OutDir=.\Release -# End Custom Macros - -ALL : "$(OUTDIR)\D3DDrv.dll" - - -CLEAN : - -@erase "$(INTDIR)\D3d_err.obj" - -@erase "$(INTDIR)\D3d_fx.obj" - -@erase "$(INTDIR)\D3d_main.obj" - -@erase "$(INTDIR)\D3dcache.obj" - -@erase "$(INTDIR)\D3ddrv.obj" - -@erase "$(INTDIR)\DDMemMgr.obj" - -@erase "$(INTDIR)\Gspan.obj" - -@erase "$(INTDIR)\Pcache.obj" - -@erase "$(INTDIR)\Render.obj" - -@erase "$(INTDIR)\Scene.obj" - -@erase "$(INTDIR)\THandle.obj" - -@erase "$(INTDIR)\tpage.obj" - -@erase "$(INTDIR)\vc60.idb" - -@erase "$(OUTDIR)\D3DDrv.dll" - -@erase "$(OUTDIR)\D3DDrv.exp" - -@erase "$(OUTDIR)\D3DDrv.lib" - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -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 -MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32 -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\D3DDrv.bsc" -BSC32_SBRS= \ - -LINK32=link.exe -LINK32_FLAGS=/nologo /dll /incremental:no /pdb:"$(OUTDIR)\D3DDrv.pdb" /machine:I386 /nodefaultlib /out:"$(OUTDIR)\D3DDrv.dll" /implib:"$(OUTDIR)\D3DDrv.lib" -LINK32_OBJS= \ - "$(INTDIR)\D3d_err.obj" \ - "$(INTDIR)\D3d_fx.obj" \ - "$(INTDIR)\D3d_main.obj" \ - "$(INTDIR)\D3dcache.obj" \ - "$(INTDIR)\D3ddrv.obj" \ - "$(INTDIR)\DDMemMgr.obj" \ - "$(INTDIR)\Gspan.obj" \ - "$(INTDIR)\Pcache.obj" \ - "$(INTDIR)\Render.obj" \ - "$(INTDIR)\Scene.obj" \ - "$(INTDIR)\THandle.obj" \ - "$(INTDIR)\tpage.obj" \ - "..\..\..\..\MSDev60\lib\Wininet.lib" \ - "..\..\..\..\MSDev60\lib\Comdlg32.lib" \ - "..\..\..\..\MSDev60\lib\Gdi32.lib" \ - "..\..\..\..\MSDev60\lib\Kernel32.lib" \ - "..\..\..\..\MSDev60\lib\Libcmt.lib" \ - "..\..\..\..\MSDev60\lib\Oldnames.lib" \ - "..\..\..\..\MSDev60\lib\Shell32.lib" \ - "..\..\..\..\MSDev60\lib\User32.lib" \ - "..\..\..\..\MSDev60\lib\Uuid.lib" \ - "..\..\..\..\MSDev60\lib\Advapi32.lib" \ - "..\..\..\..\Sdk\Dx6sdk\Lib\dxguid.lib" \ - "..\..\..\..\Sdk\Dx6sdk\Lib\ddraw.lib" \ - "..\..\..\..\Sdk\Dx6sdk\Lib\d3dim.lib" - -"$(OUTDIR)\D3DDrv.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - -!ELSEIF "$(CFG)" == "D3DDrv - Win32 Debug" - -OUTDIR=.\Debug -INTDIR=.\Debug -# Begin Custom Macros -OutDir=.\Debug -# End Custom Macros - -ALL : "$(OUTDIR)\D3DDrv.dll" - - -CLEAN : - -@erase "$(INTDIR)\D3d_err.obj" - -@erase "$(INTDIR)\D3d_fx.obj" - -@erase "$(INTDIR)\D3d_main.obj" - -@erase "$(INTDIR)\D3dcache.obj" - -@erase "$(INTDIR)\D3ddrv.obj" - -@erase "$(INTDIR)\DDMemMgr.obj" - -@erase "$(INTDIR)\Gspan.obj" - -@erase "$(INTDIR)\Pcache.obj" - -@erase "$(INTDIR)\Render.obj" - -@erase "$(INTDIR)\Scene.obj" - -@erase "$(INTDIR)\THandle.obj" - -@erase "$(INTDIR)\tpage.obj" - -@erase "$(INTDIR)\vc60.idb" - -@erase "$(INTDIR)\vc60.pdb" - -@erase "$(OUTDIR)\D3DDrv.dll" - -@erase "$(OUTDIR)\D3DDrv.exp" - -@erase "$(OUTDIR)\D3DDrv.ilk" - -@erase "$(OUTDIR)\D3DDrv.lib" - -@erase "$(OUTDIR)\D3DDrv.pdb" - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -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 -MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\D3DDrv.bsc" -BSC32_SBRS= \ - -LINK32=link.exe -LINK32_FLAGS=/nologo /dll /incremental:yes /pdb:"$(OUTDIR)\D3DDrv.pdb" /debug /machine:I386 /nodefaultlib /out:"$(OUTDIR)\D3DDrv.dll" /implib:"$(OUTDIR)\D3DDrv.lib" /pdbtype:sept -LINK32_OBJS= \ - "$(INTDIR)\D3d_err.obj" \ - "$(INTDIR)\D3d_fx.obj" \ - "$(INTDIR)\D3d_main.obj" \ - "$(INTDIR)\D3dcache.obj" \ - "$(INTDIR)\D3ddrv.obj" \ - "$(INTDIR)\DDMemMgr.obj" \ - "$(INTDIR)\Gspan.obj" \ - "$(INTDIR)\Pcache.obj" \ - "$(INTDIR)\Render.obj" \ - "$(INTDIR)\Scene.obj" \ - "$(INTDIR)\THandle.obj" \ - "$(INTDIR)\tpage.obj" \ - "..\..\..\..\MSDev60\lib\Wininet.lib" \ - "..\..\..\..\MSDev60\lib\Comdlg32.lib" \ - "..\..\..\..\MSDev60\lib\Gdi32.lib" \ - "..\..\..\..\MSDev60\lib\Kernel32.lib" \ - "..\..\..\..\MSDev60\lib\Libcmtd.lib" \ - "..\..\..\..\MSDev60\lib\Oldnames.lib" \ - "..\..\..\..\MSDev60\lib\Shell32.lib" \ - "..\..\..\..\MSDev60\lib\User32.lib" \ - "..\..\..\..\MSDev60\lib\Uuid.lib" \ - "..\..\..\..\MSDev60\lib\Advapi32.lib" \ - "..\..\..\..\Sdk\Dx6sdk\Lib\dxguid.lib" \ - "..\..\..\..\Sdk\Dx6sdk\Lib\ddraw.lib" \ - "..\..\..\..\Sdk\Dx6sdk\Lib\d3dim.lib" - -"$(OUTDIR)\D3DDrv.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - -!ENDIF - -.c{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - - -!IF "$(NO_EXTERNAL_DEPS)" != "1" -!IF EXISTS("D3DDrv.dep") -!INCLUDE "D3DDrv.dep" -!ELSE -!MESSAGE Warning: cannot find "D3DDrv.dep" -!ENDIF -!ENDIF - - -!IF "$(CFG)" == "D3DDrv - Win32 Release" || "$(CFG)" == "D3DDrv - Win32 Debug" -SOURCE=.\D3d_err.cpp - -"$(INTDIR)\D3d_err.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\D3d_fx.cpp - -"$(INTDIR)\D3d_fx.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\D3d_main.cpp - -"$(INTDIR)\D3d_main.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\D3dcache.cpp - -"$(INTDIR)\D3dcache.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\D3ddrv.cpp - -"$(INTDIR)\D3ddrv.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\DDMemMgr.c - -"$(INTDIR)\DDMemMgr.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Gspan.cpp - -"$(INTDIR)\Gspan.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Pcache.cpp - -"$(INTDIR)\Pcache.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Render.cpp - -"$(INTDIR)\Render.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Scene.cpp - -"$(INTDIR)\Scene.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\THandle.cpp - -"$(INTDIR)\THandle.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\tpage.cpp - -"$(INTDIR)\tpage.obj" : $(SOURCE) "$(INTDIR)" - - - -!ENDIF - diff --git a/G3D/Engine/Drivers/D3DDrv/D3DDrv.ncb b/G3D/Engine/Drivers/D3DDrv/D3DDrv.ncb deleted file mode 100644 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 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 index 08d3bef..0000000 --- a/G3D/Engine/Drivers/D3DDrv/D3DDrv.plg +++ /dev/null @@ -1,44 +0,0 @@ - - -
-
Build Log

-

---------------------Configuration: D3DDrv - Win32 Release--------------------
-

-
Command Lines

-Creating temporary file "C:\DOCUME~1\RALPHD~1\LOCALS~1\Temp\RSP7C.tmp" with contents
-[
-/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 
-"D:\Release\G3D\Engine\Drivers\D3DDrv\D3d_main.cpp"
-]
-Creating command line "cl.exe @C:\DOCUME~1\RALPHD~1\LOCALS~1\Temp\RSP7C.tmp" 
-Creating temporary file "C:\DOCUME~1\RALPHD~1\LOCALS~1\Temp\RSP7D.tmp" with contents
-[
-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" 
-.\Release\D3d_err.obj
-.\Release\D3d_fx.obj
-.\Release\D3d_main.obj
-.\Release\D3dcache.obj
-.\Release\D3ddrv.obj
-.\Release\DDMemMgr.obj
-.\Release\Gspan.obj
-.\Release\Pcache.obj
-.\Release\Render.obj
-.\Release\Scene.obj
-.\Release\THandle.obj
-.\Release\tpage.obj
-]
-Creating command line "link.exe @C:\DOCUME~1\RALPHD~1\LOCALS~1\Temp\RSP7D.tmp"
-
Output Window

-Compiling...
-D3d_main.cpp
-Linking...
-   Creating library Release/D3DDrv.lib and object Release/D3DDrv.exp
-
-
-
-
Results

-D3DDrv.dll - 0 error(s), 0 warning(s)
-
- - diff --git a/G3D/Engine/Drivers/D3DDrv/mssccprj.scc b/G3D/Engine/Drivers/D3DDrv/mssccprj.scc deleted file mode 100644 index 848e217..0000000 --- a/G3D/Engine/Drivers/D3DDrv/mssccprj.scc +++ /dev/null @@ -1,4 +0,0 @@ -SCC = This is a Source Code Control file - -[D3DDrv.mak] -SCC_Project_Name = "$/Genesis10/Source/Engine/Drivers/D3DDrv", LQQBAAAA diff --git a/G3D/Engine/Drivers/GlideDrv/GlideDrv.dsp b/G3D/Engine/Drivers/GlideDrv/GlideDrv.dsp deleted file mode 100644 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> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 - -CFG=GlideDrv - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "GlideDrv.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "GlideDrv.mak" CFG="GlideDrv - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "GlideDrv - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "GlideDrv - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName ""$/Genesis10/Source/Engine/Drivers/GlideDrv", CVPBAAAA" -# PROP Scc_LocalPath "." -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "GlideDrv - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "GLIDEDRV_EXPORTS" /YX /FD /c -# 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 -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# 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 -# ADD LINK32 /nologo /dll /machine:I386 /nodefaultlib - -!ELSEIF "$(CFG)" == "GlideDrv - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# 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 -# 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 -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# 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 -# ADD LINK32 /nologo /dll /debug /machine:I386 /nodefaultlib /pdbtype:sept - -!ENDIF - -# Begin Target - -# Name "GlideDrv - Win32 Release" -# Name "GlideDrv - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=..\Bmp.c -# End Source File -# Begin Source File - -SOURCE=..\Dcommon.h -# End Source File -# Begin Source File - -SOURCE=.\GCache.c -# End Source File -# Begin Source File - -SOURCE=.\GCache.h -# End Source File -# Begin Source File - -SOURCE=.\GlideDrv.c -# End Source File -# Begin Source File - -SOURCE=.\Glidedrv.h -# End Source File -# Begin Source File - -SOURCE=.\GMain.c -# End Source File -# Begin Source File - -SOURCE=.\GMain.h -# End Source File -# Begin Source File - -SOURCE=.\GMemMgr.c -# End Source File -# Begin Source File - -SOURCE=.\GMemMgr.h -# End Source File -# Begin Source File - -SOURCE=.\GSpan.cpp -# End Source File -# Begin Source File - -SOURCE=.\GSpan.h -# End Source File -# Begin Source File - -SOURCE=.\GThandle.c -# End Source File -# Begin Source File - -SOURCE=.\GTHandle.h -# End Source File -# Begin Source File - -SOURCE=.\Render.c -# End Source File -# Begin Source File - -SOURCE=.\Render.h -# End Source File -# End Group -# Begin Group "Libraries" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\..\..\..\Sdk\Glide\Lib\glide2x.lib -# End Source File -# Begin Source File - -SOURCE=..\..\..\..\MSDev60\lib\Libcmt.lib - -!IF "$(CFG)" == "GlideDrv - Win32 Release" - -!ELSEIF "$(CFG)" == "GlideDrv - Win32 Debug" - -# PROP Exclude_From_Build 1 - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=..\..\..\..\MSDev60\lib\Libcmtd.lib - -!IF "$(CFG)" == "GlideDrv - Win32 Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "GlideDrv - Win32 Debug" - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=..\..\..\..\MSDev60\lib\Winspool.lib -# End Source File -# Begin Source File - -SOURCE=..\..\..\..\MSDev60\lib\Uuid.lib -# End Source File -# Begin Source File - -SOURCE=..\..\..\..\MSDev60\lib\Comdlg32.lib -# End Source File -# Begin Source File - -SOURCE=..\..\..\..\MSDev60\lib\Gdi32.lib -# End Source File -# Begin Source File - -SOURCE=..\..\..\..\MSDev60\lib\Kernel32.lib -# End Source File -# Begin Source File - -SOURCE=..\..\..\..\MSDev60\lib\Oldnames.lib -# End Source File -# Begin Source File - -SOURCE=..\..\..\..\MSDev60\lib\Shell32.lib -# End Source File -# Begin Source File - -SOURCE=..\..\..\..\MSDev60\lib\User32.lib -# End Source File -# Begin Source File - -SOURCE=..\..\..\..\MSDev60\lib\Advapi32.lib -# End Source File -# End Group -# End Target -# End Project diff --git a/G3D/Engine/Drivers/GlideDrv/GlideDrv.dsw b/G3D/Engine/Drivers/GlideDrv/GlideDrv.dsw deleted file mode 100644 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 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "GlideDrv"=.\GlideDrv.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - diff --git a/G3D/Engine/Drivers/GlideDrv/GlideDrv.mak b/G3D/Engine/Drivers/GlideDrv/GlideDrv.mak deleted file mode 100644 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 -!IF "$(CFG)" == "" -CFG=GlideDrv - Win32 Debug -!MESSAGE No configuration specified. Defaulting to GlideDrv - Win32 Debug. -!ENDIF - -!IF "$(CFG)" != "GlideDrv - Win32 Release" && "$(CFG)" != "GlideDrv - Win32 Debug" -!MESSAGE Invalid configuration "$(CFG)" specified. -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "GlideDrv.mak" CFG="GlideDrv - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "GlideDrv - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "GlideDrv - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE -!ERROR An invalid configuration is specified. -!ENDIF - -!IF "$(OS)" == "Windows_NT" -NULL= -!ELSE -NULL=nul -!ENDIF - -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "GlideDrv - Win32 Release" - -OUTDIR=.\Release -INTDIR=.\Release -# Begin Custom Macros -OutDir=.\Release -# End Custom Macros - -ALL : "$(OUTDIR)\GlideDrv.dll" - - -CLEAN : - -@erase "$(INTDIR)\Bmp.obj" - -@erase "$(INTDIR)\GCache.obj" - -@erase "$(INTDIR)\GlideDrv.obj" - -@erase "$(INTDIR)\GMain.obj" - -@erase "$(INTDIR)\GMemMgr.obj" - -@erase "$(INTDIR)\GSpan.obj" - -@erase "$(INTDIR)\GThandle.obj" - -@erase "$(INTDIR)\Render.obj" - -@erase "$(INTDIR)\vc60.idb" - -@erase "$(OUTDIR)\GlideDrv.dll" - -@erase "$(OUTDIR)\GlideDrv.exp" - -@erase "$(OUTDIR)\GlideDrv.lib" - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -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 -MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32 -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\GlideDrv.bsc" -BSC32_SBRS= \ - -LINK32=link.exe -LINK32_FLAGS=/nologo /dll /incremental:no /pdb:"$(OUTDIR)\GlideDrv.pdb" /machine:I386 /nodefaultlib /out:"$(OUTDIR)\GlideDrv.dll" /implib:"$(OUTDIR)\GlideDrv.lib" -LINK32_OBJS= \ - "$(INTDIR)\Bmp.obj" \ - "$(INTDIR)\GCache.obj" \ - "$(INTDIR)\GlideDrv.obj" \ - "$(INTDIR)\GMain.obj" \ - "$(INTDIR)\GMemMgr.obj" \ - "$(INTDIR)\GSpan.obj" \ - "$(INTDIR)\GThandle.obj" \ - "$(INTDIR)\Render.obj" \ - "..\..\..\..\Sdk\Glide\Lib\glide2x.lib" \ - "..\..\..\..\MSDev60\lib\Libcmt.lib" \ - "..\..\..\..\MSDev60\lib\Winspool.lib" \ - "..\..\..\..\MSDev60\lib\Uuid.lib" \ - "..\..\..\..\MSDev60\lib\Comdlg32.lib" \ - "..\..\..\..\MSDev60\lib\Gdi32.lib" \ - "..\..\..\..\MSDev60\lib\Kernel32.lib" \ - "..\..\..\..\MSDev60\lib\Oldnames.lib" \ - "..\..\..\..\MSDev60\lib\Shell32.lib" \ - "..\..\..\..\MSDev60\lib\User32.lib" \ - "..\..\..\..\MSDev60\lib\Advapi32.lib" - -"$(OUTDIR)\GlideDrv.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - -!ELSEIF "$(CFG)" == "GlideDrv - Win32 Debug" - -OUTDIR=.\Debug -INTDIR=.\Debug -# Begin Custom Macros -OutDir=.\Debug -# End Custom Macros - -ALL : "$(OUTDIR)\GlideDrv.dll" - - -CLEAN : - -@erase "$(INTDIR)\Bmp.obj" - -@erase "$(INTDIR)\GCache.obj" - -@erase "$(INTDIR)\GlideDrv.obj" - -@erase "$(INTDIR)\GMain.obj" - -@erase "$(INTDIR)\GMemMgr.obj" - -@erase "$(INTDIR)\GSpan.obj" - -@erase "$(INTDIR)\GThandle.obj" - -@erase "$(INTDIR)\Render.obj" - -@erase "$(INTDIR)\vc60.idb" - -@erase "$(INTDIR)\vc60.pdb" - -@erase "$(OUTDIR)\GlideDrv.dll" - -@erase "$(OUTDIR)\GlideDrv.exp" - -@erase "$(OUTDIR)\GlideDrv.ilk" - -@erase "$(OUTDIR)\GlideDrv.lib" - -@erase "$(OUTDIR)\GlideDrv.pdb" - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -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 -MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\GlideDrv.bsc" -BSC32_SBRS= \ - -LINK32=link.exe -LINK32_FLAGS=/nologo /dll /incremental:yes /pdb:"$(OUTDIR)\GlideDrv.pdb" /debug /machine:I386 /nodefaultlib /out:"$(OUTDIR)\GlideDrv.dll" /implib:"$(OUTDIR)\GlideDrv.lib" /pdbtype:sept -LINK32_OBJS= \ - "$(INTDIR)\Bmp.obj" \ - "$(INTDIR)\GCache.obj" \ - "$(INTDIR)\GlideDrv.obj" \ - "$(INTDIR)\GMain.obj" \ - "$(INTDIR)\GMemMgr.obj" \ - "$(INTDIR)\GSpan.obj" \ - "$(INTDIR)\GThandle.obj" \ - "$(INTDIR)\Render.obj" \ - "..\..\..\..\Sdk\Glide\Lib\glide2x.lib" \ - "..\..\..\..\MSDev60\lib\Libcmtd.lib" \ - "..\..\..\..\MSDev60\lib\Winspool.lib" \ - "..\..\..\..\MSDev60\lib\Uuid.lib" \ - "..\..\..\..\MSDev60\lib\Comdlg32.lib" \ - "..\..\..\..\MSDev60\lib\Gdi32.lib" \ - "..\..\..\..\MSDev60\lib\Kernel32.lib" \ - "..\..\..\..\MSDev60\lib\Oldnames.lib" \ - "..\..\..\..\MSDev60\lib\Shell32.lib" \ - "..\..\..\..\MSDev60\lib\User32.lib" \ - "..\..\..\..\MSDev60\lib\Advapi32.lib" - -"$(OUTDIR)\GlideDrv.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - -!ENDIF - -.c{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - - -!IF "$(NO_EXTERNAL_DEPS)" != "1" -!IF EXISTS("GlideDrv.dep") -!INCLUDE "GlideDrv.dep" -!ELSE -!MESSAGE Warning: cannot find "GlideDrv.dep" -!ENDIF -!ENDIF - - -!IF "$(CFG)" == "GlideDrv - Win32 Release" || "$(CFG)" == "GlideDrv - Win32 Debug" -SOURCE=..\Bmp.c - -"$(INTDIR)\Bmp.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\GCache.c - -"$(INTDIR)\GCache.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\GlideDrv.c - -"$(INTDIR)\GlideDrv.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\GMain.c - -"$(INTDIR)\GMain.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\GMemMgr.c - -"$(INTDIR)\GMemMgr.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\GSpan.cpp - -"$(INTDIR)\GSpan.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\GThandle.c - -"$(INTDIR)\GThandle.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Render.c - -"$(INTDIR)\Render.obj" : $(SOURCE) "$(INTDIR)" - - - -!ENDIF - diff --git a/G3D/Engine/Drivers/GlideDrv/GlideDrv.ncb b/G3D/Engine/Drivers/GlideDrv/GlideDrv.ncb deleted file mode 100644 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 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 index 05edfc0..0000000 --- a/G3D/Engine/Drivers/GlideDrv/mssccprj.scc +++ /dev/null @@ -1,4 +0,0 @@ -SCC = This is a Source Code Control file - -[GlideDrv.mak] -SCC_Project_Name = "$/Genesis10/Source/Engine/Drivers/GlideDrv", MQQBAAAA diff --git a/G3D/Engine/Drivers/OpenGl/OglDrv.dsp b/G3D/Engine/Drivers/OpenGl/OglDrv.dsp deleted file mode 100644 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> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 - -CFG=OglDrv - Win32 Release -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "OglDrv.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "OglDrv.mak" CFG="OglDrv - Win32 Release" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "OglDrv - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "OglDrv - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName ""$/Genesis10/Source/Engine/Drivers/OglDrv", CVPBAAAA" -# PROP Scc_LocalPath "." -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "OglDrv - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "OglDrv_EXPORTS" /YX /FD /c -# 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 -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# 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 -# ADD LINK32 glu32.lib opengl32.lib /nologo /dll /machine:I386 /nodefaultlib - -!ELSEIF "$(CFG)" == "OglDrv - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# 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 -# 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 -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# 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 -# ADD LINK32 glu32.lib opengl32.lib /nologo /dll /debug /machine:I386 /nodefaultlib /pdbtype:sept - -!ENDIF - -# Begin Target - -# Name "OglDrv - Win32 Release" -# Name "OglDrv - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=..\Dcommon.h -# End Source File -# Begin Source File - -SOURCE=.\glext.h -# End Source File -# Begin Source File - -SOURCE=.\OglDrv.c -# End Source File -# Begin Source File - -SOURCE=.\OglDrv.h -# End Source File -# Begin Source File - -SOURCE=.\OglMisc.c -# End Source File -# Begin Source File - -SOURCE=.\OglMisc.h -# End Source File -# Begin Source File - -SOURCE=.\Render.c -# End Source File -# Begin Source File - -SOURCE=.\Render.h -# End Source File -# Begin Source File - -SOURCE=.\THandle.c -# End Source File -# Begin Source File - -SOURCE=.\THandle.h -# End Source File -# Begin Source File - -SOURCE=.\Win32.c -# End Source File -# Begin Source File - -SOURCE=.\Win32.h -# End Source File -# End Group -# Begin Group "Libraries" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\..\..\..\MSDev60\lib\Libcmt.lib - -!IF "$(CFG)" == "OglDrv - Win32 Release" - -!ELSEIF "$(CFG)" == "OglDrv - Win32 Debug" - -# PROP Exclude_From_Build 1 - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=..\..\..\..\MSDev60\lib\Libcmtd.lib - -!IF "$(CFG)" == "OglDrv - Win32 Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "OglDrv - Win32 Debug" - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=..\..\..\..\MSDev60\lib\Winspool.lib -# End Source File -# Begin Source File - -SOURCE=..\..\..\..\MSDev60\lib\Uuid.lib -# End Source File -# Begin Source File - -SOURCE=..\..\..\..\MSDev60\lib\Comdlg32.lib -# End Source File -# Begin Source File - -SOURCE=..\..\..\..\MSDev60\lib\Gdi32.lib -# End Source File -# Begin Source File - -SOURCE=..\..\..\..\MSDev60\lib\Kernel32.lib -# End Source File -# Begin Source File - -SOURCE=..\..\..\..\MSDev60\lib\Oldnames.lib -# End Source File -# Begin Source File - -SOURCE=..\..\..\..\MSDev60\lib\Shell32.lib -# End Source File -# Begin Source File - -SOURCE=..\..\..\..\MSDev60\lib\User32.lib -# End Source File -# Begin Source File - -SOURCE=..\..\..\..\MSDev60\lib\Advapi32.lib -# End Source File -# End Group -# End Target -# End Project diff --git a/G3D/Engine/Drivers/OpenGl/OglDrv.dsw b/G3D/Engine/Drivers/OpenGl/OglDrv.dsw deleted file mode 100644 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 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "OglDrv"=.\OglDrv.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - diff --git a/G3D/Engine/Drivers/SoftDrv/SoftDrv.dsp b/G3D/Engine/Drivers/SoftDrv/SoftDrv.dsp deleted file mode 100644 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> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 - -CFG=SoftDrv - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "SoftDrv.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "SoftDrv.mak" CFG="SoftDrv - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "SoftDrv - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "SoftDrv - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName ""$/Genesis10/Source/Engine/Drivers/SoftDrv", EVPBAAAA" -# PROP Scc_LocalPath "." -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "SoftDrv - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "SOFTDRV_EXPORTS" /YX /FD /c -# 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 -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# 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 -# ADD LINK32 /nologo /dll /machine:I386 /nodefaultlib - -!ELSEIF "$(CFG)" == "SoftDrv - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# 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 -# 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 -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# 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 -# ADD LINK32 /nologo /dll /debug /machine:I386 /nodefaultlib /pdbtype:sept - -!ENDIF - -# Begin Target - -# Name "SoftDrv - Win32 Release" -# Name "SoftDrv - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=.\3dnowspan.h -# End Source File -# Begin Source File - -SOURCE=.\amdspan.asm - -!IF "$(CFG)" == "SoftDrv - Win32 Release" - -# Begin Custom Build -InputPath=.\amdspan.asm - -".\amdspan.obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - ..\..\..\..\masm\bin\ml -c -I ..\..\..\..\masm\include -coff amdspan.asm - -# End Custom Build - -!ELSEIF "$(CFG)" == "SoftDrv - Win32 Debug" - -# Begin Custom Build -InputPath=.\amdspan.asm - -".\amdspan.obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - ..\..\..\..\masm\bin\ml -c -I ..\..\..\..\masm\include -coff amdspan.asm - -# End Custom Build - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\dmodes.c -# End Source File -# Begin Source File - -SOURCE=.\dmodes.h -# End Source File -# Begin Source File - -SOURCE=.\drawspan.c -# End Source File -# Begin Source File - -SOURCE=.\drawspan.h -# End Source File -# Begin Source File - -SOURCE=.\register.c -# End Source File -# Begin Source File - -SOURCE=.\Register.h -# End Source File -# Begin Source File - -SOURCE=.\render.c -# End Source File -# Begin Source File - -SOURCE=.\Render.h -# End Source File -# Begin Source File - -SOURCE=.\Sal.h -# End Source File -# Begin Source File - -SOURCE=.\scene.c -# End Source File -# Begin Source File - -SOURCE=.\Scene.h -# End Source File -# Begin Source File - -SOURCE=.\softdrv.c -# End Source File -# Begin Source File - -SOURCE=.\Softdrv.h -# End Source File -# Begin Source File - -SOURCE=.\span.c -# End Source File -# Begin Source File - -SOURCE=.\Span.h -# End Source File -# Begin Source File - -SOURCE=.\system.c -# End Source File -# Begin Source File - -SOURCE=.\System.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\Math\Vec3d.c -# End Source File -# Begin Source File - -SOURCE=..\..\..\Math\Vec3d.h -# End Source File -# Begin Source File - -SOURCE=.\W32sal.cpp -# End Source File -# Begin Source File - -SOURCE=.\x86span555.c -# End Source File -# Begin Source File - -SOURCE=.\x86span555.h -# End Source File -# Begin Source File - -SOURCE=.\x86span565.c -# End Source File -# Begin Source File - -SOURCE=.\x86span565.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\Math\Xform3d.c -# End Source File -# Begin Source File - -SOURCE=..\..\..\Math\Xform3d.h -# End Source File -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# End Group -# Begin Group "Libraries" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\..\..\..\MSDev60\lib\Winspool.lib -# End Source File -# Begin Source File - -SOURCE=..\..\..\..\MSDev60\lib\Comdlg32.lib -# End Source File -# Begin Source File - -SOURCE=..\..\..\..\MSDev60\lib\Gdi32.lib -# End Source File -# Begin Source File - -SOURCE=..\..\..\..\MSDev60\lib\Kernel32.lib -# End Source File -# Begin Source File - -SOURCE=..\..\..\..\MSDev60\lib\Libcmt.lib - -!IF "$(CFG)" == "SoftDrv - Win32 Release" - -!ELSEIF "$(CFG)" == "SoftDrv - Win32 Debug" - -# PROP Exclude_From_Build 1 - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=..\..\..\..\MSDev60\lib\Libcmtd.lib - -!IF "$(CFG)" == "SoftDrv - Win32 Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "SoftDrv - Win32 Debug" - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=..\..\..\..\MSDev60\lib\Oldnames.lib -# End Source File -# Begin Source File - -SOURCE=..\..\..\..\MSDev60\lib\Shell32.lib -# End Source File -# Begin Source File - -SOURCE=..\..\..\..\MSDev60\lib\User32.lib -# End Source File -# Begin Source File - -SOURCE=..\..\..\..\MSDev60\lib\Uuid.lib -# End Source File -# Begin Source File - -SOURCE=..\..\..\..\MSDev60\lib\Advapi32.lib -# End Source File -# Begin Source File - -SOURCE=..\..\..\..\MSDev60\lib\Winmm.lib -# End Source File -# End Group -# End Target -# End Project diff --git a/G3D/Engine/Drivers/SoftDrv/SoftDrv.mak b/G3D/Engine/Drivers/SoftDrv/SoftDrv.mak deleted file mode 100644 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 -!IF "$(CFG)" == "" -CFG=SoftDrv - Win32 Debug -!MESSAGE No configuration specified. Defaulting to SoftDrv - Win32 Debug. -!ENDIF - -!IF "$(CFG)" != "SoftDrv - Win32 Release" && "$(CFG)" != "SoftDrv - Win32 Debug" -!MESSAGE Invalid configuration "$(CFG)" specified. -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "SoftDrv.mak" CFG="SoftDrv - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "SoftDrv - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "SoftDrv - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE -!ERROR An invalid configuration is specified. -!ENDIF - -!IF "$(OS)" == "Windows_NT" -NULL= -!ELSE -NULL=nul -!ENDIF - -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "SoftDrv - Win32 Release" - -OUTDIR=.\Release -INTDIR=.\Release -# Begin Custom Macros -OutDir=.\Release -# End Custom Macros - -ALL : "$(OUTDIR)\SoftDrv.dll" - - -CLEAN : - -@erase "$(INTDIR)\dmodes.obj" - -@erase "$(INTDIR)\drawspan.obj" - -@erase "$(INTDIR)\register.obj" - -@erase "$(INTDIR)\render.obj" - -@erase "$(INTDIR)\scene.obj" - -@erase "$(INTDIR)\softdrv.obj" - -@erase "$(INTDIR)\span.obj" - -@erase "$(INTDIR)\system.obj" - -@erase "$(INTDIR)\vc60.idb" - -@erase "$(INTDIR)\Vec3d.obj" - -@erase "$(INTDIR)\W32sal.obj" - -@erase "$(INTDIR)\x86span555.obj" - -@erase "$(INTDIR)\x86span565.obj" - -@erase "$(INTDIR)\Xform3d.obj" - -@erase "$(OUTDIR)\SoftDrv.dll" - -@erase "$(OUTDIR)\SoftDrv.exp" - -@erase "$(OUTDIR)\SoftDrv.lib" - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -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 -MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32 -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\SoftDrv.bsc" -BSC32_SBRS= \ - -LINK32=link.exe -LINK32_FLAGS=/nologo /dll /incremental:no /pdb:"$(OUTDIR)\SoftDrv.pdb" /machine:I386 /nodefaultlib /out:"$(OUTDIR)\SoftDrv.dll" /implib:"$(OUTDIR)\SoftDrv.lib" -LINK32_OBJS= \ - "$(INTDIR)\dmodes.obj" \ - "$(INTDIR)\drawspan.obj" \ - "$(INTDIR)\register.obj" \ - "$(INTDIR)\render.obj" \ - "$(INTDIR)\scene.obj" \ - "$(INTDIR)\softdrv.obj" \ - "$(INTDIR)\span.obj" \ - "$(INTDIR)\system.obj" \ - "$(INTDIR)\Vec3d.obj" \ - "$(INTDIR)\W32sal.obj" \ - "$(INTDIR)\x86span555.obj" \ - "$(INTDIR)\x86span565.obj" \ - "$(INTDIR)\Xform3d.obj" \ - "..\..\..\..\MSDev60\lib\Winspool.lib" \ - "..\..\..\..\MSDev60\lib\Comdlg32.lib" \ - "..\..\..\..\MSDev60\lib\Gdi32.lib" \ - "..\..\..\..\MSDev60\lib\Kernel32.lib" \ - "..\..\..\..\MSDev60\lib\Libcmt.lib" \ - "..\..\..\..\MSDev60\lib\Oldnames.lib" \ - "..\..\..\..\MSDev60\lib\Shell32.lib" \ - "..\..\..\..\MSDev60\lib\User32.lib" \ - "..\..\..\..\MSDev60\lib\Uuid.lib" \ - "..\..\..\..\MSDev60\lib\Advapi32.lib" \ - "..\..\..\..\MSDev60\lib\Winmm.lib" \ - ".\amdspan.obj" - -"$(OUTDIR)\SoftDrv.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - -!ELSEIF "$(CFG)" == "SoftDrv - Win32 Debug" - -OUTDIR=.\Debug -INTDIR=.\Debug -# Begin Custom Macros -OutDir=.\Debug -# End Custom Macros - -ALL : "$(OUTDIR)\SoftDrv.dll" - - -CLEAN : - -@erase "$(INTDIR)\dmodes.obj" - -@erase "$(INTDIR)\drawspan.obj" - -@erase "$(INTDIR)\register.obj" - -@erase "$(INTDIR)\render.obj" - -@erase "$(INTDIR)\scene.obj" - -@erase "$(INTDIR)\softdrv.obj" - -@erase "$(INTDIR)\span.obj" - -@erase "$(INTDIR)\system.obj" - -@erase "$(INTDIR)\vc60.idb" - -@erase "$(INTDIR)\vc60.pdb" - -@erase "$(INTDIR)\Vec3d.obj" - -@erase "$(INTDIR)\W32sal.obj" - -@erase "$(INTDIR)\x86span555.obj" - -@erase "$(INTDIR)\x86span565.obj" - -@erase "$(INTDIR)\Xform3d.obj" - -@erase "$(OUTDIR)\SoftDrv.dll" - -@erase "$(OUTDIR)\SoftDrv.exp" - -@erase "$(OUTDIR)\SoftDrv.ilk" - -@erase "$(OUTDIR)\SoftDrv.lib" - -@erase "$(OUTDIR)\SoftDrv.pdb" - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -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 -MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\SoftDrv.bsc" -BSC32_SBRS= \ - -LINK32=link.exe -LINK32_FLAGS=/nologo /dll /incremental:yes /pdb:"$(OUTDIR)\SoftDrv.pdb" /debug /machine:I386 /nodefaultlib /out:"$(OUTDIR)\SoftDrv.dll" /implib:"$(OUTDIR)\SoftDrv.lib" /pdbtype:sept -LINK32_OBJS= \ - "$(INTDIR)\dmodes.obj" \ - "$(INTDIR)\drawspan.obj" \ - "$(INTDIR)\register.obj" \ - "$(INTDIR)\render.obj" \ - "$(INTDIR)\scene.obj" \ - "$(INTDIR)\softdrv.obj" \ - "$(INTDIR)\span.obj" \ - "$(INTDIR)\system.obj" \ - "$(INTDIR)\Vec3d.obj" \ - "$(INTDIR)\W32sal.obj" \ - "$(INTDIR)\x86span555.obj" \ - "$(INTDIR)\x86span565.obj" \ - "$(INTDIR)\Xform3d.obj" \ - "..\..\..\..\MSDev60\lib\Winspool.lib" \ - "..\..\..\..\MSDev60\lib\Comdlg32.lib" \ - "..\..\..\..\MSDev60\lib\Gdi32.lib" \ - "..\..\..\..\MSDev60\lib\Kernel32.lib" \ - "..\..\..\..\MSDev60\lib\Libcmtd.lib" \ - "..\..\..\..\MSDev60\lib\Oldnames.lib" \ - "..\..\..\..\MSDev60\lib\Shell32.lib" \ - "..\..\..\..\MSDev60\lib\User32.lib" \ - "..\..\..\..\MSDev60\lib\Uuid.lib" \ - "..\..\..\..\MSDev60\lib\Advapi32.lib" \ - "..\..\..\..\MSDev60\lib\Winmm.lib" \ - ".\amdspan.obj" - -"$(OUTDIR)\SoftDrv.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - -!ENDIF - -.c{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - - -!IF "$(NO_EXTERNAL_DEPS)" != "1" -!IF EXISTS("SoftDrv.dep") -!INCLUDE "SoftDrv.dep" -!ELSE -!MESSAGE Warning: cannot find "SoftDrv.dep" -!ENDIF -!ENDIF - - -!IF "$(CFG)" == "SoftDrv - Win32 Release" || "$(CFG)" == "SoftDrv - Win32 Debug" -SOURCE=.\amdspan.asm - -!IF "$(CFG)" == "SoftDrv - Win32 Release" - -InputPath=.\amdspan.asm - -".\amdspan.obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - < -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 - -CFG=SoftDrv2 - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "SoftDrv2.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "SoftDrv2.mak" CFG="SoftDrv2 - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "SoftDrv2 - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "SoftDrv2 - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName ""$/Genesis10/Source/Engine/Drivers/SoftDrv2", QADCAAAA" -# PROP Scc_LocalPath "." -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "SoftDrv2 - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "SOFTDRV2_EXPORTS" /YX /FD /c -# 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 -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /x /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# 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 -# 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" - -!ELSEIF "$(CFG)" == "SoftDrv2 - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# 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 -# 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 -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /x /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# 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 -# 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 - -!ENDIF - -# Begin Target - -# Name "SoftDrv2 - Win32 Release" -# Name "SoftDrv2 - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=.\CPUInfo.c -# End Source File -# Begin Source File - -SOURCE=.\DDRAWDisplay.c -# End Source File -# Begin Source File - -SOURCE=.\DIBDisplay.c -# End Source File -# Begin Source File - -SOURCE=.\display.c -# End Source File -# Begin Source File - -SOURCE=.\DisplayModeInfo.c -# End Source File -# Begin Source File - -SOURCE=.\DrawDecal.c -# End Source File -# Begin Source File - -SOURCE=..\..\..\Support\Ram.c -# End Source File -# Begin Source File - -SOURCE=.\softdrv.c -# End Source File -# Begin Source File - -SOURCE=.\span.c -# End Source File -# Begin Source File - -SOURCE=.\SpanBuffer.c -# End Source File -# Begin Source File - -SOURCE=.\SWTHandle.c -# End Source File -# Begin Source File - -SOURCE=.\TRaster.c -# End Source File -# Begin Source File - -SOURCE=.\Triangle.c -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Source File - -SOURCE=.\CPUInfo.h -# End Source File -# Begin Source File - -SOURCE=.\DDRAWDisplay.h -# End Source File -# Begin Source File - -SOURCE=.\DIBDisplay.h -# End Source File -# Begin Source File - -SOURCE=.\display.h -# End Source File -# Begin Source File - -SOURCE=.\DisplayModeInfo.h -# End Source File -# Begin Source File - -SOURCE=.\DrawDecal.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\Support\Ram.h -# End Source File -# Begin Source File - -SOURCE=.\rop.h -# End Source File -# Begin Source File - -SOURCE=.\Softdrv.h -# End Source File -# Begin Source File - -SOURCE=.\Span.h -# End Source File -# Begin Source File - -SOURCE=.\Span_AffineLoop.h -# End Source File -# Begin Source File - -SOURCE=.\Span_Factory.h -# End Source File -# Begin Source File - -SOURCE=.\SpanBuffer.h -# End Source File -# Begin Source File - -SOURCE=.\SpanEdges_Factory.h -# End Source File -# Begin Source File - -SOURCE=.\SWTHandle.h -# End Source File -# Begin Source File - -SOURCE=.\traster.h -# End Source File -# Begin Source File - -SOURCE=.\triangle.h -# End Source File -# End Group -# Begin Group "Libraries" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\..\..\..\MSDev60\lib\Winmm.lib -# End Source File -# Begin Source File - -SOURCE=..\..\..\..\MSDev60\lib\Comdlg32.lib -# End Source File -# Begin Source File - -SOURCE=..\..\..\..\MSDev60\lib\Gdi32.lib -# End Source File -# Begin Source File - -SOURCE=..\..\..\..\MSDev60\lib\Kernel32.lib -# End Source File -# Begin Source File - -SOURCE=..\..\..\..\MSDev60\lib\Libcmt.lib - -!IF "$(CFG)" == "SoftDrv2 - Win32 Release" - -!ELSEIF "$(CFG)" == "SoftDrv2 - Win32 Debug" - -# PROP Exclude_From_Build 1 - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=..\..\..\..\MSDev60\lib\Libcmtd.lib - -!IF "$(CFG)" == "SoftDrv2 - Win32 Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "SoftDrv2 - Win32 Debug" - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=..\..\..\..\MSDev60\lib\Oldnames.lib -# End Source File -# Begin Source File - -SOURCE=..\..\..\..\MSDev60\lib\Shell32.lib -# End Source File -# Begin Source File - -SOURCE=..\..\..\..\MSDev60\lib\User32.lib -# End Source File -# Begin Source File - -SOURCE=..\..\..\..\MSDev60\lib\Uuid.lib -# End Source File -# Begin Source File - -SOURCE=..\..\..\..\MSDev60\lib\Advapi32.lib -# End Source File -# Begin Source File - -SOURCE=..\..\..\..\MSDev60\lib\Winspool.lib -# End Source File -# Begin Source File - -SOURCE=..\..\..\..\Sdk\Dx6sdk\Lib\dxguid.lib -# End Source File -# End Group -# Begin Source File - -SOURCE=.\SoftDrv2.mak -# End Source File -# End Target -# End Project diff --git a/G3D/Engine/Drivers/SoftDrv2/SoftDrv2.mak b/G3D/Engine/Drivers/SoftDrv2/SoftDrv2.mak deleted file mode 100644 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 -!IF "$(CFG)" == "" -CFG=SoftDrv2 - Win32 Debug -!MESSAGE No configuration specified. Defaulting to SoftDrv2 - Win32 Debug. -!ENDIF - -!IF "$(CFG)" != "SoftDrv2 - Win32 Release" && "$(CFG)" != "SoftDrv2 - Win32 Debug" -!MESSAGE Invalid configuration "$(CFG)" specified. -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "SoftDrv2.mak" CFG="SoftDrv2 - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "SoftDrv2 - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "SoftDrv2 - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE -!ERROR An invalid configuration is specified. -!ENDIF - -!IF "$(OS)" == "Windows_NT" -NULL= -!ELSE -NULL=nul -!ENDIF - -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "SoftDrv2 - Win32 Release" - -OUTDIR=.\Release -INTDIR=.\Release -# Begin Custom Macros -OutDir=.\Release -# End Custom Macros - -ALL : "$(OUTDIR)\Softdrv.dll" - - -CLEAN : - -@erase "$(INTDIR)\CPUInfo.obj" - -@erase "$(INTDIR)\DDRAWDisplay.obj" - -@erase "$(INTDIR)\DIBDisplay.obj" - -@erase "$(INTDIR)\display.obj" - -@erase "$(INTDIR)\DisplayModeInfo.obj" - -@erase "$(INTDIR)\DrawDecal.obj" - -@erase "$(INTDIR)\Ram.obj" - -@erase "$(INTDIR)\softdrv.obj" - -@erase "$(INTDIR)\span.obj" - -@erase "$(INTDIR)\SpanBuffer.obj" - -@erase "$(INTDIR)\SWTHandle.obj" - -@erase "$(INTDIR)\TRaster.obj" - -@erase "$(INTDIR)\Triangle.obj" - -@erase "$(INTDIR)\vc60.idb" - -@erase "$(OUTDIR)\Softdrv.dll" - -@erase "$(OUTDIR)\Softdrv.exp" - -@erase "$(OUTDIR)\Softdrv.lib" - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -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 -MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32 -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\SoftDrv2.bsc" -BSC32_SBRS= \ - -LINK32=link.exe -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" -LINK32_OBJS= \ - "$(INTDIR)\CPUInfo.obj" \ - "$(INTDIR)\DDRAWDisplay.obj" \ - "$(INTDIR)\DIBDisplay.obj" \ - "$(INTDIR)\display.obj" \ - "$(INTDIR)\DisplayModeInfo.obj" \ - "$(INTDIR)\DrawDecal.obj" \ - "$(INTDIR)\Ram.obj" \ - "$(INTDIR)\softdrv.obj" \ - "$(INTDIR)\span.obj" \ - "$(INTDIR)\SpanBuffer.obj" \ - "$(INTDIR)\SWTHandle.obj" \ - "$(INTDIR)\TRaster.obj" \ - "$(INTDIR)\Triangle.obj" \ - "..\..\..\..\MSDev60\lib\Winmm.lib" \ - "..\..\..\..\MSDev60\lib\Comdlg32.lib" \ - "..\..\..\..\MSDev60\lib\Gdi32.lib" \ - "..\..\..\..\MSDev60\lib\Kernel32.lib" \ - "..\..\..\..\MSDev60\lib\Libcmt.lib" \ - "..\..\..\..\MSDev60\lib\Oldnames.lib" \ - "..\..\..\..\MSDev60\lib\Shell32.lib" \ - "..\..\..\..\MSDev60\lib\User32.lib" \ - "..\..\..\..\MSDev60\lib\Uuid.lib" \ - "..\..\..\..\MSDev60\lib\Advapi32.lib" \ - "..\..\..\..\MSDev60\lib\Winspool.lib" \ - "..\..\..\..\Sdk\Dx6sdk\Lib\dxguid.lib" - -"$(OUTDIR)\Softdrv.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - -!ELSEIF "$(CFG)" == "SoftDrv2 - Win32 Debug" - -OUTDIR=. -INTDIR=.\Debug -# Begin Custom Macros -OutDir=. -# End Custom Macros - -ALL : "$(OUTDIR)\Debug\Softdrv.dll" - - -CLEAN : - -@erase "$(INTDIR)\CPUInfo.obj" - -@erase "$(INTDIR)\DDRAWDisplay.obj" - -@erase "$(INTDIR)\DIBDisplay.obj" - -@erase "$(INTDIR)\display.obj" - -@erase "$(INTDIR)\DisplayModeInfo.obj" - -@erase "$(INTDIR)\DrawDecal.obj" - -@erase "$(INTDIR)\Ram.obj" - -@erase "$(INTDIR)\softdrv.obj" - -@erase "$(INTDIR)\span.obj" - -@erase "$(INTDIR)\SpanBuffer.obj" - -@erase "$(INTDIR)\SWTHandle.obj" - -@erase "$(INTDIR)\TRaster.obj" - -@erase "$(INTDIR)\Triangle.obj" - -@erase "$(INTDIR)\vc60.idb" - -@erase "$(INTDIR)\vc60.pdb" - -@erase "$(OUTDIR)\Debug\Softdrv.dll" - -@erase "$(OUTDIR)\Debug\Softdrv.ilk" - -@erase "$(OUTDIR)\Softdrv.exp" - -@erase "$(OUTDIR)\Softdrv.lib" - -@erase "$(OUTDIR)\Softdrv.pdb" - -"$(INTDIR)" : - if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)" - -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 -MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\SoftDrv2.bsc" -BSC32_SBRS= \ - -LINK32=link.exe -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 -LINK32_OBJS= \ - "$(INTDIR)\CPUInfo.obj" \ - "$(INTDIR)\DDRAWDisplay.obj" \ - "$(INTDIR)\DIBDisplay.obj" \ - "$(INTDIR)\display.obj" \ - "$(INTDIR)\DisplayModeInfo.obj" \ - "$(INTDIR)\DrawDecal.obj" \ - "$(INTDIR)\Ram.obj" \ - "$(INTDIR)\softdrv.obj" \ - "$(INTDIR)\span.obj" \ - "$(INTDIR)\SpanBuffer.obj" \ - "$(INTDIR)\SWTHandle.obj" \ - "$(INTDIR)\TRaster.obj" \ - "$(INTDIR)\Triangle.obj" \ - "..\..\..\..\MSDev60\lib\Winmm.lib" \ - "..\..\..\..\MSDev60\lib\Comdlg32.lib" \ - "..\..\..\..\MSDev60\lib\Gdi32.lib" \ - "..\..\..\..\MSDev60\lib\Kernel32.lib" \ - "..\..\..\..\MSDev60\lib\Libcmtd.lib" \ - "..\..\..\..\MSDev60\lib\Oldnames.lib" \ - "..\..\..\..\MSDev60\lib\Shell32.lib" \ - "..\..\..\..\MSDev60\lib\User32.lib" \ - "..\..\..\..\MSDev60\lib\Uuid.lib" \ - "..\..\..\..\MSDev60\lib\Advapi32.lib" \ - "..\..\..\..\MSDev60\lib\Winspool.lib" \ - "..\..\..\..\Sdk\Dx6sdk\Lib\dxguid.lib" - -"$(OUTDIR)\Debug\Softdrv.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - -!ENDIF - -.c{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - - -!IF "$(NO_EXTERNAL_DEPS)" != "1" -!IF EXISTS("SoftDrv2.dep") -!INCLUDE "SoftDrv2.dep" -!ELSE -!MESSAGE Warning: cannot find "SoftDrv2.dep" -!ENDIF -!ENDIF - - -!IF "$(CFG)" == "SoftDrv2 - Win32 Release" || "$(CFG)" == "SoftDrv2 - Win32 Debug" -SOURCE=.\CPUInfo.c - -"$(INTDIR)\CPUInfo.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\DDRAWDisplay.c - -"$(INTDIR)\DDRAWDisplay.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\DIBDisplay.c - -"$(INTDIR)\DIBDisplay.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\display.c - -"$(INTDIR)\display.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\DisplayModeInfo.c - -"$(INTDIR)\DisplayModeInfo.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\DrawDecal.c - -"$(INTDIR)\DrawDecal.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=..\..\..\Support\Ram.c - -"$(INTDIR)\Ram.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\softdrv.c - -"$(INTDIR)\softdrv.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\span.c - -"$(INTDIR)\span.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\SpanBuffer.c - -"$(INTDIR)\SpanBuffer.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\SWTHandle.c - -"$(INTDIR)\SWTHandle.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\TRaster.c - -"$(INTDIR)\TRaster.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Triangle.c - -"$(INTDIR)\Triangle.obj" : $(SOURCE) "$(INTDIR)" - - - -!ENDIF - diff --git a/G3D/Engine/Drivers/SoftDrv2/mssccprj.scc b/G3D/Engine/Drivers/SoftDrv2/mssccprj.scc deleted file mode 100644 index 39a8f66..0000000 --- a/G3D/Engine/Drivers/SoftDrv2/mssccprj.scc +++ /dev/null @@ -1,4 +0,0 @@ -SCC = This is a Source Code Control file - -[SoftDrv2.mak] -SCC_Project_Name = "$/Genesis10/Source/Engine/Drivers/SoftDrv2", HBDCAAAA diff --git a/G3D/Engine/Drivers/WireFrame/D3DDrv.dsp b/G3D/Engine/Drivers/WireFrame/D3DDrv.dsp deleted file mode 100644 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> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 - -CFG=D3DDrv - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "D3DDrv.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "D3DDrv.mak" CFG="D3DDrv - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "D3DDrv - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "D3DDrv - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName ""$/Genesis10/Source/Engine/Drivers/D3DDrv", DVPBAAAA" -# PROP Scc_LocalPath "." -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "D3DDrv - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "D3DDRV_EXPORTS" /YX /FD /c -# 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 -# SUBTRACT CPP /X /YX -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /x /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# 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 -# 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" -# SUBTRACT LINK32 /nodefaultlib - -!ELSEIF "$(CFG)" == "D3DDrv - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# 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 -# 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 -# SUBTRACT CPP /X -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /x /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# 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 -# 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 -# SUBTRACT LINK32 /nodefaultlib - -!ENDIF - -# Begin Target - -# Name "D3DDrv - Win32 Release" -# Name "D3DDrv - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=.\D3d_err.cpp -# End Source File -# Begin Source File - -SOURCE=.\D3d_err.h -# End Source File -# Begin Source File - -SOURCE=.\D3d_fx.cpp -# End Source File -# Begin Source File - -SOURCE=.\D3d_fx.h -# End Source File -# Begin Source File - -SOURCE=.\D3d_main.cpp -# End Source File -# Begin Source File - -SOURCE=.\D3d_main.h -# End Source File -# Begin Source File - -SOURCE=.\D3dcache.cpp -# End Source File -# Begin Source File - -SOURCE=.\D3dcache.h -# End Source File -# Begin Source File - -SOURCE=.\D3ddrv.cpp -# End Source File -# Begin Source File - -SOURCE=.\D3ddrv.h -# End Source File -# Begin Source File - -SOURCE=..\Dcommon.h -# End Source File -# Begin Source File - -SOURCE=.\DDMemMgr.c -# End Source File -# Begin Source File - -SOURCE=.\DDMemMgr.h -# End Source File -# Begin Source File - -SOURCE=.\Gspan.cpp -# End Source File -# Begin Source File - -SOURCE=.\Gspan.h -# End Source File -# Begin Source File - -SOURCE=.\Pcache.cpp -# End Source File -# Begin Source File - -SOURCE=.\Pcache.h -# End Source File -# Begin Source File - -SOURCE=.\Render.cpp -# End Source File -# Begin Source File - -SOURCE=.\Render.h -# End Source File -# Begin Source File - -SOURCE=.\Scene.cpp -# End Source File -# Begin Source File - -SOURCE=.\Scene.h -# End Source File -# Begin Source File - -SOURCE=.\THandle.cpp -# End Source File -# Begin Source File - -SOURCE=.\THandle.h -# End Source File -# Begin Source File - -SOURCE=.\tpage.cpp -# End Source File -# Begin Source File - -SOURCE=.\TPage.h -# End Source File -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# End Group -# Begin Group "Libraries" - -# PROP Default_Filter "" -# End Group -# End Target -# End Project diff --git a/G3D/Engine/Drivers/WireFrame/D3DDrv.dsw b/G3D/Engine/Drivers/WireFrame/D3DDrv.dsw deleted file mode 100644 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 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "D3DDrv"=.\D3DDrv.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - diff --git a/G3D/Engine/Drivers/WireFrame/D3DDrv.mak b/G3D/Engine/Drivers/WireFrame/D3DDrv.mak deleted file mode 100644 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 -!IF "$(CFG)" == "" -CFG=D3DDrv - Win32 Debug -!MESSAGE No configuration specified. Defaulting to D3DDrv - Win32 Debug. -!ENDIF - -!IF "$(CFG)" != "D3DDrv - Win32 Release" && "$(CFG)" != "D3DDrv - Win32 Debug" -!MESSAGE Invalid configuration "$(CFG)" specified. -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "D3DDrv.mak" CFG="D3DDrv - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "D3DDrv - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "D3DDrv - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE -!ERROR An invalid configuration is specified. -!ENDIF - -!IF "$(OS)" == "Windows_NT" -NULL= -!ELSE -NULL=nul -!ENDIF - -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "D3DDrv - Win32 Release" - -OUTDIR=.\Release -INTDIR=.\Release -# Begin Custom Macros -OutDir=.\Release -# End Custom Macros - -ALL : "$(OUTDIR)\D3DDrv.dll" - - -CLEAN : - -@erase "$(INTDIR)\D3d_err.obj" - -@erase "$(INTDIR)\D3d_fx.obj" - -@erase "$(INTDIR)\D3d_main.obj" - -@erase "$(INTDIR)\D3dcache.obj" - -@erase "$(INTDIR)\D3ddrv.obj" - -@erase "$(INTDIR)\DDMemMgr.obj" - -@erase "$(INTDIR)\Gspan.obj" - -@erase "$(INTDIR)\Pcache.obj" - -@erase "$(INTDIR)\Render.obj" - -@erase "$(INTDIR)\Scene.obj" - -@erase "$(INTDIR)\THandle.obj" - -@erase "$(INTDIR)\tpage.obj" - -@erase "$(INTDIR)\vc60.idb" - -@erase "$(OUTDIR)\D3DDrv.dll" - -@erase "$(OUTDIR)\D3DDrv.exp" - -@erase "$(OUTDIR)\D3DDrv.lib" - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -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 -MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32 -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\D3DDrv.bsc" -BSC32_SBRS= \ - -LINK32=link.exe -LINK32_FLAGS=/nologo /dll /incremental:no /pdb:"$(OUTDIR)\D3DDrv.pdb" /machine:I386 /nodefaultlib /out:"$(OUTDIR)\D3DDrv.dll" /implib:"$(OUTDIR)\D3DDrv.lib" -LINK32_OBJS= \ - "$(INTDIR)\D3d_err.obj" \ - "$(INTDIR)\D3d_fx.obj" \ - "$(INTDIR)\D3d_main.obj" \ - "$(INTDIR)\D3dcache.obj" \ - "$(INTDIR)\D3ddrv.obj" \ - "$(INTDIR)\DDMemMgr.obj" \ - "$(INTDIR)\Gspan.obj" \ - "$(INTDIR)\Pcache.obj" \ - "$(INTDIR)\Render.obj" \ - "$(INTDIR)\Scene.obj" \ - "$(INTDIR)\THandle.obj" \ - "$(INTDIR)\tpage.obj" \ - "..\..\..\..\MSDev60\lib\Wininet.lib" \ - "..\..\..\..\MSDev60\lib\Comdlg32.lib" \ - "..\..\..\..\MSDev60\lib\Gdi32.lib" \ - "..\..\..\..\MSDev60\lib\Kernel32.lib" \ - "..\..\..\..\MSDev60\lib\Libcmt.lib" \ - "..\..\..\..\MSDev60\lib\Oldnames.lib" \ - "..\..\..\..\MSDev60\lib\Shell32.lib" \ - "..\..\..\..\MSDev60\lib\User32.lib" \ - "..\..\..\..\MSDev60\lib\Uuid.lib" \ - "..\..\..\..\MSDev60\lib\Advapi32.lib" \ - "..\..\..\..\Sdk\Dx6sdk\Lib\dxguid.lib" \ - "..\..\..\..\Sdk\Dx6sdk\Lib\ddraw.lib" \ - "..\..\..\..\Sdk\Dx6sdk\Lib\d3dim.lib" - -"$(OUTDIR)\D3DDrv.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - -!ELSEIF "$(CFG)" == "D3DDrv - Win32 Debug" - -OUTDIR=.\Debug -INTDIR=.\Debug -# Begin Custom Macros -OutDir=.\Debug -# End Custom Macros - -ALL : "$(OUTDIR)\D3DDrv.dll" - - -CLEAN : - -@erase "$(INTDIR)\D3d_err.obj" - -@erase "$(INTDIR)\D3d_fx.obj" - -@erase "$(INTDIR)\D3d_main.obj" - -@erase "$(INTDIR)\D3dcache.obj" - -@erase "$(INTDIR)\D3ddrv.obj" - -@erase "$(INTDIR)\DDMemMgr.obj" - -@erase "$(INTDIR)\Gspan.obj" - -@erase "$(INTDIR)\Pcache.obj" - -@erase "$(INTDIR)\Render.obj" - -@erase "$(INTDIR)\Scene.obj" - -@erase "$(INTDIR)\THandle.obj" - -@erase "$(INTDIR)\tpage.obj" - -@erase "$(INTDIR)\vc60.idb" - -@erase "$(INTDIR)\vc60.pdb" - -@erase "$(OUTDIR)\D3DDrv.dll" - -@erase "$(OUTDIR)\D3DDrv.exp" - -@erase "$(OUTDIR)\D3DDrv.ilk" - -@erase "$(OUTDIR)\D3DDrv.lib" - -@erase "$(OUTDIR)\D3DDrv.pdb" - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -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 -MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\D3DDrv.bsc" -BSC32_SBRS= \ - -LINK32=link.exe -LINK32_FLAGS=/nologo /dll /incremental:yes /pdb:"$(OUTDIR)\D3DDrv.pdb" /debug /machine:I386 /nodefaultlib /out:"$(OUTDIR)\D3DDrv.dll" /implib:"$(OUTDIR)\D3DDrv.lib" /pdbtype:sept -LINK32_OBJS= \ - "$(INTDIR)\D3d_err.obj" \ - "$(INTDIR)\D3d_fx.obj" \ - "$(INTDIR)\D3d_main.obj" \ - "$(INTDIR)\D3dcache.obj" \ - "$(INTDIR)\D3ddrv.obj" \ - "$(INTDIR)\DDMemMgr.obj" \ - "$(INTDIR)\Gspan.obj" \ - "$(INTDIR)\Pcache.obj" \ - "$(INTDIR)\Render.obj" \ - "$(INTDIR)\Scene.obj" \ - "$(INTDIR)\THandle.obj" \ - "$(INTDIR)\tpage.obj" \ - "..\..\..\..\MSDev60\lib\Wininet.lib" \ - "..\..\..\..\MSDev60\lib\Comdlg32.lib" \ - "..\..\..\..\MSDev60\lib\Gdi32.lib" \ - "..\..\..\..\MSDev60\lib\Kernel32.lib" \ - "..\..\..\..\MSDev60\lib\Libcmtd.lib" \ - "..\..\..\..\MSDev60\lib\Oldnames.lib" \ - "..\..\..\..\MSDev60\lib\Shell32.lib" \ - "..\..\..\..\MSDev60\lib\User32.lib" \ - "..\..\..\..\MSDev60\lib\Uuid.lib" \ - "..\..\..\..\MSDev60\lib\Advapi32.lib" \ - "..\..\..\..\Sdk\Dx6sdk\Lib\dxguid.lib" \ - "..\..\..\..\Sdk\Dx6sdk\Lib\ddraw.lib" \ - "..\..\..\..\Sdk\Dx6sdk\Lib\d3dim.lib" - -"$(OUTDIR)\D3DDrv.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - -!ENDIF - -.c{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - - -!IF "$(NO_EXTERNAL_DEPS)" != "1" -!IF EXISTS("D3DDrv.dep") -!INCLUDE "D3DDrv.dep" -!ELSE -!MESSAGE Warning: cannot find "D3DDrv.dep" -!ENDIF -!ENDIF - - -!IF "$(CFG)" == "D3DDrv - Win32 Release" || "$(CFG)" == "D3DDrv - Win32 Debug" -SOURCE=.\D3d_err.cpp - -"$(INTDIR)\D3d_err.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\D3d_fx.cpp - -"$(INTDIR)\D3d_fx.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\D3d_main.cpp - -"$(INTDIR)\D3d_main.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\D3dcache.cpp - -"$(INTDIR)\D3dcache.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\D3ddrv.cpp - -"$(INTDIR)\D3ddrv.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\DDMemMgr.c - -"$(INTDIR)\DDMemMgr.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Gspan.cpp - -"$(INTDIR)\Gspan.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Pcache.cpp - -"$(INTDIR)\Pcache.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Render.cpp - -"$(INTDIR)\Render.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\Scene.cpp - -"$(INTDIR)\Scene.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\THandle.cpp - -"$(INTDIR)\THandle.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\tpage.cpp - -"$(INTDIR)\tpage.obj" : $(SOURCE) "$(INTDIR)" - - - -!ENDIF - diff --git a/G3D/Engine/Drivers/WireFrame/D3DDrv.ncb b/G3D/Engine/Drivers/WireFrame/D3DDrv.ncb deleted file mode 100644 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 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 index ea0e538..0000000 --- a/G3D/Engine/Drivers/WireFrame/D3DDrv.plg +++ /dev/null @@ -1,44 +0,0 @@ - - -
-
Build Log

-

---------------------Configuration: D3DDrv - Win32 Release--------------------
-

-
Command Lines

-Creating temporary file "C:\WINDOWS\TEMP\RSP2390.TMP" with contents
-[
-/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 
-"D:\Release\G3D\Engine\Drivers\WireFrame\D3d_main.cpp"
-]
-Creating command line "cl.exe @C:\WINDOWS\TEMP\RSP2390.TMP" 
-Creating temporary file "C:\WINDOWS\TEMP\RSP2391.TMP" with contents
-[
-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" 
-.\Release\D3d_err.obj
-.\Release\D3d_fx.obj
-.\Release\D3d_main.obj
-.\Release\D3dcache.obj
-.\Release\D3ddrv.obj
-.\Release\DDMemMgr.obj
-.\Release\Gspan.obj
-.\Release\Pcache.obj
-.\Release\Render.obj
-.\Release\Scene.obj
-.\Release\THandle.obj
-.\Release\tpage.obj
-]
-Creating command line "link.exe @C:\WINDOWS\TEMP\RSP2391.TMP"
-
Output Window

-Compiling...
-D3d_main.cpp
-Linking...
-   Creating library Release/WireDrv.lib and object Release/WireDrv.exp
-
-
-
-
Results

-WireDrv.dll - 0 error(s), 0 warning(s)
-
- - diff --git a/G3D/Engine/Drivers/WireFrame/mssccprj.scc b/G3D/Engine/Drivers/WireFrame/mssccprj.scc deleted file mode 100644 index 848e217..0000000 --- a/G3D/Engine/Drivers/WireFrame/mssccprj.scc +++ /dev/null @@ -1,4 +0,0 @@ -SCC = This is a Source Code Control file - -[D3DDrv.mak] -SCC_Project_Name = "$/Genesis10/Source/Engine/Drivers/D3DDrv", LQQBAAAA diff --git a/G3D/Engine/Sound.c b/G3D/Engine/Sound.c deleted file mode 100644 index 5f54ed7..0000000 --- a/G3D/Engine/Sound.c +++ /dev/null @@ -1,1068 +0,0 @@ -/****************************************************************************************/ -/* Sound.c */ -/* */ -/* Author: Brian Adelberg */ -/* Description: DirectSound wrapper */ -/* */ -/* The contents of this file are subject to the Genesis3D Public License */ -/* Version 1.01 (the "License"); you may not use this file except in */ -/* compliance with the License. You may obtain a copy of the License at */ -/* http://www.genesis3d.com */ -/* */ -/* Software distributed under the License is distributed on an "AS IS" */ -/* basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See */ -/* the License for the specific language governing rights and limitations */ -/* under the License. */ -/* */ -/* The Original Code is Genesis3D, released March 25, 1999. */ -/* Copyright (C) 1996-1999 Eclipse Entertainment, L.L.C. All Rights Reserved */ -/* */ -/****************************************************************************************/ -#include -#include -#include -#include - -#include "BaseType.h" -#include "ErrorLog.h" -#include "VFile.h" -#include "Sound.h" -#include "Ram.h" - -typedef struct SoundManager SoundManager; -typedef struct Channel Channel; - - -typedef struct geSound_System -{ - geBoolean Active; - SoundManager *SoundM; - geFloat GlobalVolume; -} geSound_System; - -typedef struct geSound_Cfg -{ - geFloat Volume; - geFloat Pan; - geFloat Frequency; -} geSound_Cfg; - - -/* - The interfaces here allow an application to write sound data to - abstract channels which are then to be mixed. The interfaces here - require two things. First, that the application create only one - sound manager per instance, and second that the type of sound data - being passed into the sound channels remains constant. That is, - the format of the binary information is all one format from - one sound to another; the application cannot combine RIFF and WAV - formats in a single channel. -*/ -/* - Call these ones only once per application: -*/ - -static SoundManager * CreateSoundManager(HWND hWnd); -static void DestroySoundManager(SoundManager *sm); - -//static BOOL FillSoundChannel(SoundManager *sm, char* Dir, char *Name, unsigned int* Handle ); -static BOOL FillSoundChannel(SoundManager *sm, geVFile *File, unsigned int* Handle ); -//static BOOL FillSoundChannelMemory(SoundManager *sm, const void *Buffer, unsigned int* Handle ); -static BOOL StartSoundChannel( SoundManager *sm, unsigned int Handle, geSound_Cfg *cfg, int loop, unsigned int* sfx); -static BOOL StopSoundChannel(Channel *channel); -static BOOL FreeAllChannels(SoundManager *sm); -static BOOL FreeChannel(SoundManager *sm, Channel *channel); -static BOOL ModifyChannel( Channel *channel, geSound_Cfg *cfg ); -static int ChannelPlaying( Channel *channel ); -static Channel* GetChannel( SoundManager *sm, unsigned int ID ); - - -typedef struct Channel -{ -// char* name; - LPDIRECTSOUNDBUFFER buffer; - unsigned int ID; - int BaseFreq; - geSound_Cfg cfg; - void * Data; - struct Channel *next; - struct Channel *nextDup; -} Channel; - -typedef struct SoundManager -{ - int smChannelCount; - unsigned int smNextChannelID; - - LPDIRECTSOUNDBUFFER smPrimaryChannel; - Channel* smChannels; - //LPDIRECTSOUNDNOTIFY * smNotify; -} SoundManager; - -static LPDIRECTSOUND lpDirectSound = NULL; -// This isn't really safe as a global. But it's consistent with the global lpDirectSound. -static HMODULE hmodDirectSound = NULL; - -// Added 11/08/1999 Ed Averill to expose DSound object for external code -GENESISAPI void *geSound_GetDSound() -{ - return (void *)lpDirectSound; -} -// End 11/08/1999 addition - -//===================================================================================== -// geSound_SystemCreate -//===================================================================================== -GENESISAPI geSound_System *geSound_CreateSoundSystem(HWND hWnd) -{ - geSound_System *SoundSystem; - - SoundSystem = GE_RAM_ALLOCATE_STRUCT(geSound_System); - - if (!SoundSystem) - { - geErrorLog_Add(GE_ERR_OUT_OF_MEMORY, NULL); - return NULL; - } - - memset(SoundSystem, 0, sizeof(geSound_System)); - - // Initialize the sound system - SoundSystem->SoundM = CreateSoundManager(hWnd); - - if (!SoundSystem->SoundM) - { - geRam_Free(SoundSystem); - geErrorLog_Add(GE_ERR_CREATE_SOUND_MANAGER_FAILED, NULL); - return NULL; - } - SoundSystem->GlobalVolume = 1.0f; - - return SoundSystem; -} - -//===================================================================================== -// geSound_SystemFree -//===================================================================================== -GENESISAPI void geSound_DestroySoundSystem(geSound_System *Sound) -{ - assert(Sound != NULL); - - // Shutdown the sound system - DestroySoundManager(Sound->SoundM); - - Sound->SoundM = NULL; - - geRam_Free(Sound); -} - -//===================================================================================== -// Sound_LoadSound -//===================================================================================== -//GENESISAPI geSound_Def *geSound_LoadSoundDef(geSound_System *SoundS, const char *Path, const char *FileName) -GENESISAPI geSound_Def *geSound_LoadSoundDef(geSound_System *SoundS, geVFile *File) -{ - unsigned int SoundDef = 0; - - assert(SoundS != NULL); - -// if (!FillSoundChannel(SoundS->SoundM, (char*)Path, (char*)FileName, &SoundDef)) - if (!FillSoundChannel(SoundS->SoundM, File, &SoundDef)) - return 0; - - return (geSound_Def *)SoundDef; -} - -#if 0 -//===================================================================================== -// Sound_LoadSound -//===================================================================================== -GENESISAPI geSound_Def *geSound_LoadSoundDefFromMemory( - geSound_System *SoundS, - const void *Buffer) -{ - unsigned int SoundDef = 0; - - assert(SoundS != NULL); - assert(Buffer != NULL); - - if (!FillSoundChannelMemory(SoundS->SoundM, Buffer, &SoundDef)) - return 0; - - return (geSound_Def *)SoundDef; -} -#endif - -//===================================================================================== -// Sound_FreeSound -//===================================================================================== -GENESISAPI void geSound_FreeSoundDef(geSound_System *SoundS, geSound_Def *SoundDef) -{ - Channel* Channel; - - assert(SoundS != NULL); - assert(SoundDef != 0); - - Channel = GetChannel(SoundS->SoundM, (unsigned int)SoundDef); - - if (!Channel) - return; - - FreeChannel(SoundS->SoundM, Channel); -} - -//===================================================================================== -// Sound_SetGlobalVolume -//===================================================================================== -GENESISAPI geBoolean geSound_SetMasterVolume( geSound_System *SoundS, geFloat Volume ) -{ - if( !SoundS ) - return( GE_FALSE ); - SoundS->GlobalVolume = Volume; - return( GE_TRUE ); -} - -//===================================================================================== -// Sound_PlaySound -//===================================================================================== -GENESISAPI geSound *geSound_PlaySoundDef(geSound_System *SoundS, - geSound_Def *SoundDef, - geFloat Volume, - geFloat Pan, - geFloat Frequency, - geBoolean Loop) -{ - unsigned int Sound; - geSound_Cfg LocalCfg; - - LocalCfg.Volume = Volume; - LocalCfg.Pan = Pan; - LocalCfg.Frequency = Frequency; - - LocalCfg.Volume *= SoundS->GlobalVolume; - if (!StartSoundChannel(SoundS->SoundM, (unsigned int)SoundDef, &LocalCfg, (BOOL)Loop, &Sound)) - { - return 0; - } - - return (geSound *)Sound; -} - -//===================================================================================== -// Sound_StopSound -//===================================================================================== -GENESISAPI geBoolean geSound_StopSound(geSound_System *SoundS, geSound *Sound) -{ - Channel* Channel; - - assert(SoundS != NULL); - assert(Sound != NULL); - - Channel = GetChannel(SoundS->SoundM, (unsigned int)Sound); - - if (!Channel) - return GE_FALSE; - - return StopSoundChannel(Channel); -} - -//===================================================================================== -// Sound_ModifySound -//===================================================================================== -GENESISAPI geBoolean geSound_ModifySound(geSound_System *SoundS, - geSound *Sound,geFloat Volume, - geFloat Pan, - geFloat Frequency) -{ - Channel* Channel; - geSound_Cfg LocalCfg; - - assert(SoundS != NULL); - assert(Sound != NULL); - - Channel = GetChannel(SoundS->SoundM, (unsigned int)Sound); - - if (!Channel) - return GE_FALSE; - LocalCfg.Volume = Volume; - LocalCfg.Pan = Pan; - LocalCfg.Frequency = Frequency; - LocalCfg.Volume *= SoundS->GlobalVolume; - return ModifyChannel(Channel, &LocalCfg); -} - -//===================================================================================== -// Sound_SoundIsPlaying -//===================================================================================== -GENESISAPI geBoolean geSound_SoundIsPlaying(geSound_System *SoundS, geSound *Sound) -{ - Channel* Channel; - - assert(SoundS != NULL); - assert(Sound != NULL); - - Channel = GetChannel(SoundS->SoundM, (unsigned int)Sound); - - if (!Channel) - return GE_FALSE; - - return ChannelPlaying(Channel); -} - - -//===================================================================================== -//===================================================================================== - -static BOOL DSParseWaveResource(const void *pvRes, WAVEFORMATEX **ppWaveHeader, - BYTE **ppbWaveData,DWORD *pcbWaveSize) -{ - DWORD *pdw; - DWORD *pdwEnd; - DWORD dwRiff; - DWORD dwType; - DWORD dwLength; - - if (ppWaveHeader) - *ppWaveHeader = NULL; - - if (ppbWaveData) - *ppbWaveData = NULL; - - if (pcbWaveSize) - *pcbWaveSize = 0; - - pdw = (DWORD *)pvRes; - dwRiff = *pdw++; - dwLength = *pdw++; - dwType = *pdw++; - - if (dwRiff != mmioFOURCC('R', 'I', 'F', 'F')) - goto exit; // not even RIFF - - if (dwType != mmioFOURCC('W', 'A', 'V', 'E')) - goto exit; // not a WAV - - pdwEnd = (DWORD *)((BYTE *)pdw + dwLength-4); - - while (pdw < pdwEnd) - { - dwType = *pdw++; - dwLength = *pdw++; - - switch (dwType) - { - case mmioFOURCC('f', 'm', 't', ' '): - if (ppWaveHeader && !*ppWaveHeader) - { - if (dwLength < sizeof(WAVEFORMAT)) - goto exit; // not a WAV - - *ppWaveHeader = (WAVEFORMATEX *)pdw; - - if ((!ppbWaveData || *ppbWaveData) && - (!pcbWaveSize || *pcbWaveSize)) - { - return TRUE; - } - } - break; - - case mmioFOURCC('d', 'a', 't', 'a'): - if ((ppbWaveData && !*ppbWaveData) || - (pcbWaveSize && !*pcbWaveSize)) - { - if (ppbWaveData) - *ppbWaveData = (LPBYTE)pdw; - - if (pcbWaveSize) - *pcbWaveSize = dwLength; - - if (!ppWaveHeader || *ppWaveHeader) - return TRUE; - } - break; - } - - pdw = (DWORD *)((BYTE *)pdw + ((dwLength+1)&~1)); - } - -exit: - return FALSE; -} - -static BOOL DSFillSoundBuffer(IDirectSoundBuffer *pDSB, BYTE *pbWaveData, DWORD cbWaveSize) -{ - - if (pDSB && pbWaveData && cbWaveSize) - { - LPVOID pMem1, pMem2; - DWORD dwSize1, dwSize2; - - if (SUCCEEDED(IDirectSoundBuffer_Lock(pDSB, 0, cbWaveSize, - &pMem1, &dwSize1, &pMem2, &dwSize2, 0))) - { - ZeroMemory(pMem1, dwSize1); - CopyMemory(pMem1, pbWaveData, dwSize1); - - if ( 0 != dwSize2 ) - CopyMemory(pMem2, pbWaveData+dwSize1, dwSize2); - - IDirectSoundBuffer_Unlock(pDSB, pMem1, dwSize1, pMem2, dwSize2); - return TRUE; - } - } - return FALSE; -} - - -DSCAPS dsCaps; -static SoundManager * CreateSoundManager(HWND hWnd ) -{ - typedef HRESULT (WINAPI *DS_CREATE_FUNC)(LPGUID, LPDIRECTSOUND *, LPUNKNOWN); - PCMWAVEFORMAT pcmwf; - DSBUFFERDESC dsbdesc; - HRESULT hres; - SoundManager * sm; - DS_CREATE_FUNC pDirectSoundCreate; - - // load the DirectSound DLL - hmodDirectSound = LoadLibrary ("DSOUND.DLL"); - if (hmodDirectSound == NULL) - { - // Couldn't load DSOUND.DLL - return NULL; - } - - pDirectSoundCreate = (DS_CREATE_FUNC)GetProcAddress (hmodDirectSound, "DirectSoundCreate"); - if (pDirectSoundCreate == NULL) - { - // couldn't find the DirectSoundCreate function - FreeLibrary (hmodDirectSound); - return NULL; - } - - hres = pDirectSoundCreate(NULL, &lpDirectSound, NULL); - if (hres != DS_OK) - { - // failed somehow - FreeLibrary (hmodDirectSound); - return NULL; - } - -// sm = malloc(sizeof(*sm)); - sm = geRam_Allocate(sizeof(*sm)); - if (!sm) - { - IDirectSound_Release(lpDirectSound); - FreeLibrary (hmodDirectSound); - return NULL; - } - sm->smChannelCount = 0; - sm->smNextChannelID = 1; - sm->smChannels = NULL; - - memset(&pcmwf, 0, sizeof(PCMWAVEFORMAT)); - pcmwf.wf.wFormatTag = WAVE_FORMAT_PCM; - - //pcmwf.wf.nChannels = 1; - //pcmwf.wf.nSamplesPerSec = 44050; - //pcmwf.wf.nBlockAlign = 2; -#if 1 - pcmwf.wf.nChannels = 2; - pcmwf.wf.nSamplesPerSec = 44100; - pcmwf.wf.nBlockAlign = 4; - pcmwf.wBitsPerSample = 16; - pcmwf.wf.nAvgBytesPerSec = pcmwf.wf.nSamplesPerSec * pcmwf.wf.nBlockAlign; -#else - pcmwf.wf.nChannels = 1; - pcmwf.wf.nSamplesPerSec = 22050; - pcmwf.wf.nBlockAlign = 1; - pcmwf.wBitsPerSample = 8; - pcmwf.wf.nAvgBytesPerSec = pcmwf.wf.nSamplesPerSec * 2; -#endif - - memset(&dsbdesc, 0, sizeof(DSBUFFERDESC)); - dsbdesc.dwSize = sizeof(DSBUFFERDESC); - dsbdesc.dwFlags = DSBCAPS_PRIMARYBUFFER;// | DSBCAPS_CTRLDEFAULT;// | DSBCAPS_CTRL3D; - dsbdesc.dwBufferBytes = 0; //dwBufferBytes and lpwfxFormat must be set this way. - dsbdesc.lpwfxFormat = NULL; - -#if 1 - if (DS_OK== IDirectSound_SetCooperativeLevel(lpDirectSound, hWnd,DSSCL_NORMAL)) -#else - if (DS_OK== IDirectSound_SetCooperativeLevel(lpDirectSound, hWnd,DSSCL_EXCLUSIVE)) -#endif - { - if (DS_OK== IDirectSound_CreateSoundBuffer(lpDirectSound, &dsbdesc, &sm->smPrimaryChannel, NULL)) - { - return sm; - } - IDirectSound_Release(lpDirectSound); - FreeLibrary (hmodDirectSound); - } -// free( sm ); - geRam_Free(sm); - return NULL; -} - -//static BOOL CreateChannel( char* Name, DSBUFFERDESC* dsBD, Channel** chanelPtr) -static BOOL CreateChannel(DSBUFFERDESC* dsBD, Channel** chanelPtr) -{ - Channel* channel; - -// channel = malloc( sizeof( Channel ) ); - channel = geRam_Allocate( sizeof( Channel ) ); - if ( channel == NULL ) - { - geErrorLog_Add(GE_ERR_OUT_OF_MEMORY, NULL); - return( FALSE ); - } - if(DS_OK != IDirectSound_CreateSoundBuffer(lpDirectSound, dsBD, &channel->buffer, NULL)) - { - geErrorLog_Add(GE_ERR_CREATE_SOUND_BUFFER_FAILED, NULL); - return FALSE; - } - if(DS_OK != IDirectSoundBuffer_GetFrequency(channel->buffer, &channel->BaseFreq) ) - { - geErrorLog_Add(GE_ERR_DS_ERROR, NULL); - return FALSE; - } - channel->next = NULL; - channel->nextDup = NULL; - channel->ID = 0; - channel->cfg.Volume = 1.0f; - channel->cfg.Pan = 0.0f; - channel->cfg.Frequency = 0.0f; -// channel->name = Name; - - *chanelPtr = channel; - return( TRUE ); -} - -//static BOOL GetSoundData( char* Name, unsigned char** dataPtr) -static BOOL GetSoundData( geVFile *File, unsigned char** dataPtr) -{ -// FILE * f; - int32 Size; - uint8 *data; -// int32 CurPos; - -#if 0 - f = fopen(Name, "rb"); - - if (!f) - { - geErrorLog_Add(GE_ERR_FILE_OPEN_ERROR, NULL); - return FALSE; - } -#endif - -#if 0 - CurPos = ftell (f); // Save the startinf pos into this function - fseek (f, 0, SEEK_END); // Seek to end - Size = ftell (f); // Get End (this will be the size) - fseek (f, CurPos, SEEK_SET); // Restore file position -#endif - - if (geVFile_Size(File, &Size) == GE_FALSE) - return FALSE; - - data = geRam_Allocate(Size); - - if (!data) - { - geErrorLog_Add(GE_ERR_OUT_OF_MEMORY, NULL); - return FALSE; - } - - if (geVFile_Read(File, data, Size) == GE_FALSE) - { - geRam_Free(data); - return FALSE; - } - -// fread(data, Size, 1, f); - -// fclose(f); - *dataPtr = data; - return( TRUE ); -} - -static BOOL ParseData( const uint8* data, DSBUFFERDESC* dsBD, BYTE ** pbWaveData ) -{ - - //Parse the Data - memset(dsBD, 0, sizeof(DSBUFFERDESC)); - - dsBD->dwSize = sizeof(DSBUFFERDESC); - dsBD->dwFlags = DSBCAPS_STATIC | DSBCAPS_GETCURRENTPOSITION2 | DSBCAPS_CTRLPAN | - DSBCAPS_CTRLFREQUENCY | DSBCAPS_CTRLVOLUME; - if (!DSParseWaveResource(data, &dsBD->lpwfxFormat, pbWaveData, &dsBD->dwBufferBytes)) - { - geErrorLog_Add(GE_ERR_INVALID_WAV, NULL); - return FALSE; - } - return( TRUE ); - -} - -//static BOOL FillSoundChannel(SoundManager *sm, char* Dir, char *Name, unsigned int* Handle ) -static BOOL FillSoundChannel(SoundManager *sm, geVFile *File, unsigned int* Handle ) -{ - DSBUFFERDESC dsBD; - INT NumBytes; - uint8 *data = NULL; - BYTE * pbWaveData; -// char* Name2; - Channel* channel; - - *Handle = 0; - if (!sm) - return TRUE; - -#if 0 - //Open the file - if (Dir) - { - Name2 = malloc( strlen( Name ) + strlen( Dir ) + 3); // 2 for the "//" and 1 for terminator - if( !Name2 ) - return( 0 ); - sprintf(Name2, "%s\\%s", Dir, Name); - } - else - { - Name2 = malloc( strlen( Name ) + 3); // 2 for the "//" and 1 for terminator - if( !Name2 ) - return( 0 ); - - sprintf(Name2, "%s", Name); - } -#endif - if(!GetSoundData( File, &data )) - return( FALSE ); - - if( !ParseData( data, &dsBD, &pbWaveData ) ) - { - geRam_Free(data); - return( FALSE ); - } - - NumBytes = dsBD.dwBufferBytes; - - //Create the channel -// if( !CreateChannel( Name2, &dsBD, &channel ) ) - if (!CreateChannel(&dsBD, &channel)) - { - geRam_Free(data); - return FALSE; - } - channel->next = sm->smChannels; - channel->ID = sm->smNextChannelID++; - channel->Data = data; - - sm->smChannels = channel; - sm->smChannelCount++; - - //Fill the channel - if (!DSFillSoundBuffer(channel->buffer, pbWaveData, NumBytes)) - return FALSE; - -// free( data ); -// geRam_Free(data); - - *Handle = channel->ID; - return TRUE; -} - -#if 0 -static BOOL FillSoundChannelMemory(SoundManager *sm, const void *Buffer, unsigned int* Handle ) -{ - DSBUFFERDESC dsBD; - INT NumBytes; - BYTE * pbWaveData; - char * Name; - Channel * channel; - - *Handle = 0; - if (!sm) - return TRUE; - - if (!ParseData(Buffer, &dsBD, &pbWaveData)) - return FALSE; - - NumBytes = dsBD.dwBufferBytes; - - Name = malloc(11); - if (Name == NULL) - return FALSE; - sprintf(Name, "0x%8x", Buffer); - - //Create the channel -// if (!CreateChannel(Name, &dsBD, &channel)) - if (!CreateChannel(&dsBD, &channel)) - return FALSE; - - channel->next = sm->smChannels; - channel->ID = sm->smNextChannelID++; - - sm->smChannels = channel; - sm->smChannelCount++; - - //Fill the channel - if (!DSFillSoundBuffer(channel->buffer, pbWaveData, NumBytes)) - return FALSE; - - *Handle = channel->ID; - return TRUE; -} -#endif - -static void StopDupBuffers( Channel* channel ) -{ - Channel* dupChannel, *prevChannel; - - assert( channel ); - - dupChannel = channel->nextDup; - prevChannel = channel; - while( dupChannel ) - { - IDirectSoundBuffer_Stop(dupChannel->buffer); - dupChannel = dupChannel->nextDup; - } -} - -static void ClearDupBuffers( Channel* channel ) -{ - Channel* dupChannel, *prevChannel; - - if( channel == NULL) - return; - - dupChannel = channel->nextDup; - prevChannel = channel; - while( dupChannel ) - { - if( !ChannelPlaying( dupChannel ) ) - { - prevChannel->nextDup = dupChannel->nextDup; - IDirectSound_Release(dupChannel->buffer); -// free( dupChannel ); - geRam_Free(dupChannel); - dupChannel = prevChannel->nextDup; - } - else - { - prevChannel = dupChannel; - dupChannel = dupChannel->nextDup; - } - } -} - -static BOOL FreeAllChannels(SoundManager *sm) -{ - int Error; - - Channel* channel, *nextChannel; - - channel = sm->smChannels; - while( channel ) - { - nextChannel = channel->next; - StopDupBuffers( channel ); - ClearDupBuffers( channel ); - Error = IDirectSoundBuffer_Stop(channel->buffer); - if (Error != DS_OK) - { - geErrorLog_Add(GE_ERR_DS_ERROR, NULL); - return FALSE; - } - Error = IDirectSound_Release(channel->buffer); - if (Error != DS_OK) - { - geErrorLog_Add(GE_ERR_DS_ERROR, NULL); - return FALSE; - } - -// if( channel->name ) -// geRam_Free(channel->name); -// free( channel->name ); - if (channel->Data) - geRam_Free(channel->Data); - geRam_Free(channel); -// free( channel ); - channel = nextChannel; - } - sm->smChannels = NULL; - sm->smChannelCount = 0; - - return TRUE; -} - - -static BOOL FreeChannel(SoundManager *sm, Channel* channel) -{ - int Error; - Channel*prevChannel = NULL, *curChannel; - if ( channel ) - { - StopDupBuffers( channel ); - ClearDupBuffers( channel ); - Error = IDirectSoundBuffer_Stop(channel->buffer); - if (Error != DS_OK) - { - geErrorLog_Add(GE_ERR_DS_ERROR, NULL); - return FALSE; - } - Error = IDirectSound_Release(channel->buffer); - if (Error != DS_OK) - { - geErrorLog_Add(GE_ERR_DS_ERROR, NULL); - return FALSE; - } -// if( channel->name ) -// geRam_Free(channel->name); -// free( channel->name ); - - if( channel->Data ) - geRam_Free(channel->Data); - - curChannel = sm->smChannels; - while( curChannel && curChannel != channel ) - { - prevChannel = curChannel; - curChannel = curChannel->next; - } - if( curChannel ) - { - if( prevChannel ) - prevChannel->next = curChannel->next; - else - sm->smChannels = curChannel->next; - geRam_Free(curChannel); -// free( curChannel ); - } - } - - return TRUE; -} - -static Channel* ReloadData(void *Data) -{ - DSBUFFERDESC dsBD; - BYTE * pbWaveData; - INT NumBytes; -// uint8 *data = NULL; - Channel* channel; - -// if( !Name ) -// return( NULL ); -// if( !GetSoundData( Data, &data ) ) -// return( NULL ); - - if( !ParseData( Data, &dsBD, &pbWaveData ) ) - return( NULL ); - - NumBytes = dsBD.dwBufferBytes; - - //Create the channel -// if( !CreateChannel( Name, &dsBD, &channel ) ) - if( !CreateChannel(&dsBD, &channel ) ) - return NULL; - - //Fill the channel - if ( !DSFillSoundBuffer(channel->buffer, pbWaveData, NumBytes)) - return NULL; - -// geRam_Free(data); -// free( data ); - return( channel ); -} - -static BOOL DupChannel( SoundManager *sm, Channel* channel, Channel** dupChannelPtr ) -{ - Channel* dupChannel; - HRESULT Error; - - *dupChannelPtr = NULL; -// dupChannel = malloc( sizeof(Channel ) ); - dupChannel = geRam_Allocate( sizeof(Channel ) ); - if( dupChannel == NULL ) - { - geErrorLog_Add(GE_ERR_OUT_OF_MEMORY, NULL ); - return FALSE; - } - Error = IDirectSound_DuplicateSoundBuffer( lpDirectSound, channel->buffer, &dupChannel->buffer ); - if( Error != DS_OK ) - { - geRam_Free(dupChannel); -// free( dupChannel ); - dupChannel = ReloadData( channel->Data ); - if( dupChannel == NULL ) - { - geErrorLog_Add(GE_ERR_DS_ERROR, NULL); - return FALSE; - } - } - dupChannel->ID = sm->smNextChannelID++; - dupChannel->next = NULL; - dupChannel->nextDup = channel->nextDup; - dupChannel->cfg = channel->cfg; -// dupChannel->name = NULL; - dupChannel->Data = channel->Data; - channel->nextDup = dupChannel; - *dupChannelPtr = dupChannel; - return( TRUE ); -} - -static BOOL StartSoundChannel( SoundManager *sm, unsigned int Handle, geSound_Cfg *cfg, int loop, unsigned int* sfx) -{ - HRESULT hres; - Channel* channel, *dupChannel; - - if( Handle == 0 ) - return( FALSE ); - channel = GetChannel( sm, Handle ); - //Clear all non-playing duplicate buffers. - ClearDupBuffers(channel); - //If the main buffer is playing and all non-playing dups have been cleared - //we need a new duplicate. - if( ChannelPlaying( channel ) ) - { - if(!DupChannel( sm,channel, &dupChannel ) ) - return( FALSE ); - channel = dupChannel; - } - if( !ModifyChannel( channel, cfg ) ) - return( FALSE ); - IDirectSoundBuffer_SetCurrentPosition(channel->buffer, 0); - hres = IDirectSoundBuffer_Play( channel->buffer, - 0, - 0, - loop ? DSBPLAY_LOOPING : 0); - - if (hres == DS_OK) - { - if( sfx ) - *sfx = channel->ID; - return TRUE; - } - - geErrorLog_Add(GE_ERR_DS_ERROR, NULL); - return FALSE; -} - -static BOOL StopSoundChannel(Channel* channel) -{ - HRESULT hres; - - assert(channel); - - hres = IDirectSoundBuffer_Stop(channel->buffer); - - if (hres == DS_OK) - return TRUE; - - geErrorLog_Add(GE_ERR_DS_ERROR, NULL); - return FALSE; -} - -static void DestroySoundManager(SoundManager *sm) -{ - if (!sm) return; - - FreeAllChannels( sm ); - if (sm->smPrimaryChannel != NULL) - sm->smPrimaryChannel->lpVtbl->Release(sm->smPrimaryChannel); - if (lpDirectSound != NULL) - IDirectSound_Release(lpDirectSound); - if (hmodDirectSound != NULL) - FreeLibrary (hmodDirectSound); - geRam_Free(sm); -// free(sm); -} - -static BOOL ModifyChannel( Channel *channel, geSound_Cfg *cfg ) -{ - int Error, Vol, Pan, Freq; - assert(channel); - - if( !cfg ) - return( TRUE ); - ClearDupBuffers(channel); - if( cfg->Volume != channel->cfg.Volume ) - { - Vol = (DWORD)((1.0 - cfg->Volume ) * DSBVOLUME_MIN); - Error = IDirectSoundBuffer_SetVolume(channel->buffer, Vol); - if (Error != DS_OK) - { - geErrorLog_Add(GE_ERR_DS_ERROR, NULL); - return FALSE; - } - channel->cfg.Volume = cfg->Volume; - } - - if( cfg->Pan != channel->cfg.Pan ) - { - Pan = (int)(cfg->Pan * DSBPAN_RIGHT); - Error = IDirectSoundBuffer_SetPan(channel->buffer, Pan); - if (Error != DS_OK) - { - geErrorLog_Add(GE_ERR_DS_ERROR, NULL); - return FALSE; - } - channel->cfg.Pan = cfg->Pan; - } - - - if( cfg->Frequency != channel->cfg.Frequency ) - { - - Freq = (DWORD)(channel->BaseFreq * cfg->Frequency); - Error = IDirectSoundBuffer_SetFrequency(channel->buffer, Freq); - if (Error != DS_OK) - { - geErrorLog_Add(GE_ERR_DS_ERROR, NULL); - return FALSE; - } - channel->cfg.Frequency = cfg->Frequency; - } - - return TRUE; -} - -static int ChannelPlaying( Channel *channel ) -{ - DWORD status, Error; - - if(!channel) - return( 0 ); - - Error = IDirectSoundBuffer_GetStatus( channel->buffer, &status); - if( Error != DS_OK) - return 0; - return( status & DSBSTATUS_PLAYING ); -} - -static Channel* GetChannel( SoundManager *sm, unsigned int ID ) -{ - Channel* dupChannel; - Channel* channel = sm->smChannels; - - while( channel ) - { - if( channel->ID == ID ) - break; - dupChannel = channel->nextDup; - while( dupChannel ) - { - if( dupChannel->ID == ID ) - break; - dupChannel = dupChannel->nextDup; - } - if( dupChannel ) - return( dupChannel ); - channel = channel->next; - } - return( channel ); -} diff --git a/G3D/Entities.h b/G3D/Entities.h index 20fc6f0..41856a3 100644 --- a/G3D/Entities.h +++ b/G3D/Entities.h @@ -28,7 +28,7 @@ #include "BaseType.h" #include "ErrorLog.h" #include "Vec3d.h" -#include "G3D/Engine/System.h" +#include "System.h" #include "World.h" #include "Ram.h" diff --git a/G3D/Fog.c b/G3D/Fog.c index 84bd28a..cb336f3 100644 --- a/G3D/Fog.c +++ b/G3D/Fog.c @@ -19,8 +19,8 @@ /* Copyright (C) 1999 WildTangent, Inc. All Rights Reserved */ /* */ /****************************************************************************************/ -#include -#include +#include +#include #include "Fog.h" 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 --- a/G3D/Frustum.c +++ b/G3D/Frustum.c @@ -19,14 +19,13 @@ /* Copyright (C) 1999 WildTangent, Inc. All Rights Reserved */ /* */ /****************************************************************************************/ -#include -#include -#include +#include +#include +#include #include "Camera.h" #include "Frustum.h" #include "Surface.h" - #include "Vec3d.h" //#define RIGHT_HANDED diff --git a/G3D/FsDos.c b/G3D/FsDos.c index 6157e8a..cf826c9 100644 --- a/G3D/FsDos.c +++ b/G3D/FsDos.c @@ -21,19 +21,16 @@ /****************************************************************************************/ #define WIN32_LEAN_AND_MEAN #include - #include #include #include #include -#include "basetype.h" -#include "ram.h" - -#include "vfile.h" -#include "vfile._h" - -#include "fsdos.h" +#include "BaseType.h" +#include "Ram.h" +#include "VFile.h" +#include "VFile._h" +#include "FsDos.h" // "DF01" #define DOSFILE_SIGNATURE 0x31304644 diff --git a/G3D/FsMemory.c b/G3D/FsMemory.c index ce5ac4e..a5f24bd 100644 --- a/G3D/FsMemory.c +++ b/G3D/FsMemory.c @@ -22,19 +22,16 @@ /****************************************************************************************/ #define WIN32_LEAN_AND_MEAN #include - #include #include #include #include -#include "basetype.h" -#include "ram.h" - -#include "vfile.h" -#include "vfile._h" - -#include "fsmemory.h" +#include "BaseType.h" +#include "Ram.h" +#include "VFile.h" +#include "VFile._h" +#include "FsMemory.h" // "MF01" #define MEMORYFILE_SIGNATURE 0x3130464D diff --git a/G3D/FsVfs.c b/G3D/FsVfs.c index ed7a368..2f8cade 100644 --- a/G3D/FsVfs.c +++ b/G3D/FsVfs.c @@ -24,10 +24,9 @@ #include #include -#include "ram.h" - -#include "fsvfs.h" -#include "dirtree.h" +#include "Ram.h" +#include "FsVfs.h" +#include "DirTree.h" // "VF00" #define VFSFILEHEADER_SIGNATURE 0x30304656 diff --git a/G3D/FsVfs.h b/G3D/FsVfs.h index ed70d2f..e5828f2 100644 --- a/G3D/FsVfs.h +++ b/G3D/FsVfs.h @@ -22,7 +22,7 @@ #ifndef FSVFS_H #define FSVFS_H -#include "vfile._h" +#include "VFile._h" const geVFile_SystemAPIs * GENESISCC FSVFS_GetAPIs(void); diff --git a/G3D/GBSPFile.c b/G3D/GBSPFile.c index 78e20b0..9ac55cd 100644 --- a/G3D/GBSPFile.c +++ b/G3D/GBSPFile.c @@ -19,14 +19,13 @@ /* Copyright (C) 1999 WildTangent, Inc. All Rights Reserved */ /* */ /****************************************************************************************/ -#include +#include #include #include "GBSPFile.h" #include "Vec3d.h" #include "Ram.h" #include "System.h" - #include "ErrorLog.h" #include "VFile.h" diff --git a/G3D/GBSPFile.h b/G3D/GBSPFile.h index c402f86..570b49e 100644 --- a/G3D/GBSPFile.h +++ b/G3D/GBSPFile.h @@ -23,11 +23,11 @@ #define GE_GBSPFILE_H #include +#include #include "G3D/BaseType.h" #include "G3D/Vec3d.h" -#include -#include "G3D/Engine/Drivers/DCommon.h" +#include "DCommon.h" #include "G3D/VFile.h" #include "G3D/Motion.h" diff --git a/G3D/Ge.c b/G3D/Ge.c index 1f4b5ca..0f33bc4 100644 --- a/G3D/Ge.c +++ b/G3D/Ge.c @@ -25,7 +25,7 @@ #include #include "Genesis.h" -#include "G3D/Engine/System.h" +#include "System.h" #include "Ram.h" //#include "Sound.h" 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 --- a/G3D/Light.c +++ b/G3D/Light.c @@ -19,9 +19,9 @@ /* Copyright (C) 1999 WildTangent, Inc. All Rights Reserved */ /* */ /****************************************************************************************/ -#include -#include -#include +#include +#include +#include #include "BaseType.h" #include "Ram.h" @@ -32,7 +32,6 @@ #include "GBSPFile.h" #include "Plane.h" #include "World.h" - #include "Trace.h" #define LIGHT_FRACT 8 diff --git a/G3D/Light.h b/G3D/Light.h index e13d199..a4fdd5e 100644 --- a/G3D/Light.h +++ b/G3D/Light.h @@ -25,10 +25,10 @@ #include //#include -#include "G3D/Genesis.h" -#include "G3D/BaseType.h" -#include "G3D/Engine/System.h" -#include "G3D/Engine/Drivers/DCommon.h" +#include "Genesis.h" +#include "BaseType.h" +#include "System.h" +#include "DCommon.h" #ifdef __cplusplus extern "C" { diff --git a/G3D/List.c b/G3D/List.c index 5b52e17..822ec63 100644 --- a/G3D/List.c +++ b/G3D/List.c @@ -114,9 +114,12 @@ LinkNode *pNode; int Len=0; if ( ! pList ) return 0; - LN_Walk(pNode,pList) { - Len++; - } + // FIXME: damn macros + //#define zLN_Walk(Node,List) for( Node = (List)->Next; (Node) != (List) ; Node = (Node)->Next ) + //LN_Walk(pNode,pList) { + for (pNode = pList->Next; pNode != pList; pNode = pNode->Next) + Len++; + //} return Len; } @@ -1125,12 +1128,15 @@ void Hash_Destroy(Hash *pHash) Debug(pHash->Members += 2) // count Head & Tail pList = pHash->NodeList; - LN_Walk_Editting(pNode,pList,pNext) { + // FIXME: damn macros + // #define zLN_Walk_Editting(Node,List,Holder) for( Node = (List)->Next; (Node) != (List) && ((Holder) = (Node)->Next) != NULL ; Node = Holder ) + //LN_Walk_Editting(pNode,pList,pNext) { + /*for (pNode = (pList)->Next; (pNode != pList) && ((pNext = pNode->Next) != NULL); pNode = pNext) { MemPool_FreeHunk(HashNodePool_g,pNode); // FIXME: where does this member variable come from?!? //assert(pHash->Members > 1); Debug(pHash->Members --) - } + }*/ // FIXME: where does this member variable come from?!? //assert(pHash->Members == 1); MemPool_FreeHunk(HashNodePool_g,pList); diff --git a/G3D/Log.h b/G3D/Log.h index b112ce2..1b1ec2c 100644 --- a/G3D/Log.h +++ b/G3D/Log.h @@ -35,7 +35,7 @@ void Log_Printf(const char * string, ...); #else // _LOG -static _inline void Log_Printf(const char * str, ...) { } +static inline void Log_Printf(const char * str, ...) { } #define Log_Puts(string) #endif // _LOG 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 --- a/G3D/Engine/Logo/logo.c +++ b/G3D/Logo.c @@ -24,15 +24,14 @@ #include #include //timeGetTime #pragma warning(default : 4201 4214 4115) - #include -#include "genesis.h" -#include "engine.h" -#include "bitmap.h" +#include "Genesis.h" +#include "Engine.h" +#include "Bitmap.h" #include "PixelFormat.h" -#include "errorlog.h" -#include "electric.h" +#include "ErrorLog.h" +#include "Electric.h" extern unsigned char LogoActor_act[]; extern int LogoActor_act_Length; @@ -51,7 +50,8 @@ extern int A_Streak_bmp_Length; static void SubLarge(LARGE_INTEGER *start, LARGE_INTEGER *end, LARGE_INTEGER *delta) { - _asm { + // FIXME: asm code + /*_asm { mov ebx,dword ptr [start] mov esi,dword ptr [end] @@ -64,7 +64,7 @@ static void SubLarge(LARGE_INTEGER *start, LARGE_INTEGER *end, LARGE_INTEGER *de mov ebx,dword ptr [delta] mov dword ptr [ebx+0],eax mov dword ptr [ebx+4],edx - } + }*/ } static geBoolean GetBonePosition(geActor *Actor, const char *BoneName, geVec3d *Pos) 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 --- a/G3D/Actor/motion.c +++ b/G3D/Motion.c @@ -29,11 +29,11 @@ #include #include // strcmp, strnicmp -#include "basetype.h" -#include "ram.h" -#include "errorlog.h" -#include "motion.h" -#include "tkevents.h" +#include "BaseType.h" +#include "Ram.h" +#include "ErrorLog.h" +#include "Motion.h" +#include "TKEvents.h" #include "StrBlock.h" #pragma warning(disable : 4201) // we're using nameless structures diff --git a/G3D/NetPlay.c b/G3D/NetPlay.c index da5387f..a5d1a76 100644 --- a/G3D/NetPlay.c +++ b/G3D/NetPlay.c @@ -118,7 +118,7 @@ BOOL InitNetPlay(LPGUID lpGuid) //==================================================================================================== BOOL NetPlayEnumSession(LPSTR IPAdress, SESSION_DESC **SessionList, DWORD *SessionNum) { - HRESULT hr; + HRESULT hr = NULL; #if 1 char tempBuf[1024]; @@ -132,8 +132,9 @@ BOOL NetPlayEnumSession(LPSTR IPAdress, SESSION_DESC **SessionList, DWORD *Sessi lpConnectionBuffer = NULL; } - hr = CoCreateInstance( &CLSID_DirectPlayLobby, NULL, CLSCTX_INPROC_SERVER, - &IID_IDirectPlayLobby3A, (LPVOID *) &lpDPL ); + // FIXME: IID_IDirectPlayLobby3A cant be linked to in a shared object? hmm + //hr = CoCreateInstance( &CLSID_DirectPlayLobby, NULL, CLSCTX_INPROC_SERVER, + // &IID_IDirectPlayLobby3A, (LPVOID *) &lpDPL ); if (hr != DP_OK) { 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 --- a/G3D/Bitmap/Compression/palcreate.c +++ b/G3D/PALCreate.c @@ -81,15 +81,15 @@ why this isn't exactly optimal: ***********/ /*}{*************************************************/ -#include "palcreate.h" -#include "tsc.h" -#include "paloptimize.h" -#include "ram.h" -#include "yuv.h" -#include "mempool.h" -#include "utility.h" // delete macro #include #include +#include "PALCreate.h" +#include "TSC.h" +#include "PALOptimize.h" +#include "Ram.h" +#include "YUV.h" +#include "MemPool.h" +#include "Utility.h" // delete macro /*******/ @@ -193,11 +193,11 @@ struct octNode int createOctTree(octNode * root,const geBitmap_Info * Info,const void * Bits,geBoolean doYUV); geBitmap_Palette * createPaletteGoodSub(const geBitmap_Info * Info,const void * Bits); -void addOctNode(octNode *root,int R,int G,int B,int *nLeavesPtr); -void gatherLeaves(octNode *node,octNode *** leavesPtrPtr,int minCount); -void gatherLeavesCutting(octNode *node,octNode *** leavesPtrPtr); -int leafCompareCount(const void *a,const void *b); -int leafCompareCost(const void *a,const void *b); +static void addOctNode(octNode *root,int R,int G,int B,int *nLeavesPtr); +static void gatherLeaves(octNode *node,octNode *** leavesPtrPtr,int minCount); +static void gatherLeavesCutting(octNode *node,octNode *** leavesPtrPtr); +static int leafCompareCount(const void *a,const void *b); +static int leafCompareCost(const void *a,const void *b); int findClosest(int R,int G,int B,uint8 *palette,int palEntries,int *foundPalPtr); void computeOctRGBs(octNode *node); void computeCutCosts(octNode *node); 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 --- a/G3D/Bitmap/Compression/palcreate.h +++ b/G3D/PALCreate.h @@ -1,8 +1,8 @@ #ifndef GE_BRANDO_PALCREATE_H #define GE_BRANDO_PALCREATE_H -#include "basetype.h" -#include "bitmap.h" +#include "BaseType.h" +#include "Bitmap.h" /****************************************************************************************/ /* PalCreate */ 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 --- a/G3D/Bitmap/Compression/paloptimize.c +++ b/G3D/PALOptimize.c @@ -73,14 +73,13 @@ The problems : **********/ -#include "yuv.h" -#include "palettize.h" -#include "utility.h" -#include "tsc.h" -#include "log.h" - -#include "bitmap.h" -#include "pixelformat.h" +#include "YUV.h" +#include "Palettize.h" +#include "Utility.h" +#include "TSC.h" +#include "Log.h" +#include "Bitmap.h" +#include "PixelFormat.h" /*******/ 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 --- a/G3D/Bitmap/Compression/paloptimize.h +++ b/G3D/PALOptimize.h @@ -23,8 +23,8 @@ /* */ /****************************************************************************************/ -#include "basetype.h" -#include "bitmap.h" +#include "BaseType.h" +#include "Bitmap.h" #ifdef __cplusplus extern "C" { 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 --- a/G3D/Bitmap/Compression/palettize.c +++ b/G3D/Palettize.c @@ -36,15 +36,15 @@ we palettize ("inverse colormap") using an octree lookup system **********/ -#include "palettize.h" #include #include -#include "ram.h" -#include "mempool.h" +#include "Palettize.h" +#include "Ram.h" +#include "MemPool.h" #ifdef _TSC #pragma message("palettize using TSC") -#include "tsc.h" +#include "TSC.h" #endif /*******/ 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 --- a/G3D/Bitmap/Compression/palettize.h +++ b/G3D/Palettize.h @@ -23,8 +23,8 @@ /* */ /****************************************************************************************/ -#include "basetype.h" -#include "bitmap.h" +#include "BaseType.h" +#include "Bitmap.h" #ifdef __cplusplus extern "C" { 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 --- a/G3D/Actor/path.c +++ b/G3D/Path.c @@ -24,14 +24,14 @@ #include #include //sscanf -#include "path.h" -#include "Quatern.h" -#include "errorlog.h" -#include "ram.h" -#include "tkarray.h" +#include "Path.h" +#include "Quaternion.h" +#include "ErrorLog.h" +#include "Ram.h" +#include "TKArray.h" #include "VKFrame.h" #include "QKFrame.h" -#include "vec3d.h" +#include "Vec3d.h" #define min(aa,bb) (( (aa)>(bb) ) ? (bb) : (aa) ) #define max(aa,bb) (( (aa)>(bb) ) ? (aa) : (bb) ) @@ -1654,4 +1654,4 @@ static gePath * GENESISCC gePath_CreateFromBinaryFile(geVFile *F,uint32 Header) P->Dirty = FLAG_DIRTY; return P; } - \ No newline at end of file + diff --git a/G3D/Physics/PhysicsJoint.h b/G3D/Physics/PhysicsJoint.h deleted file mode 100644 index 776c274..0000000 --- a/G3D/Physics/PhysicsJoint.h +++ /dev/null @@ -1,68 +0,0 @@ -/****************************************************************************************/ -/* PHYSICSJOINT.H */ -/* */ -/* Author: Jason Wood */ -/* Description: Rigid body joint interface */ -/* */ -/* The contents of this file are subject to the Genesis3D Public License */ -/* Version 1.01 (the "License"); you may not use this file except in */ -/* compliance with the License. You may obtain a copy of the License at */ -/* http://www.genesis3d.com */ -/* */ -/* Software distributed under the License is distributed on an "AS IS" */ -/* basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See */ -/* the License for the specific language governing rights and limitations */ -/* under the License. */ -/* */ -/* The Original Code is Genesis3D, released March 25, 1999. */ -/* Genesis3D Version 1.1 released November 15, 1999 */ -/* Copyright (C) 1999 WildTangent, Inc. All Rights Reserved */ -/* */ -/****************************************************************************************/ -#ifndef PHYSICSJOINT_H -#define PHYSICSJOINT_H - -#ifdef __cplusplus -extern "C" { -#endif - -typedef enum -{ - JT_WORLD = 0, - JT_SPHERICAL, - JT_PTTOPATH, - JT_PTTOSURFACE -} gePhysicsJoint_Kind; - -typedef struct gePhysicsJoint gePhysicsJoint; - -//////////////////////////////////////////////////////////////////////////////////////////////////// -// ctor / dtor - -//gePhysicsJoint* gePhysicsJoint_Create(ItemJoint* pItemJoint); -GENESISAPI gePhysicsJoint * GENESISCC gePhysicsJoint_Create(gePhysicsJoint_Kind Kind, const geVec3d *Location, - geFloat assemblyRate, gePhysicsObject *PS1, gePhysicsObject *PS2, geFloat physicsScale); -GENESISAPI geBoolean GENESISCC gePhysicsJoint_Destroy(gePhysicsJoint** ppPhysjnt); - -//////////////////////////////////////////////////////////////////////////////////////////////////////////// -// functions - -GENESISAPI gePhysicsJoint_Kind GENESISCC gePhysicsJoint_GetType(const gePhysicsJoint* pPhysjnt); -GENESISAPI void GENESISCC gePhysicsJoint_GetLocationA(const gePhysicsJoint* pPhysjnt, geVec3d* pLoc); -GENESISAPI void GENESISCC gePhysicsJoint_GetLocationB(const gePhysicsJoint* pPhysjnt, geVec3d* pLoc); -GENESISAPI void GENESISCC gePhysicsJoint_SetLocationA(gePhysicsJoint* pPhysjnt, const geVec3d* pLoc); -GENESISAPI void GENESISCC gePhysicsJoint_SetLocationB(gePhysicsJoint* pPhysjnt, const geVec3d* pLoc); -GENESISAPI void GENESISCC gePhysicsJoint_GetLocationAInWorldSpace(const gePhysicsJoint* pPhysjnt, geVec3d* pLoc); -GENESISAPI void GENESISCC gePhysicsJoint_GetLocationBInWorldSpace(const gePhysicsJoint* pPhysjnt, geVec3d* pLoc); -GENESISAPI void GENESISCC gePhysicsJoint_SetLocationAInWorldSpace(gePhysicsJoint* pPhysjnt, const geVec3d* pLoc); -GENESISAPI void GENESISCC gePhysicsJoint_SetLocationBInWorldSpace(gePhysicsJoint* pPhysjnt, const geVec3d* pLoc); -GENESISAPI gePhysicsObject* GENESISCC gePhysicsJoint_GetObject1(const gePhysicsJoint* pPhysjnt); -GENESISAPI gePhysicsObject* GENESISCC gePhysicsJoint_GetObject2(const gePhysicsJoint* pPhysjnt); -GENESISAPI geFloat GENESISCC gePhysicsJoint_GetAssemblyRate(const gePhysicsJoint* pPhysjnt); -GENESISAPI void GENESISCC gePhysicsJoint_SetAssemblyRate(gePhysicsJoint* pPhysjnt, geFloat assemblyRate); - -#ifdef __cplusplus -} -#endif - -#endif diff --git a/G3D/Physics/PhysicsObject.h b/G3D/Physics/PhysicsObject.h deleted file mode 100644 index 691bb76..0000000 --- a/G3D/Physics/PhysicsObject.h +++ /dev/null @@ -1,137 +0,0 @@ -/****************************************************************************************/ -/* PHYSICSOBJECT.H */ -/* */ -/* Author: Jason Wood */ -/* Description: Constrained rigid body interface */ -/* */ -/* The contents of this file are subject to the Genesis3D Public License */ -/* Version 1.01 (the "License"); you may not use this file except in */ -/* compliance with the License. You may obtain a copy of the License at */ -/* http://www.genesis3d.com */ -/* */ -/* Software distributed under the License is distributed on an "AS IS" */ -/* basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See */ -/* the License for the specific language governing rights and limitations */ -/* under the License. */ -/* */ -/* The Original Code is Genesis3D, released March 25, 1999. */ -/* Genesis3D Version 1.1 released November 15, 1999 */ -/* Copyright (C) 1999 WildTangent, Inc. All Rights Reserved */ -/* */ -/****************************************************************************************/ -#ifndef PHYSICSOBJECT_H -#define PHYSICSOBJECT_H - -#include "matrix33.h" - -#ifdef __cplusplus -extern "C" { -#endif - -#define PHYSICSOBJECT_GRAVITY (-3.9f) - -typedef struct gePhysicsObject gePhysicsObject; - -//////////////////////////////////////////////////////////////////////////////////////////////////////////// -// ctor/dtor - -GENESISAPI gePhysicsObject * GENESISCC gePhysicsObject_Create( - const geVec3d *StartLocation, - geFloat mass, - geBoolean IsAffectedByGravity, - geBoolean RespondsToForces, - geFloat linearDamping, - geFloat angularDamping, - const geVec3d * Mins, - const geVec3d * Maxs, - geFloat physicsScale); -GENESISAPI geBoolean GENESISCC gePhysicsObject_Destroy(gePhysicsObject** pPhysob); - -//////////////////////////////////////////////////////////////////////////////////////////////////////////// -// functions - -GENESISAPI geBoolean GENESISCC gePhysicsObject_ApplyGlobalFrameForce(gePhysicsObject* pod, geVec3d* force, geVec3d* radiusVector, geBoolean isAppliedForce, - int configIndex); -GENESISAPI geBoolean GENESISCC gePhysicsObject_ApplyGlobalFrameImpulse(gePhysicsObject* pPhysob, geVec3d* pImpulse, geVec3d* pRadVec, int configIndex); -GENESISAPI geBoolean GENESISCC gePhysicsObject_ComputeForces(gePhysicsObject* pod, int configIndex); -GENESISAPI geBoolean GENESISCC gePhysicsObject_Integrate(gePhysicsObject* pod, geFloat deltaTime, int SourceConfigIndex); - -GENESISAPI geFloat GENESISCC gePhysicsObject_GetMass(const gePhysicsObject* po); -GENESISAPI void GENESISCC gePhysicsObject_SetMass(gePhysicsObject* po, geFloat mass); - -GENESISAPI geFloat GENESISCC gePhysicsObject_GetOneOverMass(const gePhysicsObject* po); - -GENESISAPI void GENESISCC gePhysicsObject_GetXForm(const gePhysicsObject* po, geXForm3d* xform, int configIndex); -GENESISAPI void GENESISCC gePhysicsObject_SetXForm(gePhysicsObject* po, const geXForm3d* xform, int configIndex); - -GENESISAPI void GENESISCC gePhysicsObject_GetXFormInEditorSpace(const gePhysicsObject* po, geXForm3d* xform, int configIndex); - -GENESISAPI void GENESISCC gePhysicsObject_GetOriginalLocation(const gePhysicsObject* po, geVec3d* loc); -GENESISAPI void GENESISCC gePhysicsObject_SetOriginalLocation(gePhysicsObject* po, const geVec3d* loc); - -GENESISAPI void GENESISCC gePhysicsObject_GetLocation(const gePhysicsObject *po, geVec3d *Location, int configIndex); -GENESISAPI void GENESISCC gePhysicsObject_GetLocationInEditorSpace(const gePhysicsObject* po, geVec3d* loc, int configIndex); - -GENESISAPI void GENESISCC gePhysicsObject_GetLinearVelocity(const gePhysicsObject* po, geVec3d* vel, int configIndex); -GENESISAPI void GENESISCC gePhysicsObject_SetLinearVelocity(gePhysicsObject* po, const geVec3d* vel, int configIndex); - -GENESISAPI void GENESISCC gePhysicsObject_GetAngularVelocity(const gePhysicsObject* po, geVec3d* vel, int configIndex); -GENESISAPI void GENESISCC gePhysicsObject_SetAngularVelocity(gePhysicsObject* po, const geVec3d* vel, int configIndex); - -GENESISAPI void GENESISCC gePhysicsObject_GetForce(const gePhysicsObject* po, geVec3d* force, int configIndex); -GENESISAPI void GENESISCC gePhysicsObject_SetForce(gePhysicsObject* po, const geVec3d* force, int configIndex); - -GENESISAPI void GENESISCC gePhysicsObject_GetTorque(const gePhysicsObject* po, geVec3d* torque, int configIndex); -GENESISAPI void GENESISCC gePhysicsObject_SetTorque(gePhysicsObject* po, const geVec3d* torque, int configIndex); - -GENESISAPI void GENESISCC gePhysicsObject_GetAppliedForce(const gePhysicsObject* po, geVec3d* force, int configIndex); -GENESISAPI void GENESISCC gePhysicsObject_SetAppliedForce(gePhysicsObject* po, const geVec3d* force, int configIndex); - -GENESISAPI void GENESISCC gePhysicsObject_GetAppliedTorque(const gePhysicsObject* po, geVec3d* torque, int configIndex); -GENESISAPI void GENESISCC gePhysicsObject_SetAppliedTorque(gePhysicsObject* po, const geVec3d* torque, int configIndex); - -GENESISAPI void GENESISCC gePhysicsObject_ClearForce(gePhysicsObject* po, int configIndex); -GENESISAPI void GENESISCC gePhysicsObject_ClearTorque(gePhysicsObject* po, int configIndex); - -GENESISAPI void GENESISCC gePhysicsObject_ClearAppliedForce(gePhysicsObject* po, int configIndex); -GENESISAPI void GENESISCC gePhysicsObject_ClearAppliedTorque(gePhysicsObject* po, int configIndex); - -GENESISAPI void GENESISCC gePhysicsObject_IncForce(gePhysicsObject* po, const geVec3d* forceInc, int configIndex); -GENESISAPI void GENESISCC gePhysicsObject_IncTorque(gePhysicsObject* po, const geVec3d* torqueInc, int configIndex); - -GENESISAPI void GENESISCC gePhysicsObject_IncAppliedForce(gePhysicsObject* po, const geVec3d* forceInc, int configIndex); -GENESISAPI void GENESISCC gePhysicsObject_IncAppliedTorque(gePhysicsObject* po, const geVec3d* torqueInc, int configIndex); - -GENESISAPI void GENESISCC gePhysicsObject_GetOrientation(const gePhysicsObject* po, geQuaternion* orient, int configIndex); -GENESISAPI void GENESISCC gePhysicsObject_SetOrientation(gePhysicsObject* po, const geQuaternion* orient, int configIndex); - -GENESISAPI void GENESISCC gePhysicsObject_GetInertiaTensor(const gePhysicsObject* po, Matrix33* iTensor); -GENESISAPI void GENESISCC gePhysicsObject_GetInertiaTensorInverse(const gePhysicsObject* po, Matrix33* iTensorInv); - -GENESISAPI void GENESISCC gePhysicsObject_GetInertiaTensorInPhysicsSpace(const gePhysicsObject* pPhysob, Matrix33* pITensor, int configIndex); -GENESISAPI void GENESISCC gePhysicsObject_GetInertiaTensorInverseInPhysicsSpace(const gePhysicsObject* pPhysob, Matrix33* pITensorInv, int configIndex); - -GENESISAPI geBoolean GENESISCC gePhysicsObject_IsAffectedByGravity(const gePhysicsObject* po); -GENESISAPI void GENESISCC gePhysicsObject_SetIsAffectedByGravity(gePhysicsObject* po, geBoolean flag); - -GENESISAPI geBoolean GENESISCC gePhysicsObject_RespondsToForces(const gePhysicsObject* po); -GENESISAPI void GENESISCC gePhysicsObject_SetRespondsToForces(gePhysicsObject* po, geBoolean flag); - -GENESISAPI geFloat GENESISCC gePhysicsObject_GetLinearDamping(const gePhysicsObject* po); -GENESISAPI void GENESISCC gePhysicsObject_SetLinearDamping(gePhysicsObject* po, geFloat linearDamping); - -GENESISAPI geFloat GENESISCC gePhysicsObject_GetAngularDamping(const gePhysicsObject* po); -GENESISAPI void GENESISCC gePhysicsObject_SetAngularDamping(gePhysicsObject* po, geFloat angularDamping); - -GENESISAPI void GENESISCC gePhysicsObject_SetActiveConfig(gePhysicsObject* pPhysob, int configIndex); -GENESISAPI int GENESISCC gePhysicsObject_GetActiveConfig(gePhysicsObject* pPhysob); - -GENESISAPI void GENESISCC gePhysicsObject_SetPhysicsScale(gePhysicsObject* pPhysob, geFloat scale); -GENESISAPI geFloat GENESISCC gePhysicsObject_GetPhysicsScale(gePhysicsObject* pPhysob); - -#ifdef __cplusplus -} -#endif - -#endif - diff --git a/G3D/Physics/PhysicsSystem.h b/G3D/Physics/PhysicsSystem.h deleted file mode 100644 index 176fb81..0000000 --- a/G3D/Physics/PhysicsSystem.h +++ /dev/null @@ -1,54 +0,0 @@ -/****************************************************************************************/ -/* PHYSICSSYSTEM.H */ -/* */ -/* Author: Jason Wood */ -/* Description: Rigid body, constraint based physics system interface */ -/* */ -/* The contents of this file are subject to the Genesis3D Public License */ -/* Version 1.01 (the "License"); you may not use this file except in */ -/* compliance with the License. You may obtain a copy of the License at */ -/* http://www.genesis3d.com */ -/* */ -/* Software distributed under the License is distributed on an "AS IS" */ -/* basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See */ -/* the License for the specific language governing rights and limitations */ -/* under the License. */ -/* */ -/* The Original Code is Genesis3D, released March 25, 1999. */ -/* Genesis3D Version 1.1 released November 15, 1999 */ -/* Copyright (C) 1999 WildTangent, Inc. All Rights Reserved */ -/* */ -/****************************************************************************************/ -#if !defined (PHYSICSSYSTEM_H) -#define PHYSICSSYSTEM_H - -#ifdef __cplusplus -extern "C" { -#endif - -typedef struct gePhysicsSystem gePhysicsSystem; - -//////////////////////////////////////////////////////////////////////////////////////////////////// -// ctor / dtor - -GENESISAPI gePhysicsSystem *GENESISCC gePhysicsSystem_Create(void); -GENESISAPI geBoolean GENESISCC gePhysicsSystem_Destroy(gePhysicsSystem** ppSys); - -GENESISAPI geBoolean GENESISCC gePhysicsSystem_Iterate(gePhysicsSystem* psPtr, geFloat Time); - -GENESISAPI geBoolean GENESISCC gePhysicsSystem_AddJoint(gePhysicsSystem *psPtr, gePhysicsJoint *Joint); -GENESISAPI geBoolean GENESISCC gePhysicsSystem_AddObject(gePhysicsSystem *psPtr, gePhysicsObject *Object); - -GENESISAPI int GENESISCC gePhysicsSystem_GetSourceConfigIndex(const gePhysicsSystem* pSys); -GENESISAPI gePhysicsObject** GENESISCC gePhysicsSystem_GetPhysobs(const gePhysicsSystem* pSys); -GENESISAPI gePhysicsJoint** GENESISCC gePhysicsSystem_GetPhysjnts(const gePhysicsSystem* pSys); -GENESISAPI int GENESISCC gePhysicsSystem_GetNumPhysobs(const gePhysicsSystem* pSys); -GENESISAPI int GENESISCC gePhysicsSystem_GetNumPhysjnts(const gePhysicsSystem* pSys); -GENESISAPI int GENESISCC gePhysicsSystem_GetSumOfConstraintDimensions(const gePhysicsSystem* pSys); - -#ifdef __cplusplus -} -#endif - -#endif - 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 --- a/G3D/Physics/PhysicsJoint.c +++ b/G3D/PhysicsJoint.c @@ -22,12 +22,11 @@ #include #include -#include "vec3d.h" -#include "xform3d.h" -#include "ram.h" -#include "matrix33.h" -#include "quatern.h" - +#include "Vec3d.h" +#include "XForm3d.h" +#include "Ram.h" +#include "Matrix33.h" +#include "Quaternion.h" #include "PhysicsObject.h" #include "PhysicsJoint.h" 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 --- a/G3D/Physics/PhysicsObject.c +++ b/G3D/PhysicsObject.c @@ -23,12 +23,10 @@ #include #include -#include "genesis.h" -#include "ram.h" -#include "matrix33.h" -#include "quatern.h" - - +#include "Genesis.h" +#include "Ram.h" +#include "Matrix33.h" +#include "Quaternion.h" #include "PhysicsObject.h" //////////////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/G3D/PhysicsObject.h b/G3D/PhysicsObject.h index 691bb76..9114a4b 100644 --- a/G3D/PhysicsObject.h +++ b/G3D/PhysicsObject.h @@ -22,7 +22,7 @@ #ifndef PHYSICSOBJECT_H #define PHYSICSOBJECT_H -#include "matrix33.h" +#include "Matrix33.h" #ifdef __cplusplus extern "C" { 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 --- a/G3D/Physics/PhysicsSystem.c +++ b/G3D/PhysicsSystem.c @@ -25,12 +25,11 @@ #include #include -#include "vec3d.h" -#include "xform3d.h" -#include "ram.h" -#include "matrix33.h" -#include "quatern.h" - +#include "Vec3d.h" +#include "XForm3d.h" +#include "Ram.h" +#include "Matrix33.h" +#include "Quaternion.h" #include "PhysicsObject.h" #include "PhysicsJoint.h" #include "PhysicsSystem.h" 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 --- a/G3D/Bitmap/PixelFormat.c +++ b/G3D/PixelFormat.c @@ -36,7 +36,7 @@ this code only work on Intel-Endian CPU's #include #include -#include "pixelformat.h" +#include "PixelFormat.h" #define isinrange(x,lo,hi) ( (x)>=(lo) && (x)<=(hi) ) diff --git a/G3D/Plane.c b/G3D/Plane.c index 2f1bf92..7bc6675 100644 --- a/G3D/Plane.c +++ b/G3D/Plane.c @@ -19,9 +19,9 @@ /* Copyright (C) 1999 WildTangent, Inc. All Rights Reserved */ /* */ /****************************************************************************************/ -#include -#include -#include +#include +#include +#include #include "BaseType.h" #include "System.h" 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 --- a/G3D/Actor/pose.c +++ b/G3D/Pose.c @@ -24,8 +24,8 @@ #include #include -#include "ram.h" -#include "errorlog.h" +#include "Ram.h" +#include "ErrorLog.h" #include "Pose.h" #include "StrBlock.h" 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 --- a/G3D/Actor/puppet.c +++ b/G3D/Puppet.c @@ -26,28 +26,26 @@ #include //fabs() #include -#include "light.h" -#include "world.h" -#include "trace.h" //Trace_WorldCollisionExact2() -#include "surface.h" // Surf_InSurfBoundingBox() - -#include "xfarray.h" -#include "puppet.h" -#include "pose.h" +#include "Light.h" +#include "World.h" +#include "Trace.h" //Trace_WorldCollisionExact2() +#include "Surface.h" // Surf_InSurfBoundingBox() +#include "XFArray.h" +#include "Puppet.h" +#include "Pose.h" #include "ErrorLog.h" -#include "ram.h" -#include "tclip.h" - +#include "Ram.h" +#include "TClip.h" #include "Frustum.h" #include "ExtBox.h" -#include "bodyinst.h" +#include "BodyInst.h" #ifdef PROFILE #include "rdtsc.h" #endif -#include "bitmap.h" -#include "bitmap._h" +#include "Bitmap.h" +#include "Bitmap._h" #define PUPPET_DEFAULT_MAX_DYNAMIC_LIGHTS 3 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 --- a/G3D/Actor/puppet.h +++ b/G3D/Puppet.h @@ -29,7 +29,7 @@ #include "ExtBox.h" // geExtBox for gePuppet_RenderThroughFrustum #include "Frustum.h" -#include "vfile.h" +#include "VFile.h" #ifdef __cplusplus 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 --- a/G3D/Actor/QKFrame.c +++ b/G3D/QKFrame.c @@ -44,10 +44,10 @@ #include #include -#include "vec3d.h" +#include "Vec3d.h" #include "QKFrame.h" -#include "errorlog.h" -#include "ram.h" +#include "ErrorLog.h" +#include "Ram.h" #define LINEAR_BLEND(a,b,t) ( (t)*((b)-(a)) + (a) ) // linear blend of a and b 0a and t=1 ->b 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 --- a/G3D/Actor/QKFrame.h +++ b/G3D/QKFrame.h @@ -45,8 +45,8 @@ #include "TKArray.h" -#include "Quatern.h" -#include "vfile.h" +#include "Quaternion.h" +#include "VFile.h" #ifdef __cplusplus extern "C" { @@ -134,9 +134,9 @@ geBoolean GENESISCC geQKFrame_LinearRead(geVFile* pFile, void* geQKFrame); geBoolean GENESISCC geQKFrame_SlerpRead(geVFile* pFile, void* geQKFrame); geBoolean GENESISCC geQKFrame_SquadRead(geVFile* pFile, void* geQKFrame); -geBoolean GENESISCC geQKFrame_WriteToFile(geVFile *pFile, void *geQKFrame, +geBoolean GENESISCC geQKFrame_WriteToFile(geVFile *pFile, geTKArray *KeyList, geQKFrame_InterpolationType InterpolationType, int Looping); -geTKArray *GENESISCC geQKFrame_CreateFromFile(geVFile *pFile, geQKFrame_InterpolationType *InterpolationType, int *Looping); +geTKArray *GENESISCC geQKFrame_CreateFromFile(geVFile *pFile, int *InterpolationType, int *Looping); geTKArray *GENESISCC geQKFrame_CreateFromBinaryFile(geVFile *pFile, int *InterpolationType, int *Looping); geBoolean GENESISCC geQKFrame_WriteToBinaryFile(geVFile *pFile, geTKArray *KeyList, geQKFrame_InterpolationType InterpolationType, int Looping); @@ -148,4 +148,4 @@ geBoolean GENESISCC geQKFrame_WriteToBinaryFile(geVFile *pFile, geTKArray *KeyLi #endif -#endif \ No newline at end of file +#endif diff --git a/G3D/Quaternion.c b/G3D/Quaternion.c index f0ea616..727fbb3 100644 --- a/G3D/Quaternion.c +++ b/G3D/Quaternion.c @@ -21,8 +21,9 @@ /****************************************************************************************/ #include #include -#include "basetype.h" -#include "quatern.h" + +#include "BaseType.h" +#include "Quaternion.h" #ifndef NDEBUG diff --git a/G3D/Ram.c b/G3D/Ram.c index 43e41c3..313920b 100644 --- a/G3D/Ram.c +++ b/G3D/Ram.c @@ -28,7 +28,7 @@ #include #endif -#include "ram.h" +#include "Ram.h" /* This controls the MINIMAL_CONFIG flag. Basically, all overflow, underflow, diff --git a/G3D/Sound.c b/G3D/Sound.c index 040b4ae..5f54ed7 100644 --- a/G3D/Sound.c +++ b/G3D/Sound.c @@ -15,8 +15,7 @@ /* under the License. */ /* */ /* The Original Code is Genesis3D, released March 25, 1999. */ -/*Genesis3D Version 1.1 released November 15, 1999 */ -/* Copyright (C) 1999 WildTangent, Inc. All Rights Reserved */ +/* Copyright (C) 1996-1999 Eclipse Entertainment, L.L.C. All Rights Reserved */ /* */ /****************************************************************************************/ #include @@ -24,11 +23,11 @@ #include #include -#include "include/BaseType.h" -#include "include/ErrorLog.h" -#include "include/VFile.h" +#include "BaseType.h" +#include "ErrorLog.h" +#include "VFile.h" #include "Sound.h" -#include "include/Ram.h" +#include "Ram.h" typedef struct SoundManager SoundManager; typedef struct Channel Channel; @@ -100,7 +99,7 @@ typedef struct SoundManager //LPDIRECTSOUNDNOTIFY * smNotify; } SoundManager; -static LPDIRECTSOUND lpDirectSound; +static LPDIRECTSOUND lpDirectSound = NULL; // This isn't really safe as a global. But it's consistent with the global lpDirectSound. static HMODULE hmodDirectSound = NULL; @@ -212,16 +211,6 @@ GENESISAPI void geSound_FreeSoundDef(geSound_System *SoundS, geSound_Def *SoundD FreeChannel(SoundS->SoundM, Channel); } -//===================================================================================== -// Sound_FreeAllChannels -//===================================================================================== -GENESISAPI void geSound_FreeAllChannels(geSound_System *SoundS) -{ - if (!SoundS) return; - - FreeAllChannels( SoundS->SoundM ); -} - //===================================================================================== // Sound_SetGlobalVolume //===================================================================================== @@ -310,8 +299,7 @@ GENESISAPI geBoolean geSound_SoundIsPlaying(geSound_System *SoundS, geSound *Sou Channel* Channel; assert(SoundS != NULL); - if(Sound == NULL) - return GE_FALSE; // eaa3 05/29/2000 don't assert if NULL handle! + assert(Sound != NULL); Channel = GetChannel(SoundS->SoundM, (unsigned int)Sound); @@ -607,7 +595,8 @@ static BOOL ParseData( const uint8* data, DSBUFFERDESC* dsBD, BYTE ** pbWaveData memset(dsBD, 0, sizeof(DSBUFFERDESC)); dsBD->dwSize = sizeof(DSBUFFERDESC); - dsBD->dwFlags = DSBCAPS_STATIC | DSBCAPS_GETCURRENTPOSITION2 | DSBCAPS_CTRLPAN | DSBCAPS_CTRLVOLUME | DSBCAPS_CTRLFREQUENCY; + dsBD->dwFlags = DSBCAPS_STATIC | DSBCAPS_GETCURRENTPOSITION2 | DSBCAPS_CTRLPAN | + DSBCAPS_CTRLFREQUENCY | DSBCAPS_CTRLVOLUME; if (!DSParseWaveResource(data, &dsBD->lpwfxFormat, pbWaveData, &dsBD->dwBufferBytes)) { geErrorLog_Add(GE_ERR_INVALID_WAV, NULL); @@ -1030,10 +1019,6 @@ static BOOL ModifyChannel( Channel *channel, geSound_Cfg *cfg ) { Freq = (DWORD)(channel->BaseFreq * cfg->Frequency); - - if(Freq < 0) - Freq = 0; - Error = IDirectSoundBuffer_SetFrequency(channel->buffer, Freq); if (Error != DS_OK) { diff --git a/G3D/Sound3d.c b/G3D/Sound3d.c index bae9ca9..61e16e7 100644 --- a/G3D/Sound3d.c +++ b/G3D/Sound3d.c @@ -21,9 +21,9 @@ /****************************************************************************************/ #include -#include "G3D/World/Trace.h" -#include "incldue/Vec3d.h" -#include "include/XForm3d.h" +#include "Trace.h" +#include "Vec3d.h" +#include "XForm3d.h" #include "Camera.h" #include "Sound3d.h" diff --git a/G3D/Sprite.c b/G3D/Sprite.c index 7876333..703abf4 100644 --- a/G3D/Sprite.c +++ b/G3D/Sprite.c @@ -19,14 +19,11 @@ #include #include -#include "world.h" -#include "trace.h" - -#include "sprite.h" - +#include "World.h" +#include "Trace.h" +#include "Sprite.h" #include "ErrorLog.h" - #define BIG_DISTANCE 30000.0f extern geBoolean geBitmap_IsValid(const geBitmap *Bmp); diff --git a/G3D/Sprite.h b/G3D/Sprite.h index 5e54066..660e25c 100644 --- a/G3D/Sprite.h +++ b/G3D/Sprite.h @@ -26,7 +26,7 @@ #include "Bitmap.h" #ifdef GE_WORLD_H -#include "camera.h" +#include "Camera.h" #include "Frustum.h" #endif 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 --- a/G3D/Actor/strblock.c +++ b/G3D/StrBlock.c @@ -29,9 +29,9 @@ #include #include -#include "strblock.h" -#include "ram.h" -#include "errorlog.h" +#include "StrBlock.h" +#include "Ram.h" +#include "ErrorLog.h" #define STRBLOCK_MAX_STRINGLEN 255 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 --- a/G3D/Actor/strblock.h +++ b/G3D/StrBlock.h @@ -23,8 +23,8 @@ #ifndef GE_STRBLOCK_H #define GE_STRBLOCK_H -#include "basetype.h" // geBoolean -#include "vfile.h" +#include "BaseType.h" // geBoolean +#include "VFile.h" #ifdef __cplusplus extern "C" { @@ -58,4 +58,4 @@ geBoolean GENESISCC geStrBlock_WriteToBinaryFile(const geStrBlock *SB,geVFile *p } #endif -#endif \ No newline at end of file +#endif 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 --- a/G3D/Surface.c +++ b/G3D/Surface.c @@ -19,10 +19,9 @@ /* Copyright (C) 1999 WildTangent, Inc. All Rights Reserved */ /* */ /****************************************************************************************/ -#include -#include -#include - +#include +#include +#include #include "BaseType.h" #include "System.h" @@ -32,7 +31,6 @@ #include "WBitmap.h" #include "Vec3d.h" #include "Vis.h" - #include "Light.h" //================================================================================ diff --git a/G3D/Surface.h b/G3D/Surface.h index eb4c5f3..eb93156 100644 --- a/G3D/Surface.h +++ b/G3D/Surface.h @@ -25,10 +25,10 @@ #include #include -#include "G3D/BaseType.h" -#include "G3D/PtrTypes.h" -#include "G3D/Vec3d.h" -#include "G3D/Engine/Drivers/DCommon.h" +#include "BaseType.h" +#include "PtrTypes.h" +#include "Vec3d.h" +#include "DCommon.h" #ifdef __cplusplus extern "C" { 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 --- a/G3D/Engine/System.c +++ b/G3D/System.c @@ -19,16 +19,15 @@ /* Copyright (C) 1999 WildTangent, Inc. All Rights Reserved */ /* */ /****************************************************************************************/ -#include +#include #include "BaseType.h" #include "System.h" #include "Genesis.h" #include "ErrorLog.h" #include "Ram.h" -#include "engine.h" - -#include "list.h" +#include "Engine.h" +#include "List.h" #include "Surface.h" #include "World.h" #include "Plane.h" @@ -38,11 +37,8 @@ #include "Sound.h" #include "Entities.h" #include "User.h" - -#include "dcommon.h" - -#include "geassert.h" - +#include "DCommon.h" +#include "GeAssert.h" #include "BitmapList.h" //#define SKY_HACK //extern BOOL GlobalReset; 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 --- a/G3D/Engine/System.h +++ b/G3D/System.h @@ -24,11 +24,12 @@ //#define OLD_FONT -#include "G3D/ErrorLog.h" -#include "G3D/Genesis.h" #include -#include "G3D/Engine/Drivers/DCommon.h" -#include "G3D/Camera.h" + +#include "ErrorLog.h" +#include "Genesis.h" +#include "DCommon.h" +#include "Camera.h" #include "PtrTypes.h" #define VectorToSUB(a, b) ( *(((geFloat*)&a) + b) ) diff --git a/G3D/TClip.c b/G3D/TClip.c index c9eff9f..0b3dcf8 100644 --- a/G3D/TClip.c +++ b/G3D/TClip.c @@ -68,13 +68,11 @@ TClip_Rasterize : 0.006183 : 1.$ % #include #include "TClip.h" -#include "G3D/Engine/Engine.h" -#include "bitmap._h" - -#include "list.h" -#include "ram.h" - -#include "timer.h" +#include "Engine.h" +#include "Bitmap._h" +#include "List.h" +#include "Ram.h" +#include "Timer.h" TIMER_VARS(TClip_Triangle); diff --git a/G3D/TClip.h b/G3D/TClip.h index 5fa8819..7166821 100644 --- a/G3D/TClip.h +++ b/G3D/TClip.h @@ -22,10 +22,10 @@ #ifndef GE_TCLIP_H #define GE_TCLIP_H -#include "include/BaseType.h" -#include "include/GeTypes.h" -#include "include/Bitmap.h" -#include "G3D/Engine/Engine.h" +#include "BaseType.h" +#include "GeTypes.h" +#include "Bitmap.h" +#include "Engine.h" #ifdef __cplusplus extern "C" { 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 --- a/G3D/Actor/tkarray.c +++ b/G3D/TKArray.c @@ -37,7 +37,7 @@ #include "TKArray.h" #include "ErrorLog.h" -#include "ram.h" +#include "Ram.h" typedef struct geTKArray { 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 --- a/G3D/Actor/tkarray.h +++ b/G3D/TKArray.h @@ -34,8 +34,8 @@ Error conditions are reported to errorlog */ -#include "basetype.h" -#include "vfile.h" +#include "BaseType.h" +#include "VFile.h" #ifdef __cplusplus extern "C" { 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 --- a/G3D/Actor/tkevents.c +++ b/G3D/TKEvents.c @@ -29,12 +29,12 @@ */ #include #include +#include #include "TKEvents.h" #include "TKArray.h" #include "ErrorLog.h" -#include "ram.h" -#include "string.h" +#include "Ram.h" typedef struct { 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 --- a/G3D/Actor/tkevents.h +++ b/G3D/TKEvents.h @@ -31,8 +31,8 @@ Error conditions are reported to errorlog */ -#include "basetype.h" -#include "vfile.h" +#include "BaseType.h" +#include "VFile.h" #ifdef __cplusplus extern "C" { @@ -99,4 +99,4 @@ GENESISAPI geBoolean GENESISCC geTKEvents_GetExtents( -#endif // __TKEVENTS_H__ \ No newline at end of file +#endif // __TKEVENTS_H__ diff --git a/G3D/Timer.c b/G3D/Timer.c index 0e71a72..01b6816 100644 --- a/G3D/Timer.c +++ b/G3D/Timer.c @@ -20,9 +20,10 @@ /* */ /****************************************************************************************/ -#include "timer.h" +#include "Timer.h" -FILE * timerFP = stdout; +// FIXME: wtf? +//FILE * timerFP = stdout; int timerCount = 0; diff --git a/G3D/Timer.h b/G3D/Timer.h index 153e1c0..e732f83 100644 --- a/G3D/Timer.h +++ b/G3D/Timer.h @@ -24,7 +24,8 @@ /****************************************************************************************/ #include -#include "tsc.h" + +#include "TSC.h" #ifdef __cplusplus extern "C" { diff --git a/G3D/Trace.c b/G3D/Trace.c index 4271aa2..753beca 100644 --- a/G3D/Trace.c +++ b/G3D/Trace.c @@ -19,7 +19,7 @@ /* Copyright (C) 1999 WildTangent, Inc. All Rights Reserved */ /* */ /****************************************************************************************/ -#include +#include #include "XForm3d.h" #include "BaseType.h" @@ -2356,4 +2356,4 @@ geBoolean Trace_GetTexureName(geWorld *World, const geVec3d *Pos, const geVec3d return GE_FALSE; } -// end change texture name \ No newline at end of file +// end change texture name diff --git a/G3D/User.c b/G3D/User.c index 4b174dc..b4c30f7 100644 --- a/G3D/User.c +++ b/G3D/User.c @@ -19,8 +19,8 @@ /* Copyright (C) 1999 WildTangent, Inc. All Rights Reserved */ /* */ /****************************************************************************************/ -#include -#include +#include +#include #include "User.h" #include "World.h" @@ -32,9 +32,7 @@ #include "Camera.h" #include "Frustum.h" #include "Plane.h" - #include "DCommon.h" - #include "Bitmap._h" extern int32 MirrorRecursion; // GLOBAL!!! in World.c diff --git a/G3D/User.h b/G3D/User.h index f89fef6..ac7f2c2 100644 --- a/G3D/User.h +++ b/G3D/User.h @@ -25,15 +25,14 @@ #include #include -#include "G3D/BaseType.h" -#include "G3D/Vec3d.h" -#include "G3D/XForm3d.h" -#include "G3D/Camera.h" -#include "G3D/Genesis.h" +#include "BaseType.h" +#include "Vec3d.h" +#include "XForm3d.h" +#include "Camera.h" +#include "Genesis.h" #include "World.h" #include "Surface.h" - -#include "G3D/Engine/Drivers/DCommon.h" +#include "DCommon.h" #ifdef __cplusplus extern "C" { 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 --- a/G3D/Bitmap/Compression/utility.h +++ b/G3D/Utility.h @@ -23,12 +23,12 @@ /* */ /****************************************************************************************/ -#include "basetype.h" -#include "ram.h" -#include "errorlog.h" #include #include #include // for memcpy,memset +#include "BaseType.h" +#include "Ram.h" +#include "ErrorLog.h" #ifdef __cplusplus extern "C" { diff --git a/G3D/VFile._h b/G3D/VFile._h index 04f1771..1022a7e 100644 --- a/G3D/VFile._h +++ b/G3D/VFile._h @@ -22,8 +22,8 @@ #ifndef VFILE__H #define VFILE__H -#include "basetype.h" -#include "vfile.h" +#include "BaseType.h" +#include "VFile.h" typedef void * (GENESISCC *geVFile_FinderCreateFN)(geVFile *FileSystem, void *Handle, const char *FileSpec); typedef geBoolean (GENESISCC *geVFile_FinderGetNextFileFN)(void *Handle); diff --git a/G3D/VFile.c b/G3D/VFile.c index 78b685c..27913f3 100644 --- a/G3D/VFile.c +++ b/G3D/VFile.c @@ -21,21 +21,18 @@ /****************************************************************************************/ #define WIN32_LEAN_AND_MEAN #include - #include #include #include #include -#include "basetype.h" -#include "ram.h" - -#include "vfile.h" -#include "vfile._h" - -#include "fsdos.h" -#include "fsmemory.h" -#include "fsvfs.h" +#include "BaseType.h" +#include "Ram.h" +#include "VFile.h" +#include "VFile._h" +#include "FsDos.h" +#include "FsMemory.h" +#include "FsVfs.h" // // add include files for file types here 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 --- a/G3D/Actor/vkframe.c +++ b/G3D/VKFrame.c @@ -40,10 +40,10 @@ #include #include -#include "vec3d.h" -#include "vkframe.h" -#include "errorlog.h" -#include "ram.h" +#include "Vec3d.h" +#include "VKFrame.h" +#include "ErrorLog.h" +#include "Ram.h" #define LINEAR_BLEND(a,b,t) ( (t)*((b)-(a)) + (a) ) // linear blend of a and b 0a and t=1 ->b 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 --- a/G3D/Actor/vkframe.h +++ b/G3D/VKFrame.h @@ -40,7 +40,7 @@ #define GE_VKFRAME_H #include "TKArray.h" -#include "vfile.h" +#include "VFile.h" #ifdef __cplusplus extern "C" { @@ -112,15 +112,15 @@ void GENESISCC geVKFrame_HermiteRecompute( geBoolean GENESISCC geVKFrame_LinearRead(geVFile* pFile, void* geVKFrame); geBoolean GENESISCC geVKFrame_HermiteRead(geVFile* pFile, void* geVKFrame); -geBoolean GENESISCC geVKFrame_WriteToFile(geVFile *pFile, void *geVKFrame, +geBoolean GENESISCC geVKFrame_WriteToFile(geVFile *pFile, geTKArray *KeyList, geVKFrame_InterpolationType InterpolationType,int Looping); -geTKArray *GENESISCC geVKFrame_CreateFromFile(geVFile *pFile, geVKFrame_InterpolationType *InterpolationType, int *Looping); -geBoolean GENESISCC geVKFrame_WriteToBinaryFile(geVFile *pFile, void *geVKFrame, +geTKArray *GENESISCC geVKFrame_CreateFromFile(geVFile *pFile, int *InterpolationType, int *Looping); +geBoolean GENESISCC geVKFrame_WriteToBinaryFile(geVFile *pFile, geTKArray *KeyList, geVKFrame_InterpolationType InterpolationType, int Looping); -geTKArray *GENESISCC geVKFrame_CreateFromBinaryFile(geVFile *pFile, geVKFrame_InterpolationType *InterpolationType, int *Looping); +geTKArray *GENESISCC geVKFrame_CreateFromBinaryFile(geVFile *pFile, int *InterpolationType, int *Looping); #ifdef __cplusplus } #endif -#endif \ No newline at end of file +#endif diff --git a/G3D/Vec3d.c b/G3D/Vec3d.c index 219d5e1..29e908a 100644 --- a/G3D/Vec3d.c +++ b/G3D/Vec3d.c @@ -19,8 +19,9 @@ /* Copyright (C) 1999 WildTangent, Inc. All Rights Reserved */ /* */ /****************************************************************************************/ -#include +#include #include + #include "Vec3d.h" #define VCOMPARE_EPSILON (geFloat)0.0005 diff --git a/G3D/Vis.c b/G3D/Vis.c index 69a9894..79c1a97 100644 --- a/G3D/Vis.c +++ b/G3D/Vis.c @@ -19,7 +19,7 @@ /* Copyright (C) 1999 WildTangent, Inc. All Rights Reserved */ /* */ /****************************************************************************************/ -#include +#include #include "BaseType.h" #include "World.h" @@ -31,11 +31,10 @@ #include "Camera.h" #include "Frustum.h" #include "System.h" - #include "Fog.h" #ifdef _TSC -#include "tsc.h" +#include "TSC.h" #endif //#define SUPER_VIS1 diff --git a/G3D/WBitmap.c b/G3D/WBitmap.c index f5ece18..429cff1 100644 --- a/G3D/WBitmap.c +++ b/G3D/WBitmap.c @@ -19,15 +19,13 @@ /* Copyright (C) 1999 WildTangent, Inc. All Rights Reserved */ /* */ /****************************************************************************************/ -#include +#include -//===================================================================================== -//===================================================================================== #include "WBitmap.h" #include "GBSPFile.h" #include "Ram.h" #include "Bitmap.h" -#include "Errorlog.h" +#include "ErrorLog.h" #include "Bitmap._h" // NOTES - @@ -567,4 +565,4 @@ char *geWBitmap_Pool_GetWNameByBitmap(geWBitmap_Pool *Pool, const geBitmap *Bitm return NULL; } -// end change texture name \ No newline at end of file +// end change texture name 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 --- a/G3D/WgClip.c +++ b/G3D/WgClip.c @@ -28,11 +28,10 @@ #include #include -#include "genesis.h" -#include "basetype.h" -#include "extbox.h" - -#include "wgClip.h" +#include "Genesis.h" +#include "BaseType.h" +#include "ExtBox.h" +#include "WgClip.h" #pragma warning (disable:4514) // unreferenced inline function (caused by Windows) diff --git a/G3D/World.c b/G3D/World.c index a7314f4..698c5cb 100644 --- a/G3D/World.c +++ b/G3D/World.c @@ -19,9 +19,9 @@ /* Copyright (C) 1999 WildTangent, Inc. All Rights Reserved */ /* */ /****************************************************************************************/ -#include -#include - +#include +#include + #include "World.h" #include "System.h" #include "Ram.h" @@ -40,14 +40,10 @@ #include "Vis.h" #include "User.h" #include "VFile.h" - #include "Trace.h" - -#include "list.h" - +#include "List.h" #include "Bitmap.h" #include "Bitmap._h" - #include "Puppet.h" #include "Body.h" #include "Motion.h" diff --git a/G3D/World.h b/G3D/World.h index 0f80f76..34c5eda 100644 --- a/G3D/World.h +++ b/G3D/World.h @@ -22,20 +22,18 @@ #ifndef GE_WORLD_H #define GE_WORLD_H -#include "G3D/ErrorLog.h" -#include "G3D/PtrTypes.h" -#include "G3D/Genesis.h" +#include "ErrorLog.h" +#include "PtrTypes.h" +#include "Genesis.h" #include "GBSPFile.h" -#include "G3D/Motion.h" +#include "Motion.h" #include "Surface.h" #include "Fog.h" #include "WBitmap.h" #include "User.h" #include "Light.h" - -#include "G3D/Engine/BitmapList.h" - -#include "G3D/Actor.h" +#include "BitmapList.h" +#include "Actor.h" //MRB BEGIN //geSprite 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 --- a/G3D/Actor/xfarray.h +++ b/G3D/XFArray.h @@ -33,7 +33,7 @@ ...In the name of optimal access to the array. */ -#include "xform3d.h" +#include "XForm3d.h" #ifdef __cplusplus extern "C" { diff --git a/G3D/XForm3d.c b/G3D/XForm3d.c index f1adcca..fa44d4f 100644 --- 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 return; - _asm + // FIXME: asm code + /*_asm { mov ecx,Count // get item count mov esi,Source // get source array pointer @@ -454,7 +455,7 @@ Again: cmp ecx, 0 jne Again - } + }*/ // 34 cycles predicted (per loop) // 39 cycles measured 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 --- a/G3D/Bitmap/Compression/yuv.c +++ b/G3D/YUV.c @@ -1,6 +1,7 @@ -#include "yuv.h" -#include "utility.h" -#include +#include + +#include "YUV.h" +#include "Utility.h" /****************************************************************************************/ /* Yuv */ 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 --- a/G3D/Bitmap/Compression/yuv.h +++ b/G3D/YUV.h @@ -23,7 +23,7 @@ /* */ /****************************************************************************************/ -#include "basetype.h" +#include "BaseType.h" #ifdef __cplusplus extern "C" { diff --git a/GBSPLib/CMakeLists.txt b/GBSPLib/CMakeLists.txt index 9c8ef48..54d7611 100644 --- 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 --- a/GBSPLib/Portals.cpp +++ b/GBSPLib/Portals.cpp @@ -35,7 +35,7 @@ GBSP_Node *OutsideNode; geVec3d NodeMins, NodeMaxs; -geBoolean VisPortals; +geBoolean VPortals; geBoolean CreateAllOutsidePortals(GBSP_Node *Node); void GetNodeMinsMaxs(GBSP_Node *Node); @@ -89,7 +89,7 @@ geBoolean CreatePortals(GBSP_Node *RootNode, GBSP_Model *Model, geBoolean Vis) if (Verbose) GHook.Printf(" --- Create Portals --- \n"); - VisPortals = Vis; + VPortals = Vis; OutsideNode = &Model->OutsideNode; @@ -308,7 +308,7 @@ geBoolean PartitionPortals_r(GBSP_Node *Node) if (Node->PlaneNum == PLANENUM_LEAF) return GE_TRUE; - if (VisPortals && Node->Detail) // We can stop at detail seperators for the vis tree + if (VPortals && Node->Detail) // We can stop at detail seperators for the vis tree return GE_TRUE; //if (!InitializeNodePortal(Node))