fixed: exr module was disabled on x84

unity3d-jp · Jan 7, 2016 · b63452f · b63452f
1 parent 7023f12
commit b63452f
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 5 deletions.
diff --git a/FrameCapturer/Assets/FrameCapturer/Scripts/ExrCapturer.cs b/FrameCapturer/Assets/FrameCapturer/Scripts/ExrCapturer.cs
@@ -77,14 +77,17 @@ void OnEnable()
             m_frame_buffer.Create();
         }
 
+#if UNITY_EDITOR
         if (m_capture_gbuffer &&
             m_cam.renderingPath != RenderingPath.DeferredShading &&
             (m_cam.renderingPath == RenderingPath.UsePlayerSettings && PlayerSettings.renderingPath != RenderingPath.DeferredShading))
         {
             Debug.Log("ExrCapturer: Rendering path must be deferred to use capture_gbuffer mode.");
             m_capture_gbuffer = false;
         }
-        if(m_capture_gbuffer)
+#endif // UNITY_EDITOR
+
+        if (m_capture_gbuffer)
         {
             m_gbuffer = new RenderTexture[4];
             m_rt_gbuffer = new RenderBuffer[4];

diff --git a/FrameCapturer/Assets/FrameCapturer/Scripts/MP4Capturer.cs b/FrameCapturer/Assets/FrameCapturer/Scripts/MP4Capturer.cs
@@ -20,7 +20,7 @@ public class MP4Capturer : MovieCapturer
     public int m_frame_rate = 30;
     public int m_max_frame = 1800;
     public int m_keyframe = 60;
-    public int m_video_bitrate = 264000;
+    public int m_video_bitrate = 1024000;
     public int m_audio_bitrate = 64000;
     public int m_max_data_size = 0;
     public int m_max_active_tasks = 0;

diff --git a/FrameCapturer/Assets/RaymarchingMP4Test.unity b/FrameCapturer/Assets/RaymarchingMP4Test.unity
diff --git a/FrameCapturer/ProjectSettings/EditorBuildSettings.asset b/FrameCapturer/ProjectSettings/EditorBuildSettings.asset
diff --git a/Plugin/FrameCapturer.vcxproj b/Plugin/FrameCapturer.vcxproj
@@ -151,7 +151,7 @@ $(SolutionDir)external\PatchLibrary\PatchLibraryProxy64.exe /target:Unity.exe /p
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <PreprocessorDefinitions>fcSupportGIF;fcSupportMP4;fcSupportOpenGL;fcSupportD3D9;fcSupportD3D11;fcDebug;fcVerboseDebug;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>fcSupportGIF;fcSupportEXR;fcSupportMP4;fcSupportOpenGL;fcSupportD3D9;fcSupportD3D11;fcDebug;fcVerboseDebug;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -191,7 +191,7 @@ $(SolutionDir)external\PatchLibrary\PatchLibraryProxy64.exe /target:Unity.exe /p
       <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <AdditionalOptions>/Zo %(AdditionalOptions)</AdditionalOptions>
-      <PreprocessorDefinitions>fcSupportGIF;fcSupportMP4;fcSupportOpenGL;fcSupportD3D9;fcSupportD3D11;fcDebug;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>fcSupportGIF;fcSupportEXR;fcSupportMP4;fcSupportOpenGL;fcSupportD3D9;fcSupportD3D11;fcDebug;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <WarningLevel>Level1</WarningLevel>
@@ -236,7 +236,7 @@ $(SolutionDir)external\PatchLibrary\PatchLibraryProxy64.exe /target:Unity.exe /p
       <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <AdditionalOptions>/Zo %(AdditionalOptions)</AdditionalOptions>
-      <PreprocessorDefinitions>fcSupportGIF;fcSupportMP4;fcSupportOpenGL;fcSupportD3D9;fcSupportD3D11;fcMaster;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>fcSupportGIF;fcSupportEXR;fcSupportMP4;fcSupportOpenGL;fcSupportD3D9;fcSupportD3D11;fcMaster;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Optimization>Full</Optimization>
       <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>