Fix textured light shader param on DesktopGL; Separate intermediary p…

…aths for platforms
discosultan · Mar 25, 2017 · 4c3e9f6 · 4c3e9f6
1 parent ba7f606
commit 4c3e9f6
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 2 deletions.
diff --git a/Samples/Sandbox/Sandbox.csproj b/Samples/Sandbox/Sandbox.csproj
@@ -63,8 +63,7 @@
   </ItemGroup>
   <ItemGroup>
     <Reference Include="MonoGame.Framework, Version=3.6.0.1625, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\MonoGame.Framework.WindowsDX.3.6.0.1625\lib\net40\MonoGame.Framework.dll</HintPath>
-      <Private>True</Private>
+      <HintPath>$(MonoGameInstallDirectory)\MonoGame\v3.0\Assemblies\Windows\MonoGame.Framework.dll</HintPath>
     </Reference>
     <Reference Include="System" />
   </ItemGroup>

diff --git a/Source/Graphics/Renderers/LightRenderer.cs b/Source/Graphics/Renderers/LightRenderer.cs
@@ -36,7 +36,11 @@ public void Load(PenumbraEngine engine, Effect fxLight)
             _fxSpotLightTech = _fxLight.Techniques["Spotlight"];
             _fxTexturedLightTech = _fxLight.Techniques["TexturedLight"];
             _fxDebugLightTech = _fxLight.Techniques["DebugLight"];
+#if WINDOWSDX
             _fxLightParamTexture = _fxLight.Parameters["Texture"];
+#elif DESKTOPGL
+            _fxLightParamTexture = _fxLight.Parameters["TextureSampler+Texture"];
+#endif
             _fxLightParamTextureTransform = _fxLight.Parameters["TextureTransform"];
             _fxLightParamWvp = _fxLight.Parameters["WorldViewProjection"];
             _fxLightParamColor = _fxLight.Parameters["LightColor"];

diff --git a/Source/MonoGame.Penumbra.DesktopGL.csproj b/Source/MonoGame.Penumbra.DesktopGL.csproj
@@ -21,6 +21,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug\DesktopGL\</OutputPath>
+	<IntermediateOutputPath>obj\Debug\DesktopGL\</IntermediateOutputPath>
     <DocumentationFile>bin\Debug\DesktopGL\MonoGame.Penumbra.xml</DocumentationFile>
     <DefineConstants>TRACE;DEBUG;MONOGAME;DESKTOPGL</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
@@ -33,6 +34,7 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\DesktopGL\</OutputPath>
+	<IntermediateOutputPath>obj\Release\DesktopGL\</IntermediateOutputPath>
     <DocumentationFile>bin\Release\DesktopGL\MonoGame.Penumbra.xml</DocumentationFile>
     <DefineConstants>TRACE;MONOGAME;DESKTOPGL</DefineConstants>
     <ErrorReport>prompt</ErrorReport>

diff --git a/Source/MonoGame.Penumbra.WindowsDX.csproj b/Source/MonoGame.Penumbra.WindowsDX.csproj
@@ -21,6 +21,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug\WindowsDX\</OutputPath>
+	<IntermediateOutputPath>obj\Debug\WindowsDX\</IntermediateOutputPath>
     <DocumentationFile>bin\Debug\WindowsDX\MonoGame.Penumbra.xml</DocumentationFile>
     <DefineConstants>TRACE;DEBUG;MONOGAME;WINDOWSDX</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
@@ -33,6 +34,7 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\WindowsDX\</OutputPath>
+	<IntermediateOutputPath>obj\Release\WindowsDX\</IntermediateOutputPath>
     <DocumentationFile>bin\Release\WindowsDX\MonoGame.Penumbra.xml</DocumentationFile>
     <DefineConstants>TRACE;MONOGAME;WINDOWSDX</DefineConstants>
     <ErrorReport>prompt</ErrorReport>

diff --git a/Tools/MonoGame.Penumbra.DesktopGL.nuspec b/Tools/MonoGame.Penumbra.DesktopGL.nuspec
diff --git a/Tools/MonoGame.Penumbra.WindowsDX.nuspec b/Tools/MonoGame.Penumbra.WindowsDX.nuspec