AxioDL/PrimeWorldEditor
2
0
Fork 0
mirror of https://github.com/AxioDL/PrimeWorldEditor.git synced 2025-12-20 18:29:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Set up CCamera, CLight, and CSceneNode to use mutable members for caching; modified CSceneNode to allow subclasses to change how transform is calculated

Browse Source
This commit is contained in:
parax0
2015-12-06 21:23:52 -07:00
parent c260e547c9
commit 0da183b161
14 changed files with 291 additions and 234 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
Resource/CLight.cpp
View File

@@ -12,15 +12,15 @@ CLight::CLight()
mDirection = skDefaultLightDir;
mDistAttenCoefficients = CVector3f(0.f, 1.f, 0.f);
mAngleAttenCoefficients = CVector3f(0.f, 1.f, 0.f);
mRadius = 0.f;
mIntensity = 0.f;
mFlags = CLIGHT_NO_RADIUS | CLIGHT_NO_INTENSITY;
mCachedRadius = 0.f;
mCachedIntensity = 0.f;
mDirtyFlags = CLIGHT_NO_RADIUS | CLIGHT_NO_INTENSITY;
}
// ************ DATA MANIPULATION ************
// This function is reverse engineered from the kiosk demo's code
float CLight::CalculateRadius()
float CLight::CalculateRadius() const
{
if ((mDistAttenCoefficients.y >= FLT_EPSILON) ||
(mDistAttenCoefficients.z >= FLT_EPSILON))
@@ -53,7 +53,7 @@ float CLight::CalculateRadius()
}
// This function is also reverse engineered from the kiosk demo's code
float CLight::CalculateIntensity()
float CLight::CalculateIntensity() const
{
float Multiplier = (mType == eCustom) ? mAngleAttenCoefficients.x : 1.0f;
float ColorR = float(mColor.r) / 255.f;
@@ -118,26 +118,26 @@ CVector3f CLight::GetAngleAttenuation() const
return mAngleAttenCoefficients;
}
float CLight::GetRadius()
float CLight::GetRadius() const
{
if (mFlags & CLIGHT_NO_RADIUS)
if (mDirtyFlags & CLIGHT_NO_RADIUS)
{
mRadius = CalculateRadius();
mFlags &= ~CLIGHT_NO_RADIUS;
mCachedRadius = CalculateRadius();
mDirtyFlags &= ~CLIGHT_NO_RADIUS;
}
return mRadius * 2;
return mCachedRadius * 2;
}
float CLight::GetIntensity()
float CLight::GetIntensity() const
{
if (mFlags & CLIGHT_NO_INTENSITY)
if (mDirtyFlags & CLIGHT_NO_INTENSITY)
{
mIntensity = CalculateIntensity();
mFlags &= ~CLIGHT_NO_INTENSITY;
mCachedIntensity = CalculateIntensity();
mDirtyFlags &= ~CLIGHT_NO_INTENSITY;
}
return mIntensity;
return mCachedIntensity;
}
// ************ SETTERS ************
@@ -159,7 +159,7 @@ void CLight::SetDirection(const CVector3f& Direction)
void CLight::SetColor(const CColor& Color)
{
mColor = Color;
mFlags = CLIGHT_NO_RADIUS | CLIGHT_NO_INTENSITY;
mDirtyFlags = CLIGHT_NO_RADIUS | CLIGHT_NO_INTENSITY;
}
void CLight::SetSpotCutoff(float Cutoff)

21
Resource/CLight.h
View File

@@ -6,12 +6,9 @@
#include <Common/CVector3f.h>
#include <GL/glew.h>
/**
* CLight is currently heavily based on the lights system from Metroid Prime,
/* CLight is currently heavily based on the lights system from Metroid Prime,
* including code reverse engineered from the game's executable. Not yet sure
* how much needs to be modified to properly support Prime 3 and DKCR; they
* have a new light structure.
*/
* how much needs to be modified to properly support DKCR. */
enum ELightType
{
eLocalAmbient = 0,
@@ -31,17 +28,17 @@ class CLight
CVector3f mDistAttenCoefficients;
CVector3f mAngleAttenCoefficients;
float mRadius;
float mIntensity;
u8 mFlags;
mutable float mCachedRadius;
mutable float mCachedIntensity;
mutable u8 mDirtyFlags;
public:
CLight();
private:
// Data Manipulation
float CalculateRadius();
float CalculateIntensity();
float CalculateRadius() const;
float CalculateIntensity() const;
CVector3f CalculateSpotAngleAtten();
public:
@@ -53,8 +50,8 @@ public:
CColor GetColor() const;
CVector3f GetDistAttenuation() const;
CVector3f GetAngleAttenuation() const;
float GetRadius();
float GetIntensity();
float GetRadius() const;
float GetIntensity() const;
// Setters
void SetLayer(u32 index);