Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Clouds, Terrain cache and more #23

Open
wants to merge 4 commits into
base: dev
Choose a base branch
from
Open

Clouds, Terrain cache and more #23

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
51ebea4
Improvements
ultrazar Jul 2, 2021
af30167
Update TerrainCache.gd
ultrazar Jul 2, 2021
9dc6b09
I forgot this
ultrazar Jul 2, 2021
d1cc675
Merge branch 'dev' into dev
ultrazar Jul 3, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 29 additions & 11 deletions addons/hoimar.planetgen/planet_presets/alien_planet_settings.tres
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,29 @@
[gd_resource type="Resource" load_steps=9 format=2]
[gd_resource type="Resource" load_steps=12 format=2]

[ext_resource path="res://addons/hoimar.planetgen/scripts/terrain/shape_generator.gd" type="Script" id=1]
[ext_resource path="res://addons/hoimar.planetgen/scripts/terrain/ridged_noise_generator.gd" type="Script" id=2]
[ext_resource path="res://addons/hoimar.planetgen/scripts/terrain/noise_generator.gd" type="Script" id=3]
[ext_resource path="res://addons/hoimar.planetgen/scripts/celestial_bodies/planet_settings.gd" type="Script" id=4]
[ext_resource path="res://addons/hoimar.planetgen/resources/materials/water.tres" type="Material" id=5]
[ext_resource path="res://addons/hoimar.planetgen/resources/materials/planet_clouds.shader" type="Shader" id=6]

[sub_resource type="Resource" id=1]
resource_name = "Large Ridges"
[sub_resource type="ShaderMaterial" id=1]
resource_local_to_scene = true
render_priority = 2
shader = ExtResource( 6 )
shader_param/proximity_fade_distance = 3.0
shader_param/distance_fade = 0.05
shader_param/cloudscale = 1.459
shader_param/speed = 0.01
shader_param/clouddark = -0.004
shader_param/cloudlight = 0.3
shader_param/cloudcover = 0.1
shader_param/cloudalpha = 10.0
shader_param/skytint = 10.0
shader_param/m = Transform2D( 1.6, -1.2, 1.2, 1.6, 0, 0 )
shader_param/adjust_distorsion = 150.0

[sub_resource type="Resource" id=2]
script = ExtResource( 2 )
enabled = true
use_first_as_mask = false
Expand All @@ -17,8 +34,7 @@ period = 0.2
persistence = 0.3
center = Vector3( 1, 1, 0 )

[sub_resource type="Resource" id=2]
resource_name = "Details & Peaks"
[sub_resource type="Resource" id=3]
script = ExtResource( 3 )
enabled = true
use_first_as_mask = true
Expand All @@ -29,8 +45,7 @@ period = 0.1
persistence = 0.5
center = Vector3( 0.133, 0, 0 )

[sub_resource type="Resource" id=3]
resource_name = "Fine Detail"
[sub_resource type="Resource" id=4]
script = ExtResource( 3 )
enabled = true
use_first_as_mask = true
Expand All @@ -41,17 +56,20 @@ period = 0.001
persistence = 0.9
center = Vector3( 1, 2, 3 )

[sub_resource type="Resource" id=4]
[sub_resource type="Resource" id=5]
script = ExtResource( 1 )
noise_generators = [ SubResource( 1 ), SubResource( 2 ), SubResource( 3 ) ]
noise_generators = [ SubResource( 2 ), SubResource( 3 ), SubResource( 4 ) ]

[resource]
script = ExtResource( 4 )
resolution = 77
radius = 150.0
has_water = false
water_shader = ExtResource( 5 )
has_atmosphere = true
has_collisions = true
has_collisions = false
has_clouds = true
cloud_shader = SubResource( 1 )
atmosphere_thickness = 8.0
atmosphere_density = 0.02
shape_generator = SubResource( 4 )
shape_generator = SubResource( 5 )
53 changes: 35 additions & 18 deletions addons/hoimar.planetgen/planet_presets/earthlike_planet_settings.tres
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,40 @@
[gd_resource type="Resource" load_steps=10 format=2]
[gd_resource type="Resource" load_steps=13 format=2]

[ext_resource path="res://addons/hoimar.planetgen/scripts/terrain/shape_generator.gd" type="Script" id=1]
[ext_resource path="res://addons/hoimar.planetgen/scripts/terrain/ridged_noise_generator.gd" type="Script" id=2]
[ext_resource path="res://addons/hoimar.planetgen/scripts/terrain/noise_generator.gd" type="Script" id=3]
[ext_resource path="res://addons/hoimar.planetgen/scripts/celestial_bodies/planet_settings.gd" type="Script" id=4]
[ext_resource path="res://addons/hoimar.planetgen/resources/materials/water.tres" type="Material" id=5]
[ext_resource path="res://addons/hoimar.planetgen/resources/materials/planet_clouds.shader" type="Shader" id=6]

[sub_resource type="Resource" id=1]
resource_name = "Continents"
[sub_resource type="ShaderMaterial" id=1]
resource_local_to_scene = true
render_priority = 2
shader = ExtResource( 6 )
shader_param/proximity_fade_distance = 3.0
shader_param/distance_fade = 0.05
shader_param/cloudscale = 1.968
shader_param/speed = 0.02
shader_param/clouddark = 0.5
shader_param/cloudlight = 0.3
shader_param/cloudcover = -0.36
shader_param/cloudalpha = 3.0
shader_param/skytint = 100.0
shader_param/m = Transform2D( 1.6, -1.2, 1.2, 1.6, 0, 0 )
shader_param/adjust_distorsion = 104.615

[sub_resource type="Resource" id=2]
script = ExtResource( 3 )
enabled = true
use_first_as_mask = false
seed_value = 9
strength = 0.005
octaves = 4
strength = 0.01
octaves = 6
period = 0.4
persistence = 0.6
center = Vector3( -1, 0, 1 )

[sub_resource type="Resource" id=2]
resource_name = "Large Ridges"
[sub_resource type="Resource" id=3]
script = ExtResource( 2 )
enabled = true
use_first_as_mask = true
Expand All @@ -29,8 +45,7 @@ period = 0.5
persistence = 0.7
center = Vector3( 0, 0, 0 )

[sub_resource type="Resource" id=3]
resource_name = "Coarse Detail"
[sub_resource type="Resource" id=4]
script = ExtResource( 3 )
enabled = true
use_first_as_mask = true
Expand All @@ -41,8 +56,7 @@ period = 0.03
persistence = 0.6
center = Vector3( 0, 0, 0 )

[sub_resource type="Resource" id=4]
resource_name = "Fine Detail"
[sub_resource type="Resource" id=5]
script = ExtResource( 3 )
enabled = true
use_first_as_mask = true
Expand All @@ -53,17 +67,20 @@ period = 0.0005
persistence = 0.7
center = Vector3( 0, 0, 0 )

[sub_resource type="Resource" id=5]
[sub_resource type="Resource" id=6]
script = ExtResource( 1 )
noise_generators = [ SubResource( 1 ), SubResource( 2 ), SubResource( 3 ), SubResource( 4 ) ]
noise_generators = [ SubResource( 2 ), SubResource( 3 ), SubResource( 4 ), SubResource( 5 ) ]

[resource]
script = ExtResource( 4 )
resolution = 60
resolution = 30
radius = 200.0
has_water = true
water_shader = ExtResource( 5 )
has_atmosphere = true
has_collisions = true
atmosphere_thickness = 10.0
atmosphere_density = 0.02
shape_generator = SubResource( 5 )
has_collisions = false
has_clouds = true
cloud_shader = SubResource( 1 )
atmosphere_thickness = 4.0
atmosphere_density = 0.03
shape_generator = SubResource( 6 )
35 changes: 27 additions & 8 deletions addons/hoimar.planetgen/planet_presets/moon_settings.tres
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,29 @@
[gd_resource type="Resource" load_steps=8 format=2]
[gd_resource type="Resource" load_steps=11 format=2]

[ext_resource path="res://addons/hoimar.planetgen/scripts/terrain/shape_generator.gd" type="Script" id=1]
[ext_resource path="res://addons/hoimar.planetgen/scripts/terrain/ridged_noise_generator.gd" type="Script" id=2]
[ext_resource path="res://addons/hoimar.planetgen/scripts/terrain/noise_generator.gd" type="Script" id=3]
[ext_resource path="res://addons/hoimar.planetgen/scripts/celestial_bodies/planet_settings.gd" type="Script" id=4]
[ext_resource path="res://addons/hoimar.planetgen/resources/materials/water.tres" type="Material" id=5]
[ext_resource path="res://addons/hoimar.planetgen/resources/materials/planet_clouds.shader" type="Shader" id=6]

[sub_resource type="Resource" id=1]
resource_name = "Continents"
[sub_resource type="ShaderMaterial" id=1]
resource_local_to_scene = true
render_priority = 2
shader = ExtResource( 6 )
shader_param/proximity_fade_distance = 3.0
shader_param/distance_fade = 0.05
shader_param/cloudscale = 3.711
shader_param/speed = 0.01
shader_param/clouddark = 0.5
shader_param/cloudlight = 0.3
shader_param/cloudcover = 0.1
shader_param/cloudalpha = 10.0
shader_param/skytint = 10.0
shader_param/m = Transform2D( 1.6, -1.2, 1.2, 1.6, 0, 0 )
shader_param/adjust_distorsion = 150.0

[sub_resource type="Resource" id=2]
script = ExtResource( 3 )
enabled = true
use_first_as_mask = false
Expand All @@ -17,8 +34,7 @@ period = 0.5
persistence = 0.5
center = Vector3( 0, 0, 0 )

[sub_resource type="Resource" id=2]
resource_name = "Large Ridges"
[sub_resource type="Resource" id=3]
script = ExtResource( 2 )
enabled = true
use_first_as_mask = false
Expand All @@ -29,17 +45,20 @@ period = 0.2
persistence = 0.5
center = Vector3( 0, 0, 0 )

[sub_resource type="Resource" id=3]
[sub_resource type="Resource" id=4]
script = ExtResource( 1 )
noise_generators = [ SubResource( 1 ), SubResource( 2 ) ]
noise_generators = [ SubResource( 2 ), SubResource( 3 ) ]

[resource]
script = ExtResource( 4 )
resolution = 40
radius = 30.0
has_water = false
water_shader = ExtResource( 5 )
has_atmosphere = false
has_collisions = true
has_clouds = false
cloud_shader = SubResource( 1 )
atmosphere_thickness = 1.1
atmosphere_density = 0.1
shape_generator = SubResource( 3 )
shape_generator = SubResource( 4 )
34 changes: 27 additions & 7 deletions addons/hoimar.planetgen/planet_presets/sun_settings.tres
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,28 @@
[gd_resource type="Resource" load_steps=6 format=2]
[gd_resource type="Resource" load_steps=9 format=2]

[ext_resource path="res://addons/hoimar.planetgen/scripts/terrain/noise_generator.gd" type="Script" id=1]
[ext_resource path="res://addons/hoimar.planetgen/scripts/terrain/shape_generator.gd" type="Script" id=2]
[ext_resource path="res://addons/hoimar.planetgen/scripts/celestial_bodies/planet_settings.gd" type="Script" id=3]
[ext_resource path="res://addons/hoimar.planetgen/resources/materials/water.tres" type="Material" id=4]
[ext_resource path="res://addons/hoimar.planetgen/resources/materials/planet_clouds.shader" type="Shader" id=5]

[sub_resource type="Resource" id=1]
resource_name = "Sun Surface"
[sub_resource type="ShaderMaterial" id=1]
resource_local_to_scene = true
render_priority = 2
shader = ExtResource( 5 )
shader_param/proximity_fade_distance = 3.0
shader_param/distance_fade = 0.05
shader_param/cloudscale = 3.711
shader_param/speed = 0.01
shader_param/clouddark = 0.5
shader_param/cloudlight = 0.3
shader_param/cloudcover = 0.1
shader_param/cloudalpha = 10.0
shader_param/skytint = 10.0
shader_param/m = Transform2D( 1.6, -1.2, 1.2, 1.6, 0, 0 )
shader_param/adjust_distorsion = 150.0

[sub_resource type="Resource" id=2]
script = ExtResource( 1 )
enabled = true
use_first_as_mask = false
Expand All @@ -16,17 +33,20 @@ period = 0.1
persistence = 0.4
center = Vector3( 0, 0, 0 )

[sub_resource type="Resource" id=2]
[sub_resource type="Resource" id=3]
script = ExtResource( 2 )
noise_generators = [ SubResource( 1 ) ]
noise_generators = [ SubResource( 2 ) ]

[resource]
script = ExtResource( 3 )
resolution = 21
resolution = 10
radius = 200.0
has_water = false
water_shader = ExtResource( 4 )
has_atmosphere = false
has_collisions = true
has_clouds = false
cloud_shader = SubResource( 1 )
atmosphere_thickness = 1.1
atmosphere_density = 0.1
shape_generator = SubResource( 2 )
shape_generator = SubResource( 3 )
Loading