Relintai/broken_seals
1
0
Fork 0
mirror of https://github.com/Relintai/broken_seals.git synced 2024-11-13 20:47:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updated the props module, I reimplemented vertex color lights + rao for PropInstanceMerger. Also updated mesh_utils, MeshMerger did not use vector write proxies.

Browse Source
This commit is contained in:
Relintai 2021-08-11 19:20:26 +02:00
parent 9386627682
commit 60e7d4af78
4 changed files with 17 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
HEADS
View File

@ -1 +1 @@
{"engine": {"3.2": "94a0fc47f7b4e90f8973f9adbfd3312579ed2825", "master": "8c73e813134001e575b6f59e3b0100471c007410", "3.x": "91cb296a9065c541bcc31f01dcd156f84086363e"}, "world_generator": {"master": "260c430f11b0b591eaf4714516419aa327d2842c"}, "entity_spell_system": {"master": "0f709b5455411652f371879e83a0737589d690c3"}, "ui_extensions": {"master": "f82273f54cb1ab87d458c91af9554acec5c10831"}, "voxelman": {"master": "9253cc53c6fbbd78b5e4268eb498ef55b4dd0181"}, "texture_packer": {"master": "a0786956813a85b5a82093a081b90c2f8a000e6c"}, "fastnoise": {"master": "d447fd5364e9ab5a6b14184483eab23cd3fe820b"}, "mesh_data_resource": {"master": "2a2b2ae31a57fa078c4de81123cb725e3818a1b3"}, "procedural_animations": {"master": "f8aae42bf06b3936cc6bd24cb18e1c3ec9f78f4f"}, "ess_data": {"master": "3bd637fdd3304b64a18287a49a6b7387acf2f5de"}, "props": {"master": "308d8e0baf5e77c1778e84e6ffe582ac064b91cb"}, "mesh_utils": {"master": "aa47e344fdceb1829fc0ace865178489f3448c99"}, "broken_seals_module": {"master": "2afea56eba66beeb543934edf5a38a8aa63fc79b"}, "thread_pool": {"master": "b2e8c815392052947e7386f722913a12eea543a4"}, "terraman": {"master": "ecf09d12457dff62e0fade1a403634fc845f5005"}}
{"engine": {"3.2": "94a0fc47f7b4e90f8973f9adbfd3312579ed2825", "master": "8c73e813134001e575b6f59e3b0100471c007410", "3.x": "91cb296a9065c541bcc31f01dcd156f84086363e"}, "world_generator": {"master": "260c430f11b0b591eaf4714516419aa327d2842c"}, "entity_spell_system": {"master": "0f709b5455411652f371879e83a0737589d690c3"}, "ui_extensions": {"master": "f82273f54cb1ab87d458c91af9554acec5c10831"}, "voxelman": {"master": "9253cc53c6fbbd78b5e4268eb498ef55b4dd0181"}, "texture_packer": {"master": "a0786956813a85b5a82093a081b90c2f8a000e6c"}, "fastnoise": {"master": "d447fd5364e9ab5a6b14184483eab23cd3fe820b"}, "mesh_data_resource": {"master": "2a2b2ae31a57fa078c4de81123cb725e3818a1b3"}, "procedural_animations": {"master": "f8aae42bf06b3936cc6bd24cb18e1c3ec9f78f4f"}, "ess_data": {"master": "3bd637fdd3304b64a18287a49a6b7387acf2f5de"}, "props": {"master": "1d4e05b5a11cb8d566a2209caddc89d5ce29b892"}, "mesh_utils": {"master": "e0ee26fc61f9d0f1a8a9a78070e3098c8f889048"}, "broken_seals_module": {"master": "2afea56eba66beeb543934edf5a38a8aa63fc79b"}, "thread_pool": {"master": "b2e8c815392052947e7386f722913a12eea543a4"}, "terraman": {"master": "ecf09d12457dff62e0fade1a403634fc845f5005"}}

6
game/test_props/MeshDataInstance.tres
View File

@ -17,12 +17,12 @@ mesh = ExtResource( 2 )
texture = ExtResource( 3 )
[sub_resource type="PropDataLight" id=3]
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0.879526, 0, 1.18272 )
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 3.84759, 0, 1.18272 )
light_color = Color( 0.643137, 0.376471, 0.376471, 1 )
light_size = 6
light_size = 21
[sub_resource type="PropDataProp" id=4]
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 5.55294, 0, 2.9085 )
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 7.96042, 0, 2.9085 )
prop = ExtResource( 5 )
[resource]

55
game/test_props/MeshDataInstance.tscn
View File

File diff suppressed because one or more lines are too long

1
game/test_props/Spatial.tscn
View File

@ -12,4 +12,5 @@ transform = Transform( 1, 0, 0, 0, 0.828911, 0.559381, 0, -0.559381, 0.828911, 2
[node name="DirectionalLight" type="DirectionalLight" parent="."]
transform = Transform( 1, 0, 0, 0, 0.823889, 0.566751, 0, -0.566751, 0.823889, 0, 2.11892, 3.32613 )
visible = false
light_energy = 0.904