From b2a882fd3bec552f62c4253b94a6843839a4e73f Mon Sep 17 00:00:00 2001 From: osquallo Date: Tue, 8 Oct 2019 20:09:19 +0200 Subject: [PATCH] correction d'un petit oubli --- previewer/previewer.tscn | 46 +++++++++++++++++++--------------------- 1 file changed, 22 insertions(+), 24 deletions(-) diff --git a/previewer/previewer.tscn b/previewer/previewer.tscn index b7a2967..eb5f157 100644 --- a/previewer/previewer.tscn +++ b/previewer/previewer.tscn @@ -1,17 +1,16 @@ -[gd_scene load_steps=23 format=2] +[gd_scene load_steps=22 format=2] [ext_resource path="res://previewer/previewer.gd" type="Script" id=1] [ext_resource path="res://shaders/sky.shader" type="Shader" id=2] -[ext_resource path="res://textures/sky/milkywaypan_brunier_2048.jpg" type="Texture" id=3] -[ext_resource path="res://previewer/sky.gd" type="Script" id=4] -[ext_resource path="res://previewer/dummy/dummy.tscn" type="PackedScene" id=5] -[ext_resource path="res://textures/tilables/basic_texture_1024.png" type="Texture" id=6] -[ext_resource path="res://meshes/decors/rocks/cliff_001.tscn" type="PackedScene" id=7] -[ext_resource path="res://meshes/props/pendo_teddy/pendo_teddy.tscn" type="PackedScene" id=8] -[ext_resource path="res://meshes/props/travel_box/container.tscn" type="PackedScene" id=9] -[ext_resource path="res://meshes/props/reference_box/reference_box.tscn" type="PackedScene" id=10] -[ext_resource path="res://meshes/props/fountain_suzanha/Fountain_suzanha.tscn" type="PackedScene" id=11] -[ext_resource path="res://previewer/settings.tscn" type="PackedScene" id=12] +[ext_resource path="res://previewer/sky.gd" type="Script" id=3] +[ext_resource path="res://previewer/dummy/dummy.tscn" type="PackedScene" id=4] +[ext_resource path="res://textures/tilables/basic_texture_1024.png" type="Texture" id=5] +[ext_resource path="res://meshes/decors/rocks/cliff_001.tscn" type="PackedScene" id=6] +[ext_resource path="res://meshes/props/pendo_teddy/pendo_teddy.tscn" type="PackedScene" id=7] +[ext_resource path="res://meshes/props/travel_box/container.tscn" type="PackedScene" id=8] +[ext_resource path="res://meshes/props/reference_box/reference_box.tscn" type="PackedScene" id=9] +[ext_resource path="res://meshes/props/fountain_suzanha/Fountain_suzanha.tscn" type="PackedScene" id=10] +[ext_resource path="res://previewer/settings.tscn" type="PackedScene" id=11] [sub_resource type="OpenSimplexNoise" id=1] period = 8.0 @@ -42,7 +41,6 @@ shader_param/mie_scale = 120.0 shader_param/mie_scatter_dir = 0.758 shader_param/rotate_night_sky = null shader_param/iChannel0 = SubResource( 2 ) -shader_param/night_sky = ExtResource( 3 ) [sub_resource type="ImageTexture" id=4] size = Vector2( 1280, 720 ) @@ -64,7 +62,7 @@ ambient_light_energy = 3.82 [sub_resource type="SpatialMaterial" id=8] flags_unshaded = true flags_world_triplanar = true -albedo_texture = ExtResource( 6 ) +albedo_texture = ExtResource( 5 ) uv1_scale = Vector3( 122, 122, 122 ) [sub_resource type="PlaneMesh" id=9] @@ -93,12 +91,12 @@ render_target_update_mode = 3 material = SubResource( 3 ) texture = SubResource( 4 ) centered = false -script = ExtResource( 4 ) +script = ExtResource( 3 ) [node name="world_environment" type="WorldEnvironment" parent="."] environment = SubResource( 7 ) -[node name="dummy" parent="." instance=ExtResource( 5 )] +[node name="dummy" parent="." instance=ExtResource( 4 )] [node name="terrain" type="Spatial" parent="."] @@ -106,38 +104,38 @@ environment = SubResource( 7 ) transform = Transform( 60.964, 0, 0, 0, 1.21928, 0, 0, 0, 60.964, 0, 0, 0 ) mesh = SubResource( 9 ) -[node name="cliff" parent="terrain" instance=ExtResource( 7 )] +[node name="cliff" parent="terrain" instance=ExtResource( 6 )] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -48.2121 ) moss_height = 15.0 moss_fade = 2.5 [node name="props" type="Spatial" parent="."] -[node name="pendo_teddy" parent="props" instance=ExtResource( 8 )] +[node name="pendo_teddy" parent="props" instance=ExtResource( 7 )] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -3 ) -[node name="container" parent="props" instance=ExtResource( 9 )] +[node name="container" parent="props" instance=ExtResource( 8 )] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -5 ) color = Color( 0.145098, 0.0980392, 0.713726, 1 ) lid_angle = 45.0 -[node name="container_2" parent="props" instance=ExtResource( 9 )] +[node name="container_2" parent="props" instance=ExtResource( 8 )] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -1.24144, 0, -5 ) color = Color( 0.491686, 0.159256, 0.832031, 1 ) lid_angle = 90.0 -[node name="container_3" parent="props" instance=ExtResource( 9 )] +[node name="container_3" parent="props" instance=ExtResource( 8 )] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -2.6614, 0, -5 ) color = Color( 0.360784, 1, 0, 1 ) lid_angle = 12.0 -[node name="container_4" parent="props" instance=ExtResource( 9 )] +[node name="container_4" parent="props" instance=ExtResource( 8 )] transform = Transform( 0.457191, 0, 0.889369, 0, 1, 0, -0.889369, 0, 0.457191, -3.94754, 4.76837e-007, -4.27729 ) color = Color( 0.972549, 0.196078, 0.0431373, 1 ) -[node name="reference_box" parent="props" instance=ExtResource( 10 )] +[node name="reference_box" parent="props" instance=ExtResource( 9 )] -[node name="Fountain_suzanha" parent="props" instance=ExtResource( 11 )] +[node name="Fountain_suzanha" parent="props" instance=ExtResource( 10 )] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 5, 0.472, -5 ) [node name="light_system" type="Spatial" parent="."] @@ -152,7 +150,7 @@ transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 21.7307, 0 ) extents = Vector3( 63.192, 25, 76.323 ) data = SubResource( 10 ) -[node name="settings" parent="." instance=ExtResource( 12 )] +[node name="settings" parent="." instance=ExtResource( 11 )] margin_left = -475.0 margin_top = -243.0 margin_right = -219.0