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

Add score player

Browse source
This commit is contained in:
MrDev023 2017-01-21 00:01:42 +01:00
parent 89c691beca
commit 4ae8175fda
7 changed files with 267 additions and 246 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

338
.idea/workspace.xml
View file

@ -2,6 +2,12 @@
<project version="4"> <project version="4">
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="00f293cb-c755-478c-9b6f-422f827454e0" name="Default" comment=""> <list default="true" id="00f293cb-c755-478c-9b6f-422f827454e0" name="Default" comment="">
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/globalgamejam/gui/interfaces/MainInterfaces.java" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/globalgamejam/world/MainWorld.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<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/render/Texture.java" afterPath="$PROJECT_DIR$/src/globalgamejam/render/Texture.java" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/globalgamejam/render/Texture.java" afterPath="$PROJECT_DIR$/src/globalgamejam/render/Texture.java" />
</list> </list>
<ignored path="$PROJECT_DIR$/out/" /> <ignored path="$PROJECT_DIR$/out/" />
@ -18,30 +24,20 @@
<component name="ExecutionTargetManager" SELECTED_TARGET="default_target" /> <component name="ExecutionTargetManager" SELECTED_TARGET="default_target" />
<component name="FileEditorManager"> <component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="Main.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/globalgamejam/Main.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-340">
<caret line="49" column="52" lean-forward="true" selection-start-line="49" selection-start-column="52" selection-end-line="49" selection-end-column="52" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="GUILabel.java" pinned="false" current-in-tab="false"> <file leaf-file-name="GUILabel.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/globalgamejam/gui/GUILabel.java"> <entry file="file://$PROJECT_DIR$/src/globalgamejam/gui/GUILabel.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-1411"> <state relative-caret-position="272">
<caret line="49" column="55" lean-forward="true" selection-start-line="49" selection-start-column="55" selection-end-line="49" selection-end-column="55" /> <caret line="74" column="60" lean-forward="false" selection-start-line="74" selection-start-column="60" selection-end-line="74" selection-end-column="60" />
<folding> <folding>
<element signature="e#3387#3388#0" expanded="true" />
<element signature="e#3402#3403#0" expanded="true" /> <element signature="e#3402#3403#0" expanded="true" />
<element signature="e#3417#3418#0" expanded="true" /> <element signature="e#4944#4945#0" expanded="true" />
<element signature="e#4962#4963#0" expanded="true" /> <element signature="e#4964#4965#0" expanded="true" />
<element signature="e#4982#4983#0" expanded="true" /> <element signature="e#5285#5286#0" expanded="true" />
<element signature="e#5303#5304#0" expanded="true" /> <element signature="e#5305#5306#0" expanded="true" />
<element signature="e#5323#5324#0" expanded="true" /> <element signature="e#5803#5804#0" expanded="true" />
<element signature="e#5837#5838#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
@ -50,8 +46,8 @@
<file leaf-file-name="Texture.java" pinned="false" current-in-tab="false"> <file leaf-file-name="Texture.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/globalgamejam/render/Texture.java"> <entry file="file://$PROJECT_DIR$/src/globalgamejam/render/Texture.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="394"> <state relative-caret-position="139">
<caret line="84" column="90" lean-forward="false" selection-start-line="84" selection-start-column="90" selection-end-line="84" selection-end-column="90" /> <caret line="30" column="8" lean-forward="true" selection-start-line="30" selection-start-column="8" selection-end-line="37" selection-end-column="36" />
<folding> <folding>
<element signature="imports" expanded="true" /> <element signature="imports" expanded="true" />
</folding> </folding>
@ -63,7 +59,7 @@
<entry file="file://$PROJECT_DIR$/src/globalgamejam/tiles/Tile.java"> <entry file="file://$PROJECT_DIR$/src/globalgamejam/tiles/Tile.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="305"> <state relative-caret-position="305">
<caret line="67" column="0" lean-forward="true" selection-start-line="67" selection-start-column="0" selection-end-line="67" selection-end-column="0" /> <caret line="67" column="0" lean-forward="false" selection-start-line="67" selection-start-column="0" selection-end-line="67" selection-end-column="0" />
<folding> <folding>
<element signature="imports" expanded="true" /> <element signature="imports" expanded="true" />
</folding> </folding>
@ -71,20 +67,49 @@
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="MainGame.java" pinned="false" current-in-tab="true"> <file leaf-file-name="MainGame.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/globalgamejam/game/MainGame.java"> <entry file="file://$PROJECT_DIR$/src/globalgamejam/game/MainGame.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="170"> <state relative-caret-position="238">
<caret line="37" column="44" lean-forward="true" selection-start-line="37" selection-start-column="44" selection-end-line="37" selection-end-column="44" /> <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> <folding>
<element signature="e#937#938#0" expanded="true" /> <element signature="imports" expanded="true" />
<element signature="e#973#974#0" expanded="true" /> <element signature="e#673#674#0" expanded="true" />
<element signature="e#1038#1039#0" expanded="true" /> <element signature="e#694#695#0" expanded="true" />
<element signature="e#1076#1077#0" expanded="true" /> <element signature="e#734#735#0" expanded="true" />
<element signature="e#1242#1243#0" expanded="true" /> <element signature="e#760#761#0" expanded="true" />
<element signature="e#1278#1279#0" expanded="true" /> </folding>
<element signature="e#1318#1319#0" expanded="true" /> </state>
<element signature="e#1352#1353#0" expanded="true" /> </provider>
</entry>
</file>
<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" />
<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>
</file>
<file leaf-file-name="MainInterfaces.java" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/globalgamejam/gui/interfaces/MainInterfaces.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="149">
<caret line="36" column="25" lean-forward="false" selection-start-line="36" selection-start-column="25" selection-end-line="36" selection-end-column="25" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#1154#1155#0" expanded="true" />
<element signature="e#1197#1198#0" expanded="true" />
<element signature="e#1225#1226#0" expanded="true" />
<element signature="e#1253#1254#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
@ -93,19 +118,19 @@
<file leaf-file-name="GUI.java" pinned="false" current-in-tab="false"> <file leaf-file-name="GUI.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/globalgamejam/gui/GUI.java"> <entry file="file://$PROJECT_DIR$/src/globalgamejam/gui/GUI.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="697"> <state relative-caret-position="163">
<caret line="44" column="13" lean-forward="true" selection-start-line="44" selection-start-column="13" selection-end-line="44" selection-end-column="13" /> <caret line="20" column="38" lean-forward="false" selection-start-line="20" selection-start-column="38" selection-end-line="20" selection-end-column="38" />
<folding> <folding>
<element signature="e#468#469#0" expanded="true" /> <element signature="e#507#508#0" expanded="true" />
<element signature="e#504#505#0" expanded="true" /> <element signature="e#543#544#0" expanded="true" />
<element signature="e#1648#1649#0" expanded="true" /> <element signature="e#1687#1688#0" expanded="true" />
<element signature="e#1672#1673#0" expanded="true" /> <element signature="e#1711#1712#0" expanded="true" />
<element signature="e#1703#1704#0" expanded="true" /> <element signature="e#1742#1743#0" expanded="true" />
<element signature="e#1729#1730#0" expanded="true" /> <element signature="e#1768#1769#0" expanded="true" />
<element signature="e#1754#1755#0" expanded="true" /> <element signature="e#1793#1794#0" expanded="true" />
<element signature="e#1778#1779#0" expanded="true" /> <element signature="e#1817#1818#0" expanded="true" />
<element signature="e#1809#1810#0" expanded="true" /> <element signature="e#1848#1849#0" expanded="true" />
<element signature="e#1835#1836#0" expanded="true" /> <element signature="e#1874#1875#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
@ -115,17 +140,7 @@
<entry file="file://$PROJECT_DIR$/src/globalgamejam/input/Input.java"> <entry file="file://$PROJECT_DIR$/src/globalgamejam/input/Input.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-137"> <state relative-caret-position="-137">
<caret line="130" column="26" lean-forward="true" selection-start-line="130" selection-start-column="26" selection-end-line="130" selection-end-column="26" /> <caret line="130" column="26" lean-forward="false" selection-start-line="130" selection-start-column="26" selection-end-line="130" selection-end-column="26" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="DisplayManager.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/globalgamejam/render/DisplayManager.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="312">
<caret line="31" column="56" lean-forward="false" selection-start-line="31" selection-start-column="56" selection-end-line="31" selection-end-column="56" />
<folding /> <folding />
</state> </state>
</provider> </provider>
@ -135,7 +150,7 @@
<entry file="file://$PROJECT_DIR$/src/globalgamejam/gui/IActionGUI.java"> <entry file="file://$PROJECT_DIR$/src/globalgamejam/gui/IActionGUI.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="153"> <state relative-caret-position="153">
<caret line="9" column="49" lean-forward="true" selection-start-line="9" selection-start-column="49" selection-end-line="9" selection-end-column="49" /> <caret line="9" column="49" lean-forward="false" selection-start-line="9" selection-start-column="49" selection-end-line="9" selection-end-column="49" />
<folding /> <folding />
</state> </state>
</provider> </provider>
@ -145,7 +160,7 @@
<entry file="file://$PROJECT_DIR$/src/globalgamejam/gui/ActionGUI.java"> <entry file="file://$PROJECT_DIR$/src/globalgamejam/gui/ActionGUI.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="391"> <state relative-caret-position="391">
<caret line="25" column="0" lean-forward="true" selection-start-line="25" selection-start-column="0" selection-end-line="25" selection-end-column="0" /> <caret line="25" column="0" lean-forward="false" selection-start-line="25" selection-start-column="0" selection-end-line="25" selection-end-column="0" />
<folding /> <folding />
</state> </state>
</provider> </provider>
@ -209,11 +224,13 @@
<option value="$PROJECT_DIR$/src/globalgamejam/render/DisplayManager.java" /> <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/IActionGUI.java" />
<option value="$PROJECT_DIR$/src/globalgamejam/gui/ActionGUI.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/tiles/Tile.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" /> <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" />
</list> </list>
</option> </option>
</component> </component>
@ -286,7 +303,7 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT> </PATH_ELEMENT>
<PATH_ELEMENT> <PATH_ELEMENT>
<option name="myItemId" value="tiles" /> <option name="myItemId" value="world" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT> </PATH_ELEMENT>
</PATH> </PATH>
@ -330,29 +347,7 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT> </PATH_ELEMENT>
<PATH_ELEMENT> <PATH_ELEMENT>
<option name="myItemId" value="math" /> <option name="myItemId" value="gui" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="Global-Gam-Jam-2017" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="Global-Gam-Jam-2017" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="src" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="globalgamejam" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="input" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT> </PATH_ELEMENT>
</PATH> </PATH>
@ -377,48 +372,8 @@
<option name="myItemId" value="gui" /> <option name="myItemId" value="gui" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT> </PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT> <PATH_ELEMENT>
<option name="myItemId" value="Global-Gam-Jam-2017" /> <option name="myItemId" value="interfaces" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="Global-Gam-Jam-2017" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="src" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="globalgamejam" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="game" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="Global-Gam-Jam-2017" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="Global-Gam-Jam-2017" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="src" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="globalgamejam" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="audio" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT> </PATH_ELEMENT>
</PATH> </PATH>
@ -735,22 +690,6 @@
<option name="FILTER_TARGETS" value="false" /> <option name="FILTER_TARGETS" value="false" />
</component> </component>
<component name="editorHistoryManager"> <component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/.gitignore">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="102">
<caret line="6" column="5" lean-forward="true" selection-start-line="6" selection-start-column="5" selection-end-line="6" selection-end-column="5" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/globalgamejam/render/Camera.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="85">
<caret line="12" column="3" lean-forward="false" selection-start-line="12" selection-start-column="3" selection-end-line="12" selection-end-column="3" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/globalgamejam/render/Shaders.java"> <entry file="file://$PROJECT_DIR$/src/globalgamejam/render/Shaders.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="238"> <state relative-caret-position="238">
@ -1051,7 +990,7 @@
<entry file="file://$PROJECT_DIR$/src/globalgamejam/Main.java"> <entry file="file://$PROJECT_DIR$/src/globalgamejam/Main.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-340"> <state relative-caret-position="-340">
<caret line="49" column="52" lean-forward="true" selection-start-line="49" selection-start-column="52" selection-end-line="49" selection-end-column="52" /> <caret line="49" column="52" lean-forward="false" selection-start-line="49" selection-start-column="52" selection-end-line="49" selection-end-column="52" />
<folding> <folding>
<element signature="imports" expanded="true" /> <element signature="imports" expanded="true" />
</folding> </folding>
@ -1069,7 +1008,7 @@
<entry file="file://$PROJECT_DIR$/src/globalgamejam/input/Input.java"> <entry file="file://$PROJECT_DIR$/src/globalgamejam/input/Input.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-137"> <state relative-caret-position="-137">
<caret line="130" column="26" lean-forward="true" selection-start-line="130" selection-start-column="26" selection-end-line="130" selection-end-column="26" /> <caret line="130" column="26" lean-forward="false" selection-start-line="130" selection-start-column="26" selection-end-line="130" selection-end-column="26" />
<folding /> <folding />
</state> </state>
</provider> </provider>
@ -1077,7 +1016,7 @@
<entry file="file://$PROJECT_DIR$/src/globalgamejam/gui/IActionGUI.java"> <entry file="file://$PROJECT_DIR$/src/globalgamejam/gui/IActionGUI.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="153"> <state relative-caret-position="153">
<caret line="9" column="49" lean-forward="true" selection-start-line="9" selection-start-column="49" selection-end-line="9" selection-end-column="49" /> <caret line="9" column="49" lean-forward="false" selection-start-line="9" selection-start-column="49" selection-end-line="9" selection-end-column="49" />
<folding /> <folding />
</state> </state>
</provider> </provider>
@ -1085,7 +1024,7 @@
<entry file="file://$PROJECT_DIR$/src/globalgamejam/gui/ActionGUI.java"> <entry file="file://$PROJECT_DIR$/src/globalgamejam/gui/ActionGUI.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="391"> <state relative-caret-position="391">
<caret line="25" column="0" lean-forward="true" selection-start-line="25" selection-start-column="0" selection-end-line="25" selection-end-column="0" /> <caret line="25" column="0" lean-forward="false" selection-start-line="25" selection-start-column="0" selection-end-line="25" selection-end-column="0" />
<folding /> <folding />
</state> </state>
</provider> </provider>
@ -1093,7 +1032,7 @@
<entry file="file://$PROJECT_DIR$/src/globalgamejam/tiles/Tile.java"> <entry file="file://$PROJECT_DIR$/src/globalgamejam/tiles/Tile.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="305"> <state relative-caret-position="305">
<caret line="67" column="0" lean-forward="true" selection-start-line="67" selection-start-column="0" selection-end-line="67" selection-end-column="0" /> <caret line="67" column="0" lean-forward="false" selection-start-line="67" selection-start-column="0" selection-end-line="67" selection-end-column="0" />
<folding> <folding>
<element signature="imports" expanded="true" /> <element signature="imports" expanded="true" />
</folding> </folding>
@ -1102,61 +1041,88 @@
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/globalgamejam/gui/GUI.java"> <entry file="file://$PROJECT_DIR$/src/globalgamejam/gui/GUI.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="697"> <state relative-caret-position="163">
<caret line="44" column="13" lean-forward="true" selection-start-line="44" selection-start-column="13" selection-end-line="44" selection-end-column="13" /> <caret line="20" column="38" lean-forward="false" selection-start-line="20" selection-start-column="38" selection-end-line="20" selection-end-column="38" />
<folding> <folding>
<element signature="e#468#469#0" expanded="true" /> <element signature="e#507#508#0" expanded="true" />
<element signature="e#504#505#0" expanded="true" /> <element signature="e#543#544#0" expanded="true" />
<element signature="e#1648#1649#0" expanded="true" /> <element signature="e#1687#1688#0" expanded="true" />
<element signature="e#1672#1673#0" expanded="true" /> <element signature="e#1711#1712#0" expanded="true" />
<element signature="e#1703#1704#0" expanded="true" /> <element signature="e#1742#1743#0" expanded="true" />
<element signature="e#1729#1730#0" expanded="true" /> <element signature="e#1768#1769#0" expanded="true" />
<element signature="e#1754#1755#0" expanded="true" /> <element signature="e#1793#1794#0" expanded="true" />
<element signature="e#1778#1779#0" expanded="true" /> <element signature="e#1817#1818#0" expanded="true" />
<element signature="e#1809#1810#0" expanded="true" /> <element signature="e#1848#1849#0" expanded="true" />
<element signature="e#1835#1836#0" expanded="true" /> <element signature="e#1874#1875#0" 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="-1411">
<caret line="49" column="55" lean-forward="true" selection-start-line="49" selection-start-column="55" selection-end-line="49" selection-end-column="55" />
<folding>
<element signature="e#3402#3403#0" expanded="true" />
<element signature="e#3417#3418#0" expanded="true" />
<element signature="e#4962#4963#0" expanded="true" />
<element signature="e#4982#4983#0" expanded="true" />
<element signature="e#5303#5304#0" expanded="true" />
<element signature="e#5323#5324#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/globalgamejam/render/Texture.java"> <entry file="file://$PROJECT_DIR$/src/globalgamejam/render/Texture.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="394"> <state relative-caret-position="139">
<caret line="84" column="90" lean-forward="false" selection-start-line="84" selection-start-column="90" selection-end-line="84" selection-end-column="90" /> <caret line="30" column="8" lean-forward="true" selection-start-line="30" selection-start-column="8" selection-end-line="37" selection-end-column="36" />
<folding> <folding>
<element signature="imports" expanded="true" /> <element signature="imports" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/globalgamejam/gui/GUILabel.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="272">
<caret line="74" column="60" lean-forward="false" selection-start-line="74" selection-start-column="60" selection-end-line="74" selection-end-column="60" />
<folding>
<element signature="e#3387#3388#0" expanded="true" />
<element signature="e#3402#3403#0" expanded="true" />
<element signature="e#4944#4945#0" expanded="true" />
<element signature="e#4964#4965#0" expanded="true" />
<element signature="e#5285#5286#0" expanded="true" />
<element signature="e#5305#5306#0" expanded="true" />
<element signature="e#5803#5804#0" expanded="true" />
<element signature="e#5837#5838#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/globalgamejam/game/MainGame.java"> <entry file="file://$PROJECT_DIR$/src/globalgamejam/game/MainGame.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="170"> <state relative-caret-position="238">
<caret line="37" column="44" lean-forward="true" selection-start-line="37" selection-start-column="44" selection-end-line="37" selection-end-column="44" /> <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> <folding>
<element signature="e#937#938#0" expanded="true" /> <element signature="imports" expanded="true" />
<element signature="e#973#974#0" expanded="true" /> <element signature="e#673#674#0" expanded="true" />
<element signature="e#1038#1039#0" expanded="true" /> <element signature="e#694#695#0" expanded="true" />
<element signature="e#1076#1077#0" expanded="true" /> <element signature="e#734#735#0" expanded="true" />
<element signature="e#1242#1243#0" expanded="true" /> <element signature="e#760#761#0" expanded="true" />
<element signature="e#1278#1279#0" expanded="true" /> </folding>
<element signature="e#1318#1319#0" expanded="true" /> </state>
<element signature="e#1352#1353#0" expanded="true" /> </provider>
</entry>
<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" />
<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/gui/interfaces/MainInterfaces.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="149">
<caret line="36" column="25" lean-forward="false" selection-start-line="36" selection-start-column="25" selection-end-line="36" selection-end-column="25" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#1154#1155#0" expanded="true" />
<element signature="e#1197#1198#0" expanded="true" />
<element signature="e#1225#1226#0" expanded="true" />
<element signature="e#1253#1254#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>

67
src/globalgamejam/game/MainGame.java
View file

@ -1,17 +1,9 @@
package globalgamejam.game; package globalgamejam.game;
import globalgamejam.math.Vector2f; import globalgamejam.gui.interfaces.MainInterfaces;
import globalgamejam.gui.ActionGUI;
import globalgamejam.gui.GUI; import globalgamejam.world.MainWorld;
import globalgamejam.gui.GUILabel;
import globalgamejam.gui.IActionGUI;
import globalgamejam.input.Input;
import globalgamejam.render.*;
import globalgamejam.tiles.TestTile;
import globalgamejam.tiles.Tile;
import java.awt.*;
import java.util.ArrayList;
import java.util.Random; import java.util.Random;
/** /**
@ -19,71 +11,42 @@ import java.util.Random;
*/ */
public class MainGame extends Game{ public class MainGame extends Game{
private ArrayList<Tile> tiles; private MainWorld world;
private MainInterfaces interfaces;
public int[] scores;
private Random rand; private Random rand;
private Player player1; private Player player1;
private ArrayList<GUI> guis;
private GUILabel label;
@Override @Override
public void init() { public void init() {
tiles = new ArrayList<Tile>();
guis = new ArrayList<GUI>();
TestTile t = new TestTile();
t.getTransform().translate(100,100,0);
t.getTransform().scale(10,10,0);
tiles.add(t);
player1 = new Player(-100, 0);
tiles.add(player1.getTile());
rand = new Random(); rand = new Random();
label = new GUILabel("Test"); this.scores = new int[2];
label.setX(10); world = new MainWorld(this);
label.setY(10); interfaces = new MainInterfaces(this);
label.setAction(new ActionGUI() {
@Override
public void enter(float mouseX, float mouseY) {
label.setColor(Color.RED);
}
@Override
public void leave(float mouseX, float mouseY) {
label.setColor(Color.WHITE);
}
});
guis.add(label);
} }
@Override @Override
public void update() { public void update() {
Camera.transform(); interfaces.update();
// player1.setPosition((rand.nextFloat() - 0.5f) * 200f, (rand.nextFloat() - 0.5f) * 150f); world.update();
// player1.applyTransform();
for(GUI g : guis)g.update();
} }
@Override @Override
public void render2D() { public void render2D() {
for(Tile t : tiles)t.render(); world.render();
} }
@Override @Override
public void renderGUI() { public void renderGUI() {
for(GUI g : guis)g.render(); interfaces.render();
} }
@Override @Override
public void destroy() { public void destroy() {
tiles.clear(); interfaces.destroy();
guis.clear(); world.destroy();
} }
} }

1
src/globalgamejam/gui/GUI.java
View file

@ -18,6 +18,7 @@ public abstract class GUI {
this.y = y; this.y = y;
this.width = 0; this.width = 0;
this.height = 0; this.height = 0;
this.action = new ActionGUI();
} }
public void setAction(IActionGUI action){ public void setAction(IActionGUI action){

13
src/globalgamejam/gui/GUILabel.java
View file

@ -54,9 +54,9 @@ public class GUILabel extends GUI {
this.vbo = GL15.glGenBuffers(); this.vbo = GL15.glGenBuffers();
float[] a = new float[]{ float[] a = new float[]{
0,0, 0.0f,0.0f, 0,0, 0.0f,0.0f,
this.texture.width,0, 1.0f,0.0f, 1,0, 1.0f,0.0f,
this.texture.width,this.texture.height, 1.0f,1.0f, 1,1, 1.0f,1.0f,
0,this.texture.height, 0.0f,1.0f 0,1, 0.0f,1.0f
}; };
FloatBuffer buff = BufferUtils.createFloatBuffer(a.length); FloatBuffer buff = BufferUtils.createFloatBuffer(a.length);
buff.put(a).flip(); buff.put(a).flip();
@ -72,6 +72,7 @@ public class GUILabel extends GUI {
Shaders.MAIN_SHADERS.uniform("camera", Camera.matrix); Shaders.MAIN_SHADERS.uniform("camera", Camera.matrix);
Matrix4f transform = new Matrix4f(); Matrix4f transform = new Matrix4f();
transform.translate(super.x,super.y,0); transform.translate(super.x,super.y,0);
transform.scale(this.getWitdh(),this.getHeight(),1);
Shaders.MAIN_SHADERS.uniform("transform", transform); Shaders.MAIN_SHADERS.uniform("transform", transform);
Shaders.MAIN_SHADERS.uniform("projection", DisplayManager.projection); Shaders.MAIN_SHADERS.uniform("projection", DisplayManager.projection);
Shaders.MAIN_SHADERS.uniform("color", Color4f.WHITE); Shaders.MAIN_SHADERS.uniform("color", Color4f.WHITE);
@ -142,8 +143,6 @@ public class GUILabel extends GUI {
this.texture = Texture.loadFont(text,color,font,size); this.texture = Texture.loadFont(text,color,font,size);
} }
/** /**
* Return the x coordonnate of the Label (upper left corner) * Return the x coordonnate of the Label (upper left corner)
* @return x (float) : the x coordonnate of the Label * @return x (float) : the x coordonnate of the Label
@ -191,7 +190,7 @@ public class GUILabel extends GUI {
* @return witdh (int) : the width * @return witdh (int) : the width
*/ */
public int getWitdh() { public int getWitdh() {
return super.width; return this.texture.width;
} }
/** /**
@ -199,7 +198,7 @@ public class GUILabel extends GUI {
* @return height (int) : the height * @return height (int) : the height
*/ */
public int getHeight() { public int getHeight() {
return super.height; return this.texture.height;
} }
public void destroy(){ public void destroy(){

53
src/globalgamejam/gui/interfaces/MainInterfaces.java Normal file
View file

@ -0,0 +1,53 @@
package globalgamejam.gui.interfaces;
import globalgamejam.Main;
import globalgamejam.game.MainGame;
import globalgamejam.gui.GUI;
import globalgamejam.gui.GUILabel;
import java.awt.*;
import java.util.ArrayList;
/**
* Created by trexr on 20/01/2017.
*/
public class MainInterfaces {
private final int SIZE_OF_DETAILS = 100;
private MainGame game;
private ArrayList<GUI> guis;
private GUILabel p1,p2;
public MainInterfaces(MainGame game){
this.game = game;
guis = new ArrayList<GUI>();
init();
}
public void init(){
p1 = new GUILabel("Player 1 : ", Main.WIDTH/4 - 50,10, Color.WHITE,"Arial",16);
p2 = new GUILabel("Player 2 : ", Main.WIDTH/4 * 3 - 50,10, Color.WHITE,"Arial",16);
guis.add(p1);
guis.add(p2);
}
public void update(){
p1.setText("Player 1 : " + this.game.scores[0]);
p1.setX((Main.WIDTH-SIZE_OF_DETAILS)/4 - p1.getWitdh()/2);
p2.setText("Player 2 : " + this.game.scores[1]);
p2.setX((Main.WIDTH-SIZE_OF_DETAILS)/4*3 - p2.getWitdh()/2);
for(GUI g : guis)g.update();
}
public void render(){
for(GUI g : guis)g.render();
}
public void destroy(){
guis.clear();
}
}

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

@ -82,7 +82,6 @@ public class Texture {
glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, image.getWidth(), image.getHeight(), 0, GL_RGBA, GL_UNSIGNED_BYTE, buffer); glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, image.getWidth(), image.getHeight(), 0, GL_RGBA, GL_UNSIGNED_BYTE, buffer);
glBindTexture(GL_TEXTURE_2D, 0); glBindTexture(GL_TEXTURE_2D, 0);
System.out.println("Texture loaded ! " + width + "x" + height + " id:" + textureID);
return new Texture(image.getWidth(),image.getHeight(),textureID); return new Texture(image.getWidth(),image.getHeight(),textureID);
} }
@ -122,6 +121,8 @@ public class Texture {
glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, width, height, 0, GL_RGBA, GL_UNSIGNED_BYTE, buffer); glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, width, height, 0, GL_RGBA, GL_UNSIGNED_BYTE, buffer);
glBindTexture(GL_TEXTURE_2D, 0); glBindTexture(GL_TEXTURE_2D, 0);
System.out.println("Texture loaded ! " + width + "x" + height + " id:" + id);
return new Texture(width, height, id); return new Texture(width, height, id);
} catch (IOException e) { } catch (IOException e) {

38
src/globalgamejam/world/MainWorld.java Normal file
View file

@ -0,0 +1,38 @@
package globalgamejam.world;
import globalgamejam.game.MainGame;
import globalgamejam.tiles.Tile;
import java.util.ArrayList;
/**
* Created by trexr on 20/01/2017.
*/
public class MainWorld {
private ArrayList<Tile> tiles;
private MainGame game;
public MainWorld(MainGame game){
this.game = game;
tiles = new ArrayList<Tile>();
init();
}
public void init(){
}
public void update(){
}
public void render(){
for(Tile t : tiles)t.render();
}
public void destroy(){
tiles.clear();
}
}