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

Fix push/pop mismatch bug;add code to properly rotate, translate and render needle.

Browse source
This commit is contained in:
yourarcade 2016-09-25 17:48:27 -07:00
parent 213b7020a3
commit 8d610787a2
1 changed files with 24 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

47
Engine/source/T3D/vehicles/guiSpeedometer.cpp
View file

@ -19,11 +19,11 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
// IN THE SOFTWARE. // IN THE SOFTWARE.
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
#include "gui/controls/guiBitmapCtrl.h" #include "gui/controls/guiBitmapCtrl.h"
#include "console/consoleTypes.h" #include "console/consoleTypes.h"
#include "T3D/gameBase/gameConnection.h" #include "T3D/gameBase/gameConnection.h"
#include "T3D/vehicles/vehicle.h" #include "T3D/vehicles/vehicle.h"
#include "T3D/player.h"
#include "gfx/primBuilder.h" #include "gfx/primBuilder.h"
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
@ -173,23 +173,31 @@ void GuiSpeedometerHud::onRender(Point2I offset, const RectI &updateRect)
if (mSpeed > mMaxSpeed) if (mSpeed > mMaxSpeed)
mSpeed = mMaxSpeed; mSpeed = mMaxSpeed;
// Render the needle // Calculate center point if necessary and roll in offsets
GFX->pushWorldMatrix();
Point2F center = mCenter; Point2F center = mCenter;
if (mIsZero(center.x) && mIsZero(center.y)) if (mIsZero(center.x) && mIsZero(center.y))
{ {
center.x = getExtent().x / 2.0f; center.x = getExtent().x / 2.0f;
center.y = getExtent().y / 2.0f; center.y = getExtent().y / 2.0f;
} }
MatrixF newMat(1); F32 fillOffset = GFX->getFillConventionOffset(); // Find the fill offset
Point2F viewCenter(offset.x + fillOffset + center.x, offset.y + fillOffset + center.y);
newMat.setPosition(Point3F(getLeft() + center.x, getTop() + center.y, 0.0f)); // Handle rotation calculations
F32 rotation, spinAngle;
F32 rotation = mMinAngle + (mMaxAngle - mMinAngle) * (mSpeed / mMaxSpeed); rotation = mMinAngle + (mMaxAngle - mMinAngle) * (mSpeed / mMaxSpeed);
AngAxisF newRot(Point3F(0.0f,0.0f,-1.0f), rotation); spinAngle = mDegToRad(rotation);
MatrixF rotMatrix(EulerF(0.0, 0.0, spinAngle));
newRot.setMatrix(&newMat);
// Set up the needle vertex list
Point3F vertList[5];
vertList[0].set(+mNeedleLength,-mNeedleWidth,0);
vertList[1].set(+mNeedleLength,+mNeedleWidth,0);
vertList[2].set(-mTailLength ,+mNeedleWidth,0);
vertList[3].set(-mTailLength ,-mNeedleWidth,0);
vertList[4].set(+mNeedleLength,-mNeedleWidth,0); //// Get back to the start!
// Create a GFXStateBlock description if one has not been set.
if (mBlendSB.isNull()) if (mBlendSB.isNull())
{ {
GFXStateBlockDesc desc; GFXStateBlockDesc desc;
@ -198,22 +206,15 @@ void GuiSpeedometerHud::onRender(Point2I offset, const RectI &updateRect)
desc.samplers[0].textureColorOp = GFXTOPDisable; desc.samplers[0].textureColorOp = GFXTOPDisable;
mBlendSB = GFX->createStateBlock(desc); mBlendSB = GFX->createStateBlock(desc);
} }
GFX->setStateBlock(mBlendSB); GFX->setStateBlock(mBlendSB);
GFX->setTexture(0, NULL); GFX->setTexture(0, NULL);
PrimBuild::begin(GFXLineStrip, 5); // Render the needle
PrimBuild::color4f(mColor.red, mColor.green, mColor.blue, mColor.alpha); PrimBuild::color4f(mColor.red, mColor.green, mColor.blue, mColor.alpha);
PrimBuild::begin(GFXLineStrip, 5);
PrimBuild::vertex2f(+mNeedleLength,-mNeedleWidth); for(int k=0; k<5; k++){
PrimBuild::vertex2f(+mNeedleLength,+mNeedleWidth); rotMatrix.mulP(vertList[k]);
PrimBuild::vertex2f(-mTailLength ,+mNeedleWidth); PrimBuild::vertex2f(vertList[k].x + viewCenter.x, vertList[k].y + viewCenter.y);
PrimBuild::vertex2f(-mTailLength ,-mNeedleWidth); }
//// Get back to the start!
PrimBuild::vertex2f(+mNeedleLength,-mNeedleWidth);
PrimBuild::end(); PrimBuild::end();
} }