uzudil avatar uzudil committed 8e31440

Working on adding stairs in houses

Comments (0)

Files changed (8)

.idea/workspace.xml

     <bookmark url="file://$PROJECT_DIR$/src/org/scourge/terrain/TreeController.java" line="29" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="58e1e136-ea37-49ef-a1c7-215471723208" name="Default" comment="">
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/org/scourge/terrain/DoorController.java" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/org/scourge/terrain/InAndOutController.java" />
+    <list default="true" id="58e1e136-ea37-49ef-a1c7-215471723208" name="Default" comment="Working on adding stairs in houses">
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/data/3ds/h-stairs.3ds" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/org/scourge/ScourgeConstants.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/scourge2.jar" afterPath="$PROJECT_DIR$/scourge2.jar" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/org/scourge/Main.java" afterPath="$PROJECT_DIR$/src/org/scourge/Main.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/org/scourge/model/Creature.java" afterPath="$PROJECT_DIR$/src/org/scourge/model/Creature.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/org/scourge/terrain/House.java" afterPath="$PROJECT_DIR$/src/org/scourge/terrain/House.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/org/scourge/terrain/Region.java" afterPath="$PROJECT_DIR$/src/org/scourge/terrain/Region.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/org/scourge/terrain/ShowHideController.java" afterPath="$PROJECT_DIR$/src/org/scourge/terrain/ShowHideController.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/org/scourge/terrain/Model.java" afterPath="$PROJECT_DIR$/src/org/scourge/terrain/Model.java" />
     </list>
     <ignored path="scourge2.iws" />
     <ignored path=".idea/workspace.xml" />
   </component>
   <component name="FileEditorManager">
     <leaf>
-      <file leaf-file-name="ShowHideController.java" pinned="false" current="true" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/org/scourge/terrain/ShowHideController.java">
+      <file leaf-file-name="House.java" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/org/scourge/terrain/House.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="38" column="12" selection-start="1101" selection-end="1101" vertical-scroll-proportion="0.8042328">
-              <folding>
-                <element signature="imports" expanded="true" />
-              </folding>
+            <state line="404" column="30" selection-start="19041" selection-end="19041" vertical-scroll-proportion="0.0">
+              <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="DoorController.java" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/org/scourge/terrain/DoorController.java">
+      <file leaf-file-name="WinUtil.java" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/org/scourge/ui/component/WinUtil.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
-              <folding>
-                <element signature="imports" expanded="true" />
-              </folding>
+            <state line="95" column="24" selection-start="2978" selection-end="2978" vertical-scroll-proportion="0.0">
+              <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="House.java" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/org/scourge/terrain/House.java">
+      <file leaf-file-name="Model.java" pinned="false" current="true" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/org/scourge/terrain/Model.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="361" column="39" selection-start="17028" selection-end="17028" vertical-scroll-proportion="0.0">
-              <folding>
-                <element signature="imports" expanded="true" />
-              </folding>
+            <state line="583" column="4" selection-start="18195" selection-end="18195" vertical-scroll-proportion="0.3327674">
+              <folding />
             </state>
           </provider>
         </entry>
       <file leaf-file-name="Main.java" pinned="false" current="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/org/scourge/Main.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="505" column="0" selection-start="18104" selection-end="18104" vertical-scroll-proportion="0.0">
+            <state line="731" column="128" selection-start="25222" selection-end="25222" vertical-scroll-proportion="0.0">
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="InAndOutController.java" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/org/scourge/terrain/InAndOutController.java">
+      <file leaf-file-name="Creature.java" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/org/scourge/model/Creature.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="29" column="51" selection-start="718" selection-end="718" vertical-scroll-proportion="0.0">
-              <folding>
-                <element signature="imports" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="Region.java" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/org/scourge/terrain/Region.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state line="703" column="26" selection-start="34312" selection-end="34312" vertical-scroll-proportion="0.0">
+            <state line="74" column="88" selection-start="1813" selection-end="1813" vertical-scroll-proportion="0.0">
               <folding />
             </state>
           </provider>
   <component name="IdeDocumentHistory">
     <option name="changedFiles">
       <list>
-        <option value="$PROJECT_DIR$/src/org/scourge/GameState.java" />
-        <option value="$PROJECT_DIR$/src/org/scourge/terrain/MonsterGenerator.java" />
         <option value="$PROJECT_DIR$/src/org/scourge/model/Monster.java" />
         <option value="$PROJECT_DIR$/src/org/scourge/model/Door.java" />
         <option value="$PROJECT_DIR$/src/org/scourge/terrain/Terrain.java" />
         <option value="$PROJECT_DIR$/src/org/scourge/terrain/Tile.java" />
-        <option value="$PROJECT_DIR$/src/org/scourge/terrain/Model.java" />
         <option value="$PROJECT_DIR$/src/org/newdawn/ardor3d/loader/max/TDSFile.java" />
         <option value="$PROJECT_DIR$/src/org/scourge/terrain/CreatureModel.java" />
         <option value="$PROJECT_DIR$/src/org/newdawn/ardor3d/loader/max/MaterialBlock.java" />
         <option value="$PROJECT_DIR$/src/org/scourge/terrain/Region.java" />
-        <option value="$PROJECT_DIR$/src/org/scourge/terrain/House.java" />
         <option value="$PROJECT_DIR$/src/org/scourge/terrain/InAndOutController.java" />
         <option value="$PROJECT_DIR$/src/org/scourge/terrain/ShowHideController.java" />
         <option value="$PROJECT_DIR$/src/org/scourge/terrain/DoorController.java" />
+        <option value="$PROJECT_DIR$/src/org/scourge/terrain/Model.java" />
         <option value="$PROJECT_DIR$/src/org/scourge/Main.java" />
+        <option value="$PROJECT_DIR$/src/org/scourge/ScourgeConstants.java" />
+        <option value="$PROJECT_DIR$/src/org/scourge/model/Creature.java" />
+        <option value="$PROJECT_DIR$/src/org/scourge/terrain/House.java" />
       </list>
     </option>
   </component>
       <sortByType />
     </navigator>
     <panes>
+      <pane id="Scope" />
       <pane id="PackagesPane" />
+      <pane id="Favorites" />
       <pane id="ProjectPane">
         <subPane>
           <PATH>
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
+              <option name="myItemId" value="ui" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="scourge2" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="scourge2" />
+              <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="org" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="scourge" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="ui" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="component" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="scourge2" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="scourge2" />
+              <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="org" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="scourge" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
               <option name="myItemId" value="terrain" />
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
               <option name="myItemId" value="org" />
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="scourge" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="model" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="scourge2" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="scourge2" />
+              <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="org" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
           </PATH>
           <PATH>
             <PATH_ELEMENT>
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
           </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="scourge2" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="scourge2" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="data" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="scourge2" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="scourge2" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="data" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="3ds" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
         </subPane>
       </pane>
-      <pane id="Favorites" />
-      <pane id="Scope" />
     </panes>
   </component>
   <component name="PropertiesComponent">
     </key>
   </component>
   <component name="RunManager" selected="Application.Main">
-    <configuration default="true" type="PhpRunConfigurationType" factoryName="PHP">
-      <method>
-        <option name="AntTarget" enabled="false" />
-        <option name="BuildArtifacts" enabled="false" />
-        <option name="Maven.BeforeRunTask" enabled="false" />
-      </method>
-    </configuration>
     <configuration default="true" type="PHPUnitRunConfigurationType" factoryName="PHPUnit">
       <method>
         <option name="AntTarget" enabled="false" />
       <ConfigurationWrapper RunnerId="Run" />
       <method />
     </configuration>
-    <list size="1">
+    <configuration default="false" name="Editor" type="Application" factoryName="Application">
+      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea">
+        <pattern>
+          <option name="PATTERN" value="org.scourge.*" />
+          <option name="ENABLED" value="true" />
+        </pattern>
+      </extension>
+      <option name="MAIN_CLASS_NAME" value="org.scourge.editor.Editor" />
+      <option name="VM_PARAMETERS" value="-Djava.library.path=lib/lwjgl/native/macosx/ -Xms256m -Xmx512m -dsa -da" />
+      <option name="PROGRAM_PARAMETERS" value="--skip-menu" />
+      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
+      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+      <option name="ALTERNATIVE_JRE_PATH" value="" />
+      <option name="ENABLE_SWING_INSPECTOR" value="false" />
+      <option name="ENV_VARIABLES" />
+      <option name="PASS_PARENT_ENVS" value="true" />
+      <module name="Scourge2" />
+      <envs />
+      <RunnerSettings RunnerId="Run" />
+      <ConfigurationWrapper RunnerId="Run" />
+      <method />
+    </configuration>
+    <list size="2">
       <item index="0" class="java.lang.String" itemvalue="Application.Main" />
+      <item index="1" class="java.lang.String" itemvalue="Application.Editor" />
     </list>
     <configuration name="&lt;template&gt;" type="WebApp" default="true" selected="false">
       <Host>localhost</Host>
     <servers />
   </component>
   <component name="ToolWindowManager">
-    <frame x="673" y="22" width="1226" height="1033" extended-state="0" />
+    <frame x="674" y="22" width="1243" height="1027" extended-state="0" />
     <editor active="false" />
     <layout>
-      <window_info id="Changes" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.3253012" 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="true" weight="0.32513368" sideWeight="0.5" order="7" 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="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3262032" 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="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.39783785" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="IDEtalk Messages" 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="IDEtalk" 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="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32858709" 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.32719395" 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.3262032" sideWeight="0.5" order="7" 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="true" 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="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="0" 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.3271028" sideWeight="0.67469877" order="0" side_tool="false" content_ui="tabs" />
+      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.32663316" sideWeight="0.6748663" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Dependency Viewer" 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="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.26725084" sideWeight="0.97652584" 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="false" weight="0.26524064" sideWeight="0.97652584" order="2" 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="true" weight="0.32655138" sideWeight="0.5" order="1" 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" />
     </layout>
     <option name="SHOW_ONLY_CHANGED_IN_SELECTION_DIFF" value="true" />
     <option name="CHECK_COMMIT_MESSAGE_SPELLING" value="true" />
     <option name="FORCE_NON_EMPTY_COMMENT" value="false" />
-    <option name="LAST_COMMIT_MESSAGE" value="fade transition when entering/exiting house" />
+    <option name="LAST_COMMIT_MESSAGE" value="Door open/close now animated." />
     <option name="MAKE_NEW_CHANGELIST_ACTIVE" value="true" />
     <option name="OPTIMIZE_IMPORTS_BEFORE_PROJECT_COMMIT" value="false" />
     <option name="CHECK_FILES_UP_TO_DATE_BEFORE_COMMIT" value="false" />
     <MESSAGE value="village fountain" />
     <MESSAGE value="working on walking in/out houses; no transitions yet just show/hide levels and open/close doors" />
     <MESSAGE value="fade transition when entering/exiting house" />
+    <MESSAGE value="Door open/close now animated." />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager />
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/org/newdawn/ardor3d/loader/max/TDSFile.java">
+    <entry file="file://$PROJECT_DIR$/src/org/scourge/terrain/TreeController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="469" column="0" selection-start="20231" selection-end="20231" vertical-scroll-proportion="0.0" />
+        <state line="35" column="30" selection-start="961" selection-end="965" vertical-scroll-proportion="-11.0" />
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/org/scourge/ui/MiniMap.java">
+    <entry file="file://$PROJECT_DIR$/src/org/scourge/PlayerControl.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="152" column="77" selection-start="6135" selection-end="6163" vertical-scroll-proportion="0.0" />
+        <state line="40" column="30" selection-start="1542" selection-end="1542" vertical-scroll-proportion="0.31630972" />
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/org/scourge/terrain/InAndOutController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="29" column="51" selection-start="718" selection-end="718" vertical-scroll-proportion="0.0" />
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/org/scourge/terrain/ShowHideController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="38" column="12" selection-start="1101" selection-end="1101" vertical-scroll-proportion="0.0" />
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/org/scourge/terrain/DoorController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0" />
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/org/scourge/terrain/Region.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="721" column="0" selection-start="34900" selection-end="34900" vertical-scroll-proportion="0.0" />
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/org/scourge/Main.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="731" column="128" selection-start="25222" selection-end="25222" vertical-scroll-proportion="0.0">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/org/scourge/ScourgeConstants.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="8" column="29" selection-start="122" selection-end="138" vertical-scroll-proportion="0.0">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/org/scourge/Scourge.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="13" column="17" selection-start="233" selection-end="233" vertical-scroll-proportion="0.0">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/org/scourge/model/Creature.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="74" column="88" selection-start="1813" selection-end="1813" vertical-scroll-proportion="0.0">
+          <folding />
+        </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/org/scourge/ui/component/WinUtil.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="126" column="22" selection-start="4372" selection-end="4372" vertical-scroll-proportion="0.0" />
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/org/newdawn/ardor3d/loader/max/ColorChunk.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="75" column="25" selection-start="3008" selection-end="3008" vertical-scroll-proportion="0.5701358">
+        <state line="95" column="24" selection-start="2978" selection-end="2978" vertical-scroll-proportion="0.0">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="jar://$PROJECT_DIR$/lib/ardor3d_core.jar!/com/ardor3d/math/ColorRGBA.class">
+    <entry file="file://$PROJECT_DIR$/src/org/scourge/ui/component/Button.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="32" column="11" selection-start="1808" selection-end="1808" vertical-scroll-proportion="0.34608984">
+        <state line="15" column="88" selection-start="427" selection-end="460" vertical-scroll-proportion="0.2746479">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/org/scourge/terrain/CreatureModel.java">
+    <entry file="file://$PROJECT_DIR$/src/org/scourge/ui/component/Window.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="93" column="0" selection-start="3957" selection-end="4132" vertical-scroll-proportion="0.31611893">
+        <state line="110" column="25" selection-start="3640" selection-end="3640" vertical-scroll-proportion="0.33274648">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/org/scourge/ui/component/Label.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="12" column="12" selection-start="214" selection-end="214" vertical-scroll-proportion="0.24489796">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/org/scourge/terrain/House.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="404" column="30" selection-start="19041" selection-end="19041" vertical-scroll-proportion="0.0">
           <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/org/scourge/terrain/Model.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="610" column="73" selection-start="19110" selection-end="19247" vertical-scroll-proportion="0.0" />
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/org/newdawn/ardor3d/loader/max/MaterialBlock.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="183" column="41" selection-start="7461" selection-end="7461" vertical-scroll-proportion="0.33333334">
+        <state line="583" column="4" selection-start="18195" selection-end="18195" vertical-scroll-proportion="0.3327674">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/org/scourge/terrain/TreeController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="35" column="30" selection-start="961" selection-end="965" vertical-scroll-proportion="-11.0">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/org/scourge/PlayerControl.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="40" column="30" selection-start="1542" selection-end="1542" vertical-scroll-proportion="0.31630972">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/org/scourge/terrain/House.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="361" column="39" selection-start="17028" selection-end="17028" vertical-scroll-proportion="0.0">
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/org/scourge/terrain/Region.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="703" column="26" selection-start="34312" selection-end="34312" vertical-scroll-proportion="0.0">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/org/scourge/Main.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="505" column="0" selection-start="18104" selection-end="18104" vertical-scroll-proportion="0.0">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/org/scourge/terrain/DoorController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/org/scourge/terrain/InAndOutController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="29" column="51" selection-start="718" selection-end="718" vertical-scroll-proportion="0.0">
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/org/scourge/terrain/ShowHideController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="38" column="12" selection-start="1101" selection-end="1101" vertical-scroll-proportion="0.8042328">
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
   </component>
   <component name="masterDetails">
     <states>

Binary file added.

Binary file modified.

src/org/scourge/Main.java

     private boolean updateHouseRoof;
     private boolean inUpDown;
 	public static boolean SKIP_MENU;
+	private int houseLevel;
 
 	public Main() {
         main = this;
                 updateRoof();
             }
 			boolean inHouse = tile.getC() == MapSymbol.house.getC();
-			if(inHouse != this.inHouse) {
+			int level = (int)(getPlayer().getCreatureModel().getNode().getTranslation().getY() / ShapeUtil.WALL_WIDTH);
+			if(inHouse != this.inHouse || level != this.houseLevel) {
 				this.inHouse = inHouse;
+				this.houseLevel = level;
 				updateHouseRoof();
 			}
             boolean inUpDown = (tile.getC() == MapSymbol.up.getC() || tile.getC() == MapSymbol.down.getC());

src/org/scourge/ScourgeConstants.java

+package org.scourge;
+
+/**
+ * Created by IntelliJ IDEA.
+ * User: gtorak
+ * Date: 4/9/11
+ * Time: 12:30 PM
+ */
+public class ScourgeConstants {
+	public static final int START_X = 652;
+	public static final int START_Z = 410;
+}

src/org/scourge/model/Creature.java

 
 import com.ardor3d.math.Vector3;
 import org.scourge.Main;
+import org.scourge.ScourgeConstants;
 import org.scourge.config.CreatureModelTemplate;
 import org.scourge.config.PlayerTemplate;
 import org.scourge.terrain.CreatureModel;
         //389, 9, 349);
         //498, 9, 489);
         //c.position = new float[] { 651, 9, 413 };
-        c.position = new float[] { 644, 9, 433 };
+//        c.position = new float[] { 644, 9, 433 };
+        c.position = new float[] { ScourgeConstants.START_X, 9, ScourgeConstants.START_Z };
         c.name = "zorro";
         c.model = "";
         c.skin = "";

src/org/scourge/terrain/House.java

 import com.ardor3d.util.geom.BufferUtils;
 import org.scourge.Main;
 import org.scourge.io.BlockData;
+import org.scourge.ui.component.GText;
+import org.scourge.ui.component.WinUtil;
 import org.scourge.util.ShapeUtil;
 
 import java.nio.FloatBuffer;
         this.random = random;
         house = new Node(ShapeUtil.newShapeName("house_"));
         for(int i = 0; i < levels; i++) {
-            drawLevel(house, 0, i, 0, w, h, i == 0);
+            drawLevel(house, 0, i, 0, w, h, i == 0, (int)levels);
         }
         drawRoof(house, 0, 0 + levels, 0, w, h);
 		Vector3 v = new Vector3(x * ShapeUtil.WALL_WIDTH, y * ShapeUtil.WALL_HEIGHT + Region.MIN_HEIGHT, z * ShapeUtil.WALL_WIDTH);
         house.attachChild(roofNode);
     }
 
-    private void drawLevel(Node house, double x, double y, double z, double w, double h, boolean has_door) {
+    private void drawLevel(Node house, double x, double y, double z, double w, double h, boolean has_door, int levels) {
 		Node level = new Node(ShapeUtil.newShapeName("level_" + y));
 		level.setTranslation(0, y * ShapeUtil.WALL_WIDTH, 0);
         Direction door = Direction.values()[(int)((float)Direction.values().length * random.nextFloat())];
         drawWall(house, x - (w / 2),     0, z - (h / 2), Direction.SOUTH, h, 0, door == Direction.SOUTH && has_door, level);
         drawWall(house, x + (w / 2),     0, z - (h / 2 + 1), Direction.NORTH, h, h - 1, door == Direction.NORTH && has_door, level);
         drawFloor(house, x, 0.25, z, w, h, level);
+		if(y < levels - 1) {
+			drawStairs(house, x, 0, z, w, h, door, level);
+		}
 		level.addController(new ShowHideController());
 		house.attachChild(level);
     }
 
-
-    private void drawFloor(Node house, double x, double y, double z, double w, double h, Node parent) {
+	private void drawFloor(Node house, double x, double y, double z, double w, double h, Node parent) {
         Quad floor = new Quad(ShapeUtil.newShapeName("floor_"), w * ShapeUtil.WALL_WIDTH, h * ShapeUtil.WALL_WIDTH);
 		Vector3 v = new Vector3(x * ShapeUtil.WALL_WIDTH,
 				0.25,
 
     }
 
+	// put the stairs in the farthest corner from the door
+	private void drawStairs(Node house, double x, int y, double z, double w, double h, Direction door, Node level) {
+		Node nn = new Node(ShapeUtil.newShapeName("stairs"));
+		Spatial stairs = getStairs();
+		nn.attachChild(stairs);
+		GText label = null;
+
+		System.err.println("h=" + h + " /2=" + (h/2));
+
+		switch(door) {
+			case EAST:
+				label = WinUtil.createLabel(0, 0, "east", new ColorRGBA(1, 0.90f, 0.75f, 1), WinUtil.ScourgeFont.regular, false);
+				nn.setTranslation((w / 2) * ShapeUtil.WALL_WIDTH, 0, (h / 2 - 1.5) * ShapeUtil.WALL_WIDTH);
+				nn.setRotation(new Quaternion().fromAngleAxis(MathUtils.DEG_TO_RAD * -90, Vector3.UNIT_Y));
+				break;
+			case WEST:
+				label = WinUtil.createLabel(0, 0, "west", new ColorRGBA(1, 0.90f, 0.75f, 1), WinUtil.ScourgeFont.regular, false);
+				nn.setTranslation((w / 2 - 0.5) * ShapeUtil.WALL_WIDTH, 0, -(h / 2 + 1) * ShapeUtil.WALL_WIDTH);
+				break;
+			case SOUTH:
+				label = WinUtil.createLabel(0, 0, "south", new ColorRGBA(1, 0.90f, 0.75f, 1), WinUtil.ScourgeFont.regular, false);
+				nn.setTranslation((w / 2) * ShapeUtil.WALL_WIDTH, 0, (h/2 - 1.5) * ShapeUtil.WALL_WIDTH);
+				nn.setRotation(new Quaternion().fromAngleAxis(MathUtils.DEG_TO_RAD * -90, Vector3.UNIT_Y));
+				break;
+			case NORTH:
+				label = WinUtil.createLabel(0, 0, "north", new ColorRGBA(1, 0.90f, 0.75f, 1), WinUtil.ScourgeFont.regular, false);
+				nn.setTranslation((0.5 - (w / 2)) * ShapeUtil.WALL_WIDTH, 0, (h / 2 - 1) * ShapeUtil.WALL_WIDTH);
+				nn.setRotation(new Quaternion().fromAngleAxis(MathUtils.DEG_TO_RAD * 180, Vector3.UNIT_Y));
+				break;
+		}
+		label.getSceneHints().setAllPickingHints(false);
+		nn.attachChild(label);
+		level.attachChild(nn);
+	}
 
     private void drawWall(Node house, double x, double y, double z, Direction dir, double length, double finalPos, boolean has_door, Node parent) {
         int door_pos = has_door ? 1 + (int)((float)(length - 2) * random.nextFloat()) : -1;
 		door.addController(new DoorController());
 		return door;
     }
+
+	protected Spatial getStairs() {
+        return Model.houseStairs.createSpatial();
+    }
 }

src/org/scourge/terrain/Model.java

 		public Spatial createSpatial() {
 			return getAlphaSpatial(1, 0, 0, 0);
 		}
+	},
+	houseStairs("./data/3ds/h-stairs.3ds") {
+		@Override
+		public Spatial createSpatial() {
+			return getAlphaSpatial(1, 0, 0, 0);
+		}
 	}
 
 
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.