Browse Source

Change environment to 3.1/3.2 environment

Aaron Franke 5 years ago
parent
commit
e30b9d4c7d
5 changed files with 30 additions and 126 deletions
  1. 8 0
      3d/ik/default_env.tres
  2. 5 31
      3d/ik/fabrik_ik.tscn
  3. 11 37
      3d/ik/fps/fps_example.tscn
  4. 1 27
      3d/ik/look_at_ik.tscn
  5. 5 31
      3d/ik/skeleton_ik.tscn

+ 8 - 0
3d/ik/default_env.tres

@@ -5,3 +5,11 @@
 [resource]
 background_mode = 2
 background_sky = SubResource( 1 )
+ambient_light_color = Color( 1, 1, 1, 1 )
+ambient_light_sky_contribution = 0.8
+glow_enabled = true
+glow_levels/1 = true
+glow_levels/2 = true
+glow_levels/5 = false
+glow_intensity = 0.2
+glow_blend_mode = 0

+ 5 - 31
3d/ik/fabrik_ik.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=17 format=2]
+[gd_scene load_steps=15 format=2]
 
 [ext_resource path="res://addons/sade/editor_gizmo_texture.png" type="Texture" id=1]
 [ext_resource path="res://godot_battle_bot.dae" type="PackedScene" id=2]
@@ -20,33 +20,10 @@ roughness = 0.2
 uv1_scale = Vector3( 0.25, 0.25, 0.25 )
 uv1_triplanar = true
 
-[sub_resource type="ProceduralSky" id=3]
-sky_top_color = Color( 0.0470588, 0.454902, 0.976471, 1 )
-sky_horizon_color = Color( 0.556863, 0.823529, 0.909804, 1 )
-sky_curve = 0.25
-ground_bottom_color = Color( 0.101961, 0.145098, 0.188235, 1 )
-ground_horizon_color = Color( 0.482353, 0.788235, 0.952941, 1 )
-ground_curve = 0.01
-
-[sub_resource type="Environment" id=4]
-background_mode = 2
-background_sky = SubResource( 3 )
-ambient_light_color = Color( 1, 0.909804, 0.784314, 1 )
-ambient_light_energy = 1.4
-ambient_light_sky_contribution = 0.72
-tonemap_mode = 3
-glow_enabled = true
-glow_levels/1 = true
-glow_levels/2 = true
-glow_levels/5 = false
-glow_intensity = 0.2
-glow_bloom = 0.03
-glow_blend_mode = 0
-
-[sub_resource type="CubeMesh" id=5]
+[sub_resource type="CubeMesh" id=3]
 size = Vector3( 1, 1, 1 )
 
-[sub_resource type="SpatialMaterial" id=6]
+[sub_resource type="SpatialMaterial" id=4]
 albedo_color = Color( 0, 0.191406, 0.765625, 1 )
 roughness = 0.0
 
@@ -59,9 +36,6 @@ material/0 = SubResource( 2 )
 [node name="DirectionalLight" type="DirectionalLight" parent="."]
 transform = Transform( 0.56827, 0.673454, -0.472789, 0, 0.574581, 0.818448, 0.822842, -0.465099, 0.326517, -9.77531, 11.5204, 11.766 )
 
-[node name="WorldEnvironment" type="WorldEnvironment" parent="."]
-environment = SubResource( 4 )
-
 [node name="BattleBot" parent="." instance=ExtResource( 2 )]
 
 [node name="godot_battle_bot" parent="BattleBot/Armature/Skeleton" index="0"]
@@ -161,8 +135,8 @@ transform = Transform( -0.792023, 0.0165711, -0.610266, -1.49012e-08, 0.999631,
 transform = Transform( -0.678336, 0.00698721, -0.734719, -2.32831e-09, 0.999955, 0.00950961, 0.734752, 0.00645071, -0.678305, -1.07914, 0.020072, 0.03791 )
 
 [node name="1MeterCube" type="MeshInstance" parent="Camera/Targets"]
-mesh = SubResource( 5 )
-material/0 = SubResource( 6 )
+mesh = SubResource( 3 )
+material/0 = SubResource( 4 )
 
 [node name="Control" type="Control" parent="."]
 anchor_right = 1.0

+ 11 - 37
3d/ik/fps/fps_example.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=28 format=2]
+[gd_scene load_steps=26 format=2]
 
 [ext_resource path="res://addons/sade/editor_gizmo_texture.png" type="Texture" id=1]
 [ext_resource path="res://button_change_scene.gd" type="Script" id=2]
@@ -42,40 +42,17 @@ albedo_color = Color( 0, 0.882813, 1, 1 )
 albedo_texture = ExtResource( 1 )
 uv1_triplanar = true
 
-[sub_resource type="ProceduralSky" id=8]
-sky_top_color = Color( 0.0470588, 0.454902, 0.976471, 1 )
-sky_horizon_color = Color( 0.556863, 0.823529, 0.909804, 1 )
-sky_curve = 0.25
-ground_bottom_color = Color( 0.101961, 0.145098, 0.188235, 1 )
-ground_horizon_color = Color( 0.482353, 0.788235, 0.952941, 1 )
-ground_curve = 0.01
-
-[sub_resource type="Environment" id=9]
-background_mode = 2
-background_sky = SubResource( 8 )
-ambient_light_color = Color( 1, 0.909804, 0.784314, 1 )
-ambient_light_energy = 1.4
-ambient_light_sky_contribution = 0.72
-tonemap_mode = 3
-glow_enabled = true
-glow_levels/1 = true
-glow_levels/2 = true
-glow_levels/5 = false
-glow_intensity = 0.2
-glow_bloom = 0.03
-glow_blend_mode = 0
-
-[sub_resource type="CapsuleShape" id=10]
+[sub_resource type="CapsuleShape" id=8]
 radius = 4.0
 height = 6.0
 
-[sub_resource type="Curve3D" id=11]
+[sub_resource type="Curve3D" id=9]
 _data = {
 "points": PoolVector3Array( 0, 0, 0, 0, 0, 0, -2.43129, -0.955339, 0, 0, 0, 0, 0, 0, 0, -0.670561, 0.183959, 0, 0, 0, 0, 0, 0, 0, 0.64629, 0.228347, 0, 0, 0, 0, 0, 0, 0, 2.31825, -0.925747, 0 ),
 "tilts": PoolRealArray( 0, 0, 0, 0 )
 }
 
-[sub_resource type="Animation" id=12]
+[sub_resource type="Animation" id=10]
 tracks/0/type = "value"
 tracks/0/path = NodePath("LeanPath/PathFollow/IK_LookAt_Chest/AimPos:translation")
 tracks/0/interp = 1
@@ -113,7 +90,7 @@ tracks/2/keys = {
 "values": [ 80.0, 60.0 ]
 }
 
-[sub_resource type="Animation" id=13]
+[sub_resource type="Animation" id=11]
 tracks/0/type = "value"
 tracks/0/path = NodePath("LeanPath/PathFollow/IK_LookAt_Chest/Camera:fov")
 tracks/0/interp = 1
@@ -151,7 +128,7 @@ tracks/2/keys = {
 "values": [ Vector3( 0, 0, 0 ), Vector3( 0, -2, 0 ) ]
 }
 
-[sub_resource type="Animation" id=14]
+[sub_resource type="Animation" id=12]
 tracks/0/type = "value"
 tracks/0/path = NodePath("LeanPath/PathFollow/IK_LookAt_Chest/AimPos:translation")
 tracks/0/interp = 1
@@ -401,9 +378,6 @@ transform = Transform( 0.388878, -0.754027, 0.529355, 0, 0.574581, 0.818448, -0.
 light_color = Color( 1, 0.925598, 0.820313, 1 )
 shadow_enabled = true
 
-[node name="WorldEnvironment" type="WorldEnvironment" parent="."]
-environment = SubResource( 9 )
-
 [node name="Control" type="Control" parent="."]
 anchor_right = 1.0
 anchor_bottom = 1.0
@@ -478,13 +452,13 @@ script = ExtResource( 3 )
 
 [node name="CollisionShape" type="CollisionShape" parent="KinematicBody"]
 transform = Transform( 1, 0, 0, 0, -4.37114e-08, -1, 0, 1, -4.37114e-08, 0, 7, 0 )
-shape = SubResource( 10 )
+shape = SubResource( 8 )
 
 [node name="CameraHolder" type="Spatial" parent="KinematicBody"]
 transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 13, 0 )
 
 [node name="LeanPath" type="Path" parent="KinematicBody/CameraHolder"]
-curve = SubResource( 11 )
+curve = SubResource( 9 )
 
 [node name="PathFollow" type="PathFollow" parent="KinematicBody/CameraHolder/LeanPath"]
 transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -0.0412404, 0.205172, 0 )
@@ -598,9 +572,9 @@ bone_name = "Head"
 [node name="AnimationPlayer" type="AnimationPlayer" parent="KinematicBody/CameraHolder"]
 autoplay = "Start"
 playback_speed = 4.0
-anims/Aiming = SubResource( 12 )
-anims/Idle = SubResource( 13 )
-anims/Start = SubResource( 14 )
+anims/Aiming = SubResource( 10 )
+anims/Idle = SubResource( 11 )
+anims/Start = SubResource( 12 )
 
 [node name="Weapon" type="Spatial" parent="KinematicBody/CameraHolder"]
 

+ 1 - 27
3d/ik/look_at_ik.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=13 format=2]
+[gd_scene load_steps=11 format=2]
 
 [ext_resource path="res://addons/sade/editor_gizmo_texture.png" type="Texture" id=1]
 [ext_resource path="res://godot_battle_bot.dae" type="PackedScene" id=2]
@@ -18,29 +18,6 @@ roughness = 0.2
 uv1_scale = Vector3( 0.25, 0.25, 0.25 )
 uv1_triplanar = true
 
-[sub_resource type="ProceduralSky" id=3]
-sky_top_color = Color( 0.0470588, 0.454902, 0.976471, 1 )
-sky_horizon_color = Color( 0.556863, 0.823529, 0.909804, 1 )
-sky_curve = 0.25
-ground_bottom_color = Color( 0.101961, 0.145098, 0.188235, 1 )
-ground_horizon_color = Color( 0.482353, 0.788235, 0.952941, 1 )
-ground_curve = 0.01
-
-[sub_resource type="Environment" id=4]
-background_mode = 2
-background_sky = SubResource( 3 )
-ambient_light_color = Color( 1, 0.909804, 0.784314, 1 )
-ambient_light_energy = 1.4
-ambient_light_sky_contribution = 0.72
-tonemap_mode = 3
-glow_enabled = true
-glow_levels/1 = true
-glow_levels/2 = true
-glow_levels/5 = false
-glow_intensity = 0.2
-glow_bloom = 0.03
-glow_blend_mode = 0
-
 [node name="LookAtIK" type="Spatial"]
 
 [node name="Floor" type="MeshInstance" parent="."]
@@ -50,9 +27,6 @@ material/0 = SubResource( 2 )
 [node name="DirectionalLight" type="DirectionalLight" parent="."]
 transform = Transform( 0.56827, 0.673454, -0.472789, 0, 0.574581, 0.818448, 0.822842, -0.465099, 0.326517, -9.77531, 11.5204, 11.766 )
 
-[node name="WorldEnvironment" type="WorldEnvironment" parent="."]
-environment = SubResource( 4 )
-
 [node name="BattleBot" parent="." instance=ExtResource( 2 )]
 
 [node name="godot_battle_bot" parent="BattleBot/Armature/Skeleton" index="0"]

+ 5 - 31
3d/ik/skeleton_ik.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=16 format=2]
+[gd_scene load_steps=14 format=2]
 
 [ext_resource path="res://skeleton_ik_runner.gd" type="Script" id=1]
 [ext_resource path="res://addons/sade/ik_look_at.png" type="Texture" id=2]
@@ -19,33 +19,10 @@ roughness = 0.2
 uv1_scale = Vector3( 0.25, 0.25, 0.25 )
 uv1_triplanar = true
 
-[sub_resource type="ProceduralSky" id=3]
-sky_top_color = Color( 0.0470588, 0.454902, 0.976471, 1 )
-sky_horizon_color = Color( 0.556863, 0.823529, 0.909804, 1 )
-sky_curve = 0.25
-ground_bottom_color = Color( 0.101961, 0.145098, 0.188235, 1 )
-ground_horizon_color = Color( 0.482353, 0.788235, 0.952941, 1 )
-ground_curve = 0.01
-
-[sub_resource type="Environment" id=4]
-background_mode = 2
-background_sky = SubResource( 3 )
-ambient_light_color = Color( 1, 0.909804, 0.784314, 1 )
-ambient_light_energy = 1.4
-ambient_light_sky_contribution = 0.72
-tonemap_mode = 3
-glow_enabled = true
-glow_levels/1 = true
-glow_levels/2 = true
-glow_levels/5 = false
-glow_intensity = 0.2
-glow_bloom = 0.03
-glow_blend_mode = 0
-
-[sub_resource type="CubeMesh" id=5]
+[sub_resource type="CubeMesh" id=3]
 size = Vector3( 1, 1, 1 )
 
-[sub_resource type="SpatialMaterial" id=6]
+[sub_resource type="SpatialMaterial" id=4]
 albedo_color = Color( 0, 0.191406, 0.765625, 1 )
 roughness = 0.0
 
@@ -58,9 +35,6 @@ material/0 = SubResource( 2 )
 [node name="DirectionalLight" type="DirectionalLight" parent="."]
 transform = Transform( 0.56827, 0.673454, -0.472789, 0, 0.574581, 0.818448, 0.822842, -0.465099, 0.326517, -9.77531, 11.5204, 11.766 )
 
-[node name="WorldEnvironment" type="WorldEnvironment" parent="."]
-environment = SubResource( 4 )
-
 [node name="GodotBattleBot" parent="." instance=ExtResource( 4 )]
 
 [node name="godot_battle_bot" parent="GodotBattleBot/Armature/Skeleton" index="0"]
@@ -105,8 +79,8 @@ bone_name = "Head"
 additional_rotation = Vector3( 90, 0, 0 )
 
 [node name="1MeterCube" type="MeshInstance" parent="Camera/Targets"]
-mesh = SubResource( 5 )
-material/0 = SubResource( 6 )
+mesh = SubResource( 3 )
+material/0 = SubResource( 4 )
 
 [node name="TargetLeft" type="Position3D" parent="Camera/Targets"]
 transform = Transform( -0.179447, 0.98366, -0.0145678, 0.981822, 0.178142, -0.0654973, -0.0618319, -0.0260563, -0.997746, 0.653517, -0.112305, -0.760886 )