Browse Source

Changes required for sound to work. Added updated .xgs, .xsb and xwb files. Thanks espes.

Dominique Louis 13 years ago
parent
commit
145d19653f

+ 21 - 0
StarterKits/Android/VectorRumble/VectorRumble.csproj

@@ -280,5 +280,26 @@
     <AndroidAsset Include="..\..\MacOS\VectorRumble\Content\Textures\title.png">
       <Link>Assets\Content\Textures\title.png</Link>
     </AndroidAsset>
+    <AndroidAsset Include="..\..\MacOS\VectorRumble\Content\Effects\BloomCombine.fsh">
+      <Link>Assets\Content\Effects\BloomCombine.fsh</Link>
+    </AndroidAsset>
+    <AndroidAsset Include="..\..\MacOS\VectorRumble\Content\Effects\BloomExtract.fsh">
+      <Link>Assets\Content\Effects\BloomExtract.fsh</Link>
+    </AndroidAsset>
+    <AndroidAsset Include="..\..\MacOS\VectorRumble\Content\Effects\GaussianBlur.fsh">
+      <Link>Assets\Content\Effects\GaussianBlur.fsh</Link>
+    </AndroidAsset>
+    <AndroidAsset Include="..\..\MacOS\VectorRumble\Content\Audio\VectorRumble.xgs">
+      <Link>Assets\Content\Audio\VectorRumble.xgs</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </AndroidAsset>
+    <AndroidAsset Include="..\..\MacOS\VectorRumble\Content\Audio\VectorRumble.xsb">
+      <Link>Assets\Content\Audio\VectorRumble.xsb</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </AndroidAsset>
+    <AndroidAsset Include="..\..\MacOS\VectorRumble\Content\Audio\VectorRumble.xwb">
+      <Link>Assets\Content\Audio\VectorRumble.xwb</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </AndroidAsset>
   </ItemGroup>
 </Project>

BIN
StarterKits/MacOS/VectorRumble/Content/Audio/VectorRumble.xgs


BIN
StarterKits/MacOS/VectorRumble/Content/Audio/VectorRumble.xsb


BIN
StarterKits/MacOS/VectorRumble/Content/Audio/VectorRumble.xwb


+ 3 - 3
StarterKits/MacOS/VectorRumble/Game.cs

@@ -58,9 +58,9 @@ namespace VectorRumble
 
             // create the audio manager
             audioManager = new AudioManager(this, 
-                "Content\\Audio\\VectorRumble.xgs", 
-                "Content\\Audio\\VectorRumble.xwb",
-                "Content\\Audio\\VectorRumble.xsb");
+                "Content/Audio/VectorRumble.xgs", 
+                "Content/Audio/VectorRumble.xwb",
+                "Content/Audio/VectorRumble.xsb");
             Services.AddService(typeof(AudioManager), audioManager);
         }
 

+ 26 - 17
StarterKits/MacOS/VectorRumble/VectorRumble.csproj

@@ -16,7 +16,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug</OutputPath>
-    <DefineConstants>DEBUG;MONOMAC</DefineConstants>
+    <DefineConstants>DEBUG;MONOMAC;AUDIO</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <ConsolePause>false</ConsolePause>
@@ -44,6 +44,22 @@
     <None Include="Content\Effects\GaussianBlur.fx" />
     <None Include="Content\Fonts\retroMedium.spritefont" />
     <None Include="Content\Fonts\retroSmall.spritefont" />
+    <None Include="Content\Audio\Waves\damage1.wav" />
+    <None Include="Content\Audio\Waves\engine_3.wav" />
+    <None Include="Content\Audio\Waves\explosion1.wav" />
+    <None Include="Content\Audio\Waves\explosion2.wav" />
+    <None Include="Content\Audio\Waves\explosion3.wav" />
+    <None Include="Content\Audio\Waves\hax2_fire.wav" />
+    <None Include="Content\Audio\Waves\hax2_fire2.wav" />
+    <None Include="Content\Audio\Waves\menu_back.wav" />
+    <None Include="Content\Audio\Waves\menu_scroll.wav" />
+    <None Include="Content\Audio\Waves\menu_select3.wav" />
+    <None Include="Content\Audio\Waves\phase_expire_alt.wav" />
+    <None Include="Content\Audio\Waves\RacingGame Game Music 1.wav" />
+    <None Include="Content\Audio\Waves\tx0_fire1.wav" />
+    <None Include="Content\Audio\Waves\tx0_fire2.wav" />
+    <None Include="Content\Audio\Waves\tx0_fire3.wav" />
+    <None Include="Content\Audio\Waves\weapon_pickup_alt_retro.wav" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <Import Project="$(MSBuildExtensionsPath)\Mono\MonoMac\v0.0\Mono.MonoMac.targets" />
@@ -97,22 +113,6 @@
     <Compile Include="BloomPostprocess\BloomSettings.cs" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="Content\Audio\Waves\damage1.wav" />
-    <Content Include="Content\Audio\Waves\engine_3.wav" />
-    <Content Include="Content\Audio\Waves\explosion1.wav" />
-    <Content Include="Content\Audio\Waves\explosion2.wav" />
-    <Content Include="Content\Audio\Waves\explosion3.wav" />
-    <Content Include="Content\Audio\Waves\hax2_fire.wav" />
-    <Content Include="Content\Audio\Waves\hax2_fire2.wav" />
-    <Content Include="Content\Audio\Waves\menu_back.wav" />
-    <Content Include="Content\Audio\Waves\menu_scroll.wav" />
-    <Content Include="Content\Audio\Waves\menu_select3.wav" />
-    <Content Include="Content\Audio\Waves\phase_expire_alt.wav" />
-    <Content Include="Content\Audio\Waves\RacingGame Game Music 1.wav" />
-    <Content Include="Content\Audio\Waves\tx0_fire1.wav" />
-    <Content Include="Content\Audio\Waves\tx0_fire2.wav" />
-    <Content Include="Content\Audio\Waves\tx0_fire3.wav" />
-    <Content Include="Content\Audio\Waves\weapon_pickup_alt_retro.wav" />
     <Content Include="Content\Textures\blank.png" />
     <Content Include="Content\Textures\title.png" />
     <Content Include="Content\Fonts\retroMedium.xnb" />
@@ -128,6 +128,15 @@
     </Content>
     <Content Include="Info.plist" />
     <Content Include="VectorRumble.icns" />
+    <Content Include="Content\Audio\VectorRumble.xgs">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\Audio\VectorRumble.xsb">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\Audio\VectorRumble.xwb">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\..\MonoGame\MonoGame.Framework\MonoGame.Framework.MacOS.csproj">

+ 16 - 2
StarterKits/iOS/VectorRumble/VectorRumble.iOS.csproj

@@ -16,7 +16,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\iPhoneSimulator\Debug</OutputPath>
-    <DefineConstants>DEBUG;IOS</DefineConstants>
+    <DefineConstants>DEBUG;IOS;AUDIO</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <ConsolePause>false</ConsolePause>
@@ -38,13 +38,15 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\iPhone\Debug</OutputPath>
-    <DefineConstants>DEBUG;</DefineConstants>
+    <DefineConstants>DEBUG;IOS</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <ConsolePause>false</ConsolePause>
     <MtouchDebug>true</MtouchDebug>
     <CodesignKey>iPhone Developer</CodesignKey>
     <IpaPackageName />
+    <MtouchI18n />
+    <MtouchLink>Full</MtouchLink>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhone' ">
     <DebugType>none</DebugType>
@@ -292,5 +294,17 @@
     <Content Include="..\..\MacOS\VectorRumble\Content\Fonts\retroSmall.xnb">
       <Link>Content\Fonts\retroSmall.xnb</Link>
     </Content>
+    <Content Include="..\..\MacOS\VectorRumble\Content\Audio\VectorRumble.xgs">
+      <Link>Content\Audio\VectorRumble.xgs</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\..\MacOS\VectorRumble\Content\Audio\VectorRumble.xsb">
+      <Link>Content\Audio\VectorRumble.xsb</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\..\MacOS\VectorRumble\Content\Audio\VectorRumble.xwb">
+      <Link>Content\Audio\VectorRumble.xwb</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
   </ItemGroup>
 </Project>