mirror of
https://github.com/TorqueGameEngines/Torque3D.git
synced 2026-07-15 08:34:40 +00:00
Various fixes
This commit is contained in:
Areloch
parent
0e6ba354db
commit
ad5f583893
28 changed files with 198 additions and 381 deletions
|
|
@ -3,9 +3,17 @@ singleton Material(Grid_512_Orange)
|
|||
{
|
||||
mapTo = "Grid_512_orange";
|
||||
diffuseColor[0] = "0.8 0.8 0.8 1";
|
||||
diffuseMap[0] = "E:/Gamedev/T3DMIT/clangtest/Templates/Full/game/core/art/grids/Grid_512_orange.png";
|
||||
diffuseMap[0] = "tools/base/images/512_orange.png";
|
||||
specular[0] = "0.8 0.8 0.8 1";
|
||||
specularPower[0] = "0.25";
|
||||
specularStrength[0] = "25";
|
||||
translucentBlendOp = "None";
|
||||
translucentBlendOp = "Add";
|
||||
smoothness[0] = "0.941176";
|
||||
metalness[0] = "1";
|
||||
DiffuseMapAsset0 = "StaticShapeTest:Grid_512_orange_ALBEDO";
|
||||
specularStrength0 = "25";
|
||||
specular0 = "0.8 0.8 0.8 1";
|
||||
specularPower0 = "0.25";
|
||||
emissive[0] = "1";
|
||||
translucent = "1";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,13 +1,16 @@
|
|||
//--- OBJECT WRITE BEGIN ---
|
||||
new Scene(PBRMatTestLevel) {
|
||||
new Scene(PbrMatTestLevel) {
|
||||
canSave = "1";
|
||||
canSaveDynamicFields = "1";
|
||||
isSubscene = "0";
|
||||
isEditing = "0";
|
||||
isDirty = "0";
|
||||
cdTrack = "2";
|
||||
CTF_scoreLimit = "5";
|
||||
enabled = "1";
|
||||
Enabled = "1";
|
||||
musicTrack = "lush";
|
||||
|
||||
new LevelInfo(theLevelInfo) {
|
||||
new LevelInfo(TheLevelInfo) {
|
||||
nearClip = "0.1";
|
||||
visibleDistance = "1000";
|
||||
visibleGhostDistance = "0";
|
||||
|
|
@ -24,8 +27,8 @@ new Scene(PBRMatTestLevel) {
|
|||
canSave = "1";
|
||||
canSaveDynamicFields = "1";
|
||||
desc0 = "PBR Mat Test";
|
||||
enabled = "1";
|
||||
levelName = "A PBR Mat test";
|
||||
Enabled = "1";
|
||||
LevelName = "A PBR Mat test";
|
||||
};
|
||||
new SkyBox(theSky) {
|
||||
Material = "HdrSky";
|
||||
|
|
@ -51,7 +54,6 @@ new Scene(PBRMatTestLevel) {
|
|||
coronaScale = "0.5";
|
||||
coronaTint = "1 1 1 1";
|
||||
coronaUseLightColor = "1";
|
||||
flareType = "SunFlareExample";
|
||||
flareScale = "1";
|
||||
attenuationRatio = "0 1 1";
|
||||
shadowType = "PSSM";
|
||||
|
|
@ -76,29 +78,10 @@ new Scene(PBRMatTestLevel) {
|
|||
new SimGroup(PlayerDropPoints) {
|
||||
canSave = "1";
|
||||
canSaveDynamicFields = "1";
|
||||
enabled = "1";
|
||||
|
||||
new SpawnSphere() {
|
||||
autoSpawn = "0";
|
||||
spawnTransform = "0";
|
||||
radius = "0.5";
|
||||
sphereWeight = "1";
|
||||
indoorWeight = "1";
|
||||
outdoorWeight = "1";
|
||||
isAIControlled = "0";
|
||||
dataBlock = "SpawnSphereMarker";
|
||||
position = "-9.39606 10.3721 3.14272";
|
||||
rotation = "0 0 -1 90.6035";
|
||||
scale = "1 1 1";
|
||||
canSave = "1";
|
||||
canSaveDynamicFields = "1";
|
||||
enabled = "1";
|
||||
homingCount = "0";
|
||||
lockCount = "0";
|
||||
};
|
||||
Enabled = "1";
|
||||
};
|
||||
new Skylight(theSkyLight) {
|
||||
enabled = "1";
|
||||
Enabled = "1";
|
||||
ReflectionMode = "Baked Cubemap";
|
||||
position = "8.74661 10.1457 2.94337";
|
||||
rotation = "1 0 0 0";
|
||||
|
|
@ -111,179 +94,6 @@ new Scene(PBRMatTestLevel) {
|
|||
reflectionPath = "levels/Timmy Test/probes/";
|
||||
scale = "1 1 1";
|
||||
};
|
||||
new TSStatic() {
|
||||
shapeName = "art/shapes/material_ball/material_ball.dae";
|
||||
skin = "iron";
|
||||
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 = "-14.1145 15.7844 2.76337";
|
||||
rotation = "1 0 0 0";
|
||||
scale = "1 1 1";
|
||||
canSave = "1";
|
||||
canSaveDynamicFields = "1";
|
||||
};
|
||||
new TSStatic() {
|
||||
shapeName = "art/shapes/material_ball/material_ball.dae";
|
||||
skin = "plastic";
|
||||
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 = "-16.3895 15.7844 2.76337";
|
||||
rotation = "1 0 0 0";
|
||||
scale = "1 1 1";
|
||||
canSave = "1";
|
||||
canSaveDynamicFields = "1";
|
||||
};
|
||||
new TSStatic() {
|
||||
shapeName = "art/shapes/material_ball/material_ball.dae";
|
||||
skin = "gold";
|
||||
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 = "-11.9028 15.7844 2.76337";
|
||||
rotation = "1 0 0 0";
|
||||
scale = "1 1 1";
|
||||
canSave = "1";
|
||||
canSaveDynamicFields = "1";
|
||||
};
|
||||
new TSStatic() {
|
||||
shapeName = "art/shapes/material_ball/material_ball.dae";
|
||||
skin = "greasy";
|
||||
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 = "-9.71689 15.7844 2.76337";
|
||||
rotation = "1 0 0 0";
|
||||
scale = "1 1 1";
|
||||
canSave = "1";
|
||||
canSaveDynamicFields = "1";
|
||||
};
|
||||
new TSStatic() {
|
||||
shapeName = "art/shapes/material_ball/material_ball.dae";
|
||||
skin = "copper";
|
||||
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 = "-7.6275 15.7844 2.76337";
|
||||
rotation = "1 0 0 0";
|
||||
scale = "1 1 1";
|
||||
canSave = "1";
|
||||
canSaveDynamicFields = "1";
|
||||
};
|
||||
new TSStatic(floor) {
|
||||
shapeName = "art/shapes/floor/floor.dae";
|
||||
playAmbient = "1";
|
||||
meshCulling = "0";
|
||||
originSort = "0";
|
||||
CollisionType = "Visible Mesh";
|
||||
DecalType = "Visible 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 = "-11.7037 15.245 1.7387";
|
||||
rotation = "1 0 0 0";
|
||||
scale = "1 1 1";
|
||||
canSave = "1";
|
||||
canSaveDynamicFields = "1";
|
||||
};
|
||||
new TSStatic() {
|
||||
shapeName = "art/shapes/sphere/sphere.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 = "-10.15 -3.23709 3.47759";
|
||||
rotation = "1 0 0 0";
|
||||
scale = "1 1 1";
|
||||
canSave = "1";
|
||||
canSaveDynamicFields = "1";
|
||||
};
|
||||
new SpotLight() {
|
||||
range = "10";
|
||||
innerAngle = "5";
|
||||
|
|
@ -296,7 +106,6 @@ new Scene(PBRMatTestLevel) {
|
|||
dynamicRefreshFreq = "8";
|
||||
priority = "1";
|
||||
animate = "1";
|
||||
animationType = "SpinLightAnim";
|
||||
animationPeriod = "5";
|
||||
animationPhase = "1";
|
||||
flareScale = "1";
|
||||
|
|
@ -328,7 +137,6 @@ new Scene(PBRMatTestLevel) {
|
|||
dynamicRefreshFreq = "8";
|
||||
priority = "1";
|
||||
animate = "1";
|
||||
animationType = "SubtlePulseLightAnim";
|
||||
animationPeriod = "1";
|
||||
animationPhase = "1";
|
||||
flareScale = "1";
|
||||
|
|
@ -351,7 +159,7 @@ new Scene(PBRMatTestLevel) {
|
|||
canSaveDynamicFields = "1";
|
||||
};
|
||||
new ConvexShape() {
|
||||
Material = "Grid512_Blue_Mat";
|
||||
Material = "Grid_512_Orange";
|
||||
position = "-6.41329 13.7734 2.12278";
|
||||
rotation = "0 0 1 3.19212";
|
||||
scale = "1 1 1";
|
||||
|
|
@ -366,7 +174,7 @@ new Scene(PBRMatTestLevel) {
|
|||
surface = "0.5 -0.5 0.5 0.5 0.758333 0 -1.07696e-07";
|
||||
};
|
||||
new BoxEnvironmentProbe() {
|
||||
enabled = "0";
|
||||
Enabled = "0";
|
||||
refOffset = "0 0 0";
|
||||
refScale = "10 10 10";
|
||||
ReflectionMode = "Baked Cubemap";
|
||||
|
|
@ -378,5 +186,20 @@ new Scene(PBRMatTestLevel) {
|
|||
persistentId = "8c7e1f23-5f1c-11e9-8089-c88cdaba85a3";
|
||||
attenuation = "1";
|
||||
};
|
||||
new ConvexShape() {
|
||||
Material = "Floor_Material";
|
||||
position = "0 0 0";
|
||||
rotation = "1 0 0 0";
|
||||
scale = "15 15 1";
|
||||
canSave = "1";
|
||||
canSaveDynamicFields = "1";
|
||||
|
||||
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 0.707107 -0.707107 0 0 -0.5 0";
|
||||
surface = "0.5 0.5 -0.5 0.5 -0.5 0 0";
|
||||
surface = "0.5 -0.5 0.5 0.5 0.5 0 0";
|
||||
};
|
||||
};
|
||||
//--- OBJECT WRITE END ---
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
//------------------------------------------------------------------------------
|
||||
// Autogenerated 'GBuffer Conditioner' Condition Method
|
||||
//------------------------------------------------------------------------------
|
||||
inline float4 autogenCondition_55070f7a(in float4 unconditionedOutput)
|
||||
vec4 autogenCondition_55070f7a(vec4 unconditionedOutput)
|
||||
{
|
||||
// g-buffer conditioner: float4(normal.X, normal.Y, depth Hi, depth Lo)
|
||||
float4 _gbConditionedOutput = float4(sqrt(half(2.0/(1.0 - unconditionedOutput.y))) * half2(unconditionedOutput.xz), 0.0, unconditionedOutput.a);
|
||||
|
|
@ -18,10 +18,10 @@ inline float4 autogenCondition_55070f7a(in float4 unconditionedOutput)
|
|||
//------------------------------------------------------------------------------
|
||||
// Autogenerated 'GBuffer Conditioner' Uncondition Method
|
||||
//------------------------------------------------------------------------------
|
||||
inline float4 autogenUncondition_55070f7a(SamplerState deferredSamplerVar, Texture2D deferredTexVar, float2 screenUVVar)
|
||||
float4 autogenUncondition_55070f7a(sampler2D deferredSamplerVar, float2 screenUVVar)
|
||||
{
|
||||
// Sampler g-buffer
|
||||
float4 bufferSample = deferredTexVar.SampleLevel(deferredSamplerVar, screenUVVar,0);
|
||||
float4 bufferSample = tex2Dlod(deferredSamplerVar, float4(screenUVVar,0,0));
|
||||
// g-buffer unconditioner: float4(normal.X, normal.Y, depth Hi, depth Lo)
|
||||
float2 _inpXY = bufferSample.xy;
|
||||
float _xySQ = dot(_inpXY, _inpXY);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue