Khaganat-games/khanat-client
Khaganat-games/khanat-client
2
0
Fork 0
Code Issues 23 Pull requests 2 Projects Releases Packages Wiki Activity

Branch master was renamed to main.

Draft: Resolve "Créer une zone de paysage extérieur" #45

Open
yannk wants to merge 24 commits from 10-creer-une-zone-de-paysage-exterieur into develop
pull from: 10-creer-une-zone-de-paysage-exterieur
merge into: Khaganat-games:develop
Conversation 28 Commits 24 Files changed 348 +1 -37
2 changed files with 1 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 44a4844f36 - Show all commits

37
assets/landscape/aa_zone.tscn
View file

@ -1,16 +1,7 @@
[gd_scene load_steps=24 format=2]
[gd_scene load_steps=14 format=2]
[ext_resource path="res://addons/zylann.hterrain/hterrain.gd" type="Script" id=1]
[ext_resource path="res://addons/zylann.hterrain/hterrain_texture_set.gd" type="Script" id=2]
[ext_resource path="res://assets/landscape/data/aa_zone/data.hterrain" type="Resource" id=3]
[ext_resource path="res://assets/landscape/imported_textures/slot0_albedo_bump.packed_tex" type="Texture" id=4]
[ext_resource path="res://assets/landscape/imported_textures/slot2_albedo_bump.packed_tex" type="Texture" id=5]
[ext_resource path="res://assets/landscape/imported_textures/slot1_albedo_bump.packed_tex" type="Texture" id=6]
[ext_resource path="res://assets/landscape/imported_textures/slot3_albedo_bump.packed_tex" type="Texture" id=7]
[ext_resource path="res://assets/landscape/imported_textures/slot1_normal_roughness.packed_tex" type="Texture" id=8]
[ext_resource path="res://assets/landscape/imported_textures/slot2_normal_roughness.packed_tex" type="Texture" id=9]
[ext_resource path="res://assets/landscape/imported_textures/slot3_normal_roughness.packed_tex" type="Texture" id=10]
[ext_resource path="res://assets/landscape/imported_textures/slot0_normal_roughness.packed_tex" type="Texture" id=11]
[ext_resource path="res://assets/landscape/data/aa/data.hterrain" type="Resource" id=12]
[ext_resource path="res://assets/landscape/imported_textures/aa_zone_slot1_normal_roughness.packed_tex" type="Texture" id=13]
[ext_resource path="res://assets/landscape/imported_textures/aa_zone_slot2_normal_roughness.packed_tex" type="Texture" id=14]
@ -24,11 +15,6 @@
[sub_resource type="Environment" id=2]
ambient_light_color = Color( 1, 1, 1, 1 )
[sub_resource type="Resource" id=3]
script = ExtResource( 2 )
mode = 0
textures = [ [ ExtResource( 4 ), ExtResource( 6 ), ExtResource( 5 ), ExtResource( 7 ) ], [ ExtResource( 11 ), ExtResource( 8 ), ExtResource( 9 ), ExtResource( 10 ) ] ]
[sub_resource type="Resource" id=4]
script = ExtResource( 2 )
mode = 0
@ -44,27 +30,6 @@ environment = SubResource( 2 )
transform = Transform( 0.600044, -0.445864, -0.664193, 0.358619, -0.592248, 0.72155, -0.71508, -0.671154, -0.195479, 0, 20.3141, 3.8147e-06 )
shadow_enabled = true
[node name="HTerrain" type="Spatial" parent="."]
visible = false
script = ExtResource( 1 )
_terrain_data = ExtResource( 3 )
chunk_size = 32
collision_enabled = true
collision_layer = 1
collision_mask = 1
shader_type = "Classic4"
custom_shader = null
custom_globalmap_shader = null
texture_set = SubResource( 3 )
render_layers = 1
shader_params/u_ground_uv_scale_per_texture = Plane( 0.5, 0.5, 0.5, 0.5 )
shader_params/u_depth_blending = true
shader_params/u_triplanar = false
shader_params/u_tile_reduction = Plane( 0, 0, 0, 0 )
shader_params/u_globalmap_blend_start = null
shader_params/u_globalmap_blend_distance = null
shader_params/u_colormap_opacity_per_texture = Plane( 1, 1, 1, 1 )
[node name="HTerrain_2" type="Spatial" parent="."]
script = ExtResource( 1 )
_terrain_data = ExtResource( 12 )

1
scenes/game/alpha.tscn
View file

@ -16,7 +16,6 @@ transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.01, 0 )
[node name="creatures" type="Spatial" parent="."]
[node name="aa_zone" parent="." instance=ExtResource( 2 )]
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -64, -4.71, -64 )
[node name="menu_options" parent="." instance=ExtResource( 1 )]
visible = false