TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-02-13 19:53:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'Preview4_0' into alpha40translucency2

Browse source
This commit is contained in:
AzaezelX 2019-07-08 04:11:57 -05:00
commit 63be684474
1102 changed files with 205083 additions and 62836 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Engine/source/T3D/systems/render/meshRenderSystem.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);
};
};

2
Engine/source/renderInstance/renderProbeMgr.h
View file

@ -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;
}

7
Engine/source/shaderGen/HLSL/shaderFeatureHLSL.cpp
View file

@ -405,8 +405,11 @@ Var* ShaderFeatureHLSL::getInTexCoord( const char *name,
texCoord->setType( type );
}
AssertFatal( dStrcmp( type, (const char*)texCoord->type ) == 0,
"ShaderFeatureHLSL::getInTexCoord - Type mismatch!" );
//AssertFatal( dStrcmp( type, (const char*)texCoord->type ) == 0,
// "ShaderFeatureHLSL::getInTexCoord - Type mismatch!" );
if (dStrcmp(type, (const char*)texCoord->type) != 0)
return nullptr;
return texCoord;
}