From fb341fdf97e79a84ab60bb701f1f5914b719a0aa Mon Sep 17 00:00:00 2001 From: thecelloman Date: Tue, 2 Apr 2013 19:44:31 -0400 Subject: [PATCH] Moving the light related assets and data out of the core. --- .../Empty/game/art/datablocks/datablockExec.cs | 3 +++ .../game/{core => }/art/datablocks/lights.cs | 14 +++++++------- .../{core/art/special => art/lights}/corona.png | Bin .../special => art/lights}/lensFlareSheet0.png | Bin .../special => art/lights}/lensFlareSheet1.png | Bin .../special => art/lights}/lensflareSheet3.png | Bin .../{core/art/special => art/lights}/materials.cs | 0 .../game/core/art/datablocks/datablockExec.cs | 3 --- .../Full/game/art/datablocks/datablockExec.cs | 5 ++++- .../Full/game/{core => }/art/datablocks/lights.cs | 14 +++++++------- .../{core/art/special => art/lights}/corona.png | Bin .../special => art/lights}/lensFlareSheet0.png | Bin .../special => art/lights}/lensFlareSheet1.png | Bin .../special => art/lights}/lensflareSheet3.png | Bin .../{core/art/special => art/lights}/materials.cs | 0 .../game/core/art/datablocks/datablockExec.cs | 3 --- 16 files changed, 21 insertions(+), 21 deletions(-) rename Templates/Empty/game/{core => }/art/datablocks/lights.cs (97%) rename Templates/Empty/game/{core/art/special => art/lights}/corona.png (100%) rename Templates/Empty/game/{core/art/special => art/lights}/lensFlareSheet0.png (100%) rename Templates/Empty/game/{core/art/special => art/lights}/lensFlareSheet1.png (100%) rename Templates/Empty/game/{core/art/special => art/lights}/lensflareSheet3.png (100%) rename Templates/Empty/game/{core/art/special => art/lights}/materials.cs (100%) rename Templates/Full/game/{core => }/art/datablocks/lights.cs (97%) rename Templates/Full/game/{core/art/special => art/lights}/corona.png (100%) rename Templates/Full/game/{core/art/special => art/lights}/lensFlareSheet0.png (100%) rename Templates/Full/game/{core/art/special => art/lights}/lensFlareSheet1.png (100%) rename Templates/Full/game/{core/art/special => art/lights}/lensflareSheet3.png (100%) rename Templates/Full/game/{core/art/special => art/lights}/materials.cs (100%) diff --git a/Templates/Empty/game/art/datablocks/datablockExec.cs b/Templates/Empty/game/art/datablocks/datablockExec.cs index cbafc7e73..e26bcd9dc 100644 --- a/Templates/Empty/game/art/datablocks/datablockExec.cs +++ b/Templates/Empty/game/art/datablocks/datablockExec.cs @@ -22,3 +22,6 @@ // Load up all datablocks. This function is called when // a server is constructed. + +// LightFlareData and LightAnimData(s) +exec("./lights.cs"); diff --git a/Templates/Empty/game/core/art/datablocks/lights.cs b/Templates/Empty/game/art/datablocks/lights.cs similarity index 97% rename from Templates/Empty/game/core/art/datablocks/lights.cs rename to Templates/Empty/game/art/datablocks/lights.cs index 005aec0ca..ea82fffd0 100644 --- a/Templates/Empty/game/core/art/datablocks/lights.cs +++ b/Templates/Empty/game/art/datablocks/lights.cs @@ -117,7 +117,7 @@ datablock LightFlareData( SunFlareExample ) overallScale = 4.0; flareEnabled = true; renderReflectPass = false; - flareTexture = "./../special/lensFlareSheet0"; + flareTexture = "art/lights/lensFlareSheet0"; elementRect[0] = "512 0 512 512"; elementDist[0] = 0.0; @@ -175,7 +175,7 @@ datablock LightFlareData( SunFlareExample2 ) overallScale = 2.0; flareEnabled = true; renderReflectPass = false; - flareTexture = "./../special/lensFlareSheet0"; + flareTexture = "art/lights/lensFlareSheet0"; elementRect[0] = "1024 0 128 128"; elementDist[0] = 0.5; @@ -219,7 +219,7 @@ datablock LightFlareData(SunFlareExample3) overallScale = 2.0; flareEnabled = true; renderReflectPass = false; - flareTexture = "core/art/special/lensflareSheet3.png"; + flareTexture = "art/lights/lensflareSheet3.png"; elementRect[0] = "0 256 256 256"; elementDist[0] = "-0.6"; @@ -361,7 +361,7 @@ datablock LightFlareData(SunFlarePacificIsland) overallScale = 2.0; flareEnabled = true; renderReflectPass = false; - flareTexture = "art/special/lensflareSheet3.png"; + flareTexture = "art/lights/lensflareSheet3.png"; elementRect[0] = "0 256 256 256"; elementDist[0] = "-0.6"; @@ -502,7 +502,7 @@ datablock LightFlareData( LightFlareExample0 ) overallScale = 2.0; flareEnabled = true; renderReflectPass = true; - flareTexture = "./../special/lensFlareSheet1"; + flareTexture = "art/lights/lensFlareSheet1"; elementRect[0] = "0 512 512 512"; elementDist[0] = 0.0; @@ -525,7 +525,7 @@ datablock LightFlareData( LightFlareExample1 ) overallScale = 2.0; flareEnabled = true; renderReflectPass = true; - flareTexture = "./../special/lensFlareSheet1"; + flareTexture = "art/lights/lensFlareSheet1"; elementRect[0] = "512 512 512 512"; elementDist[0] = 0.0; @@ -548,7 +548,7 @@ datablock LightFlareData( LightFlareExample2 ) overallScale = 2.0; flareEnabled = true; renderReflectPass = true; - flareTexture = "./../special/lensFlareSheet0"; + flareTexture = "art/lights/lensFlareSheet0"; elementRect[0] = "512 512 512 512"; elementDist[0] = 0.0; diff --git a/Templates/Empty/game/core/art/special/corona.png b/Templates/Empty/game/art/lights/corona.png similarity index 100% rename from Templates/Empty/game/core/art/special/corona.png rename to Templates/Empty/game/art/lights/corona.png diff --git a/Templates/Empty/game/core/art/special/lensFlareSheet0.png b/Templates/Empty/game/art/lights/lensFlareSheet0.png similarity index 100% rename from Templates/Empty/game/core/art/special/lensFlareSheet0.png rename to Templates/Empty/game/art/lights/lensFlareSheet0.png diff --git a/Templates/Empty/game/core/art/special/lensFlareSheet1.png b/Templates/Empty/game/art/lights/lensFlareSheet1.png similarity index 100% rename from Templates/Empty/game/core/art/special/lensFlareSheet1.png rename to Templates/Empty/game/art/lights/lensFlareSheet1.png diff --git a/Templates/Empty/game/core/art/special/lensflareSheet3.png b/Templates/Empty/game/art/lights/lensflareSheet3.png similarity index 100% rename from Templates/Empty/game/core/art/special/lensflareSheet3.png rename to Templates/Empty/game/art/lights/lensflareSheet3.png diff --git a/Templates/Empty/game/core/art/special/materials.cs b/Templates/Empty/game/art/lights/materials.cs similarity index 100% rename from Templates/Empty/game/core/art/special/materials.cs rename to Templates/Empty/game/art/lights/materials.cs diff --git a/Templates/Empty/game/core/art/datablocks/datablockExec.cs b/Templates/Empty/game/core/art/datablocks/datablockExec.cs index da4a98989..af059530d 100644 --- a/Templates/Empty/game/core/art/datablocks/datablockExec.cs +++ b/Templates/Empty/game/core/art/datablocks/datablockExec.cs @@ -30,6 +30,3 @@ exec("./camera.cs"); exec("./markers.cs"); exec("./defaultparticle.cs"); - -// LightFlareData and LightAnimData(s) -exec("./lights.cs"); \ No newline at end of file diff --git a/Templates/Full/game/art/datablocks/datablockExec.cs b/Templates/Full/game/art/datablocks/datablockExec.cs index bf419e905..b78084cc3 100644 --- a/Templates/Full/game/art/datablocks/datablockExec.cs +++ b/Templates/Full/game/art/datablocks/datablockExec.cs @@ -26,10 +26,13 @@ // Do the sounds first -- later scripts/datablocks may need them exec("./audioProfiles.cs"); +// LightFlareData and LightAnimData(s) +exec("./lights.cs"); + // Do the various effects next -- later scripts/datablocks may need them exec("./particles.cs"); - exec("./environment.cs"); + exec("./triggers.cs"); // Add a rigid example diff --git a/Templates/Full/game/core/art/datablocks/lights.cs b/Templates/Full/game/art/datablocks/lights.cs similarity index 97% rename from Templates/Full/game/core/art/datablocks/lights.cs rename to Templates/Full/game/art/datablocks/lights.cs index 005aec0ca..ea82fffd0 100644 --- a/Templates/Full/game/core/art/datablocks/lights.cs +++ b/Templates/Full/game/art/datablocks/lights.cs @@ -117,7 +117,7 @@ datablock LightFlareData( SunFlareExample ) overallScale = 4.0; flareEnabled = true; renderReflectPass = false; - flareTexture = "./../special/lensFlareSheet0"; + flareTexture = "art/lights/lensFlareSheet0"; elementRect[0] = "512 0 512 512"; elementDist[0] = 0.0; @@ -175,7 +175,7 @@ datablock LightFlareData( SunFlareExample2 ) overallScale = 2.0; flareEnabled = true; renderReflectPass = false; - flareTexture = "./../special/lensFlareSheet0"; + flareTexture = "art/lights/lensFlareSheet0"; elementRect[0] = "1024 0 128 128"; elementDist[0] = 0.5; @@ -219,7 +219,7 @@ datablock LightFlareData(SunFlareExample3) overallScale = 2.0; flareEnabled = true; renderReflectPass = false; - flareTexture = "core/art/special/lensflareSheet3.png"; + flareTexture = "art/lights/lensflareSheet3.png"; elementRect[0] = "0 256 256 256"; elementDist[0] = "-0.6"; @@ -361,7 +361,7 @@ datablock LightFlareData(SunFlarePacificIsland) overallScale = 2.0; flareEnabled = true; renderReflectPass = false; - flareTexture = "art/special/lensflareSheet3.png"; + flareTexture = "art/lights/lensflareSheet3.png"; elementRect[0] = "0 256 256 256"; elementDist[0] = "-0.6"; @@ -502,7 +502,7 @@ datablock LightFlareData( LightFlareExample0 ) overallScale = 2.0; flareEnabled = true; renderReflectPass = true; - flareTexture = "./../special/lensFlareSheet1"; + flareTexture = "art/lights/lensFlareSheet1"; elementRect[0] = "0 512 512 512"; elementDist[0] = 0.0; @@ -525,7 +525,7 @@ datablock LightFlareData( LightFlareExample1 ) overallScale = 2.0; flareEnabled = true; renderReflectPass = true; - flareTexture = "./../special/lensFlareSheet1"; + flareTexture = "art/lights/lensFlareSheet1"; elementRect[0] = "512 512 512 512"; elementDist[0] = 0.0; @@ -548,7 +548,7 @@ datablock LightFlareData( LightFlareExample2 ) overallScale = 2.0; flareEnabled = true; renderReflectPass = true; - flareTexture = "./../special/lensFlareSheet0"; + flareTexture = "art/lights/lensFlareSheet0"; elementRect[0] = "512 512 512 512"; elementDist[0] = 0.0; diff --git a/Templates/Full/game/core/art/special/corona.png b/Templates/Full/game/art/lights/corona.png similarity index 100% rename from Templates/Full/game/core/art/special/corona.png rename to Templates/Full/game/art/lights/corona.png diff --git a/Templates/Full/game/core/art/special/lensFlareSheet0.png b/Templates/Full/game/art/lights/lensFlareSheet0.png similarity index 100% rename from Templates/Full/game/core/art/special/lensFlareSheet0.png rename to Templates/Full/game/art/lights/lensFlareSheet0.png diff --git a/Templates/Full/game/core/art/special/lensFlareSheet1.png b/Templates/Full/game/art/lights/lensFlareSheet1.png similarity index 100% rename from Templates/Full/game/core/art/special/lensFlareSheet1.png rename to Templates/Full/game/art/lights/lensFlareSheet1.png diff --git a/Templates/Full/game/core/art/special/lensflareSheet3.png b/Templates/Full/game/art/lights/lensflareSheet3.png similarity index 100% rename from Templates/Full/game/core/art/special/lensflareSheet3.png rename to Templates/Full/game/art/lights/lensflareSheet3.png diff --git a/Templates/Full/game/core/art/special/materials.cs b/Templates/Full/game/art/lights/materials.cs similarity index 100% rename from Templates/Full/game/core/art/special/materials.cs rename to Templates/Full/game/art/lights/materials.cs diff --git a/Templates/Full/game/core/art/datablocks/datablockExec.cs b/Templates/Full/game/core/art/datablocks/datablockExec.cs index da4a98989..af059530d 100644 --- a/Templates/Full/game/core/art/datablocks/datablockExec.cs +++ b/Templates/Full/game/core/art/datablocks/datablockExec.cs @@ -30,6 +30,3 @@ exec("./camera.cs"); exec("./markers.cs"); exec("./defaultparticle.cs"); - -// LightFlareData and LightAnimData(s) -exec("./lights.cs"); \ No newline at end of file