Parchment, update mesh wood and paper, make a specific scene to control it ; and bake a new lightmap

This commit is contained in:
stilobique-i7
2021-05-24 19:13:41 +02:00
committed by VAILLANT Jeremy
parent a2d94e0cbd
commit 69ea236583
21 changed files with 2663 additions and 447 deletions
+20
View File
@@ -0,0 +1,20 @@
extends Spatial
# Declare member variables here. Examples:
# var a = 2
# var b = "text"
export var paper = false
func _init():
$sm_paperparchment_lod0.set_visible(paper)
print("[Parchment] Set is visibility > " + paper)
# Called when the node enters the scene tree for the first time.
func _ready():
pass # Replace with function body.
# Called every frame. 'delta' is the elapsed time since the previous frame.
#func _process(delta):
# pass
File diff suppressed because one or more lines are too long
Binary file not shown.
File diff suppressed because one or more lines are too long
File diff suppressed because it is too large Load Diff
Binary file not shown.
+20
View File
@@ -0,0 +1,20 @@
[gd_scene load_steps=4 format=2]
[ext_resource path="res://assets/props/parchment/sm_wood_parchment_lod1.mesh" type="ArrayMesh" id=1]
[ext_resource path="res://assets/props/parchment/gd_parchment.gd" type="Script" id=2]
[ext_resource path="res://assets/props/parchment/sm_paperparchment_lod0.mesh" type="ArrayMesh" id=3]
[node name="sm_parchment" type="Spatial"]
script = ExtResource( 2 )
paper = true
[node name="sm_wood_parchment_lod1" type="MeshInstance" parent="."]
use_in_baked_light = true
mesh = ExtResource( 1 )
material/0 = null
[node name="sm_paperparchment_lod0" type="MeshInstance" parent="."]
visible = false
use_in_baked_light = true
mesh = ExtResource( 3 )
material/0 = null
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
File diff suppressed because one or more lines are too long
@@ -2,21 +2,21 @@
importer="scene" importer="scene"
type="PackedScene" type="PackedScene"
path="res://.import/wood parchment.gltf-e93c1eef2677faf58da1ac1e3f046a68.scn" path="res://.import/sm_woodparchement_lod0.gltf-4962a9a2d9d3ce9db719721b89671873.scn"
[deps] [deps]
source_file="res://assets/props/parchment/wood parchment.gltf" source_file="res://assets/props/parchment/sm_woodparchement_lod0.gltf"
dest_files=[ "res://.import/wood parchment.gltf-e93c1eef2677faf58da1ac1e3f046a68.scn" ] dest_files=[ "res://.import/sm_woodparchement_lod0.gltf-4962a9a2d9d3ce9db719721b89671873.scn" ]
[params] [params]
nodes/root_type="Spatial" nodes/root_type="ArrayMesh"
nodes/root_name="Scene Root" nodes/root_name="Scene Root"
nodes/root_scale=1.0 nodes/root_scale=1.0
nodes/custom_script="" nodes/custom_script=""
nodes/storage=0 nodes/storage=0
nodes/use_legacy_names=true nodes/use_legacy_names=false
materials/location=1 materials/location=1
materials/storage=0 materials/storage=0
materials/keep_on_reimport=false materials/keep_on_reimport=false
File diff suppressed because one or more lines are too long
@@ -2,21 +2,21 @@
importer="scene" importer="scene"
type="PackedScene" type="PackedScene"
path="res://.import/paper parchment.gltf-132cfafe4de0955ce9f05ae6af0c9ca8.scn" path="res://.import/sm_woodparchement_lod1.gltf-db6db4231d549ef4a489cae55ec8e1ea.scn"
[deps] [deps]
source_file="res://assets/props/parchment/paper parchment.gltf" source_file="res://assets/props/parchment/sm_woodparchement_lod1.gltf"
dest_files=[ "res://.import/paper parchment.gltf-132cfafe4de0955ce9f05ae6af0c9ca8.scn" ] dest_files=[ "res://.import/sm_woodparchement_lod1.gltf-db6db4231d549ef4a489cae55ec8e1ea.scn" ]
[params] [params]
nodes/root_type="Spatial" nodes/root_type="ArrayMesh"
nodes/root_name="Scene Root" nodes/root_name="Scene Root"
nodes/root_scale=1.0 nodes/root_scale=1.0
nodes/custom_script="" nodes/custom_script=""
nodes/storage=0 nodes/storage=0
nodes/use_legacy_names=true nodes/use_legacy_names=false
materials/location=1 materials/location=1
materials/storage=0 materials/storage=0
materials/keep_on_reimport=false materials/keep_on_reimport=false
File diff suppressed because one or more lines are too long
File diff suppressed because it is too large Load Diff
File diff suppressed because one or more lines are too long
Binary file not shown.
Binary file not shown.
+1 -21
View File
@@ -1,4 +1,5 @@
[gd_scene load_steps=64 format=2] [gd_scene load_steps=64 format=2]
[gd_scene load_steps=62 format=2]
[ext_resource path="res://assets/props/candle/sm_candle_top.mesh" type="ArrayMesh" id=1] [ext_resource path="res://assets/props/candle/sm_candle_top.mesh" type="ArrayMesh" id=1]
[ext_resource path="res://scenes/levels/warcraft/WarCraft.gd" type="Script" id=2] [ext_resource path="res://scenes/levels/warcraft/WarCraft.gd" type="Script" id=2]
@@ -6,13 +7,11 @@
[ext_resource path="res://assets/props/candle/sm_candlestick.mesh" type="ArrayMesh" id=4] [ext_resource path="res://assets/props/candle/sm_candlestick.mesh" type="ArrayMesh" id=4]
[ext_resource path="res://assets/props/rock floor/materials/MA_rock_floor.material" type="Material" id=5] [ext_resource path="res://assets/props/rock floor/materials/MA_rock_floor.material" type="Material" id=5]
[ext_resource path="res://assets/props/stool b/sm_stool_b.mesh" type="ArrayMesh" id=6] [ext_resource path="res://assets/props/stool b/sm_stool_b.mesh" type="ArrayMesh" id=6]
[ext_resource path="res://assets/props/parchment/sm_paper_parchment.mesh" type="ArrayMesh" id=7]
[ext_resource path="res://assets/materials/gray.tres" type="Material" id=8] [ext_resource path="res://assets/materials/gray.tres" type="Material" id=8]
[ext_resource path="res://assets/props/candle/sm_candle_b.mesh" type="ArrayMesh" id=9] [ext_resource path="res://assets/props/candle/sm_candle_b.mesh" type="ArrayMesh" id=9]
[ext_resource path="res://assets/props/growler/sm_growler.mesh" type="ArrayMesh" id=10] [ext_resource path="res://assets/props/growler/sm_growler.mesh" type="ArrayMesh" id=10]
[ext_resource path="res://assets/hdri/tx_night_place.hdr" type="Texture" id=11] [ext_resource path="res://assets/hdri/tx_night_place.hdr" type="Texture" id=11]
[ext_resource path="res://assets/props/rock floor/floor_lib.meshlib" type="MeshLibrary" id=12] [ext_resource path="res://assets/props/rock floor/floor_lib.meshlib" type="MeshLibrary" id=12]
[ext_resource path="res://assets/props/parchment/sm_wood_parchment.mesh" type="ArrayMesh" id=13]
[ext_resource path="res://assets/props/dagger/dagger.mesh" type="ArrayMesh" id=14] [ext_resource path="res://assets/props/dagger/dagger.mesh" type="ArrayMesh" id=14]
[ext_resource path="res://assets/sounds/ambient-sound-level-warcraft.ogg" type="AudioStream" id=15] [ext_resource path="res://assets/sounds/ambient-sound-level-warcraft.ogg" type="AudioStream" id=15]
[ext_resource path="res://scenes/levels/warcraft/WarCraft.lmbake" type="BakedLightmapData" id=16] [ext_resource path="res://scenes/levels/warcraft/WarCraft.lmbake" type="BakedLightmapData" id=16]
@@ -486,25 +485,6 @@ use_in_baked_light = true
mesh = ExtResource( 10 ) mesh = ExtResource( 10 )
material/0 = null material/0 = null
[node name="sm_wood_parchment2" type="MeshInstance" parent="Main Scene Props"]
transform = Transform( 0.796076, 0.00917861, -0.605127, 0, 0.999885, 0.0151663, 0.605197, -0.0120736, 0.795984, 0.543303, 0.962739, 0.755265 )
use_in_baked_light = true
mesh = ExtResource( 13 )
material/0 = null
[node name="sm_paper_parcment" type="MeshInstance" parent="Main Scene Props/sm_wood_parchment2"]
transform = Transform( 0.999998, -0.00176462, 0.000917584, 0.00177043, 0.999977, -0.00636284, -0.000906646, 0.00636445, 0.999979, -0.258801, -0.0540404, -0.00213048 )
use_in_baked_light = true
mesh = ExtResource( 7 )
skeleton = NodePath("")
material/0 = null
[node name="sm_wood_parchment3" type="MeshInstance" parent="Main Scene Props"]
transform = Transform( -0.596381, 0.0184557, 0.802489, 0.0225364, 0.999726, -0.00624354, -0.802385, 0.0143617, -0.596634, 0.281044, 0.958449, -0.253034 )
use_in_baked_light = true
mesh = ExtResource( 13 )
material/0 = null
[node name="sm_candle_d2" type="MeshInstance" parent="Main Scene Props"] [node name="sm_candle_d2" type="MeshInstance" parent="Main Scene Props"]
transform = Transform( -0.927966, 1.10978e-07, -0.372664, 6.91459e-08, 1, 1.25617e-07, 0.372664, 9.08001e-08, -0.927966, 0.457262, 1.00485, -0.058084 ) transform = Transform( -0.927966, 1.10978e-07, -0.372664, 6.91459e-08, 1, 1.25617e-07, 0.372664, 9.08001e-08, -0.927966, 0.457262, 1.00485, -0.058084 )
use_in_baked_light = true use_in_baked_light = true