From 91249152378e4a29b9fda3c8b8164504952a9846 Mon Sep 17 00:00:00 2001 From: MrDev023 Date: Sat, 14 Jan 2017 14:02:13 +0100 Subject: [PATCH] add basic shaders and Tile class --- .gitignore | 2 +- .idea/workspace.xml | 288 ++++++++++++++++---------- res/shaders/main.frag | 15 ++ res/shaders/main.vert | 21 ++ src/globalgamejam/audio/Sound3D.java | 14 -- src/globalgamejam/render/Shaders.java | 10 + src/globalgamejam/render/Tile.java | 98 +++++++++ 7 files changed, 324 insertions(+), 124 deletions(-) create mode 100644 res/shaders/main.frag create mode 100644 res/shaders/main.vert delete mode 100644 src/globalgamejam/audio/Sound3D.java create mode 100644 src/globalgamejam/render/Tile.java diff --git a/.gitignore b/.gitignore index b4202cb..88d9c5d 100644 --- a/.gitignore +++ b/.gitignore @@ -12,4 +12,4 @@ # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml hs_err_pid* -.idea/* \ No newline at end of file +.idea/ \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 04c18b6..55feed7 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,11 +2,13 @@ - - - + + + + + + + + fr.technicalgames @@ -166,10 +178,13 @@ @@ -335,6 +350,24 @@