Redstone: Add wires, redstone torches, levers (incomplete) and repeaters

This commit is contained in:
Er2
2024-04-07 16:51:01 +03:00
parent b8c01e085f
commit 6bdfe250a2
50 changed files with 1687 additions and 114 deletions

View File

@@ -1,9 +1,5 @@
SET(MC_ROOT ../..)
# Native Android Build
add_compile_definitions(USE_NATIVE_ANDROID)
set(USE_NATIVE_ANDROID TRUE)
add_library(reminecraftpe SHARED
AppPlatform_android.cpp
SoundSystemSL.cpp

View File

@@ -21,7 +21,7 @@
#endif
#include <SLES/OpenSLES.h>
#ifdef ANDROID
#ifdef __ANDROID__
#include <SLES/OpenSLES_Android.h>
#endif
@@ -62,4 +62,4 @@ private:
static std::vector<SLObjectItf> toRemove;
static SLObjectItf objEngine;
static pthread_mutex_t toRemoveMutex;
};
};

View File

@@ -314,7 +314,7 @@ static void initWindow(struct engine* engine, struct android_app* app)
ANativeWindow_setBuffersGeometry(app->window, 0, 0, format);
engine->surface = eglCreateWindowSurface(engine->display, config, app->window, NULL);
engine->surface = eglCreateWindowSurface(engine->display, config, (EGLNativeWindowType)app->window, NULL);
engine->context = eglCreateContext(engine->display, config, NULL, NULL);
if (!engine->context)
@@ -471,4 +471,4 @@ void android_main(struct android_app* state) {
exit:
engine.ninecraftApp->saveOptions();
delete engine.ninecraftApp;
}
}