Commit Graph

402 Commits (49d3298bda62c4fba84c51d703febf41fe3ba074)

Author SHA1 Message Date
hYdos 49d3298bda getting closer to loading models 2020-03-03 20:34:37 +10:00
hYdos a1bddbaf5a Update VulkanStarter.java 2020-03-03 17:10:24 +10:00
hYdos e4308b47c1 HOW 2020-03-03 16:35:58 +10:00
hYdos b535c09420 Merge branch 'Vulkan' of https://github.com/halotroop/Ginger3D.git into Vulkan
Conflicts:
	src/main/java/com/github/halotroop/litecraft/Litecraft.java
	src/main/java/com/github/halotroop/litecraft/world/World.java
	src/main/java/com/github/hydos/ginger/engine/common/obj/ModelLoader.java
	src/main/java/com/github/hydos/ginger/engine/opengl/utils/GlLoader.java
2020-03-03 16:34:53 +10:00
hYdos a635c549c1 yay merge conflict fixes 2020-03-03 16:27:53 +10:00
hYdos 86a82d9a6a yus 2020-03-03 16:21:47 +10:00
hYdos 1feffa5cd0 yEs 2020-03-03 16:21:46 +10:00
hYdos d8191d9171 yay improvments 2020-03-03 16:21:26 +10:00
hayden v 034bba8924 even more classes but a much smaller main method 2020-03-03 16:21:26 +10:00
Caroline Bell a00ba1dcee Single-line "if"-statements 2020-03-03 16:21:26 +10:00
Caroline Bell e84b8139b3 Organize your god damn imports @hYdos! 2020-03-03 16:21:26 +10:00
hayden v a54e2ef15d Proper implementation of Uniform Buffer Objects 2020-03-03 16:20:17 +10:00
hayden v e5b2fbf25d moved around shader code and other vulkan stuff 2020-03-03 16:20:17 +10:00
hYdos 4f4e41d990 yus 2020-03-03 16:16:41 +10:00
Caroline Bell cab3121c7a Removed references to classes within the Litecraft package from Ginger 2020-03-02 22:15:50 -08:00
hYdos 9a8fdc44a7 yEs 2020-03-03 15:56:37 +10:00
hYdos 75f7f37b41 yay improvments 2020-03-03 15:43:19 +10:00
Caroline Bell 77d3d14753 ginger...Player.java -> litecraft...PlayerEntity.java 2020-03-02 21:04:19 -08:00
hayden v 40a9e3d7c7 even more classes but a much smaller main method 2020-03-03 14:05:33 +10:00
Caroline Bell 6f8f1f07ce Single-line "if"-statements 2020-03-02 19:06:57 -08:00
hayden v c6607746f6 Merge branch 'liteCraft' into Vulkan 2020-03-03 12:57:47 +10:00
Caroline Bell f151525643 Organize your god damn imports @hYdos! 2020-03-02 18:48:09 -08:00
Caroline Bell a2f712dc63 Cleaned up the gitignore 2020-03-02 18:46:26 -08:00
hayden v 6654e5c51d Merge branch 'liteCraft' into Vulkan 2020-03-03 12:39:35 +10:00
hayden v e27fe5a8d1 Proper implementation of Uniform Buffer Objects 2020-03-03 12:33:06 +10:00
hayden v 79638140d9 moved around shader code and other vulkan stuff 2020-03-03 11:10:59 +10:00
hYdos a5817d31be Merge branch 'Vulkan' into liteCraft 2020-03-03 07:57:25 +10:00
hYdos 63bb9426ed [Refactor] more common movement (will this ever end) 2020-03-03 07:56:29 +10:00
hYdos d0402d069b less static imports 2020-03-03 07:54:50 +10:00
hYdos 6765a3a33a improvements 2020-03-03 07:50:07 +10:00
Caroline Bell 610e52b633 Use nanoseconds for ticks 2020-03-02 13:37:28 -08:00
hYdos e3661b5fb7 begone ARR hello customised example 2020-03-03 07:34:53 +10:00
hYdos b21d127ef7 Merge branch 'liteCraft' into Vulkan 2020-03-03 05:50:43 +10:00
Caroline Bell d623fef436 Don't supress warnings. EVER. 2020-03-02 02:55:22 -08:00
Caroline Bell 3dce58b238 Resolved errors created during merge 2020-03-02 02:51:46 -08:00
Caroline Bell 6e831468f9 Print error if this thing happens 2020-03-02 02:43:35 -08:00
Caroline Bell 95d4f19ad4 Change the way debug info is shown 2020-03-02 02:43:35 -08:00
Caroline Bell f22076fe44 Don't allow unchecked scaling of cubes 2020-03-02 02:43:35 -08:00
Caroline Bell 3a36a78392 OpenGL 4.6 YeS 2020-03-02 02:42:00 -08:00
Caroline Bell fe3ea62286 "cleanup" Screens instead of "close" since that's really what they do 2020-03-02 02:39:47 -08:00
hYdos b281cb2f12 added vulkan support to Window class and implement it 2020-03-02 20:38:17 +10:00
Caroline Bell 86a4b04332 Type safety. 2020-03-02 02:38:14 -08:00
hYdos a7e3541668 good non vulkan changes and some common ones 2020-03-02 20:26:30 +10:00
hYdos 89b4a0902f working vulkan example 2020-03-02 20:11:45 +10:00
hYdos 0c7925b280 Merge branch 'liteCraft' into Vulkan 2020-03-02 19:34:15 +10:00
valoeghese 7b4d87d712 f 2020-03-02 20:56:44 +13:00
valoeghese 54181617a2 e 2020-03-02 20:56:25 +13:00
valoeghese 598ce5f625 change render size back because lag 2020-03-02 20:49:41 +13:00
valoeghese 0361b799a8 remove unneccesary code, and do stuff tm 2020-03-02 20:47:47 +13:00
valoeghese d1492f152b increase render size 2020-03-02 20:43:49 +13:00