From c6e4b4a0e4a111135d73a3aef9e4f73322774953 Mon Sep 17 00:00:00 2001 From: Areloch Date: Mon, 4 Mar 2019 17:57:53 -0600 Subject: [PATCH] Corrected yorks chapel materials + added to the main test level --- .../yorks/chapel/Module_Common/materials.cs | 105 ++++++- Templates/Full/game/levels/AProbeTest.mis | 280 ++++++++++++++++-- 2 files changed, 338 insertions(+), 47 deletions(-) diff --git a/Templates/Full/game/art/yorks/chapel/Module_Common/materials.cs b/Templates/Full/game/art/yorks/chapel/Module_Common/materials.cs index 8e786d3d1..9e857a50d 100644 --- a/Templates/Full/game/art/yorks/chapel/Module_Common/materials.cs +++ b/Templates/Full/game/art/yorks/chapel/Module_Common/materials.cs @@ -48,25 +48,29 @@ singleton Material(LMA_chapel_int_chapel_Module_Common_LMA_chapel_int_Material1) specularMap[0] = "art/shapes/yorks/chapel/brick_small_blue_dds.dds"; }; -singleton Material(LMX_chapel_props_chapel_Module_Common_LMX_chapel_props_Material0) +singleton Material(chapel_Module_Common_LMX_chapel_props_Material0) { mapTo = "chapel_Module_Common_LMX_chapel_props-Material0"; diffuseColor[1] = "1 1 1 0.8"; - diffuseMap[0] = "art/shapes/yorks/chapel/marble1_red.png"; - diffuseMap[1] = "art/shapes/yorks/chapel/marble1_red.png"; - toneMap[0] = "art/shapes/yorks/chapel/Module_Common/LMX_chapel_props.dds"; + diffuseMap[0] = "art/yorks/chapel/marble1_red.png"; + diffuseMap[1] = "marble1_red.png"; + toneMap[0] = "art/yorks/chapel/Module_Common/LMX_chapel_props.png"; emissive[1] = "1"; translucentBlendOp = "None"; emissive[0] = "0"; materialTag0 = "Miscellaneous"; alphaRef = "0"; - lightMap[1] = "art/shapes/yorks/chapel/Module_Common/LMX_chapel_props.dds"; + lightMap[1] = "art/yorks/chapel/Module_Common/LMX_chapel_props.dds"; castShadows = "0"; cubemap = "DesertSkyCubemap"; showFootprints = "0"; + smoothness[0] = "1"; + specular0 = "1 1 1 1"; + specularPower0 = "8"; + pixelSpecular0 = "0"; }; -singleton Material(LMX_chapel_props_chapel_Module_Common_LMX_chapel_props_Material1) +singleton Material(chapel_Module_Common_LMX_chapel_props_Material1) { diffuseColor[0] = "1 1 1 1"; specular[0] = "1 1 1 1"; @@ -77,17 +81,21 @@ singleton Material(LMX_chapel_props_chapel_Module_Common_LMX_chapel_props_Materi translucent = false; translucentBlendOp = "None"; mapTo = "chapel_Module_Common_LMX_chapel_props-Material1"; - toneMap[0] = "art/shapes/yorks/chapel/Module_Common/LMX_chapel_props.dds"; - diffuseMap[0] = "art/shapes/yorks/chapel/marble1_green.png"; + toneMap[0] = "art/yorks/chapel/Module_Common/LMX_chapel_props.png"; + diffuseMap[0] = "art/yorks/chapel/marble1_green.png"; diffuseColor[1] = "1 1 1 0.7"; - diffuseMap[1] = "art/shapes/yorks/chapel/marble1_green.png"; - lightMap[1] = "art/shapes/yorks/chapel/Module_Common/LMX_chapel_props.dds"; + diffuseMap[1] = "marble1_green.png"; + lightMap[1] = "art/yorks/chapel/Module_Common/LMX_chapel_props.dds"; emissive[1] = "1"; materialTag0 = "Miscellaneous"; cubemap = "DesertSkyCubemap"; + smoothness[0] = "1"; + specular0 = "1 1 1 1"; + specularPower0 = "8"; + pixelSpecular0 = "0"; }; -singleton Material(LMX_chapel_props_chapel_Module_Common_LMX_chapel_props_Material2) +singleton Material(chapel_Module_Common_LMX_chapel_props_Material2) { diffuseColor[0] = "1 1 1 1"; specular[0] = "1 1 1 1"; @@ -98,13 +106,18 @@ singleton Material(LMX_chapel_props_chapel_Module_Common_LMX_chapel_props_Materi translucent = false; translucentBlendOp = "None"; mapTo = "chapel_Module_Common_LMX_chapel_props-Material2"; - toneMap[0] = "art/shapes/yorks/chapel/Module_Common/LMX_chapel_props.dds"; - diffuseMap[0] = "art/shapes/yorks/chapel/int_props_map.png"; + toneMap[0] = "art/yorks/chapel/Module_Common/LMX_chapel_props.png"; + diffuseMap[0] = "art/yorks/chapel/int_props_map.png"; diffuseColor[1] = "1 1 1 0.7"; - diffuseMap[1] = "art/shapes/yorks/chapel/int_props_map.png"; - lightMap[1] = "art/shapes/yorks/chapel/Module_Common/LMX_chapel_props.dds"; + diffuseMap[1] = "int_props_map.png"; + lightMap[1] = "LMX_chapel_props.dds"; emissive[1] = "1"; cubemap = "DesertSkyCubemap"; + smoothness[0] = "1"; + specular0 = "1 1 1 1"; + materialTag0 = "Miscellaneous"; + specularPower0 = "8"; + pixelSpecular0 = "1"; }; singleton Material(SB_chapel_glass_chapel_Module_Common_SB_chapel_glass_Material0) @@ -129,3 +142,65 @@ singleton Material(BlankWhite) emissive[0] = "0"; materialTag0 = "Miscellaneous"; }; + +singleton Material(SB_chapel_ext_chapel_Module_Common_SB_chapel_ext_Material0) +{ + mapTo = "chapel_Module_Common_SB_chapel_ext-Material0"; + smoothness[0] = "1"; + translucentBlendOp = "None"; +}; + +singleton Material(LMA_chapel_int_chapel_Module_Common_LMA_chapel_int_Material1) +{ + mapTo = "chapel_Module_Common_LMA_chapel_int-Material1"; + diffuseMap[0] = "art/yorks/chapel/brick_small_blue.png"; + smoothness[0] = "1"; + translucentBlendOp = "None"; + toneMap[0] = "art/yorks/chapel/Module_Common/LMA_chapel_int.png"; +}; + +singleton Material(LMA_chapel_int_chapel_Module_Common_LMA_chapel_int_Material0) +{ + mapTo = "chapel_Module_Common_LMA_chapel_int-Material0"; + diffuseMap[0] = "art/yorks/chapel/brick_block.png"; + smoothness[0] = "1"; + translucentBlendOp = "None"; + toneMap[0] = "art/yorks/chapel/Module_Common/LMA_chapel_int.png"; +}; + +singleton Material(LMX_chapel_props_chapel_Module_Common_LMX_chapel_props_Material1) +{ + mapTo = "chapel_Module_Common_LMX_chapel_props-Material1"; + diffuseMap[0] = "art/yorks/chapel/marble1_green.png"; + smoothness[0] = "1"; + translucentBlendOp = "None"; + toneMap[0] = "art/yorks/chapel/Module_Common/LMX_chapel_props.png"; +}; + +singleton Material(LMX_chapel_props_chapel_Module_Common_LMX_chapel_props_Material2) +{ + mapTo = "chapel_Module_Common_LMX_chapel_props-Material2"; + diffuseMap[0] = "art/yorks/chapel/int_props_map.png"; + smoothness[0] = "1"; + translucentBlendOp = "None"; + toneMap[0] = "art/yorks/chapel/Module_Common/LMX_chapel_props.png"; +}; + +singleton Material(LMX_chapel_props_chapel_Module_Common_LMX_chapel_props_Material0) +{ + mapTo = "chapel_Module_Common_LMX_chapel_props-Material0"; + diffuseMap[0] = "art/yorks/chapel/marble1_red.png"; + smoothness[0] = "1"; + translucentBlendOp = "None"; + toneMap[0] = "art/yorks/chapel/Module_Common/LMX_chapel_props.png"; +}; + +singleton Material(SB_chapel_glass_chapel_Module_Common_SB_chapel_glass_Material0) +{ + mapTo = "chapel_Module_Common_SB_chapel_glass-Material0"; + smoothness[0] = "1"; + translucentBlendOp = "None"; + diffuseMap[0] = "art/yorks/chapel/stainedglass1.png"; + glow[0] = "1"; + emissive[0] = "1"; +}; diff --git a/Templates/Full/game/levels/AProbeTest.mis b/Templates/Full/game/levels/AProbeTest.mis index 054715d8f..1deb3225a 100644 --- a/Templates/Full/game/levels/AProbeTest.mis +++ b/Templates/Full/game/levels/AProbeTest.mis @@ -138,31 +138,11 @@ new SimGroup(MissionGroup) { persistentId = "8072e1be-2846-11e7-9f56-abd46b190c60"; }; new BoxEnvironmentProbe() { - enabled = "1"; + enabled = "0"; refOffset = "0 0 0"; refScale = "10 10 10"; ReflectionMode = "Baked Cubemap"; - position = "-9.53882 10.3135 4.01808"; - rotation = "1 0 0 0"; - scale = "10 10 10"; - canSave = "1"; - canSaveDynamicFields = "1"; - persistentId = "8f479759-3291-11e9-8898-df29fd75d18c"; - GroundColor = "0.8 0.7 0.5 1"; - IndirectLight = "1 1 1 1"; - IndirectLightMode = "Spherical Harmonics"; - Intensity = "1"; - posOffset = "0 0 0"; - radius = "5"; - reflectionPath = "levels/probeTest/probes/"; - SkyColor = "0.5 0.5 1 1"; - }; - new BoxEnvironmentProbe() { - enabled = "1"; - refOffset = "0 0 0"; - refScale = "10 10 10"; - ReflectionMode = "Baked Cubemap"; - position = "-9.33192 0 4.85356"; + position = "0 0 0"; rotation = "1 0 0 0"; scale = "10 10 10"; canSave = "1"; @@ -178,11 +158,11 @@ new SimGroup(MissionGroup) { SkyColor = "0.5 0.5 1 1"; }; new BoxEnvironmentProbe() { - enabled = "1"; + enabled = "0"; refOffset = "0 0 0"; refScale = "10 10 10"; ReflectionMode = "Baked Cubemap"; - position = "0 -10.0137 4.69386"; + position = "0 0 0"; rotation = "1 0 0 0"; scale = "10 10 10"; canSave = "1"; @@ -197,6 +177,146 @@ new SimGroup(MissionGroup) { reflectionPath = "levels/probeTest/probes/"; SkyColor = "0.5 0.5 1 1"; }; + new BoxEnvironmentProbe() { + enabled = "0"; + refOffset = "0 0 0"; + refScale = "10 10 10"; + ReflectionMode = "Baked Cubemap"; + position = "0 0 0"; + rotation = "1 0 0 0"; + scale = "10 10 10"; + canSave = "1"; + canSaveDynamicFields = "1"; + persistentId = "f4db4dde-1ae9-11e9-9c9a-df9135416cc7"; + GroundColor = "0.8 0.7 0.5 1"; + IndirectLight = "1 1 1 1"; + IndirectLightMode = "Spherical Harmonics"; + Intensity = "1"; + posOffset = "0 0 0"; + radius = "5"; + reflectionPath = "levels/probeTest/probes/"; + SkyColor = "0.5 0.5 1 1"; + }; + new BoxEnvironmentProbe() { + enabled = "0"; + refOffset = "0 0 0"; + refScale = "10 10 10"; + ReflectionMode = "Baked Cubemap"; + position = "0 0 0"; + rotation = "1 0 0 0"; + scale = "10 10 10"; + canSave = "1"; + canSaveDynamicFields = "1"; + persistentId = "9b2db461-3291-11e9-8898-df29fd75d18c"; + GroundColor = "0.8 0.7 0.5 1"; + IndirectLight = "1 1 1 1"; + IndirectLightMode = "Spherical Harmonics"; + Intensity = "1"; + posOffset = "0 0 0"; + radius = "5"; + reflectionPath = "levels/probeTest/probes/"; + SkyColor = "0.5 0.5 1 1"; + }; + new BoxEnvironmentProbe() { + enabled = "0"; + refOffset = "0 0 0"; + refScale = "10 10 10"; + ReflectionMode = "Baked Cubemap"; + position = "0 0 0"; + rotation = "1 0 0 0"; + scale = "10 10 10"; + canSave = "1"; + canSaveDynamicFields = "1"; + persistentId = "9850277f-3291-11e9-8898-df29fd75d18c"; + GroundColor = "0.8 0.7 0.5 1"; + IndirectLight = "1 1 1 1"; + IndirectLightMode = "Spherical Harmonics"; + Intensity = "1"; + posOffset = "0 0 0"; + radius = "5"; + reflectionPath = "levels/probeTest/probes/"; + SkyColor = "0.5 0.5 1 1"; + }; + new BoxEnvironmentProbe() { + enabled = "0"; + refOffset = "0 0 0"; + refScale = "10 10 10"; + ReflectionMode = "Baked Cubemap"; + position = "0 0 0"; + rotation = "1 0 0 0"; + scale = "10 10 10"; + canSave = "1"; + canSaveDynamicFields = "1"; + persistentId = "9752cd1f-3291-11e9-8898-df29fd75d18c"; + GroundColor = "0.8 0.7 0.5 1"; + IndirectLight = "1 1 1 1"; + IndirectLightMode = "Spherical Harmonics"; + Intensity = "1"; + posOffset = "0 0 0"; + radius = "5"; + reflectionPath = "levels/probeTest/probes/"; + SkyColor = "0.5 0.5 1 1"; + }; + new BoxEnvironmentProbe() { + enabled = "0"; + refOffset = "0 0 0"; + refScale = "10 10 10"; + ReflectionMode = "Baked Cubemap"; + position = "0 0 0"; + rotation = "1 0 0 0"; + scale = "10 10 10"; + canSave = "1"; + canSaveDynamicFields = "1"; + persistentId = "9536f9d8-3291-11e9-8898-df29fd75d18c"; + GroundColor = "0.8 0.7 0.5 1"; + IndirectLight = "1 1 1 1"; + IndirectLightMode = "Spherical Harmonics"; + Intensity = "1"; + posOffset = "0 0 0"; + radius = "5"; + reflectionPath = "levels/probeTest/probes/"; + SkyColor = "0.5 0.5 1 1"; + }; + new BoxEnvironmentProbe() { + enabled = "0"; + refOffset = "0 0 0"; + refScale = "10 10 10"; + ReflectionMode = "Baked Cubemap"; + position = "0 0 0"; + rotation = "1 0 0 0"; + scale = "10 10 10"; + canSave = "1"; + canSaveDynamicFields = "1"; + persistentId = "8f479759-3291-11e9-8898-df29fd75d18c"; + GroundColor = "0.8 0.7 0.5 1"; + IndirectLight = "1 1 1 1"; + IndirectLightMode = "Spherical Harmonics"; + Intensity = "1"; + posOffset = "0 0 0"; + radius = "5"; + reflectionPath = "levels/probeTest/probes/"; + SkyColor = "0.5 0.5 1 1"; + }; + new BoxEnvironmentProbe() { + enabled = "0"; + refOffset = "0 0 0"; + refScale = "10 10 10"; + ReflectionMode = "Baked Cubemap"; + position = "0 0 0"; + rotation = "1 0 0 0"; + scale = "10 10 10"; + canSave = "1"; + canSaveDynamicFields = "1"; + persistentId = "8856e1d2-3291-11e9-8898-df29fd75d18c"; + GroundColor = "0.8 0.7 0.5 1"; + IndirectLight = "1 1 1 1"; + IndirectLightMode = "Spherical Harmonics"; + Intensity = "1"; + posOffset = "0 0 0"; + radius = "5"; + reflectionPath = "levels/probeTest/probes/"; + SkyColor = "0.5 0.5 1 1"; + }; new ConvexShape() { Material = "Grid512_Orange_Mat"; position = "0.487092 0.454657 9.4951"; @@ -207,7 +327,7 @@ new SimGroup(MissionGroup) { surface = "0 0 0 1 0 0 0.5"; surface = "0 1 0 0 0 0 -0.5"; - surface = "0.707107 0 0 0.707106 0 0.5 0"; + surface = "0.707107 0 0 0.707107 0 0.5 0"; surface = "0 0.707107 -0.707107 0 0 -0.5 -2.84217e-14"; surface = "0.5 0.5 -0.5 0.5 -0.5 0 -9.93411e-08"; surface = "0.5 -0.5 0.5 0.5 0.5 0 -9.93411e-08"; @@ -222,7 +342,7 @@ new SimGroup(MissionGroup) { surface = "0 0 0 1 0 0 0.5"; surface = "0 1 0 0 0 0 -0.5"; - surface = "0.707107 0 0 0.707106 0 0.5 0"; + surface = "0.707107 0 0 0.707107 0 0.5 0"; surface = "0 0.707107 -0.707107 0 0 -0.5 -2.84217e-14"; surface = "0.5 0.5 -0.5 0.5 -0.5 0 -9.93411e-08"; surface = "0.5 -0.5 0.5 0.5 0.5 0 -9.93411e-08"; @@ -237,7 +357,7 @@ new SimGroup(MissionGroup) { surface = "0 0 0 1 0 0 0.5"; surface = "0 1 0 0 0 0 -0.5"; - surface = "0.707107 0 0 0.707107 0 0.5 0"; + surface = "0.707107 0 0 0.707106 0 0.5 0"; surface = "0 0.707107 -0.707107 0 0 -0.5 -2.84217e-14"; surface = "0.5 0.5 -0.5 0.5 -0.5 0 -9.93411e-08"; surface = "0.5 -0.5 0.5 0.5 0.5 0 -9.93411e-08"; @@ -252,7 +372,7 @@ new SimGroup(MissionGroup) { surface = "0 0 0 1 0 0 0.5"; surface = "0 1 0 0 0 0 -0.5"; - surface = "0.707107 0 0 0.707107 0 0.5 0"; + surface = "0.707107 0 0 0.707106 0 0.5 0"; surface = "0 0.707107 -0.707107 0 0 -0.5 -2.84217e-14"; surface = "0.5 0.5 -0.5 0.5 -0.5 0 -9.93411e-08"; surface = "0.5 -0.5 0.5 0.5 0.5 0 -9.93411e-08"; @@ -267,7 +387,7 @@ new SimGroup(MissionGroup) { surface = "0 0 0 1 0 0 0.5"; surface = "0 1 0 0 0 0 -0.5"; - surface = "0.707107 0 0 0.707107 0 0.5 0"; + surface = "0.707107 0 0 0.707106 0 0.5 0"; surface = "0 0.707107 -0.707107 0 0 -0.5 -2.84217e-14"; surface = "0.5 0.5 -0.5 0.5 -0.5 0 -9.93411e-08"; surface = "0.5 -0.5 0.5 0.5 0.5 0 -9.93411e-08"; @@ -282,7 +402,7 @@ new SimGroup(MissionGroup) { surface = "0 0 0 1 0 0 0.5"; surface = "0 1 0 0 0 0 -0.5"; - surface = "0.707107 0 0 0.707106 0 0.5 0"; + surface = "0.707107 0 0 0.707107 0 0.5 0"; surface = "0 0.707107 -0.707107 0 0 -0.5 -2.84217e-14"; surface = "0.5 0.5 -0.5 0.5 -0.5 0 -9.93411e-08"; surface = "0.5 -0.5 0.5 0.5 0.5 0 -9.93411e-08"; @@ -297,7 +417,7 @@ new SimGroup(MissionGroup) { surface = "0 0 0 1 0 0 0.5"; surface = "0 1 0 0 0 0 -0.5"; - surface = "0.707107 0 0 0.707107 0 0.5 0"; + surface = "0.707107 0 0 0.707106 0 0.5 0"; surface = "0 0.707107 -0.707107 0 0 -0.5 -2.84217e-14"; surface = "0.5 0.5 -0.5 0.5 -0.5 0 -9.93411e-08"; surface = "0.5 -0.5 0.5 0.5 0.5 0 -9.93411e-08"; @@ -371,11 +491,107 @@ new SimGroup(MissionGroup) { refScale = "10 10 10"; ReflectionMode = "Baked Cubemap"; StaticCubemap = "HdrSkyCubemap"; - position = "0 0 0"; + position = "0 -0.0355076 0"; rotation = "1 0 0 0"; canSave = "1"; canSaveDynamicFields = "1"; persistentId = "c4bc9059-3cb4-11e9-933c-d270d89e32b9"; }; + new TSStatic() { + shapeName = "art/yorks/chapel/Module_Common/SB_chapel_ext.dae"; + playAmbient = "1"; + meshCulling = "0"; + originSort = "0"; + CollisionType = "Collision Mesh"; + DecalType = "Collision Mesh"; + allowPlayerStep = "0"; + alphaFadeEnable = "0"; + alphaFadeStart = "100"; + alphaFadeEnd = "150"; + alphaFadeInverse = "0"; + renderNormals = "0"; + forceDetail = "-1"; + ignoreZodiacs = "0"; + useGradientRange = "0"; + gradientRange = "0 180"; + invertGradientRange = "0"; + position = "0.569034 -19.8511 -0.101853"; + rotation = "1 0 0 0"; + scale = "1 1 1"; + canSave = "1"; + canSaveDynamicFields = "1"; + }; + new TSStatic() { + shapeName = "art/yorks/chapel/Module_Common/LMA_chapel_int.dae"; + playAmbient = "1"; + meshCulling = "0"; + originSort = "0"; + CollisionType = "Collision Mesh"; + DecalType = "Collision Mesh"; + allowPlayerStep = "0"; + alphaFadeEnable = "0"; + alphaFadeStart = "100"; + alphaFadeEnd = "150"; + alphaFadeInverse = "0"; + renderNormals = "0"; + forceDetail = "-1"; + ignoreZodiacs = "0"; + useGradientRange = "0"; + gradientRange = "0 180"; + invertGradientRange = "0"; + position = "0.569034 -19.8511 -0.101853"; + rotation = "1 0 0 0"; + scale = "1 1 1"; + canSave = "1"; + canSaveDynamicFields = "1"; + }; + new TSStatic() { + shapeName = "art/yorks/chapel/Module_Common/LMX_chapel_props.dae"; + playAmbient = "1"; + meshCulling = "0"; + originSort = "0"; + CollisionType = "Collision Mesh"; + DecalType = "Collision Mesh"; + allowPlayerStep = "0"; + alphaFadeEnable = "0"; + alphaFadeStart = "100"; + alphaFadeEnd = "150"; + alphaFadeInverse = "0"; + renderNormals = "0"; + forceDetail = "-1"; + ignoreZodiacs = "0"; + useGradientRange = "0"; + gradientRange = "0 180"; + invertGradientRange = "0"; + position = "0.569034 -19.8511 -0.101853"; + rotation = "1 0 0 0"; + scale = "1 1 1"; + canSave = "1"; + canSaveDynamicFields = "1"; + }; + new TSStatic() { + shapeName = "art/yorks/chapel/Module_Common/SB_chapel_glass.dae"; + playAmbient = "1"; + meshCulling = "0"; + originSort = "0"; + CollisionType = "Collision Mesh"; + DecalType = "Collision Mesh"; + allowPlayerStep = "0"; + alphaFadeEnable = "0"; + alphaFadeStart = "100"; + alphaFadeEnd = "150"; + alphaFadeInverse = "0"; + renderNormals = "0"; + forceDetail = "-1"; + ignoreZodiacs = "0"; + useGradientRange = "0"; + gradientRange = "0 180"; + invertGradientRange = "0"; + position = "0.569034 -19.8511 -0.101853"; + rotation = "1 0 0 0"; + scale = "1 1 1"; + canSave = "1"; + canSaveDynamicFields = "1"; + }; }; //--- OBJECT WRITE END ---