Skip to content

Commit 90a3336

Browse files
seanpaultaylorseanpaultaylor
committed
Fixes to VS2013 projects for updated resources.
1 parent 4ed4ab6 commit 90a3336

File tree

8 files changed

+83
-41
lines changed

8 files changed

+83
-41
lines changed

‎samples/browser/sample-browser.vcxproj‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -161,9 +161,6 @@ copy ..\..\gameplay\res\logo_powered_white.png res</Command>
161161
</PreBuildEvent>
162162
</ItemDefinitionGroup>
163163
<ItemGroup>
164-
<None Include="bar-descriptor.xml">
165-
<SubType>Designer</SubType>
166-
</None>
167164
<None Include="game.config">
168165
<SubType>Designer</SubType>
169166
</None>
@@ -196,7 +193,6 @@ copy ..\..\gameplay\res\logo_powered_white.png res</Command>
196193
<None Include="res\common\forms\formZOrder.form" />
197194
<None Include="res\common\gamepad.form" />
198195
<None Include="res\common\gamepad.theme" />
199-
<None Include="res\common\grid.material" />
200196
<None Include="res\common\inputs.form" />
201197
<None Include="res\common\light.form" />
202198
<None Include="res\common\light.material" />

‎samples/browser/sample-browser.vcxproj.filters‎

Lines changed: 75 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,16 @@
3333
<Filter Include="res\common\audio">
3434
<UniqueIdentifier>{7da0c58a-d770-4181-8781-f9948df5bdd3}</UniqueIdentifier>
3535
</Filter>
36+
<Filter Include="res\common\water">
37+
<UniqueIdentifier>{e6d4de4b-95e9-4893-a8a9-ce00291995cb}</UniqueIdentifier>
38+
</Filter>
39+
<Filter Include="res\common\particles">
40+
<UniqueIdentifier>{98333a4d-224e-4f83-ac60-baca4885bf82}</UniqueIdentifier>
41+
</Filter>
3642
</ItemGroup>
3743
<ItemGroup>
3844
<None Include="game.config" />
3945
<None Include="icon.png" />
40-
<None Include="bar-descriptor.xml" />
4146
<None Include="res\common\forms\formBasicControls.form">
4247
<Filter>res\common\forms</Filter>
4348
</None>
@@ -143,9 +148,6 @@
143148
<None Include="res\common\gamepad.theme">
144149
<Filter>res\common</Filter>
145150
</None>
146-
<None Include="res\common\grid.material">
147-
<Filter>res\common</Filter>
148-
</None>
149151
<None Include="res\common\inputs.form">
150152
<Filter>res\common</Filter>
151153
</None>
@@ -254,17 +256,6 @@
254256
<None Include="res\common\fonts\neuropol.gpb">
255257
<Filter>res\common\fonts</Filter>
256258
</None>
257-
<None Include="res\common\particles\editor.form" />
258-
<None Include="res\common\particles\editor.theme" />
259-
<None Include="res\common\particles\explosion.particle" />
260-
<None Include="res\common\particles\fire.particle" />
261-
<None Include="res\common\particles\grid.material" />
262-
<None Include="res\common\particles\smoke.particle" />
263-
<None Include="res\common\water\pond.gpb" />
264-
<None Include="res\common\water\watersample.frag" />
265-
<None Include="res\common\water\watersample.material" />
266-
<None Include="res\common\water\watersample.scene" />
267-
<None Include="res\common\water\watersample.vert" />
268259
<None Include="res\common\audio\background.form">
269260
<Filter>res\common\audio</Filter>
270261
</None>
@@ -283,6 +274,39 @@
283274
<None Include="res\common\audio\sample.audio">
284275
<Filter>res\common\audio</Filter>
285276
</None>
277+
<None Include="res\common\water\watersample.vert">
278+
<Filter>res\common\water</Filter>
279+
</None>
280+
<None Include="res\common\water\watersample.frag">
281+
<Filter>res\common\water</Filter>
282+
</None>
283+
<None Include="res\common\water\watersample.material">
284+
<Filter>res\common\water</Filter>
285+
</None>
286+
<None Include="res\common\water\watersample.scene">
287+
<Filter>res\common\water</Filter>
288+
</None>
289+
<None Include="res\common\particles\editor.form">
290+
<Filter>res\common\particles</Filter>
291+
</None>
292+
<None Include="res\common\particles\editor.theme">
293+
<Filter>res\common\particles</Filter>
294+
</None>
295+
<None Include="res\common\particles\explosion.particle">
296+
<Filter>res\common\particles</Filter>
297+
</None>
298+
<None Include="res\common\particles\fire.particle">
299+
<Filter>res\common\particles</Filter>
300+
</None>
301+
<None Include="res\common\particles\smoke.particle">
302+
<Filter>res\common\particles</Filter>
303+
</None>
304+
<None Include="res\common\water\pond.gpb">
305+
<Filter>res\common\water</Filter>
306+
</None>
307+
<None Include="res\common\particles\grid.material">
308+
<Filter>res\common</Filter>
309+
</None>
286310
</ItemGroup>
287311
<ItemGroup>
288312
<ClInclude Include="src\MeshPrimitiveSample.h">
@@ -345,9 +369,6 @@
345369
<ClInclude Include="src\WaterSample.h">
346370
<Filter>src</Filter>
347371
</ClInclude>
348-
<ClInclude Include="src\ParticlesSample.h" />
349-
<ClInclude Include="src\FontSample.h" />
350-
<ClInclude Include="src\SpriteSample.h" />
351372
<ClInclude Include="src\SceneCreateSample.h">
352373
<Filter>src</Filter>
353374
</ClInclude>
@@ -357,6 +378,15 @@
357378
<ClInclude Include="src\AudioSample.h">
358379
<Filter>src</Filter>
359380
</ClInclude>
381+
<ClInclude Include="src\ParticlesSample.h">
382+
<Filter>src</Filter>
383+
</ClInclude>
384+
<ClInclude Include="src\SpriteSample.h">
385+
<Filter>src</Filter>
386+
</ClInclude>
387+
<ClInclude Include="src\FontSample.h">
388+
<Filter>src</Filter>
389+
</ClInclude>
360390
</ItemGroup>
361391
<ItemGroup>
362392
<ClCompile Include="src\MeshPrimitiveSample.cpp">
@@ -419,9 +449,6 @@
419449
<ClCompile Include="src\WaterSample.cpp">
420450
<Filter>src</Filter>
421451
</ClCompile>
422-
<ClCompile Include="src\ParticlesSample.cpp" />
423-
<ClCompile Include="src\FontSample.cpp" />
424-
<ClCompile Include="src\SpriteSample.cpp" />
425452
<ClCompile Include="src\SceneCreateSample.cpp">
426453
<Filter>src</Filter>
427454
</ClCompile>
@@ -431,6 +458,15 @@
431458
<ClCompile Include="src\AudioSample.cpp">
432459
<Filter>src</Filter>
433460
</ClCompile>
461+
<ClCompile Include="src\ParticlesSample.cpp">
462+
<Filter>src</Filter>
463+
</ClCompile>
464+
<ClCompile Include="src\SpriteSample.cpp">
465+
<Filter>src</Filter>
466+
</ClCompile>
467+
<ClCompile Include="src\FontSample.cpp">
468+
<Filter>src</Filter>
469+
</ClCompile>
434470
</ItemGroup>
435471
<ItemGroup>
436472
<Image Include="res\common\terrain\dirt.dds">
@@ -490,12 +526,24 @@
490526
<Image Include="res\png\logo.png">
491527
<Filter>res\png</Filter>
492528
</Image>
493-
<Image Include="res\common\particles\editor.png" />
494-
<Image Include="res\common\particles\explosion.png" />
495-
<Image Include="res\common\particles\fire.png" />
496-
<Image Include="res\common\particles\smoke.png" />
497-
<Image Include="res\common\water\water_normal.png" />
498-
<Image Include="res\common\water\water_sample.png" />
529+
<Image Include="res\common\water\water_normal.png">
530+
<Filter>res\common\water</Filter>
531+
</Image>
532+
<Image Include="res\common\water\water_sample.png">
533+
<Filter>res\common\water</Filter>
534+
</Image>
535+
<Image Include="res\common\particles\editor.png">
536+
<Filter>res\common\particles</Filter>
537+
</Image>
538+
<Image Include="res\common\particles\explosion.png">
539+
<Filter>res\common\particles</Filter>
540+
</Image>
541+
<Image Include="res\common\particles\fire.png">
542+
<Filter>res\common\particles</Filter>
543+
</Image>
544+
<Image Include="res\common\particles\smoke.png">
545+
<Filter>res\common\particles</Filter>
546+
</Image>
499547
</ItemGroup>
500548
<ItemGroup>
501549
<Media Include="res\common\footsteps.wav">

‎samples/character/sample-character.vcxproj‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -164,9 +164,6 @@ copy .\game.dxt.config .\game.config</Command>
164164
</PreBuildEvent>
165165
</ItemDefinitionGroup>
166166
<ItemGroup>
167-
<None Include="bar-descriptor.xml">
168-
<SubType>Designer</SubType>
169-
</None>
170167
<None Include="game.config">
171168
<SubType>Designer</SubType>
172169
</None>

‎samples/character/sample-character.vcxproj.filters‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
</ItemGroup>
1717
<ItemGroup>
1818
<None Include="icon.png" />
19-
<None Include="bar-descriptor.xml" />
2019
<None Include="game.config" />
2120
<None Include="game.dxt.config" />
2221
<None Include="res\common\arial.gpb">

‎samples/racer/sample-racer.vcxproj‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -158,9 +158,10 @@ copy .\game.dxt.config .\game.config</Command>
158158
</PreBuildEvent>
159159
</ItemDefinitionGroup>
160160
<ItemGroup>
161-
<None Include="bar-descriptor.xml">
162-
<SubType>Designer</SubType>
163-
</None>
161+
<None Include="game.atc.config" />
162+
<None Include="game.dxt.config" />
163+
<None Include="game.png.config" />
164+
<None Include="game.pvr.config" />
164165
<None Include="icon.png" />
165166
<None Include="res\common\background_track.ogg" />
166167
<None Include="res\common\engine_loop.ogg" />

‎samples/racer/sample-racer.vcxproj.filters‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
</ItemGroup>
1515
<ItemGroup>
1616
<None Include="icon.png" />
17-
<None Include="bar-descriptor.xml" />
1817
<None Include="res\shaders\colored.frag">
1918
<Filter>res\shaders</Filter>
2019
</None>
@@ -99,6 +98,10 @@
9998
<None Include="res\common\racer.scene">
10099
<Filter>res\common</Filter>
101100
</None>
101+
<None Include="game.atc.config" />
102+
<None Include="game.dxt.config" />
103+
<None Include="game.png.config" />
104+
<None Include="game.pvr.config" />
102105
</ItemGroup>
103106
<ItemGroup>
104107
<ClInclude Include="src\RacerGame.h">

‎samples/spaceship/sample-spaceship.vcxproj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,6 @@ copy ..\..\gameplay\res\logo_powered_white.png res</Command>
165165
</PreBuildEvent>
166166
</ItemDefinitionGroup>
167167
<ItemGroup>
168-
<None Include="bar-descriptor.xml" />
169168
<None Include="game.config" />
170169
<None Include="icon.png" />
171170
<None Include="res\airstrip.gpb" />

‎samples/spaceship/sample-spaceship.vcxproj.filters‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
</Filter>
1313
</ItemGroup>
1414
<ItemGroup>
15-
<None Include="bar-descriptor.xml" />
1615
<None Include="icon.png" />
1716
<None Include="game.config" />
1817
<None Include="res\airstrip.gpb">

0 commit comments

Comments
 (0)