konsthol/shattered-pixel-dungeon-web-port
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nothing much

Browse Source
This commit is contained in:
konsthol
2025-06-03 20:10:46 +03:00
parent 5c053e78a7
commit 62af69055d
6 changed files with 30 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
SPD-classes/src/main/java/com/watabou/noosa/NoosaScript.java
View File

@@ -85,17 +85,17 @@ public class NoosaScript extends Script {
public void drawElements( FloatBuffer vertices, ShortBuffer indices, int size ) { public void drawElements( FloatBuffer vertices, ShortBuffer indices, int size ) {
if (DeviceCompat.isWeb()) { if (DeviceCompat.isWeb()) {
Gdx.gl30.glBindBuffer(Gdx.gl30.GL_ARRAY_BUFFER, vertexBufferId); activeGL.glBindBuffer(GL20.GL_ARRAY_BUFFER, vertexBufferId);
((Buffer)vertices).position( 0 ); ((Buffer)vertices).position( 0 );
Gdx.gl30.glBufferSubData(Gdx.gl30.GL_ARRAY_BUFFER, 0, vertices.remaining() * 4, vertices); activeGL.glBufferSubData(GL20.GL_ARRAY_BUFFER, 0, vertices.remaining() * 4, vertices);
aXY.vertexBuffer(2, 4, 0); aXY.vertexBuffer(2, 4, 0);
aUV.vertexBuffer(2, 4, 2); aUV.vertexBuffer(2, 4, 2);
Quad.releaseIndices(); Quad.releaseIndices();
Gdx.gl30.glDrawElements( Gdx.gl30.GL_TRIANGLES, size, Gdx.gl30.GL_UNSIGNED_SHORT, indices ); activeGL.glDrawElements( GL20.GL_TRIANGLES, size, GL20.GL_UNSIGNED_SHORT, indices );
Quad.bindIndices(); Quad.bindIndices();
Gdx.gl30.glBindBuffer(Gdx.gl30.GL_ARRAY_BUFFER, 0); activeGL.glBindBuffer(GL20.GL_ARRAY_BUFFER, 0);
} else { } else {
((Buffer)vertices).position( 0 ); ((Buffer)vertices).position( 0 );
aXY.vertexPointer( 2, 4, vertices ); aXY.vertexPointer( 2, 4, vertices );
@@ -111,14 +111,14 @@ public class NoosaScript extends Script {
public void drawQuad( FloatBuffer vertices ) { public void drawQuad( FloatBuffer vertices ) {
if (DeviceCompat.isWeb()) { if (DeviceCompat.isWeb()) {
Gdx.gl30.glBindBuffer(Gdx.gl30.GL_ARRAY_BUFFER, vertexBufferId); activeGL.glBindBuffer(GL20.GL_ARRAY_BUFFER, vertexBufferId);
((Buffer)vertices).position( 0 ); ((Buffer)vertices).position( 0 );
Gdx.gl30.glBufferSubData(Gdx.gl30.GL_ARRAY_BUFFER, 0, vertices.remaining() * 4, vertices); activeGL.glBufferSubData(GL20.GL_ARRAY_BUFFER, 0, vertices.remaining() * 4, vertices);
Gdx.gl30.glVertexAttribPointer(aXY.location(), 2, Gdx.gl30.GL_FLOAT, false, 4 * 4, 0); activeGL.glVertexAttribPointer(aXY.location(), 2, GL20.GL_FLOAT, false, 4 * 4, 0);
Gdx.gl30.glVertexAttribPointer(aUV.location(), 2, Gdx.gl30.GL_FLOAT, false, 4 * 4, 2 * 4); activeGL.glVertexAttribPointer(aUV.location(), 2, GL20.GL_FLOAT, false, 4 * 4, 2 * 4);
Gdx.gl30.glDrawElements( Gdx.gl30.GL_TRIANGLES, Quad.SIZE, Gdx.gl30.GL_UNSIGNED_SHORT, 0 ); activeGL.glDrawElements( GL20.GL_TRIANGLES, Quad.SIZE, GL20.GL_UNSIGNED_SHORT, 0 );
Gdx.gl30.glBindBuffer(Gdx.gl30.GL_ARRAY_BUFFER, 0); activeGL.glBindBuffer(GL20.GL_ARRAY_BUFFER, 0);
} else { } else {
((Buffer)vertices).position( 0 ); ((Buffer)vertices).position( 0 );
aXY.vertexPointer( 2, 4, vertices ); aXY.vertexPointer( 2, 4, vertices );
@@ -151,16 +151,16 @@ public class NoosaScript extends Script {
} }
if (DeviceCompat.isWeb()) { if (DeviceCompat.isWeb()) {
Gdx.gl30.glBindBuffer(Gdx.gl30.GL_ARRAY_BUFFER, vertexBufferId); activeGL.glBindBuffer(GL20.GL_ARRAY_BUFFER, vertexBufferId);
((Buffer)vertices).position( 0 ); ((Buffer)vertices).position( 0 );
Gdx.gl30.glBufferSubData(Gdx.gl30.GL_ARRAY_BUFFER, 0, vertices.remaining() * 4, vertices); activeGL.glBufferSubData(GL20.GL_ARRAY_BUFFER, 0, vertices.remaining() * 4, vertices);
Gdx.gl30.glVertexAttribPointer(aXY.location(), 2, Gdx.gl30.GL_FLOAT, false, 4 * 4, 0); activeGL.glVertexAttribPointer(aXY.location(), 2, GL20.GL_FLOAT, false, 4 * 4, 0);
Gdx.gl30.glVertexAttribPointer(aUV.location(), 2, Gdx.gl30.GL_FLOAT, false, 4 * 4, 2 * 4); activeGL.glVertexAttribPointer(aUV.location(), 2, GL20.GL_FLOAT, false, 4 * 4, 2 * 4);
Gdx.gl30.glDrawElements( Gdx.gl30.GL_TRIANGLES, Quad.SIZE * size, Gdx.gl30.GL_UNSIGNED_SHORT, 0 ); activeGL.glDrawElements( GL20.GL_TRIANGLES, Quad.SIZE * size, GL20.GL_UNSIGNED_SHORT, 0 );
Gdx.gl30.glBindBuffer(Gdx.gl30.GL_ARRAY_BUFFER, 0); activeGL.glBindBuffer(GL20.GL_ARRAY_BUFFER, 0);
} else { } else {
((Buffer)vertices).position( 0 ); ((Buffer)vertices).position( 0 );
aXY.vertexPointer( 2, 4, vertices ); aXY.vertexPointer( 2, 4, vertices );

2
build.gradle
View File

@@ -41,4 +41,4 @@ allprojects {
maven { url 'https://oss.sonatype.org/content/repositories/snapshots' } maven { url 'https://oss.sonatype.org/content/repositories/snapshots' }
} }
} }

1
html/build.gradle
View File

@@ -20,6 +20,7 @@ repositories {
tasks.register('compileClient', JavaExec) { tasks.register('compileClient', JavaExec) {
classpath(sourceSets.main.runtimeClasspath) classpath(sourceSets.main.runtimeClasspath)
mainClass.set('com.shatteredpixel.shatteredpixeldungeon.html.Compile') mainClass.set('com.shatteredpixel.shatteredpixeldungeon.html.Compile')
jvmArgs('-Xms8g', '-Xmx14g', '-Xss16m', '-XX:MaxMetaspaceSize=12g', '-Dfile.encoding=UTF-8')
outputs.dir '../release/webapp' outputs.dir '../release/webapp'
doFirst { doFirst {
println "Running compileClient..." println "Running compileClient..."

2
html/buildTestWeb.sh
View File

@@ -3,5 +3,5 @@
../gradlew :html:build ../gradlew :html:build
wait wait
if [[ -d ../release/webapp/ ]]; then if [[ -d ../release/webapp/ ]]; then
python3 -m http.server 8100 -d ../release/webapp/ python3 -m http.server 8000 -d ../release/webapp/
fi fi

9
html/deployWeb.sh Executable file
View File

@@ -0,0 +1,9 @@
#!/usr/bin/env bash
TARGET_FOLDER="shatteredPixelDungeon"
# shellcheck disable=SC2029
if ssh vps "[[ -d /var/www/$TARGET_FOLDER ]]"; then
ssh vps "find /var/www/$TARGET_FOLDER -mindepth 1 -delete"
scp -r ../release/webapp/* vps:/var/www/$TARGET_FOLDER
fi

4
html/src/main/java/Compile.java
View File

@@ -1,4 +1,4 @@
/* /*
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
* You may obtain a copy of the License at: * You may obtain a copy of the License at:
@@ -7,7 +7,7 @@
* *
* This file is derived from micronaut-libgdx-teavm (https://github.com/hollingsworthd/micronaut-libgdx-teavm), * This file is derived from micronaut-libgdx-teavm (https://github.com/hollingsworthd/micronaut-libgdx-teavm),
* originally licensed under the Apache License, Version 2.0. * originally licensed under the Apache License, Version 2.0.
* *
* Modifications made by Konsthol on 13/4/25: * Modifications made by Konsthol on 13/4/25:
* - Adjusted to compile Shattered Pixel Dungeon * - Adjusted to compile Shattered Pixel Dungeon
* *