関数名をリファクタリング
@@ -22,78 +22,86 @@ | ||
22 | 22 | <favorites_list name="MyProject" /> |
23 | 23 | </component> |
24 | 24 | <component name="FileEditorManager"> |
25 | - <leaf> | |
26 | - <file leaf-file-name="Main.hx" pinned="false" current="false" current-in-tab="false"> | |
27 | - <entry file="file://$PROJECT_DIR$/Source/Main.hx"> | |
28 | - <provider selected="true" editor-type-id="text-editor"> | |
29 | - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="510"> | |
30 | - <caret line="19" column="44" selection-start-line="19" selection-start-column="44" selection-end-line="19" selection-end-column="44" /> | |
31 | - <folding /> | |
32 | - </state> | |
33 | - </provider> | |
34 | - </entry> | |
35 | - </file> | |
36 | - <file leaf-file-name="GamePad.hx" pinned="false" current="false" current-in-tab="false"> | |
37 | - <entry file="file://$PROJECT_DIR$/Source/framework/GamePad.hx"> | |
38 | - <provider selected="true" editor-type-id="text-editor"> | |
39 | - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="870"> | |
40 | - <caret line="19" column="5" selection-start-line="19" selection-start-column="5" selection-end-line="19" selection-end-column="5" /> | |
41 | - <folding /> | |
42 | - </state> | |
43 | - </provider> | |
44 | - </entry> | |
45 | - </file> | |
46 | - <file leaf-file-name="Keyboard.hx" pinned="false" current="false" current-in-tab="false"> | |
47 | - <entry file="file://$PROJECT_DIR$/Source/framework/Keyboard.hx"> | |
48 | - <provider selected="true" editor-type-id="text-editor"> | |
49 | - <state vertical-scroll-proportion="0.0" vertical-offset="1652" max-vertical-offset="2310"> | |
50 | - <caret line="148" column="0" selection-start-line="148" selection-start-column="0" selection-end-line="148" selection-end-column="0" /> | |
51 | - <folding /> | |
52 | - </state> | |
53 | - </provider> | |
54 | - </entry> | |
55 | - </file> | |
56 | - <file leaf-file-name="InputManager.hx" pinned="false" current="false" current-in-tab="false"> | |
57 | - <entry file="file://$PROJECT_DIR$/Source/framework/InputManager.hx"> | |
58 | - <provider selected="true" editor-type-id="text-editor"> | |
59 | - <state vertical-scroll-proportion="0.0" vertical-offset="1292" max-vertical-offset="1950"> | |
60 | - <caret line="120" column="25" selection-start-line="120" selection-start-column="25" selection-end-line="120" selection-end-column="25" /> | |
61 | - <folding /> | |
62 | - </state> | |
63 | - </provider> | |
64 | - </entry> | |
65 | - </file> | |
66 | - <file leaf-file-name="Mouse.hx" pinned="false" current="false" current-in-tab="false"> | |
67 | - <entry file="file://$PROJECT_DIR$/Source/framework/Mouse.hx"> | |
68 | - <provider selected="true" editor-type-id="text-editor"> | |
69 | - <state vertical-scroll-proportion="0.0" vertical-offset="372" max-vertical-offset="1275"> | |
70 | - <caret line="67" column="33" selection-start-line="67" selection-start-column="33" selection-end-line="67" selection-end-column="33" /> | |
71 | - <folding /> | |
72 | - </state> | |
73 | - </provider> | |
74 | - </entry> | |
75 | - </file> | |
76 | - <file leaf-file-name="SceneMain.hx" pinned="false" current="true" current-in-tab="true"> | |
77 | - <entry file="file://$PROJECT_DIR$/Source/SceneMain.hx"> | |
78 | - <provider selected="true" editor-type-id="text-editor"> | |
79 | - <state vertical-scroll-proportion="0.6270903" vertical-offset="0" max-vertical-offset="630"> | |
80 | - <caret line="25" column="0" selection-start-line="25" selection-start-column="0" selection-end-line="25" selection-end-column="0" /> | |
81 | - <folding /> | |
82 | - </state> | |
83 | - </provider> | |
84 | - </entry> | |
85 | - </file> | |
86 | - <file leaf-file-name="Application.hx" pinned="false" current="false" current-in-tab="false"> | |
87 | - <entry file="file://$PROJECT_DIR$/Source/framework/Application.hx"> | |
88 | - <provider selected="true" editor-type-id="text-editor"> | |
89 | - <state vertical-scroll-proportion="0.0" vertical-offset="60" max-vertical-offset="1665"> | |
90 | - <caret line="26" column="21" selection-start-line="26" selection-start-column="21" selection-end-line="26" selection-end-column="21" /> | |
91 | - <folding /> | |
92 | - </state> | |
93 | - </provider> | |
94 | - </entry> | |
95 | - </file> | |
96 | - </leaf> | |
25 | + <splitter split-orientation="horizontal" split-proportion="0.5"> | |
26 | + <split-first> | |
27 | + <leaf> | |
28 | + <file leaf-file-name="Main.hx" pinned="false" current="false" current-in-tab="false"> | |
29 | + <entry file="file://$PROJECT_DIR$/Source/Main.hx"> | |
30 | + <provider selected="true" editor-type-id="text-editor"> | |
31 | + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="510"> | |
32 | + <caret line="19" column="44" selection-start-line="19" selection-start-column="44" selection-end-line="19" selection-end-column="44" /> | |
33 | + <folding /> | |
34 | + </state> | |
35 | + </provider> | |
36 | + </entry> | |
37 | + </file> | |
38 | + <file leaf-file-name="GamePad.hx" pinned="false" current="true" current-in-tab="true"> | |
39 | + <entry file="file://$PROJECT_DIR$/Source/framework/GamePad.hx"> | |
40 | + <provider selected="true" editor-type-id="text-editor"> | |
41 | + <state vertical-scroll-proportion="0.9752322" vertical-offset="0" max-vertical-offset="870"> | |
42 | + <caret line="42" column="33" selection-start-line="42" selection-start-column="33" selection-end-line="42" selection-end-column="33" /> | |
43 | + <folding /> | |
44 | + </state> | |
45 | + </provider> | |
46 | + </entry> | |
47 | + </file> | |
48 | + <file leaf-file-name="Keyboard.hx" pinned="false" current="false" current-in-tab="false"> | |
49 | + <entry file="file://$PROJECT_DIR$/Source/framework/Keyboard.hx"> | |
50 | + <provider selected="true" editor-type-id="text-editor"> | |
51 | + <state vertical-scroll-proportion="0.0" vertical-offset="1485" max-vertical-offset="2310"> | |
52 | + <caret line="125" column="22" selection-start-line="125" selection-start-column="20" selection-end-line="125" selection-end-column="27" /> | |
53 | + <folding /> | |
54 | + </state> | |
55 | + </provider> | |
56 | + </entry> | |
57 | + </file> | |
58 | + <file leaf-file-name="SceneMain.hx" pinned="false" current="false" current-in-tab="false"> | |
59 | + <entry file="file://$PROJECT_DIR$/Source/SceneMain.hx"> | |
60 | + <provider selected="true" editor-type-id="text-editor"> | |
61 | + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="690"> | |
62 | + <caret line="29" column="23" selection-start-line="29" selection-start-column="23" selection-end-line="29" selection-end-column="23" /> | |
63 | + <folding /> | |
64 | + </state> | |
65 | + </provider> | |
66 | + </entry> | |
67 | + </file> | |
68 | + <file leaf-file-name="Application.hx" pinned="false" current="false" current-in-tab="false"> | |
69 | + <entry file="file://$PROJECT_DIR$/Source/framework/Application.hx"> | |
70 | + <provider selected="true" editor-type-id="text-editor"> | |
71 | + <state vertical-scroll-proportion="0.0" vertical-offset="60" max-vertical-offset="1665"> | |
72 | + <caret line="26" column="21" selection-start-line="26" selection-start-column="21" selection-end-line="26" selection-end-column="21" /> | |
73 | + <folding /> | |
74 | + </state> | |
75 | + </provider> | |
76 | + </entry> | |
77 | + </file> | |
78 | + <file leaf-file-name="InputManager.hx" pinned="false" current="false" current-in-tab="false"> | |
79 | + <entry file="file://$PROJECT_DIR$/Source/framework/InputManager.hx"> | |
80 | + <provider selected="true" editor-type-id="text-editor"> | |
81 | + <state vertical-scroll-proportion="0.0" vertical-offset="1352" max-vertical-offset="1950"> | |
82 | + <caret line="120" column="25" selection-start-line="120" selection-start-column="25" selection-end-line="120" selection-end-column="25" /> | |
83 | + <folding /> | |
84 | + </state> | |
85 | + </provider> | |
86 | + </entry> | |
87 | + </file> | |
88 | + </leaf> | |
89 | + </split-first> | |
90 | + <split-second> | |
91 | + <leaf> | |
92 | + <file leaf-file-name="Mouse.hx" pinned="false" current="false" current-in-tab="true"> | |
93 | + <entry file="file://$PROJECT_DIR$/Source/framework/Mouse.hx"> | |
94 | + <provider selected="true" editor-type-id="text-editor"> | |
95 | + <state vertical-scroll-proportion="1.1121076" vertical-offset="81" max-vertical-offset="1275"> | |
96 | + <caret line="55" column="23" selection-start-line="55" selection-start-column="23" selection-end-line="55" selection-end-column="23" /> | |
97 | + <folding /> | |
98 | + </state> | |
99 | + </provider> | |
100 | + </entry> | |
101 | + </file> | |
102 | + </leaf> | |
103 | + </split-second> | |
104 | + </splitter> | |
97 | 105 | </component> |
98 | 106 | <component name="FindManager"> |
99 | 107 | <FindUsagesManager> |
@@ -108,14 +116,14 @@ | ||
108 | 116 | <option value="$PROJECT_DIR$/Source/framework/SceneManager.hx" /> |
109 | 117 | <option value="$PROJECT_DIR$/Source/framework/IScene.hx" /> |
110 | 118 | <option value="$PROJECT_DIR$/Source/framework/GraphicManager.hx" /> |
111 | - <option value="$PROJECT_DIR$/Source/framework/GamePad.hx" /> | |
112 | 119 | <option value="$PROJECT_DIR$/Source/framework/IToken.hx" /> |
113 | - <option value="$PROJECT_DIR$/Source/framework/Mouse.hx" /> | |
114 | - <option value="$PROJECT_DIR$/Source/framework/Keyboard.hx" /> | |
115 | 120 | <option value="$PROJECT_DIR$/Source/framework/Application.hx" /> |
116 | 121 | <option value="$PROJECT_DIR$/Source/Main.hx" /> |
117 | 122 | <option value="$PROJECT_DIR$/Source/framework/InputManager.hx" /> |
118 | 123 | <option value="$PROJECT_DIR$/Source/SceneMain.hx" /> |
124 | + <option value="$PROJECT_DIR$/Source/framework/Mouse.hx" /> | |
125 | + <option value="$PROJECT_DIR$/Source/framework/Keyboard.hx" /> | |
126 | + <option value="$PROJECT_DIR$/Source/framework/GamePad.hx" /> | |
119 | 127 | </list> |
120 | 128 | </option> |
121 | 129 | </component> |
@@ -122,7 +130,7 @@ | ||
122 | 130 | <component name="ProjectFrameBounds"> |
123 | 131 | <option name="x" value="56" /> |
124 | 132 | <option name="y" value="22" /> |
125 | - <option name="width" value="1232" /> | |
133 | + <option name="width" value="1766" /> | |
126 | 134 | <option name="height" value="1000" /> |
127 | 135 | </component> |
128 | 136 | <component name="ProjectLevelVcsManager" settingsEditedManually="false"> |
@@ -230,8 +238,8 @@ | ||
230 | 238 | <property name="MemberChooser.copyJavadoc" value="false" /> |
231 | 239 | <property name="FullScreen" value="false" /> |
232 | 240 | <property name="project.structure.last.edited" value="Modules" /> |
233 | - <property name="project.structure.proportion" value="0.0" /> | |
234 | - <property name="project.structure.side.proportion" value="0.0" /> | |
241 | + <property name="project.structure.proportion" value="0.15" /> | |
242 | + <property name="project.structure.side.proportion" value="0.2" /> | |
235 | 243 | <property name="recentsLimit" value="5" /> |
236 | 244 | <property name="restartRequiresConfirmation" value="true" /> |
237 | 245 | </component> |
@@ -418,7 +426,7 @@ | ||
418 | 426 | <servers /> |
419 | 427 | </component> |
420 | 428 | <component name="ToolWindowManager"> |
421 | - <frame x="56" y="22" width="1232" height="1000" extended-state="0" /> | |
429 | + <frame x="56" y="22" width="1766" height="1000" extended-state="0" /> | |
422 | 430 | <editor active="true" /> |
423 | 431 | <layout> |
424 | 432 | <window_info id="Palette	" 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" /> |
@@ -437,8 +445,8 @@ | ||
437 | 445 | <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" /> |
438 | 446 | <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" /> |
439 | 447 | <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" /> |
440 | - <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.25" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> | |
441 | - <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.32760474" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> | |
448 | + <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.17440544" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> | |
449 | + <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.25134265" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> | |
442 | 450 | <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" /> |
443 | 451 | <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" /> |
444 | 452 | <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" /> |
@@ -643,14 +651,6 @@ | ||
643 | 651 | </state> |
644 | 652 | </provider> |
645 | 653 | </entry> |
646 | - <entry file="file://$PROJECT_DIR$/Source/framework/Mouse.hx"> | |
647 | - <provider selected="true" editor-type-id="text-editor"> | |
648 | - <state vertical-scroll-proportion="0.0" vertical-offset="372" max-vertical-offset="1275"> | |
649 | - <caret line="67" column="33" selection-start-line="67" selection-start-column="33" selection-end-line="67" selection-end-column="33" /> | |
650 | - <folding /> | |
651 | - </state> | |
652 | - </provider> | |
653 | - </entry> | |
654 | 654 | <entry file="file://$PROJECT_DIR$/Source/framework/IToken.hx"> |
655 | 655 | <provider selected="true" editor-type-id="text-editor"> |
656 | 656 | <state vertical-scroll-proportion="0.5735786" vertical-offset="17" max-vertical-offset="615"> |
@@ -675,14 +675,22 @@ | ||
675 | 675 | </state> |
676 | 676 | </provider> |
677 | 677 | </entry> |
678 | - <entry file="file://$PROJECT_DIR$/Source/framework/Keyboard.hx"> | |
678 | + <entry file="file://$PROJECT_DIR$/Source/framework/InputManager.hx"> | |
679 | 679 | <provider selected="true" editor-type-id="text-editor"> |
680 | - <state vertical-scroll-proportion="0.0" vertical-offset="1652" max-vertical-offset="2310"> | |
681 | - <caret line="148" column="0" selection-start-line="148" selection-start-column="0" selection-end-line="148" selection-end-column="0" /> | |
680 | + <state vertical-scroll-proportion="0.0" vertical-offset="1352" max-vertical-offset="1950"> | |
681 | + <caret line="120" column="25" selection-start-line="120" selection-start-column="25" selection-end-line="120" selection-end-column="25" /> | |
682 | 682 | <folding /> |
683 | 683 | </state> |
684 | 684 | </provider> |
685 | 685 | </entry> |
686 | + <entry file="file://$PROJECT_DIR$/Source/SceneMain.hx"> | |
687 | + <provider selected="true" editor-type-id="text-editor"> | |
688 | + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="690"> | |
689 | + <caret line="29" column="23" selection-start-line="29" selection-start-column="23" selection-end-line="29" selection-end-column="23" /> | |
690 | + <folding /> | |
691 | + </state> | |
692 | + </provider> | |
693 | + </entry> | |
686 | 694 | <entry file="file://$PROJECT_DIR$/Source/Main.hx"> |
687 | 695 | <provider selected="true" editor-type-id="text-editor"> |
688 | 696 | <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="510"> |
@@ -691,26 +699,26 @@ | ||
691 | 699 | </state> |
692 | 700 | </provider> |
693 | 701 | </entry> |
694 | - <entry file="file://$PROJECT_DIR$/Source/framework/InputManager.hx"> | |
702 | + <entry file="file://$PROJECT_DIR$/Source/framework/Mouse.hx"> | |
695 | 703 | <provider selected="true" editor-type-id="text-editor"> |
696 | - <state vertical-scroll-proportion="0.0" vertical-offset="1292" max-vertical-offset="1950"> | |
697 | - <caret line="120" column="25" selection-start-line="120" selection-start-column="25" selection-end-line="120" selection-end-column="25" /> | |
704 | + <state vertical-scroll-proportion="1.1121076" vertical-offset="81" max-vertical-offset="1275"> | |
705 | + <caret line="55" column="23" selection-start-line="55" selection-start-column="23" selection-end-line="55" selection-end-column="23" /> | |
698 | 706 | <folding /> |
699 | 707 | </state> |
700 | 708 | </provider> |
701 | 709 | </entry> |
702 | - <entry file="file://$PROJECT_DIR$/Source/framework/GamePad.hx"> | |
710 | + <entry file="file://$PROJECT_DIR$/Source/framework/Keyboard.hx"> | |
703 | 711 | <provider selected="true" editor-type-id="text-editor"> |
704 | - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="870"> | |
705 | - <caret line="19" column="5" selection-start-line="19" selection-start-column="5" selection-end-line="19" selection-end-column="5" /> | |
712 | + <state vertical-scroll-proportion="0.0" vertical-offset="1485" max-vertical-offset="2310"> | |
713 | + <caret line="125" column="22" selection-start-line="125" selection-start-column="20" selection-end-line="125" selection-end-column="27" /> | |
706 | 714 | <folding /> |
707 | 715 | </state> |
708 | 716 | </provider> |
709 | 717 | </entry> |
710 | - <entry file="file://$PROJECT_DIR$/Source/SceneMain.hx"> | |
718 | + <entry file="file://$PROJECT_DIR$/Source/framework/GamePad.hx"> | |
711 | 719 | <provider selected="true" editor-type-id="text-editor"> |
712 | - <state vertical-scroll-proportion="0.6270903" vertical-offset="0" max-vertical-offset="630"> | |
713 | - <caret line="25" column="0" selection-start-line="25" selection-start-column="0" selection-end-line="25" selection-end-column="0" /> | |
720 | + <state vertical-scroll-proportion="0.9752322" vertical-offset="0" max-vertical-offset="870"> | |
721 | + <caret line="42" column="33" selection-start-line="42" selection-start-column="33" selection-end-line="42" selection-end-column="33" /> | |
714 | 722 | <folding /> |
715 | 723 | </state> |
716 | 724 | </provider> |