Merge pull request #45 from zakki/fix-mmman-sdl

Fix mmman sdl

Author: onitama

.github/workflows/build.yml

@@ -42,7 +42,6 @@ jobs:
         actions-cache-folder: ${{env.EM_CACHE_FOLDER}}
     - name: Build hsp3dish.js
       run: |
-        cd src/hsp3dish
         make -f  makefile.emscripten -j2
     - name: Build hspcmp.js
       run: |
@@ -53,7 +52,7 @@ jobs:
       with:
         name: openhsp-js
         path: |
-          src/hsp3dish/*.js
-          src/hsp3dish/*.wasm
+          *.js
+          *.wasm
           src/hspcmp/*.js
           src/hspcmp/*.wasm

makefile.emscripten

@@ -63,7 +63,6 @@
 #define USE_JAVA_FONT
 #define FONT_TEX_SX 512
 #define FONT_TEX_SY 128
-int hgio_fontsystem_get_texid(void);
 #endif
 
 #if defined(HSPLINUX) || defined(HSPEMSCRIPTEN)
@@ -753,7 +752,6 @@ static	int fontdata_size;
 static	int fontdata_color;
 static	int fontsystem_size;
 static	int fontsystem_style;
-static	int fontsystem_texid;
 
 static int Get2N(int val)
 {
@@ -765,11 +763,6 @@ static int Get2N(int val)
 	return res;
 }
 
-int hgio_fontsystem_get_texid(void)
-{
-	return fontsystem_texid;
-}
-
 void hgio_fontsystem_term(void)
 {
 	//		フォントレンダリング解放
@@ -811,10 +804,11 @@ int hgio_fontsystem_exec(char* msg, unsigned char* buffer, int pitch, int* out_s
 			}
 			d.style.setProperty("font", $1 + "px 'sans-serif'");
 
-			const t = document.createTextNode(UTF8ToString($0));
-			if (d.hasChildNodes())
-				d.removeChild(d.firstChild);
-			d.appendChild(t);
+			//const t = document.createTextNode(UTF8ToString($0));
+			//if (d.hasChildNodes())
+			//	d.removeChild(d.firstChild);
+			//d.appendChild(t);
+			d.innerText = UTF8ToString($0);
 			HEAP32[$2 >> 2] = d.clientWidth | 0;
 			HEAP32[$3 >> 2] = d.clientHeight | 0;
 
@@ -854,33 +848,22 @@ int hgio_fontsystem_exec(char* msg, unsigned char* buffer, int pitch, int* out_s
 	int sx = Get2N(fontsystem_sx);
 	int sy = Get2N(fontsystem_sy);
 
-	GLuint id;
-	glGenTextures( 1, &id );
-	glBindTexture( GL_TEXTURE_2D, id );
-	glTexImage2D( GL_TEXTURE_2D, 0, GL_RGBA, sx, sy, 0, GL_RGBA, GL_UNSIGNED_BYTE, NULL );
-
-	glBindTexture( GL_TEXTURE_2D, id );
-	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-
-	glPixelStorei( GL_UNPACK_ALIGNMENT, 1);
-
 	EM_ASM_({
 		var canvas = document.getElementById('hsp3dishFontCanvas');
-		if (canvas) {
-			document.body.removeChild(canvas);
+		if (!canvas) {
+			//document.body.removeChild(canvas);
+			canvas = document.createElement("canvas");
+			canvas.id = 'hsp3dishFontCanvas';
+			canvas.style.setProperty("visibility", "hidden");
+			canvas.style.setProperty("position", "absolute");
+			canvas.style.setProperty("top", "0");
+			canvas.style.setProperty("left", "0");
+			canvas.width = $2;
+			canvas.height = $3;
+			document.body.appendChild(canvas);
 		}
-		canvas = document.createElement("canvas");
-		canvas.id = 'hsp3dishFontCanvas';
-		canvas.style.setProperty("visibility", "hidden");
-		canvas.style.setProperty("position", "absolute");
-		canvas.style.setProperty("top", "0");
-		canvas.style.setProperty("left", "0");
-		canvas.width = $2;
-		canvas.height = $3;
-		document.body.appendChild(canvas);
-
-		var context = canvas.getContext("2d");
+
+		var context = canvas.getContext("2d", { willReadFrequently: true });
 		context.font = $1 + "px 'sans-serif'";
 
 		var msg = UTF8ToString($0);
@@ -889,12 +872,11 @@ int hgio_fontsystem_exec(char* msg, unsigned char* buffer, int pitch, int* out_s
 		context.fillText(msg, 0, $1);
 		//console.log(msg);
 
-		GLctx.texImage2D(GLctx.TEXTURE_2D, 0, GLctx.RGBA, GLctx.RGBA, GLctx.UNSIGNED_BYTE, canvas);
-		}, msg, fontsystem_size, sx, sy);
-
+		//GLctx.texImage2D(GLctx.TEXTURE_2D, 0, GLctx.RGBA, GLctx.RGBA, GLctx.UNSIGNED_BYTE, context.getImageData(0, 0, $2, $3));
+		var imageData = context.getImageData(0, 0, $2, $3);
+		HEAPU8.set(imageData.data, $4);
 
-	glBindTexture(GL_TEXTURE_2D, 0);
-	fontsystem_texid = (int)id;
+		}, msg, fontsystem_size, sx, sy, buffer);
 
 	//Alertf( "Init:Surface(%d,%d) %d destpitch%d",fontsystem_sx,fontsystem_sy,fontdata_color,pitch );
 	*out_sx = fontsystem_sx;

src/hsp3dish/emscripten/fontsystem.cpp

@@ -63,7 +63,6 @@
 #define USE_JAVA_FONT
 #define FONT_TEX_SX 512
 #define FONT_TEX_SY 128
-int hgio_fontsystem_get_texid(void);
 #endif
 
 #if defined(HSPLINUX) || defined(HSPEMSCRIPTEN)
@@ -493,9 +492,11 @@ void hgio_reset( void )
     //ポイントの設定
     glEnable(GL_POINT_SMOOTH);
 
+#if !defined(HSPEMSCRIPTEN)
     //前処理
     glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_MAG_FILTER,GL_NEAREST);
     glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_MIN_FILTER,GL_NEAREST);
+#endif
 
 	//テクスチャ設定リセット
 	TexReset();
@@ -2163,9 +2164,6 @@ void hgio_fontsystem_delete(int id)
 
 int hgio_fontsystem_setup(int sx, int sy, void *buffer)
 {
-#if defined(HSPEMSCRIPTEN)
-	return hgio_fontsystem_get_texid();
-#else
 	GLuint id;
 	glGenTextures( 1, &id );
 	glBindTexture( GL_TEXTURE_2D, id );
@@ -2175,7 +2173,6 @@ int hgio_fontsystem_setup(int sx, int sy, void *buffer)
 	ChangeTex( tid );
 	glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, sx,sy, GL_RGBA, GL_UNSIGNED_BYTE, (char *)buffer);
 	return tid;
-#endif
 }
 
 

src/hsp3dish/emscripten/hgiox.cpp

@@ -61,7 +61,6 @@
 #define USE_JAVA_FONT
 #define FONT_TEX_SX 512
 #define FONT_TEX_SY 128
-int hgio_fontsystem_get_texid(void);
 #endif
 
 #if defined(HSPLINUX) || defined(HSPEMSCRIPTEN)

src/hsp3dish/emscripten/hgtex.cpp

@@ -141,10 +141,18 @@ MMMan::MMMan()
 	engine_flag = false;
 	MusicInit();
 
-	Mix_Init(MIX_INIT_OGG|MIX_INIT_MP3);
+	int init_result = Mix_Init(MIX_INIT_OGG|MIX_INIT_MP3);
+	if (init_result != (MIX_INIT_OGG|MIX_INIT_MP3)) {
+		Alertf("[MMMan] Mix_Init: %d OGG:%d MP3:%d\n", init_result, init_result & MIX_INIT_OGG, init_result & MIX_INIT_MP3);
+	}
 
-	Mix_ReserveChannels(16);
 	int ret = Mix_OpenAudio(0, 0, 0, 0);
+
+	int allocated_channels = Mix_AllocateChannels(MIX_MAX_CHANNEL);
+	if (allocated_channels != MIX_MAX_CHANNEL) {
+		printf("[MMMan] Mix_AllocateChannels: %d\n", allocated_channels);
+	}
+
 	//assert(ret == 0);
 	engine_flag = ret == 0;
 }
@@ -155,9 +163,10 @@ MMMan::~MMMan()
 	ClearAllBank();
 	MusicTerm();
 
+	Mix_CloseAudio();
+
 	while(Mix_Init(0))
 		Mix_Quit();
-	Mix_CloseAudio();
 }
 
 void MMMan::DeleteBank( int bank )

src/hsp3dish/emscripten/mmman.cpp

@@ -297,11 +297,11 @@ using std::va_list;
     #else
         #error "Unsupported Apple Device"
     #endif
-#elif EMSCRIPTEN
+#elif __EMSCRIPTEN__
     #define GLEW_STATIC
     #include <GL/glew.h>
     #define OPENGL_ES
-    #define USE_VAO
+    #define GP_USE_VAO
 #endif
 
 // Graphics (GLSL)

src/hsp3dish/gameplay/src/Base.h

@@ -50,6 +50,14 @@ DepthStencilTarget* DepthStencilTarget::create(const char* id, Format format, un
     __gl_error_code = glGetError();
     if ( __gl_error_code != GL_NO_ERROR)
     {
+#ifdef __EMSCRIPTEN__
+        glRenderbufferStorage(GL_RENDERBUFFER, GL_DEPTH_STENCIL, width, height);
+    }
+
+    __gl_error_code = glGetError();
+    if ( __gl_error_code != GL_NO_ERROR)
+    {
+#endif
         const char* extString = (const char*)glGetString(GL_EXTENSIONS);
 
         if (strstr(extString, "GL_OES_packed_depth_stencil") != 0)

src/hsp3dish/gameplay/src/DepthStencilTarget.cpp

@@ -221,9 +221,6 @@ void FrameBuffer::setRenderTarget(RenderTarget* target, unsigned int index, GLen
 
         // Restore the FBO binding
         GL_ASSERT( glBindFramebuffer(GL_FRAMEBUFFER, _currentFrameBuffer->_handle) );
-
-        // FIXME: Without this, setDepthStencilTarget will fail
-        glGetError();
     }
 }
 
@@ -261,14 +258,21 @@ void FrameBuffer::setDepthStencilTarget(DepthStencilTarget* target)
         GL_ASSERT( glBindFramebuffer(GL_FRAMEBUFFER, _handle) );
 
         // Attach the render buffer to the framebuffer
-        GL_ASSERT( glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, GL_RENDERBUFFER, _depthStencilTarget->_depthBuffer) );
         if (target->isPacked())
         {
-            GL_ASSERT( glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_STENCIL_ATTACHMENT, GL_RENDERBUFFER, _depthStencilTarget->_depthBuffer) );
+            GL_ASSERT( glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_DEPTH_STENCIL_ATTACHMENT, GL_RENDERBUFFER, _depthStencilTarget->_depthBuffer) );
         }
         else if (target->getFormat() == DepthStencilTarget::DEPTH_STENCIL)
         {
+#ifdef __EMSCRIPTEN__
+            GP_WARN("Unexpected status %d %zu %zu", target->isPacked(), _depthStencilTarget->_depthBuffer, _depthStencilTarget->_stencilBuffer);
+            GL_ASSERT( glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, GL_RENDERBUFFER, _depthStencilTarget->_depthBuffer) );
             GL_ASSERT( glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_STENCIL_ATTACHMENT, GL_RENDERBUFFER, _depthStencilTarget->_stencilBuffer) );
+#endif
+        }
+        else
+        {
+            GL_ASSERT( glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, GL_RENDERBUFFER, _depthStencilTarget->_depthBuffer) );
         }
 
         // Check the framebuffer is good to go.