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
parent 517dd0b6a8
commit 05b9ef9443
21 changed files with 2697 additions and 474 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"
type="PackedScene"
path="res://.import/wood parchment.gltf-e93c1eef2677faf58da1ac1e3f046a68.scn"
path="res://.import/sm_woodparchement_lod0.gltf-4962a9a2d9d3ce9db719721b89671873.scn"
[deps]
source_file="res://assets/props/parchment/wood parchment.gltf"
dest_files=[ "res://.import/wood parchment.gltf-e93c1eef2677faf58da1ac1e3f046a68.scn" ]
source_file="res://assets/props/parchment/sm_woodparchement_lod0.gltf"
dest_files=[ "res://.import/sm_woodparchement_lod0.gltf-4962a9a2d9d3ce9db719721b89671873.scn" ]
[params]
nodes/root_type="Spatial"
nodes/root_type="ArrayMesh"
nodes/root_name="Scene Root"
nodes/root_scale=1.0
nodes/custom_script=""
nodes/storage=0
nodes/use_legacy_names=true
nodes/use_legacy_names=false
materials/location=1
materials/storage=0
materials/keep_on_reimport=false
File diff suppressed because one or more lines are too long
@@ -2,21 +2,21 @@
importer="scene"
type="PackedScene"
path="res://.import/paper parchment.gltf-132cfafe4de0955ce9f05ae6af0c9ca8.scn"
path="res://.import/sm_woodparchement_lod1.gltf-db6db4231d549ef4a489cae55ec8e1ea.scn"
[deps]
source_file="res://assets/props/parchment/paper parchment.gltf"
dest_files=[ "res://.import/paper parchment.gltf-132cfafe4de0955ce9f05ae6af0c9ca8.scn" ]
source_file="res://assets/props/parchment/sm_woodparchement_lod1.gltf"
dest_files=[ "res://.import/sm_woodparchement_lod1.gltf-db6db4231d549ef4a489cae55ec8e1ea.scn" ]
[params]
nodes/root_type="Spatial"
nodes/root_type="ArrayMesh"
nodes/root_name="Scene Root"
nodes/root_scale=1.0
nodes/custom_script=""
nodes/storage=0
nodes/use_legacy_names=true
nodes/use_legacy_names=false
materials/location=1
materials/storage=0
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.
+35 -48
View File
@@ -1,4 +1,4 @@
[gd_scene load_steps=63 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://scenes/levels/warcraft/WarCraft.gd" type="Script" id=2]
@@ -6,14 +6,13 @@
[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/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/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/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/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/parchment/sm_parchment.tscn" type="PackedScene" id=15]
[ext_resource path="res://scenes/levels/warcraft/WarCraft.lmbake" type="BakedLightmapData" id=16]
[ext_resource path="res://assets/props/candle/sm_candle_d.mesh" type="ArrayMesh" id=17]
[ext_resource path="res://assets/props/table/sm_table.tscn" type="PackedScene" id=18]
@@ -88,7 +87,7 @@ ss_reflections_enabled = true
dof_blur_far_distance = 2.0
glow_enabled = true
[sub_resource type="ArrayMesh" id=18]
[sub_resource type="ArrayMesh" id=4]
lightmap_size_hint = Vector2( 158, 158 )
surfaces/0 = {
"aabb": AABB( -8.00194, 0.00112093, -7.00022, 10.0041, 0.0734728, 12.0031 ),
@@ -103,54 +102,54 @@ surfaces/0 = {
"vertex_count": 4110
}
[sub_resource type="CapsuleShape" id=4]
[sub_resource type="CapsuleShape" id=5]
radius = 0.130821
height = 0.168171
[sub_resource type="CapsuleShape" id=5]
[sub_resource type="CapsuleShape" id=6]
radius = 0.129956
height = 0.149993
[sub_resource type="CapsuleShape" id=6]
[sub_resource type="CapsuleShape" id=7]
radius = 0.124344
height = 0.123496
[sub_resource type="CapsuleShape" id=7]
[sub_resource type="CapsuleShape" id=8]
radius = 0.0500489
height = 0.330211
[sub_resource type="CapsuleShape" id=8]
[sub_resource type="CapsuleShape" id=9]
radius = 0.0995524
height = 0.748899
[sub_resource type="CapsuleShape" id=9]
[sub_resource type="CapsuleShape" id=10]
radius = 0.114536
height = 0.236295
[sub_resource type="CapsuleShape" id=10]
[sub_resource type="CapsuleShape" id=11]
radius = 0.0911443
height = 0.831942
[sub_resource type="SphereShape" id=11]
[sub_resource type="SphereShape" id=12]
radius = 0.0777453
[sub_resource type="SphereShape" id=12]
[sub_resource type="SphereShape" id=13]
radius = 0.0939276
[sub_resource type="SphereShape" id=13]
[sub_resource type="SphereShape" id=14]
radius = 0.0872712
[sub_resource type="SphereShape" id=14]
[sub_resource type="SphereShape" id=15]
radius = 0.0817803
[sub_resource type="BoxShape" id=15]
[sub_resource type="BoxShape" id=16]
extents = Vector3( 0.075969, 0.0690835, 0.0842404 )
[sub_resource type="CylinderShape" id=16]
[sub_resource type="CylinderShape" id=17]
radius = 0.0715322
height = 0.169626
[sub_resource type="CylinderShape" id=17]
[sub_resource type="CylinderShape" id=18]
radius = 0.0931278
height = 0.171908
@@ -268,7 +267,7 @@ mesh_library = ExtResource( 12 )
use_in_baked_light = true
cell_center_y = false
cell_center_z = false
baked_meshes = [ SubResource( 18 ) ]
baked_meshes = [ SubResource( 4 ) ]
data = {
"cells": PoolIntArray( 0, 0, 0, 65531, 0, 3, 65532, 0, 0, 65533, 0, 0, 65534, 0, 0, 65535, 0, 0, 0, 1, 0, 65531, 1, 3, 65532, 1, 0, 65533, 1, 0, 65534, 1, 0, 65535, 1, 0, 0, 2, 0, 65531, 2, 3, 65532, 2, 0, 65533, 2, 0, 65534, 2, 0, 65535, 2, 0, 0, 65533, 0, 65532, 65533, 0, 65533, 65533, 0, 65534, 65533, 0, 65535, 65533, 0, 0, 65534, 0, 65531, 65534, 3, 65532, 65534, 0, 65533, 65534, 0, 65534, 65534, 0, 65535, 65534, 0, 0, 65535, 0, 65531, 65535, 3, 65532, 65535, 0, 65533, 65535, 0, 65534, 65535, 0, 65535, 65535, 0 )
}
@@ -485,24 +484,12 @@ use_in_baked_light = true
mesh = ExtResource( 10 )
material/0 = null
[node name="sm_wood_parchment2" type="MeshInstance" parent="Main Scene Props"]
[node name="sm_parchment" parent="Main Scene Props" instance=ExtResource( 15 )]
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"]
[node name="sm_parchment2" parent="Main Scene Props" instance=ExtResource( 15 )]
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
paper = false
[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 )
@@ -541,7 +528,7 @@ collision_mask = 2
[node name="CollisionShape" type="CollisionShape" parent="Hidden Objects Items/fioles/fiole1/Area"]
transform = Transform( 1, 2.98023e-08, -8.9407e-08, 0, -1.19209e-07, 1, -8.9407e-08, -1, 2.98023e-08, -5.96046e-08, 0.0801149, 0 )
shape = SubResource( 4 )
shape = SubResource( 5 )
[node name="fiole2" type="MeshInstance" parent="Hidden Objects Items/fioles"]
transform = Transform( 0.655275, 0.636944, -0.4061, 0.670978, -0.243833, 0.700239, 0.346993, -0.731333, -0.587153, -4.19531, -0.894133, 2.66915 )
@@ -555,7 +542,7 @@ collision_mask = 2
[node name="CollisionShape" type="CollisionShape" parent="Hidden Objects Items/fioles/fiole2/Area"]
transform = Transform( 1, 5.96046e-08, -8.9407e-08, 2.98023e-08, -8.9407e-08, 1, -8.9407e-08, -1, 0, 2.38419e-07, 0.0823998, -1.19209e-07 )
shape = SubResource( 5 )
shape = SubResource( 6 )
[node name="fiole_socle" type="MeshInstance" parent="Hidden Objects Items/fioles"]
transform = Transform( 0.6773, -1.86265e-09, 0.735707, -0.0293841, 0.999202, 0.0270513, -0.73512, -0.03994, 0.67676, -2.27881, -0.11528, -1.23929 )
@@ -574,7 +561,7 @@ collision_mask = 2
[node name="CollisionShape" type="CollisionShape" parent="Hidden Objects Items/fioles/fiole_socle/fiole3/Area"]
transform = Transform( 1, 2.08616e-07, -7.45058e-08, -5.96046e-08, -1.49012e-07, 1, 5.96046e-08, -1, -1.04308e-07, -1.78814e-07, 0.0560231, 0 )
shape = SubResource( 6 )
shape = SubResource( 7 )
[node name="dagger" type="MeshInstance" parent="Hidden Objects Items"]
transform = Transform( -0.625025, -0.777847, 0.0655765, 0, 0.0840072, 0.996466, -0.780606, 0.622816, -0.0525065, 0.69073, -0.117415, 0.830941 )
@@ -587,7 +574,7 @@ collision_mask = 2
[node name="CollisionShape" type="CollisionShape" parent="Hidden Objects Items/dagger/Area"]
transform = Transform( 1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, 0, 0.0802139, 0 )
shape = SubResource( 7 )
shape = SubResource( 8 )
[node name="spyglass" type="MeshInstance" parent="Hidden Objects Items"]
transform = Transform( 0.665919, -0.0332091, 0.63579, 1.34429e-08, 0.920039, 0.0480562, -0.636656, -0.0347355, 0.665013, -2.88265, -0.329537, -0.428369 )
@@ -600,7 +587,7 @@ collision_mask = 2
[node name="CollisionShape" type="CollisionShape" parent="Hidden Objects Items/spyglass/Area"]
transform = Transform( 1, 0, 2.98023e-08, 1.86265e-09, 1, 3.72529e-09, 0, 5.58794e-09, 1, 2.38419e-07, -1.19209e-07, 0.0177531 )
shape = SubResource( 8 )
shape = SubResource( 9 )
[node name="beer" type="MeshInstance" parent="Hidden Objects Items"]
transform = Transform( 0.996658, -0.053142, 0.0620432, 0.0548108, 0.998171, -0.0255105, -0.060574, 0.0288258, 0.997748, -2.8842, 0.173697, 1.98168 )
@@ -614,7 +601,7 @@ collision_mask = 2
[node name="CollisionShapeBeer" type="CollisionShape" parent="Hidden Objects Items/beer/Area"]
transform = Transform( 1, 0, -1.61817e-08, 1.83936e-08, -4.28408e-08, 1, 0, -1, -4.65661e-08, 9.53674e-07, 0.0746492, 2.38419e-07 )
shape = SubResource( 9 )
shape = SubResource( 10 )
[node name="weapon" type="MeshInstance" parent="Hidden Objects Items"]
transform = Transform( 0.540284, -0.813497, 0.215212, -0.009216, 0.250018, 0.968198, -0.841432, -0.525085, 0.127583, -2.7508, -0.359206, 1.19589 )
@@ -627,7 +614,7 @@ collision_mask = 2
[node name="CollisionShapeWeapon" type="CollisionShape" parent="Hidden Objects Items/weapon/Area"]
transform = Transform( -1.49012e-07, 0, 1, -1, -1.49012e-08, 0, 3.72529e-08, -1, -5.21541e-08, 0.0388942, 0.0484145, -8.19564e-08 )
shape = SubResource( 10 )
shape = SubResource( 11 )
[node name="apples" type="Spatial" parent="Hidden Objects Items"]
@@ -642,7 +629,7 @@ collision_mask = 2
[node name="CollisionShapeApple" type="CollisionShape" parent="Hidden Objects Items/apples/apple1/Area"]
transform = Transform( -1.45286e-07, -2.98023e-08, 1, -1, -1.11759e-08, 0, 1.86265e-08, -1, -8.9407e-08, -1.90735e-06, 0.00575864, 0 )
shape = SubResource( 11 )
shape = SubResource( 12 )
[node name="apple2" type="MeshInstance" parent="Hidden Objects Items/apples"]
transform = Transform( -0.190449, 0, 0.981697, 0, 1, 0, -0.981697, 0, -0.190449, -1.71166, -0.0869397, -1.29534 )
@@ -655,7 +642,7 @@ collision_mask = 2
[node name="CollisionShapeApple2" type="CollisionShape" parent="Hidden Objects Items/apples/apple2/Area"]
transform = Transform( -1.49012e-07, 4.47035e-08, 1, -1, -1.49012e-08, 0, 3.72529e-08, -1, -1.49012e-08, -4.76837e-07, -0.00566041, 0 )
shape = SubResource( 12 )
shape = SubResource( 13 )
[node name="apple3" type="MeshInstance" parent="Hidden Objects Items/apples"]
transform = Transform( 0.823731, 0.226496, -0.519776, -0.248954, 0.96813, 0.0273319, 0.509401, 0.106886, 0.853865, -0.718663, -0.36046, 1.92043 )
@@ -668,7 +655,7 @@ collision_mask = 2
[node name="CollisionShapeApple3" type="CollisionShape" parent="Hidden Objects Items/apples/apple3/Area"]
transform = Transform( -1.71363e-07, 0, 1, -1, -3.72529e-08, 1.49012e-08, 2.98023e-08, -1, -1.19209e-07, -3.57628e-07, 0.0142345, 2.38419e-07 )
shape = SubResource( 13 )
shape = SubResource( 14 )
[node name="apple4" type="MeshInstance" parent="Hidden Objects Items/apples"]
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -4.38775, -0.940515, 0.233058 )
@@ -681,7 +668,7 @@ collision_mask = 2
[node name="CollisionShapeApple4" type="CollisionShape" parent="Hidden Objects Items/apples/apple4/Area"]
transform = Transform( -1.49012e-07, 0, 1, -1, -1.49012e-08, 0, 3.72529e-08, -1, -5.21541e-08, -4.76837e-07, 0.00115258, -1.17347e-07 )
shape = SubResource( 14 )
shape = SubResource( 15 )
[node name="golds" type="Spatial" parent="Hidden Objects Items"]
@@ -697,7 +684,7 @@ collision_mask = 2
[node name="CollisionShapeGold1" type="CollisionShape" parent="Hidden Objects Items/golds/coin1/Area"]
transform = Transform( 1, -4.65661e-08, 0, -1.38185e-07, 0.999999, 3.14321e-08, 4.17233e-07, -4.19095e-09, 1, 0.0276761, 0.00212932, 0.0336302 )
shape = SubResource( 15 )
shape = SubResource( 16 )
[node name="coin2" type="MeshInstance" parent="Hidden Objects Items/golds"]
transform = Transform( 0.250245, 2.79397e-09, -0.968183, 0.0456076, 0.99889, 0.0117882, 0.967108, -0.0471065, 0.249967, 0.752443, -0.000386238, 1.36745 )
@@ -712,7 +699,7 @@ collision_mask = 2
[node name="CollisionShapeGold2" type="CollisionShape" parent="Hidden Objects Items/golds/coin2/Area"]
transform = Transform( 1, 0, 2.98023e-08, 7.45058e-09, 1, -9.31323e-10, 5.96046e-08, 0, 1, 0.0499306, 1.19209e-07, 0.0191208 )
shape = SubResource( 16 )
shape = SubResource( 17 )
[node name="coin3" type="MeshInstance" parent="Hidden Objects Items/golds"]
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -4.74641, -0.885448, -0.198129 )
@@ -726,7 +713,7 @@ collision_mask = 2
[node name="CollisionShapeGold3" type="CollisionShape" parent="Hidden Objects Items/golds/coin3/Area"]
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0.0358186, 0, 0.0109152 )
shape = SubResource( 17 )
shape = SubResource( 18 )
[node name="ListObjects" parent="." instance=ExtResource( 44 )]