From c6e93b0062aef2ed0e93aaf54c3da20aa4a0d093 Mon Sep 17 00:00:00 2001 From: Valentin Stark Date: Fri, 19 Aug 2022 21:41:54 +0200 Subject: [PATCH] =?UTF-8?q?am=C3=A9lioration=20du=20rendu?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- world/World3d.gd | 7 +++++-- world/game.gd | 5 +++-- world/game.tscn | 2 +- world/world.material | Bin 1159 -> 1168 bytes world/world.tres | 2 +- 5 files changed, 10 insertions(+), 6 deletions(-) diff --git a/world/World3d.gd b/world/World3d.gd index 5626a04..0a0ded5 100644 --- a/world/World3d.gd +++ b/world/World3d.gd @@ -24,12 +24,12 @@ func draw_world(): st.add_vertex(Vector3(edge.end().point3d().x, triangle.get_elevation(), edge.end().point3d().z) * factor) st.add_vertex(Vector3(edge.end().point3d().x, edge.opposite_triangle().get_elevation(), edge.end().point3d().z) * factor) st.add_vertex(Vector3(edge.start().point3d().x, edge.opposite_triangle().get_elevation(), edge.start().point3d().z) * factor) - + for point in triangle.points(): st.add_vertex(Vector3(point.point3d().x, triangle.get_elevation(), point.point3d().z) * factor) st.generate_normals() - st.generate_tangents() +# st.generate_tangents() st.index() # Commit to a mesh. var mesh = st.commit() @@ -42,8 +42,11 @@ func draw_world(): mi.cast_shadow = GeometryInstance.SHADOW_CASTING_SETTING_ON print(mi) add_child(mi) + Global.print_debug(OS.get_ticks_msec() / 1000.0) func _on_Game_world_loaded(game_terrain): terrain = game_terrain draw_world() +# 18 - 42 +# 4 - 9 diff --git a/world/game.gd b/world/game.gd index 2550823..4fd0c80 100644 --- a/world/game.gd +++ b/world/game.gd @@ -23,7 +23,7 @@ func _ready(): noise.seed = rng.randi() noise.octaves = octaves - var terrain_name="bonjour" + var terrain_name="bonjour90" terrain = Terrain.new() print(terrain.list()) @@ -36,6 +36,7 @@ func _ready(): if terrain.is_created() or terrain.is_loaded(): init_data() add_trees() + Global.print_debug(OS.get_ticks_msec() / 1000.0) emit_signal("world_loaded", terrain) else: Global.print_debug("Pas de terrain, pas de construction ...") @@ -178,7 +179,7 @@ func triangle_find_elevation(triangle): return elevation func triangle_is_water(triangle): - if triangle.get_elevation() <= 0: + if triangle.get_elevation() < 0: return true return false diff --git a/world/game.tscn b/world/game.tscn index a1855c0..26c0e5f 100644 --- a/world/game.tscn +++ b/world/game.tscn @@ -43,7 +43,7 @@ fov = 55.0 zoom_sensibility = 1.436 [node name="DirectionalLight" type="DirectionalLight" parent="World3d"] -transform = Transform( 1, 0, 0, 0, 0.641744, 0.766919, 0, -0.766919, 0.641744, 0, 1.41623, 0 ) +transform = Transform( 0.971628, 0.168947, -0.16552, 0, 0.699825, 0.714314, 0.236516, -0.694047, 0.67997, 0, 1.41623, 14.8745 ) light_energy = 0.1 shadow_enabled = true diff --git a/world/world.material b/world/world.material index 2448577da7906540ca1bbab346bee09f2c9adfbe..ae35355256802629b9ee79a543d08aaa831609a5 100644 GIT binary patch literal 1168 zcmV;B1aJFNQ$s@n000005C8yH3IG6j1ONaiwJ-f(Rta?@0M>D*L-2Il2Dp**RCSY) z^F{*|OUnb#vVmvdLJZUXzt`m!=>xHDp|vIsthfOf_6jq4=!ij0z(J#F;GSBknj{!G z!OGVZhX9cPlmI&8J>?duhpnzq!dJ&zFK8_@hr#!Vt8^5#D|Ix<3$8W2Bksd_g3oHL z+_aPSo7B@*C$sdT1lQ7w+eELsLqF}Bam`-LRJ#p)do@q(?gm`bTQ{o34sZQUs^LjH zc^5dnbn1wAv~pq_>C7M2G`l+mcZc9s)=alt$yAdgk-IY>;O+w411FP`x{U9eOiCg} z?$%S5B>32S;PBXYs*=ZkQ^M(JD0gL!`_|E;{PkO6yM34OR__PlW#YK#VpcnvI&x0b z=I=Tycn2U41v^xoPk9PnR9i~HkD=g2Q4r=g zmu10gW2#*V-<_+*fpIcb8tiYSps98o&gN8UyiVFl!E7}9(vFjP)4cT?us7AN1L9+- zl-K-LbN=Q=gXVAkHq8{gFb&j(PNlh3=1h0oaNLxGFa};A&q}C;<*}#Wb*fZ+Ttc4| zk39upHX0M%nUY?sm;|*eOZaAN@%$i$^sE36nKs#2tmUKxI2O@hzX>!85uL&edF#2 z3b?z1O7uDdwJ&n(>ZCfUOrGA#-Oq2VVG`fryuEhu{FAkE)-5}{KlzXHacN0YRkjLe-(lX*BB7oAU!JT4gMnpuCf~1hfKmtOL zDl={pfKxflg3vHTs){Dr+VAk0ch-&d%4Gwarle_k#D|yXya;AA;t4YmsYzMn^=6Oc zP?mw~5=o3sNdm5AlSF~ZiYiRD`1MEzwJ`w-^t!FvZP_f+R`DI^p4SFv5@ z!zPjte-E_(_(R~64T0|fqUIlS+)IMs4fK-$87MkLs8Z04^7s{4j1$c@^9+%`e5qy<`^QZ&S`YQ}gT-H?O{s(!O@a=g$ i-(k#U7e+xrh*R^9A|OK;o%}SaOQ|1|LVz7oQ$s^%yDuC7 literal 1159 zcmV;21bF*WQ$s@n000005C8y83IG6a1ONaiwJ-f(O$jX{0QT^tLlAY-0TBQo#rG`56;8I|SmylGc@YTsHy(pov^kPPR?QYnqJg=SCi}$(OptCpchP&H9S^T%VDRei4rgGlTa^*fJOQP;(K%lz?bO+Z`yZOoXrtaG6Cfl1# zkyK~uN)ztMX*)gZ^qWzBUIR5g<c_L?ED7)I9XVI+<|#_$HnZ$({-is~$EAhEuM5Ux9`b-tsC-U{ zDu`t+5`9=okU-HAs#HvXKpvORO3R3V)2Pv%VrWK0BuPP17{)*XLXavmZW5qVIm?33 zFhr_~CfVBWusoN+RrAW(h6Y4Qw49SeuK64e9$I9!nc&nx7FNBvB55DX08Bzsdr=Yx z7qlcXA+VwflPxJbl1yQDfC8v)>+QA-mTODw4t>wGQ5pH-I6Zu>5IS3DNgQ`^SF+ zZ`lc)1Bf%{nB%IX1|Ogw2gt6XNTd|IRc!b${gBFL{J{%}5a$Y95xf*D&`rM*s$CpM zTm*C!ctZGUfMQ|8?h)W^vs3z7ek*a@83bwe(X$mqxsy&-_UXXixen9gBcMi);X*oO zSaUkc^#smN5GT6{aG_)epoBgqwK4yq;4`nQfYz>&oBIaOPzQ`2DrUhfK+h07>5NHb zFC2pa6Tkm99TKta