Skip to content

Commit

Permalink
Upgrade to Godot 4.2 (#8)
Browse files Browse the repository at this point in the history
* GDScript upgrade

* upgrade meshes
  • Loading branch information
TitanNano authored Dec 7, 2023
1 parent 7be2ac5 commit 56fd4c9
Show file tree
Hide file tree
Showing 322 changed files with 2,250 additions and 1,995 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ jobs:
strategy:
matrix:
profile: ['macOS', 'Windows', 'Linux']
version: ['4.1.1']
version: ['4.2']
include:
- profile: 'macOS'
platform: darwin
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@
[ext_resource type="Script" path="res://addons/visual_shader_node_library/shader_nodes/3d/depth_world_position.gd" id="10"]
[ext_resource type="Script" path="res://addons/visual_shader_node_library/shader_nodes/common/rotation_2d.gd" id="11"]
[ext_resource type="Script" path="res://addons/visual_shader_node_library/shader_nodes/3d/deep_parallax.gd" id="12"]
[ext_resource type="PackedScene" path="res://addons/visual_shader_node_library/examples/3D/models/test_bed/test_bed.tscn" id="17"]
[ext_resource type="PackedScene" uid="uid://bbo06bjr620sx" path="res://addons/visual_shader_node_library/examples/3D/models/test_bed/test_bed.tscn" id="17"]
[ext_resource type="Script" path="res://addons/visual_shader_node_library/examples/3D/tester.gd" id="18"]
[ext_resource type="Script" path="res://addons/visual_shader_node_library/shader_nodes/3d/depth.gd" id="19"]
[ext_resource type="Script" path="res://addons/visual_shader_node_library/shader_nodes/common/rotation_3d.gd" id="20"]
[ext_resource type="Script" path="res://addons/visual_shader_node_library/shader_nodes/common/flowmap_add_uv.gd" id="21"]
[ext_resource type="Script" path="res://addons/visual_shader_node_library/shader_nodes/common/flowmap.gd" id="22"]
[ext_resource type="Script" path="res://addons/visual_shader_node_library/shader_nodes/3d/object_world_position.gd" id="23"]
[ext_resource type="PackedScene" path="res://addons/visual_shader_node_library/examples/3D/models/terrain.tscn" id="25"]
[ext_resource type="PackedScene" uid="uid://kgqolp34ab2j" path="res://addons/visual_shader_node_library/examples/3D/models/terrain.tscn" id="25"]
[ext_resource type="Material" uid="uid://cekvwfoxxu38" path="res://addons/visual_shader_node_library/examples/3D/models/proc_wood.material" id="28"]

[sub_resource type="SphereMesh" id="1"]
Expand Down Expand Up @@ -90,6 +90,8 @@ script = ExtResource("3")

[sub_resource type="VisualShader" id="141"]
code = "shader_type spatial;
render_mode blend_mix, depth_draw_opaque, cull_back, diffuse_lambert, specular_schlick_ggx;



"
Expand Down
Binary file not shown.
34 changes: 17 additions & 17 deletions addons/visual_shader_node_library/examples/3D/models/terrain.tscn

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,15 @@ meshes/generate_lods=true
meshes/create_shadow_meshes=true
meshes/light_baking=1
meshes/lightmap_texel_size=0.2
meshes/force_disable_compression=false
skins/use_named_skins=true
animation/import=true
animation/fps=30
animation/trimming=false
animation/remove_immutable_tracks=true
import_script/path=""
_subresources={}
gltf/naming_version=0
gltf/embedded_image_handling=1
blender/nodes/visible=0
blender/nodes/punctual_lights=true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,13 @@ meshes/generate_lods=true
meshes/create_shadow_meshes=true
meshes/light_baking=0
meshes/lightmap_texel_size=0.1
meshes/force_disable_compression=false
skins/use_named_skins=true
animation/import=true
animation/fps=15
animation/trimming=false
animation/remove_immutable_tracks=true
import_script/path=""
_subresources={}
gltf/naming_version=0
gltf/embedded_image_handling=1
Original file line number Diff line number Diff line change
@@ -1,22 +1,19 @@
[gd_scene load_steps=4 format=2]
[gd_scene load_steps=4 format=3 uid="uid://bbo06bjr620sx"]

[ext_resource path="res://addons/visual_shader_node_library/examples/3D/models/test_bed/test_bed.glb" type="PackedScene" id=1]
[ext_resource path="res://addons/visual_shader_node_library/examples/3D/models/test_bed/small_material.tres" type="Material" id=2]
[ext_resource path="res://addons/visual_shader_node_library/examples/3D/models/test_bed/large_material.tres" type="Material" id=3]
[ext_resource type="PackedScene" uid="uid://cvn7rm3mlem6u" path="res://addons/visual_shader_node_library/examples/3D/models/test_bed/test_bed.glb" id="1"]
[ext_resource type="Material" path="res://addons/visual_shader_node_library/examples/3D/models/test_bed/small_material.tres" id="2"]
[ext_resource type="Material" path="res://addons/visual_shader_node_library/examples/3D/models/test_bed/large_material.tres" id="3"]




[node name="TestBed" index="0" instance=ExtResource( 1 )]
[node name="TestBed" index="0" instance=ExtResource("1")]

[node name="SmallPart" parent="." index="0"]
material/0 = ExtResource( 2 )
material/0 = ExtResource("2")

[node name="LargePart" parent="." index="1"]
material/0 = ExtResource( 3 )
material/0 = ExtResource("3")

[node name="SpotLight3D" type="SpotLight3D" parent="." index="2"]
transform = Transform3D( 1, 0, 0, 0, 0.707107, 0.707107, 0, -0.707107, 0.707107, 0, 5.5, 0 )
transform = Transform3D(1, 0, 0, 0, 0.707107, 0.707107, 0, -0.707107, 0.707107, 0, 5.5, 0)
shadow_enabled = true
spot_range = 9.37954
spot_angle = 31.8299
10 changes: 6 additions & 4 deletions project.godot
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,16 @@ config_version=5

config/name="Sim Chopper"
run/main_scene="res://resources/main.tscn"
config/features=PackedStringArray("4.1")
config/features=PackedStringArray("4.2")

[debug]

gdscript/warnings/unassigned_variable=2
gdscript/warnings/shadowed_variable=0
gdscript/warnings/unsafe_property_access=2
gdscript/warnings/unsafe_method_access=2
gdscript/warnings/unsafe_cast=1
gdscript/warnings/unsafe_call_argument=1
gdscript/warnings/unsafe_cast=2
gdscript/warnings/unsafe_call_argument=2
gdscript/warnings/static_called_on_instance=0
shapes/road_navigation/display_network=false
shapes/road_navigation/display_vehicle_target=false
Expand All @@ -36,7 +38,7 @@ window/size/mode.release=3
[editor]

export/convert_text_resources_to_binary=false
required_version="4.1.1"
required_version="4.2.0"

[editor_plugins]

Expand Down
2 changes: 2 additions & 0 deletions resources/Meshes/Buildings/Abandoned/building_1.gltf.import
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,13 @@ meshes/generate_lods=true
meshes/create_shadow_meshes=true
meshes/light_baking=1
meshes/lightmap_texel_size=0.1
meshes/force_disable_compression=false
skins/use_named_skins=true
animation/import=true
animation/fps=15
animation/trimming=false
animation/remove_immutable_tracks=true
import_script/path=""
_subresources={}
gltf/naming_version=0
gltf/embedded_image_handling=1
2 changes: 2 additions & 0 deletions resources/Meshes/Buildings/Abandoned/building_2.gltf.import
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,13 @@ meshes/generate_lods=true
meshes/create_shadow_meshes=true
meshes/light_baking=1
meshes/lightmap_texel_size=0.1
meshes/force_disable_compression=false
skins/use_named_skins=true
animation/import=true
animation/fps=15
animation/trimming=false
animation/remove_immutable_tracks=true
import_script/path=""
_subresources={}
gltf/naming_version=0
gltf/embedded_image_handling=1
2 changes: 2 additions & 0 deletions resources/Meshes/Buildings/Abandoned/building_3.gltf.import
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,13 @@ meshes/generate_lods=true
meshes/create_shadow_meshes=true
meshes/light_baking=1
meshes/lightmap_texel_size=0.1
meshes/force_disable_compression=false
skins/use_named_skins=true
animation/import=true
animation/fps=15
animation/trimming=false
animation/remove_immutable_tracks=true
import_script/path=""
_subresources={}
gltf/naming_version=0
gltf/embedded_image_handling=1
2 changes: 2 additions & 0 deletions resources/Meshes/Buildings/Abandoned/building_4.gltf.import
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,13 @@ meshes/generate_lods=true
meshes/create_shadow_meshes=true
meshes/light_baking=1
meshes/lightmap_texel_size=0.1
meshes/force_disable_compression=false
skins/use_named_skins=true
animation/import=true
animation/fps=15
animation/trimming=false
animation/remove_immutable_tracks=true
import_script/path=""
_subresources={}
gltf/naming_version=0
gltf/embedded_image_handling=1
2 changes: 2 additions & 0 deletions resources/Meshes/Buildings/Abandoned/building_5.gltf.import
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,13 @@ meshes/generate_lods=true
meshes/create_shadow_meshes=true
meshes/light_baking=1
meshes/lightmap_texel_size=0.1
meshes/force_disable_compression=false
skins/use_named_skins=true
animation/import=true
animation/fps=15
animation/trimming=false
animation/remove_immutable_tracks=true
import_script/path=""
_subresources={}
gltf/naming_version=0
gltf/embedded_image_handling=1
2 changes: 2 additions & 0 deletions resources/Meshes/Buildings/Abandoned/building_6.gltf.import
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,13 @@ meshes/generate_lods=true
meshes/create_shadow_meshes=true
meshes/light_baking=1
meshes/lightmap_texel_size=0.1
meshes/force_disable_compression=false
skins/use_named_skins=true
animation/import=true
animation/fps=15
animation/trimming=false
animation/remove_immutable_tracks=true
import_script/path=""
_subresources={}
gltf/naming_version=0
gltf/embedded_image_handling=1
2 changes: 2 additions & 0 deletions resources/Meshes/Buildings/Airport/building_1.gltf.import
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,13 @@ meshes/generate_lods=true
meshes/create_shadow_meshes=true
meshes/light_baking=1
meshes/lightmap_texel_size=0.1
meshes/force_disable_compression=false
skins/use_named_skins=true
animation/import=true
animation/fps=15
animation/trimming=false
animation/remove_immutable_tracks=true
import_script/path=""
_subresources={}
gltf/naming_version=0
gltf/embedded_image_handling=1
2 changes: 2 additions & 0 deletions resources/Meshes/Buildings/Airport/building_2.gltf.import
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,13 @@ meshes/generate_lods=true
meshes/create_shadow_meshes=true
meshes/light_baking=1
meshes/lightmap_texel_size=0.1
meshes/force_disable_compression=false
skins/use_named_skins=true
animation/import=true
animation/fps=15
animation/trimming=false
animation/remove_immutable_tracks=true
import_script/path=""
_subresources={}
gltf/naming_version=0
gltf/embedded_image_handling=1
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,13 @@ meshes/generate_lods=true
meshes/create_shadow_meshes=true
meshes/light_baking=1
meshes/lightmap_texel_size=0.1
meshes/force_disable_compression=false
skins/use_named_skins=true
animation/import=true
animation/fps=15
animation/trimming=false
animation/remove_immutable_tracks=true
import_script/path=""
_subresources={}
gltf/naming_version=0
gltf/embedded_image_handling=1
2 changes: 2 additions & 0 deletions resources/Meshes/Buildings/Airport/hangar_1.gltf.import
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,13 @@ meshes/generate_lods=true
meshes/create_shadow_meshes=true
meshes/light_baking=1
meshes/lightmap_texel_size=0.1
meshes/force_disable_compression=false
skins/use_named_skins=true
animation/import=true
animation/fps=15
animation/trimming=false
animation/remove_immutable_tracks=true
import_script/path=""
_subresources={}
gltf/naming_version=0
gltf/embedded_image_handling=1
2 changes: 2 additions & 0 deletions resources/Meshes/Buildings/Airport/runway.gltf.import
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,13 @@ meshes/generate_lods=true
meshes/create_shadow_meshes=true
meshes/light_baking=1
meshes/lightmap_texel_size=0.1
meshes/force_disable_compression=false
skins/use_named_skins=true
animation/import=true
animation/fps=15
animation/trimming=false
animation/remove_immutable_tracks=true
import_script/path=""
_subresources={}
gltf/naming_version=0
gltf/embedded_image_handling=1
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,13 @@ meshes/generate_lods=true
meshes/create_shadow_meshes=true
meshes/light_baking=1
meshes/lightmap_texel_size=0.1
meshes/force_disable_compression=false
skins/use_named_skins=true
animation/import=true
animation/fps=15
animation/trimming=false
animation/remove_immutable_tracks=true
import_script/path=""
_subresources={}
gltf/naming_version=0
gltf/embedded_image_handling=1
2 changes: 2 additions & 0 deletions resources/Meshes/Buildings/Airport/warehouse.gltf.import
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,13 @@ meshes/generate_lods=true
meshes/create_shadow_meshes=true
meshes/light_baking=1
meshes/lightmap_texel_size=0.1
meshes/force_disable_compression=false
skins/use_named_skins=true
animation/import=true
animation/fps=15
animation/trimming=false
animation/remove_immutable_tracks=true
import_script/path=""
_subresources={}
gltf/naming_version=0
gltf/embedded_image_handling=1
2 changes: 2 additions & 0 deletions resources/Meshes/Buildings/Apartments/large_1.gltf.import
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,13 @@ meshes/generate_lods=true
meshes/create_shadow_meshes=true
meshes/light_baking=1
meshes/lightmap_texel_size=0.1
meshes/force_disable_compression=false
skins/use_named_skins=true
animation/import=true
animation/fps=15
animation/trimming=false
animation/remove_immutable_tracks=true
import_script/path=""
_subresources={}
gltf/naming_version=0
gltf/embedded_image_handling=1
2 changes: 2 additions & 0 deletions resources/Meshes/Buildings/Apartments/large_2.gltf.import
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,13 @@ meshes/generate_lods=true
meshes/create_shadow_meshes=true
meshes/light_baking=1
meshes/lightmap_texel_size=0.1
meshes/force_disable_compression=false
skins/use_named_skins=true
animation/import=true
animation/fps=15
animation/trimming=false
animation/remove_immutable_tracks=true
import_script/path=""
_subresources={}
gltf/naming_version=0
gltf/embedded_image_handling=1
2 changes: 2 additions & 0 deletions resources/Meshes/Buildings/Apartments/medium_1.gltf.import
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,13 @@ meshes/generate_lods=true
meshes/create_shadow_meshes=true
meshes/light_baking=1
meshes/lightmap_texel_size=0.1
meshes/force_disable_compression=false
skins/use_named_skins=true
animation/import=true
animation/fps=15
animation/trimming=false
animation/remove_immutable_tracks=true
import_script/path=""
_subresources={}
gltf/naming_version=0
gltf/embedded_image_handling=1
2 changes: 2 additions & 0 deletions resources/Meshes/Buildings/Apartments/medium_2.gltf.import
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,13 @@ meshes/generate_lods=true
meshes/create_shadow_meshes=true
meshes/light_baking=1
meshes/lightmap_texel_size=0.1
meshes/force_disable_compression=false
skins/use_named_skins=true
animation/import=true
animation/fps=15
animation/trimming=false
animation/remove_immutable_tracks=true
import_script/path=""
_subresources={}
gltf/naming_version=0
gltf/embedded_image_handling=1
2 changes: 2 additions & 0 deletions resources/Meshes/Buildings/Apartments/small_1.gltf.import
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,13 @@ meshes/generate_lods=true
meshes/create_shadow_meshes=true
meshes/light_baking=1
meshes/lightmap_texel_size=0.1
meshes/force_disable_compression=false
skins/use_named_skins=true
animation/import=true
animation/fps=15
animation/trimming=false
animation/remove_immutable_tracks=true
import_script/path=""
_subresources={}
gltf/naming_version=0
gltf/embedded_image_handling=1
2 changes: 2 additions & 0 deletions resources/Meshes/Buildings/Apartments/small_2.gltf.import
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,13 @@ meshes/generate_lods=true
meshes/create_shadow_meshes=true
meshes/light_baking=1
meshes/lightmap_texel_size=0.1
meshes/force_disable_compression=false
skins/use_named_skins=true
animation/import=true
animation/fps=15
animation/trimming=false
animation/remove_immutable_tracks=true
import_script/path=""
_subresources={}
gltf/naming_version=0
gltf/embedded_image_handling=1
Loading

0 comments on commit 56fd4c9

Please sign in to comment.