BTH/axyz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'Menu' of https://github.com/teamfisk/TacticalZ into Menu

Browse Source
This commit is contained in:
Teejoon
2016-03-11 11:41:11 +01:00
parent cac0522ae7 26dde21e3d
commit 91aedcbb14
7 changed files with 283 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/Schema/Components/ConfigBtnFloat.xml
+6
View File
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<ConfigBtnFloat xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="ConfigBtnFloat.xsd">
<Header></Header>
<Field></Field>
<PressValue></PressValue>
</ConfigBtnFloat>
resources/Schema/Components/ConfigBtnFloat.xsd
+22
View File
@@ -0,0 +1,22 @@
<?xml version="1.0"?>
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:t="types">
<xs:import schemaLocation="../Types.xsd" namespace="types"/>
<xs:element name="ConfigBtnFloat">
<xs:annotation><xs:documentation>Used with a Button component, this button will change a variable in the config file.</xs:documentation></xs:annotation>
<xs:complexType>
<xs:all>
<xs:element name="Header" type="t:string" minOccurs="0">
<xs:annotation><xs:documentation>The header of the section in config.</xs:documentation></xs:annotation>
</xs:element>
<xs:element name="Field" type="t:string" minOccurs="0">
<xs:annotation><xs:documentation>The name of the field to be changed in the config.</xs:documentation></xs:annotation>
</xs:element>
<xs:element name="PressValue" type="t:float" minOccurs="0">
<xs:annotation><xs:documentation>The value to give the field.</xs:documentation></xs:annotation>
</xs:element>
</xs:all>
</xs:complexType>
</xs:element>
</xs:schema>
resources/Schema/Components/ConfigBtnResolution.xml
+6
View File
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<ConfigBtnResolution xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="ConfigBtnResolution.xsd">
<Header></Header>
<Field></Field>
<PressValue></PressValue>
</ConfigBtnResolution>
resources/Schema/Components/ConfigBtnResolution.xsd
+17
View File
@@ -0,0 +1,17 @@
<?xml version="1.0"?>
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:t="types">
<xs:import schemaLocation="../Types.xsd" namespace="types"/>
<xs:element name="ConfigBtnResolution">
<xs:annotation><xs:documentation>Used with a Button component, this button will change a variable in the config file.</xs:documentation></xs:annotation>
<xs:complexType>
<xs:all>
<xs:element name="Width" type="t:int" minOccurs="0">
<xs:annotation><xs:documentation>Value of the resolution width.</xs:documentation></xs:annotation>
</xs:element>
<xs:element name="Height" type="t:int" minOccurs="0">
<xs:annotation><xs:documentation>Value of the resolution height.</xs:documentation></xs:annotation>
</xs:element>
</xs:all>
</xs:complexType>
</xs:element>
</xs:schema>
resources/Schema/Entities/OptionMenu.xml
+111
View File
@@ -0,0 +1,111 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<Entity name="OptionsOrigin" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
<Components>
<c:Transform/>
</Components>
<Children>
<Entity name="Buttons_anchor">
<Components>
<c:Transform>
<Position X="0" Y="0.168000013" Z="0.0199999996"/>
</c:Transform>
</Components>
<Children>
<Entity name="Res1080">
<Components>
<c:Sprite>
<Model>Models/Core/UnitQuad.mesh</Model>
<GlowMap></GlowMap>
<DiffuseTexture>Textures/Core/White.png</DiffuseTexture>
</c:Sprite>
<c:Transform>
<Position X="-0.088000007" Y="0" Z="0"/>
<Scale X="0.0820000023" Y="0.0299999993" Z="1"/>
</c:Transform>
</Components>
<Children>
<Entity name="Text">
<Components>
<c:Text>
<Content>1920x1080</Content>
<Resource>Fonts/DroidSans.ttf,64</Resource>
<Color A="1" B="0" G="0" R="0"/>
<Alignment>
<Left/>
</Alignment>
</c:Text>
<c:Transform>
<Position X="-0.387000024" Y="-0.472000033" Z="0.0199999996"/>
<Scale X="0.192000002" Y="0.396000028" Z="1"/>
</c:Transform>
</Components>
<Children/>
</Entity>
</Children>
</Entity>
</Children>
</Entity>
<Entity name="Background_Origin">
<Components>
<c:Transform/>
</Components>
<Children>
<Entity name="Background">
<Components>
<c:Sprite>
<Model>Models/Core/UnitQuad.mesh</Model>
<GlowMap></GlowMap>
<DiffuseTexture>Textures/Core/White.png</DiffuseTexture>
<BlurBackground>true</BlurBackground>
<Color A="0.196078435" B="0" G="0" R="0"/>
</c:Sprite>
<c:Transform>
<Scale X="0.300000012" Y="0.5" Z="1"/>
</c:Transform>
</Components>
<Children/>
</Entity>
<Entity name="Title_Origin">
<Components>
<c:Transform/>
</Components>
<Children>
<Entity name="Text">
<Components>
<c:Text>
<Content>Options</Content>
<Resource>Fonts/DroidSans.ttf,64</Resource>
<Alignment>
<Left/>
</Alignment>
</c:Text>
<c:Transform>
<Position X="-0.131999999" Y="0.202000007" Z="0.0199999996"/>
<Scale X="0.0320000015" Y="0.0310000014" Z="1"/>
</c:Transform>
</Components>
<Children/>
</Entity>
<Entity name="UnderLine">
<Components>
<c:Sprite>
<Model>Models/Core/UnitQuad.mesh</Model>
<GlowMap></GlowMap>
<DiffuseTexture>Textures/Core/White.png</DiffuseTexture>
</c:Sprite>
<c:Transform>
<Position X="0.00500000035" Y="0.198000014" Z="0.0199999996"/>
<Scale X="0.270000011" Y="0.00100000005" Z="1"/>
</c:Transform>
</Components>
<Children/>
</Entity>
</Children>
</Entity>
</Children>
</Entity>
</Children>
</Entity>
resources/Schema/Entities/StartMenu.xml
+118 -105
View File
@@ -22,7 +22,7 @@
<Entity>
<Components>
<c:CapturePointGameMode>
<RespawnTime>4.7191051568560454</RespawnTime>
<RespawnTime>0.53338721940212963</RespawnTime>
</c:CapturePointGameMode>
<c:Transform/>
</Components>
@@ -2828,7 +2828,7 @@
</c:Model>
<c:Transform>
<Position X="0" Y="2.36784196" Z="0"/>
<Orientation X="0" Y="25838.0078" Z="0"/>
<Orientation X="0" Y="26060.2324" Z="0"/>
<Scale X="0.600000024" Y="0.600000024" Z="0.600000024"/>
</c:Transform>
</Components>
@@ -2870,7 +2870,7 @@
</c:Model>
<c:Transform>
<Position X="0" Y="2.36784196" Z="0"/>
<Orientation X="0" Y="90362.9844" Z="0"/>
<Orientation X="0" Y="90593.4219" Z="0"/>
<Scale X="0.600000024" Y="0.600000024" Z="0.600000024"/>
</c:Transform>
</Components>
@@ -2912,7 +2912,7 @@
</c:Model>
<c:Transform>
<Position X="0" Y="2.36784196" Z="0"/>
<Orientation X="0" Y="90301.125" Z="0"/>
<Orientation X="0" Y="90531.5625" Z="0"/>
<Scale X="0.600000024" Y="0.600000024" Z="0.600000024"/>
</c:Transform>
</Components>
@@ -2954,7 +2954,7 @@
</c:Model>
<c:Transform>
<Position X="0" Y="2.36800003" Z="0"/>
<Orientation X="0" Y="71417.3281" Z="0"/>
<Orientation X="0" Y="71647.7656" Z="0"/>
<Scale X="0.600000024" Y="0.600000024" Z="0.600000024"/>
</c:Transform>
</Components>
@@ -2996,7 +2996,7 @@
</c:Model>
<c:Transform>
<Position X="0" Y="2.36800003" Z="0"/>
<Orientation X="0" Y="25768.3613" Z="0"/>
<Orientation X="0" Y="25990.5859" Z="0"/>
<Scale X="0.600000024" Y="0.600000024" Z="0.600000024"/>
</c:Transform>
</Components>
@@ -3038,7 +3038,7 @@
</c:Model>
<c:Transform>
<Position X="0" Y="2.36784196" Z="0"/>
<Orientation X="0" Y="80968.2656" Z="0"/>
<Orientation X="0" Y="81198.7031" Z="0"/>
<Scale X="0.600000024" Y="0.600000024" Z="0.600000024"/>
</c:Transform>
</Components>
@@ -3080,7 +3080,7 @@
</c:Model>
<c:Transform>
<Position X="0" Y="2.36784196" Z="0"/>
<Orientation X="0" Y="78705.4375" Z="0"/>
<Orientation X="0" Y="78935.875" Z="0"/>
<Scale X="0.600000024" Y="0.600000024" Z="0.600000024"/>
</c:Transform>
</Components>
@@ -3122,7 +3122,7 @@
</c:Model>
<c:Transform>
<Position X="0" Y="2.36784196" Z="0"/>
<Orientation X="0" Y="90362.9844" Z="0"/>
<Orientation X="0" Y="90593.4219" Z="0"/>
<Scale X="0.600000024" Y="0.600000024" Z="0.600000024"/>
</c:Transform>
</Components>
@@ -3164,7 +3164,7 @@
</c:Model>
<c:Transform>
<Position X="0" Y="2.36784196" Z="0"/>
<Orientation X="0" Y="78705.4375" Z="0"/>
<Orientation X="0" Y="78935.875" Z="0"/>
<Scale X="0.600000024" Y="0.600000024" Z="0.600000024"/>
</c:Transform>
</Components>
@@ -5261,7 +5261,7 @@
</c:Model>
<c:Transform>
<Position X="0" Y="2.36800003" Z="0"/>
<Orientation X="0" Y="71264.125" Z="0"/>
<Orientation X="0" Y="71494.5625" Z="0"/>
<Scale X="0.600000024" Y="0.600000024" Z="0.600000024"/>
</c:Transform>
</Components>
@@ -5303,7 +5303,7 @@
</c:Model>
<c:Transform>
<Position X="0" Y="2.36784196" Z="0"/>
<Orientation X="0" Y="47321.9336" Z="0"/>
<Orientation X="0" Y="47550.7578" Z="0"/>
<Scale X="0.600000024" Y="0.600000024" Z="0.600000024"/>
</c:Transform>
</Components>
@@ -6869,7 +6869,7 @@
</c:Model>
<c:Transform>
<Position X="0" Y="2.36800003" Z="0"/>
<Orientation X="0" Y="71387.9063" Z="0"/>
<Orientation X="0" Y="71618.3438" Z="0"/>
<Scale X="0.600000024" Y="0.600000024" Z="0.600000024"/>
</c:Transform>
</Components>
@@ -6911,7 +6911,7 @@
</c:Model>
<c:Transform>
<Position X="0" Y="2.36784196" Z="0"/>
<Orientation X="0" Y="90329.8594" Z="0"/>
<Orientation X="0" Y="90560.2969" Z="0"/>
<Scale X="0.600000024" Y="0.600000024" Z="0.600000024"/>
</c:Transform>
</Components>
@@ -6953,7 +6953,7 @@
</c:Model>
<c:Transform>
<Position X="0" Y="2.36784196" Z="0"/>
<Orientation X="0" Y="78672.3125" Z="0"/>
<Orientation X="0" Y="78902.75" Z="0"/>
<Scale X="0.600000024" Y="0.600000024" Z="0.600000024"/>
</c:Transform>
</Components>
@@ -6995,7 +6995,7 @@
</c:Model>
<c:Transform>
<Position X="0" Y="2.36784196" Z="0"/>
<Orientation X="0" Y="80935.1406" Z="0"/>
<Orientation X="0" Y="81165.5781" Z="0"/>
<Scale X="0.600000024" Y="0.600000024" Z="0.600000024"/>
</c:Transform>
</Components>
@@ -7037,7 +7037,7 @@
</c:Model>
<c:Transform>
<Position X="0" Y="2.36784196" Z="0"/>
<Orientation X="0" Y="90268" Z="0"/>
<Orientation X="0" Y="90498.4375" Z="0"/>
<Scale X="0.600000024" Y="0.600000024" Z="0.600000024"/>
</c:Transform>
</Components>
@@ -7079,7 +7079,7 @@
</c:Model>
<c:Transform>
<Position X="0" Y="2.36784196" Z="0"/>
<Orientation X="0" Y="25805.2559" Z="0"/>
<Orientation X="0" Y="26027.4805" Z="0"/>
<Scale X="0.600000024" Y="0.600000024" Z="0.600000024"/>
</c:Transform>
</Components>
@@ -7121,7 +7121,7 @@
</c:Model>
<c:Transform>
<Position X="0" Y="2.36784196" Z="0"/>
<Orientation X="0" Y="90329.8594" Z="0"/>
<Orientation X="0" Y="90560.2969" Z="0"/>
<Scale X="0.600000024" Y="0.600000024" Z="0.600000024"/>
</c:Transform>
</Components>
@@ -8796,7 +8796,7 @@
<Axis X="0" Y="1" Z="0"/>
</c:RaptorCopter>
<c:Transform>
<Orientation X="0" Y="103.331795" Z="0"/>
<Orientation X="0" Y="165.48909" Z="0"/>
</c:Transform>
</Components>
<Children>
@@ -8808,7 +8808,7 @@
</c:RaptorCopter>
<c:Transform>
<Position X="0" Y="26" Z="40"/>
<Orientation X="0" Y="-123.565147" Z="0"/>
<Orientation X="0" Y="-247.882935" Z="0"/>
</c:Transform>
</Components>
<Children>
@@ -8854,44 +8854,6 @@
<c:Transform/>
</Components>
<Children>
<Entity name="ButtonCorner_Origin">
<Components>
<c:Transform/>
</Components>
<Children>
<Entity name="TopRight">
<Components>
<c:Sprite>
<Model>Models/Core/UnitQuad.mesh</Model>
<GlowMap></GlowMap>
<DiffuseTexture>Textures/HUD/ButtonCorner_16.png</DiffuseTexture>
<Linear>false</Linear>
</c:Sprite>
<c:Transform>
<Position X="0.0970000029" Y="0.0220000017" Z="0.00499999989"/>
<Scale X="0.00499999989" Y="0.00499999989" Z="1"/>
</c:Transform>
</Components>
<Children/>
</Entity>
<Entity name="BottomRight">
<Components>
<c:Sprite>
<Model>Models/Core/UnitQuad.mesh</Model>
<GlowMap></GlowMap>
<DiffuseTexture>Textures/HUD/ButtonCorner_16.png</DiffuseTexture>
<Linear>false</Linear>
</c:Sprite>
<c:Transform>
<Position X="0.0970000029" Y="-0.0219999999" Z="0.00499999989"/>
<Orientation X="0" Y="0" Z="4.71199989"/>
<Scale X="0.00499999989" Y="0.00499999989" Z="1"/>
</c:Transform>
</Components>
<Children/>
</Entity>
</Children>
</Entity>
<Entity name="Button_1">
<Components>
<c:Button/>
@@ -8913,6 +8875,44 @@
</Components>
<Children/>
</Entity>
<Entity name="ButtonCorner_Origin">
<Components>
<c:Transform/>
</Components>
<Children>
<Entity name="BottomRight">
<Components>
<c:Sprite>
<Model>Models/Core/UnitQuad.mesh</Model>
<GlowMap></GlowMap>
<DiffuseTexture>Textures/HUD/ButtonCorner_16.png</DiffuseTexture>
<Linear>false</Linear>
</c:Sprite>
<c:Transform>
<Position X="0.0970000029" Y="-0.0219999999" Z="0.00499999989"/>
<Orientation X="0" Y="0" Z="4.71199989"/>
<Scale X="0.00499999989" Y="0.00499999989" Z="1"/>
</c:Transform>
</Components>
<Children/>
</Entity>
<Entity name="TopRight">
<Components>
<c:Sprite>
<Model>Models/Core/UnitQuad.mesh</Model>
<GlowMap></GlowMap>
<DiffuseTexture>Textures/HUD/ButtonCorner_16.png</DiffuseTexture>
<Linear>false</Linear>
</c:Sprite>
<c:Transform>
<Position X="0.0970000029" Y="0.0220000017" Z="0.00499999989"/>
<Scale X="0.00499999989" Y="0.00499999989" Z="1"/>
</c:Transform>
</Components>
<Children/>
</Entity>
</Children>
</Entity>
<Entity name="Text">
<Components>
<c:Text>
@@ -8976,6 +8976,21 @@
<c:Transform/>
</Components>
<Children>
<Entity name="TopRight">
<Components>
<c:Sprite>
<Model>Models/Core/UnitQuad.mesh</Model>
<GlowMap></GlowMap>
<DiffuseTexture>Textures/HUD/ButtonCorner_16.png</DiffuseTexture>
<Linear>false</Linear>
</c:Sprite>
<c:Transform>
<Position X="0.0970000029" Y="0.0220000017" Z="0.00499999989"/>
<Scale X="0.00499999989" Y="0.00499999989" Z="1"/>
</c:Transform>
</Components>
<Children/>
</Entity>
<Entity name="BottomRight">
<Components>
<c:Sprite>
@@ -8992,21 +9007,6 @@
</Components>
<Children/>
</Entity>
<Entity name="TopRight">
<Components>
<c:Sprite>
<Model>Models/Core/UnitQuad.mesh</Model>
<GlowMap></GlowMap>
<DiffuseTexture>Textures/HUD/ButtonCorner_16.png</DiffuseTexture>
<Linear>false</Linear>
</c:Sprite>
<c:Transform>
<Position X="0.0970000029" Y="0.0220000017" Z="0.00499999989"/>
<Scale X="0.00499999989" Y="0.00499999989" Z="1"/>
</c:Transform>
</Components>
<Children/>
</Entity>
</Children>
</Entity>
</Children>
@@ -9023,21 +9023,6 @@
<c:Transform/>
</Components>
<Children>
<Entity name="TopRight">
<Components>
<c:Sprite>
<Model>Models/Core/UnitQuad.mesh</Model>
<GlowMap></GlowMap>
<DiffuseTexture>Textures/HUD/ButtonCorner_16.png</DiffuseTexture>
<Linear>false</Linear>
</c:Sprite>
<c:Transform>
<Position X="0.0970000029" Y="0.0220000017" Z="0.00499999989"/>
<Scale X="0.00499999989" Y="0.00499999989" Z="1"/>
</c:Transform>
</Components>
<Children/>
</Entity>
<Entity name="BottomRight">
<Components>
<c:Sprite>
@@ -9054,6 +9039,21 @@
</Components>
<Children/>
</Entity>
<Entity name="TopRight">
<Components>
<c:Sprite>
<Model>Models/Core/UnitQuad.mesh</Model>
<GlowMap></GlowMap>
<DiffuseTexture>Textures/HUD/ButtonCorner_16.png</DiffuseTexture>
<Linear>false</Linear>
</c:Sprite>
<c:Transform>
<Position X="0.0970000029" Y="0.0220000017" Z="0.00499999989"/>
<Scale X="0.00499999989" Y="0.00499999989" Z="1"/>
</c:Transform>
</Components>
<Children/>
</Entity>
</Children>
</Entity>
<Entity name="Button_2">
@@ -9067,6 +9067,10 @@
<BlurBackground>true</BlurBackground>
<Color A="0.392156869" B="0" G="0" R="0"/>
</c:Sprite>
<c:InputCmdButton>
<Command>Options</Command>
<PressValue>1</PressValue>
</c:InputCmdButton>
<c:Transform>
<Scale X="0.200000003" Y="0.0500000007" Z="1"/>
</c:Transform>
@@ -9076,7 +9080,7 @@
<Entity name="Text">
<Components>
<c:Text>
<Content>Option</Content>
<Content>Options</Content>
<Resource>Fonts/DroidSans.ttf,64</Resource>
<Alignment>
<Right/>
@@ -9136,6 +9140,21 @@
<c:Transform/>
</Components>
<Children>
<Entity name="TopRight">
<Components>
<c:Sprite>
<Model>Models/Core/UnitQuad.mesh</Model>
<GlowMap></GlowMap>
<DiffuseTexture>Textures/HUD/ButtonCorner_16.png</DiffuseTexture>
<Linear>false</Linear>
</c:Sprite>
<c:Transform>
<Position X="0.0970000029" Y="0.0220000017" Z="0.00499999989"/>
<Scale X="0.00499999989" Y="0.00499999989" Z="1"/>
</c:Transform>
</Components>
<Children/>
</Entity>
<Entity name="BottomRight">
<Components>
<c:Sprite>
@@ -9152,21 +9171,6 @@
</Components>
<Children/>
</Entity>
<Entity name="TopRight">
<Components>
<c:Sprite>
<Model>Models/Core/UnitQuad.mesh</Model>
<GlowMap></GlowMap>
<DiffuseTexture>Textures/HUD/ButtonCorner_16.png</DiffuseTexture>
<Linear>false</Linear>
</c:Sprite>
<c:Transform>
<Position X="0.0970000029" Y="0.0220000017" Z="0.00499999989"/>
<Scale X="0.00499999989" Y="0.00499999989" Z="1"/>
</c:Transform>
</Components>
<Children/>
</Entity>
</Children>
</Entity>
</Children>
@@ -9189,6 +9193,15 @@
</Components>
<Children/>
</Entity>
<Entity name="OptionsSpawner">
<Components>
<c:Spawner>
<EntityFile>Schema/Entities/OptionMenu.xml</EntityFile>
</c:Spawner>
<c:Transform/>
</Components>
<Children/>
</Entity>
</Children>
</Entity>
</Children>
resources/Shaders/Sprite.frag.glsl
+3 -2
View File
@@ -29,9 +29,10 @@ void main()
vec4 color_result = Color * diffuseTexel;
float pos = ((P * vec4(Input.Position, 1)).y + 1.0)/2.0;
float fillResult = floor(pos*FillPercentage);
color_result = FillColor*diffuseTexel.a*fillResult + color_result*(1-fillResult);
if(pos <= FillPercentage) {
color_result = FillColor*diffuseTexel.a;
}
sceneColor = vec4(color_result.xyz, clamp(color_result.a, 0, 1));