GameDevArea/Global-Gam-Jam-2017
Archived
1
0
Fork 0
Code Releases 1 Activity

Bug Fixes

Browse source
This commit is contained in:
MrDev023 2017-01-21 03:51:35 +01:00
parent 58e0435cb8
commit 0a34862090
7 changed files with 102 additions and 109 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
.classpath
View file

@ -1,11 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
<classpathentry kind="lib" path="libs/lwjgl.jar">
<attributes>
<attribute name="org.eclipse.jdt.launching.CLASSPATH_ATTR_LIBRARY_PATH_ENTRY" value="Global-Gam-Jam-2017/libs"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="output" path="bin"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="src" path="res"/>
<classpathentry kind="src" path="libs"/>
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/lwjgl"/>
<classpathentry kind="output" path="out/production/Global-Gam-Jam-2017"/>
</classpath>

7
.gitignore vendored
View file

@ -12,3 +12,10 @@
hs_err_pid*
/.idea/
/bin/
bin/*
.project
.classpath
*.eml
*.userlibraries

181
.idea/workspace.xml
View file

@ -2,8 +2,11 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="00f293cb-c755-478c-9b6f-422f827454e0" name="Default" comment="">
<change type="MOVED" beforePath="$PROJECT_DIR$/src/globalgamejam/gui/interfaces/MainInterfaces.java" afterPath="$PROJECT_DIR$/src/globalgamejam/interfaces/MainInterfaces.java" />
<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$/.classpath" afterPath="$PROJECT_DIR$/.classpath" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.gitignore" afterPath="$PROJECT_DIR$/.gitignore" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.project" afterPath="$PROJECT_DIR$/.project" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/globalgamejam/render/Texture.java" afterPath="$PROJECT_DIR$/src/globalgamejam/render/Texture.java" />
</list>
<ignored path="$PROJECT_DIR$/out/" />
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@ -22,7 +25,7 @@
<file leaf-file-name="GUILabel.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/globalgamejam/gui/GUILabel.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-2663">
<state relative-caret-position="-2636">
<caret line="48" column="25" lean-forward="false" selection-start-line="48" selection-start-column="25" selection-end-line="48" selection-end-column="25" />
<folding>
<element signature="e#3387#3388#0" expanded="true" />
@ -50,21 +53,11 @@
</provider>
</entry>
</file>
<file leaf-file-name="TestTile.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/globalgamejam/tiles/TestTile.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="204">
<caret line="12" column="36" lean-forward="false" selection-start-line="12" selection-start-column="36" selection-end-line="12" selection-end-column="36" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="Texture.java" pinned="false" current-in-tab="true">
<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="34">
<caret line="22" column="4" lean-forward="true" selection-start-line="22" selection-start-column="4" selection-end-line="22" selection-end-column="4" />
<state relative-caret-position="-419">
<caret line="30" column="0" lean-forward="false" selection-start-line="30" selection-start-column="0" selection-end-line="30" selection-end-column="34" />
<folding>
<element signature="imports" expanded="true" />
</folding>
@ -75,8 +68,8 @@
<file leaf-file-name="Tile.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/globalgamejam/tiles/Tile.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="237">
<caret line="27" column="47" lean-forward="false" selection-start-line="27" selection-start-column="47" selection-end-line="27" selection-end-column="47" />
<state relative-caret-position="238">
<caret line="17" column="17" lean-forward="true" selection-start-line="17" selection-start-column="17" selection-end-line="17" selection-end-column="17" />
<folding>
<element signature="imports" expanded="true" />
</folding>
@ -84,18 +77,22 @@
</provider>
</entry>
</file>
<file leaf-file-name=".gitignore" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/.gitignore">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="340">
<caret line="20" column="15" lean-forward="false" selection-start-line="20" selection-start-column="15" selection-end-line="20" selection-end-column="15" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="MainGame.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/globalgamejam/game/MainGame.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="238">
<caret line="14" column="38" lean-forward="false" selection-start-line="14" selection-start-column="38" selection-end-line="14" selection-end-column="38" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#669#670#0" expanded="true" />
<element signature="e#690#691#0" expanded="true" />
<element signature="e#730#731#0" expanded="true" />
<element signature="e#756#757#0" expanded="true" />
</folding>
<state relative-caret-position="595">
<caret line="35" column="38" lean-forward="false" selection-start-line="35" selection-start-column="38" selection-end-line="35" selection-end-column="38" />
<folding />
</state>
</provider>
</entry>
@ -103,14 +100,10 @@
<file leaf-file-name="MainWorld.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/globalgamejam/world/MainWorld.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="217">
<caret line="18" column="38" lean-forward="false" selection-start-line="18" selection-start-column="38" selection-end-line="18" selection-end-column="38" />
<state relative-caret-position="472">
<caret line="33" column="38" lean-forward="false" selection-start-line="33" selection-start-column="38" selection-end-line="33" selection-end-column="38" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#477#478#0" expanded="true" />
<element signature="e#522#523#0" expanded="true" />
<element signature="e#550#551#0" expanded="true" />
<element signature="e#579#580#0" expanded="true" />
<marker date="1484956478568" expanded="true" signature="37:51" ph="..." />
</folding>
</state>
</provider>
@ -222,7 +215,6 @@
<option value="$PROJECT_DIR$/src/globalgamejam/render/Shaders.java" />
<option value="$PROJECT_DIR$/src/globalgamejam/render/FrameBufferObject.java" />
<option value="$PROJECT_DIR$/src/globalgamejam/Main.java" />
<option value="$PROJECT_DIR$/.gitignore" />
<option value="$PROJECT_DIR$/src/globalgamejam/math/Vector3f.java" />
<option value="$PROJECT_DIR$/src/globalgamejam/gui/Label.java" />
<option value="$PROJECT_DIR$/src/globalgamejam/input/Input.java" />
@ -231,13 +223,14 @@
<option value="$PROJECT_DIR$/src/globalgamejam/render/DisplayManager.java" />
<option value="$PROJECT_DIR$/src/globalgamejam/gui/IActionGUI.java" />
<option value="$PROJECT_DIR$/src/globalgamejam/gui/ActionGUI.java" />
<option value="$PROJECT_DIR$/src/globalgamejam/tiles/Tile.java" />
<option value="$PROJECT_DIR$/src/globalgamejam/render/Texture.java" />
<option value="$PROJECT_DIR$/src/globalgamejam/world/MainWorld.java" />
<option value="$PROJECT_DIR$/src/globalgamejam/game/MainGame.java" />
<option value="$PROJECT_DIR$/src/globalgamejam/gui/GUI.java" />
<option value="$PROJECT_DIR$/src/globalgamejam/gui/GUILabel.java" />
<option value="$PROJECT_DIR$/src/globalgamejam/gui/interfaces/MainInterfaces.java" />
<option value="$PROJECT_DIR$/src/globalgamejam/render/Texture.java" />
<option value="$PROJECT_DIR$/src/globalgamejam/tiles/Tile.java" />
<option value="$PROJECT_DIR$/.gitignore" />
</list>
</option>
</component>
@ -649,7 +642,7 @@
</component>
<component name="ToolWindowManager">
<frame x="1358" y="-8" width="1296" height="1000" extended-state="6" />
<editor active="false" />
<editor active="true" />
<layout>
<window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
@ -666,7 +659,7 @@
<window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
<window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
<window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
@ -738,6 +731,7 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="85">
<caret line="21" column="59" lean-forward="false" selection-start-line="21" selection-start-column="59" selection-end-line="21" selection-end-column="59" />
<folding />
</state>
</provider>
</entry>
@ -745,6 +739,7 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="238">
<caret line="14" column="6" lean-forward="false" selection-start-line="14" selection-start-column="6" selection-end-line="14" selection-end-column="6" />
<folding />
</state>
</provider>
</entry>
@ -782,6 +777,7 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="119">
<caret line="7" column="3" lean-forward="false" selection-start-line="7" selection-start-column="3" selection-end-line="7" selection-end-column="3" />
<folding />
</state>
</provider>
</entry>
@ -803,6 +799,7 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="119">
<caret line="7" column="3" lean-forward="false" selection-start-line="7" selection-start-column="3" selection-end-line="7" selection-end-column="3" />
<folding />
</state>
</provider>
</entry>
@ -889,17 +886,11 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/.gitignore">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="85">
<caret line="5" column="17" lean-forward="false" selection-start-line="5" selection-start-column="17" selection-end-line="5" selection-end-column="17" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/globalgamejam/audio/Audio.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-459">
<caret line="67" column="28" lean-forward="true" selection-start-line="67" selection-start-column="28" selection-end-line="67" selection-end-column="28" />
<folding />
</state>
</provider>
</entry>
@ -966,16 +957,6 @@
</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="237">
<caret line="27" column="47" lean-forward="false" selection-start-line="27" selection-start-column="47" selection-end-line="27" selection-end-column="47" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/globalgamejam/gui/GUI.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="316">
@ -995,9 +976,43 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/globalgamejam/world/MainWorld.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="472">
<caret line="33" column="38" lean-forward="false" selection-start-line="33" selection-start-column="38" selection-end-line="33" selection-end-column="38" />
<folding>
<marker date="1484956478568" expanded="true" signature="37:51" ph="..." />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/globalgamejam/interfaces/MainInterfaces.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="221">
<caret line="31" column="34" lean-forward="false" selection-start-line="31" selection-start-column="34" selection-end-line="31" selection-end-column="34" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#1150#1151#0" expanded="true" />
<element signature="e#1193#1194#0" expanded="true" />
<element signature="e#1221#1222#0" expanded="true" />
<element signature="e#1249#1250#0" expanded="true" />
</folding>
</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="-419">
<caret line="30" column="0" lean-forward="false" selection-start-line="30" selection-start-column="0" selection-end-line="30" selection-end-column="34" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/globalgamejam/gui/GUILabel.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-2663">
<state relative-caret-position="-2636">
<caret line="48" column="25" lean-forward="false" selection-start-line="48" selection-start-column="25" selection-end-line="48" selection-end-column="25" />
<folding>
<element signature="e#3387#3388#0" expanded="true" />
@ -1025,54 +1040,28 @@
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/globalgamejam/game/MainGame.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="595">
<caret line="35" column="38" lean-forward="false" selection-start-line="35" selection-start-column="38" selection-end-line="35" selection-end-column="38" />
<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="238">
<caret line="14" column="38" lean-forward="false" selection-start-line="14" selection-start-column="38" selection-end-line="14" selection-end-column="38" />
<caret line="17" column="17" lean-forward="true" selection-start-line="17" selection-start-column="17" selection-end-line="17" selection-end-column="17" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#669#670#0" expanded="true" />
<element signature="e#690#691#0" expanded="true" />
<element signature="e#730#731#0" expanded="true" />
<element signature="e#756#757#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/globalgamejam/world/MainWorld.java">
<entry file="file://$PROJECT_DIR$/.gitignore">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="217">
<caret line="18" column="38" lean-forward="false" selection-start-line="18" selection-start-column="38" selection-end-line="18" selection-end-column="38" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#477#478#0" expanded="true" />
<element signature="e#522#523#0" expanded="true" />
<element signature="e#550#551#0" expanded="true" />
<element signature="e#579#580#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/globalgamejam/interfaces/MainInterfaces.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="221">
<caret line="31" column="34" lean-forward="false" selection-start-line="31" selection-start-column="34" selection-end-line="31" selection-end-column="34" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#1150#1151#0" expanded="true" />
<element signature="e#1193#1194#0" expanded="true" />
<element signature="e#1221#1222#0" expanded="true" />
<element signature="e#1249#1250#0" expanded="true" />
</folding>
</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="34">
<caret line="22" column="4" lean-forward="true" selection-start-line="22" selection-start-column="4" selection-end-line="22" selection-end-column="4" />
<folding>
<element signature="imports" expanded="true" />
</folding>
<state relative-caret-position="340">
<caret line="20" column="15" lean-forward="false" selection-start-line="20" selection-start-column="15" selection-end-line="20" selection-end-column="15" />
<folding />
</state>
</provider>
</entry>

8
.project
View file

@ -1,14 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>Global-Gam-Jam-2017</name>
<comment></comment>
<projects>
</projects>
<comment/>
<projects/>
<buildSpec>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
<arguments/>
</buildCommand>
</buildSpec>
<natures>

BIN
out/production/Global-Gam-Jam-2017/textures/fond.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 700 KiB

BIN
out/production/Global-Gam-Jam-2017/textures/perso.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.3 KiB

3
src/globalgamejam/render/Texture.java
View file

@ -28,7 +28,8 @@ public class Texture {
}
public static Texture loadFont(String text, Color color, String font, int size){
Font f_font = new Font(font, Font.PLAIN, size);
text = text.toUpperCase();
Font f_font = new Font(font, Font.BOLD, size);
// to get the width of the text
BufferedImage img = new BufferedImage(1, 1, BufferedImage.TYPE_INT_ARGB);