Merge pull request #302 from thecelloman/movewater

Relocate water related assets.

Templates/Empty/game/tools/riverEditor/riverEditorGui.cs

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

Templates/Empty/game/tools/worldEditor/gui/objectBuilderGui.ed.gui

@@ -797,9 +797,9 @@ function ObjectBuilderGui::addWaterObjectFields(%this)
    %this.addField("waveSpeed[2]", "TypeFloat", "Wave Speed", "1");
    %this.addField("overallWaveMagnitude", "TypeFloat", "Overall Wave Magnitude", "1.0");
    
-   %this.addField("rippleTex", "TypeImageFilename", "Ripple Texture", "core/art/water/ripple" );
-   %this.addField("depthGradientTex", "TypeImageFilename", "Depth Gradient Texture", "core/art/water/depthcolor_ramp" );
-   %this.addField("foamTex", "TypeImageFilename", "Foam Texture", "core/art/water/foam" );
+   %this.addField("rippleTex", "TypeImageFilename", "Ripple Texture", "art/water/ripple" );
+   %this.addField("depthGradientTex", "TypeImageFilename", "Depth Gradient Texture", "art/water/depthcolor_ramp" );
+   %this.addField("foamTex", "TypeImageFilename", "Foam Texture", "art/water/foam" );
    %this.addField("cubemap", "TypeRealString", "Cubemap", "DefaultSkyCubemap" );
 }
 

Templates/Full/game/tools/riverEditor/riverEditorGui.cs

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

Templates/Full/game/tools/worldEditor/gui/objectBuilderGui.ed.gui

@@ -797,9 +797,9 @@ function ObjectBuilderGui::addWaterObjectFields(%this)
    %this.addField("waveSpeed[2]", "TypeFloat", "Wave Speed", "1");
    %this.addField("overallWaveMagnitude", "TypeFloat", "Overall Wave Magnitude", "1.0");
    
-   %this.addField("rippleTex", "TypeImageFilename", "Ripple Texture", "core/art/water/ripple" );
-   %this.addField("depthGradientTex", "TypeImageFilename", "Depth Gradient Texture", "core/art/water/depthcolor_ramp" );
-   %this.addField("foamTex", "TypeImageFilename", "Foam Texture", "core/art/water/foam" );
+   %this.addField("rippleTex", "TypeImageFilename", "Ripple Texture", "art/water/ripple" );
+   %this.addField("depthGradientTex", "TypeImageFilename", "Depth Gradient Texture", "art/water/depthcolor_ramp" );
+   %this.addField("foamTex", "TypeImageFilename", "Foam Texture", "art/water/foam" );
    %this.addField("cubemap", "TypeRealString", "Cubemap", "DefaultSkyCubemap" );
 }