Skip to content

Commit c742bee

Browse files
committed
Fix color tween and set the light count limit to 2à in the editor
1 parent cf0404a commit c742bee

1 file changed

Lines changed: 38 additions & 10 deletions

File tree

examples/3d-car-coin-hunt/3d-car-coin-hunt.json

Lines changed: 38 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"firstLayout": "Menu",
33
"gdVersion": {
4-
"build": 262,
4+
"build": 265,
55
"major": 5,
66
"minor": 6,
77
"revision": 0
@@ -87,7 +87,6 @@
8787
"playableDevices": [
8888
"keyboard",
8989
"gamepad",
90-
"mobile",
9190
"mobile"
9291
],
9392
"extensionProperties": [],
@@ -1266,6 +1265,17 @@
12661265
"name": "RoadBend"
12671266
}
12681267
]
1268+
},
1269+
{
1270+
"name": "Light",
1271+
"objects": [
1272+
{
1273+
"name": "NewSpotLight"
1274+
},
1275+
{
1276+
"name": "NewPointLight"
1277+
}
1278+
]
12691279
}
12701280
],
12711281
"variables": [
@@ -7352,7 +7362,12 @@
73527362
"variant": "",
73537363
"variables": [],
73547364
"effects": [],
7355-
"behaviors": [],
7365+
"behaviors": [
7366+
{
7367+
"name": "Tween",
7368+
"type": "Tween::TweenBehavior"
7369+
}
7370+
],
73567371
"content": {
73577372
"ShadowQuality": "High",
73587373
"Intensity": 4,
@@ -8856,7 +8871,7 @@
88568871
"value": "Tween::IsPlaying"
88578872
},
88588873
"parameters": [
8859-
"NewSpotLight",
8874+
"Light",
88608875
"Tween",
88618876
"\"Color\""
88628877
]
@@ -8874,12 +8889,23 @@
88748889
""
88758890
]
88768891
},
8892+
{
8893+
"type": {
8894+
"value": "Light3D::PointLight3D::SetColor"
8895+
},
8896+
"parameters": [
8897+
"NewPointLight",
8898+
"=",
8899+
"\"208;2;27\"",
8900+
""
8901+
]
8902+
},
88778903
{
88788904
"type": {
88798905
"value": "Tween::TweenBehavior::AddObjectColorTween2"
88808906
},
88818907
"parameters": [
8882-
"NewSpotLight",
8908+
"Light",
88838909
"Tween",
88848910
"\"Color\"",
88858911
"\"248;231;28\"",
@@ -42558,7 +42584,7 @@
4255842584
"}",
4255942585
"",
4256042586
"const editorLightCountMax = {",
42561-
" value: 4",
42587+
" value: 20",
4256242588
"};",
4256342589
"",
4256442590
"const lightCountMax = {",
@@ -43132,10 +43158,11 @@
4313243158
"if (!object.setColor && !object.getColor) {",
4313343159
" const prototype = Object.getPrototypeOf(object);",
4313443160
" prototype.setColor = function(tint) {",
43135-
" this.SetColor(tint, eventsFunctionContext);",
43161+
" this._setColor(tint);",
43162+
" this.__spotLightAdapter.setColor(tint);",
4313643163
" }",
4313743164
" prototype.getColor = function() {",
43138-
" return this.Color(eventsFunctionContext);",
43165+
" return this._getColor(eventsFunctionContext);",
4313943166
" }",
4314043167
"}",
4314143168
""
@@ -45217,10 +45244,11 @@
4521745244
"if (!object.setColor && !object.getColor) {",
4521845245
" const prototype = Object.getPrototypeOf(object);",
4521945246
" prototype.setColor = function(tint) {",
45220-
" this.SetColor(tint, eventsFunctionContext);",
45247+
" this._setColor(tint);",
45248+
" this.__pointLightAdapter.setColor(tint);",
4522145249
" }",
4522245250
" prototype.getColor = function() {",
45223-
" return this.Color(eventsFunctionContext);",
45251+
" return this._getColor(eventsFunctionContext);",
4522445252
" }",
4522545253
"}",
4522645254
""

0 commit comments

Comments
 (0)