Merge pull request #1570 from Areloch/SimPathTempRollback

Roll back the changes to simPath temporarily in order to merge in DX11

Engine/source/scene/simPath.cpp

@@ -273,7 +273,7 @@ DefineEngineMethod( Path, getPathId, S32, (),,
 //--------------------------------------------------------------------------
 
 GFXStateBlockRef Marker::smStateBlock;
-GFXVertexBufferHandle<GFXVertexPCT> Marker::smVertexBuffer;
+GFXVertexBufferHandle<GFXVertexPC> Marker::smVertexBuffer;
 GFXPrimitiveBufferHandle Marker::smPrimitiveBuffer;
 
 static Point3F wedgePoints[4] = {
@@ -295,14 +295,12 @@ void Marker::initGFXResources()
    smStateBlock = GFX->createStateBlock(d);
    
    smVertexBuffer.set(GFX, 4, GFXBufferTypeStatic);
-   GFXVertexPCT* verts = smVertexBuffer.lock();
-   verts[0].point = wedgePoints[0] * 1.25f;
-   verts[1].point = wedgePoints[1] * 1.25f;
-   verts[2].point = wedgePoints[2] * 1.25f;
-   verts[3].point = wedgePoints[3] * 1.25f;
-   verts[1].color = GFXVertexColor(ColorI(255, 0, 0, 255));
-   verts[0].color = verts[2].color = verts[3].color = GFXVertexColor(ColorI(0, 0, 255, 255));
-
+   GFXVertexPC* verts = smVertexBuffer.lock();
+   verts[0].point = wedgePoints[0] * 0.25f;
+   verts[1].point = wedgePoints[1] * 0.25f;
+   verts[2].point = wedgePoints[2] * 0.25f;
+   verts[3].point = wedgePoints[3] * 0.25f;
+   verts[0].color = verts[1].color = verts[2].color = verts[3].color = GFXVertexColor(ColorI(0, 255, 0, 255));
    smVertexBuffer.unlock();
    
    smPrimitiveBuffer.set(GFX, 24, 12, GFXBufferTypeStatic);
@@ -419,7 +417,7 @@ bool Marker::onAdd()
    if(!Parent::onAdd())
       return false;
 
-   mObjBox = Box3F(Point3F(-1.25, -1.25, -1.25), Point3F(1.25, 1.25, 1.25));
+   mObjBox = Box3F(Point3F(-.25, -.25, -.25), Point3F(.25, .25, .25));
    resetWorldBox();
 
    if(gEditingMission)

Engine/source/scene/simPath.h

@@ -132,7 +132,7 @@ class Marker : public SceneObject
    static void initGFXResources();
 
    static GFXStateBlockRef smStateBlock;
-   static GFXVertexBufferHandle<GFXVertexPCT> smVertexBuffer;
+   static GFXVertexBufferHandle<GFXVertexPC> smVertexBuffer;
    static GFXPrimitiveBufferHandle smPrimitiveBuffer;
 
   public: