Merge pull request #174 from InfinyTech3D/fix_X11_texture

[src] Update SofaGraphicsAPI to support X11 texture

Author: epernod

Core/Plugins/SofaUnityAPI/GraphicAPI/AbstractSofaGraphicCall.cs

@@ -2,6 +2,7 @@
 using UnityEngine;
 using System.Collections;
 using System.Collections.Generic;
+using UnityEngine.Rendering;
 
 namespace SofaUnityAPI
 {
@@ -15,6 +16,8 @@ public abstract class AbtractSofaGraphicCall : MonoBehaviour
         protected abstract int InitCall();
         protected abstract void BeforeDestroy();
 
+        protected abstract bool checkGraphicsDeviceType();
+
         public void RegisterID(int renderID)
         {
             m_registeredRenderIDList.Add(renderID);
@@ -28,10 +31,8 @@ public bool GLRenderEnded()
         //// MonoBehavior API
         IEnumerator Start()
         {
-            string graphicVersion = SystemInfo.graphicsDeviceVersion;
-            if (!graphicVersion.Contains("OpenGL")) // only openGL version is supported
+            if (!checkGraphicsDeviceType())
             {
-                Debug.LogError("SofaGraphicCall - XRay and Ultrasound rendering are only available with Unity in OpenGL mode.");
                 yield break;
             }
 
@@ -94,7 +95,6 @@ private IEnumerator CallWaitForEndOfFrame()
                 {
                     foreach (int renderID in m_registeredRenderIDList)
                     {
-                        //Debug.Log("Calling renderID " + renderID);
                         GL.IssuePluginEvent(SofaUnityAPI.SofaGraphicAPI.getRenderEventFunc(), renderID);
                     }
                 }

Core/Plugins/SofaUnityAPI/GraphicAPI/SofaGraphicAPI.cs

@@ -22,13 +22,13 @@ public void Dispose()
         public static extern int AddRenderEvent_SetVirtualXRayTexture(System.IntPtr simuContext, System.IntPtr texture, int w, int h, string objectName);
 
         [DllImport("ImagingUS")]
-        public static extern int AddRenderEvent_SetImagingUSTexture(System.IntPtr simuContext, System.IntPtr texture, int w, int h, string objectName);
+        public static extern int AddRenderEvent_SetImagingUSTexture(System.IntPtr simuContext, System.IntPtr texture, int w, int h, string objectName, int graphicsType);
 
         [DllImport("SofaVerseAPI")]
         public static extern void clearUp(System.IntPtr simuContext);
 
         [DllImport("SofaVerseAPI")]
         public static extern IntPtr getRenderEventFunc();
     }
-    
+
 }