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

merge

Browse source
This commit is contained in:
Lucas 2017-01-21 01:53:51 +01:00
commit 58e0435cb8
11 changed files with 461 additions and 404 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

503
.idea/workspace.xml
View file

@ -2,7 +2,8 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="00f293cb-c755-478c-9b6f-422f827454e0" name="Default" comment="">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/globalgamejam/render/Texture.java" afterPath="$PROJECT_DIR$/src/globalgamejam/render/Texture.java" />
<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" />
</list>
<ignored path="$PROJECT_DIR$/out/" />
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@ -18,40 +19,52 @@
<component name="ExecutionTargetManager" SELECTED_TARGET="default_target" />
<component name="FileEditorManager">
<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">
<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" />
<state relative-caret-position="-2663">
<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" />
<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" />
<element signature="e#3635#3636#0" expanded="true" />
<element signature="e#3688#3689#0" expanded="true" />
<element signature="e#3828#3829#0" expanded="true" />
<element signature="e#3847#3848#0" expanded="true" />
<element signature="e#4296#4297#0" expanded="true" />
<element signature="e#4314#4315#0" expanded="true" />
<element signature="e#4773#4774#0" expanded="true" />
<element signature="e#4788#4789#0" expanded="true" />
<element signature="e#4944#4945#0" expanded="true" />
<element signature="e#4964#4965#0" expanded="true" />
<element signature="e#5114#5115#0" expanded="true" />
<element signature="e#5129#5130#0" expanded="true" />
<element signature="e#5285#5286#0" expanded="true" />
<element signature="e#5305#5306#0" expanded="true" />
<element signature="e#5661#5662#0" expanded="true" />
<element signature="e#5693#5694#0" expanded="true" />
<element signature="e#5803#5804#0" expanded="true" />
<element signature="e#5837#5838#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="Texture.java" pinned="false" current-in-tab="false">
<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">
<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" />
<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>
@ -62,8 +75,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="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" />
<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>
@ -71,20 +84,49 @@
</provider>
</entry>
</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">
<provider selected="true" editor-type-id="text-editor">
<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" />
<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="e#937#938#0" expanded="true" />
<element signature="e#973#974#0" expanded="true" />
<element signature="e#1038#1039#0" expanded="true" />
<element signature="e#1076#1077#0" expanded="true" />
<element signature="e#1242#1243#0" expanded="true" />
<element signature="e#1278#1279#0" expanded="true" />
<element signature="e#1318#1319#0" expanded="true" />
<element signature="e#1352#1353#0" expanded="true" />
<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>
</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="false">
<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>
@ -93,49 +135,29 @@
<file leaf-file-name="GUI.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/globalgamejam/gui/GUI.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="697">
<caret line="44" column="13" lean-forward="true" selection-start-line="44" selection-start-column="13" selection-end-line="44" selection-end-column="13" />
<state relative-caret-position="316">
<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>
<element signature="e#468#469#0" expanded="true" />
<element signature="e#504#505#0" expanded="true" />
<element signature="e#1648#1649#0" expanded="true" />
<element signature="e#1672#1673#0" expanded="true" />
<element signature="e#1703#1704#0" expanded="true" />
<element signature="e#1729#1730#0" expanded="true" />
<element signature="e#1754#1755#0" expanded="true" />
<element signature="e#1778#1779#0" expanded="true" />
<element signature="e#1809#1810#0" expanded="true" />
<element signature="e#1835#1836#0" expanded="true" />
<element signature="e#507#508#0" expanded="true" />
<element signature="e#543#544#0" expanded="true" />
<element signature="e#1687#1688#0" expanded="true" />
<element signature="e#1711#1712#0" expanded="true" />
<element signature="e#1742#1743#0" expanded="true" />
<element signature="e#1768#1769#0" expanded="true" />
<element signature="e#1793#1794#0" expanded="true" />
<element signature="e#1817#1818#0" expanded="true" />
<element signature="e#1848#1849#0" expanded="true" />
<element signature="e#1874#1875#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="Input.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/globalgamejam/input/Input.java">
<provider selected="true" editor-type-id="text-editor">
<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" />
<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 />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="IActionGUI.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/globalgamejam/gui/IActionGUI.java">
<provider selected="true" editor-type-id="text-editor">
<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 />
</state>
</provider>
@ -145,7 +167,7 @@
<entry file="file://$PROJECT_DIR$/src/globalgamejam/gui/ActionGUI.java">
<provider selected="true" editor-type-id="text-editor">
<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 />
</state>
</provider>
@ -209,11 +231,13 @@
<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/gui/GUI.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/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>
</option>
</component>
@ -268,6 +292,28 @@
<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="world" />
<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" />
@ -312,50 +358,6 @@
<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="math" />
<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" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="Global-Gam-Jam-2017" />
@ -378,50 +380,6 @@
<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="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" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="Global-Gam-Jam-2017" />
@ -691,7 +649,7 @@
</component>
<component name="ToolWindowManager">
<frame x="1358" y="-8" width="1296" height="1000" extended-state="6" />
<editor active="true" />
<editor active="false" />
<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" />
@ -708,7 +666,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="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="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="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" />
@ -735,41 +693,10 @@
<option name="FILTER_TARGETS" value="false" />
</component>
<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">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="238">
<caret line="18" column="88" lean-forward="false" selection-start-line="18" selection-start-column="88" selection-end-line="18" selection-end-column="88" />
<folding>
<element signature="imports" expanded="false" />
<element signature="e#1625#1626#0" expanded="false" />
<element signature="e#1653#1654#0" expanded="false" />
<element signature="e#1678#1679#0" expanded="false" />
<element signature="e#1700#1701#0" expanded="false" />
<element signature="e#1746#1747#0" expanded="false" />
<element signature="e#1794#1795#0" expanded="false" />
<element signature="e#1958#1959#0" expanded="false" />
<element signature="e#2016#2017#0" expanded="false" />
<element signature="e#2066#2067#0" expanded="false" />
<element signature="e#2140#2141#0" expanded="false" />
<element signature="e#2587#2588#0" expanded="false" />
<element signature="e#2644#2645#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
@ -794,7 +721,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
@ -812,9 +738,6 @@
<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>
<element signature="imports" expanded="false" />
</folding>
</state>
</provider>
</entry>
@ -822,7 +745,6 @@
<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>
@ -838,21 +760,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="238">
<caret line="18" column="88" lean-forward="false" selection-start-line="18" selection-start-column="88" selection-end-line="18" selection-end-column="88" />
<folding>
<element signature="imports" expanded="false" />
<element signature="e#1625#1626#0" expanded="false" />
<element signature="e#1653#1654#0" expanded="false" />
<element signature="e#1678#1679#0" expanded="false" />
<element signature="e#1700#1701#0" expanded="false" />
<element signature="e#1746#1747#0" expanded="false" />
<element signature="e#1794#1795#0" expanded="false" />
<element signature="e#1958#1959#0" expanded="false" />
<element signature="e#2016#2017#0" expanded="false" />
<element signature="e#2066#2067#0" expanded="false" />
<element signature="e#2140#2141#0" expanded="false" />
<element signature="e#2587#2588#0" expanded="false" />
<element signature="e#2644#2645#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
@ -860,7 +767,9 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="85">
<caret line="14" column="3" lean-forward="false" selection-start-line="14" selection-start-column="3" selection-end-line="14" selection-end-column="3" />
<folding />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
@ -873,7 +782,6 @@
<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>
@ -895,7 +803,6 @@
<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>
@ -947,21 +854,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="731">
<caret line="47" column="47" lean-forward="false" selection-start-line="47" selection-start-column="47" selection-end-line="47" selection-end-column="47" />
<folding>
<element signature="imports" expanded="false" />
<element signature="e#1625#1626#0" expanded="false" />
<element signature="e#1653#1654#0" expanded="false" />
<element signature="e#1678#1679#0" expanded="false" />
<element signature="e#1700#1701#0" expanded="false" />
<element signature="e#1746#1747#0" expanded="false" />
<element signature="e#1794#1795#0" expanded="false" />
<element signature="e#1958#1959#0" expanded="false" />
<element signature="e#2016#2017#0" expanded="false" />
<element signature="e#2066#2067#0" expanded="false" />
<element signature="e#2140#2141#0" expanded="false" />
<element signature="e#2587#2588#0" expanded="false" />
<element signature="e#2644#2645#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
@ -1001,7 +893,6 @@
<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" />
<folding />
</state>
</provider>
</entry>
@ -1009,7 +900,6 @@
<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>
@ -1017,10 +907,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="206">
<caret line="28" column="26" lean-forward="false" selection-start-line="28" selection-start-column="26" selection-end-line="28" selection-end-column="26" />
<folding>
<element signature="e#465#466#0" expanded="true" />
<element signature="e#495#496#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
@ -1028,7 +914,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="257">
<caret line="86" column="22" lean-forward="true" selection-start-line="86" selection-start-column="22" selection-end-line="86" selection-end-column="22" />
<folding />
</state>
</provider>
</entry>
@ -1036,22 +921,14 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="238">
<caret line="14" column="14" lean-forward="false" selection-start-line="14" selection-start-column="14" selection-end-line="14" selection-end-column="14" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/globalgamejam/gui/Image.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-732">
<caret line="3" column="0" lean-forward="false" selection-start-line="3" selection-start-column="0" selection-end-line="3" selection-end-column="25" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/globalgamejam/gui/Image.java" />
<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" />
<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>
<element signature="imports" expanded="true" />
</folding>
@ -1062,14 +939,13 @@
<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 />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/globalgamejam/input/Input.java">
<provider selected="true" editor-type-id="text-editor">
<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>
@ -1077,7 +953,7 @@
<entry file="file://$PROJECT_DIR$/src/globalgamejam/gui/IActionGUI.java">
<provider selected="true" editor-type-id="text-editor">
<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 />
</state>
</provider>
@ -1085,15 +961,15 @@
<entry file="file://$PROJECT_DIR$/src/globalgamejam/gui/ActionGUI.java">
<provider selected="true" editor-type-id="text-editor">
<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 />
</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">
<caret line="67" column="0" lean-forward="true" selection-start-line="67" selection-start-column="0" selection-end-line="67" selection-end-column="0" />
<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>
@ -1102,61 +978,100 @@
</entry>
<entry file="file://$PROJECT_DIR$/src/globalgamejam/gui/GUI.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="697">
<caret line="44" column="13" lean-forward="true" selection-start-line="44" selection-start-column="13" selection-end-line="44" selection-end-column="13" />
<state relative-caret-position="316">
<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>
<element signature="e#468#469#0" expanded="true" />
<element signature="e#504#505#0" expanded="true" />
<element signature="e#1648#1649#0" expanded="true" />
<element signature="e#1672#1673#0" expanded="true" />
<element signature="e#1703#1704#0" expanded="true" />
<element signature="e#1729#1730#0" expanded="true" />
<element signature="e#1754#1755#0" expanded="true" />
<element signature="e#1778#1779#0" expanded="true" />
<element signature="e#1809#1810#0" expanded="true" />
<element signature="e#1835#1836#0" expanded="true" />
<element signature="e#507#508#0" expanded="true" />
<element signature="e#543#544#0" expanded="true" />
<element signature="e#1687#1688#0" expanded="true" />
<element signature="e#1711#1712#0" expanded="true" />
<element signature="e#1742#1743#0" expanded="true" />
<element signature="e#1768#1769#0" expanded="true" />
<element signature="e#1793#1794#0" expanded="true" />
<element signature="e#1817#1818#0" expanded="true" />
<element signature="e#1848#1849#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" />
<state relative-caret-position="-2663">
<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" />
<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>
</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" />
<element signature="e#3635#3636#0" expanded="true" />
<element signature="e#3688#3689#0" expanded="true" />
<element signature="e#3828#3829#0" expanded="true" />
<element signature="e#3847#3848#0" expanded="true" />
<element signature="e#4296#4297#0" expanded="true" />
<element signature="e#4314#4315#0" expanded="true" />
<element signature="e#4773#4774#0" expanded="true" />
<element signature="e#4788#4789#0" expanded="true" />
<element signature="e#4944#4945#0" expanded="true" />
<element signature="e#4964#4965#0" expanded="true" />
<element signature="e#5114#5115#0" expanded="true" />
<element signature="e#5129#5130#0" expanded="true" />
<element signature="e#5285#5286#0" expanded="true" />
<element signature="e#5305#5306#0" expanded="true" />
<element signature="e#5661#5662#0" expanded="true" />
<element signature="e#5693#5694#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">
<provider selected="true" editor-type-id="text-editor">
<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" />
<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="e#937#938#0" expanded="true" />
<element signature="e#973#974#0" expanded="true" />
<element signature="e#1038#1039#0" expanded="true" />
<element signature="e#1076#1077#0" expanded="true" />
<element signature="e#1242#1243#0" expanded="true" />
<element signature="e#1278#1279#0" expanded="true" />
<element signature="e#1318#1319#0" expanded="true" />
<element signature="e#1352#1353#0" expanded="true" />
<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">
<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>
</provider>

BIN
res/textures/perso.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.3 KiB

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

@ -1,6 +1,7 @@
package globalgamejam.game;
import java.awt.Color;
import java.util.ArrayList;
import java.util.Random;
@ -18,121 +19,52 @@ import globalgamejam.tiles.TestTile;
import globalgamejam.tiles.Tile;
import globalgamejam.interfaces.MainInterfaces;
import globalgamejam.world.MainWorld;
import java.util.Random;
import org.lwjgl.glfw.GLFW;
/**
* Class created by MrDev023 (Florian RICHER) on 14/01/2017
*/
public class MainGame extends Game{
private ArrayList<Tile> tiles;
private Random rand;
private Player player1;
private ArrayList<GUI> guis;
private GUILabel label;
private MainWorld world;
private MainInterfaces interfaces;
public int[] scores;
@Override
public void init() {
tiles = new ArrayList<Tile>();
Fond fond = new Fond("res/textures/fond.png");
fond.getTransform().translate(Main.WIDTH/2, Main.HEIGHT/2, 0);
fond.getTransform().scale(Main.WIDTH,Main.HEIGHT, 0);
fond.getTransform().rotate(180, 0, 0);
guis = new ArrayList<GUI>();
tiles.add(fond);
TestTile test = new TestTile();
test.getTransform().translate(0, 80, 0);
test.getTransform().scale(10, 10, 0);
tiles.add(test);
player1 = new Player(-100, 0);
tiles.add(player1.getTile());
rand = new Random();
label = new GUILabel("Test");
label.setX(10);
label.setY(10);
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);
generateEntity(3);
this.scores = new int[2];
world = new MainWorld(this);
interfaces = new MainInterfaces(this);
}
@Override
public void update() {
Camera.transform();
// player1.setPosition((rand.nextFloat() - 0.5f) * 200f, (rand.nextFloat() - 0.5f) * 150f);
// player1.applyTransform();
for(GUI g : guis)g.update();
interfaces.update();
world.update();
}
@Override
public void render2D() {
for(int i = tiles.size() - 1;i >= 0 ;i--)
tiles.get(i).render();
world.render();
}
@Override
public void renderGUI() {
for(GUI g : guis)g.render();
interfaces.render();
}
@Override
public void destroy() {
tiles.clear();
guis.clear();
interfaces.destroy();
world.destroy();
}
public void generateEntity(int nb){
final int MIN_HAUTEUR_MAX=150;
final int MIN_HAUTEUR=80;
int hauteurMax = (int) (MIN_HAUTEUR_MAX +Math.random()* Main.HEIGHT-80);
int nbMin = 0;
int nbMax = 0;
ArrayList<Tile> list = new ArrayList<>();
if(hauteurMax<MIN_HAUTEUR_MAX){
nbMin=nb-2;
nbMax=0;
}
if(hauteurMax>MIN_HAUTEUR_MAX && hauteurMax<Main.HEIGHT/2){
nbMin=nb-2;
nbMax=nb+2;
}
if(hauteurMax>Main.HEIGHT/2){
nbMin=0;
nbMax=nb+2;
}
int countJ1=(int)(nbMin + Math.random()*nbMax);
int countJ2=(int)(nbMin + Math.random()*nbMax);
for(int i =0;i<countJ1;i++){
list.add(new Objet((int)(Math.random()* Main.WIDTH/2),(int) (MIN_HAUTEUR+Math.random()* hauteurMax)));
}
for(int i =0;i<countJ1;i++){
list.add(new Objet((int)(Main.WIDTH/2+Math.random()* Main.WIDTH),(int) (MIN_HAUTEUR +Math.random()* hauteurMax)));
}
for(Tile t : list){
tiles.add(t);
}
}
}

25
src/globalgamejam/game/Player.java
View file

@ -20,7 +20,7 @@ public class Player extends PhysicalEntity {
public Player(float x, float y){
super(x, y, 100, 0, 0, 10);
this.tile = new PlayerTile("res/textures/default.png", -250, 0);
this.tile = new PlayerTile("res/textures/perso.png", x, y);
this.longueurBalai = 100;
this.brosse = new PhysicalEntity(x, y + this.longueurBalai, 20, 0, 0, 0);
@ -30,6 +30,14 @@ public class Player extends PhysicalEntity {
return this.tile;
}
public void move(float x, float y){
this.addPosition(x, y);
this.tile.setPosition(new Vector2f(this.x, this.y));
this.tile.applyTransform();
this.brosse.addPosition(x, y);
}
public void rotate(float angleRotation){
this.angle += angleRotation;
this.angle %= 360;
@ -38,6 +46,7 @@ public class Player extends PhysicalEntity {
}
this.tile.setRotation(this.angle);
this.tile.applyTransform();
float angleRad = (float)(this.angle * (Math.PI / 180));
@ -51,6 +60,11 @@ public class Player extends PhysicalEntity {
return this.brosse.collideWithSquareHitBox(entity);
}
@Override
public String toString(){
return this.brosse.toString();
}
private class PlayerTile extends Tile {
public PlayerTile(String texturePath, float x, float y){
@ -58,16 +72,11 @@ public class Player extends PhysicalEntity {
this.setTexture(Texture.loadTexture(texturePath));
this.setPosition(x, y);
this.setPosition(new Vector2f(x, y));
this.setScale(new Vector2f(50, 50));
this.setScale(new Vector2f(this.getTexture().width, this.getTexture().height));
this.applyTransform();
}
public void setPosition(float x, float y){
this.setPosition(new Vector2f(x, y));
}
}
}

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

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

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

@ -0,0 +1,53 @@
package globalgamejam.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();
}
}

10
src/globalgamejam/physics/PhysicalEntity.java
View file

@ -67,4 +67,14 @@ public class PhysicalEntity {
this.x = x;
this.y = y;
}
public void addPosition(float x, float y){
this.x += x;
this.y += y;
}
@Override
public String toString(){
return this.x + " " + this.y;
}
}

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);
glBindTexture(GL_TEXTURE_2D, 0);
System.out.println("Texture loaded ! " + width + "x" + height + " id:" + 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);
glBindTexture(GL_TEXTURE_2D, 0);
System.out.println("Texture loaded ! " + width + "x" + height + " id:" + id);
return new Texture(width, height, id);
} catch (IOException e) {

8
src/globalgamejam/tiles/Tile.java
View file

@ -33,10 +33,10 @@ public abstract class Tile {
this.color = Color4f.WHITE;
this.vbo = GL15.glGenBuffers();
float[] a = new float[]{
-.5f,-.5f, 0.0f,0.0f,
.5f,-.5f, 1.0f,0.0f,
.5f,.5f, 1.0f,1.0f,
-.5f,.5f, 0.0f,1.0f
-.5f,-.5f, 0.0f,1.0f,
.5f,-.5f, 1.0f,1.0f,
.5f,.5f, 1.0f,0.0f,
-.5f,.5f, 0.0f,0.0f
};
FloatBuffer buffer = BufferUtils.createFloatBuffer(a.length);
buffer.put(a).flip();

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

@ -0,0 +1,137 @@
package globalgamejam.world;
import globalgamejam.Main;
import globalgamejam.game.MainGame;
import globalgamejam.game.Player;
import globalgamejam.gui.ActionGUI;
import globalgamejam.gui.GUI;
import globalgamejam.gui.GUILabel;
import globalgamejam.input.Input;
import globalgamejam.tiles.Fond;
import globalgamejam.tiles.Objet;
import globalgamejam.tiles.TestTile;
import globalgamejam.tiles.Tile;
import java.awt.Color;
import java.util.ArrayList;
import java.util.Random;
import org.lwjgl.glfw.GLFW;
/**
* Created by trexr on 20/01/2017.
*/
public class MainWorld {
private ArrayList<Tile> tiles;
private MainGame game;
private Player player1;
public MainWorld(MainGame game){
this.game = game;
tiles = new ArrayList<Tile>();
init();
}
public void init(){
player1 = new Player(200, 150);
tiles.add(player1.getTile());
tiles = new ArrayList<Tile>();
Fond fond = new Fond("res/textures/fond.png");
fond.getTransform().translate(Main.WIDTH/2, Main.HEIGHT/2, 0);
fond.getTransform().scale(Main.WIDTH,Main.HEIGHT, 0);
tiles.add(fond);
TestTile test = new TestTile();
test.getTransform().translate(0, 80, 0);
test.getTransform().scale(10, 10, 0);
tiles.add(test);
player1 = new Player(100, 0);
tiles.add(player1.getTile());
generateEntity(3);
}
public void update(){
float xDep = 0, yDep = 0;
if(Input.isKey(GLFW.GLFW_KEY_W)){
yDep = 10;
}
if(Input.isKey(GLFW.GLFW_KEY_S)){
yDep = -10;
}
if(Input.isKey(GLFW.GLFW_KEY_A)){
xDep = -10;
}
if(Input.isKey(GLFW.GLFW_KEY_D)){
xDep = 10;
}
if(xDep != 0.0 && yDep != 0.0){
xDep *= Math.cos(Math.PI / 4);
yDep *= Math.cos(Math.PI / 4);
}
player1.move(xDep, yDep);
if(Input.isKey(GLFW.GLFW_KEY_SPACE)){
player1.rotate(-5);
}
if(Input.isKey(GLFW.GLFW_KEY_LEFT_ALT)){
player1.rotate(5);
}
System.out.println(player1);
}
public void render(){
for(int i = tiles.size() - 1;i >= 0 ;i--)
tiles.get(i).render();
}
public void destroy(){
tiles.clear();
}
public void generateEntity(int nb){
final int MIN_HAUTEUR_MAX=150;
final int MIN_HAUTEUR=80;
int hauteurMax = (int) (MIN_HAUTEUR_MAX +Math.random()* Main.HEIGHT-80);
int nbMin = 0;
int nbMax = 0;
ArrayList<Tile> list = new ArrayList<>();
if(hauteurMax<MIN_HAUTEUR_MAX){
nbMin=nb-2;
nbMax=0;
}
if(hauteurMax>MIN_HAUTEUR_MAX && hauteurMax<Main.HEIGHT/2){
nbMin=nb-2;
nbMax=nb+2;
}
if(hauteurMax>Main.HEIGHT/2){
nbMin=0;
nbMax=nb+2;
}
int countJ1=(int)(nbMin + Math.random()*nbMax);
int countJ2=(int)(nbMin + Math.random()*nbMax);
for(int i =0;i<countJ1;i++){
list.add(new Objet((int)(Math.random()* Main.WIDTH/2),(int) (MIN_HAUTEUR+Math.random()* hauteurMax)));
}
for(int i =0;i<countJ2;i++){
list.add(new Objet((int)(Main.WIDTH/2+Math.random()* Main.WIDTH),(int) (MIN_HAUTEUR +Math.random()* hauteurMax)));
}
for(Tile t : list){
tiles.add(t);
}
}
}