update only when any handle is moved.

hecomi · Sep 15, 2017 · 20734e3 · 20734e3
1 parent 9d8092e
commit 20734e3
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 9 deletions.
diff --git a/Assets/uHomography/Scripts/DraggableVertex.cs b/Assets/uHomography/Scripts/DraggableVertex.cs
@@ -10,11 +10,13 @@ public class DraggableVertex
     , IBeginDragHandler
     , IDragHandler
 {
-    public Camera camera;
+    public new Camera camera;
 
     Vector3 startPos_;
     Vector3 startMousePos_;
 
+    public bool hasChanged { get; set; }
+
     public Vector2 viewPosition
     {
         get 
@@ -39,6 +41,7 @@ public void OnDrag(PointerEventData data)
         var startPos = camera.ScreenToWorldPoint(new Vector3(startMousePos_.x, startMousePos_.y, z));
         var dPos = currentPos - startPos;
         transform.localPosition = startPos_ + dPos;
+        hasChanged = true;
     }
 }
 

diff --git a/Assets/uHomography/Scripts/Homography.cs b/Assets/uHomography/Scripts/Homography.cs
@@ -10,10 +10,8 @@ public class Homography : MonoBehaviour
 {
     const string VertexPrefabPath = "uHomography/Prefabs/Vertex";
 
-    public bool showHandles = true;
-
     [SerializeField]
-    KeyCode toggleKey = KeyCode.None;
+    KeyCode handleToggleKey = KeyCode.None;
 
     bool isHandlesVisible_ = true;
 
@@ -41,6 +39,9 @@ public class Homography : MonoBehaviour
     [SerializeField, HideInInspector]
     DraggableVertex v11;
 
+    float[] homography_ = null; 
+    float[] invHomography_ = null;
+
     void CreateCameraIfNeeded()
     {
         if (uiCamera) return;
@@ -159,9 +160,21 @@ float[] CalcInverseMatrix(float[] mat)
         return new float[] { o11, o12, o13, o21, o22, o23, o31, o32, o33 };
     }
 
+    void UpdateHomographyMatrix()
+    {
+        homography_ = CalcHomographyMatrix();
+        invHomography_ = CalcInverseMatrix(homography_);
+        v00.hasChanged = v01.hasChanged = v10.hasChanged = v11.hasChanged = false;
+    }
+
+    void Start()
+    {
+        UpdateHomographyMatrix();
+    }
+
     void Update()
     {
-        if (Input.GetKeyDown(toggleKey))
+        if (Input.GetKeyDown(handleToggleKey))
         {
             isHandlesVisible_ = !isHandlesVisible_;
             v00.gameObject.SetActive(isHandlesVisible_);
@@ -187,10 +200,15 @@ void OnRenderImage(RenderTexture source, RenderTexture destination)
 
         CreateMaterialIfNeeded();
 
-        var homography = CalcHomographyMatrix();
-        var invHomography = CalcInverseMatrix(homography);
-        material.SetFloatArray("_Homography", homography);
-        material.SetFloatArray("_InvHomography", invHomography);
+        bool isHandleMoved = (v00.hasChanged || v01.hasChanged || v10.hasChanged || v11.hasChanged);
+        bool isNotInitialized = (homography_.Length == 0) || (invHomography_.Length == 0);
+        if (isHandleMoved || isNotInitialized)
+        {
+            UpdateHomographyMatrix();
+        }
+
+        material.SetFloatArray("_Homography", homography_);
+        material.SetFloatArray("_InvHomography", invHomography_);
         Graphics.Blit(source, destination, material);
     }
 }