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

Add fonction to Tile

Browse source
This commit is contained in:
MrDev023 2017-01-20 19:38:35 +01:00
parent af14bf15a5
commit e3e472f30b
4 changed files with 216 additions and 109 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

277
.idea/workspace.xml
View file

@ -2,10 +2,10 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="00f293cb-c755-478c-9b6f-422f827454e0" name="Default" comment="">
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/libs/lwjgl.jar" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.gitignore" afterPath="$PROJECT_DIR$/.gitignore" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/modules.xml" afterPath="$PROJECT_DIR$/.idea/modules.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/globalgamejam/math/Matrix4f.java" afterPath="$PROJECT_DIR$/src/globalgamejam/math/Matrix4f.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/globalgamejam/math/Vector3f.java" afterPath="$PROJECT_DIR$/src/globalgamejam/math/Vector3f.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/globalgamejam/tiles/Tile.java" afterPath="$PROJECT_DIR$/src/globalgamejam/tiles/Tile.java" />
</list>
<ignored path="$PROJECT_DIR$/out/" />
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@ -21,87 +21,43 @@
<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="true">
<entry file="file://$PROJECT_DIR$/src/globalgamejam/Main.java">
<file leaf-file-name="Tile.java" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/globalgamejam/tiles/Tile.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="510">
<caret line="30" column="0" lean-forward="false" selection-start-line="30" selection-start-column="0" selection-end-line="30" selection-end-column="0" />
<state relative-caret-position="1360">
<caret line="80" column="26" lean-forward="false" selection-start-line="80" selection-start-column="26" selection-end-line="80" selection-end-column="26" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#1383#1582#0" expanded="true" />
<element signature="e#1581#1582#0" expanded="true" />
<element signature="e#3194#3195#0" expanded="true" />
<element signature="e#3225#3226#0" expanded="true" />
<element signature="e#3259#3260#0" expanded="true" />
<element signature="e#3287#3288#0" expanded="true" />
<element signature="e#3321#3322#0" expanded="true" />
<element signature="e#3352#3353#0" expanded="true" />
<element signature="e#3402#3403#0" expanded="true" />
<element signature="e#3442#3443#0" expanded="true" />
<element signature="e#3486#3487#0" expanded="true" />
<element signature="e#3520#3521#0" expanded="true" />
<element signature="e#3567#3568#0" expanded="true" />
<element signature="e#3607#3608#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name=".gitignore" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/.gitignore">
<file leaf-file-name="Vector3f.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/globalgamejam/math/Vector3f.java">
<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>
</file>
<file leaf-file-name="Shaders.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/globalgamejam/render/Shaders.java">
<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" />
<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="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" />
<element signature="e#465#466#0" expanded="true" />
<element signature="e#495#496#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="main.frag" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/res/shaders/main.frag">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="153">
<caret line="9" column="86" lean-forward="false" selection-start-line="9" selection-start-column="86" selection-end-line="9" selection-end-column="86" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="FrameBufferObject.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/globalgamejam/render/FrameBufferObject.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="646">
<caret line="49" column="39" lean-forward="false" selection-start-line="49" selection-start-column="39" selection-end-line="49" selection-end-column="39" />
<folding>
<element signature="e#3154#3155#0" expanded="false" />
<element signature="e#3206#3207#0" expanded="false" />
</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="578">
<caret line="38" column="24" lean-forward="false" selection-start-line="38" selection-start-column="24" selection-end-line="38" selection-end-column="24" />
<folding />
</state>
</provider>
</entry>
</file>
</leaf>
</component>
<component name="FileTemplateManagerImpl">
@ -138,7 +94,6 @@
<option value="$PROJECT_DIR$/src/globalgamejam/math/Mathf.java" />
<option value="$PROJECT_DIR$/src/globalgamejam/math/Quaternion.java" />
<option value="$PROJECT_DIR$/src/globalgamejam/math/Vector2f.java" />
<option value="$PROJECT_DIR$/src/globalgamejam/math/Vector3f.java" />
<option value="$PROJECT_DIR$/src/globalgamejam/math/Vector4f.java" />
<option value="$PROJECT_DIR$/src/globalgamejam/render/Texture.java" />
<option value="$PROJECT_DIR$/src/globalgamejam/render/Tile.java" />
@ -146,8 +101,6 @@
<option value="$PROJECT_DIR$/src/globalgamejam/tiles/TestTile.java" />
<option value="$PROJECT_DIR$/res/shaders/main.vert" />
<option value="$PROJECT_DIR$/src/globalgamejam/render/DisplayManager.java" />
<option value="$PROJECT_DIR$/src/globalgamejam/math/Matrix4f.java" />
<option value="$PROJECT_DIR$/src/globalgamejam/tiles/Tile.java" />
<option value="$PROJECT_DIR$/src/globalgamejam/render/Camera.java" />
<option value="$PROJECT_DIR$/src/globalgamejam/game/Game.java" />
<option value="$PROJECT_DIR$/src/globalgamejam/tiles/FBOTile.java" />
@ -159,6 +112,9 @@
<option value="$PROJECT_DIR$/src/globalgamejam/Main.java" />
<option value="$PROJECT_DIR$/res/shaders/main.frag" />
<option value="$PROJECT_DIR$/.gitignore" />
<option value="$PROJECT_DIR$/src/globalgamejam/math/Vector3f.java" />
<option value="$PROJECT_DIR$/src/globalgamejam/math/Matrix4f.java" />
<option value="$PROJECT_DIR$/src/globalgamejam/tiles/Tile.java" />
</list>
</option>
</component>
@ -213,6 +169,50 @@
<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="tiles" />
<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>
</subPane>
</pane>
<pane id="PackagesPane" />
@ -450,7 +450,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" />
@ -467,7 +467,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="8" 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" />
@ -513,6 +513,21 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="204">
<caret line="17" column="31" lean-forward="true" selection-start-line="17" selection-start-column="31" selection-end-line="17" selection-end-column="31" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#3194#3195#0" expanded="true" />
<element signature="e#3225#3226#0" expanded="true" />
<element signature="e#3259#3260#0" expanded="true" />
<element signature="e#3287#3288#0" expanded="true" />
<element signature="e#3321#3322#0" expanded="true" />
<element signature="e#3352#3353#0" expanded="true" />
<element signature="e#3402#3403#0" expanded="true" />
<element signature="e#3442#3443#0" expanded="true" />
<element signature="e#3486#3487#0" expanded="true" />
<element signature="e#3520#3521#0" expanded="true" />
<element signature="e#3567#3568#0" expanded="true" />
<element signature="e#3607#3608#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
@ -520,6 +535,9 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="102">
<caret line="8" column="3" lean-forward="false" selection-start-line="8" selection-start-column="3" selection-end-line="8" selection-end-column="3" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
@ -600,6 +618,21 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1037">
<caret line="66" column="5" lean-forward="true" selection-start-line="66" selection-start-column="5" selection-end-line="66" selection-end-column="5" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#3194#3195#0" expanded="true" />
<element signature="e#3225#3226#0" expanded="true" />
<element signature="e#3259#3260#0" expanded="true" />
<element signature="e#3287#3288#0" expanded="true" />
<element signature="e#3321#3322#0" expanded="true" />
<element signature="e#3352#3353#0" expanded="true" />
<element signature="e#3402#3403#0" expanded="true" />
<element signature="e#3442#3443#0" expanded="true" />
<element signature="e#3486#3487#0" expanded="true" />
<element signature="e#3520#3521#0" expanded="true" />
<element signature="e#3567#3568#0" expanded="true" />
<element signature="e#3607#3608#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
@ -655,6 +688,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>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
@ -667,6 +703,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>
@ -688,13 +725,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" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/globalgamejam/math/Vector3f.java">
<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>
@ -713,16 +744,6 @@
</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="-4188">
<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>
<entry file="file://$PROJECT_DIR$/src/globalgamejam/input/Input.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-1981">
@ -739,13 +760,7 @@
<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" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/globalgamejam/math/Matrix4f.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-391">
<caret line="84" column="25" lean-forward="false" selection-start-line="84" selection-start-column="25" selection-end-line="84" selection-end-column="25" />
<folding />
</state>
</provider>
</entry>
@ -761,6 +776,9 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="238">
<caret line="14" column="5" lean-forward="true" selection-start-line="14" selection-start-column="5" selection-end-line="14" selection-end-column="5" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
@ -774,18 +792,14 @@
</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="121">
<caret line="53" column="8" lean-forward="false" selection-start-line="53" selection-start-column="8" selection-end-line="66" selection-end-column="38" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/globalgamejam/tiles/FBOTile.java" />
<entry file="file://$PROJECT_DIR$/src/globalgamejam/render/Texture.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="359">
<caret line="84" column="41" lean-forward="false" selection-start-line="84" selection-start-column="8" selection-end-line="84" selection-end-column="41" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
@ -869,8 +883,8 @@
</entry>
<entry file="file://$PROJECT_DIR$/src/globalgamejam/Main.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="510">
<caret line="30" column="0" lean-forward="false" selection-start-line="30" selection-start-column="0" selection-end-line="30" selection-end-column="0" />
<state relative-caret-position="119">
<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" />
<element signature="e#1383#1582#0" expanded="true" />
@ -879,6 +893,55 @@
</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>
<entry file="file://$PROJECT_DIR$/src/globalgamejam/math/Matrix4f.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="189">
<caret line="84" column="30" lean-forward="false" selection-start-line="84" selection-start-column="30" selection-end-line="84" selection-end-column="53" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/globalgamejam/math/Vector3f.java">
<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>
<entry file="file://$PROJECT_DIR$/src/globalgamejam/tiles/Tile.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1360">
<caret line="80" column="26" lean-forward="false" selection-start-line="80" selection-start-column="26" selection-end-line="80" selection-end-column="26" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#3194#3195#0" expanded="true" />
<element signature="e#3225#3226#0" expanded="true" />
<element signature="e#3259#3260#0" expanded="true" />
<element signature="e#3287#3288#0" expanded="true" />
<element signature="e#3321#3322#0" expanded="true" />
<element signature="e#3352#3353#0" expanded="true" />
<element signature="e#3402#3403#0" expanded="true" />
<element signature="e#3442#3443#0" expanded="true" />
<element signature="e#3486#3487#0" expanded="true" />
<element signature="e#3520#3521#0" expanded="true" />
<element signature="e#3567#3568#0" expanded="true" />
<element signature="e#3607#3608#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</component>
<component name="masterDetails">
<states>

2
src/globalgamejam/math/Matrix4f.java
View file

@ -81,6 +81,8 @@ public class Matrix4f {
});
return mat;
}
public Matrix4f translate(float x,float y,float z){
public Matrix4f translate(float x,float y,float z){
Matrix4f mat = new Matrix4f(new float[][]{

3
src/globalgamejam/math/Vector3f.java
View file

@ -25,6 +25,9 @@ public class Vector3f {
public Vector3f(Vector2f vec,float z){
this(vec.x,vec.y,z);
}
public Vector3f(Vector2f vec){
this(vec.x,vec.y,0);
}
public Vector3f(Vector3f vec){
this(vec.x,vec.y,vec.z);

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

@ -1,7 +1,6 @@
package globalgamejam.tiles;
import globalgamejam.math.Color4f;
import globalgamejam.math.Matrix4f;
import globalgamejam.math.*;
import globalgamejam.render.Camera;
import globalgamejam.render.DisplayManager;
import globalgamejam.render.Shaders;
@ -19,12 +18,18 @@ public abstract class Tile {
private int vbo;
private Texture texture;
private Color4f color;
private Vector2f position;
private Vector2f scale;
private float rotation;
private Matrix4f transform;
private int size;
public Tile(){
this.texture = Texture.loadTexture("res/textures/default.png");
this.transform = new Matrix4f();
this.position = new Vector2f();
this.scale = new Vector2f();
this.rotation = 0;
this.color = Color4f.WHITE;
this.vbo = GL15.glGenBuffers();
float[] a = new float[]{
@ -71,6 +76,9 @@ public abstract class Tile {
GL15.glDeleteBuffers(vbo);
texture.destroy();
transform = null;
this.position = null;
this.rotation = 0;
this.scale = null;
}
public Texture getTexture() {
@ -96,4 +104,35 @@ public abstract class Tile {
public Matrix4f getTransform() {
return transform;
}
public Vector2f getPosition() {
return position;
}
public Vector2f getScale() {
return scale;
}
public float getRotation() {
return rotation;
}
public void setPosition(Vector2f position) {
this.position = position;
}
public void setScale(Vector2f scale) {
this.scale = scale;
}
public void setRotation(float rotation) {
this.rotation = rotation;
}
public void applyTransform(){
this.transform.loadIdentity();
this.transform.translate(this.position.x,this.position.y,0);
this.transform.rotate(new Quaternion(new Vector3f(0,0,1),this.rotation));
this.transform.scale(this.scale.x,this.scale.y,1);
}
}