test Godot 4.2 beta

This commit is contained in:
deed 2023-10-20 16:28:26 +02:00
parent 874f53d8c2
commit 7902e1142e
18 changed files with 42 additions and 74 deletions

View file

@ -1,3 +1,3 @@
source_md5="00a829a1a6525327667989f332784055"
dest_md5="8a7f668c54f0891eed615adac7866ba7"
dest_md5="5eadda31cffa5e45312db9028a2420bb"

View file

@ -1,3 +1,3 @@
source_md5="3ed7d2e8eb8bc525b8c1677ca88ccd71"
dest_md5="6ba4ceeaa365c2ed49384521d721c516"
dest_md5="7b8b8d5ef31e90e25366d140e8ae949a"

View file

@ -1,3 +1,3 @@
source_md5="37e5a334b990996dc5fe4f7c071f0894"
dest_md5="eed87dea242e52b68f81accb3a37e3f2"
source_md5="06db590e6466e4740567d6c788cd46ad"
dest_md5="cc7ad3cf3677d6b99ad065f617f78688"

View file

@ -1,3 +1,3 @@
source_md5="e361aed20540bd1199a0033cb9383276"
dest_md5="c2b895c6d4f387133a5a15647fb0f366"
dest_md5="dac54ec6ea17107eebe5a20b93ee667f"

View file

@ -7,7 +7,7 @@ const HEIGHT_SHADER_PATH = "res://addons/waterways/shaders/system_renders/system
const FLOW_SHADER_PATH = "res://addons/waterways/shaders/system_renders/system_flow.gdshader"
const ALPHA_SHADER_PATH = "res://addons/waterways/shaders/system_renders/alpha.gdshader"
const RiverManager = preload("./river_manager.gd")
var renderer = SubViewport
var _camera: Camera3D
var _container: Node3D

View file

@ -4,8 +4,8 @@
extends Node3D
const RiverManager = preload("./river_manager.gd")
const SystemMapRenderer = preload("./system_map_renderer.gd")
const FilterRenderer = preload("./filter_renderer.gd")
const SystemMapRenderer = preload("./system_map_renderer.tscn")
const FilterRenderer = preload("./filter_renderer.tscn")
var system_map : ImageTexture = null: set = set_system_map
var system_bake_resolution := 2
@ -113,7 +113,7 @@ func generate_system_maps() -> void:
var river_aabb = river.get_transformed_aabb()
_system_aabb = _system_aabb.merge(river_aabb)
var renderer: SystemMapRenderer = SystemMapRenderer.instantiate()
var renderer = SystemMapRenderer
add_child(renderer)
var resolution := pow(2, system_bake_resolution + 7)
var flow_map: ImageTexture = await renderer.grab_flow(rivers, _system_aabb, resolution)
@ -122,7 +122,7 @@ func generate_system_maps() -> void:
remove_child(renderer)
var filter_renderer: FilterRenderer = FilterRenderer.instantiate()
var filter_renderer = FilterRenderer.instantiate()
add_child(filter_renderer)
self.system_map = await filter_renderer.apply_combine(flow_map, flow_map, height_map) as ImageTexture

View file

@ -22,6 +22,7 @@ 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

View file

@ -22,6 +22,7 @@ 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

View file

@ -22,6 +22,7 @@ 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

Binary file not shown.

Binary file not shown.

Before

Width:  |  Height:  |  Size: 157 KiB

After

Width:  |  Height:  |  Size: 157 KiB

View file

@ -15,6 +15,10 @@ run/main_scene="res://scenes/interface/page_login.tscn"
config/features=PackedStringArray("4.2", "Forward Plus")
config/icon="res://icon.png"
[editor_plugins]
enabled=PackedStringArray("res://addons/proton_scatter/plugin.cfg", "res://addons/waterways/plugin.cfg", "res://addons/zylann.hterrain/plugin.cfg")
[input]
ui_left={

File diff suppressed because one or more lines are too long