From 80c67686b9404fda5832839c484a6a84f5996de1 Mon Sep 17 00:00:00 2001 From: AleaJactaEst Date: Tue, 29 Jun 2021 21:40:38 +0200 Subject: [PATCH] update isidot race --- .../creatures/isidor/IsidorMatHalo.material | Bin 1832 -> 845 bytes .../isidor/IsidorMatPropulsion.material | Bin 1676 -> 774 bytes .../creatures/isidor/IsidorMatRoue.material | Bin 1652 -> 755 bytes assets/creatures/isidor/isidor.gltf | 1010 +++++++++++++---- assets/creatures/isidor/isidor.tscn | 3 - project.godot | 2 +- scenes/creature_creation/creature_creation.gd | 17 +- .../creature_creation_menu.gd | 2 + scenes/main/main.gd | 2 +- 9 files changed, 813 insertions(+), 223 deletions(-) diff --git a/assets/creatures/isidor/IsidorMatHalo.material b/assets/creatures/isidor/IsidorMatHalo.material index c8ee916fa907ed0cb8dc55f32144e4f8ff7de5c1..40c5f524a0e150d9924585a6bacc6f7ca90aa294 100644 GIT binary patch literal 845 zcmV-T1G4;5Q$s@n000005C8xq2LJ#y0{{RhwJ-f(BnDj>0M@5=I52V30RYA59E^yF zNZ}%Q9go~Z$WD`xNzT|LWG9i6K~DQ;V-`#XcQu9^=ONwy2aErq=*1zO0$~7Q0Ac`- znQy9)S;t}6eg?A(Ir^=d2&a@aNZEM9Dl?Ai5y(B$&gLxp(J{H6yW=?bZ1@~ycZc9Q zzs=hXTNTq*C>euOrpb{XS0-MlsUvpnyYsla61Q?&KSNgTXB)XY2LkQ_n`|Xvttf3M zrt8AdxuT@aRWbBDtI(nBY`)pNINcqE^OaCD!%y1H3AH0<`b_r%CF;7QuX4?5(#B_o ztSa0E)6Nfa^pTZbR)Q$y?6Yy5ELYopRI7QTE!Oeba)WU18rrS@Pe*=j1 z@X4uDSAw=Fng|&;f3`O6U|N}?Vv3B{eIcE2$}*UUdnsd?N%)a=t$c;mCtuduOXk&XP}!~~L`Fn9aM)lW(O@CDtGGZFl@~B( zSTGktGGMUWfV;C$NfARvrK5yKWrPS1mR6%Az#V}CE1(a&^2BEdib=Ct--)Mon)s`G zP9`K=L);yJZ`;Z5&VVMC@2gbhgPmV!Ioypxp-@_Ty!!L7E)be%^HqJyegc4*sDUjq z$jpq4NYbP*i~&#rA%?1o2NFOuHOc}hBO-03{eJ@huSyL44zP!NGq$!#h5pWbA3MYu z$|k&2^(jfegUPV;)Ey?k&8?2!?bGEzRqi09*}(L^ZM_ z_ZWK0NK5+ytB5&5i6D^~JTWE$V*wd3kSvUCf+~nCbE}Fg#v}KLq%!2NY$8j-n5So3 z*_Y-Q-I-tx+dc;B2-~{0mk|Wg)-D#q9S#zkpqJN7h7pHzb0B^HUCSBaaL-y zH42}O!#eILMr=Y8K2e#@dFF}JIu0Q|cH2Qpk|aS@L6UL}rgNgA-2?6J?H5`d+mDY| XX;wa!poHhcNL6^_B%*E@Qd2`i)Xaif literal 1832 zcmbVNOOMnr3=VJcel2e}fq07%D}fM)86hqpv6tNg$H>#VGZAT0IhmbVP8|6QNcpDpBmC{h1^(Y@AR4e+5Rv%XoBj9q4bQyJ zgE06R6{xK*!0PCADA1ugx2khcqY^I&U5TU{GM-G_Q>PenxQM!e5Y#1>DhrdKBY_JI zuz6IsGdc^X!xTzCmvwvtg>al->YZq@R97>!ixhF8t(i=taTB$XHO}i2n>f`GLsVBX zE{inYxTu5qj4M=gPqt*wOk=?Tsf&3^WfoYr=1XV6j&;W)H=SRp_cW`w%%#2k^ys0JIXciEgOQMTYu6< z*VHDoo=Idl;!p=&nyQjnwJ$ME=&5Dr}j~$Wd1(*`~$_)|w)D+Y7o6QmT)Pav7v~vhaRT7gKN!Z8{C)XOpSJ z?lfdc>L?N1WP$@|W{~J(&D${EX>?LQW%9KL(<$r)wm_QfCI2(#8zhJv205=w)alvo zX4+H6dY9w?w$+!Hlz5Y=vn;hzSOh9O#Ef2M6r2e@l5h4hd|F_iMd>7M)$|*Zz7u9+ zF8@mM8@Z)rYdOfNd+d*bEJj!n6mc~;;(W=8G&WO6Q=08Q?@C9!5y@9oz?k})h|4}8 z-mD?gqo_$aY^gTas5aNBHV;s(AS+bT(;D&%Q*+bP75BN$VI@1`W)Z=0mr06ra8EEC z3T{`Cf0R1J;{^|H*slizZnqf2pdbV(t1vLZl%59f(}!<~cVPXqy1y;P$AvcqHUBZrd=2#l+5Z9$>0HfiXi+g- zbdDuBGE9uL(YmAyVcJI-_rJz}4qumxeI4tvuYLSqAm9({N!S>bI!%)bv2%Nk^H!Ip z{}ImXoK=Q8;jSix`!K_1n2d7>7jvA7K@t-#YGp{3gfo<7ZO{c9sX}HQhr&xX7vE#I zT5cn?RxLOp88u674c?56D&0^a4b48xJgf#nnrcLu1x=;)kgRvJLJU%=o|0zr?oXGf3@qfak#NVNUiH=DI5*Cw6MTh`@g$0FkVLeS3 zL|?~;$f`=t2p?{Wa3k|YA{rPs{0Go2H}U@gnAkO^LUj!a>2&g<+awZ+q^(9HH;v-L z0P^HDs!q2J?qYX~0}_BVJx3BPqmj6f_WuoiE`k^r zWsF1SS0OkCZ7wsw!#!h4{s!~qR~oJh%sL{}H0BTje`d!---3kUT}qiY-4Qvf4dLJo z(y@1@eT0h3ZFMR6h!o*u#4%n12RYiyfh(+$suiAO+p|c=!Egf=8eVq1JyXyhsEWO* zr1lJKlP0uG7GhXP?ICNRu|Sm8;}CoWp(KX&0G4uki`vD87+?(Yq(cRm3YMSZ=@=`W%4!m4pLJ? EL&|1e@Bjb+ literal 1676 zcmbVN$&S=85H-sT`#S84IB~5Y_#Ri;>nF7j-Z{ zaE)r=$(HPyX)QP)bthk`%o5A~_{v$ZGb}x`FLmW5K!N5n^*mo7HCe#cZIdr zmL|Z=qK0N>I1c?A)(Fsrj!+k#m?JV7HDH5!$`*!K7v6f(@*oJh_a{AcLv2FunM8&o z4o%RdsVceE_!85F0S_$}odxO@lC43(Zo0BZB`O2TXKfEYT!DSeOM=A?i!~1Q!j!R2 zl`ybuiSAQC%;gSS8@uEZEN78CInCF1}lf`r3j`9 zTctB{)YTO}(_jQ^O_97E1w95S)kj9T4AMO@ybbE22ItVGZXn;yYllNOWJ&5M5j!iu1X+s>C9Xk#;l42|ye?T}jWMkHTV0b`mw zBCh&WyxBlxhESVg+*2KHP#tbk9qv%AA!}4Jb6WCC)9_Hz70;o;VI?o)W{%)^3M55p ztV;}sg2zeZ52eoW`oN0^>ifxr$05crDF{K*9wsK3($nNi+IWh8<&<<*^8BV5XZq!R zAyR45ZqIvBiHSX4((3;pO83qW=Oj<^{~@vrExGe;ub%Gzd^bJ%{pyoazosu3yU6R{ Q&+F;S;hVSVG5-(!1?9Nv=l}o! diff --git a/assets/creatures/isidor/IsidorMatRoue.material b/assets/creatures/isidor/IsidorMatRoue.material index 40e133c5132fa53ead536dbed4eb585a716662f9..d98ff51190a9f7f3f42d196f757d1e159a0e5674 100644 GIT binary patch literal 755 zcmVIk4ymfD>aVJ* zsu&)!tyv<;vE^o@Bq2oZEj`vD{%2p@OA%)DgT`n}|65zj*WYnG{uEXKSO8i8EW2TH zp$Yb)#)B(l3(_@}sJey`^5b|j+-uBk8!>Zh`A>1?Yp5s4{vY^8=W1?4i;Cf*b4=pM zFfr0b>yj>nX&+_W{}%rR-0sc!65aCq7MA{W6_jq7nyzn1Dx7@`4 z3t(c`oC?(~Xrt4~iEe{HAdt2ejl3+1%Yw#}*Qh$(F1U-`%Ra0;tOz!m27rgCp)De1 zL`Fs=X;K)*Py!)n%DMp(fFwPK5-lT=xYGW=0q@DqVu73$Hz+qspC$yHsw^4jo4}+8 zOnW(&hS8;N&BmPZ;NR?+$Xgr0sawp^nC=L`YDD-D1ap2m!yXY${a%fT9wIa3M%3+j zaL`E09JqxyQwrgC*e)gRX0UOCd>WN)(|%Lp@TcBh12g^%i}@ykMjm2E7}Y}-frr92 zqq8I68R6zaIwBtmQt@`v*8oGw0#=OirJKueE`kIxHTDX|^-TXQQ8x2)ka{^5WRetNHo-n;L)Dc%H^1{(s&AreF0ij5(QzfNV+2z$>mFRhp~X0tUE|aJz=ZyuuM7=gwz2q&+2VO`-D2Jz{a(l z6FV@%@o?)8;zg^TSLgyM<3@Y8TxA!Q>S^_as4aGRr8B0io>g29>7ol+C-)0?sMe9Z z<;Yy;ApohzbxY$mXouz7V8JiYMrPmWCQ5=5Ef?xt-Ne2SvnDj?E~a~>o!eTMVBt|i zyKtO`;SM_l7*bEDO(f>XOhzsEq~7oe5fk+fV0k{;qI7u|EaG(;wu;fzC@v~^7* zyV_{6Y#8y>q3J!);E-yK4h}Qe0hO$bD6jPc_+kqVIkyDsBNp!h>b0|ZRXSm0IjF^S zqVs+cfyPrM?MI%Uh#hw$cvSbc{w2k=dbPDndVIG6Ug}bcr0%nGtX|1r>9B1%GiP1h z<~1#5@ZOmc?PTaFNu@t3%56~g$-#%9HY*4LeR&NO`{gR&_!_DueN+fuGr?au{JlVDe$`mJ{uKr4Z5RFFuZ?m1x9@O_MMe-4S#9P9>T> zL^OoDlH-BubdTzEpX&68Y6sb&63yu-Zd}Wvq#M?uF<>P( Array: list_blend_shapes( i, root) return ret + func update_blend_shapes_step( obj, father = "" ): for i in obj.get_children(): var root = father + str(i.name) + "." @@ -94,13 +95,11 @@ func change_creature( new_model_path ): new_model = new_model.instance() new_model.name = "creature" self.add_child( new_model ) - #new_model.connect( "animation_finished", self, "_on_creature_animation_finished" ) - #new_model.duplicate_meshes() -func _on_select_race( race ): - Config.msg_debug(race) - match race: +func _on_select_race( race_sex_selected ): + Config.msg_debug(race_sex_selected) + match race_sex_selected: "arche": self.change_creature( "res://scenes/creature_creation/arche.tscn" ) "isidor": @@ -109,14 +108,6 @@ func _on_select_race( race ): self.change_creature( "res://scenes/creature_creation/arche.tscn" ) search_animation(self) update_blend_shapes($creature) -# for child in $creature.get_children(): -# Config.msg_debug("Child / name:" + child.name) -# list_child($creature) -# var skeleton = child.get_node( "skeleton" ) -# for node in skeleton.get_children(): -# if node is MeshInstance: -# Config.msg_debug("Node / name:" + node.name) -# #node.set( "blend_shapes/"+p_blend_shape_name, p_value ) func _on_update_property(name_property, value): diff --git a/scenes/creature_creation/creature_creation_menu.gd b/scenes/creature_creation/creature_creation_menu.gd index 14850d7..b76908b 100644 --- a/scenes/creature_creation/creature_creation_menu.gd +++ b/scenes/creature_creation/creature_creation_menu.gd @@ -76,6 +76,7 @@ func _on_property_previous_pressed(): func _on_property_next_pressed(): Config.msg_debug("First name: " + $create/diplay/panel_left/margin/name/v_box_container/FirstName/line_edit.text) Config.msg_debug("Last name: " + $create/diplay/panel_left/margin/name/v_box_container/LastName/line_edit.text) + Config.msg_debug("Race: " + current_race) for key in $create/diplay/panel_left/margin/property/panel/blend_shape/list.get_children(): for pop in key.get_children(): if pop is HBoxContainer: @@ -110,6 +111,7 @@ func generate_name(): $create/diplay/panel_left/margin/name/v_box_container/FirstName/line_edit.text = first_name $create/diplay/panel_left/margin/name/v_box_container/LastName/line_edit.text = last_name + func update_property( blend_shapes ): #Config.msg_debug("") for child in $create/diplay/panel_left/margin/property/panel/blend_shape/list.get_children(): diff --git a/scenes/main/main.gd b/scenes/main/main.gd index 7c73a48..40313ac 100644 --- a/scenes/main/main.gd +++ b/scenes/main/main.gd @@ -15,7 +15,7 @@ func _ready(): Connection.connect( "connection_ok", self, "_on_connexion_ok" ) Connection.connect( "connection_error", self, "_on_connection_error" ) #GeneratorMap.GenerateSphere() - #GeneratorMap.GenerateMap("res://ground-0-2-high.png", 0 , 0) + GeneratorMap.GenerateMap("res://ground-0-2-high.png", 0 , 1) #GeneratorMap.GenerateMap("res://ground-0-4-high.png", 0 , 0) Globals.ressource_queue.start()