TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-04-29 16:25:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1569 from Areloch/SimPathDX11Fix

Browse source 
Fix for SimPath to make DX11 compatible.
This commit is contained in:
Areloch 2016-03-28 22:48:24 -05:00
commit b9b11047bf
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Engine/source/scene/simPath.cpp
View file

@ -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;

2
Engine/source/scene/simPath.h
View file

@ -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: