From c516e8ae78d1210cad19630193bcc3fb07e53d4b Mon Sep 17 00:00:00 2001
From: omigamedev <omarator@gmail.com>
Date: Wed, 30 Jan 2019 11:44:39 +0100
Subject: [PATCH] fix parallax camera

---
 android/build.gradle | 2 +-
 data/layout.xml      | 2 +-
 src/app_layout.cpp   | 2 +-
 src/node_canvas.cpp  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/android/build.gradle b/android/build.gradle
index 3550bca..f3c5482 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -95,7 +95,7 @@ android {
           // Specifies the ABI configurations of your native
           // libraries Gradle should build and package with your APK.
           // abiFilters 'x86', 'x86_64', 'armeabi', 'armeabi-v7a', 'arm64-v8a'
-          abiFilters 'armeabi-v7a'
+          abiFilters 'x86', 'x86_64', 'armeabi-v7a', 'arm64-v8a'
         }
     }
 
diff --git a/data/layout.xml b/data/layout.xml
index cb364b3..cf6085a 100644
--- a/data/layout.xml
+++ b/data/layout.xml
@@ -1089,7 +1089,7 @@ Here's a list of what's available in this release.
             <image path="data/ui/eraser.png" width="100%" height="100%" align="center" justify="flex-end"/>
           </button-custom>
 
-          <!--<button id="btn-cam" width="70" height="100%" margin="0 0 0 5" text="Parallax"/>-->
+          <button id="btn-cam" width="70" height="100%" margin="0 0 0 5" text="Parallax"/>
           
           <button-custom id="btn-line" width="40" height="100%" margin="0 0 0 5" thickness="1" border-color="0 0 0 1" pad="2">
             <image path="data/ui/line.png" width="100%" height="100%" align="center" justify="flex-end"/>
diff --git a/src/app_layout.cpp b/src/app_layout.cpp
index d01f85b..47799bf 100644
--- a/src/app_layout.cpp
+++ b/src/app_layout.cpp
@@ -277,7 +277,7 @@ void select_button(Node* main, T* button) {
     main->find<NodeButtonCustom>("btn-pen")->set_color(color_button_normal);
     main->find<NodeButtonCustom>("btn-erase")->set_color(color_button_normal);
     main->find<NodeButtonCustom>("btn-line")->set_color(color_button_normal);
-    //main->find<NodeButton>("btn-cam")->set_color(color_button_normal);
+    main->find<NodeButton>("btn-cam")->set_color(color_button_normal);
     main->find<NodeButton>("btn-grid")->set_color(color_button_normal);
     main->find<NodeButton>("btn-copy")->set_color(color_button_normal);
     main->find<NodeButton>("btn-cut")->set_color(color_button_normal);
diff --git a/src/node_canvas.cpp b/src/node_canvas.cpp
index f00ec01..ee1e8ec 100644
--- a/src/node_canvas.cpp
+++ b/src/node_canvas.cpp
@@ -76,7 +76,7 @@ void NodeCanvas::draw()
 
     glm::mat4 ortho_proj = glm::ortho(0.f, box.z, 0.f, box.w, -1000.f, 1000.f);
     glm::mat4 proj = glm::perspective(glm::radians(m_canvas->m_cam_fov), box.z / box.w, 0.001f, 1000.f);
-    glm::mat4 camera = m_canvas->m_cam_rot * glm::translate(m_canvas->m_cam_pos);
+    glm::mat4 camera = glm::translate(m_canvas->m_cam_pos) * m_canvas->m_cam_rot;
 
     m_canvas->m_mv = camera;
     m_canvas->m_proj = proj;