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

always cleanup -_-

Browse source
This commit is contained in:
marauder2k7 2025-03-27 09:11:40 +00:00
parent ea49af52a5
commit fad397d914
2 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Engine/source/materials/materialManager.h
View file

@ -113,6 +113,10 @@ public:
/// procedural shaders have been flushed. /// procedural shaders have been flushed.
typedef Signal<void()> FlushSignal; typedef Signal<void()> FlushSignal;
/// Returns the signal used to notify systems that the
/// procedural shaders have been flushed.
FlushSignal& getFlushSignal() { return mFlushSignal; }
/// Flushes all the procedural shaders and re-initializes all /// Flushes all the procedural shaders and re-initializes all
/// the active materials instances immediately. /// the active materials instances immediately.
void flushAndReInitInstances(); void flushAndReInitInstances();

6
Templates/BaseGame/game/tools/worldEditor/gui/objectBuilderGui.ed.gui
View file

@ -1282,9 +1282,9 @@ function ObjectBuilderGui::addWaterObjectFields(%this)
%this.addField("waveSpeed[2]", "TypeFloat", "Wave Speed", "1"); %this.addField("waveSpeed[2]", "TypeFloat", "Wave Speed", "1");
%this.addField("overallWaveMagnitude", "TypeFloat", "Overall Wave Magnitude", "1.0"); %this.addField("overallWaveMagnitude", "TypeFloat", "Overall Wave Magnitude", "1.0");
%this.addField("RippleTexAsset", "TypeImageAssetPtrRefactor", "Ripple Texture", "Core_Rendering:ripple_image" ); %this.addField("RippleTexAsset", "TypeImageAssetPtr", "Ripple Texture", "Core_Rendering:ripple_image" );
%this.addField("DepthGradientTexAsset", "TypeImageAssetPtrRefactor", "Depth Gradient Texture", "Core_Rendering:depthcolor_ramp_image" ); %this.addField("DepthGradientTexAsset", "TypeImageAssetPtr", "Depth Gradient Texture", "Core_Rendering:depthcolor_ramp_image" );
%this.addField("FoamTexAsset", "TypeImageAssetPtrRefactor", "Foam Texture", "Core_Rendering:foam_image" ); %this.addField("FoamTexAsset", "TypeImageAssetPtr", "Foam Texture", "Core_Rendering:foam_image" );
} }
function ObjectBuilderGui::buildWaterBlock(%this) function ObjectBuilderGui::buildWaterBlock(%this)