Browse Source

Relocate water related assets.

Also remove duplication, favoring DDS over other formats.
thecelloman 12 năm trước cách đây
mục cha
commit
6d7270c894
24 tập tin đã thay đổi với 12 bổ sung12 xóa
  1. 0 0
      Templates/Empty/game/art/water/depthcolor_ramp.png
  2. 0 0
      Templates/Empty/game/art/water/foam.dds
  3. 0 0
      Templates/Empty/game/art/water/ripple.dds
  4. BIN
      Templates/Empty/game/core/art/water/foam.png
  5. BIN
      Templates/Empty/game/core/art/water/lava_depthcolor_ramp.png
  6. BIN
      Templates/Empty/game/core/art/water/lava_foam.dds
  7. BIN
      Templates/Empty/game/core/art/water/river_depthcolor_ramp.png
  8. BIN
      Templates/Empty/game/core/art/water/riversuds.dds
  9. BIN
      Templates/Empty/game/core/art/water/riversuds.png
  10. BIN
      Templates/Empty/game/core/art/water/wateredge512.dds
  11. 3 3
      Templates/Empty/game/tools/riverEditor/riverEditorGui.cs
  12. 3 3
      Templates/Empty/game/tools/worldEditor/gui/objectBuilderGui.ed.gui
  13. 0 0
      Templates/Full/game/art/water/depthcolor_ramp.png
  14. 0 0
      Templates/Full/game/art/water/foam.dds
  15. 0 0
      Templates/Full/game/art/water/ripple.dds
  16. BIN
      Templates/Full/game/core/art/water/foam.png
  17. BIN
      Templates/Full/game/core/art/water/lava_depthcolor_ramp.png
  18. BIN
      Templates/Full/game/core/art/water/lava_foam.dds
  19. BIN
      Templates/Full/game/core/art/water/river_depthcolor_ramp.png
  20. BIN
      Templates/Full/game/core/art/water/riversuds.dds
  21. BIN
      Templates/Full/game/core/art/water/riversuds.png
  22. BIN
      Templates/Full/game/core/art/water/wateredge512.dds
  23. 3 3
      Templates/Full/game/tools/riverEditor/riverEditorGui.cs
  24. 3 3
      Templates/Full/game/tools/worldEditor/gui/objectBuilderGui.ed.gui

+ 0 - 0
Templates/Empty/game/core/art/water/depthcolor_ramp.png → Templates/Empty/game/art/water/depthcolor_ramp.png


+ 0 - 0
Templates/Empty/game/core/art/water/foam.dds → Templates/Empty/game/art/water/foam.dds


+ 0 - 0
Templates/Empty/game/core/art/water/ripple.dds → Templates/Empty/game/art/water/ripple.dds


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


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


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


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


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


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


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


+ 3 - 3
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;

+ 3 - 3
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" );
 }
 

+ 0 - 0
Templates/Full/game/core/art/water/depthcolor_ramp.png → Templates/Full/game/art/water/depthcolor_ramp.png


+ 0 - 0
Templates/Full/game/core/art/water/foam.dds → Templates/Full/game/art/water/foam.dds


+ 0 - 0
Templates/Full/game/core/art/water/ripple.dds → Templates/Full/game/art/water/ripple.dds


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


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


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


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


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


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


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


+ 3 - 3
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;

+ 3 - 3
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" );
 }