This commit is contained in:
rnentjes
2014-01-17 13:11:50 +01:00
parent c44c578636
commit 831448b8f5
8 changed files with 327 additions and 226 deletions

230
.idea/workspace.xml generated
View File

@@ -2,7 +2,13 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="0193c0b3-1608-4943-8e86-0ee275fde56d" name="Default" comment="">
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/com/persesgames/jogl/shader/Program.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/com/persesgames/jogl/shader/ComputeProgram.java" afterPath="$PROJECT_DIR$/src/com/persesgames/jogl/shader/ComputeProgram.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/com/persesgames/jogl/explosion/ExplosionComputeHandler.java" afterPath="$PROJECT_DIR$/src/com/persesgames/jogl/explosion/ExplosionComputeHandler.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/com/persesgames/jogl/Renderer.java" afterPath="$PROJECT_DIR$/src/com/persesgames/jogl/Renderer.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/com/persesgames/jogl/shader/ShaderProgram.java" afterPath="$PROJECT_DIR$/src/com/persesgames/jogl/shader/ShaderProgram.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/com/persesgames/jogl/explosion/explosion.comp" afterPath="$PROJECT_DIR$/src/com/persesgames/jogl/explosion/explosion.comp" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/com/persesgames/jogl/explosion/explosionCleanUp.comp" afterPath="$PROJECT_DIR$/src/com/persesgames/jogl/explosion/explosionCleanUp.comp" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
</list>
<ignored path="jogl-compute-shaders-fireworks.iws" />
@@ -67,39 +73,14 @@
</component>
<component name="FileEditorManager">
<leaf>
<file leaf-file-name="Util.java" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/com/persesgames/jogl/Util.java">
<provider selected="true" editor-type-id="text-editor">
<state line="27" column="0" selection-start="694" selection-end="694" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="558">
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="explShader.frag" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/com/persesgames/jogl/explosion/explShader.frag">
<provider selected="true" editor-type-id="text-editor">
<state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="450">
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="explShader.vert" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/com/persesgames/jogl/explosion/explShader.vert">
<provider selected="true" editor-type-id="text-editor">
<state line="22" column="0" selection-start="485" selection-end="485" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="504">
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="ExplosionComputeHandler.java" pinned="false" current="true" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/com/persesgames/jogl/explosion/ExplosionComputeHandler.java">
<provider selected="true" editor-type-id="text-editor">
<state line="127" column="16" selection-start="4643" selection-end="4643" vertical-scroll-proportion="-0.802589" vertical-offset="2782" max-vertical-offset="3726">
<state line="24" column="60" selection-start="751" selection-end="751" vertical-scroll-proportion="0.7309645" vertical-offset="0" max-vertical-offset="3744">
<folding>
<element signature="imports" expanded="true" />
<element signature="e#6831#6832#0" expanded="true" />
<element signature="e#6867#6868#0" expanded="true" />
</folding>
</state>
</provider>
@@ -126,16 +107,61 @@
<file leaf-file-name="Renderer.java" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/com/persesgames/jogl/Renderer.java">
<provider selected="true" editor-type-id="text-editor">
<state line="160" column="35" selection-start="4797" selection-end="4797" vertical-scroll-proportion="0.0" vertical-offset="2574" max-vertical-offset="3474">
<state line="161" column="36" selection-start="4846" selection-end="4846" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="3474">
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="Timer.java" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/com/persesgames/jogl/Timer.java">
<file leaf-file-name="ShaderProgram.java" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/com/persesgames/jogl/shader/ShaderProgram.java">
<provider selected="true" editor-type-id="text-editor">
<state line="13" column="13" selection-start="230" selection-end="230" vertical-scroll-proportion="0.0" vertical-offset="1299" max-vertical-offset="1926">
<state line="27" column="0" selection-start="1200" selection-end="1200" vertical-scroll-proportion="0.0" vertical-offset="282" max-vertical-offset="1170">
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="explosionCleanUp.comp" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/com/persesgames/jogl/explosion/explosionCleanUp.comp">
<provider selected="true" editor-type-id="text-editor">
<state line="3" column="37" selection-start="75" selection-end="75" vertical-scroll-proportion="-2.0" vertical-offset="0" max-vertical-offset="648">
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="explosion.comp" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/com/persesgames/jogl/explosion/explosion.comp">
<provider selected="true" editor-type-id="text-editor">
<state line="28" column="0" selection-start="633" selection-end="633" vertical-scroll-proportion="0.0" vertical-offset="108" max-vertical-offset="792">
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="ComputeProgram.java" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/com/persesgames/jogl/shader/ComputeProgram.java">
<provider selected="true" editor-type-id="text-editor">
<state line="24" column="0" selection-start="1103" selection-end="1103" vertical-scroll-proportion="0.0" vertical-offset="408" max-vertical-offset="1026">
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="Program.java" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/com/persesgames/jogl/shader/Program.java">
<provider selected="true" editor-type-id="text-editor">
<state line="29" column="0" selection-start="1235" selection-end="1235" vertical-scroll-proportion="0.0" vertical-offset="1038" max-vertical-offset="1926">
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="Keyboard.java" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/com/persesgames/jogl/Keyboard.java">
<provider selected="true" editor-type-id="text-editor">
<state line="9" column="13" selection-start="169" selection-end="169" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="828">
<folding />
</state>
</provider>
@@ -156,8 +182,13 @@
<list>
<option value="$PROJECT_DIR$/src/jogl/Util.java" />
<option value="$PROJECT_DIR$/src/com/persesgames/jogl/explosion/explShader.vert" />
<option value="$PROJECT_DIR$/src/com/persesgames/jogl/explosion/ExplosionComputeHandler.java" />
<option value="$PROJECT_DIR$/src/com/persesgames/jogl/shader/ComputeProgram.java" />
<option value="$PROJECT_DIR$/src/com/persesgames/jogl/shader/ShaderProgram.java" />
<option value="$PROJECT_DIR$/src/com/persesgames/jogl/shader/Program.java" />
<option value="$PROJECT_DIR$/src/com/persesgames/jogl/explosion/explosion.comp" />
<option value="$PROJECT_DIR$/src/com/persesgames/jogl/Renderer.java" />
<option value="$PROJECT_DIR$/src/com/persesgames/jogl/explosion/explosionCleanUp.comp" />
<option value="$PROJECT_DIR$/src/com/persesgames/jogl/explosion/ExplosionComputeHandler.java" />
</list>
</option>
</component>
@@ -229,6 +260,50 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="jogl-compute-shaders-fireworks" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="jogl-compute-shaders-fireworks" />
<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="jogl" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="shader" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="jogl-compute-shaders-fireworks" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="jogl-compute-shaders-fireworks" />
<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="jogl" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="explosion" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="jogl-compute-shaders-fireworks" />
@@ -258,7 +333,7 @@
<property name="MemberChooser.copyJavadoc" value="false" />
<property name="last_opened_file_path" value="$PROJECT_DIR$/lib" />
<property name="project.structure.last.edited" value="Modules" />
<property name="project.structure.proportion" value="0.0" />
<property name="project.structure.proportion" value="0.15" />
<property name="project.structure.side.proportion" value="0.2" />
<property name="recentsLimit" value="5" />
<property name="dynamic.classpath" value="false" />
@@ -266,6 +341,22 @@
<property name="options.splitter.main.proportions" value="0.3" />
<property name="options.splitter.details.proportions" value="0.2" />
<property name="options.searchVisible" value="true" />
<property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth0" value="114" />
<property name="FileHistory.git4idea.history.GitHistoryProvider_flatOrder0" value="0" />
<property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth1" value="124" />
<property name="FileHistory.git4idea.history.GitHistoryProvider_flatOrder1" value="1" />
<property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth2" value="130" />
<property name="FileHistory.git4idea.history.GitHistoryProvider_flatOrder2" value="2" />
<property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth3" value="1039" />
<property name="FileHistory.git4idea.history.GitHistoryProvider_flatOrder3" value="3" />
<property name="FileHistory.git4idea.history.GitHistoryProvider_treeWidth0" value="114" />
<property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder0" value="0" />
<property name="FileHistory.git4idea.history.GitHistoryProvider_treeWidth1" value="124" />
<property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder1" value="1" />
<property name="FileHistory.git4idea.history.GitHistoryProvider_treeWidth2" value="130" />
<property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder2" value="2" />
<property name="FileHistory.git4idea.history.GitHistoryProvider_treeWidth3" value="1039" />
<property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder3" value="3" />
</component>
<component name="PsiViewer.ProjectComponent">
<option name="HIGHLIGHT" value="false" />
@@ -276,6 +367,9 @@
<option name="AUTOSCROLL_FROM_SOURCE" value="false" />
</component>
<component name="RecentsManager">
<key name="CopyClassDialog.RECENTS_KEY">
<recent name="com.persesgames.jogl.shader" />
</key>
<key name="CopyFile.RECENT_KEYS">
<recent name="$PROJECT_DIR$/src" />
<recent name="$PROJECT_DIR$/lib" />
@@ -553,17 +647,25 @@
<created>1389957748775</created>
<updated>1389957748775</updated>
<workItem from="1389957751293" duration="57000" />
<workItem from="1389957808723" duration="1147000" />
<workItem from="1389957808723" duration="2892000" />
</task>
<task id="LOCAL-00001" summary="Initial commit">
<created>1389958488400</created>
<updated>1389958488401</updated>
</task>
<option name="localTasksCounter" value="2" />
<task id="LOCAL-00002" summary="Cleanup">
<created>1389958962131</created>
<updated>1389958962131</updated>
</task>
<task id="LOCAL-00003" summary="Cleanup&#10;">
<created>1389959134709</created>
<updated>1389959134709</updated>
</task>
<option name="localTasksCounter" value="4" />
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="1204000" />
<option name="totallyTimeSpent" value="2949000" />
</component>
<component name="ToolWindowManager">
<frame x="439" y="34" width="1481" height="1142" extended-state="0" />
@@ -574,6 +676,7 @@
<window_info id="Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32964823" 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" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
@@ -591,7 +694,6 @@
<window_info id="PsiViewer" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
<window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
@@ -610,7 +712,9 @@
<TodoPanelSettings />
</option>
<MESSAGE value="Initial commit" />
<option name="LAST_COMMIT_MESSAGE" value="Initial commit" />
<MESSAGE value="Cleanup" />
<MESSAGE value="Cleanup&#10;" />
<option name="LAST_COMMIT_MESSAGE" value="Cleanup&#10;" />
</component>
<component name="XDebuggerManager">
<breakpoint-manager />
@@ -669,18 +773,62 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/com/persesgames/jogl/shader/Program.java">
<provider selected="true" editor-type-id="text-editor">
<state line="29" column="0" selection-start="1235" selection-end="1235" vertical-scroll-proportion="0.0" vertical-offset="1038" max-vertical-offset="1926">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/com/persesgames/jogl/Keyboard.java">
<provider selected="true" editor-type-id="text-editor">
<state line="9" column="13" selection-start="169" selection-end="169" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="828">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/com/persesgames/jogl/shader/ComputeProgram.java">
<provider selected="true" editor-type-id="text-editor">
<state line="24" column="0" selection-start="1103" selection-end="1103" vertical-scroll-proportion="0.0" vertical-offset="156" max-vertical-offset="1026">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/com/persesgames/jogl/shader/ShaderProgram.java">
<provider selected="true" editor-type-id="text-editor">
<state line="27" column="0" selection-start="1200" selection-end="1200" vertical-scroll-proportion="0.0" vertical-offset="224" max-vertical-offset="1170">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/com/persesgames/jogl/explosion/explosion.comp">
<provider selected="true" editor-type-id="text-editor">
<state line="28" column="0" selection-start="633" selection-end="633" vertical-scroll-proportion="0.0" vertical-offset="108" max-vertical-offset="792">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/com/persesgames/jogl/Renderer.java">
<provider selected="true" editor-type-id="text-editor">
<state line="160" column="35" selection-start="4797" selection-end="4797" vertical-scroll-proportion="0.0" vertical-offset="2574" max-vertical-offset="3474">
<state line="161" column="36" selection-start="4846" selection-end="4846" vertical-scroll-proportion="0.0" vertical-offset="2494" max-vertical-offset="3474">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/com/persesgames/jogl/explosion/explosionCleanUp.comp">
<provider selected="true" editor-type-id="text-editor">
<state line="3" column="37" selection-start="75" selection-end="75" vertical-scroll-proportion="-2.0" vertical-offset="0" max-vertical-offset="648">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/com/persesgames/jogl/explosion/ExplosionComputeHandler.java">
<provider selected="true" editor-type-id="text-editor">
<state line="127" column="16" selection-start="4643" selection-end="4643" vertical-scroll-proportion="-0.802589" vertical-offset="2782" max-vertical-offset="3726">
<state line="24" column="60" selection-start="751" selection-end="751" vertical-scroll-proportion="0.7309645" vertical-offset="0" max-vertical-offset="3744">
<folding>
<element signature="imports" expanded="true" />
<element signature="e#6831#6832#0" expanded="true" />
<element signature="e#6867#6868#0" expanded="true" />
</folding>
</state>
</provider>