Mahtan/wagic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Emscripten seems to work, should also fix PSP and Qt builds

Browse Source
This commit is contained in:
xawotihs
2016-06-19 00:41:35 +02:00
parent 1667b79fa8
commit e4e809f3fe
7 changed files with 38 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
JGE/include/JSoundSystem.h
View File

@@ -113,23 +113,29 @@ public:
unsigned long fileSize(); unsigned long fileSize();
#if (defined QT_CONFIG) && (!defined USE_PHONON) #if (defined QT_CONFIG) && (!defined USE_PHONON)
QMediaPlayer* effect; QMediaPlayer* effect;
void* mSample;
#elif defined (PSP)
WAVDATA* mSample;
#elif defined (IOS) #elif defined (IOS)
std::string filename; std::string filename;
std::string key; std::string key;
std::string ext; std::string ext;
void* mSample;
#elif defined (WITH_FMOD) #elif defined (WITH_FMOD)
FSOUND_SAMPLE *mSample; FSOUND_SAMPLE *mSample;
#elif defined (USE_PHONON) #elif defined (USE_PHONON)
Phonon::AudioOutput* mOutput; Phonon::AudioOutput* mOutput;
Phonon::MediaObject* mMediaObject; Phonon::MediaObject* mMediaObject;
void* mSample;
#elif defined ANDROID #elif defined ANDROID
SLObjectItf playerObject; SLObjectItf playerObject;
SLPlayItf playInterface; SLPlayItf playInterface;
SLVolumeItf sampleVolumeInterface; SLVolumeItf sampleVolumeInterface;
void* mSample;
#elif (defined WIN32) #elif (defined WIN32)
std::string filename; std::string filename;
#endif
void* mSample; void* mSample;
#endif
}; };

2
JGE/src/Downloader.cpp
View File

@@ -139,7 +139,7 @@ void DownloadRequest::fileDownloaded()
// let's check some error // let's check some error
if(mNetworkReply->error() != QNetworkReply::NoError) { if(mNetworkReply->error() != QNetworkReply::NoError) {
processError(NetworkReply->error(), mNetworkReply->errorString().toStdString()); processError(mNetworkReply->error(), mNetworkReply->errorString().toStdString());
break; break;
} }

5
JGE/src/JFileSystem.cpp
View File

@@ -124,6 +124,10 @@ JFileSystem::JFileSystem(const string & _userPath, const string & _systemPath)
userPath = [[documentsDirectory stringByAppendingString: @"/User/"] cStringUsingEncoding:1]; userPath = [[documentsDirectory stringByAppendingString: @"/User/"] cStringUsingEncoding:1];
systemPath = [[documentsDirectory stringByAppendingString: @"/Res/"] cStringUsingEncoding:1]; systemPath = [[documentsDirectory stringByAppendingString: @"/Res/"] cStringUsingEncoding:1];
#elif defined (__EMSCRIPTEN__)
systemPath = "/";
DebugTrace("User path " << userPath);
DebugTrace("System path " << systemPath);
#elif defined (ANDROID) #elif defined (ANDROID)
userPath = JGE::GetInstance()->getFileSystemLocation(); userPath = JGE::GetInstance()->getFileSystemLocation();
systemPath = ""; systemPath = "";
@@ -296,6 +300,7 @@ void JFileSystem::DetachZipFile()
bool JFileSystem::openForRead(izfstream & File, const string & FilePath) { bool JFileSystem::openForRead(izfstream & File, const string & FilePath) {
DebugTrace("JFileSystem::openForRead " << FilePath);
File.open(FilePath.c_str(), mUserFS); File.open(FilePath.c_str(), mUserFS);
if (File) if (File)
return true; return true;

2
JGE/src/pc/JGfx.cpp
View File

@@ -2322,6 +2322,8 @@ void JRenderer::TransferTextureToGLContext(JTexture& inTexture)
// Pay attention when doing texture mapping!!! // Pay attention when doing texture mapping!!!
glBindTexture(GL_TEXTURE_2D, mCurrentTex); // Bind To The Texture ID glBindTexture(GL_TEXTURE_2D, mCurrentTex); // Bind To The Texture ID
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
/* NOT USED /* NOT USED
if (mode == TEX_TYPE_MIPMAP) // generate mipmaps if (mode == TEX_TYPE_MIPMAP) // generate mipmaps

6
platforms/emscripten/configure.cmake
View File

@@ -1,6 +1,8 @@
set(CMAKE_CXX_FLAGS "-s USE_SDL=2 -s FULL_ES2=1 -std=c++11 -g4 -s TOTAL_MEMORY=500000000 -s ALLOW_MEMORY_GROWTH=1") set(CMAKE_CXX_FLAGS "-s USE_SDL=2 -s FULL_ES2=1 -std=c++11 -O1 -s ALLOW_MEMORY_GROWTH=1 --preload-file ../../../projects/mtg/bin/Res@/")
#set(CMAKE_CXX_FLAGS "-s USE_SDL=2 -s FULL_ES2=1 -std=c++11 -g4 -s ALLOW_MEMORY_GROWTH=1 --preload-file ../../../projects/mtg/bin/Res@/")
set(CMAKE_EXECUTABLE_SUFFIX ".html") set(CMAKE_EXECUTABLE_SUFFIX ".html")
add_definitions(-DLINUX) add_definitions(-DLINUX)
add_definitions(-D_DEBUG) add_definitions(-D_DEBUG)
add_definitions(-DUSERDIR=".wagic") add_definitions(-DUSERDIR=".wagic")
add_definitions(-DRESDIR="Res") add_definitions(-DRESDIR="/")
add_definitions(-DGL_ES_VERSION_2_0)

37
projects/mtg/src/SDLmain.cpp
View File

@@ -128,7 +128,6 @@ public:
static void OneIter() static void OneIter()
{ {
DebugTrace("OneIter");
SDL_Event Event; SDL_Event Event;
if (g_engine) if (g_engine)
{ {
@@ -675,9 +674,9 @@ bool SdlApp::OnInit()
window_h = ACTUAL_SCREEN_HEIGHT; window_h = ACTUAL_SCREEN_HEIGHT;
#endif #endif
#ifndef __EMSCRIPTEN__ int buffers, samples;
int buffers, samples;
SDL_GL_SetAttribute(SDL_GL_RED_SIZE, 8); SDL_GL_SetAttribute(SDL_GL_RED_SIZE, 8);
SDL_GL_SetAttribute(SDL_GL_GREEN_SIZE, 8); SDL_GL_SetAttribute(SDL_GL_GREEN_SIZE, 8);
SDL_GL_SetAttribute(SDL_GL_BLUE_SIZE, 8); SDL_GL_SetAttribute(SDL_GL_BLUE_SIZE, 8);
SDL_GL_SetAttribute(SDL_GL_ALPHA_SIZE, 8); SDL_GL_SetAttribute(SDL_GL_ALPHA_SIZE, 8);
@@ -691,7 +690,7 @@ bool SdlApp::OnInit()
SDL_GL_SetAttribute(SDL_GL_ACCUM_ALPHA_SIZE, 8); SDL_GL_SetAttribute(SDL_GL_ACCUM_ALPHA_SIZE, 8);
SDL_GL_SetAttribute(SDL_GL_MULTISAMPLEBUFFERS, 1); SDL_GL_SetAttribute(SDL_GL_MULTISAMPLEBUFFERS, 1);
SDL_GL_SetAttribute(SDL_GL_MULTISAMPLESAMPLES, 2); SDL_GL_SetAttribute(SDL_GL_MULTISAMPLESAMPLES, 2);
SDL_GL_GetAttribute(SDL_GL_MULTISAMPLEBUFFERS, &buffers); SDL_GL_GetAttribute(SDL_GL_MULTISAMPLEBUFFERS, &buffers);
SDL_GL_GetAttribute(SDL_GL_MULTISAMPLESAMPLES, &samples); SDL_GL_GetAttribute(SDL_GL_MULTISAMPLESAMPLES, &samples);
@@ -701,21 +700,21 @@ bool SdlApp::OnInit()
SDL_GL_SetAttribute(SDL_GL_MULTISAMPLESAMPLES, 0); SDL_GL_SetAttribute(SDL_GL_MULTISAMPLESAMPLES, 0);
} }
SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, 1); #ifndef __EMSCRIPTEN__
SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, 1); SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, 1);
SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, 1);
#else #else
SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1); SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, 2);
SDL_GL_SetAttribute(SDL_GL_DEPTH_SIZE, 24); SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, 2);
SDL_GL_SetAttribute(SDL_GL_STENCIL_SIZE, 8);
SDL_GL_SetAttribute(SDL_GL_STENCIL_SIZE, 8); SDL_DisplayMode current;
SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, 2); SDL_GetCurrentDisplayMode(0, &current);
SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, 2);
SDL_DisplayMode current;
SDL_GetCurrentDisplayMode(0, &current);
#endif #endif
#if (defined ANDROID) #if (defined ANDROID)
Uint32 flags = SDL_WINDOW_OPENGL | SDL_WINDOW_FULLSCREEN | SDL_WINDOW_BORDERLESS; Uint32 flags = SDL_WINDOW_OPENGL | SDL_WINDOW_FULLSCREEN | SDL_WINDOW_BORDERLESS;
#elif defined __EMSCRIPTEN__
Uint32 flags = SDL_WINDOW_OPENGL | SDL_WINDOW_FULLSCREEN | SDL_WINDOW_BORDERLESS;
#else #else
Uint32 flags = SDL_WINDOW_OPENGL | SDL_WINDOW_RESIZABLE; Uint32 flags = SDL_WINDOW_OPENGL | SDL_WINDOW_RESIZABLE;
#endif #endif
@@ -737,7 +736,7 @@ bool SdlApp::OnInit()
glClearColor(0.0f, 0.0f, 0.0f, 0.0f); // Black Background (yes that's the way fuckers) glClearColor(0.0f, 0.0f, 0.0f, 0.0f); // Black Background (yes that's the way fuckers)
#if (defined GL_ES_VERSION_2_0) || (defined GL_VERSION_2_0) #if (defined GL_ES_VERSION_2_0) || (defined GL_VERSION_2_0)
#if (defined GL_ES_VERSION_2_0) #if (defined GL_ES_VERSION_2_0) && (!defined __EMSCRIPTEN__)
glClearDepthf(1.0f); // Depth Buffer Setup glClearDepthf(1.0f); // Depth Buffer Setup
#else #else
glClearDepth(1.0f); // Depth Buffer Setup glClearDepth(1.0f); // Depth Buffer Setup
@@ -800,16 +799,16 @@ int main(int argc, char* argv[])
#endif #endif
DebugTrace("I R in da native"); DebugTrace("I R in da native");
/*
DownloadRequest* downloadRequest = NULL; DownloadRequest* downloadRequest = NULL;
Downloader*downloader = Downloader::GetInstance(); Downloader*downloader = Downloader::GetInstance();
downloadRequest = downloader->Get( downloadRequest = downloader->Get(
"core.zip", "core.zip",
"file:///C:/Users/bieber/Documents/GitHub/wagic-cmake/build-emscripten/bin/Wagic-core.zip" "file:///C:/Users/xawot_000/Documents/GitHub/wagic-master/build-emscripten/bin/Wagic-core.zip"
// "http://127.0.0.1:8000/Wagic-core.zip" // "http://127.0.0.1:8000/Wagic-core.zip"
); );
downloadRequest->waitUntilCompleted(); downloadRequest->waitUntilCompleted();
*/
g_launcher = new JGameLauncher(); g_launcher = new JGameLauncher();
u32 flags = g_launcher->GetInitFlags(); u32 flags = g_launcher->GetInitFlags();

2
projects/mtg/src/WResourceManager.cpp
View File

@@ -206,7 +206,7 @@ ResourceManagerImpl::ResourceManagerImpl()
LOG("Calling CacheEngine::Create"); LOG("Calling CacheEngine::Create");
#ifdef PSP #if (defined PSP) || (defined __EMSCRIPTEN__)
CacheEngine::Create<UnthreadedCardRetriever>(textureWCache); CacheEngine::Create<UnthreadedCardRetriever>(textureWCache);
#else #else
CacheEngine::Create<ThreadedCardRetriever>(textureWCache); CacheEngine::Create<ThreadedCardRetriever>(textureWCache);