mirror of
https://github.com/TorqueGameEngines/Torque3D.git
synced 2026-07-12 23:24:41 +00:00
Corrected probe init'ing so they don't fight for the cubemap idx order
Also correct deleting behavior so it updates indicies when a probe is removed Updated forward lighting to utilize the same math as deferred
This commit is contained in:
parent
37461b4768
commit
a1ecc98c87
21 changed files with 440 additions and 389 deletions
|
|
@ -7,8 +7,8 @@ singleton Material(Grid_512_Orange)
|
|||
specular[0] = "0.8 0.8 0.8 1";
|
||||
specularPower[0] = "0.25";
|
||||
specularStrength[0] = "25";
|
||||
translucentBlendOp = "Add";
|
||||
smoothness[0] = "0.941176";
|
||||
translucentBlendOp = "LerpAlpha";
|
||||
smoothness[0] = "1";
|
||||
metalness[0] = "1";
|
||||
DiffuseMapAsset0 = "StaticShapeTest:Grid_512_orange_ALBEDO";
|
||||
specularStrength0 = "25";
|
||||
|
|
|
|||
|
|
@ -101,19 +101,6 @@ new Scene(PbrMatTestLevel) {
|
|||
persistentId = "658580df-7bda-11e9-9951-fcefa3e1cde4";
|
||||
reflectionPath = "data/pbr/levels/PbrMatTest/probes/";
|
||||
};
|
||||
new BoxEnvironmentProbe() {
|
||||
Enabled = "1";
|
||||
refOffset = "0 0 0";
|
||||
refScale = "10 10 10";
|
||||
ReflectionMode = "Baked Cubemap";
|
||||
position = "-0.0289133 -0.122873 1.6924";
|
||||
rotation = "1 0 0 0";
|
||||
scale = "10 10 10";
|
||||
canSave = "1";
|
||||
canSaveDynamicFields = "1";
|
||||
persistentId = "079c3eaf-874e-11e9-8bbc-bdd5fc1d7642";
|
||||
attenuation = "1";
|
||||
};
|
||||
new TSStatic() {
|
||||
shapeName = "data/pbr/shapes/material_ball.dae";
|
||||
playAmbient = "1";
|
||||
|
|
@ -284,6 +271,19 @@ new Scene(PbrMatTestLevel) {
|
|||
surface = "0.5 0.5 -0.5 0.5 -0.412576 0 -1.53859e-07 0 0 0 1 1 0 1 1";
|
||||
surface = "0.5 -0.5 0.5 0.5 0.412576 0 -1.53859e-07 0 0 0 1 1 0 1 1";
|
||||
};
|
||||
new BoxEnvironmentProbe() {
|
||||
Enabled = "1";
|
||||
refOffset = "0 0 0";
|
||||
refScale = "10 10 10";
|
||||
ReflectionMode = "Baked Cubemap";
|
||||
position = "-0.0463406 0.0380459 2.23039";
|
||||
rotation = "1 0 0 0";
|
||||
scale = "10 10 10";
|
||||
canSave = "1";
|
||||
canSaveDynamicFields = "1";
|
||||
persistentId = "29579d61-9b0f-11e9-b718-be72e303d0f8";
|
||||
attenuation = "1";
|
||||
};
|
||||
new PointLight() {
|
||||
radius = "5";
|
||||
isEnabled = "1";
|
||||
|
|
@ -310,7 +310,7 @@ new Scene(PbrMatTestLevel) {
|
|||
representedInLightmap = "0";
|
||||
shadowDarkenColor = "0 0 0 -1";
|
||||
includeLightmappedGeometryInShadow = "0";
|
||||
position = "-0.0881653 -2.35794 1.41582";
|
||||
position = "0.110554 -2.2668 1.41582";
|
||||
rotation = "1 0 0 0";
|
||||
canSave = "1";
|
||||
canSaveDynamicFields = "1";
|
||||
|
|
|
|||
Binary file not shown.
Binary file not shown.
Loading…
Add table
Add a link
Reference in a new issue