celisej567/mcpe
1
0
Fork 0
mirror of https://github.com/celisej567/mcpe.git synced 2025-12-31 17:49:17 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix Texture Detection

Browse Source
This commit is contained in:
TheBrokenRail
2023-11-05 17:03:07 -05:00
committed by iProgramInCpp
parent ec12755632
commit 433b1532d9
7 changed files with 47 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
platforms/android/project/app/src/main/cpp/CMakeLists.txt
View File

@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.16.0)
project(reminecraftpe-android)
# Project Root
set(MC_ROOT ../../../../../../..)
set(MC_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/../../../../../../..")
# Native Android Build
add_compile_definitions(USE_NATIVE_ANDROID)

1
platforms/sdl/base/AppPlatform_sdl_base.hpp
View File

@@ -26,6 +26,7 @@ public:
int getScreenWidth() const override;
int getScreenHeight() const override;
Texture loadTexture(const std::string& path, bool b = false) override = 0;
virtual bool doesTextureExist(const std::string& path) = 0;
int getUserInputStatus() override;
SoundSystem* const getSoundSystem() const override { return m_pSoundSystem; }
std::string getDateString(int time) override;

19
platforms/sdl/desktop/AppPlatform_sdl.cpp
View File

@@ -172,6 +172,25 @@ Texture AppPlatform_sdl::loadTexture(const std::string& path, bool b)
// Return
return out;
}
bool AppPlatform_sdl::doesTextureExist(const std::string& path)
{
// Get Full Path
std::string realPath = getAssetPath(path);
// Open File
SDL_RWops *io = SDL_RWFromFile(realPath.c_str(), "rb");
if (!io)
{
// Does Not Exist
return false;
}
else
{
// File Exists
SDL_RWclose(io);
return true;
}
}
bool AppPlatform_sdl::hasFileSystemAccess()
{

1
platforms/sdl/desktop/AppPlatform_sdl.hpp
View File

@@ -15,6 +15,7 @@ public:
void saveScreenshot(const std::string& fileName, int width, int height) override;
Texture loadTexture(const std::string& path, bool b = false) override;
bool doesTextureExist(const std::string& path) override;
bool hasFileSystemAccess() override;

20
platforms/sdl/emscripten/AppPlatform_sdl.cpp
View File

@@ -28,3 +28,23 @@ Texture AppPlatform_sdl::loadTexture(const std::string& path, bool b)
LOG_E("Couldn't find file: %s", realPath.c_str());
return out;
}
bool AppPlatform_sdl::doesTextureExist(const std::string& path)
{
// Get Full Path
std::string realPath = getAssetPath(path);
// Open File
int width = 0, height = 0;
char *data = emscripten_get_preloaded_image_data(("/" + realPath).c_str(), &width, &height);
if (!data)
{
// Does Not Exist
return false;
}
else
{
// File Exists
free(data);
return true;
}
}

1
platforms/sdl/emscripten/AppPlatform_sdl.hpp
View File

@@ -13,4 +13,5 @@ public:
AppPlatform_sdl(std::string storageDir, SDL_Window *window);
Texture loadTexture(const std::string& path, bool b = false) override;
bool doesTextureExist(const std::string& path) override;
};

25
platforms/sdl/main.cpp
View File

@@ -294,29 +294,12 @@ extern bool g_bAreCloudsAvailable; // client/renderer/LevelRenderer.cpp
extern bool g_bIsGrassColorAvailable; // world/level/GrassColor.cpp
extern bool g_bIsFoliageColorAvailable; // world/level/FoliageColor.cpp
#ifdef __EMSCRIPTEN__
bool DoesAssetExist(const std::string & fileName)
{
std::string realPath = g_pAppPlatform->getAssetPath(fileName);
int width = 0, height = 0;
char *data = emscripten_get_preloaded_image_data(("/" + realPath).c_str(), &width, &height);
if (data == NULL)
return false;
free(data);
return true;
}
#else
// access works just fine on linux and friends
#define DoesAssetExist(fileName) (XPL_ACCESS("assets/" fileName, 0) == 0)
#endif
void CheckOptionalTextureAvailability()
{
g_bIsMenuBackgroundAvailable = DoesAssetExist("gui/background/panorama_0.png");
g_bAreCloudsAvailable = DoesAssetExist("environment/clouds.png");
g_bIsGrassColorAvailable = DoesAssetExist("misc/grasscolor.png");
g_bIsFoliageColorAvailable = DoesAssetExist("misc/foliagecolor.png");
g_bIsMenuBackgroundAvailable = g_pAppPlatform->doesTextureExist("gui/background/panorama_0.png");
g_bAreCloudsAvailable = g_pAppPlatform->doesTextureExist("environment/clouds.png");
g_bIsGrassColorAvailable = g_pAppPlatform->doesTextureExist("misc/grasscolor.png");
g_bIsFoliageColorAvailable = g_pAppPlatform->doesTextureExist("misc/foliagecolor.png");
}
// Main