mirror of
https://github.com/TorqueGameEngines/Torque3D.git
synced 2026-07-13 15:44:36 +00:00
code review with az
changes per review, frustum wasnt dirty... i like it dirty
This commit is contained in:
parent
e7a7935bd4
commit
a92b9d0e2d
3 changed files with 34 additions and 2 deletions
|
|
@ -35,6 +35,7 @@
|
||||||
#include "scene/sceneRenderState.h"
|
#include "scene/sceneRenderState.h"
|
||||||
#include "renderInstance/renderProbeMgr.h"
|
#include "renderInstance/renderProbeMgr.h"
|
||||||
#include "T3D/lighting/skylight.h"
|
#include "T3D/lighting/skylight.h"
|
||||||
|
#include "gfx/gfxDrawUtil.h"
|
||||||
|
|
||||||
// GuiMaterialPreview
|
// GuiMaterialPreview
|
||||||
GuiMaterialPreview::GuiMaterialPreview()
|
GuiMaterialPreview::GuiMaterialPreview()
|
||||||
|
|
@ -370,7 +371,6 @@ void GuiMaterialPreview::renderWorld(const RectI &updateRect)
|
||||||
bool isOrtho;
|
bool isOrtho;
|
||||||
GFX->getFrustum( &left, &right, &bottom, &top, &nearPlane, &farPlane, &isOrtho);
|
GFX->getFrustum( &left, &right, &bottom, &top, &nearPlane, &farPlane, &isOrtho);
|
||||||
mSaveFrustum = Frustum( isOrtho, left, right, bottom, top, nearPlane, farPlane, MatrixF::Identity );
|
mSaveFrustum = Frustum( isOrtho, left, right, bottom, top, nearPlane, farPlane, MatrixF::Identity );
|
||||||
mSaveFrustum.setTransform(MatrixF::Identity);
|
|
||||||
|
|
||||||
mSaveProjection = GFX->getProjectionMatrix();
|
mSaveProjection = GFX->getProjectionMatrix();
|
||||||
mSaveWorldToScreenScale = GFX->getWorldToScreenScale();
|
mSaveWorldToScreenScale = GFX->getWorldToScreenScale();
|
||||||
|
|
@ -426,12 +426,43 @@ void GuiMaterialPreview::renderWorld(const RectI &updateRect)
|
||||||
|
|
||||||
renderPass->renderPass( &state );
|
renderPass->renderPass( &state );
|
||||||
|
|
||||||
|
if (mMouseState == MovingLight)
|
||||||
|
{
|
||||||
|
renderSunDirection();
|
||||||
|
}
|
||||||
|
|
||||||
gClientSceneGraph->setFogData( savedFogData ); // restore fog setting
|
gClientSceneGraph->setFogData( savedFogData ); // restore fog setting
|
||||||
|
|
||||||
// Make sure to remove our fake sun
|
// Make sure to remove our fake sun
|
||||||
LIGHTMGR->unregisterAllLights();
|
LIGHTMGR->unregisterAllLights();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void GuiMaterialPreview::renderSunDirection() const
|
||||||
|
{
|
||||||
|
// Render four arrows aiming in the direction of the sun's light
|
||||||
|
ColorI color = LinearColorF(mFakeSun->getColor()).toColorI();
|
||||||
|
F32 length = mModel->getShape()->mBounds.len() * 0.8f;
|
||||||
|
|
||||||
|
// Get the sun's vectors
|
||||||
|
Point3F fwd = mFakeSun->getTransform().getForwardVector();
|
||||||
|
Point3F up = mFakeSun->getTransform().getUpVector() * length / 8;
|
||||||
|
Point3F right = mFakeSun->getTransform().getRightVector() * length / 8;
|
||||||
|
|
||||||
|
// Calculate the start and end points of the first arrow (bottom left)
|
||||||
|
Point3F start = mModel->getShape()->center - fwd * length - up / 2 - right / 2;
|
||||||
|
Point3F end = mModel->getShape()->center - fwd * length / 3 - up / 2 - right / 2;
|
||||||
|
|
||||||
|
GFXStateBlockDesc desc;
|
||||||
|
desc.setZReadWrite(true, true);
|
||||||
|
|
||||||
|
GFXDrawUtil* drawUtil = GFX->getDrawUtil();
|
||||||
|
|
||||||
|
drawUtil->drawArrow(desc, start, end, color);
|
||||||
|
drawUtil->drawArrow(desc, start + up, end + up, color);
|
||||||
|
drawUtil->drawArrow(desc, start + right, end + right, color);
|
||||||
|
drawUtil->drawArrow(desc, start + up + right, end + up + right, color);
|
||||||
|
}
|
||||||
|
|
||||||
// Make sure the orbit distance is within the acceptable range.
|
// Make sure the orbit distance is within the acceptable range.
|
||||||
void GuiMaterialPreview::setOrbitDistance(F32 distance)
|
void GuiMaterialPreview::setOrbitDistance(F32 distance)
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -75,7 +75,7 @@ protected:
|
||||||
Point2I mLastMousePoint;
|
Point2I mLastMousePoint;
|
||||||
|
|
||||||
LightInfo* mFakeSun;
|
LightInfo* mFakeSun;
|
||||||
|
void renderSunDirection() const;
|
||||||
public:
|
public:
|
||||||
bool onWake() override;
|
bool onWake() override;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -81,6 +81,7 @@ Frustum::Frustum( bool isOrtho,
|
||||||
|
|
||||||
mProjectionOffset.zero();
|
mProjectionOffset.zero();
|
||||||
mProjectionOffsetMatrix.identity();
|
mProjectionOffsetMatrix.identity();
|
||||||
|
mDirty = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
//-----------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue