Skip to content

Commit

Permalink
add: orange flowers
Browse files Browse the repository at this point in the history
  • Loading branch information
gtibo committed Feb 9, 2023
1 parent 6ac1f00 commit d2f35ef
Show file tree
Hide file tree
Showing 20 changed files with 313 additions and 10 deletions.
56 changes: 53 additions & 3 deletions Environment/environment.tscn

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion Environment/grass/grass_mat.tres
Expand Up @@ -3,7 +3,7 @@
[ext_resource type="Shader" path="res://Environment/grass/grass.gdshader" id="1_21fji"]

[sub_resource type="Gradient" id="Gradient_og0wy"]
colors = PackedColorArray(0.125954, 0.389848, 0.194368, 1, 0.235294, 0.560784, 0.219608, 1)
colors = PackedColorArray(0.11908, 0.387024, 0.176702, 1, 0.278388, 0.581803, 0.267947, 1)

[sub_resource type="GradientTexture1D" id="GradientTexture1D_deq1y"]
gradient = SubResource("Gradient_og0wy")
Expand Down
Binary file added Environment/orange_flowers/orange_flower.glb
Binary file not shown.
32 changes: 32 additions & 0 deletions Environment/orange_flowers/orange_flower.glb.import
@@ -0,0 +1,32 @@
[remap]

importer="scene"
importer_version=1
type="PackedScene"
uid="uid://cndyqf8jamodj"
path="res://.godot/imported/orange_flower.glb-eb02d8bfd3069c3c7b71246be2c48b90.scn"

[deps]

source_file="res://Environment/orange_flowers/orange_flower.glb"
dest_files=["res://.godot/imported/orange_flower.glb-eb02d8bfd3069c3c7b71246be2c48b90.scn"]

[params]

nodes/root_type="Node3D"
nodes/root_name="Scene Root"
nodes/apply_root_scale=true
nodes/root_scale=1.0
meshes/ensure_tangents=true
meshes/generate_lods=true
meshes/create_shadow_meshes=true
meshes/light_baking=1
meshes/lightmap_texel_size=0.2
skins/use_named_skins=true
animation/import=true
animation/fps=30
animation/trimming=false
animation/remove_immutable_tracks=true
import_script/path=""
_subresources={}
gltf/embedded_image_handling=1
5 changes: 5 additions & 0 deletions Environment/orange_flowers/orange_flower.tscn
@@ -0,0 +1,5 @@
[gd_scene load_steps=2 format=3 uid="uid://8o56ett8oups"]

[ext_resource type="PackedScene" uid="uid://cndyqf8jamodj" path="res://Environment/orange_flowers/orange_flower.glb" id="1_yjl25"]

[node name="OrangeFlower" instance=ExtResource("1_yjl25")]
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
35 changes: 35 additions & 0 deletions Environment/orange_flowers/orange_flower_Image.png.import
@@ -0,0 +1,35 @@
[remap]

importer="texture"
type="CompressedTexture2D"
uid="uid://b4un2d3uwwwub"
path="res://.godot/imported/orange_flower_Image.png-ac9c0f4c51d01de8668f243ab03a46fd.ctex"
metadata={
"vram_texture": false
}
generator_parameters={}

[deps]

source_file="res://Environment/orange_flowers/orange_flower_Image.png"
dest_files=["res://.godot/imported/orange_flower_Image.png-ac9c0f4c51d01de8668f243ab03a46fd.ctex"]

[params]

compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=true
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=1
Binary file added Environment/orange_flowers/orange_flower_Image_3.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
35 changes: 35 additions & 0 deletions Environment/orange_flowers/orange_flower_Image_3.png.import
@@ -0,0 +1,35 @@
[remap]

importer="texture"
type="CompressedTexture2D"
uid="uid://dbnko66pmayh"
path="res://.godot/imported/orange_flower_Image_3.png-171dc3ee714164287e391bf526afefeb.ctex"
metadata={
"vram_texture": false
}
generator_parameters={}

[deps]

source_file="res://Environment/orange_flowers/orange_flower_Image_3.png"
dest_files=["res://.godot/imported/orange_flower_Image_3.png-171dc3ee714164287e391bf526afefeb.ctex"]

[params]

compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=true
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=1
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
@@ -0,0 +1,36 @@
[remap]

importer="texture"
type="CompressedTexture2D"
uid="uid://da17l2ty1e0r0"
path.s3tc="res://.godot/imported/orange_flower_flower_blade_albedo.png-083016b63bd590227c5d2bdbc9982057.s3tc.ctex"
metadata={
"imported_formats": ["s3tc_bptc"],
"vram_texture": true
}
generator_parameters={}

[deps]

source_file="res://Environment/orange_flowers/orange_flower_flower_blade_albedo.png"
dest_files=["res://.godot/imported/orange_flower_flower_blade_albedo.png-083016b63bd590227c5d2bdbc9982057.s3tc.ctex"]

[params]

compress/mode=2
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=true
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=0
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
@@ -0,0 +1,36 @@
[remap]

importer="texture"
type="CompressedTexture2D"
uid="uid://bybrr5xpohowo"
path.s3tc="res://.godot/imported/orange_flower_flower_blade_normal.png-11f5772337fd35a43cb790a129455c8e.s3tc.ctex"
metadata={
"imported_formats": ["s3tc_bptc"],
"vram_texture": true
}
generator_parameters={}

[deps]

source_file="res://Environment/orange_flowers/orange_flower_flower_blade_normal.png"
dest_files=["res://.godot/imported/orange_flower_flower_blade_normal.png-11f5772337fd35a43cb790a129455c8e.s3tc.ctex"]

[params]

compress/mode=2
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/normal_map=1
compress/channel_pack=0
mipmaps/generate=true
mipmaps/limit=-1
roughness/mode=1
roughness/src_normal="res://Environment/orange_flowers/orange_flower_flower_blade_normal.png"
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=0
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
@@ -0,0 +1,36 @@
[remap]

importer="texture"
type="CompressedTexture2D"
uid="uid://bpee2r4w5ghjp"
path.s3tc="res://.godot/imported/orange_flower_pink_flower_albedo.png-7c3aabbb097bc7ad39a5936cd288aef1.s3tc.ctex"
metadata={
"imported_formats": ["s3tc_bptc"],
"vram_texture": true
}
generator_parameters={}

[deps]

source_file="res://Environment/orange_flowers/orange_flower_pink_flower_albedo.png"
dest_files=["res://.godot/imported/orange_flower_pink_flower_albedo.png-7c3aabbb097bc7ad39a5936cd288aef1.s3tc.ctex"]

[params]

compress/mode=2
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=true
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=0
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
@@ -0,0 +1,36 @@
[remap]

importer="texture"
type="CompressedTexture2D"
uid="uid://caxnpjpvcx2va"
path.s3tc="res://.godot/imported/orange_flower_pink_flower_normal.png-4f64cbb4f4ec458b87cb1c2194cb7678.s3tc.ctex"
metadata={
"imported_formats": ["s3tc_bptc"],
"vram_texture": true
}
generator_parameters={}

[deps]

source_file="res://Environment/orange_flowers/orange_flower_pink_flower_normal.png"
dest_files=["res://.godot/imported/orange_flower_pink_flower_normal.png-4f64cbb4f4ec458b87cb1c2194cb7678.s3tc.ctex"]

[params]

compress/mode=2
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/normal_map=1
compress/channel_pack=0
mipmaps/generate=true
mipmaps/limit=-1
roughness/mode=1
roughness/src_normal="res://Environment/orange_flowers/orange_flower_pink_flower_normal.png"
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=0
8 changes: 5 additions & 3 deletions Player/Player.tscn
Expand Up @@ -14,7 +14,9 @@

[sub_resource type="SeparationRayShape3D" id="SeparationRayShape3D_gqx4v"]

[sub_resource type="CameraAttributesPractical" id="CameraAttributesPractical_3ix22"]
[sub_resource type="CameraAttributesPractical" id="CameraAttributesPractical_2ooex"]
dof_blur_far_enabled = true
dof_blur_far_distance = 45.0

[sub_resource type="CylinderShape3D" id="CylinderShape3D_s5n07"]

Expand Down Expand Up @@ -135,7 +137,7 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 10)
[node name="PlayerCamera" type="Camera3D" parent="CameraController"]
transform = Transform3D(-1, -3.71248e-14, -8.74228e-08, -3.23484e-08, 0.929023, 0.370022, 8.12178e-08, 0.370022, -0.929023, -8.74228e-07, 6.04006, -9.29023)
top_level = true
attributes = SubResource("CameraAttributesPractical_3ix22")
attributes = SubResource("CameraAttributesPractical_2ooex")
fov = 50.0

[node name="CameraRayCast" type="RayCast3D" parent="CameraController/PlayerCamera"]
Expand Down Expand Up @@ -239,7 +241,7 @@ render_target_update_mode = 4
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -0.812403)

[node name="godot_coin" parent="PlayerUI/CoinsContainer/SubViewportContainer/SubViewport/Coin" index="0"]
transform = Transform3D(0.934963, 0, 0.354745, 0, 1, 0, -0.354745, 0, 0.934963, 0, 0, 0)
transform = Transform3D(0.998735, 0, 0.0502874, 0, 1, 0, -0.0502874, 0, 0.998735, 0, 0, 0)
y_amplitude = 0.0

[node name="Camera3D" type="Camera3D" parent="PlayerUI/CoinsContainer/SubViewportContainer/SubViewport"]
Expand Down
4 changes: 2 additions & 2 deletions Player/model/materials/face_mat.tres
@@ -1,7 +1,7 @@
[gd_resource type="ShaderMaterial" load_steps=3 format=3 uid="uid://bbishx00t2kip"]

[ext_resource type="Shader" path="res://shared/shaders/face_mat.gdshader" id="1_js7p0"]
[ext_resource type="Texture2D" uid="uid://ci7cn145ld3l5" path="res://Player/model/faces/closed.png" id="2_gtaw8"]
[ext_resource type="Texture2D" uid="uid://dbag7f8i27ub1" path="res://Player/model/faces/open.png" id="2_vumes"]

[resource]
render_priority = 0
Expand All @@ -12,4 +12,4 @@ shader_parameter/screen_red_offset = Vector2(0, 0)
shader_parameter/screen_green_offset = Vector2(0, 0)
shader_parameter/screen_blue_offset = Vector2(0, 0)
shader_parameter/pixel_size = 44.0
shader_parameter/face_texture = ExtResource("2_gtaw8")
shader_parameter/face_texture = ExtResource("2_vumes")
2 changes: 1 addition & 1 deletion Player/model/materials/heart_core_mat.tres
Expand Up @@ -4,4 +4,4 @@
albedo_color = Color(0, 0, 0, 1)
emission_enabled = true
emission = Color(0, 1, 0.392157, 1)
emission_energy_multiplier = 1.76197
emission_energy_multiplier = 1.80497

0 comments on commit d2f35ef

Please sign in to comment.