Commit 8d0e6b81 authored by SilentMike's avatar SilentMike

Merge pull request #299 from thecelloman/movelightassets

Moving the light related assets and data out of the core.
parents 93c7e1fb fb341fdf
......@@ -22,3 +22,6 @@
// Load up all datablocks. This function is called when
// a server is constructed.
// LightFlareData and LightAnimData(s)
exec("./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;
......
......@@ -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
......@@ -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
......
......@@ -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;
......
......@@ -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
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment