Force proper update of box probe when attenuation changes

Fixed multiple case sensitivity issues
Adds GL ARB check for cubemap arrays for certain cases where the driver only supports the extension, not as core
Fixes undeeded namespace declaration in an inline operator function
Cleaned up/reordered some modules default in the data dir
WIP of Das Boot test map
Begun refactoring visualizer tools
Added default cloud and water textures to core/rendering so water and cloud objects work correctly
Added default Fog_Cube mesh so volumetric fog works correctly
This commit is contained in:
Areloch 2019-08-19 01:14:34 -05:00
parent ab9fc302fc
commit 600859bd63
162 changed files with 1198 additions and 3160 deletions

View file

@ -35,7 +35,7 @@
#include "core/stream/fileStream.h"
#include "core/fileObject.h"
#include "core/resourceManager.h"
#include "console/simPersistId.h"
#include "console/simPersistID.h"
#include "T3D/gameFunctions.h"
#include "postFx/postEffect.h"
#include "renderInstance/renderProbeMgr.h"
@ -143,6 +143,12 @@ void BoxEnvironmentProbe::unpackUpdate(NetConnection *conn, BitStream *stream)
if (stream->readFlag()) // StaticDataMask
{
stream->read(&mAtten);
mDirty = true;
}
if (mDirty)
{
updateProbeParams();
}
}

View file

@ -35,7 +35,7 @@
#include "core/stream/fileStream.h"
#include "core/fileObject.h"
#include "core/resourceManager.h"
#include "console/simPersistId.h"
#include "console/simPersistID.h"
#include "T3D/gameFunctions.h"
#include "postFx/postEffect.h"
#include "renderInstance/renderProbeMgr.h"

View file

@ -35,7 +35,7 @@
#include "core/stream/fileStream.h"
#include "core/fileObject.h"
#include "core/resourceManager.h"
#include "console/simPersistId.h"
#include "console/simPersistID.h"
#include "T3D/gameFunctions.h"
#include "postFx/postEffect.h"
#include "renderInstance/renderProbeMgr.h"

View file

@ -35,7 +35,7 @@
#include "core/stream/fileStream.h"
#include "core/fileObject.h"
#include "core/resourceManager.h"
#include "console/simPersistId.h"
#include "console/simPersistID.h"
#include "T3D/gameFunctions.h"
#include "postFx/postEffect.h"
#include "renderInstance/renderProbeMgr.h"

View file

@ -1,6 +1,6 @@
#pragma once
#include "scene/sceneRenderState.h"
#include "core/util/SystemInterfaceList.h"
#include "core/util/systemInterfaceList.h"
#include "ts/tsShape.h"
#include "ts/tsShapeInstance.h"
#include "T3D/assets/ShapeAsset.h"
@ -59,4 +59,4 @@ public:
//Render our particular interface's data
static void renderInterface(U32 interfaceIndex, SceneRenderState* state);
};
};

View file

@ -1,5 +1,5 @@
#pragma once
#include "core/util/SystemInterfaceList.h"
#include "core/util/systemInterfaceList.h"
class UpdateSystemInterface : public SystemInterface<UpdateSystemInterface>
{
@ -13,4 +13,4 @@ public:
static void processTick();
static void advanceTime(U32 _tickMS);
static void interpolateTick(U32 _deltaMS);
};
};

View file

@ -1008,20 +1008,34 @@ bool GFXGLShader::_loadShaderFromStream( GLuint shader,
Vector<U32> lengths;
// The GLSL version declaration must go first!
const char *versionDecl = "#version 400\r\n";
buffers.push_back( dStrdup( versionDecl ) );
lengths.push_back( dStrlen( versionDecl ) );
if(GFXGL->mCapabilities.shaderModel5)
char* versionDecl = "#version 150\r\n";
if (!gglHasExtension(ARB_texture_cube_map_array))
{
const char *extension = "#extension GL_ARB_gpu_shader5 : enable\r\n";
buffers.push_back( dStrdup( extension ) );
lengths.push_back( dStrlen( extension ) );
Con::errorf("ARB_texture_cube_map_array not found. attempting to use 4.0 core");
versionDecl = "#version 400\r\n";
buffers.push_back(dStrdup(versionDecl));
lengths.push_back(dStrlen(versionDecl));
}
else
{
Con::errorf("Attempting to use 3.2 core with ARB_texture_cube_map_array ");
buffers.push_back(dStrdup(versionDecl));
lengths.push_back(dStrlen(versionDecl));
const char* extension = "#extension GL_ARB_texture_cube_map_array : enable\r\n";
buffers.push_back(dStrdup(extension));
lengths.push_back(dStrlen(extension));
}
const char *newLine = "\r\n";
buffers.push_back( dStrdup( newLine ) );
lengths.push_back( dStrlen( newLine ) );
if (GFXGL->mCapabilities.shaderModel5)
{
const char* extension = "#extension GL_ARB_gpu_shader5 : enable\r\n";
buffers.push_back(dStrdup(extension));
lengths.push_back(dStrlen(extension));
}
const char* newLine = "\r\n";
buffers.push_back(dStrdup(newLine));
lengths.push_back(dStrlen(newLine));
// Now add all the macros.
for( U32 i = 0; i < macros.size(); i++ )

View file

@ -39,7 +39,7 @@
#include "gfx/gfxVertexBuffer.h"
#endif
#include "core/util/SystemInterfaceList.h"
#include "core/util/systemInterfaceList.h"
#ifndef _MATERIALS_PROCESSEDSHADERMATERIAL_H_
#include "materials/processedShaderMaterial.h"
@ -126,7 +126,7 @@ public:
void clear();
inline bool ProbeRenderInst::operator ==(const ProbeRenderInst& b) const
inline bool operator ==(const ProbeRenderInst& b) const
{
return mProbeIdx == b.mProbeIdx;
}

View file

@ -20,7 +20,7 @@
// IN THE SOFTWARE.
//-----------------------------------------------------------------------------
#include "shadergen/CustomShaderFeature.h"
#include "shadergen/customShaderFeature.h"
#ifdef TORQUE_D3D11
#include "shaderGen/HLSL/customFeatureHLSL.h"