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

Merge branch 'Preview4_0' of https://github.com/TorqueGameEngines/Torque3D into kermithelpme

Browse source
This commit is contained in:
AzaezelX 2021-10-09 11:32:13 -05:00
commit e2e1c491ac
68 changed files with 171 additions and 167 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Engine/source/gfx/gl/gfxGLCubemap.cpp
View file

@ -308,7 +308,7 @@ U8* GFXGLCubemap::getTextureData(U32 face, U32 mip)
GFXGLCubemapArray::GFXGLCubemapArray()
{
mCubemap = NULL;
mCubemap = 0;
}
GFXGLCubemapArray::~GFXGLCubemapArray()

4
Engine/source/gfx/gl/gfxGLStateBlock.cpp
View file

@ -101,8 +101,8 @@ void GFXGLStateBlock::activate(const GFXGLStateBlock* oldState)
// the state value even if that value is identical to the current value.
#define STATE_CHANGE(state) (!oldState || oldState->mDesc.state != mDesc.state)
#define TOGGLE_STATE(state, enum) if(mDesc.state) glEnable(enum); else glDisable(enum)
#define CHECK_TOGGLE_STATE(state, enum) if(!oldState || oldState->mDesc.state != mDesc.state) if(mDesc.state) glEnable(enum); else glDisable(enum)
#define TOGGLE_STATE(state, enum) if(mDesc.state) { glEnable(enum); } else { glDisable(enum); }
#define CHECK_TOGGLE_STATE(state, enum) if(!oldState || oldState->mDesc.state != mDesc.state) { if(mDesc.state) { glEnable(enum); } else { glDisable(enum); }}
// Blending
CHECK_TOGGLE_STATE(blendEnable, GL_BLEND);

2
Engine/source/gfx/gl/gfxGLTextureArray.cpp
View file

@ -6,7 +6,7 @@
GFXGLTextureArray::GFXGLTextureArray()
{
mTextureArray = NULL;
mTextureArray = 0;
}
void GFXGLTextureArray::init()

2
Engine/source/gfx/gl/gfxGLTextureArray.h
View file

@ -13,7 +13,7 @@ public:
~GFXGLTextureArray() { Release(); };
void init();
void init() override;
void setToTexUnit(U32 tuNum) override;

2
Engine/source/gfx/gl/gfxGLTextureObject.cpp
View file

@ -46,7 +46,7 @@ GFXGLTextureObject::GFXGLTextureObject(GFXDevice * aDevice, GFXTextureProfile *p
{
#if TORQUE_DEBUG
mFrameAllocatorMarkGuard == FrameAllocator::getWaterMark();
mFrameAllocatorMarkGuard = FrameAllocator::getWaterMark();
#endif
dMemset(&mLockedRect, 0, sizeof(mLockedRect));