Merge pull request #7 from keijiro/dev-small-fixes

Fixes and updates
keijiro · May 20, 2018 · 06bd577 · 06bd577
2 parents 19cd734 + 2b6864c
commit 06bd577
Show file tree

Hide file tree

Showing 20 changed files with 23 additions and 5 deletions.
diff --git a/Assets/Klak/NDI/Internal.meta → Assets/Klak/NDI/Plugin.meta b/Assets/Klak/NDI/Internal.meta → Assets/Klak/NDI/Plugin.meta
diff --git a/Assets/Klak/NDI/Internal/PluginEntry.cs → Assets/Klak/NDI/Plugin/PluginEntry.cs b/Assets/Klak/NDI/Internal/PluginEntry.cs → Assets/Klak/NDI/Plugin/PluginEntry.cs
diff --git a/Assets/Klak/NDI/Internal/PluginEntry.cs.meta → Assets/Klak/NDI/Plugin/PluginEntry.cs.meta b/Assets/Klak/NDI/Internal/PluginEntry.cs.meta → Assets/Klak/NDI/Plugin/PluginEntry.cs.meta
diff --git a/Assets/Klak/NDI/Internal/x64.meta → Assets/Klak/NDI/Plugin/x64.meta b/Assets/Klak/NDI/Internal/x64.meta → Assets/Klak/NDI/Plugin/x64.meta
diff --git a/Assets/Klak/NDI/Internal/x64/KlakNDI.dll → Assets/Klak/NDI/Plugin/x64/KlakNDI.dll b/Assets/Klak/NDI/Internal/x64/KlakNDI.dll → Assets/Klak/NDI/Plugin/x64/KlakNDI.dll
diff --git a/...ts/Klak/NDI/Internal/x64/KlakNDI.dll.meta → Assets/Klak/NDI/Plugin/x64/KlakNDI.dll.meta b/...ts/Klak/NDI/Internal/x64/KlakNDI.dll.meta → Assets/Klak/NDI/Plugin/x64/KlakNDI.dll.meta
diff --git a/...I/Internal/x64/Processing.NDI.Lib.x64.dll → ...NDI/Plugin/x64/Processing.NDI.Lib.x64.dll b/...I/Internal/x64/Processing.NDI.Lib.x64.dll → ...NDI/Plugin/x64/Processing.NDI.Lib.x64.dll
diff --git a/...ernal/x64/Processing.NDI.Lib.x64.dll.meta → ...lugin/x64/Processing.NDI.Lib.x64.dll.meta b/...ernal/x64/Processing.NDI.Lib.x64.dll.meta → ...lugin/x64/Processing.NDI.Lib.x64.dll.meta
diff --git a/Assets/Klak/NDI/Resources.meta b/Assets/Klak/NDI/Resources.meta
diff --git a/Assets/Klak/NDI/Internal/Receiver.shader → Assets/Klak/NDI/Resources/Receiver.shader b/Assets/Klak/NDI/Internal/Receiver.shader → Assets/Klak/NDI/Resources/Receiver.shader
diff --git a/...ts/Klak/NDI/Internal/Receiver.shader.meta → ...s/Klak/NDI/Resources/Receiver.shader.meta b/...ts/Klak/NDI/Internal/Receiver.shader.meta → ...s/Klak/NDI/Resources/Receiver.shader.meta
diff --git a/Assets/Klak/NDI/Internal/Sender.shader → Assets/Klak/NDI/Resources/Sender.shader b/Assets/Klak/NDI/Internal/Sender.shader → Assets/Klak/NDI/Resources/Sender.shader
diff --git a/Assets/Klak/NDI/Internal/Sender.shader.meta → Assets/Klak/NDI/Resources/Sender.shader.meta b/Assets/Klak/NDI/Internal/Sender.shader.meta → Assets/Klak/NDI/Resources/Sender.shader.meta
diff --git a/Assets/Klak/NDI/Runtime.meta b/Assets/Klak/NDI/Runtime.meta
diff --git a/Assets/Klak/NDI/NdiReceiver.cs → Assets/Klak/NDI/Runtime/NdiReceiver.cs b/Assets/Klak/NDI/NdiReceiver.cs → Assets/Klak/NDI/Runtime/NdiReceiver.cs
@@ -63,6 +63,8 @@ public Texture receivedTexture {
 
         #region Private members
 
+        static IntPtr _callback = PluginEntry.NDI_GetTextureUpdateCallback();
+
         CommandBuffer _commandBuffer;
         Texture2D _sourceTexture;
         MaterialPropertyBlock _propertyBlock;
@@ -100,11 +102,10 @@ void Update()
 
             // Invoke the texture update callback in the plugin.
             _commandBuffer.IssuePluginCustomTextureUpdate(
-                PluginEntry.NDI_GetTextureUpdateCallback(),
-                _sourceTexture,
-                PluginEntry.NDI_GetReceiverID(_plugin)
+                _callback, _sourceTexture, PluginEntry.NDI_GetReceiverID(_plugin)
             );
             Graphics.ExecuteCommandBuffer(_commandBuffer);
+            _sourceTexture.IncrementUpdateCount();
             _commandBuffer.Clear();
 
             // Check the frame dimensions.
@@ -131,6 +132,7 @@ void Update()
             if (_targetTexture != null)
             {
                 Graphics.Blit(_sourceTexture, _targetTexture, _material, alpha ? 1 : 0);
+                _targetTexture.IncrementUpdateCount();
             }
             else
             {

diff --git a/Assets/Klak/NDI/NdiReceiver.cs.meta → Assets/Klak/NDI/Runtime/NdiReceiver.cs.meta b/Assets/Klak/NDI/NdiReceiver.cs.meta → Assets/Klak/NDI/Runtime/NdiReceiver.cs.meta
diff --git a/Assets/Klak/NDI/NdiSender.cs → Assets/Klak/NDI/Runtime/NdiSender.cs b/Assets/Klak/NDI/NdiSender.cs → Assets/Klak/NDI/Runtime/NdiSender.cs
diff --git a/Assets/Klak/NDI/NdiSender.cs.meta → Assets/Klak/NDI/Runtime/NdiSender.cs.meta b/Assets/Klak/NDI/NdiSender.cs.meta → Assets/Klak/NDI/Runtime/NdiSender.cs.meta
diff --git a/Plugin/Windows/Sender.h b/Plugin/Windows/Sender.h
@@ -26,7 +26,7 @@ namespace KlakNDI
             frame.xres = width;
             frame.yres = height;
             frame.FourCC = static_cast<NDIlib_FourCC_type_e>(fourCC);
-            frame.frame_format_type = NDIlib_frame_format_type_interleaved;
+            frame.frame_format_type = NDIlib_frame_format_type_progressive;
             frame.p_data = static_cast<uint8_t*>(data);
             frame.line_stride_in_bytes = width * 2;
 

diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt
@@ -1 +1 @@
-m_EditorVersion: 2018.1.0b13
+m_EditorVersion: 2018.1.1f1
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		m_EditorVersion: 2018.1.0b13
		m_EditorVersion: 2018.1.1f1