mirror of
https://github.com/curioustorvald/Terrarum.git
synced 2026-03-13 23:26:07 +09:00
some mac-specific codes
This commit is contained in:
@@ -14,6 +14,7 @@ import com.badlogic.gdx.graphics.glutils.*;
|
|||||||
import com.badlogic.gdx.utils.Disposable;
|
import com.badlogic.gdx.utils.Disposable;
|
||||||
import com.badlogic.gdx.utils.GdxRuntimeException;
|
import com.badlogic.gdx.utils.GdxRuntimeException;
|
||||||
import com.badlogic.gdx.utils.JsonValue;
|
import com.badlogic.gdx.utils.JsonValue;
|
||||||
|
import com.badlogic.gdx.utils.SharedLibraryLoader;
|
||||||
import com.github.strikerx3.jxinput.XInputDevice;
|
import com.github.strikerx3.jxinput.XInputDevice;
|
||||||
import kotlin.jvm.functions.Function0;
|
import kotlin.jvm.functions.Function0;
|
||||||
import kotlin.text.Charsets;
|
import kotlin.text.Charsets;
|
||||||
@@ -351,7 +352,8 @@ public class App implements ApplicationListener {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public static ShapeRenderer makeShapeRenderer() {
|
public static ShapeRenderer makeShapeRenderer() {
|
||||||
return new ShapeRenderer(5000, DefaultGL32Shaders.INSTANCE.createShapeRendererShader());
|
ShapeRenderer s = new ShapeRenderer(5000, DefaultGL32Shaders.INSTANCE.createShapeRendererShader());
|
||||||
|
return s;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static boolean gl40capable = false;
|
public static boolean gl40capable = false;
|
||||||
@@ -468,7 +470,11 @@ public class App implements ApplicationListener {
|
|||||||
appConfig.setTitle(GAME_NAME);
|
appConfig.setTitle(GAME_NAME);
|
||||||
//appConfig.forceExit = true; // it seems KDE 5 likes this one better...
|
//appConfig.forceExit = true; // it seems KDE 5 likes this one better...
|
||||||
// (Plasma freezes upon app exit. with forceExit = true, it's only frozen for a minute; with forceExit = false, it's indefinite)
|
// (Plasma freezes upon app exit. with forceExit = true, it's only frozen for a minute; with forceExit = false, it's indefinite)
|
||||||
//appConfig.samples = 4; // force the AA on, if the graphics driver didn't do already
|
|
||||||
|
if (SharedLibraryLoader.isMac)
|
||||||
|
appConfig.setBackBufferConfig(8, 8, 8, 8, 16, 0, 4);
|
||||||
|
else
|
||||||
|
appConfig.setBackBufferConfig(16, 16, 16, 16, 16, 0, 4);
|
||||||
|
|
||||||
// load app icon
|
// load app icon
|
||||||
appConfig.setWindowIcon(Files.FileType.Classpath,
|
appConfig.setWindowIcon(Files.FileType.Classpath,
|
||||||
|
|||||||
@@ -41,6 +41,7 @@ import net.torvald.terrarumsansbitmap.gdx.TerrarumSansBitmap
|
|||||||
import net.torvald.unsafe.UnsafeHelper
|
import net.torvald.unsafe.UnsafeHelper
|
||||||
import net.torvald.util.CircularArray
|
import net.torvald.util.CircularArray
|
||||||
import org.dyn4j.geometry.Vector2
|
import org.dyn4j.geometry.Vector2
|
||||||
|
import org.lwjgl.opengl.GL11
|
||||||
import java.io.File
|
import java.io.File
|
||||||
import java.io.PrintStream
|
import java.io.PrintStream
|
||||||
import kotlin.math.*
|
import kotlin.math.*
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
package net.torvald.terrarum.modulebasegame.gameactors
|
package net.torvald.terrarum.modulebasegame.gameactors
|
||||||
|
|
||||||
|
import com.badlogic.gdx.Gdx
|
||||||
import com.badlogic.gdx.graphics.Color
|
import com.badlogic.gdx.graphics.Color
|
||||||
import com.badlogic.gdx.graphics.g2d.SpriteBatch
|
import com.badlogic.gdx.graphics.g2d.SpriteBatch
|
||||||
import net.torvald.terrarum.*
|
import net.torvald.terrarum.*
|
||||||
@@ -7,6 +8,7 @@ import net.torvald.terrarum.TerrarumAppConfiguration.TILE_SIZED
|
|||||||
import net.torvald.terrarum.gameactors.ActorWithBody
|
import net.torvald.terrarum.gameactors.ActorWithBody
|
||||||
import net.torvald.terrarum.modulebasegame.worldgenerator.HALF_PI
|
import net.torvald.terrarum.modulebasegame.worldgenerator.HALF_PI
|
||||||
import net.torvald.terrarum.modulebasegame.worldgenerator.TWO_PI
|
import net.torvald.terrarum.modulebasegame.worldgenerator.TWO_PI
|
||||||
|
import org.lwjgl.opengl.GL11
|
||||||
import java.util.*
|
import java.util.*
|
||||||
import kotlin.math.*
|
import kotlin.math.*
|
||||||
|
|
||||||
@@ -153,7 +155,9 @@ class ActorConveyors : ActorWithBody {
|
|||||||
batch.end()
|
batch.end()
|
||||||
|
|
||||||
shapeRender.projectionMatrix = batch.projectionMatrix
|
shapeRender.projectionMatrix = batch.projectionMatrix
|
||||||
|
Gdx.gl.glEnable(GL11.GL_LINE_SMOOTH)
|
||||||
shapeRender.inUse {
|
shapeRender.inUse {
|
||||||
|
|
||||||
it.color = COL_BELT
|
it.color = COL_BELT
|
||||||
|
|
||||||
// belt top
|
// belt top
|
||||||
|
|||||||
Reference in New Issue
Block a user