TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-13 15:44:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge pull request #1556 from Azaezel/splineSpelunking

Browse source 
Path editor display augmentations.
This commit is contained in:
Anis 2016-03-22 12:57:49 +01:00
commit 935bddca35
2 changed files with 14 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Engine/source/gui/worldEditor/worldEditor.cpp
View file

@ -1303,7 +1303,7 @@ void WorldEditor::renderObjectFace(SceneObject * obj, const VectorF & normal, co
PrimBuild::color( col ); PrimBuild::color( col );
PrimBuild::begin( GFXTriangleFan, 4 ); PrimBuild::begin( GFXTriangleStrip, 4 );
for(U32 k = 0; k < 4; k++) for(U32 k = 0; k < 4; k++)
{ {
PrimBuild::vertex3f(projPnts[k].x, projPnts[k].y, projPnts[k].z); PrimBuild::vertex3f(projPnts[k].x, projPnts[k].y, projPnts[k].z);
@ -1492,7 +1492,7 @@ void WorldEditor::renderSplinePath(SimPath::Path *path)
F32 tmpT = t; F32 tmpT = t;
while (tmpT < size - 1) while (tmpT < size - 1)
{ {
tmpT = spline.advanceDist(tmpT, 4.0f); tmpT = spline.advanceDist(tmpT, 1.0f);
vCount++; vCount++;
} }
@ -1514,7 +1514,7 @@ void WorldEditor::renderSplinePath(SimPath::Path *path)
{ {
CameraSpline::Knot k; CameraSpline::Knot k;
spline.value(t, &k); spline.value(t, &k);
t = spline.advanceDist(t, 4.0f); t = spline.advanceDist(t, 1.0f);
k.mRotation.mulP(a, &vb[vIdx+0].point); k.mRotation.mulP(a, &vb[vIdx+0].point);
k.mRotation.mulP(b, &vb[vIdx+1].point); k.mRotation.mulP(b, &vb[vIdx+1].point);
@ -1524,9 +1524,9 @@ void WorldEditor::renderSplinePath(SimPath::Path *path)
vb[vIdx+1].point += k.mPosition; vb[vIdx+1].point += k.mPosition;
vb[vIdx+2].point += k.mPosition; vb[vIdx+2].point += k.mPosition;
vb[vIdx+0].color.set(0, 255, 0, 100); vb[vIdx+0].color.set(0, 255, 0, 0);
vb[vIdx+1].color.set(0, 255, 0, 100); vb[vIdx+1].color.set(0, 255, 0, 255);
vb[vIdx+2].color.set(0, 255, 0, 100); vb[vIdx+2].color.set(0, 255, 0, 0);
// vb[vIdx+3] = vb[vIdx+1]; // vb[vIdx+3] = vb[vIdx+1];

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

@ -296,11 +296,13 @@ void Marker::initGFXResources()
smVertexBuffer.set(GFX, 4, GFXBufferTypeStatic); smVertexBuffer.set(GFX, 4, GFXBufferTypeStatic);
GFXVertexPC* verts = smVertexBuffer.lock(); GFXVertexPC* verts = smVertexBuffer.lock();
verts[0].point = wedgePoints[0] * 0.25f; verts[0].point = wedgePoints[0] * 1.25f;
verts[1].point = wedgePoints[1] * 0.25f; verts[1].point = wedgePoints[1] * 1.25f;
verts[2].point = wedgePoints[2] * 0.25f; verts[2].point = wedgePoints[2] * 1.25f;
verts[3].point = wedgePoints[3] * 0.25f; verts[3].point = wedgePoints[3] * 1.25f;
verts[0].color = verts[1].color = verts[2].color = verts[3].color = GFXVertexColor(ColorI(0, 255, 0, 255)); verts[1].color = GFXVertexColor(ColorI(255, 0, 0, 255));
verts[0].color = verts[2].color = verts[3].color = GFXVertexColor(ColorI(0, 0, 255, 255));
smVertexBuffer.unlock(); smVertexBuffer.unlock();
smPrimitiveBuffer.set(GFX, 24, 12, GFXBufferTypeStatic); smPrimitiveBuffer.set(GFX, 24, 12, GFXBufferTypeStatic);
@ -417,7 +419,7 @@ bool Marker::onAdd()
if(!Parent::onAdd()) if(!Parent::onAdd())
return false; return false;
mObjBox = Box3F(Point3F(-.25, -.25, -.25), Point3F(.25, .25, .25)); mObjBox = Box3F(Point3F(-1.25, -1.25, -1.25), Point3F(1.25, 1.25, 1.25));
resetWorldBox(); resetWorldBox();
if(gEditingMission) if(gEditingMission)