ashikk
/
kaliber
mirror of https://github.com/auygun/kaliber.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Bump version 

Also fix typo and remove redundant code
Add bash script for ndk-stack
This commit is contained in:
Attila Uygun 2023-05-28 00:37:52 +02:00
parent f6f67d7e53
commit 685b17aba6
6 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build/android/app/src/main/AndroidManifest.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
android:versionCode="18" android:versionCode="19"
android:versionName="1.0.2"> android:versionName="1.0.3">
<application <application
android:allowBackup="false" android:allowBackup="false"

6
build/android/stack Executable file
View File

@ -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

2
src/demo/menu.cc
View File

@ -22,7 +22,7 @@ using namespace eng;
namespace { namespace {
constexpr char kVersionStr[] = "Version 1.0.2"; constexpr char kVersionStr[] = "Version 1.0.3";
constexpr char kMenuOption[Menu::kOption_Max][10] = {"continue", "start", constexpr char kMenuOption[Menu::kOption_Max][10] = {"continue", "start",
"credits", "exit"}; "credits", "exit"};

8
src/engine/engine.cc
View File

@ -22,8 +22,6 @@
#include "engine/shader_source.h" #include "engine/shader_source.h"
#include "third_party/texture_compressor/texture_compressor.h" #include "third_party/texture_compressor/texture_compressor.h"
#define USE_VULKAN_RENDERER 1
using namespace base; using namespace base;
namespace eng { namespace eng {
@ -519,13 +517,13 @@ void Engine::AddInputEvent(std::unique_ptr<InputEvent> event) {
case InputEvent::kDragEnd: case InputEvent::kDragEnd:
if (((GetScreenSize() / 2) * 0.9f - event->GetVector()).Length() <= if (((GetScreenSize() / 2) * 0.9f - event->GetVector()).Length() <=
0.25f) { 0.25f) {
SetSatsVisible(!stats_->IsVisible()); SetStatsVisible(!stats_->IsVisible());
// TODO: Enqueue DragCancel so we can consume this event. // TODO: Enqueue DragCancel so we can consume this event.
} }
break; break;
case InputEvent::kKeyPress: case InputEvent::kKeyPress:
if (event->GetKeyPress() == 's') { if (event->GetKeyPress() == 's') {
SetSatsVisible(!stats_->IsVisible()); SetStatsVisible(!stats_->IsVisible());
// Consume event. // Consume event.
return; return;
} }
@ -619,7 +617,7 @@ void Engine::ContextLost() {
game_->ContextLost(); game_->ContextLost();
} }
void Engine::SetSatsVisible(bool visible) { void Engine::SetStatsVisible(bool visible) {
stats_->SetVisible(visible); stats_->SetVisible(visible);
if (visible) if (visible)
stats_->Create("stats_tex"); stats_->Create("stats_tex");

2
src/engine/engine.h
View File

@ -235,7 +235,7 @@ class Engine : public PlatformObserver {
void ContextLost(); void ContextLost();
void SetSatsVisible(bool visible); void SetStatsVisible(bool visible);
std::unique_ptr<Image> PrintStats(); std::unique_ptr<Image> PrintStats();
Engine(const Engine&) = delete; Engine(const Engine&) = delete;

2
src/engine/renderer/vulkan/renderer_vulkan.cc
View File

@ -907,7 +907,7 @@ bool RendererVulkan::InitializeInternal() {
} }
// In this simple engine we use only one descriptor set layout that is for // 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; VkDescriptorSetLayoutBinding ds_layout_binding;
ds_layout_binding.descriptorType = VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER; ds_layout_binding.descriptorType = VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER;
ds_layout_binding.descriptorCount = 1; ds_layout_binding.descriptorCount = 1;