From f5c63a5c559578827bea54f218185b90a8bb8815 Mon Sep 17 00:00:00 2001 From: Evan Pratten Date: Sat, 2 Apr 2022 15:07:22 -0400 Subject: [PATCH] Defining a test object --- .../env_testObject/env_testObject.xcf | Bin 0 -> 10666 bytes .../env/env_testObject/env_testObject.json | 31 ++++++++++++++++++ .../env_testObject/env_testObjectBottom.png | Bin 0 -> 1225 bytes .../env/env_testObject/env_testObjectTop.png | Bin 0 -> 1537 bytes game/dist/map_gameMap.objects.json | 8 +++++ game/game_logic/src/model/world_object.rs | 2 +- 6 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 assets/ewpratten/env_testObject/env_testObject.xcf create mode 100644 game/dist/assets/env/env_testObject/env_testObject.json create mode 100644 game/dist/assets/env/env_testObject/env_testObjectBottom.png create mode 100644 game/dist/assets/env/env_testObject/env_testObjectTop.png create mode 100644 game/dist/map_gameMap.objects.json diff --git a/assets/ewpratten/env_testObject/env_testObject.xcf b/assets/ewpratten/env_testObject/env_testObject.xcf new file mode 100644 index 0000000000000000000000000000000000000000..23a451738397b3f1320f095c979d2be401bfd443 GIT binary patch literal 10666 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 literal 0 HcmV?d00001 diff --git a/game/dist/assets/env/env_testObject/env_testObject.json b/game/dist/assets/env/env_testObject/env_testObject.json new file mode 100644 index 00000000..1e1cbfa6 --- /dev/null +++ b/game/dist/assets/env/env_testObject/env_testObject.json @@ -0,0 +1,31 @@ +{ + "name": "env_testObject", + "bottom_texture": { + "file_path": "assets/env/env_testObject/env_testObjectBottom.png" + }, + "top_texture": { + "file_path": "assets/env/env_testObject/env_testObjectTop.png" + }, + "footprint": [ + { + "position": [ + 0, + 0 + ], + "radius": 256.0 + } + ], + "physics_colliders": [ + { + "position": [ + -118, + -60 + ], + "size": [ + 230, + 127 + ] + } + ], + "temperature": 5.0 +} \ No newline at end of file diff --git a/game/dist/assets/env/env_testObject/env_testObjectBottom.png b/game/dist/assets/env/env_testObject/env_testObjectBottom.png new file mode 100644 index 0000000000000000000000000000000000000000..a38050380d7b01f9f278cfee737206db2445dba6 GIT binary patch literal 1225 zcmeAS@N?(olHy`uVBq!ia0y~yU<5K5893O0R7}x|G$5xX)7d$|)7e>}peR2rGbfdS zL1SX=L|c!;4l+mMFMGLa$-Yr|G-07t2Wz09`&uVKt(K^Tq3n~r_b=#F^eikCiQ(p} z(+QJ}nNwO?Aj)!(U%*{m-Bn!kW4-4>*BG|H1cpYaboiF zaRvsa&7LlfAr-gY-fav#Y{27ivFr3d?QTYm@|TH8o^|<+({BAL_2OC&R7oaqKNZU_ z6IVU^+&&HS4~h)Wr&@E_saL1npVh)(v1qOq*ZO#y9~FuWY;)#UoALjOWIf>USVe__ zOgTe~DWM4fkAsMk literal 0 HcmV?d00001 diff --git a/game/dist/assets/env/env_testObject/env_testObjectTop.png b/game/dist/assets/env/env_testObject/env_testObjectTop.png new file mode 100644 index 0000000000000000000000000000000000000000..47f071186a97bd07957f26565848ad9fbe202601 GIT binary patch literal 1537 zcmaJ=3rtg282<0=EiFZ8QI>XCr1%H}9JJY#=y()Lg=$o0hFF7CWko9j1DoC zWtnxgI5gl1Z@9*^vV!`)Z=yNgH?(}SDTP+I=0am-kR&h9FU`xRcfA0AEKw~44_|7n_mkjT zBC00@M7g>&vp=uH81SVQCmKq_&OaU43D$-ax9)Cs&?|B%>|5Du`zYaR(itpTE>C6j z`c;Vsrwtt;%;)`h^r`e*v+hU?NFRmjC|oXnamjb-6I!);N3QFr;>AnK0(SoXhK+m< z`YfKxB6C%C-&ZbHXYH^tMli#G-eh+sLOwg=jMv z0=tc+AXKv2Y@!^ld*cwWFXQ^bzA5 zuryRU5RbnvX;NGZ^lSr55s(1#X6-pPC^5i+4mGwI5=bv#fe=W;ON@Xtx5iEJ{>89J z9g~qb_5Ve)Pd#s-Pc}m?`(#AomnGenln2Q4g=3GY048G@IfHt+U+jW)ZJ{ zHu1CNpJ9(47+q4{AU?ay-&6mdV^%Bwp_!#3Hxy=>w~S8R7on-6xgAafBZdlYh=5eo zEXk^uKeUcS+FQ_IlZu#@BCKYQvmGqd@grfd>%yyc;AtE;akN7R_`!Fc2hv22EL$=GBVJTeSWq4fAb0oID{ z=nzV+dfx8t!|+}q3TMhtEqi+)7Uf|%e7r;o3DC{$NCf%+F9d%9ga?ew8xoDlD^eGgt0I~OccbEH@pyj{t)3gu~D#)96CTl(e`oFzdmpQ z_*%vY~r{>0~?f*h(tm|xh1_*F)PO$Z0^mBiqPKr`tnTeiCUZCKLJoUB;? r>~Yk%QLr?j-}k literal 0 HcmV?d00001 diff --git a/game/dist/map_gameMap.objects.json b/game/dist/map_gameMap.objects.json new file mode 100644 index 00000000..e5bb13c2 --- /dev/null +++ b/game/dist/map_gameMap.objects.json @@ -0,0 +1,8 @@ +[ + { + "type":"env", + "name":"env_testObject", + "position": [0,0], + "rotation_radians": 0.5 + } +] \ No newline at end of file diff --git a/game/game_logic/src/model/world_object.rs b/game/game_logic/src/model/world_object.rs index ceb0fe9c..59fb0094 100644 --- a/game/game_logic/src/model/world_object.rs +++ b/game/game_logic/src/model/world_object.rs @@ -6,7 +6,7 @@ pub struct PossiblyAnimatedTexture { /// Signal if the texture is animated or static pub animated: bool, /// Relative file path from `dist` to the texture - pub rel_file_path: String, + pub file_path: String, }