From fd51c194872521051ecf43fbdb4c4c08198ba5b9 Mon Sep 17 00:00:00 2001 From: austin Date: Sun, 13 Apr 2025 16:31:01 -0400 Subject: [PATCH] new models --- assets/Data/entity/items/hand_tools.json | 31 +++++++++++++++++++++++ assets/Data/entity/items/materials.json | 26 +++++++++++++++++++ assets/Models/items/materials/sack.glb | Bin 0 -> 3040 bytes assets/Models/items/weapons/pick1.glb | Bin 0 -> 12144 bytes docs/src/progress/renderertodo.md | 5 ++++ 5 files changed, 62 insertions(+) create mode 100644 assets/Models/items/materials/sack.glb create mode 100644 assets/Models/items/weapons/pick1.glb diff --git a/assets/Data/entity/items/hand_tools.json b/assets/Data/entity/items/hand_tools.json index 313a6bb9..f02582b7 100644 --- a/assets/Data/entity/items/hand_tools.json +++ b/assets/Data/entity/items/hand_tools.json @@ -30,6 +30,37 @@ "offsetZ" : 0 }, "iconPath" : "Textures/icons/itemIconItemGeneric.png" + }, + { + "id" : "Stone Pick", + "tokens" : [ + "GRAVITY", + "TARGETABLE", + "CURSOR" + ], + "equipData": { + "equipClass" : "tool" + }, + "graphicsTemplate": { + "model": { + "path" : "Models/items/weapons/pick1.glb" + } + }, + "clientSidePrimary": "DIG", + "collidable": { + "type" : "CUBE", + "dimension1" : 0.1, + "dimension2" : 0.1, + "dimension3" : 0.35, + "rotX": 0, + "rotY": 0, + "rotZ": 0, + "rotW": 1, + "offsetX" : 0, + "offsetY" : 0.05, + "offsetZ" : 0 + }, + "iconPath" : "Textures/icons/itemIconItemGeneric.png" } ], "files" : [ diff --git a/assets/Data/entity/items/materials.json b/assets/Data/entity/items/materials.json index 2adc0da8..47ec0187 100644 --- a/assets/Data/entity/items/materials.json +++ b/assets/Data/entity/items/materials.json @@ -181,6 +181,32 @@ "offsetZ" : 0 }, "iconPath" : "Textures/icons/itemIconItemGeneric.png" + }, + { + "id" : "Grain", + "tokens" : [ + "GRAVITY", + "TARGETABLE" + ], + "graphicsTemplate": { + "model": { + "path" : "Models/items/materials/sack.glb" + } + }, + "collidable": { + "type" : "CUBE", + "dimension1" : 0.1, + "dimension2" : 0.1, + "dimension3" : 0.35, + "rotX": 0, + "rotY": 0, + "rotZ": 0, + "rotW": 1, + "offsetX" : 0, + "offsetY" : 0.05, + "offsetZ" : 0 + }, + "iconPath" : "Textures/icons/itemIconItemGeneric.png" } ], "files" : [ diff --git a/assets/Models/items/materials/sack.glb b/assets/Models/items/materials/sack.glb new file mode 100644 index 0000000000000000000000000000000000000000..db657f5ff108c2adc3ebca39fe5e1e157e894d59 GIT binary patch literal 3040 zcmcImTWl0%6#m=V(km@3h2GgtFP5+@v%9m~-L*3lsE|}kOWFpJLYm#}v@Eu}&F&T` zwOTb8kRUN>f*4RqkVHa+f{D>kCP5z%d?5;?MhM}-`-2)UF#_>Be`n|@MEYWzbNRpj zT)uN=CT;&f*P2wu*v%Zqjy}TJ6P@jCqe3u|(2_!6ROr{DT0EGH#f5}gaO)Dl~Gsu7c7z)MLYRTZhKqTA|8}8o{)e^`b6+*#;)*Ks%#n%MGe9~^w z;S>3f)9H7KewW`q7sN@#j0R>Y3?4Uo-NPK7F+K$5sL3s@xI|!r{lf+S9fgv{&WuVJ-Q^k z8%F!i=9R50JNTPD%isEB_)`guB(+v8+MmQ%;SnXfKtOw6AOBRTSTNpCU#(m6d-43u zT|7LO7n^Ig+l_a@+S!SRHTUL{4^01&?v^l$wY!@>j+s3eJFpDy^tmLw!8Y4G##Xho zv5SW;%Hp1&{3+SmP4ew4mlOx=B?G^3=;9Qe3CI1^+ue6$aoj22{n_K(YuhKEzVnH4 zeL6TP3?69e`t^uXGkD-Eg!?ww74=uSpOtv^ly>8qd_0`0^xn8OW%1?6(GrF5(`m;h z&s;tzH!TY(r!OCzviS1o?rDyH|I*e;;$-1GWpc(095*;~oH!rqzB6TV-ecQ0WpW0; zvnJ#uU0IETU2EE+?B=W^$FjJol(5uPmS!J=JB+{uPzj+ ze_Scj$@W*KtC`O(=hlMj7F=K3_LzG71&5A5b*y&3rfxrcOCi5tqoiK{;G_(zTYQxj zJg;_DoRleMlUq{%+<#t%)h)hS@zHbYuG^P*Oy1!#^*141h1D&-y8qZlHCC6dQXO#9 zEu3`=XA>vRCQh7n3uoQJS+{UDed4TJIO`V9rca!8lQVIm`qYPfs*l}p-@rL<1Lr!#{)2j8y_%!m6OF_)QAzJV-TiDsYnqNoVCO6&d9a8!Dv%$$(_CTwXU9 z-h7saylUub_9#x7IL(LTu?FgqsH3 z7eg0=M>+CKpi3}A5xSQ`m$EW=m0+F^DMdsPkOdHmDnWKFqygtrR4s!ng;#@arI30= LlmRJ$)Um$-3pSg< literal 0 HcmV?d00001 diff --git a/assets/Models/items/weapons/pick1.glb b/assets/Models/items/weapons/pick1.glb new file mode 100644 index 0000000000000000000000000000000000000000..7b36c50e0abff8b61ae24112b0ac500cd0509941 GIT binary patch literal 12144 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 Dp%>0j literal 0 HcmV?d00001 diff --git a/docs/src/progress/renderertodo.md b/docs/src/progress/renderertodo.md index 4936b95b..2bde2efc 100644 --- a/docs/src/progress/renderertodo.md +++ b/docs/src/progress/renderertodo.md @@ -1462,6 +1462,11 @@ UI work (04/11/2025) Fixing text input spacing (padding was taking up all of height) +(04/13/2025) +Transparency support for component decorations +Cloth sack model +Pickaxe model +