From 685b17aba6fbdb54c4d12652693fa812a87d3f79 Mon Sep 17 00:00:00 2001
From: Attila Uygun <auygun@opera.com>
Date: Sun, 28 May 2023 00:37:52 +0200
Subject: [PATCH] Bump version

Also fix typo and remove redundant code
Add bash script for ndk-stack
---
 build/android/app/src/main/AndroidManifest.xml | 4 ++--
 build/android/stack                            | 6 ++++++
 src/demo/menu.cc                               | 2 +-
 src/engine/engine.cc                           | 8 +++-----
 src/engine/engine.h                            | 2 +-
 src/engine/renderer/vulkan/renderer_vulkan.cc  | 2 +-
 6 files changed, 14 insertions(+), 10 deletions(-)
 create mode 100755 build/android/stack

diff --git a/build/android/app/src/main/AndroidManifest.xml b/build/android/app/src/main/AndroidManifest.xml
index f4736da..ec734d7 100644
--- a/build/android/app/src/main/AndroidManifest.xml
+++ b/build/android/app/src/main/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    android:versionCode="18"
-    android:versionName="1.0.2">
+    android:versionCode="19"
+    android:versionName="1.0.3">
 
     <application
         android:allowBackup="false"
diff --git a/build/android/stack b/build/android/stack
new file mode 100755
index 0000000..1caae47
--- /dev/null
+++ b/build/android/stack
@@ -0,0 +1,6 @@
+#!/bin/bash
+BUILD="$1"
+if [[ -z "$1" ]]; then
+    BUILD="debug"
+fi
+adb logcat | ndk-stack -sym ./app/build/intermediates/merged_native_libs/"$BUILD"/out/lib/arm64-v8a
diff --git a/src/demo/menu.cc b/src/demo/menu.cc
index f58d269..2bfd91c 100644
--- a/src/demo/menu.cc
+++ b/src/demo/menu.cc
@@ -22,7 +22,7 @@ using namespace eng;
 
 namespace {
 
-constexpr char kVersionStr[] = "Version 1.0.2";
+constexpr char kVersionStr[] = "Version 1.0.3";
 
 constexpr char kMenuOption[Menu::kOption_Max][10] = {"continue", "start",
                                                      "credits", "exit"};
diff --git a/src/engine/engine.cc b/src/engine/engine.cc
index 6d41bc4..f5900bc 100644
--- a/src/engine/engine.cc
+++ b/src/engine/engine.cc
@@ -22,8 +22,6 @@
 #include "engine/shader_source.h"
 #include "third_party/texture_compressor/texture_compressor.h"
 
-#define USE_VULKAN_RENDERER 1
-
 using namespace base;
 
 namespace eng {
@@ -519,13 +517,13 @@ void Engine::AddInputEvent(std::unique_ptr<InputEvent> event) {
     case InputEvent::kDragEnd:
       if (((GetScreenSize() / 2) * 0.9f - event->GetVector()).Length() <=
           0.25f) {
-        SetSatsVisible(!stats_->IsVisible());
+        SetStatsVisible(!stats_->IsVisible());
         // TODO: Enqueue DragCancel so we can consume this event.
       }
       break;
     case InputEvent::kKeyPress:
       if (event->GetKeyPress() == 's') {
-        SetSatsVisible(!stats_->IsVisible());
+        SetStatsVisible(!stats_->IsVisible());
         // Consume event.
         return;
       }
@@ -619,7 +617,7 @@ void Engine::ContextLost() {
     game_->ContextLost();
 }
 
-void Engine::SetSatsVisible(bool visible) {
+void Engine::SetStatsVisible(bool visible) {
   stats_->SetVisible(visible);
   if (visible)
     stats_->Create("stats_tex");
diff --git a/src/engine/engine.h b/src/engine/engine.h
index ecb53a8..5ea4790 100644
--- a/src/engine/engine.h
+++ b/src/engine/engine.h
@@ -235,7 +235,7 @@ class Engine : public PlatformObserver {
 
   void ContextLost();
 
-  void SetSatsVisible(bool visible);
+  void SetStatsVisible(bool visible);
   std::unique_ptr<Image> PrintStats();
 
   Engine(const Engine&) = delete;
diff --git a/src/engine/renderer/vulkan/renderer_vulkan.cc b/src/engine/renderer/vulkan/renderer_vulkan.cc
index 7affd05..4aedd24 100644
--- a/src/engine/renderer/vulkan/renderer_vulkan.cc
+++ b/src/engine/renderer/vulkan/renderer_vulkan.cc
@@ -907,7 +907,7 @@ bool RendererVulkan::InitializeInternal() {
   }
 
   // In this simple engine we use only one descriptor set layout that is for
-  // textures. We use push contants for everything else.
+  // textures. We use push constants for everything else.
   VkDescriptorSetLayoutBinding ds_layout_binding;
   ds_layout_binding.descriptorType = VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER;
   ds_layout_binding.descriptorCount = 1;