提交: 107 - stg001 (svn)

Commit MetaInfo

• 修訂: 107 (tree)
• 時間: 2014-05-27 22:41:13
• 作者: syun77

Log Message

スプライト描画を実装

Change Summary

• modified: trunk/MyProject/.idea/workspace.xml
• modified: trunk/MyProject/Source/SceneMain.hx
• modified: trunk/MyProject/Source/framework/GraphicManager.hx
• modified: trunk/MyProject/Source/framework/SoundManager.hx
• modified: trunk/MyProject/Source/framework/util/CsvLoader.hx
• added: trunk/MyProject/Assets/charset.png

差異

--- trunk/MyProject/.idea/workspace.xml	(revision 106)
+++ trunk/MyProject/.idea/workspace.xml	(revision 107)
@@ -26,28 +26,38 @@
       <file leaf-file-name="SceneMain.hx" pinned="false" current="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/Source/SceneMain.hx">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.0" vertical-offset="938" max-vertical-offset="1515">
-              <caret line="90" column="19" selection-start-line="90" selection-start-column="19" selection-end-line="90" selection-end-column="19" />
+            <state vertical-scroll-proportion="0.0" vertical-offset="713" max-vertical-offset="1440">
+              <caret line="87" column="48" selection-start-line="87" selection-start-column="48" selection-end-line="87" selection-end-column="48" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="GraphicManager.hx" pinned="false" current="true" current-in-tab="true">
+      <file leaf-file-name="GraphicManager.hx" pinned="false" current="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/Source/framework/GraphicManager.hx">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.5608365" vertical-offset="1235" max-vertical-offset="5010">
-              <caret line="102" column="21" selection-start-line="102" selection-start-column="21" selection-end-line="102" selection-end-column="21" />
+            <state vertical-scroll-proportion="0.0" vertical-offset="1158" max-vertical-offset="5385">
+              <caret line="94" column="0" selection-start-line="94" selection-start-column="0" selection-end-line="94" selection-end-column="0" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
+      <file leaf-file-name="SoundManager.hx" pinned="false" current="true" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/Source/framework/SoundManager.hx">
+          <provider selected="true" editor-type-id="text-editor">
+            <state vertical-scroll-proportion="0.47309834" vertical-offset="435" max-vertical-offset="1605">
+              <caret line="46" column="8" selection-start-line="46" selection-start-column="8" selection-end-line="46" selection-end-column="8" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
       <file leaf-file-name="CsvLoader.hx" pinned="false" current="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/Source/framework/util/CsvLoader.hx">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.0" vertical-offset="646" max-vertical-offset="1185">
-              <caret line="40" column="17" selection-start-line="40" selection-start-column="17" selection-end-line="40" selection-end-column="17" />
+            <state vertical-scroll-proportion="0.0" vertical-offset="359" max-vertical-offset="1365">
+              <caret line="52" column="3" selection-start-line="52" selection-start-column="3" selection-end-line="52" selection-end-column="3" />
               <folding />
             </state>
           </provider>
@@ -75,7 +85,6 @@
         <option value="$PROJECT_DIR$/Source/framework/FontManager.hx" />
         <option value="$PROJECT_DIR$/Source/framework/Application.hx" />
         <option value="$PROJECT_DIR$/Source/framework/FpsView.hx" />
-        <option value="$PROJECT_DIR$/Source/framework/SoundManager.hx" />
         <option value="$PROJECT_DIR$/project.xml" />
         <option value="$PROJECT_DIR$/Source/framework/IToken.hx" />
         <option value="$PROJECT_DIR$/Source/framework/Token.hx" />
@@ -83,8 +92,9 @@
         <option value="$PROJECT_DIR$/Source/framework/TmxLoader.hx" />
         <option value="$PROJECT_DIR$/Source/framework/util/Layer2D.hx" />
         <option value="$PROJECT_DIR$/Source/framework/util/CsvLoader.hx" />
+        <option value="$PROJECT_DIR$/Source/framework/GraphicManager.hx" />
         <option value="$PROJECT_DIR$/Source/SceneMain.hx" />
-        <option value="$PROJECT_DIR$/Source/framework/GraphicManager.hx" />
+        <option value="$PROJECT_DIR$/Source/framework/SoundManager.hx" />
       </list>
     </option>
   </component>
@@ -608,22 +618,6 @@
   <component name="editorHistoryManager">
     <entry file="file://$PROJECT_DIR$/Source/SceneMain.hx">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1530">
-          <caret line="68" column="20" selection-start-line="68" selection-start-column="20" selection-end-line="68" selection-end-column="20" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/Source/SceneMain.hx">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1440">
-          <caret line="62" column="20" selection-start-line="62" selection-start-column="20" selection-end-line="62" selection-end-column="20" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/Source/SceneMain.hx">
-      <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0" vertical-offset="360" max-vertical-offset="585">
           <caret line="24" column="0" selection-start-line="24" selection-start-column="0" selection-end-line="24" selection-end-column="0" />
           <folding />
@@ -918,13 +912,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/Source/framework/SoundManager.hx">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="773" max-vertical-offset="1500">
-          <caret line="81" column="18" selection-start-line="81" selection-start-column="18" selection-end-line="81" selection-end-column="18" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/Source/framework/IToken.hx">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="765">
@@ -956,18 +943,34 @@
         </state>
       </provider>
     </entry>
+    <entry file="file:///usr/lib/haxe/std/Map.hx">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.6133056" vertical-offset="1325" max-vertical-offset="2745">
+          <caret line="108" column="27" selection-start-line="108" selection-start-column="27" selection-end-line="108" selection-end-column="27" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/Source/framework/util/CsvLoader.hx">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="540" max-vertical-offset="1185">
-          <caret line="40" column="17" selection-start-line="40" selection-start-column="17" selection-end-line="40" selection-end-column="17" />
+        <state vertical-scroll-proportion="0.0" vertical-offset="359" max-vertical-offset="1365">
+          <caret line="52" column="3" selection-start-line="52" selection-start-column="3" selection-end-line="52" selection-end-column="3" />
           <folding />
         </state>
       </provider>
     </entry>
+    <entry file="file:///usr/lib/haxe/std/haxe/io/Error.hx">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.56340957" vertical-offset="119" max-vertical-offset="630">
+          <caret line="26" column="5" selection-start-line="26" selection-start-column="5" selection-end-line="26" selection-end-column="10" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/Source/SceneMain.hx">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="938" max-vertical-offset="1515">
-          <caret line="90" column="19" selection-start-line="90" selection-start-column="19" selection-end-line="90" selection-end-column="19" />
+        <state vertical-scroll-proportion="0.0" vertical-offset="713" max-vertical-offset="1440">
+          <caret line="87" column="48" selection-start-line="87" selection-start-column="48" selection-end-line="87" selection-end-column="48" />
           <folding />
         </state>
       </provider>
@@ -974,12 +977,20 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/Source/framework/GraphicManager.hx">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.5608365" vertical-offset="1235" max-vertical-offset="5010">
-          <caret line="102" column="21" selection-start-line="102" selection-start-column="21" selection-end-line="102" selection-end-column="21" />
+        <state vertical-scroll-proportion="0.0" vertical-offset="1158" max-vertical-offset="5385">
+          <caret line="94" column="0" selection-start-line="94" selection-start-column="0" selection-end-line="94" selection-end-column="0" />
           <folding />
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/Source/framework/SoundManager.hx">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.47309834" vertical-offset="435" max-vertical-offset="1605">
+          <caret line="46" column="8" selection-start-line="46" selection-start-column="8" selection-end-line="46" selection-end-column="8" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
   </component>
   <component name="masterDetails">
     <states>