Răsfoiți Sursa

Includes a formatting fix for the SimPath change to make it compatible with DX11.

Areloch 9 ani în urmă
părinte
comite
b9d8df5a4a
2 a modificat fișierele cu 3 adăugiri și 3 ștergeri
  1. 2 2
      Engine/source/scene/simPath.cpp
  2. 1 1
      Engine/source/scene/simPath.h

+ 2 - 2
Engine/source/scene/simPath.cpp

@@ -273,7 +273,7 @@ DefineEngineMethod( Path, getPathId, S32, (),,
 //--------------------------------------------------------------------------
 //--------------------------------------------------------------------------
 
 
 GFXStateBlockRef Marker::smStateBlock;
 GFXStateBlockRef Marker::smStateBlock;
-GFXVertexBufferHandle<GFXVertexPC> Marker::smVertexBuffer;
+GFXVertexBufferHandle<GFXVertexPCT> Marker::smVertexBuffer;
 GFXPrimitiveBufferHandle Marker::smPrimitiveBuffer;
 GFXPrimitiveBufferHandle Marker::smPrimitiveBuffer;
 
 
 static Point3F wedgePoints[4] = {
 static Point3F wedgePoints[4] = {
@@ -295,7 +295,7 @@ void Marker::initGFXResources()
    smStateBlock = GFX->createStateBlock(d);
    smStateBlock = GFX->createStateBlock(d);
    
    
    smVertexBuffer.set(GFX, 4, GFXBufferTypeStatic);
    smVertexBuffer.set(GFX, 4, GFXBufferTypeStatic);
-   GFXVertexPC* verts = smVertexBuffer.lock();
+   GFXVertexPCT* verts = smVertexBuffer.lock();
    verts[0].point = wedgePoints[0] * 1.25f;
    verts[0].point = wedgePoints[0] * 1.25f;
    verts[1].point = wedgePoints[1] * 1.25f;
    verts[1].point = wedgePoints[1] * 1.25f;
    verts[2].point = wedgePoints[2] * 1.25f;
    verts[2].point = wedgePoints[2] * 1.25f;

+ 1 - 1
Engine/source/scene/simPath.h

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