Force proper update of box probe when attenuation changes

Fixed multiple case sensitivity issues
Adds GL ARB check for cubemap arrays for certain cases where the driver only supports the extension, not as core
Fixes undeeded namespace declaration in an inline operator function
Cleaned up/reordered some modules default in the data dir
WIP of Das Boot test map
Begun refactoring visualizer tools
Added default cloud and water textures to core/rendering so water and cloud objects work correctly
Added default Fog_Cube mesh so volumetric fog works correctly
This commit is contained in:
Areloch 2019-08-19 01:14:34 -05:00
parent ab9fc302fc
commit 600859bd63
162 changed files with 1198 additions and 3160 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.8 KiB

File diff suppressed because it is too large Load diff

View file

@ -0,0 +1,219 @@
<?xml version="1.0" encoding="utf-8" ?>
<COLLADA xmlns="http://www.collada.org/2005/11/COLLADASchema" version="1.4.0">
<asset>
<contributor>
<author />
<authoring_tool>Torque 3D 2009 Interior Exporter</authoring_tool>
<comments />
</contributor>
<created>8/09/2009 2:52:45 PM</created>
<modified>8/09/2009 2:52:45 PM</modified>
<revision />
<title />
<subject />
<keywords />
<unit meter="1.000000" />
<up_axis>Z_UP</up_axis>
</asset>
<library_images>
<image id="PILLAR128X128G-Diffuse" name="PILLAR128X128G-Diffuse">
<init_from>file://PILLAR128X128G.png</init_from>
</image>
<image id="FULL128X128G-Diffuse" name="FULL128X128G-Diffuse">
<init_from>file://FULL128X128G.png</init_from>
</image>
<image id="BLACK-Diffuse" name="BLACK-Diffuse">
<init_from>file://BLACK.png</init_from>
</image>
</library_images>
<library_materials>
<material id="PILLAR128X128G" name="PILLAR128X128G">
<instance_effect url="#PILLAR128X128G-fx" />
</material>
<material id="FULL128X128G" name="FULL128X128G">
<instance_effect url="#FULL128X128G-fx" />
</material>
<material id="BLACK" name="BLACK">
<instance_effect url="#BLACK-fx" />
</material>
</library_materials>
<library_effects>
<effect id="PILLAR128X128G-fx" name="PILLAR128X128G-fx">
<profile_COMMON>
<technique sid="standard">
<phong>
<diffuse>
<texture texture="PILLAR128X128G-Diffuse" texcoord="CHANNEL0">
<extra>
<technique profile="MAYA">
<wrapU sid="wrapU0">TRUE</wrapU>
<wrapV sid="wrapV0">TRUE</wrapV>
<blend_mode>ADD</blend_mode>
</technique>
</extra>
</texture>
</diffuse>
</phong>
</technique>
</profile_COMMON>
</effect>
<effect id="FULL128X128G-fx" name="FULL128X128G-fx">
<profile_COMMON>
<technique sid="standard">
<phong>
<diffuse>
<texture texture="FULL128X128G-Diffuse" texcoord="CHANNEL0">
<extra>
<technique profile="MAYA">
<wrapU sid="wrapU0">TRUE</wrapU>
<wrapV sid="wrapV0">TRUE</wrapV>
<blend_mode>ADD</blend_mode>
</technique>
</extra>
</texture>
</diffuse>
</phong>
</technique>
</profile_COMMON>
</effect>
<effect id="BLACK-fx" name="BLACK-fx">
<profile_COMMON>
<technique sid="standard">
<phong>
<diffuse>
<texture texture="BLACK-Diffuse" texcoord="CHANNEL0">
<extra>
<technique profile="MAYA">
<wrapU sid="wrapU0">TRUE</wrapU>
<wrapV sid="wrapV0">TRUE</wrapV>
<blend_mode>ADD</blend_mode>
</technique>
</extra>
</texture>
</diffuse>
</phong>
</technique>
</profile_COMMON>
</effect>
</library_effects>
<library_geometries>
<geometry id="Door-lib" name="DoorMesh">
<mesh>
<source id="Door-Position">
<float_array id="Door-Position-array" count="24">
2.0000 -0.2500 -2.0000
2.0000 -0.2500 2.0000
2.0000 0.2500 -2.0000
2.0000 0.2500 2.0000
-2.0000 -0.2500 -2.0000
-2.0000 0.2500 -2.0000
-2.0000 -0.2500 2.0000
-2.0000 0.2500 2.0000
</float_array>
<technique_common>
<accessor source="#Door-Position-array" count="8" stride="3">
<param name="X" type="float" />
<param name="Y" type="float" />
<param name="Z" type="float" />
</accessor>
</technique_common>
</source>
<source id="Door-Normal">
<float_array id="Door-Normal-array" count="18">
1.0000 -0.0000 -0.0000
-1.0000 -0.0000 -0.0000
-0.0000 1.0000 -0.0000
-0.0000 -1.0000 -0.0000
-0.0000 -0.0000 1.0000
-0.0000 -0.0000 -1.0000
</float_array>
<technique_common>
<accessor source="#Door-Normal-array" count="6" stride="3">
<param name="X" type="float" />
<param name="Y" type="float" />
<param name="Z" type="float" />
</accessor>
</technique_common>
</source>
<source id="Door-UV0">
<float_array id="Door-UV0-array" count="28">
5.7500 0.0000
5.7500 1.0000
6.0000 0.0000
6.0000 1.0000
-5.7500 0.0000
-6.0000 0.0000
-5.7500 1.0000
-6.0000 1.0000
1.0000 0.0000
0.0000 0.0000
1.0000 1.0000
0.0000 1.0000
8.0000 0.0000
8.0000 1.0000
</float_array>
<technique_common>
<accessor source="#Door-UV0-array" count="14" stride="2">
<param name="S" type="float" />
<param name="T" type="float" />
</accessor>
</technique_common>
</source>
<vertices id="Door-Vertex">
<input semantic="POSITION" source="#Door-Position" />
</vertices>
<triangles material="PILLAR128X128G" count="4">
<input semantic="VERTEX" offset="0" source="#Door-Vertex" />
<input semantic="NORMAL" offset="1" source="#Door-Normal" />
<input semantic="TEXCOORD" offset="2" set="0" source="#Door-UV0" />
<p>
3 0 3 1 0 1 0 0 0
2 0 2 3 0 3 0 0 0
7 1 7 5 1 5 4 1 4
6 1 6 7 1 7 4 1 4
</p>
</triangles>
<triangles material="FULL128X128G" count="4">
<input semantic="VERTEX" offset="0" source="#Door-Vertex" />
<input semantic="NORMAL" offset="1" source="#Door-Normal" />
<input semantic="TEXCOORD" offset="2" set="0" source="#Door-UV0" />
<p>
3 2 11 2 2 9 5 2 8
7 2 10 3 2 11 5 2 8
1 3 10 6 3 11 4 3 9
0 3 8 1 3 10 4 3 9
</p>
</triangles>
<triangles material="BLACK" count="4">
<input semantic="VERTEX" offset="0" source="#Door-Vertex" />
<input semantic="NORMAL" offset="1" source="#Door-Normal" />
<input semantic="TEXCOORD" offset="2" set="0" source="#Door-UV0" />
<p>
3 4 13 7 4 11 6 4 9
1 4 12 3 4 13 6 4 9
2 5 11 0 5 9 4 5 12
5 5 13 2 5 11 4 5 12
</p>
</triangles>
</mesh>
</geometry>
</library_geometries>
<library_visual_scenes>
<visual_scene id="RootNode" name="RootNode">
<node id="Door" name="Door">
<instance_geometry url="#Door-lib">
<bind_material>
<technique_common>
<instance_material symbol="PILLAR128X128G" target="#PILLAR128X128G" />
<instance_material symbol="FULL128X128G" target="#FULL128X128G" />
<instance_material symbol="BLACK" target="#BLACK" />
</technique_common>
</bind_material>
</instance_geometry>
</node>
</visual_scene>
</library_visual_scenes>
<scene>
<instance_visual_scene url="#RootNode" />
</scene>
</COLLADA>

View file

@ -0,0 +1,180 @@
<?xml version="1.0" encoding="utf-8" ?>
<COLLADA xmlns="http://www.collada.org/2005/11/COLLADASchema" version="1.4.0">
<asset>
<contributor>
<author />
<authoring_tool>Torque 3D 2009 Interior Exporter</authoring_tool>
<comments />
</contributor>
<created>12/09/2009 9:50:04 AM</created>
<modified>12/09/2009 9:50:04 AM</modified>
<revision />
<title />
<subject />
<keywords />
<unit meter="1.000000" />
<up_axis>Z_UP</up_axis>
</asset>
<library_images>
<image id="DemoRoomLrg_PILLAR128X128G-Diffuse" name="DemoRoomLrg_PILLAR128X128G-Diffuse">
<init_from>file://PILLAR128X128G.png</init_from>
</image>
<image id="DemoRoomLrg_FULL128X128G-Diffuse" name="DemoRoomLrg_FULL128X128G-Diffuse">
<init_from>file://FULL128X128G.png</init_from>
</image>
</library_images>
<library_materials>
<material id="DemoRoomLrg_PILLAR128X128G" name="DemoRoomLrg_PILLAR128X128G">
<instance_effect url="#DemoRoomLrg_PILLAR128X128G-fx" />
</material>
<material id="DemoRoomLrg_FULL128X128G" name="DemoRoomLrg_FULL128X128G">
<instance_effect url="#DemoRoomLrg_FULL128X128G-fx" />
</material>
</library_materials>
<library_effects>
<effect id="DemoRoomLrg_PILLAR128X128G-fx" name="DemoRoomLrg_PILLAR128X128G-fx">
<profile_COMMON>
<technique sid="standard">
<phong>
<diffuse>
<texture texture="DemoRoomLrg_PILLAR128X128G-Diffuse" texcoord="CHANNEL0">
<extra>
<technique profile="MAYA">
<wrapU sid="wrapU0">TRUE</wrapU>
<wrapV sid="wrapV0">TRUE</wrapV>
<blend_mode>ADD</blend_mode>
</technique>
</extra>
</texture>
</diffuse>
</phong>
</technique>
</profile_COMMON>
</effect>
<effect id="DemoRoomLrg_FULL128X128G-fx" name="DemoRoomLrg_FULL128X128G-fx">
<profile_COMMON>
<technique sid="standard">
<phong>
<diffuse>
<texture texture="DemoRoomLrg_FULL128X128G-Diffuse" texcoord="CHANNEL0">
<extra>
<technique profile="MAYA">
<wrapU sid="wrapU0">TRUE</wrapU>
<wrapV sid="wrapV0">TRUE</wrapV>
<blend_mode>ADD</blend_mode>
</technique>
</extra>
</texture>
</diffuse>
</phong>
</technique>
</profile_COMMON>
</effect>
</library_effects>
<library_geometries>
<geometry id="ElevatorPlatform_5c1b8cbb-lib" name="ElevatorPlatform_5c1b8cbbMesh">
<mesh>
<source id="ElevatorPlatform_5c1b8cbb-Position">
<float_array id="ElevatorPlatform_5c1b8cbb-Position-array" count="24">
2.0000 -1.7500 -0.2500
2.0000 -1.7500 0.2500
2.0000 1.7500 -0.2500
2.0000 1.7500 0.2500
-2.0000 -1.7500 -0.2500
-2.0000 1.7500 -0.2500
-2.0000 -1.7500 0.2500
-2.0000 1.7500 0.2500
</float_array>
<technique_common>
<accessor source="#ElevatorPlatform_5c1b8cbb-Position-array" count="8" stride="3">
<param name="X" type="float" />
<param name="Y" type="float" />
<param name="Z" type="float" />
</accessor>
</technique_common>
</source>
<source id="ElevatorPlatform_5c1b8cbb-Normal">
<float_array id="ElevatorPlatform_5c1b8cbb-Normal-array" count="18">
1.0000 -0.0000 -0.0000
-1.0000 -0.0000 -0.0000
-0.0000 1.0000 -0.0000
-0.0000 -1.0000 -0.0000
-0.0000 -0.0000 1.0000
-0.0000 -0.0000 -1.0000
</float_array>
<technique_common>
<accessor source="#ElevatorPlatform_5c1b8cbb-Normal-array" count="6" stride="3">
<param name="X" type="float" />
<param name="Y" type="float" />
<param name="Z" type="float" />
</accessor>
</technique_common>
</source>
<source id="ElevatorPlatform_5c1b8cbb-UV0">
<float_array id="ElevatorPlatform_5c1b8cbb-UV0-array" count="16">
3.2500 -1.0000
3.0000 -1.0000
3.2500 0.0000
3.0000 0.0000
0.0000 -1.0000
0.0000 0.0000
1.0000 -1.0000
1.0000 0.0000
</float_array>
<technique_common>
<accessor source="#ElevatorPlatform_5c1b8cbb-UV0-array" count="8" stride="2">
<param name="S" type="float" />
<param name="T" type="float" />
</accessor>
</technique_common>
</source>
<vertices id="ElevatorPlatform_5c1b8cbb-Vertex">
<input semantic="POSITION" source="#ElevatorPlatform_5c1b8cbb-Position" />
</vertices>
<triangles material="DemoRoomLrg_PILLAR128X128G" count="8">
<input semantic="VERTEX" offset="0" source="#ElevatorPlatform_5c1b8cbb-Vertex" />
<input semantic="NORMAL" offset="1" source="#ElevatorPlatform_5c1b8cbb-Normal" />
<input semantic="TEXCOORD" offset="2" set="0" source="#ElevatorPlatform_5c1b8cbb-UV0" />
<p>
3 0 3 1 0 1 0 0 0
2 0 2 3 0 3 0 0 0
7 1 1 5 1 0 4 1 2
6 1 3 7 1 1 4 1 2
3 2 1 2 2 0 5 2 2
7 2 3 3 2 1 5 2 2
1 3 3 6 3 1 4 3 0
0 3 2 1 3 3 4 3 0
</p>
</triangles>
<triangles material="DemoRoomLrg_FULL128X128G" count="4">
<input semantic="VERTEX" offset="0" source="#ElevatorPlatform_5c1b8cbb-Vertex" />
<input semantic="NORMAL" offset="1" source="#ElevatorPlatform_5c1b8cbb-Normal" />
<input semantic="TEXCOORD" offset="2" set="0" source="#ElevatorPlatform_5c1b8cbb-UV0" />
<p>
3 4 7 7 4 5 6 4 4
1 4 6 3 4 7 6 4 4
2 5 5 0 5 4 4 5 6
5 5 7 2 5 5 4 5 6
</p>
</triangles>
</mesh>
</geometry>
</library_geometries>
<library_visual_scenes>
<visual_scene id="RootNode" name="RootNode">
<node id="ElevatorPlatform_5c1b8cbb" name="ElevatorPlatform_5c1b8cbb">
<instance_geometry url="#ElevatorPlatform_5c1b8cbb-lib">
<bind_material>
<technique_common>
<instance_material symbol="DemoRoomLrg_PILLAR128X128G" target="#DemoRoomLrg_PILLAR128X128G" />
<instance_material symbol="DemoRoomLrg_FULL128X128G" target="#DemoRoomLrg_FULL128X128G" />
</technique_common>
</bind_material>
</instance_geometry>
</node>
</visual_scene>
</library_visual_scenes>
<scene>
<instance_visual_scene url="#RootNode" />
</scene>
</COLLADA>

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.8 KiB

View file

@ -0,0 +1,179 @@
//--- Door.dae MATERIALS BEGIN ---
singleton Material(Door_PILLAR128X128G)
{
mapTo = "PILLAR128X128G";
diffuseMap[0] = "PILLAR128X128G";
normalMap[0] = "";
specularMap[0] = "";
diffuseColor[0] = "1 1 1 1";
specular[0] = "1 1 1 1";
specularPower[0] = 8;
pixelSpecular[0] = false;
emissive[0] = false;
doubleSided = false;
translucent = false;
translucentBlendOp = "None";
};
singleton Material(Door_FULL128X128G)
{
mapTo = "FULL128X128G";
diffuseMap[0] = "FULL128X128G";
normalMap[0] = "";
specularMap[0] = "";
diffuseColor[0] = "1 1 1 1";
specular[0] = "1 1 1 1";
specularPower[0] = 8;
pixelSpecular[0] = false;
emissive[0] = false;
doubleSided = false;
translucent = false;
translucentBlendOp = "None";
};
singleton Material(Door_BLACK)
{
mapTo = "BLACK";
diffuseMap[0] = "BLACK";
normalMap[0] = "";
specularMap[0] = "";
diffuseColor[0] = "1 1 1 1";
specular[0] = "1 1 1 1";
specularPower[0] = 8;
pixelSpecular[0] = false;
emissive[0] = false;
doubleSided = false;
translucent = false;
translucentBlendOp = "None";
};
//--- Door.dae MATERIALS END ---
//--- DemoRoomLrg.dae MATERIALS BEGIN ---
singleton Material(DemoRoomLrg_BLACK)
{
mapTo = "BLACK";
diffuseMap[0] = "BLACK";
normalMap[0] = "";
specularMap[0] = "";
diffuseColor[0] = "1 1 1 1";
specular[0] = "1 1 1 1";
specularPower[0] = 8;
pixelSpecular[0] = false;
emissive[0] = false;
doubleSided = false;
translucent = false;
translucentBlendOp = "None";
};
singleton Material(DemoRoomLrg_FULL128X128G)
{
mapTo = "FULL128X128G";
diffuseMap[0] = "FULL128X128G";
normalMap[0] = "";
specularMap[0] = "";
diffuseColor[0] = "1 1 1 1";
specular[0] = "1 1 1 1";
specularPower[0] = 8;
pixelSpecular[0] = false;
emissive[0] = false;
doubleSided = false;
translucent = false;
translucentBlendOp = "None";
};
singleton Material(DemoRoomLrg_PILLAR128X128G)
{
mapTo = "PILLAR128X128G";
diffuseMap[0] = "PILLAR128X128G";
normalMap[0] = "";
specularMap[0] = "";
diffuseColor[0] = "1 1 1 1";
specular[0] = "1 1 1 1";
specularPower[0] = 8;
pixelSpecular[0] = false;
emissive[0] = false;
doubleSided = false;
translucent = false;
translucentBlendOp = "None";
};
singleton Material(DemoRoomLrg_FULL64X64G)
{
mapTo = "FULL64X64G";
diffuseMap[0] = "FULL64X64G";
normalMap[0] = "";
specularMap[0] = "";
diffuseColor[0] = "1 1 1 1";
specular[0] = "1 1 1 1";
specularPower[0] = 8;
pixelSpecular[0] = false;
emissive[0] = false;
doubleSided = false;
translucent = false;
translucentBlendOp = "None";
};
//--- DemoRoomLrg.dae MATERIALS END ---
//--- ElevatorPlatform.dae MATERIALS BEGIN ---
singleton Material(ElevatorPlatform_DemoRoomLrg_PILLAR128X128G)
{
mapTo = "DemoRoomLrg_PILLAR128X128G";
diffuseMap[0] = "PILLAR128X128G";
normalMap[0] = "";
specularMap[0] = "";
diffuseColor[0] = "1 1 1 1";
specular[0] = "1 1 1 1";
specularPower[0] = 8;
pixelSpecular[0] = false;
emissive[0] = false;
doubleSided = false;
translucent = false;
translucentBlendOp = "None";
};
singleton Material(ElevatorPlatform_DemoRoomLrg_FULL128X128G)
{
mapTo = "DemoRoomLrg_FULL128X128G";
diffuseMap[0] = "FULL128X128G";
normalMap[0] = "";
specularMap[0] = "";
diffuseColor[0] = "1 1 1 1";
specular[0] = "1 1 1 1";
specularPower[0] = 8;
pixelSpecular[0] = false;
emissive[0] = false;
doubleSided = false;
translucent = false;
translucentBlendOp = "None";
};
//--- ElevatorPlatform.dae MATERIALS END ---