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

Merge pull request #302 from thecelloman/movewater

Browse source 
Relocate water related assets.
This commit is contained in:
SilentMike 2013-04-04 11:16:08 -07:00
parent 0f76a1718f 6d7270c894
commit 93c7e1fb73
24 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

0
Templates/Empty/game/core/art/water/depthcolor_ramp.png → Templates/Empty/game/art/water/depthcolor_ramp.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 268 B

After

Width:  |  Height:  |  Size: 268 B

0
Templates/Empty/game/core/art/water/foam.dds → Templates/Empty/game/art/water/foam.dds
View file

0
Templates/Empty/game/core/art/water/ripple.dds → Templates/Empty/game/art/water/ripple.dds
View file

BIN
Templates/Empty/game/core/art/water/foam.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 11 KiB

BIN
Templates/Empty/game/core/art/water/lava_depthcolor_ramp.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 163 B

BIN
Templates/Empty/game/core/art/water/lava_foam.dds
View file

Binary file not shown.

BIN
Templates/Empty/game/core/art/water/river_depthcolor_ramp.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 242 B

BIN
Templates/Empty/game/core/art/water/riversuds.dds
View file

Binary file not shown.

BIN
Templates/Empty/game/core/art/water/riversuds.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 105 KiB

BIN
Templates/Empty/game/core/art/water/wateredge512.dds
View file

Binary file not shown.

6
Templates/Empty/game/tools/riverEditor/riverEditorGui.cs
View file

@ -76,10 +76,10 @@ function RiverEditorGui::createRiver( %this )
baseColor = "45 108 171 255"; baseColor = "45 108 171 255";
rippleTex = "core/art/water/ripple.dds"; rippleTex = "art/water/ripple.dds";
foamTex = "core/art/water/foam"; foamTex = "art/water/foam";
cubemap = "DefaultSkyCubemap"; cubemap = "DefaultSkyCubemap";
depthGradientTex = "core/art/water/depthcolor_ramp"; depthGradientTex = "art/water/depthcolor_ramp";
}; };
return %river; return %river;

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

@ -797,9 +797,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("rippleTex", "TypeImageFilename", "Ripple Texture", "core/art/water/ripple" ); %this.addField("rippleTex", "TypeImageFilename", "Ripple Texture", "art/water/ripple" );
%this.addField("depthGradientTex", "TypeImageFilename", "Depth Gradient Texture", "core/art/water/depthcolor_ramp" ); %this.addField("depthGradientTex", "TypeImageFilename", "Depth Gradient Texture", "art/water/depthcolor_ramp" );
%this.addField("foamTex", "TypeImageFilename", "Foam Texture", "core/art/water/foam" ); %this.addField("foamTex", "TypeImageFilename", "Foam Texture", "art/water/foam" );
%this.addField("cubemap", "TypeRealString", "Cubemap", "DefaultSkyCubemap" ); %this.addField("cubemap", "TypeRealString", "Cubemap", "DefaultSkyCubemap" );
} }

0
Templates/Full/game/core/art/water/depthcolor_ramp.png → Templates/Full/game/art/water/depthcolor_ramp.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 268 B

After

Width:  |  Height:  |  Size: 268 B

0
Templates/Full/game/core/art/water/foam.dds → Templates/Full/game/art/water/foam.dds
View file

0
Templates/Full/game/core/art/water/ripple.dds → Templates/Full/game/art/water/ripple.dds
View file

BIN
Templates/Full/game/core/art/water/foam.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 11 KiB

BIN
Templates/Full/game/core/art/water/lava_depthcolor_ramp.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 163 B

BIN
Templates/Full/game/core/art/water/lava_foam.dds
View file

Binary file not shown.

BIN
Templates/Full/game/core/art/water/river_depthcolor_ramp.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 242 B

BIN
Templates/Full/game/core/art/water/riversuds.dds
View file

Binary file not shown.

BIN
Templates/Full/game/core/art/water/riversuds.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 105 KiB

BIN
Templates/Full/game/core/art/water/wateredge512.dds
View file

Binary file not shown.

6
Templates/Full/game/tools/riverEditor/riverEditorGui.cs
View file

@ -76,10 +76,10 @@ function RiverEditorGui::createRiver( %this )
baseColor = "45 108 171 255"; baseColor = "45 108 171 255";
rippleTex = "core/art/water/ripple.dds"; rippleTex = "art/water/ripple.dds";
foamTex = "core/art/water/foam"; foamTex = "art/water/foam";
cubemap = "DefaultSkyCubemap"; cubemap = "DefaultSkyCubemap";
depthGradientTex = "core/art/water/depthcolor_ramp"; depthGradientTex = "art/water/depthcolor_ramp";
}; };
return %river; return %river;

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

@ -797,9 +797,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("rippleTex", "TypeImageFilename", "Ripple Texture", "core/art/water/ripple" ); %this.addField("rippleTex", "TypeImageFilename", "Ripple Texture", "art/water/ripple" );
%this.addField("depthGradientTex", "TypeImageFilename", "Depth Gradient Texture", "core/art/water/depthcolor_ramp" ); %this.addField("depthGradientTex", "TypeImageFilename", "Depth Gradient Texture", "art/water/depthcolor_ramp" );
%this.addField("foamTex", "TypeImageFilename", "Foam Texture", "core/art/water/foam" ); %this.addField("foamTex", "TypeImageFilename", "Foam Texture", "art/water/foam" );
%this.addField("cubemap", "TypeRealString", "Cubemap", "DefaultSkyCubemap" ); %this.addField("cubemap", "TypeRealString", "Cubemap", "DefaultSkyCubemap" );
} }