From 85a5520013c931f2bbe1113dc050e4ea79a1f441 Mon Sep 17 00:00:00 2001
From: Valentin Stark <valentin@medialsace.fr>
Date: Wed, 17 Aug 2022 21:47:47 +0200
Subject: [PATCH] update 3d render

---
 world/World.gd       |   4 ++--
 world/game.gd        |   2 +-
 world/game.tscn      |   6 +++++-
 world/world.material | Bin 0 -> 1166 bytes
 4 files changed, 8 insertions(+), 4 deletions(-)
 create mode 100644 world/world.material

diff --git a/world/World.gd b/world/World.gd
index d273cb0..b1fd2f8 100644
--- a/world/World.gd
+++ b/world/World.gd
@@ -13,7 +13,7 @@ func draw_world():
 	st.add_smooth_group(true)
 	for triangle in terrain.get_triangles():
 		for point in triangle.points():
-			st.add_vertex(point.point3d())
+			st.add_vertex(point.point3d() * Vector3(1, 24*5, 1))
 
 	st.generate_normals()
 	st.generate_tangents()
@@ -23,7 +23,7 @@ func draw_world():
 	
 	var mi = MeshInstance.new()
 	mi.mesh = mesh
-	var material = load("res://world/world.tres")
+	var material = load("res://world/world.material")
 	mi.set_surface_material(0, material)
 	mi.create_trimesh_collision()
 	mi.cast_shadow = GeometryInstance.SHADOW_CASTING_SETTING_ON
diff --git a/world/game.gd b/world/game.gd
index b1afcf0..0c8d105 100644
--- a/world/game.gd
+++ b/world/game.gd
@@ -121,7 +121,7 @@ func point_find_elevation(point):
 		
 	elevation = min(elevation, 1)
 		
-	# elevation = elevation * terraces
+	elevation = round(elevation * terraces) / terraces
 	return elevation
 	
 func point_is_water(point):
diff --git a/world/game.tscn b/world/game.tscn
index e8339b9..00c45f4 100644
--- a/world/game.tscn
+++ b/world/game.tscn
@@ -21,7 +21,7 @@ scale = Vector2( 0.25, 0.25 )
 script = ExtResource( 4 )
 
 [node name="Water" type="MeshInstance" parent="World"]
-visible = false
+transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 1000, 0, 1000 )
 mesh = SubResource( 1 )
 
 [node name="WorldEnvironment" type="WorldEnvironment" parent="World"]
@@ -29,6 +29,10 @@ environment = ExtResource( 3 )
 
 [node name="CamBase" parent="World" instance=ExtResource( 5 )]
 
+[node name="DirectionalLight" type="DirectionalLight" parent="World"]
+transform = Transform( 1, 0, 0, 0, 0.41636, 0.9092, 0, -0.9092, 0.41636, 0, 1.41623, 0 )
+light_energy = 0.1
+
 [connection signal="world_loaded" from="." to="UI/Map" method="_on_Game_world_loaded"]
 [connection signal="world_loaded" from="." to="World" method="_on_Game_world_loaded"]
 
diff --git a/world/world.material b/world/world.material
new file mode 100644
index 0000000000000000000000000000000000000000..e4ba4f61e8eed162c40ed316a3053fa7e9d80572
GIT binary patch
literal 1166
zcmV;91abRPQ$s@n000005C8yJ3IG6h1ONaiwJ-f(SP5k#0G9EkLjZM~1KIyybx3fE
z*T3c;o<Xxg|No%<f7aHvRNxl5N@8|%$&%bIcw+oNs;tjq-~8wJ^X=`0K00>X6#x*N
z2p~)Wg#e8JlmOReO>*%)OL2vgtvJ?c0b_YZ7dnqb^G9*35=WD?&=`Lmi9UNLv^FV~
z`8!EJ?LBOD@=7mCXe_;$O<%hk_9@S6=k?<Ktv2ZF&8y+=HqiL%<bI2t&G^%Pv)XsE
zF6ghX;b?QDQnNI^c0Y^%b~lCYhR{^b`&qKw-{dIN-3$nHw}9@NpJ-3&uB~pOJ&6=W
zb)K#yLC4$!2gkfql{n^`5>7|+qAG99b&edxFVE6a&bw>5Sw9FbPPI12#~;VdjnhJt
zFp<(v<NW7BdN!8i-Qp;Fzi~{ni(7pP<G<MsUR2I3J?!tDaseX%x+&S!Mz1YdxU+D6
zjHP9vU<}<o>JrOB=?<_}S+ey(f3+D0B33*U>`-+)#VL3_rcXhaq2NVPFvd5RWx;D>
znqA4(eCNh_aWYjJ%<H6}X?7gW=2U6CPEw7E*=Tb8P9!g<amzPgZkk;Ogv(GVu5oVO
z`)L~u8n5@ue<^rj8mJAON>iu2_jBZI%rAma23{*37LZGeV@|>ARH^v9fIcZ4a|*_6
zG^Wq@Nxn@>f?Jg(Td$=yDxeU^#19}D3nE3bizLZ|j*S}`wu6U*6dE*YWFBzj$W{m$
zlFf93n3;i*Wj%akA9CpE?g%OiM3hkAIg%j6j2_V42(ln1kjiqzkkQ?n?mkeUyA@O+
z#~Gf&$c(F#>ZCI9uTxY%p6zBycxNx?TeX^>D3#jGva|V<?kJxZmln4yD1$l3vw}k9
zb0S2+3-eIu(^7&23KtNiVq#^*^YUSF8Sx2#)TptYVrWK2M3aJ~FpL2}0z!}~Gj0-~
zV>Qfj&@e=*iYD3G@9?>I*EKvnwxPmPA}tT{mis-2!Ixe>KXZmEAdA7?14()*^49@H
zk|tCVfeYazaUigg3X_#|)Ll>?7@z>sZN1%A#e%jp@8I`L8<de_j<ZK#VxYv;K1y?V
z(~w1w5c78e8;|q&XNgERs;aaxU=NSapl$nF-a1n>ryD?+S<QK)t0*8;cwi6N<P!ew
z`F0lH3p}$X@C_i)Tx*Vh$q&APJ_#UUMTAHZb`!?%!}LSWhW;Zeq#@4LxT1I=Szt|{
z5>j0#NAwXYP(TJD&j4|Si`}1S+w-T?j{GX|u~P`^?4w_+i1OGSQTTenn!XFHh*OPl
zC%v%3;URmx)M9wE+md5H8ip!gVHF%FBI{@a)9o?Ed2kS9SlcSaLGZ(!bOXA>db~6g
z_E;_?Nd}y=TRu^6js!W`^?(aYb_+`Aqfr|ka3p+8+2i@ZNB55OfH0~8xz*}Ae=M9F
z3p_Hf&}<K%9X2_`qUw3enfyBBNfr5knsK-}or0uMiJ&zo4^7^2(gHt;H2ApfiJot@
gCcLXC9u`9Xy!{B`5SB4NGwM>B#!Vp*22xW)L!T}%6#xJL

literal 0
HcmV?d00001