Android 编译通过

This commit is contained in:
xsl
2025-10-20 18:44:36 +08:00
parent 576c302cd1
commit 87178587d3
22 changed files with 15 additions and 16708 deletions
+1 -1
View File
@@ -21,7 +21,7 @@
#include "../app/src/main/cpp/AndroidOut.h"
#define logOut aout
#define VK_USE_PLATFORM_ANDROID_KHR
//#include <vulkan/vulkan.h>
#include <vulkan/vulkan.h>
#include <vulkan/vulkan_android.h>
#include <android/native_window.h>
#endif
-1
View File
@@ -5,7 +5,6 @@
#include "AppBase.h"
#include <thread>
#include <mutex>
#include <vulkan/vulkan.hpp>
struct Texture
{
+1 -1
View File
@@ -503,7 +503,7 @@ void FaceApp::render(VkCommandBuffer commandBuffer)
#else
if (getCurrentTimeMillis() - last_update_time < 1000)
{
vkCmdDrawIndexed(draw_cmd_buffers[i], index_count, 1, 0, 0, 0);
vkCmdDrawIndexed(commandBuffer, obj_indices.size(), 1, 0, 0, 0);
}
#endif
}
+2 -2
View File
@@ -2,7 +2,7 @@
#define __FaceApp_H__
#include "Application.h"
#include "vma/include/vk_mem_alloc.h"
#include "../third_party/vma/include/vk_mem_alloc.h"
#include <map>
#include <glm/glm.hpp>
#include <glm/gtc/matrix_transform.hpp>
@@ -42,7 +42,7 @@ public:
static FaceApp* Get() { return faceIns; }
void update_face_vertex_buffer(float* pos, int pointCount);
virtual bool isInited() { return inited && faceAppInited; }
virtual bool isInited() override { return inited && faceAppInited; }
virtual void cleanup() override;
private:
glm::vec3 rotation = glm::vec3();