Skip to content

Commit 172a6f0

Browse files
committed
Update v2.3 for Xenko example
1 parent 885fc8f commit 172a6f0

27 files changed

Lines changed: 164 additions & 190 deletions

BasicUI_Xenko/BasicUI_Xenko.sln

Lines changed: 50 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 2013
4-
VisualStudioVersion = 12.0.40629.0
3+
# Visual Studio 14
4+
VisualStudioVersion = 14.0.25420.1
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "BasicUI_Xenko", "BasicUI_Xenko", "{650DFDF3-E237-4050-9753-C4C4776B0A90}"
77
ProjectSection(SiliconStudioPackage) = preProject
@@ -24,6 +24,12 @@ Global
2424
AppStore|Any CPU = AppStore|Any CPU
2525
AppStore|Mixed Platforms = AppStore|Mixed Platforms
2626
AppStore|Windows = AppStore|Windows
27+
CoreCLR_Debug|Any CPU = CoreCLR_Debug|Any CPU
28+
CoreCLR_Debug|Mixed Platforms = CoreCLR_Debug|Mixed Platforms
29+
CoreCLR_Debug|Windows = CoreCLR_Debug|Windows
30+
CoreCLR_Release|Any CPU = CoreCLR_Release|Any CPU
31+
CoreCLR_Release|Mixed Platforms = CoreCLR_Release|Mixed Platforms
32+
CoreCLR_Release|Windows = CoreCLR_Release|Windows
2733
Debug|Any CPU = Debug|Any CPU
2834
Debug|Mixed Platforms = Debug|Mixed Platforms
2935
Debug|Windows = Debug|Windows
@@ -44,6 +50,24 @@ Global
4450
{E171415E-F63A-4ADB-9F1D-35F83F00C484}.AppStore|Windows.ActiveCfg = AppStore|Any CPU
4551
{E171415E-F63A-4ADB-9F1D-35F83F00C484}.AppStore|Windows.Build.0 = AppStore|Any CPU
4652
{E171415E-F63A-4ADB-9F1D-35F83F00C484}.AppStore|Windows.Deploy.0 = AppStore|Any CPU
53+
{E171415E-F63A-4ADB-9F1D-35F83F00C484}.CoreCLR_Debug|Any CPU.ActiveCfg = CoreCLR_Debug|Any CPU
54+
{E171415E-F63A-4ADB-9F1D-35F83F00C484}.CoreCLR_Debug|Any CPU.Build.0 = CoreCLR_Debug|Any CPU
55+
{E171415E-F63A-4ADB-9F1D-35F83F00C484}.CoreCLR_Debug|Any CPU.Deploy.0 = CoreCLR_Debug|Any CPU
56+
{E171415E-F63A-4ADB-9F1D-35F83F00C484}.CoreCLR_Debug|Mixed Platforms.ActiveCfg = CoreCLR_Debug|Any CPU
57+
{E171415E-F63A-4ADB-9F1D-35F83F00C484}.CoreCLR_Debug|Mixed Platforms.Build.0 = CoreCLR_Debug|Any CPU
58+
{E171415E-F63A-4ADB-9F1D-35F83F00C484}.CoreCLR_Debug|Mixed Platforms.Deploy.0 = CoreCLR_Debug|Any CPU
59+
{E171415E-F63A-4ADB-9F1D-35F83F00C484}.CoreCLR_Debug|Windows.ActiveCfg = CoreCLR_Debug|Any CPU
60+
{E171415E-F63A-4ADB-9F1D-35F83F00C484}.CoreCLR_Debug|Windows.Build.0 = CoreCLR_Debug|Any CPU
61+
{E171415E-F63A-4ADB-9F1D-35F83F00C484}.CoreCLR_Debug|Windows.Deploy.0 = CoreCLR_Debug|Any CPU
62+
{E171415E-F63A-4ADB-9F1D-35F83F00C484}.CoreCLR_Release|Any CPU.ActiveCfg = CoreCLR_Release|Any CPU
63+
{E171415E-F63A-4ADB-9F1D-35F83F00C484}.CoreCLR_Release|Any CPU.Build.0 = CoreCLR_Release|Any CPU
64+
{E171415E-F63A-4ADB-9F1D-35F83F00C484}.CoreCLR_Release|Any CPU.Deploy.0 = CoreCLR_Release|Any CPU
65+
{E171415E-F63A-4ADB-9F1D-35F83F00C484}.CoreCLR_Release|Mixed Platforms.ActiveCfg = CoreCLR_Release|Any CPU
66+
{E171415E-F63A-4ADB-9F1D-35F83F00C484}.CoreCLR_Release|Mixed Platforms.Build.0 = CoreCLR_Release|Any CPU
67+
{E171415E-F63A-4ADB-9F1D-35F83F00C484}.CoreCLR_Release|Mixed Platforms.Deploy.0 = CoreCLR_Release|Any CPU
68+
{E171415E-F63A-4ADB-9F1D-35F83F00C484}.CoreCLR_Release|Windows.ActiveCfg = CoreCLR_Release|Any CPU
69+
{E171415E-F63A-4ADB-9F1D-35F83F00C484}.CoreCLR_Release|Windows.Build.0 = CoreCLR_Release|Any CPU
70+
{E171415E-F63A-4ADB-9F1D-35F83F00C484}.CoreCLR_Release|Windows.Deploy.0 = CoreCLR_Release|Any CPU
4771
{E171415E-F63A-4ADB-9F1D-35F83F00C484}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
4872
{E171415E-F63A-4ADB-9F1D-35F83F00C484}.Debug|Any CPU.Build.0 = Debug|Any CPU
4973
{E171415E-F63A-4ADB-9F1D-35F83F00C484}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
@@ -77,6 +101,18 @@ Global
77101
{44547B06-90D6-477F-9348-CDD1915F980B}.AppStore|Mixed Platforms.Build.0 = AppStore|Any CPU
78102
{44547B06-90D6-477F-9348-CDD1915F980B}.AppStore|Windows.ActiveCfg = AppStore|Any CPU
79103
{44547B06-90D6-477F-9348-CDD1915F980B}.AppStore|Windows.Build.0 = AppStore|Any CPU
104+
{44547B06-90D6-477F-9348-CDD1915F980B}.CoreCLR_Debug|Any CPU.ActiveCfg = CoreCLR_Debug|Any CPU
105+
{44547B06-90D6-477F-9348-CDD1915F980B}.CoreCLR_Debug|Any CPU.Build.0 = CoreCLR_Debug|Any CPU
106+
{44547B06-90D6-477F-9348-CDD1915F980B}.CoreCLR_Debug|Mixed Platforms.ActiveCfg = CoreCLR_Debug|Any CPU
107+
{44547B06-90D6-477F-9348-CDD1915F980B}.CoreCLR_Debug|Mixed Platforms.Build.0 = CoreCLR_Debug|Any CPU
108+
{44547B06-90D6-477F-9348-CDD1915F980B}.CoreCLR_Debug|Windows.ActiveCfg = CoreCLR_Debug|Any CPU
109+
{44547B06-90D6-477F-9348-CDD1915F980B}.CoreCLR_Debug|Windows.Build.0 = CoreCLR_Debug|Any CPU
110+
{44547B06-90D6-477F-9348-CDD1915F980B}.CoreCLR_Release|Any CPU.ActiveCfg = CoreCLR_Release|Any CPU
111+
{44547B06-90D6-477F-9348-CDD1915F980B}.CoreCLR_Release|Any CPU.Build.0 = CoreCLR_Release|Any CPU
112+
{44547B06-90D6-477F-9348-CDD1915F980B}.CoreCLR_Release|Mixed Platforms.ActiveCfg = CoreCLR_Release|Any CPU
113+
{44547B06-90D6-477F-9348-CDD1915F980B}.CoreCLR_Release|Mixed Platforms.Build.0 = CoreCLR_Release|Any CPU
114+
{44547B06-90D6-477F-9348-CDD1915F980B}.CoreCLR_Release|Windows.ActiveCfg = CoreCLR_Release|Any CPU
115+
{44547B06-90D6-477F-9348-CDD1915F980B}.CoreCLR_Release|Windows.Build.0 = CoreCLR_Release|Any CPU
80116
{44547B06-90D6-477F-9348-CDD1915F980B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
81117
{44547B06-90D6-477F-9348-CDD1915F980B}.Debug|Any CPU.Build.0 = Debug|Any CPU
82118
{44547B06-90D6-477F-9348-CDD1915F980B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
@@ -101,6 +137,12 @@ Global
101137
{7B998320-FA99-4F92-8A6F-7BA0538C353C}.AppStore|Mixed Platforms.Build.0 = Release|Any CPU
102138
{7B998320-FA99-4F92-8A6F-7BA0538C353C}.AppStore|Windows.ActiveCfg = Release|Any CPU
103139
{7B998320-FA99-4F92-8A6F-7BA0538C353C}.AppStore|Windows.Build.0 = Release|Any CPU
140+
{7B998320-FA99-4F92-8A6F-7BA0538C353C}.CoreCLR_Debug|Any CPU.ActiveCfg = Debug|Any CPU
141+
{7B998320-FA99-4F92-8A6F-7BA0538C353C}.CoreCLR_Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
142+
{7B998320-FA99-4F92-8A6F-7BA0538C353C}.CoreCLR_Debug|Windows.ActiveCfg = Debug|Any CPU
143+
{7B998320-FA99-4F92-8A6F-7BA0538C353C}.CoreCLR_Release|Any CPU.ActiveCfg = Release|Any CPU
144+
{7B998320-FA99-4F92-8A6F-7BA0538C353C}.CoreCLR_Release|Mixed Platforms.ActiveCfg = Release|Any CPU
145+
{7B998320-FA99-4F92-8A6F-7BA0538C353C}.CoreCLR_Release|Windows.ActiveCfg = Release|Any CPU
104146
{7B998320-FA99-4F92-8A6F-7BA0538C353C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
105147
{7B998320-FA99-4F92-8A6F-7BA0538C353C}.Debug|Any CPU.Build.0 = Debug|Any CPU
106148
{7B998320-FA99-4F92-8A6F-7BA0538C353C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
@@ -125,6 +167,12 @@ Global
125167
{412255AD-EE65-45C6-8921-82C8F156C92C}.AppStore|Mixed Platforms.Build.0 = Release|Any CPU
126168
{412255AD-EE65-45C6-8921-82C8F156C92C}.AppStore|Windows.ActiveCfg = Release|Any CPU
127169
{412255AD-EE65-45C6-8921-82C8F156C92C}.AppStore|Windows.Build.0 = Release|Any CPU
170+
{412255AD-EE65-45C6-8921-82C8F156C92C}.CoreCLR_Debug|Any CPU.ActiveCfg = Debug|Any CPU
171+
{412255AD-EE65-45C6-8921-82C8F156C92C}.CoreCLR_Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
172+
{412255AD-EE65-45C6-8921-82C8F156C92C}.CoreCLR_Debug|Windows.ActiveCfg = Debug|Any CPU
173+
{412255AD-EE65-45C6-8921-82C8F156C92C}.CoreCLR_Release|Any CPU.ActiveCfg = Release|Any CPU
174+
{412255AD-EE65-45C6-8921-82C8F156C92C}.CoreCLR_Release|Mixed Platforms.ActiveCfg = Release|Any CPU
175+
{412255AD-EE65-45C6-8921-82C8F156C92C}.CoreCLR_Release|Windows.ActiveCfg = Release|Any CPU
128176
{412255AD-EE65-45C6-8921-82C8F156C92C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
129177
{412255AD-EE65-45C6-8921-82C8F156C92C}.Debug|Any CPU.Build.0 = Debug|Any CPU
130178
{412255AD-EE65-45C6-8921-82C8F156C92C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,6 @@
1-
!SoundMusic
1+
!Sound
22
Id: 5babf2df-84c3-49b0-acef-8193321e26b7
33
Tags: []
44
Source: ../../Content/Click.wav
5-
~Base:
6-
Location: --import--
7-
Asset: !SoundMusic
8-
Id: 00000000-0000-0000-0000-000000000000
9-
Tags: []
10-
Source:
11-
ImporterId: 5adcb5b0-7011-4d28-9741-23ec7c3df617
5+
Spatialized: false
6+
StreamFromDisk: true
Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,6 @@
1-
!SoundEffect
1+
!Sound
22
Id: 1a087696-5b79-4439-877b-3ab37dd1bd4a
33
Tags: []
44
Source: ../../Content/Click.wav
5-
~Base:
6-
Location: --import--
7-
Asset: !SoundEffect
8-
Id: 00000000-0000-0000-0000-000000000000
9-
Tags: []
10-
Source:
11-
ImporterId: 634842fa-d1db-45c2-b13d-bc11486dae4d
5+
Spatialized: true
6+
StreamFromDisk: false

BasicUI_Xenko/BasicUI_Xenko/Assets/Shared/GameSettings.xkgamesettings

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ Defaults:
88
~Id: 1b8abe58-4c6c-4fcb-a9c1-dcce9a3eca30
99
DefaultBackBufferWidth: 1280
1010
DefaultBackBufferHeight: 720
11+
AdaptBackBufferToScreen: false
1112
DefaultGraphicsProfile: Level_11_0
1213
ColorSpace: Gamma
1314
DisplayOrientation: Default

BasicUI_Xenko/BasicUI_Xenko/Assets/Shared/Images/EmptyKeysLogoTextSmall.xktex

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,3 @@ SerializedVersion: {Xenko: 1.4.0-beta}
44
Tags: []
55
Source: EmptyKeysLogoTextSmall.png
66
ColorKeyColor: {R: 255, G: 0, B: 255, A: 255}
7-
~Base:
8-
Location: --import--
9-
Asset: !Texture
10-
Id: 00000000-0000-0000-0000-000000000000
11-
SerializedVersion: {Xenko: 1.4.0-beta}
12-
Tags: []
13-
Source:
14-
ImporterId: a60986f3-a594-4278-bd9d-68ea172f0558
15-
ColorKeyColor: {R: 255, G: 0, B: 255, A: 255}
Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,6 @@
1-
!SoundMusic
1+
!Sound
22
Id: eed9e017-aa5d-4e74-9b58-aa0e0492b1cf
33
Tags: []
44
Source: ../../Content/KeyPress.wav
5-
~Base:
6-
Location: --import--
7-
Asset: !SoundMusic
8-
Id: 00000000-0000-0000-0000-000000000000
9-
Tags: []
10-
Source:
11-
ImporterId: 5adcb5b0-7011-4d28-9741-23ec7c3df617
5+
Spatialized: false
6+
StreamFromDisk: true
Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,6 @@
1-
!SoundEffect
1+
!Sound
22
Id: c2a3354c-828d-4bfa-be5f-8254b2eb47b3
33
Tags: []
44
Source: ../../Content/KeyPress.wav
5-
~Base:
6-
Location: --import--
7-
Asset: !SoundEffect
8-
Id: 00000000-0000-0000-0000-000000000000
9-
Tags: []
10-
Source:
11-
ImporterId: 634842fa-d1db-45c2-b13d-bc11486dae4d
5+
Spatialized: true
6+
StreamFromDisk: false

BasicUI_Xenko/BasicUI_Xenko/Assets/Shared/MainScene.xkscene

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,7 @@
11
!SceneAsset
22
Id: 8c93517a-df0a-4e5f-9c48-af808ae868af
3-
SerializedVersion: {Xenko: 1.6.0-beta03}
3+
SerializedVersion: {Xenko: 1.7.0-beta04}
44
Tags: []
5-
Hierarchy:
6-
~Id: 3f975216-23b3-401c-a4ce-b49a611fa568
7-
RootEntities:
8-
- ec1d6490-31f7-4b20-9e2c-7fe56a1d3157
9-
Entities:
10-
- Entity:
11-
Id: ec1d6490-31f7-4b20-9e2c-7fe56a1d3157
12-
Name: Entity
13-
Components:
14-
- !TransformComponent
15-
~Id: 9b2fe5e7-041e-4575-834b-2c5dc0ba4c7b
16-
Position: {X: 0.0, Y: 0.0, Z: 0.0}
17-
Rotation: {W: 1.0, X: 0.0, Y: 0.0, Z: 0.0}
18-
Scale: {X: 1.0, Y: 1.0, Z: 1.0}
19-
Children: []
20-
- !BasicUI_Xenko.BasicUIScript,BasicUI_Xenko.Game
21-
~Id: 1e143e57-0fe8-4e42-9c98-1770665b15c4
22-
Design: {}
235
SceneSettings:
246
~Id: d048f352-a808-4f53-93fb-ce78f7adda61
257
GraphicsCompositor: !SceneGraphicsCompositorLayers
@@ -44,6 +26,7 @@ SceneSettings:
4426
Index: 0
4527
Output: !CurrentRenderFrameProvider {}
4628
Viewport: {X: 0.0, Y: 0.0, Width: 100.0, Height: 100.0}
29+
ForceAspectRatio: false
4730
EditorSettings:
4831
~Id: 2174e9a2-7f6d-470f-bec1-fa38dfd7d48f
4932
GridColor: {R: 0.7058824, G: 0.7058824, B: 0.7058824}
@@ -93,3 +76,20 @@ SceneSettings:
9376
Color: {R: 0.0, G: 0.0, B: 0.0}
9477
Antialiasing: !FXAAEffect
9578
~Id: ccf2365b-ea51-4f0f-9342-db3e0b033da1
79+
Hierarchy:
80+
~Id: 3f975216-23b3-401c-a4ce-b49a611fa568
81+
RootPartIds:
82+
- ec1d6490-31f7-4b20-9e2c-7fe56a1d3157
83+
Parts:
84+
- Entity:
85+
Id: ec1d6490-31f7-4b20-9e2c-7fe56a1d3157
86+
Name: Entity
87+
Components:
88+
- !TransformComponent
89+
~Id: 9b2fe5e7-041e-4575-834b-2c5dc0ba4c7b
90+
Position: {X: 0.0, Y: 0.0, Z: 0.0}
91+
Rotation: {W: 1.0, X: 0.0, Y: 0.0, Z: 0.0}
92+
Scale: {X: 1.0, Y: 1.0, Z: 1.0}
93+
Children: []
94+
- !BasicUI_Xenko.BasicUIScript,BasicUI_Xenko.Game
95+
~Id: 1e143e57-0fe8-4e42-9c98-1770665b15c4
Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,6 @@
1-
!SoundMusic
1+
!Sound
22
Id: 734c90f6-466c-4dbf-bdea-1ba01c63b89d
33
Tags: []
44
Source: ../../Content/Move.wav
5-
~Base:
6-
Location: --import--
7-
Asset: !SoundMusic
8-
Id: 00000000-0000-0000-0000-000000000000
9-
Tags: []
10-
Source:
11-
ImporterId: 5adcb5b0-7011-4d28-9741-23ec7c3df617
5+
Spatialized: false
6+
StreamFromDisk: true
Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,6 @@
1-
!SoundEffect
1+
!Sound
22
Id: 4f5087d6-2774-4d77-8caf-fdf00b9851de
33
Tags: []
44
Source: ../../Content/Move.wav
5-
~Base:
6-
Location: --import--
7-
Asset: !SoundEffect
8-
Id: 00000000-0000-0000-0000-000000000000
9-
Tags: []
10-
Source:
11-
ImporterId: 634842fa-d1db-45c2-b13d-bc11486dae4d
5+
Spatialized: true
6+
StreamFromDisk: false

0 commit comments

Comments
 (0)