From 9e5d6a03c3cfdf6525fea247bac79d0e04a92c46 Mon Sep 17 00:00:00 2001
From: MrDev023 <trexricher1997@gmail.com>
Date: Fri, 20 Jan 2017 22:55:07 +0100
Subject: [PATCH] Bug fixes and add Label

---
 .idea/workspace.xml                   | 45 ++++++++++-----------------
 src/globalgamejam/render/Texture.java |  2 +-
 2 files changed, 18 insertions(+), 29 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index a1e3487..7273826 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,18 +2,7 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="00f293cb-c755-478c-9b6f-422f827454e0" name="Default" comment="">
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/globalgamejam/gui/ActionGUI.java" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/src/globalgamejam/gui/Image.java" afterPath="" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/out/production/Global-Gam-Jam-2017/shaders/main.frag" afterPath="$PROJECT_DIR$/out/production/Global-Gam-Jam-2017/shaders/main.frag" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/res/shaders/main.frag" afterPath="$PROJECT_DIR$/res/shaders/main.frag" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/globalgamejam/game/MainGame.java" afterPath="$PROJECT_DIR$/src/globalgamejam/game/MainGame.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/globalgamejam/gui/GUI.java" afterPath="$PROJECT_DIR$/src/globalgamejam/gui/GUI.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/globalgamejam/gui/GUILabel.java" afterPath="$PROJECT_DIR$/src/globalgamejam/gui/GUILabel.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/globalgamejam/gui/IActionGUI.java" afterPath="$PROJECT_DIR$/src/globalgamejam/gui/IActionGUI.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/globalgamejam/render/DisplayManager.java" afterPath="$PROJECT_DIR$/src/globalgamejam/render/DisplayManager.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/globalgamejam/render/Texture.java" afterPath="$PROJECT_DIR$/src/globalgamejam/render/Texture.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/globalgamejam/tiles/Tile.java" afterPath="$PROJECT_DIR$/src/globalgamejam/tiles/Tile.java" />
     </list>
     <ignored path="$PROJECT_DIR$/out/" />
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -61,8 +50,8 @@
       <file leaf-file-name="Texture.java" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/globalgamejam/render/Texture.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="360">
-              <caret line="46" column="21" lean-forward="false" selection-start-line="46" selection-start-column="21" selection-end-line="46" selection-end-column="21" />
+            <state relative-caret-position="394">
+              <caret line="84" column="90" lean-forward="false" selection-start-line="84" selection-start-column="90" selection-end-line="84" selection-end-column="90" />
               <folding>
                 <element signature="imports" expanded="true" />
               </folding>
@@ -85,8 +74,8 @@
       <file leaf-file-name="MainGame.java" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/src/globalgamejam/game/MainGame.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="289">
-              <caret line="44" column="13" lean-forward="false" selection-start-line="44" selection-start-column="13" selection-end-line="44" selection-end-column="13" />
+            <state relative-caret-position="170">
+              <caret line="37" column="44" lean-forward="true" selection-start-line="37" selection-start-column="44" selection-end-line="37" selection-end-column="44" />
               <folding>
                 <element signature="e#937#938#0" expanded="true" />
                 <element signature="e#973#974#0" expanded="true" />
@@ -221,10 +210,10 @@
         <option value="$PROJECT_DIR$/src/globalgamejam/gui/IActionGUI.java" />
         <option value="$PROJECT_DIR$/src/globalgamejam/gui/ActionGUI.java" />
         <option value="$PROJECT_DIR$/src/globalgamejam/gui/GUI.java" />
-        <option value="$PROJECT_DIR$/src/globalgamejam/render/Texture.java" />
         <option value="$PROJECT_DIR$/src/globalgamejam/tiles/Tile.java" />
         <option value="$PROJECT_DIR$/src/globalgamejam/gui/GUILabel.java" />
         <option value="$PROJECT_DIR$/src/globalgamejam/game/MainGame.java" />
+        <option value="$PROJECT_DIR$/src/globalgamejam/render/Texture.java" />
       </list>
     </option>
   </component>
@@ -1101,16 +1090,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/globalgamejam/render/Texture.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="360">
-          <caret line="46" column="21" lean-forward="false" selection-start-line="46" selection-start-column="21" selection-end-line="46" selection-end-column="21" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/globalgamejam/tiles/Tile.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="305">
@@ -1155,10 +1134,20 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/globalgamejam/render/Texture.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="394">
+          <caret line="84" column="90" lean-forward="false" selection-start-line="84" selection-start-column="90" selection-end-line="84" selection-end-column="90" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/src/globalgamejam/game/MainGame.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="289">
-          <caret line="44" column="13" lean-forward="false" selection-start-line="44" selection-start-column="13" selection-end-line="44" selection-end-column="13" />
+        <state relative-caret-position="170">
+          <caret line="37" column="44" lean-forward="true" selection-start-line="37" selection-start-column="44" selection-end-line="37" selection-end-column="44" />
           <folding>
             <element signature="e#937#938#0" expanded="true" />
             <element signature="e#973#974#0" expanded="true" />
diff --git a/src/globalgamejam/render/Texture.java b/src/globalgamejam/render/Texture.java
index 39655dd..18c8e7f 100644
--- a/src/globalgamejam/render/Texture.java
+++ b/src/globalgamejam/render/Texture.java
@@ -22,7 +22,6 @@ public class Texture {
 	int id;
 	
 	public Texture(int width,int height,int id){
-		System.out.println("Texture loaded ! " + width + "x" + height + " id:" + id);
 		this.id = id;
 		this.width = width;
 		this.height = height;
@@ -83,6 +82,7 @@ public class Texture {
 		glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, image.getWidth(), image.getHeight(), 0, GL_RGBA, GL_UNSIGNED_BYTE, buffer);
 
 		glBindTexture(GL_TEXTURE_2D, 0);
+		System.out.println("Texture loaded ! " + width + "x" + height + " id:" + textureID);
 
 		return new Texture(image.getWidth(),image.getHeight(),textureID);
 	}