Skip to content

Commit

Permalink
Pickup Items
Browse files Browse the repository at this point in the history
* Projected decals copy constructor should honor spriteAtlas field

* Initial work on letting items behave as pickups

* Floating pickup mesh items spin

* 💄

* Non-floating mesh items should not rotate

* Adding example level

* Made pickup helper a static object.
  • Loading branch information
joshuaskelly authored Oct 31, 2020
1 parent 0e8eb49 commit 4bccad5
Show file tree
Hide file tree
Showing 12 changed files with 1,355 additions and 297 deletions.
28 changes: 25 additions & 3 deletions Dungeoneer/assets/data/animations.dat
Original file line number Diff line number Diff line change
Expand Up @@ -570,21 +570,43 @@
"endTexOffset": 1,
"frames": [
{
"transform": { "x": 0.12, "y": -0.250, "z": 0.4000 },
"transform": { "x": 0.12, "y": -0.20, "z": 0.4000 },
"rotation": { "x": 0.0, "y": 80.0, "z": 0.0 },
"length": 0.0
},
{
"transform": { "x": 0.12, "y": -0.1200, "z": -0.150 },
"transform": { "x": 0.12, "y": -0.01200, "z": -0.150 },
"rotation": { "x": 0.0, "y": 80.0, "z": 0.0 },
"length": 1.2
},
{
"transform": { "x": 0.12, "y": -0.250, "z": 0.4000 },
"transform": { "x": 0.12, "y": -0.20, "z": 0.4000 },
"rotation": { "x": 0.0, "y": 80.0, "z": 0.0 },
"length": 0
}
]
},
"gunFire3D": {
"class": "com.interrupt.dungeoneer.gfx.animation.lerp3d.LerpedAnimation",
"actionTime": 10,
"endTexOffset": 1,
"frames": [
{
"transform": { "x": -0.1, "y": -0.3, "z": 0.30 },
"rotation": { "x": 0.0, "y": 0.0, "z": 0.0 },
"length": 0.0
},
{
"transform": { "x": -0.1, "y": -0.3, "z": 0.20 },
"rotation": { "x": 5.0, "y": 0.0, "z": 0.0 },
"length": 1.2
},
{
"transform": { "x": -0.1, "y": -0.3, "z": 0.30 },
"rotation": { "x": 0.0, "y": 0.0, "z": 0.0 },
"length": 0
}
]
}
}
}
Binary file modified Dungeoneer/assets/items-guns.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Dungeoneer/assets/items.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Loading

0 comments on commit 4bccad5

Please sign in to comment.