diff --git a/addons/material_maker/panoramas/epping_forest_01.hdr.import b/addons/material_maker/panoramas/epping_forest_01.hdr.import deleted file mode 100644 index 5206b33..0000000 --- a/addons/material_maker/panoramas/epping_forest_01.hdr.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="StreamTexture" -path="res://.import/epping_forest_01.hdr-31bce8524abc8c389aae17071145b2f5.stex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://addons/material_maker/panoramas/epping_forest_01.hdr" -dest_files=[ "res://.import/epping_forest_01.hdr-31bce8524abc8c389aae17071145b2f5.stex" ] - -[params] - -compress/mode=0 -compress/lossy_quality=0.7 -compress/hdr_mode=0 -compress/bptc_ldr=0 -compress/normal_map=0 -flags/repeat=0 -flags/filter=true -flags/mipmaps=false -flags/anisotropic=false -flags/srgb=2 -process/fix_alpha_border=true -process/premult_alpha=false -process/HDR_as_SRGB=false -process/invert_color=false -stream=false -size_limit=0 -detect_3d=true -svg/scale=1.0 diff --git a/addons/material_maker/panoramas/moonless_golf.hdr.import b/addons/material_maker/panoramas/moonless_golf.hdr.import deleted file mode 100644 index 63c16b2..0000000 --- a/addons/material_maker/panoramas/moonless_golf.hdr.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="StreamTexture" -path="res://.import/moonless_golf.hdr-449a314e5543da22c1760db0d27aeb69.stex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://addons/material_maker/panoramas/moonless_golf.hdr" -dest_files=[ "res://.import/moonless_golf.hdr-449a314e5543da22c1760db0d27aeb69.stex" ] - -[params] - -compress/mode=0 -compress/lossy_quality=0.7 -compress/hdr_mode=0 -compress/bptc_ldr=0 -compress/normal_map=0 -flags/repeat=0 -flags/filter=true -flags/mipmaps=false -flags/anisotropic=false -flags/srgb=2 -process/fix_alpha_border=true -process/premult_alpha=false -process/HDR_as_SRGB=false -process/invert_color=false -stream=false -size_limit=0 -detect_3d=true -svg/scale=1.0 diff --git a/addons/material_maker/preview/panoramas/studio_sky.tres b/addons/material_maker/preview/panoramas/studio_sky.tres new file mode 100644 index 0000000..693e106 --- /dev/null +++ b/addons/material_maker/preview/panoramas/studio_sky.tres @@ -0,0 +1,19 @@ +[gd_resource type="Environment" load_steps=2 format=2] + +[sub_resource type="ProceduralSky" id=1] +sky_top_color = Color( 1, 1, 1, 1 ) +sky_horizon_color = Color( 0.5, 0.5, 0.5, 1 ) +sky_curve = 0.5 +ground_bottom_color = Color( 0.25, 0.25, 0.25, 1 ) +ground_horizon_color = Color( 0.5, 0.5, 0.5, 1 ) +ground_curve = 0.2 +sun_longitude = 135.0 +sun_curve = 0.1 +sun_energy = 64.0 + +[resource] +background_mode = 2 +background_sky = SubResource( 1 ) +ambient_light_energy = 0.3 +tonemap_mode = 2 +tonemap_white = 16.0 diff --git a/addons/material_maker/preview/preview_3d.tscn b/addons/material_maker/preview/preview_3d.tscn index fc310b8..fee8e20 100644 --- a/addons/material_maker/preview/preview_3d.tscn +++ b/addons/material_maker/preview/preview_3d.tscn @@ -1,21 +1,22 @@ -[gd_scene load_steps=12 format=2] +[gd_scene load_steps=14 format=2] [ext_resource path="res://addons/material_maker/preview/preview_objects.tscn" type="PackedScene" id=1] [ext_resource path="res://addons/material_maker/preview/panoramas/moonless_golf.hdr" type="Texture" id=2] [ext_resource path="res://addons/material_maker/environment.gd" type="Script" id=3] [ext_resource path="res://addons/material_maker/preview/panoramas/epping_forest_01.hdr" type="Texture" id=4] +[ext_resource path="res://addons/material_maker/preview/panoramas/studio_sky.tres" type="Environment" id=5] -[sub_resource type="PanoramaSky" id=1] + +[sub_resource type="PanoramaSky" id=2] resource_local_to_scene = true -radiance_size = 4 panorama = ExtResource( 2 ) -[sub_resource type="Environment" id=2] +[sub_resource type="Environment" id=3] resource_local_to_scene = true background_mode = 2 -background_sky = SubResource( 1 ) +background_sky = SubResource( 2 ) -[sub_resource type="Animation" id=3] +[sub_resource type="Animation" id=4] loop = true tracks/0/type = "value" tracks/0/path = NodePath("Objects:rotation_degrees") @@ -30,26 +31,30 @@ tracks/0/keys = { "values": [ Vector3( 0, 0, 0 ), Vector3( 0, 360, 0 ) ] } -[sub_resource type="PanoramaSky" id=4] +[sub_resource type="PanoramaSky" id=5] resource_local_to_scene = true -radiance_size = 4 panorama = ExtResource( 4 ) -[sub_resource type="Environment" id=5] +[sub_resource type="Environment" id=6] background_mode = 2 -background_sky = SubResource( 4 ) +background_sky = SubResource( 5 ) background_energy = 1.5 ambient_light_color = Color( 1, 1, 1, 1 ) ambient_light_energy = 0.32 tonemap_mode = 2 tonemap_white = 16.0 -[sub_resource type="CylinderMesh" id=6] +[sub_resource type="CylinderMesh" id=7] top_radius = 5.0 bottom_radius = 5.0 height = 0.5 -[sub_resource type="SpatialMaterial" id=7] +[sub_resource type="SpatialMaterial" id=8] + +[sub_resource type="PlaneMesh" id=1] +size = Vector2( 1000, 1000 ) +subdivide_width = 10 +subdivide_depth = 10 [node name="Preview3d" type="Spatial"] @@ -61,7 +66,7 @@ transform = Transform( 1, 0, 0, 0, 0.766044, 0.642788, 0, -0.642788, 0.766044, 0 [node name="Camera" type="Camera" parent="CameraPivot"] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 3.5 ) -environment = SubResource( 2 ) +environment = SubResource( 3 ) current = true [node name="RemoteTransform" type="RemoteTransform" parent="CameraPivot/Camera"] @@ -70,14 +75,15 @@ remote_path = NodePath("../../../../../../ProjectsPane/BackgroundPreview/Viewpor [node name="ObjectRotate" type="AnimationPlayer" parent="."] autoplay = "rotate" playback_speed = 0.1 -anims/rotate = SubResource( 3 ) +anims/rotate = SubResource( 4 ) [node name="Environments" type="Spatial" parent="."] [node name="Epping Forest" type="Spatial" parent="Environments"] +editor/display_folded = true visible = false script = ExtResource( 3 ) -environment = SubResource( 5 ) +environment = SubResource( 6 ) [node name="DirectionalLight" type="DirectionalLight" parent="Environments/Epping Forest"] transform = Transform( 0.976272, -0.0494319, -0.21083, 0.216548, 0.222856, 0.950496, -8.69534e-009, -0.973597, 0.228272, -5.08826, 21.6274, 5.3744 ) @@ -87,15 +93,30 @@ shadow_enabled = true [node name="MeshInstance" type="MeshInstance" parent="Environments/Epping Forest"] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -3.3343, 0 ) visible = false -mesh = SubResource( 6 ) -material/0 = SubResource( 7 ) +mesh = SubResource( 7 ) +material/0 = SubResource( 8 ) [node name="Moonless Golf" type="Spatial" parent="Environments"] +editor/display_folded = true visible = false script = ExtResource( 3 ) -environment = SubResource( 2 ) +environment = SubResource( 3 ) [node name="DirectionalLight" type="DirectionalLight" parent="Environments/Moonless Golf"] transform = Transform( 0.569388, 0.170928, 0.804103, 0.171359, -0.981336, 0.087263, 0.804011, 0.088104, -0.588051, 91.9658, 9.62053, -85.1176 ) light_energy = 0.2 shadow_enabled = true + +[node name="Studio" type="Spatial" parent="Environments"] +visible = false +script = ExtResource( 3 ) +environment = ExtResource( 5 ) + +[node name="DirectionalLight" type="DirectionalLight" parent="Environments/Studio"] +transform = Transform( 0.707107, -0.40558, 0.579228, 0, 0.819152, 0.573577, -0.707107, -0.40558, 0.579228, 10, 10, 0 ) +shadow_enabled = true + +[node name="GroundPlane" type="MeshInstance" parent="Environments/Studio"] +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -1.05186, 0 ) +mesh = SubResource( 1 ) +material/0 = null