diff --git a/assets/Data/entity/items/materials.json b/assets/Data/entity/items/materials.json index 47ec0187..5efcd6c8 100644 --- a/assets/Data/entity/items/materials.json +++ b/assets/Data/entity/items/materials.json @@ -1,187 +1,5 @@ { "items" : [ - { - "id" : "Log", - "tokens" : [ - "GRAVITY", - "TARGETABLE" - ], - "graphicsTemplate": { - "model": { - "path" : "Models/items/materials/log.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" - }, - { - "id" : "Rock", - "tokens" : [ - "GRAVITY", - "TARGETABLE" - ], - "graphicsTemplate": { - "model": { - "path" : "Models/items/materials/rock1.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" - }, - { - "id" : "Stick", - "tokens" : [ - "GRAVITY", - "TARGETABLE" - ], - "graphicsTemplate": { - "model": { - "path" : "Models/items/materials/stick1.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" - }, - { - "id" : "Copper", - "tokens" : [ - "GRAVITY", - "TARGETABLE" - ], - "graphicsTemplate": { - "model": { - "path" : "Models/items/materials/rock1.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" - }, - { - "id" : "Tin", - "tokens" : [ - "GRAVITY", - "TARGETABLE" - ], - "graphicsTemplate": { - "model": { - "path" : "Models/items/materials/rock1.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" - }, - { - "id" : "Bronze", - "tokens" : [ - "GRAVITY", - "TARGETABLE" - ], - "graphicsTemplate": { - "model": { - "path" : "Models/items/materials/rock1.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" - }, - { - "id" : "Clay", - "tokens" : [ - "GRAVITY", - "TARGETABLE" - ], - "graphicsTemplate": { - "model": { - "path" : "Models/items/materials/rock1.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" - }, { "id" : "Grain", "tokens" : [ @@ -210,5 +28,7 @@ } ], "files" : [ + "Data/entity/items/materials/rocks.json", + "Data/entity/items/materials/wood.json" ] } \ No newline at end of file diff --git a/assets/Data/entity/items/materials/rocks.json b/assets/Data/entity/items/materials/rocks.json new file mode 100644 index 00000000..1a54261f --- /dev/null +++ b/assets/Data/entity/items/materials/rocks.json @@ -0,0 +1,110 @@ +{ + "items" : [ + { + "id" : "Rock", + "tokens" : [ + "GRAVITY", + "TARGETABLE" + ], + "graphicsTemplate": { + "model": { + "path" : "Models/items/materials/rock1.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" + }, + { + "id" : "Copper", + "tokens" : [ + "GRAVITY", + "TARGETABLE" + ], + "graphicsTemplate": { + "model": { + "path" : "Models/items/materials/rock2.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" + }, + { + "id" : "Tin", + "tokens" : [ + "GRAVITY", + "TARGETABLE" + ], + "graphicsTemplate": { + "model": { + "path" : "Models/items/materials/rock2.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" + }, + { + "id" : "Clay", + "tokens" : [ + "GRAVITY", + "TARGETABLE" + ], + "graphicsTemplate": { + "model": { + "path" : "Models/items/materials/rock3.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" : [ + ] +} \ No newline at end of file diff --git a/assets/Data/entity/items/materials/wood.json b/assets/Data/entity/items/materials/wood.json new file mode 100644 index 00000000..83ad26d0 --- /dev/null +++ b/assets/Data/entity/items/materials/wood.json @@ -0,0 +1,58 @@ +{ + "items" : [ + { + "id" : "Log", + "tokens" : [ + "GRAVITY", + "TARGETABLE" + ], + "graphicsTemplate": { + "model": { + "path" : "Models/items/materials/log.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" + }, + { + "id" : "Stick", + "tokens" : [ + "GRAVITY", + "TARGETABLE" + ], + "graphicsTemplate": { + "model": { + "path" : "Models/items/materials/stick1.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" : [ + ] +} \ No newline at end of file diff --git a/assets/Models/items/materials/rock2.glb b/assets/Models/items/materials/rock2.glb new file mode 100644 index 00000000..3d80dc89 Binary files /dev/null and b/assets/Models/items/materials/rock2.glb differ diff --git a/assets/Models/items/materials/rock3.glb b/assets/Models/items/materials/rock3.glb new file mode 100644 index 00000000..4c23ba42 Binary files /dev/null and b/assets/Models/items/materials/rock3.glb differ diff --git a/assets/Models/items/materials/texturemap.json b/assets/Models/items/materials/texturemap.json index 555c8d44..b08108d7 100644 --- a/assets/Models/items/materials/texturemap.json +++ b/assets/Models/items/materials/texturemap.json @@ -20,6 +20,20 @@ "diffuse" : "/Textures/Ground/rock3_256.png", "isDefault" : true } + ], + "Models/items/materials/rock2.glb": [ + { + "meshName" : "Cylinder", + "diffuse" : "/Textures/Ground/rock3_256.png", + "isDefault" : true + } + ], + "Models/items/materials/rock3.glb": [ + { + "meshName" : "Cylinder", + "diffuse" : "/Textures/Ground/rock3_256.png", + "isDefault" : true + } ] } } \ No newline at end of file diff --git a/docs/src/progress/renderertodo.md b/docs/src/progress/renderertodo.md index 2bde2efc..c46becf0 100644 --- a/docs/src/progress/renderertodo.md +++ b/docs/src/progress/renderertodo.md @@ -1466,6 +1466,7 @@ Fixing text input spacing (padding was taking up all of height) Transparency support for component decorations Cloth sack model Pickaxe model +More rock models