This commit is contained in:
rnentjes
2014-01-17 19:16:13 +01:00
parent 11ceadd67f
commit c422345783
2 changed files with 175 additions and 89 deletions

260
.idea/workspace.xml generated
View File

@@ -2,9 +2,7 @@
<project version="4"> <project version="4">
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="0193c0b3-1608-4943-8e86-0ee275fde56d" name="Default" comment=""> <list default="true" id="0193c0b3-1608-4943-8e86-0ee275fde56d" name="Default" comment="">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/data/fireworks.png" afterPath="$PROJECT_DIR$/data/fireworks.png" /> <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/TestJogl.java" afterPath="$PROJECT_DIR$/src/com/persesgames/jogl/TestJogl.java" />
<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" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
</list> </list>
<ignored path="jogl-compute-shaders-fireworks.iws" /> <ignored path="jogl-compute-shaders-fireworks.iws" />
@@ -69,28 +67,10 @@
</component> </component>
<component name="FileEditorManager"> <component name="FileEditorManager">
<leaf> <leaf>
<file leaf-file-name="TestJogl.java" pinned="false" current="false" current-in-tab="false"> <file leaf-file-name="Renderer.java" pinned="false" current="true" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/com/persesgames/jogl/TestJogl.java">
<provider selected="true" editor-type-id="text-editor">
<state line="25" column="0" selection-start="518" selection-end="518" vertical-scroll-proportion="0.0" vertical-offset="450" max-vertical-offset="1008">
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="README.md" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/README.md">
<provider selected="true" editor-type-id="text-editor">
<state line="15" column="0" selection-start="372" selection-end="372" vertical-scroll-proportion="0.0" vertical-offset="270" max-vertical-offset="378">
<folding />
</state>
</provider>
</entry>
</file>
<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"> <entry file="file://$PROJECT_DIR$/src/com/persesgames/jogl/Renderer.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state line="161" column="36" selection-start="4846" selection-end="4846" vertical-scroll-proportion="0.0" vertical-offset="2898" max-vertical-offset="3618"> <state line="130" column="0" selection-start="3952" selection-end="3952" vertical-scroll-proportion="0.8658147" vertical-offset="1654" max-vertical-offset="3546">
<folding /> <folding />
</state> </state>
</provider> </provider>
@@ -105,10 +85,28 @@
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="explosionCleanUp.comp" pinned="false" current="true" current-in-tab="true"> <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"> <entry file="file://$PROJECT_DIR$/src/com/persesgames/jogl/explosion/explosionCleanUp.comp">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state line="21" column="58" selection-start="506" selection-end="506" vertical-scroll-proportion="0.39457202" vertical-offset="0" max-vertical-offset="958"> <state line="30" column="0" selection-start="0" selection-end="664" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="648">
<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="19" column="0" selection-start="0" selection-end="420" 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="0" selection-end="485" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="504">
<folding /> <folding />
</state> </state>
</provider> </provider>
@@ -117,12 +115,23 @@
<file leaf-file-name="explosion.comp" pinned="false" current="false" current-in-tab="false"> <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"> <entry file="file://$PROJECT_DIR$/src/com/persesgames/jogl/explosion/explosion.comp">
<provider selected="true" editor-type-id="text-editor"> <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"> <state line="38" column="0" selection-start="893" selection-end="893" vertical-scroll-proportion="0.0" vertical-offset="108" max-vertical-offset="792">
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="ExplosionComputeHandler.java" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/com/persesgames/jogl/explosion/ExplosionComputeHandler.java">
<provider selected="true" editor-type-id="text-editor">
<state line="32" column="41" selection-start="0" selection-end="7011" vertical-scroll-proportion="0.0" vertical-offset="108" max-vertical-offset="3708">
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="ComputeProgram.java" pinned="false" current="false" current-in-tab="false"> <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"> <entry file="file://$PROJECT_DIR$/src/com/persesgames/jogl/shader/ComputeProgram.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
@@ -168,11 +177,11 @@
<option value="$PROJECT_DIR$/src/com/persesgames/jogl/shader/ComputeProgram.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/ShaderProgram.java" />
<option value="$PROJECT_DIR$/src/com/persesgames/jogl/shader/Program.java" /> <option value="$PROJECT_DIR$/src/com/persesgames/jogl/shader/Program.java" />
<option value="$PROJECT_DIR$/src/com/persesgames/jogl/TestJogl.java" />
<option value="$PROJECT_DIR$/src/com/persesgames/jogl/explosion/explosionCleanUp.comp" />
<option value="$PROJECT_DIR$/src/com/persesgames/jogl/explosion/explosion.comp" /> <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/Renderer.java" />
<option value="$PROJECT_DIR$/src/com/persesgames/jogl/explosion/ExplosionComputeHandler.java" /> <option value="$PROJECT_DIR$/src/com/persesgames/jogl/explosion/ExplosionComputeHandler.java" />
<option value="$PROJECT_DIR$/src/com/persesgames/jogl/TestJogl.java" />
<option value="$PROJECT_DIR$/src/com/persesgames/jogl/explosion/explosionCleanUp.comp" />
</list> </list>
</option> </option>
</component> </component>
@@ -207,8 +216,6 @@
<sortByType /> <sortByType />
</navigator> </navigator>
<panes> <panes>
<pane id="PackagesPane" />
<pane id="Scope" />
<pane id="ProjectPane"> <pane id="ProjectPane">
<subPane> <subPane>
<PATH> <PATH>
@@ -319,6 +326,8 @@
</PATH> </PATH>
</subPane> </subPane>
</pane> </pane>
<pane id="PackagesPane" />
<pane id="Scope" />
</panes> </panes>
</component> </component>
<component name="PropertiesComponent"> <component name="PropertiesComponent">
@@ -328,7 +337,7 @@
<property name="MemberChooser.sorted" value="false" /> <property name="MemberChooser.sorted" value="false" />
<property name="MemberChooser.showClasses" value="true" /> <property name="MemberChooser.showClasses" value="true" />
<property name="MemberChooser.copyJavadoc" value="false" /> <property name="MemberChooser.copyJavadoc" value="false" />
<property name="last_opened_file_path" value="$PROJECT_DIR$" /> <property name="last_opened_file_path" value="$PROJECT_DIR$/../jogl-compute-shaders" />
<property name="project.structure.last.edited" value="Modules" /> <property name="project.structure.last.edited" value="Modules" />
<property name="project.structure.proportion" value="0.15" /> <property name="project.structure.proportion" value="0.15" />
<property name="project.structure.side.proportion" value="0.2" /> <property name="project.structure.side.proportion" value="0.2" />
@@ -354,6 +363,7 @@
<property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder2" value="2" /> <property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder2" value="2" />
<property name="FileHistory.git4idea.history.GitHistoryProvider_treeWidth3" value="1039" /> <property name="FileHistory.git4idea.history.GitHistoryProvider_treeWidth3" value="1039" />
<property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder3" value="3" /> <property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder3" value="3" />
<property name="FullScreen" value="false" />
</component> </component>
<component name="PsiViewer.ProjectComponent"> <component name="PsiViewer.ProjectComponent">
<option name="HIGHLIGHT" value="false" /> <option name="HIGHLIGHT" value="false" />
@@ -405,10 +415,12 @@
<ConfigurationWrapper RunnerId="Run" /> <ConfigurationWrapper RunnerId="Run" />
<method /> <method />
</configuration> </configuration>
<configuration default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin" singleton="true"> <configuration default="true" type="DartUnitRunConfigurationType" factoryName="DartUnit">
<module name="" /> <option name="VMOptions" />
<option name="VM_PARAMETERS" value="-Xmx512m -Xms256m -XX:MaxPermSize=250m -ea" /> <option name="arguments" />
<option name="PROGRAM_PARAMETERS" /> <option name="filePath" />
<option name="scope" value="ALL" />
<option name="testName" />
<method /> <method />
</configuration> </configuration>
<configuration default="true" type="DartCommandLineRunConfigurationType" factoryName="Dart Command Line Application"> <configuration default="true" type="DartCommandLineRunConfigurationType" factoryName="Dart Command Line Application">
@@ -421,12 +433,10 @@
<option name="showConsoleOnStdOut" value="false" /> <option name="showConsoleOnStdOut" value="false" />
<method /> <method />
</configuration> </configuration>
<configuration default="true" type="DartUnitRunConfigurationType" factoryName="DartUnit"> <configuration default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin" singleton="true">
<option name="VMOptions" /> <module name="" />
<option name="arguments" /> <option name="VM_PARAMETERS" value="-Xmx512m -Xms256m -XX:MaxPermSize=250m -ea" />
<option name="filePath" /> <option name="PROGRAM_PARAMETERS" />
<option name="scope" value="ALL" />
<option name="testName" />
<method /> <method />
</configuration> </configuration>
<configuration default="true" type="Remote" factoryName="Remote"> <configuration default="true" type="Remote" factoryName="Remote">
@@ -534,7 +544,8 @@
<workItem from="1389957751293" duration="57000" /> <workItem from="1389957751293" duration="57000" />
<workItem from="1389957808723" duration="3152000" /> <workItem from="1389957808723" duration="3152000" />
<workItem from="1389960966918" duration="149000" /> <workItem from="1389960966918" duration="149000" />
<workItem from="1389961142491" duration="2000" /> <workItem from="1389961142491" duration="311000" />
<workItem from="1389961462865" duration="4767000" />
</task> </task>
<task id="LOCAL-00001" summary="Initial commit"> <task id="LOCAL-00001" summary="Initial commit">
<created>1389958488400</created> <created>1389958488400</created>
@@ -556,15 +567,19 @@
<created>1389960995030</created> <created>1389960995030</created>
<updated>1389960995030</updated> <updated>1389960995030</updated>
</task> </task>
<option name="localTasksCounter" value="6" /> <task id="LOCAL-00006" summary="Cleanup&#10;">
<created>1389961147844</created>
<updated>1389961147844</updated>
</task>
<option name="localTasksCounter" value="7" />
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="3360000" /> <option name="totallyTimeSpent" value="8436000" />
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="437" y="0" width="1483" height="1152" extended-state="0" /> <frame x="437" y="0" width="1483" height="1152" extended-state="0" />
<editor active="false" /> <editor active="true" />
<layout> <layout>
<window_info id="Palette&#9;" 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="Palette&#9;" 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="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32964823" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32964823" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
@@ -578,20 +593,20 @@
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" /> <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
<window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" /> <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32964823" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32964823" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33065328" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" /> <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
<window_info id="Structure" active="false" anchor="left" 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="Structure" active="false" anchor="left" 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="Maven Projects" 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="Maven Projects" 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="Application Servers" 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="Application Servers" 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="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.2543433" 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" weight="0.2543433" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3286432" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.3283582" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<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="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="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="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.32964823" sideWeight="0.5" order="1" 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="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33065328" sideWeight="0.5" order="8" 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="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="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" />
<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="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" />
</layout> </layout>
</component> </component>
<component name="Vcs.Log.UiProperties"> <component name="Vcs.Log.UiProperties">
@@ -619,6 +634,69 @@
<option name="FILTER_TARGETS" value="false" /> <option name="FILTER_TARGETS" value="false" />
</component> </component>
<component name="editorHistoryManager"> <component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/src/com/persesgames/jogl/TestJogl.java">
<provider selected="true" editor-type-id="text-editor">
<state line="25" column="0" selection-start="518" selection-end="518" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1008">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/README.md">
<provider selected="true" editor-type-id="text-editor">
<state line="15" column="0" selection-start="372" selection-end="372" vertical-scroll-proportion="0.0" vertical-offset="270" max-vertical-offset="378">
<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="161" column="36" selection-start="4846" selection-end="4846" vertical-scroll-proportion="0.0" vertical-offset="2898" max-vertical-offset="3618">
<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="486" max-vertical-offset="1242">
<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="30" column="0" selection-start="664" selection-end="664" vertical-scroll-proportion="0.0" vertical-offset="540" max-vertical-offset="648">
<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/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="432" max-vertical-offset="1026">
<folding />
</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="522" max-vertical-offset="2034">
<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="162" max-vertical-offset="846">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/com/persesgames/jogl/TestJogl.java"> <entry file="file://$PROJECT_DIR$/src/com/persesgames/jogl/TestJogl.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state line="25" column="0" selection-start="518" selection-end="518" vertical-scroll-proportion="0.0" vertical-offset="450" max-vertical-offset="1008"> <state line="25" column="0" selection-start="518" selection-end="518" vertical-scroll-proportion="0.0" vertical-offset="450" max-vertical-offset="1008">
@@ -775,16 +853,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<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="640" />
</provider>
</entry>
<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" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/com/persesgames/jogl/shader/Program.java"> <entry file="file://$PROJECT_DIR$/src/com/persesgames/jogl/shader/Program.java">
<provider selected="true" editor-type-id="text-editor"> <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"> <state line="29" column="0" selection-start="1235" selection-end="1235" vertical-scroll-proportion="0.0" vertical-offset="1038" max-vertical-offset="1926">
@@ -813,36 +881,6 @@
</state> </state>
</provider> </provider>
</entry> </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="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/ExplosionComputeHandler.java">
<provider selected="true" editor-type-id="text-editor">
<state line="30" column="40" selection-start="921" selection-end="921" vertical-scroll-proportion="0.0" vertical-offset="540" max-vertical-offset="3708">
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/README.md">
<provider selected="true" editor-type-id="text-editor">
<state line="15" column="0" selection-start="372" selection-end="372" vertical-scroll-proportion="0.0" vertical-offset="270" max-vertical-offset="378">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/data/fireworks.png"> <entry file="file://$PROJECT_DIR$/data/fireworks.png">
<provider selected="true" editor-type-id="images"> <provider selected="true" editor-type-id="images">
<state /> <state />
@@ -855,9 +893,53 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/README.md">
<provider selected="true" editor-type-id="text-editor">
<state line="15" column="0" selection-start="372" selection-end="372" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="378">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/com/persesgames/jogl/explosion/explosionCleanUp.comp"> <entry file="file://$PROJECT_DIR$/src/com/persesgames/jogl/explosion/explosionCleanUp.comp">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state line="21" column="58" selection-start="506" selection-end="506" vertical-scroll-proportion="0.39457202" vertical-offset="0" max-vertical-offset="958"> <state line="30" column="0" selection-start="0" selection-end="664" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="648">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/com/persesgames/jogl/explosion/explShader.frag">
<provider selected="true" editor-type-id="text-editor">
<state line="19" column="0" selection-start="0" selection-end="420" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="450">
<folding />
</state>
</provider>
</entry>
<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="0" selection-end="485" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="504">
<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="38" column="0" selection-start="893" selection-end="893" 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/explosion/ExplosionComputeHandler.java">
<provider selected="true" editor-type-id="text-editor">
<state line="32" column="41" selection-start="0" selection-end="7011" vertical-scroll-proportion="0.0" vertical-offset="108" max-vertical-offset="3708">
<folding>
<element signature="imports" expanded="true" />
</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="130" column="0" selection-start="3952" selection-end="3952" vertical-scroll-proportion="0.8658147" vertical-offset="1654" max-vertical-offset="3546">
<folding /> <folding />
</state> </state>
</provider> </provider>

View File

@@ -122,6 +122,10 @@ public class Renderer implements GLEventListener {
delta = (nanoDelta / 1000000000f); delta = (nanoDelta / 1000000000f);
if (keyboard.isPressed(KeyEvent.VK_CONTROL)) {
delta = delta / 10f;
}
lastDelta = System.nanoTime(); lastDelta = System.nanoTime();
} }