• R/O
  • SSH

コミット

タグ
未設定

よく使われているワード(クリックで追加)

javaandroidc++linuxc#objective-c誰得cocoaqtpythonrubywindowsphpgameguibathyscaphec翻訳omegat計画中(planning stage)frameworktwitterdombtronvb.nettestarduinodirectxpreviewerゲームエンジン

コミットメタ情報

リビジョン12d8b44236a930aedeaf931120a0afe20531270a (tree)
日時2021-05-05 03:39:48
作者sebastian_bugiu
コミッターsebastian_bugiu

ログメッセージ

Split the ship materials into big and small ships materials. Looks like the touch keyboard is not working.

変更サマリ

差分

diff -r 21a632d2dabd -r 12d8b44236a9 core/src/headwayent/blackholedarksun/APP_Game.java
--- a/core/src/headwayent/blackholedarksun/APP_Game.java Thu Apr 29 14:51:43 2021 +0300
+++ b/core/src/headwayent/blackholedarksun/APP_Game.java Tue May 04 21:39:48 2021 +0300
@@ -1395,7 +1395,13 @@
13951395 }
13961396
13971397 public void setOnscreenKeyboardVisible(boolean visible) {
1398- Gdx.input.setOnscreenKeyboardVisible(visible);
1398+ // TODO investigate why it crashes on iOS.
1399+ // Ignore the NullPointerException for now.
1400+ try {
1401+ Gdx.input.setOnscreenKeyboardVisible(visible);
1402+ } catch (RuntimeException e) {
1403+ e.printStackTrace();
1404+ }
13991405 }
14001406
14011407 public EventBus getEventBus() {
diff -r 21a632d2dabd -r 12d8b44236a9 core/src/headwayent/blackholedarksun/APP_SinglePlayerGame.java
--- a/core/src/headwayent/blackholedarksun/APP_SinglePlayerGame.java Thu Apr 29 14:51:43 2021 +0300
+++ b/core/src/headwayent/blackholedarksun/APP_SinglePlayerGame.java Tue May 04 21:39:48 2021 +0300
@@ -316,12 +316,15 @@
316316 mainThread.addWorker(new LoadResourcesPart0());
317317 mainThread.addWorker(new LoadResourcesPart1());
318318 mainThread.addWorker(new LoadResourcesPart2());
319+ mainThread.addWorker(new LoadResourcesPart3());
319320 mainThread.addWorker(new LoadResourcesPart4());
320321 mainThread.addWorker(new LoadResourcesPart5());
321322 mainThread.addWorker(new LoadResourcesPart6());
322323 mainThread.addWorker(new LoadResourcesPart7());
323324 mainThread.addWorker(new LoadResourcesPart8());
324325 mainThread.addWorker(new LoadResourcesPart9());
326+ mainThread.addWorker(new LoadResourcesPart10());
327+ mainThread.addWorker(new LoadResourcesPart11());
325328
326329 mainThread.addWorker(new LoadRawData());
327330
@@ -840,97 +843,166 @@
840843 }
841844 }
842845
843- private class LoadResourcesPart0 implements ENG_IMainThreadSequentialWorker {
846+ private class LoadResourcesPart0 extends ENG_MainThreadSequentialWorkerWithTimer {
847+
848+ public LoadResourcesPart0() {
849+ super("AnimatedTextures AsteroidMeshes", true);
850+ }
844851
845852 @Override
846- public void run() {
853+ public void runWithTimer() {
847854 loadResources("AnimatedTextures");
848855 loadResources("AsteroidMeshes");
849856 loadingScreenContainer.getProgressBar().setProgress(10);
850857 }
851858 }
852859
853- private class LoadResourcesPart1 implements ENG_IMainThreadSequentialWorker {
860+ private class LoadResourcesPart1 extends ENG_MainThreadSequentialWorkerWithTimer {
861+
862+ public LoadResourcesPart1() {
863+ super("AsteroidTextures AsteroidMaterials", true);
864+ }
854865
855866 @Override
856- public void run() {
867+ public void runWithTimer() {
857868 loadResources("AsteroidTextures");
858869 loadResources("AsteroidMaterials");
859870 loadingScreenContainer.getProgressBar().setProgress(20);
860871 }
861872 }
862873
863- private class LoadResourcesPart2 implements ENG_IMainThreadSequentialWorker {
874+ private class LoadResourcesPart2 extends ENG_MainThreadSequentialWorkerWithTimer {
875+
876+ public LoadResourcesPart2() {
877+ super("CargoMeshes CargoTextures", true);
878+ }
864879
865880 @Override
866- public void run() {
881+ public void runWithTimer() {
867882 loadResources("CargoMeshes");
868883 loadResources("CargoTextures");
869884 loadingScreenContainer.getProgressBar().setProgress(30);
870885 }
871886 }
872887
873- private class LoadResourcesPart3 implements ENG_IMainThreadSequentialWorker {
888+ private class LoadResourcesPart3 extends ENG_MainThreadSequentialWorkerWithTimer {
889+
890+ public LoadResourcesPart3() {
891+ super("FlagMeshes FlagTextures MiscTextures", true);
892+ }
874893
875894 @Override
876- public void run() {
895+ public void runWithTimer() {
877896 loadResources("FlagMeshes");
878897 loadResources("FlagTextures");
879898 loadResources("MiscTextures");
899+ loadingScreenContainer.getProgressBar().setProgress(35);
900+ }
901+ }
902+
903+ private class LoadResourcesPart4 extends ENG_MainThreadSequentialWorkerWithTimer {
904+
905+ public LoadResourcesPart4() {
906+ super("ShipMeshes", true);
907+ }
908+
909+ @Override
910+ public void runWithTimer() {
911+ loadResources("ShipMeshes");
880912 loadingScreenContainer.getProgressBar().setProgress(40);
881913 }
882914 }
883915
884- private class LoadResourcesPart4 implements ENG_IMainThreadSequentialWorker {
916+ private class LoadResourcesPart5 extends ENG_MainThreadSequentialWorkerWithTimer {
917+
918+ public LoadResourcesPart5() {
919+ super("ShipTextures", true);
920+ }
885921
886922 @Override
887- public void run() {
888- loadResources("ShipMeshes");
923+ public void runWithTimer() {
889924 loadResources("ShipTextures");
890- loadResources("ShipMaterials");
925+ loadingScreenContainer.getProgressBar().setProgress(45);
926+ }
927+ }
928+
929+ private class LoadResourcesPart6 extends ENG_MainThreadSequentialWorkerWithTimer {
930+
931+ public LoadResourcesPart6() {
932+ super("ShipMaterialsBig", true);
933+ }
934+
935+ @Override
936+ public void runWithTimer() {
937+ loadResources("ShipMaterialsBig");
891938 loadingScreenContainer.getProgressBar().setProgress(50);
892939 }
893940 }
894941
895- private class LoadResourcesPart5 implements ENG_IMainThreadSequentialWorker {
942+ private class LoadResourcesPart7 extends ENG_MainThreadSequentialWorkerWithTimer {
943+
944+ public LoadResourcesPart7() {
945+ super("ShipMaterialsSmall", true);
946+ }
896947
897948 @Override
898- public void run() {
899- loadResources("Skyboxes");
900- loadResources("SkyboxesMaterials");
949+ public void runWithTimer() {
950+ loadResources("ShipMaterialsSmall");
901951 loadingScreenContainer.getProgressBar().setProgress(60);
902952 }
903953 }
904954
905- private class LoadResourcesPart6 implements ENG_IMainThreadSequentialWorker {
955+ private class LoadResourcesPart8 extends ENG_MainThreadSequentialWorkerWithTimer {
956+
957+ public LoadResourcesPart8() {
958+ super("Skyboxes SkyboxesMaterials", true);
959+ }
906960
907961 @Override
908- public void run() {
909- loadResources("Sounds");
962+ public void runWithTimer() {
963+ loadResources("Skyboxes");
964+ loadResources("SkyboxesMaterials");
910965 loadingScreenContainer.getProgressBar().setProgress(70);
911966 }
912967 }
913968
914- private class LoadResourcesPart7 implements ENG_IMainThreadSequentialWorker {
969+ private class LoadResourcesPart9 extends ENG_MainThreadSequentialWorkerWithTimer {
970+
971+ public LoadResourcesPart9() {
972+ super("Sounds", true);
973+ }
915974
916975 @Override
917- public void run() {
918- loadResources("WeaponMeshes");
919- loadResources("WeaponTextures");
920- loadResources("WeaponMaterials");
976+ public void runWithTimer() {
977+ loadResources("Sounds");
921978 loadingScreenContainer.getProgressBar().setProgress(80);
922979 }
923980 }
924981
925- private class LoadResourcesPart8 implements ENG_IMainThreadSequentialWorker {
982+ private class LoadResourcesPart10 extends ENG_MainThreadSequentialWorkerWithTimer {
983+
984+ public LoadResourcesPart10() {
985+ super("WeaponMeshes WeaponTextures WeaponMaterials", true);
986+ }
926987
927988 @Override
928- public void run() {
989+ public void runWithTimer() {
990+ loadResources("WeaponMeshes");
991+ loadResources("WeaponTextures");
992+ loadResources("WeaponMaterials");
929993 loadingScreenContainer.getProgressBar().setProgress(90);
930994 }
931995 }
932996
933- private class LoadResourcesPart9 implements ENG_IMainThreadSequentialWorker {
997+ private class LoadResourcesPart11 implements ENG_IMainThreadSequentialWorker {
998+
999+ @Override
1000+ public void run() {
1001+ loadingScreenContainer.getProgressBar().setProgress(100);
1002+ }
1003+ }
1004+
1005+ private class LoadResourcesPart12 implements ENG_IMainThreadSequentialWorker {
9341006
9351007 @Override
9361008 public void run() {
diff -r 21a632d2dabd -r 12d8b44236a9 core/src/headwayent/hotshotengine/ENG_MainThreadSequentialWorkerWithTimer.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/core/src/headwayent/hotshotengine/ENG_MainThreadSequentialWorkerWithTimer.java Tue May 04 21:39:48 2021 +0300
@@ -0,0 +1,27 @@
1+package headwayent.hotshotengine;
2+
3+public abstract class ENG_MainThreadSequentialWorkerWithTimer implements ENG_IMainThreadSequentialWorker {
4+
5+ private final String taskName;
6+ private final boolean printTime;
7+
8+ public ENG_MainThreadSequentialWorkerWithTimer(String taskName, boolean printTime) {
9+ if (taskName == null) {
10+ taskName = "";
11+ }
12+ this.taskName = taskName;
13+ this.printTime = printTime;
14+ }
15+
16+ public abstract void runWithTimer();
17+
18+ @Override
19+ public void run() {
20+ long startTime = ENG_Utility.currentTimeMillis();
21+ runWithTimer();
22+ long endTime = ENG_Utility.currentTimeMillis() - startTime;
23+ if (printTime) {
24+ System.out.println("Tasks: " + taskName + " time to completion: " + endTime);
25+ }
26+ }
27+}
diff -r 21a632d2dabd -r 12d8b44236a9 desktop/raw/hotshot_gamedata.zip
Binary file desktop/raw/hotshot_gamedata.zip has changed
diff -r 21a632d2dabd -r 12d8b44236a9 desktop/raw/hotshot_gamedata/ship_materials/material_ships.material
--- a/desktop/raw/hotshot_gamedata/ship_materials/material_ships.material Thu Apr 29 14:51:43 2021 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,183 +0,0 @@
1-hlms ship_alien_big0_mat pbs
2-{
3- roughness 0.4
4- fresnel 1.33
5-
6- diffuse_map ship_alien_big0_BaseColor.png
7- normal_map ship_alien_big0_Normal.png
8- roughness_map ship_alien_big0_Roughness.png
9- specular_map ship_alien_big0_Metallic.png
10-}
11-
12-hlms ship_alien_big1_mat pbs
13-{
14- roughness 0.4
15- fresnel 1.33
16-
17- diffuse_map ship_alien_big1_BaseColor.png
18- normal_map ship_alien_big1_Normal.png
19- roughness_map ship_alien_big1_Roughness.png
20- specular_map ship_alien_big1_Metallic.png
21-}
22-
23-hlms ship_alien0_mat pbs
24-{
25- roughness 0.4
26- fresnel 1.33
27-
28- diffuse_map ship_alien0_BaseColor.png
29- normal_map ship_alien0_Normal.png
30- roughness_map ship_alien0_Roughness.png
31- specular_map ship_alien0_Metallic.png
32-}
33-
34-hlms ship_alien1_mat pbs
35-{
36- roughness 0.4
37- fresnel 1.33
38-
39- diffuse_map ship_alien1_done.png
40-// normal_map Rocks_Normal.tga
41-// roughness_map Rocks_Spec.tga
42-// specular_map Rocks_Diffuse.tga
43-}
44-
45-hlms ship_alien2_mat pbs
46-{
47- roughness 0.4
48- fresnel 1.33
49-
50- diffuse_map ship_alien2_done.png
51-// normal_map Rocks_Normal.tga
52-// roughness_map Rocks_Spec.tga
53-// specular_map Rocks_Diffuse.tga
54-}
55-
56-hlms ship_alien3_mat pbs
57-{
58- roughness 0.4
59- fresnel 1.33
60-
61- diffuse_map ship_alien3_done.png
62-// normal_map Rocks_Normal.tga
63-// roughness_map Rocks_Spec.tga
64-// specular_map Rocks_Diffuse.tga
65-}
66-
67-hlms ship_alien4_mat pbs
68-{
69- roughness 0.4
70- fresnel 1.33
71-
72- diffuse_map ship_alien4_BaseColor.png
73- normal_map ship_alien4_Normal.png
74- roughness_map ship_alien4_Roughness.png
75- specular_map ship_alien4_Metallic.png
76-}
77-
78-hlms ship_human_big0_mat pbs
79-{
80- roughness 0.4
81- fresnel 1.33
82-
83- diffuse_map ship_human_big0_BaseColor.png
84- normal_map ship_human_big0_Normal.png
85- roughness_map ship_human_big0_Roughness.png
86- specular_map ship_human_big0_Metallic.png
87-}
88-
89-hlms ship_human_big1_mat pbs
90-{
91- roughness 0.4
92- fresnel 1.33
93-
94- diffuse_map ship_big_human1_done.png
95-// normal_map Rocks_Normal.tga
96-// roughness_map Rocks_Spec.tga
97-// specular_map Rocks_Diffuse.tga
98-}
99-
100-hlms ship_human_big2_mat pbs
101-{
102- roughness 0.4
103- fresnel 1.33
104-
105- diffuse_map ship_human_big2_done.png
106-// normal_map Rocks_Normal.tga
107-// roughness_map Rocks_Spec.tga
108-// specular_map Rocks_Diffuse.tga
109-}
110-
111-hlms ship_human0_mat pbs
112-{
113- roughness 0.4
114- fresnel 1.33
115-
116- diffuse_map ship_human0_BaseColor.png
117- normal_map ship_human0_Normal.png
118- roughness_map ship_human0_Roughness.png
119- specular_map ship_human0_Metallic.png
120-}
121-
122-hlms ship_human1_mat pbs
123-{
124- roughness 0.4
125- fresnel 1.33
126-
127- diffuse_map ship_human2_done.png
128-// normal_map Rocks_Normal.tga
129-// roughness_map Rocks_Spec.tga
130-// specular_map Rocks_Diffuse.tga
131-}
132-
133-hlms ship_human2_mat pbs
134-{
135- roughness 0.4
136- fresnel 1.33
137-
138- diffuse_map ship_human3_done.png
139-// normal_map Rocks_Normal.tga
140-// roughness_map Rocks_Spec.tga
141-// specular_map Rocks_Diffuse.tga
142-}
143-
144-hlms ship_human3_mat pbs
145-{
146- roughness 0.4
147- fresnel 1.33
148-
149- diffuse_map ship_human4_done.png
150-// normal_map Rocks_Normal.tga
151-// roughness_map Rocks_Spec.tga
152-// specular_map Rocks_Diffuse.tga
153-}
154-
155-hlms ship_reloader_mat pbs
156-{
157- roughness 0.4
158- fresnel 1.33
159-
160- diffuse_map ship_reloader_done.png
161-// normal_map Rocks_Normal.tga
162-// roughness_map Rocks_Spec.tga
163-// specular_map Rocks_Diffuse.tga
164-}
165-
166-//hlms Marble pbs
167-//{
168-// roughness 1.0
169-// detail_map0 MRAMOR6X6.jpg
170-// detail_offset_scale0 0 0 5 5
171-// roughness_map MRAMOR-bump.jpg
172-//}
173-
174-//hlms Rocks pbs
175-//{
176-// roughness 0.4
177-// fresnel 1.33
178-
179-// diffuse_map Rocks_Diffuse.tga
180-// normal_map Rocks_Normal.tga
181-// roughness_map Rocks_Spec.tga
182-// specular_map Rocks_Diffuse.tga
183-//}
\ No newline at end of file
diff -r 21a632d2dabd -r 12d8b44236a9 desktop/raw/hotshot_gamedata/ship_materials_big/material_ships_big.material
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/desktop/raw/hotshot_gamedata/ship_materials_big/material_ships_big.material Tue May 04 21:39:48 2021 +0300
@@ -0,0 +1,54 @@
1+hlms ship_alien_big0_mat pbs
2+{
3+ roughness 0.4
4+ fresnel 1.33
5+
6+ diffuse_map ship_alien_big0_BaseColor.png
7+ normal_map ship_alien_big0_Normal.png
8+ roughness_map ship_alien_big0_Roughness.png
9+ specular_map ship_alien_big0_Metallic.png
10+}
11+
12+hlms ship_alien_big1_mat pbs
13+{
14+ roughness 0.4
15+ fresnel 1.33
16+
17+ diffuse_map ship_alien_big1_BaseColor.png
18+ normal_map ship_alien_big1_Normal.png
19+ roughness_map ship_alien_big1_Roughness.png
20+ specular_map ship_alien_big1_Metallic.png
21+}
22+
23+hlms ship_human_big0_mat pbs
24+{
25+ roughness 0.4
26+ fresnel 1.33
27+
28+ diffuse_map ship_human_big0_BaseColor.png
29+ normal_map ship_human_big0_Normal.png
30+ roughness_map ship_human_big0_Roughness.png
31+ specular_map ship_human_big0_Metallic.png
32+}
33+
34+hlms ship_human_big1_mat pbs
35+{
36+ roughness 0.4
37+ fresnel 1.33
38+
39+ diffuse_map ship_big_human1_done.png
40+// normal_map Rocks_Normal.tga
41+// roughness_map Rocks_Spec.tga
42+// specular_map Rocks_Diffuse.tga
43+}
44+
45+hlms ship_human_big2_mat pbs
46+{
47+ roughness 0.4
48+ fresnel 1.33
49+
50+ diffuse_map ship_human_big2_done.png
51+// normal_map Rocks_Normal.tga
52+// roughness_map Rocks_Spec.tga
53+// specular_map Rocks_Diffuse.tga
54+}
\ No newline at end of file
diff -r 21a632d2dabd -r 12d8b44236a9 desktop/raw/hotshot_gamedata/ship_materials_small/material_ships_small.material
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/desktop/raw/hotshot_gamedata/ship_materials_small/material_ships_small.material Tue May 04 21:39:48 2021 +0300
@@ -0,0 +1,128 @@
1+hlms ship_alien0_mat pbs
2+{
3+ roughness 0.4
4+ fresnel 1.33
5+
6+ diffuse_map ship_alien0_BaseColor.png
7+ normal_map ship_alien0_Normal.png
8+ roughness_map ship_alien0_Roughness.png
9+ specular_map ship_alien0_Metallic.png
10+}
11+
12+hlms ship_alien1_mat pbs
13+{
14+ roughness 0.4
15+ fresnel 1.33
16+
17+ diffuse_map ship_alien1_done.png
18+// normal_map Rocks_Normal.tga
19+// roughness_map Rocks_Spec.tga
20+// specular_map Rocks_Diffuse.tga
21+}
22+
23+hlms ship_alien2_mat pbs
24+{
25+ roughness 0.4
26+ fresnel 1.33
27+
28+ diffuse_map ship_alien2_done.png
29+// normal_map Rocks_Normal.tga
30+// roughness_map Rocks_Spec.tga
31+// specular_map Rocks_Diffuse.tga
32+}
33+
34+hlms ship_alien3_mat pbs
35+{
36+ roughness 0.4
37+ fresnel 1.33
38+
39+ diffuse_map ship_alien3_done.png
40+// normal_map Rocks_Normal.tga
41+// roughness_map Rocks_Spec.tga
42+// specular_map Rocks_Diffuse.tga
43+}
44+
45+hlms ship_alien4_mat pbs
46+{
47+ roughness 0.4
48+ fresnel 1.33
49+
50+ diffuse_map ship_alien4_BaseColor.png
51+ normal_map ship_alien4_Normal.png
52+ roughness_map ship_alien4_Roughness.png
53+ specular_map ship_alien4_Metallic.png
54+}
55+
56+hlms ship_human0_mat pbs
57+{
58+ roughness 0.4
59+ fresnel 1.33
60+
61+ diffuse_map ship_human0_BaseColor.png
62+ normal_map ship_human0_Normal.png
63+ roughness_map ship_human0_Roughness.png
64+ specular_map ship_human0_Metallic.png
65+}
66+
67+hlms ship_human1_mat pbs
68+{
69+ roughness 0.4
70+ fresnel 1.33
71+
72+ diffuse_map ship_human2_done.png
73+// normal_map Rocks_Normal.tga
74+// roughness_map Rocks_Spec.tga
75+// specular_map Rocks_Diffuse.tga
76+}
77+
78+hlms ship_human2_mat pbs
79+{
80+ roughness 0.4
81+ fresnel 1.33
82+
83+ diffuse_map ship_human3_done.png
84+// normal_map Rocks_Normal.tga
85+// roughness_map Rocks_Spec.tga
86+// specular_map Rocks_Diffuse.tga
87+}
88+
89+hlms ship_human3_mat pbs
90+{
91+ roughness 0.4
92+ fresnel 1.33
93+
94+ diffuse_map ship_human4_done.png
95+// normal_map Rocks_Normal.tga
96+// roughness_map Rocks_Spec.tga
97+// specular_map Rocks_Diffuse.tga
98+}
99+
100+hlms ship_reloader_mat pbs
101+{
102+ roughness 0.4
103+ fresnel 1.33
104+
105+ diffuse_map ship_reloader_done.png
106+// normal_map Rocks_Normal.tga
107+// roughness_map Rocks_Spec.tga
108+// specular_map Rocks_Diffuse.tga
109+}
110+
111+//hlms Marble pbs
112+//{
113+// roughness 1.0
114+// detail_map0 MRAMOR6X6.jpg
115+// detail_offset_scale0 0 0 5 5
116+// roughness_map MRAMOR-bump.jpg
117+//}
118+
119+//hlms Rocks pbs
120+//{
121+// roughness 0.4
122+// fresnel 1.33
123+
124+// diffuse_map Rocks_Diffuse.tga
125+// normal_map Rocks_Normal.tga
126+// roughness_map Rocks_Spec.tga
127+// specular_map Rocks_Diffuse.tga
128+//}
\ No newline at end of file
diff -r 21a632d2dabd -r 12d8b44236a9 desktop/raw/resources2.cfg
--- a/desktop/raw/resources2.cfg Thu Apr 29 14:51:43 2021 +0300
+++ b/desktop/raw/resources2.cfg Tue May 04 21:39:48 2021 +0300
@@ -40,8 +40,10 @@
4040 FileSystem=/hotshot_gamedata/ship_meshes
4141 [ShipTextures]
4242 FileSystem=/hotshot_gamedata/ship_textures
43-[ShipMaterials]
44-FileSystem=/hotshot_gamedata/ship_materials
43+[ShipMaterialsBig]
44+FileSystem=/hotshot_gamedata/ship_materials_big
45+[ShipMaterialsSmall]
46+FileSystem=/hotshot_gamedata/ship_materials_small
4547 [Skyboxes]
4648 FileSystem=/hotshot_gamedata/skyboxes
4749 [SkyboxesMaterials]