Skip to content

Commit dae188f

Browse files
Xottab-DUTYXottab-DUTY
committed
Loading screen is now in XML, finally!
Removed dxApplicationRender and cleaned up CApplication Moved rs_loadingstages from xrRender to xrEngine
1 parent ce6164a commit dae188f

37 files changed

+324
-497
lines changed

‎res/gamedata/configs/ui/textures_descr/ui_mm_loading_screen.xml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<w>
2+
<file name="ui\ui_actor_loadgame_screen">
3+
<texture id="ui_mm_loading_screen" x="0" y="0" width="1024" height="768" />
4+
<texture id="ui_mm_loading_progress_bar" x="0" y="772" width="506" height="4" />
5+
</file>
6+
<file name="ui\ui_actor_widescreen_sidepanels">
7+
<texture id="ui_mm_loading_left_widepanel" x="0" y="0" width="128" height="768" />
8+
<texture id="ui_mm_loading_right_widepanel" x="128" y="0" width="128" height="768" />
9+
</file>
10+
</w>

‎res/gamedata/configs/ui/ui_mm_loading_screen.xml‎

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
<w>
2+
<background width="1024" height="768">
3+
<auto_static width="1024" height="768">
4+
<texture>ui_mm_loading_screen</texture>
5+
</auto_static>
6+
</background>
7+
8+
<loading_logo x="0" y="173" width="1024" height="399">
9+
</loading_logo>
10+
11+
<loading_progress_background x="260" y="599" width="405" height="4">
12+
<texture width="405" height="4" color="black" a="255">ui_mm_loading_progress_bar</texture>
13+
</loading_progress_background>
14+
15+
<loading_progress x="260" y="599" width="506" height="4" horz="1" min="0" max="100" pos="0" inertion="5.0">
16+
<progress>
17+
<texture>ui_mm_loading_progress_bar</texture>
18+
</progress>
19+
<min_color r="30" g="88" b="126"/>
20+
<middle_color r="60" g="118" b="156"/>
21+
<max_color r="90" g="148" b="186"/>
22+
</loading_progress>
23+
24+
<loading_progress_percent x="260" y="574" width="506" height="20">
25+
<text align="c" r="170" g="170" b="170" font="letterica18"/>
26+
</loading_progress_percent>
27+
28+
<loading_stage x="260" y="530" width="506" height="20">
29+
<text align="c" r="170" g="170" b="170" font="letterica18"/>
30+
</loading_stage>
31+
32+
<loading_header x="260" y="622" width="506" height="20">
33+
<text align="c" r="103" g="103" b="103" font="letterica18"/>
34+
</loading_header>
35+
36+
<loading_tip_number x="260" y="658" width="506" height="20">
37+
<text align="c" r="103" g="103" b="103" font="letterica18"/>
38+
</loading_tip_number>
39+
40+
<loading_tip x="163" y="676" width="700" height="80" complex_mode="1">
41+
<text alignment="c" align="c" r="103" g="103" b="103" font="letterica18"/>
42+
</loading_tip>
43+
</w>

‎res/gamedata/configs/ui/ui_mm_loading_screen_16.xml‎

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
<w>
2+
<background width="1024" height="768">
3+
<auto_static x="102" y="0" width="819" height="768" stretch="1">
4+
<texture>ui_mm_loading_screen</texture>
5+
</auto_static>
6+
<auto_static x="0" y="0" width="104" height="768" stretch="1">
7+
<texture>ui_mm_loading_left_widepanel</texture>
8+
</auto_static>
9+
<auto_static x="920" y="0" width="104" height="768" stretch="1">
10+
<texture>ui_mm_loading_right_widepanel</texture>
11+
</auto_static>
12+
</background>
13+
14+
<loading_logo x="104" y="173" width="816" height="512" stretch="1">
15+
</loading_logo>
16+
17+
<loading_progress_background x="310" y="599" width="405" height="4">
18+
<texture width="405" height="4" color="black" a="255">ui_mm_loading_progress_bar</texture>
19+
</loading_progress_background>
20+
21+
<loading_progress x="310" y="599" width="405" height="4" horz="1" min="0" max="100" pos="0" inertion="5.0">
22+
<progress>
23+
<texture>ui_mm_loading_progress_bar</texture>
24+
</progress>
25+
<min_color r="30" g="88" b="126"/>
26+
<middle_color r="60" g="118" b="156"/>
27+
<max_color r="90" g="148" b="186"/>
28+
</loading_progress>
29+
30+
<loading_progress_percent x="310" y="574" width="405" height="20" stretch="1">
31+
<text align="c" r="170" g="170" b="170" a="0" font="letterica18"/>
32+
</loading_progress_percent>
33+
34+
<loading_stage x="310" y="530" width="405" height="20" stretch="1">
35+
<text align="c" r="170" g="170" b="170" font="letterica18"/>
36+
</loading_stage>
37+
38+
<loading_header x="310" y="622" width="405" height="20" stretch="1">
39+
<text align="c" r="103" g="103" b="103" font="letterica18"/>
40+
</loading_header>
41+
42+
<loading_tip_number x="310" y="658" width="405" height="20" stretch="1">
43+
<text align="c" r="103" g="103" b="103" font="letterica18"/>
44+
</loading_tip_number>
45+
46+
<loading_tip x="273" y="676" width="480" height="80" complex_mode="1" stretch="1">
47+
<text alignment="c" align="c" r="103" g="103" b="103" font="letterica18"/>
48+
</loading_tip>
49+
</w>

‎src/Include/xrRender/ApplicationRender.h‎

Lines changed: 0 additions & 19 deletions
This file was deleted.

‎src/Include/xrRender/FactoryPtr.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ FACTORY_PTR_INSTANCIATE(ConsoleRender)
5353
#ifdef DEBUG
5454
FACTORY_PTR_INSTANCIATE(ObjectSpaceRender)
5555
#endif // DEBUG
56-
FACTORY_PTR_INSTANCIATE(ApplicationRender)
5756
FACTORY_PTR_INSTANCIATE(WallMarkArray)
5857
#endif // _EDITOR
5958

‎src/Include/xrRender/RenderFactory.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ class IRenderFactory
5151
#ifdef DEBUG
5252
RENDER_FACTORY_INTERFACE(ObjectSpaceRender)
5353
#endif // DEBUG
54-
RENDER_FACTORY_INTERFACE(ApplicationRender)
5554
RENDER_FACTORY_INTERFACE(WallMarkArray)
5655
#endif // _EDITOR
5756

0 commit comments

Comments
 (0)