mirror of https://github.com/sm64pc/sm64pc.git
Lights for THI and some general tweaks on all ambient lights.
This commit is contained in:
parent
560d53b11f
commit
cc694ea503
|
@ -1787,8 +1787,8 @@
|
|||
"attenuationRadius": 0.0,
|
||||
"diffuseColor": [
|
||||
0.30000001192092896,
|
||||
0.3499999940395355,
|
||||
0.44999998807907104
|
||||
0.4000000059604645,
|
||||
0.5
|
||||
],
|
||||
"flickerIntensity": 0.0,
|
||||
"groupBits": 0,
|
||||
|
@ -1805,9 +1805,9 @@
|
|||
"attenuationExponent": 0.0,
|
||||
"attenuationRadius": 99999997952.0,
|
||||
"diffuseColor": [
|
||||
0.699999988079071,
|
||||
0.6000000238418579,
|
||||
0.550000011920929,
|
||||
0.44999998807907104
|
||||
0.5
|
||||
],
|
||||
"flickerIntensity": 0.0,
|
||||
"groupBits": 1,
|
||||
|
@ -1830,8 +1830,8 @@
|
|||
"attenuationRadius": 0.0,
|
||||
"diffuseColor": [
|
||||
0.30000001192092896,
|
||||
0.3499999940395355,
|
||||
0.44999998807907104
|
||||
0.4000000059604645,
|
||||
0.5
|
||||
],
|
||||
"flickerIntensity": 0.0,
|
||||
"groupBits": 0,
|
||||
|
@ -1848,8 +1848,8 @@
|
|||
"attenuationExponent": 0.0,
|
||||
"attenuationRadius": 99999997952.0,
|
||||
"diffuseColor": [
|
||||
0.6499999761581421,
|
||||
0.75,
|
||||
0.6000000238418579,
|
||||
0.699999988079071,
|
||||
0.800000011920929
|
||||
],
|
||||
"flickerIntensity": 0.0,
|
||||
|
@ -1903,7 +1903,7 @@
|
|||
},
|
||||
{
|
||||
"attenuationExponent": 0.75,
|
||||
"attenuationRadius": 2500.0,
|
||||
"attenuationRadius": 3000.0,
|
||||
"diffuseColor": [
|
||||
1.2000000476837158,
|
||||
1.0,
|
||||
|
@ -1922,11 +1922,11 @@
|
|||
},
|
||||
{
|
||||
"attenuationExponent": 1.0,
|
||||
"attenuationRadius": 2000.0,
|
||||
"attenuationRadius": 3000.0,
|
||||
"diffuseColor": [
|
||||
0.6000000238418579,
|
||||
0.8999999761581421,
|
||||
1.2000000476837158
|
||||
1.2000000476837158,
|
||||
1.5
|
||||
],
|
||||
"flickerIntensity": 0.0,
|
||||
"groupBits": 2,
|
||||
|
@ -1997,8 +1997,8 @@
|
|||
"attenuationRadius": 0.0,
|
||||
"diffuseColor": [
|
||||
0.30000001192092896,
|
||||
0.3499999940395355,
|
||||
0.44999998807907104
|
||||
0.4000000059604645,
|
||||
0.5
|
||||
],
|
||||
"flickerIntensity": 0.0,
|
||||
"groupBits": 0,
|
||||
|
@ -2015,9 +2015,9 @@
|
|||
"attenuationExponent": 0.25,
|
||||
"attenuationRadius": 3050.0,
|
||||
"diffuseColor": [
|
||||
0.949999988079071,
|
||||
0.8500000238418579,
|
||||
0.75
|
||||
0.8999999761581421,
|
||||
0.800000011920929,
|
||||
0.699999988079071
|
||||
],
|
||||
"flickerIntensity": 0.0,
|
||||
"groupBits": 1,
|
||||
|
@ -2268,8 +2268,8 @@
|
|||
"attenuationRadius": 0.0,
|
||||
"diffuseColor": [
|
||||
0.30000001192092896,
|
||||
0.3499999940395355,
|
||||
0.44999998807907104
|
||||
0.4000000059604645,
|
||||
0.5
|
||||
],
|
||||
"flickerIntensity": 0.0,
|
||||
"groupBits": 0,
|
||||
|
@ -4109,8 +4109,8 @@
|
|||
"attenuationRadius": 0.0,
|
||||
"diffuseColor": [
|
||||
0.30000001192092896,
|
||||
0.3499999940395355,
|
||||
0.44999998807907104
|
||||
0.4000000059604645,
|
||||
0.5
|
||||
],
|
||||
"flickerIntensity": 0.0,
|
||||
"groupBits": 0,
|
||||
|
@ -4128,8 +4128,8 @@
|
|||
"attenuationRadius": 99999997952.0,
|
||||
"diffuseColor": [
|
||||
0.800000011920929,
|
||||
0.75,
|
||||
0.6499999761581421
|
||||
0.699999988079071,
|
||||
0.6000000238418579
|
||||
],
|
||||
"flickerIntensity": 0.0,
|
||||
"groupBits": 1,
|
||||
|
@ -4453,8 +4453,8 @@
|
|||
"attenuationRadius": 0.0,
|
||||
"diffuseColor": [
|
||||
0.30000001192092896,
|
||||
0.3499999940395355,
|
||||
0.44999998807907104
|
||||
0.4000000059604645,
|
||||
0.5
|
||||
],
|
||||
"flickerIntensity": 0.0,
|
||||
"groupBits": 0,
|
||||
|
@ -4472,8 +4472,8 @@
|
|||
"attenuationRadius": 99999997952.0,
|
||||
"diffuseColor": [
|
||||
0.800000011920929,
|
||||
0.75,
|
||||
0.6499999761581421
|
||||
0.699999988079071,
|
||||
0.6000000238418579
|
||||
],
|
||||
"flickerIntensity": 0.0,
|
||||
"groupBits": 1,
|
||||
|
@ -4700,9 +4700,9 @@
|
|||
"attenuationExponent": 0.0,
|
||||
"attenuationRadius": 0.0,
|
||||
"diffuseColor": [
|
||||
0.20000000298023224,
|
||||
0.25,
|
||||
0.3499999940395355
|
||||
0.30000001192092896,
|
||||
0.4000000059604645,
|
||||
0.5
|
||||
],
|
||||
"flickerIntensity": 0.0,
|
||||
"groupBits": 0,
|
||||
|
@ -4720,8 +4720,8 @@
|
|||
"attenuationRadius": 99999997952.0,
|
||||
"diffuseColor": [
|
||||
0.800000011920929,
|
||||
0.75,
|
||||
0.6499999761581421
|
||||
0.699999988079071,
|
||||
0.6000000238418579
|
||||
],
|
||||
"flickerIntensity": 0.0,
|
||||
"groupBits": 1,
|
||||
|
@ -4930,8 +4930,8 @@
|
|||
"attenuationRadius": 0.0,
|
||||
"diffuseColor": [
|
||||
0.30000001192092896,
|
||||
0.3499999940395355,
|
||||
0.44999998807907104
|
||||
0.4000000059604645,
|
||||
0.5
|
||||
],
|
||||
"flickerIntensity": 0.0,
|
||||
"groupBits": 0,
|
||||
|
@ -4949,16 +4949,16 @@
|
|||
"attenuationRadius": 99999997952.0,
|
||||
"diffuseColor": [
|
||||
0.800000011920929,
|
||||
0.75,
|
||||
0.6499999761581421
|
||||
0.699999988079071,
|
||||
0.6000000238418579
|
||||
],
|
||||
"flickerIntensity": 0.0,
|
||||
"groupBits": 1,
|
||||
"pointRadius": 5000.0,
|
||||
"pointRadius": 6000.0,
|
||||
"position": [
|
||||
100000.0,
|
||||
200000.0,
|
||||
100000.0
|
||||
-100000.0,
|
||||
250000.0,
|
||||
200000.0
|
||||
],
|
||||
"shadowOffset": 0.0,
|
||||
"specularIntensity": 0.6499999761581421
|
||||
|
@ -4973,8 +4973,8 @@
|
|||
"attenuationRadius": 0.0,
|
||||
"diffuseColor": [
|
||||
0.30000001192092896,
|
||||
0.3499999940395355,
|
||||
0.44999998807907104
|
||||
0.4000000059604645,
|
||||
0.5
|
||||
],
|
||||
"flickerIntensity": 0.0,
|
||||
"groupBits": 0,
|
||||
|
@ -4992,16 +4992,16 @@
|
|||
"attenuationRadius": 99999997952.0,
|
||||
"diffuseColor": [
|
||||
0.800000011920929,
|
||||
0.75,
|
||||
0.6499999761581421
|
||||
0.699999988079071,
|
||||
0.6000000238418579
|
||||
],
|
||||
"flickerIntensity": 0.0,
|
||||
"groupBits": 1,
|
||||
"pointRadius": 5000.0,
|
||||
"position": [
|
||||
100000.0,
|
||||
200000.0,
|
||||
100000.0
|
||||
-100000.0,
|
||||
250000.0,
|
||||
200000.0
|
||||
],
|
||||
"shadowOffset": 0.0,
|
||||
"specularIntensity": 0.6499999761581421
|
||||
|
@ -5021,8 +5021,8 @@
|
|||
"attenuationRadius": 0.0,
|
||||
"diffuseColor": [
|
||||
0.30000001192092896,
|
||||
0.3499999940395355,
|
||||
0.44999998807907104
|
||||
0.4000000059604645,
|
||||
0.5
|
||||
],
|
||||
"flickerIntensity": 0.0,
|
||||
"groupBits": 0,
|
||||
|
@ -5036,22 +5036,41 @@
|
|||
"specularIntensity": 0.0
|
||||
},
|
||||
{
|
||||
"attenuationExponent": 0.0,
|
||||
"attenuationRadius": 99999997952.0,
|
||||
"attenuationExponent": 1.0,
|
||||
"attenuationRadius": 10000.0,
|
||||
"diffuseColor": [
|
||||
0.800000011920929,
|
||||
0.75,
|
||||
0.6499999761581421
|
||||
1.0,
|
||||
0.8999999761581421,
|
||||
0.5
|
||||
],
|
||||
"flickerIntensity": 0.0,
|
||||
"groupBits": 1,
|
||||
"pointRadius": 5000.0,
|
||||
"groupBits": 4,
|
||||
"pointRadius": 50.0,
|
||||
"position": [
|
||||
100000.0,
|
||||
200000.0,
|
||||
100000.0
|
||||
0.0,
|
||||
2250.280517578125,
|
||||
0.0
|
||||
],
|
||||
"shadowOffset": 0.0,
|
||||
"shadowOffset": 50.0,
|
||||
"specularIntensity": 0.6499999761581421
|
||||
},
|
||||
{
|
||||
"attenuationExponent": 1.0,
|
||||
"attenuationRadius": 1000.0,
|
||||
"diffuseColor": [
|
||||
1.0,
|
||||
0.8999999761581421,
|
||||
0.800000011920929
|
||||
],
|
||||
"flickerIntensity": 0.0,
|
||||
"groupBits": 4,
|
||||
"pointRadius": 50.0,
|
||||
"position": [
|
||||
0.0,
|
||||
3111.06005859375,
|
||||
0.0
|
||||
],
|
||||
"shadowOffset": 50.0,
|
||||
"specularIntensity": 0.6499999761581421
|
||||
}
|
||||
]
|
||||
|
@ -5351,8 +5370,8 @@
|
|||
"attenuationRadius": 0.0,
|
||||
"diffuseColor": [
|
||||
0.30000001192092896,
|
||||
0.3499999940395355,
|
||||
0.44999998807907104
|
||||
0.4000000059604645,
|
||||
0.5
|
||||
],
|
||||
"flickerIntensity": 0.0,
|
||||
"groupBits": 0,
|
||||
|
@ -5370,8 +5389,8 @@
|
|||
"attenuationRadius": 99999997952.0,
|
||||
"diffuseColor": [
|
||||
0.800000011920929,
|
||||
0.75,
|
||||
0.6499999761581421
|
||||
0.699999988079071,
|
||||
0.6000000238418579
|
||||
],
|
||||
"flickerIntensity": 0.0,
|
||||
"groupBits": 1,
|
||||
|
@ -6632,8 +6651,8 @@
|
|||
"attenuationRadius": 0.0,
|
||||
"diffuseColor": [
|
||||
0.30000001192092896,
|
||||
0.3499999940395355,
|
||||
0.44999998807907104
|
||||
0.4000000059604645,
|
||||
0.5
|
||||
],
|
||||
"flickerIntensity": 0.0,
|
||||
"groupBits": 0,
|
||||
|
@ -8677,8 +8696,8 @@
|
|||
"attenuationRadius": 0.0,
|
||||
"diffuseColor": [
|
||||
0.30000001192092896,
|
||||
0.3499999940395355,
|
||||
0.44999998807907104
|
||||
0.4000000059604645,
|
||||
0.5
|
||||
],
|
||||
"flickerIntensity": 0.0,
|
||||
"groupBits": 0,
|
||||
|
@ -8696,8 +8715,8 @@
|
|||
"attenuationRadius": 99999997952.0,
|
||||
"diffuseColor": [
|
||||
0.800000011920929,
|
||||
0.75,
|
||||
0.6499999761581421
|
||||
0.699999988079071,
|
||||
0.6000000238418579
|
||||
],
|
||||
"flickerIntensity": 0.0,
|
||||
"groupBits": 1,
|
||||
|
@ -8720,8 +8739,8 @@
|
|||
"attenuationRadius": 0.0,
|
||||
"diffuseColor": [
|
||||
0.30000001192092896,
|
||||
0.3499999940395355,
|
||||
0.44999998807907104
|
||||
0.4000000059604645,
|
||||
0.5
|
||||
],
|
||||
"flickerIntensity": 0.0,
|
||||
"groupBits": 0,
|
||||
|
@ -8739,8 +8758,8 @@
|
|||
"attenuationRadius": 99999997952.0,
|
||||
"diffuseColor": [
|
||||
0.800000011920929,
|
||||
0.75,
|
||||
0.6499999761581421
|
||||
0.699999988079071,
|
||||
0.6000000238418579
|
||||
],
|
||||
"flickerIntensity": 0.0,
|
||||
"groupBits": 1,
|
||||
|
@ -8787,8 +8806,8 @@
|
|||
"attenuationRadius": 0.0,
|
||||
"diffuseColor": [
|
||||
0.30000001192092896,
|
||||
0.3499999940395355,
|
||||
0.44999998807907104
|
||||
0.4000000059604645,
|
||||
0.5
|
||||
],
|
||||
"flickerIntensity": 0.0,
|
||||
"groupBits": 0,
|
||||
|
@ -8806,8 +8825,8 @@
|
|||
"attenuationRadius": 99999997952.0,
|
||||
"diffuseColor": [
|
||||
0.800000011920929,
|
||||
0.75,
|
||||
0.6499999761581421
|
||||
0.699999988079071,
|
||||
0.6000000238418579
|
||||
],
|
||||
"flickerIntensity": 0.0,
|
||||
"groupBits": 1,
|
||||
|
@ -8830,8 +8849,8 @@
|
|||
"attenuationRadius": 0.0,
|
||||
"diffuseColor": [
|
||||
0.30000001192092896,
|
||||
0.3499999940395355,
|
||||
0.44999998807907104
|
||||
0.4000000059604645,
|
||||
0.5
|
||||
],
|
||||
"flickerIntensity": 0.0,
|
||||
"groupBits": 0,
|
||||
|
@ -8849,8 +8868,8 @@
|
|||
"attenuationRadius": 99999997952.0,
|
||||
"diffuseColor": [
|
||||
0.800000011920929,
|
||||
0.75,
|
||||
0.6499999761581421
|
||||
0.699999988079071,
|
||||
0.6000000238418579
|
||||
],
|
||||
"flickerIntensity": 0.0,
|
||||
"groupBits": 1,
|
||||
|
|
|
@ -120,6 +120,24 @@
|
|||
"materialMod": null,
|
||||
"name": "actors/checkerboard_platform/checkerboard_platform_side.rgba16"
|
||||
},
|
||||
{
|
||||
"materialMod": {
|
||||
"ignoreNormalFactor": 1.0
|
||||
},
|
||||
"name": "actors/chuckya/chuckya_body_arm_left_side.rgba16"
|
||||
},
|
||||
{
|
||||
"materialMod": {
|
||||
"ignoreNormalFactor": 1.0
|
||||
},
|
||||
"name": "actors/chuckya/chuckya_body_arm_right_side.rgba16"
|
||||
},
|
||||
{
|
||||
"materialMod": {
|
||||
"ignoreNormalFactor": 1.0
|
||||
},
|
||||
"name": "actors/chuckya/chuckya_hand_antenna.rgba16"
|
||||
},
|
||||
{
|
||||
"materialMod": null,
|
||||
"name": "actors/coin/coin_front.ia16"
|
||||
|
@ -332,6 +350,13 @@
|
|||
},
|
||||
"name": "actors/star/star_surface.rgba16"
|
||||
},
|
||||
{
|
||||
"materialMod": {
|
||||
"ignoreNormalFactor": 1.0,
|
||||
"specularIntensity": 0.0
|
||||
},
|
||||
"name": "actors/tree/snowy_pine_tree.rgba16"
|
||||
},
|
||||
{
|
||||
"materialMod": null,
|
||||
"name": "actors/tree/tree_left_side.rgba16"
|
||||
|
@ -342,16 +367,15 @@
|
|||
},
|
||||
{
|
||||
"materialMod": {
|
||||
"reflectionFactor": 0.02500000037252903,
|
||||
"reflectionFresnelFactor": 0.10000000149011612,
|
||||
"specularExponent": 10.0
|
||||
"specularExponent": 5.0,
|
||||
"specularIntensity": 5.0
|
||||
},
|
||||
"name": "actors/warp_pipe/warp_pipe_side.rgba16"
|
||||
},
|
||||
{
|
||||
"materialMod": {
|
||||
"reflectionFactor": 0.02500000037252903,
|
||||
"reflectionFresnelFactor": 0.10000000149011612
|
||||
"specularExponent": 5.0,
|
||||
"specularIntensity": 5.0
|
||||
},
|
||||
"name": "actors/warp_pipe/warp_pipe_top.rgba16"
|
||||
},
|
||||
|
@ -836,6 +860,18 @@
|
|||
"materialMod": null,
|
||||
"name": "textures/grass/wf_textures.07000.rgba16"
|
||||
},
|
||||
{
|
||||
"materialMod": {
|
||||
"lightGroupMaskBits": 0,
|
||||
"selfLight": [
|
||||
0.5,
|
||||
0.5,
|
||||
0.5
|
||||
],
|
||||
"solidAlphaMultiplier": 0.5
|
||||
},
|
||||
"name": "textures/grass/wf_textures.0B800.ia16"
|
||||
},
|
||||
{
|
||||
"materialMod": null,
|
||||
"name": "textures/inside/inside_castle_textures.00000.rgba16"
|
||||
|
@ -1047,6 +1083,12 @@
|
|||
},
|
||||
"name": "textures/snow/ccm_textures.00800.rgba16"
|
||||
},
|
||||
{
|
||||
"materialMod": {
|
||||
"specularIntensity": 0.0
|
||||
},
|
||||
"name": "textures/snow/ccm_textures.02000.rgba16"
|
||||
},
|
||||
{
|
||||
"materialMod": {
|
||||
"specularIntensity": 0.0
|
||||
|
|
Loading…
Reference in New Issue