This commit is contained in:
Daveo 2001-04-30 21:49:54 +00:00
parent a115ed8b39
commit b31a2e39dc
52 changed files with 1841 additions and 886 deletions

View file

@ -26,6 +26,7 @@
#include "LayerPlatform.h"
#include "LayerTrigger.h"
#include "LayerFX.h"
#include "LayerHazard.h"
#include "LayerDef.h"
#include "Utils.h"
@ -45,6 +46,7 @@ sLayerInfoTable CLayer::InfoTable[]=
{LAYER_TYPE_PLATFORM, LAYER_SUBTYPE_NONE, "Platform", true, 1.0f, false, true, true, LAYER_SUBVIEW_NONE,},
{LAYER_TYPE_TRIGGER, LAYER_SUBTYPE_NONE, "Trigger", true, 1.0f, false, true, true, LAYER_SUBVIEW_NONE,},
{LAYER_TYPE_FX, LAYER_SUBTYPE_NONE, "FX", true, 1.0f, false, true, true, LAYER_SUBVIEW_NONE,},
{LAYER_TYPE_HAZARD, LAYER_SUBTYPE_NONE, "Hazard", true, 1.0f, false, true, true, LAYER_SUBVIEW_NONE,},
};
int CLayer::InfoTableSize=sizeof(InfoTable)/sizeof(sLayerInfoTable);
@ -100,6 +102,9 @@ CLayer *New;
case LAYER_TYPE_FX:
New=new CLayerFX(Def);
break;
case LAYER_TYPE_HAZARD:
New=new CLayerHazard(Def);
break;
default:
ASSERT(!"Unknown Layer");
}
@ -140,6 +145,9 @@ CLayer *New;
case LAYER_TYPE_FX:
New=new CLayerFX(File,Version);
break;
case LAYER_TYPE_HAZARD:
New=new CLayerHazard(File,Version);
break;
default:
ASSERT(!"Unknown Layer");
}
@ -195,6 +203,7 @@ Vector3 &Scale=Core->GetScaleVector();
float Col;
const float OverVal=0.1f;
if (GetType()>LAYER_TYPE_COLLISION) return;
glMatrixMode(GL_MODELVIEW);
glPushMatrix();
glLoadIdentity();