mirror of
https://github.com/curioustorvald/Terrarum.git
synced 2026-06-11 19:14:05 +09:00
Slick wireframes when antialised
Former-commit-id: ff43e4904ace96db4915e9684c07f0ef53d91634 Former-commit-id: 2397086bc1157242df81cdc0d3fb3cfaa5a02f79
This commit is contained in:
4
.idea/libraries/lib.xml
generated
4
.idea/libraries/lib.xml
generated
@@ -5,7 +5,6 @@
|
|||||||
<root url="jar://$PROJECT_DIR$/lib/commons-csv-1.2.jar!/" />
|
<root url="jar://$PROJECT_DIR$/lib/commons-csv-1.2.jar!/" />
|
||||||
<root url="jar://$PROJECT_DIR$/lib/gson-2.5.jar!/" />
|
<root url="jar://$PROJECT_DIR$/lib/gson-2.5.jar!/" />
|
||||||
<root url="jar://$PROJECT_DIR$/lib/ibxm.jar!/" />
|
<root url="jar://$PROJECT_DIR$/lib/ibxm.jar!/" />
|
||||||
<root url="jar://$PROJECT_DIR$/lib/jbox2d-library-2.1.2.jar!/" />
|
|
||||||
<root url="jar://$PROJECT_DIR$/lib/jinput.jar!/" />
|
<root url="jar://$PROJECT_DIR$/lib/jinput.jar!/" />
|
||||||
<root url="jar://$PROJECT_DIR$/lib/jnlp.jar!/" />
|
<root url="jar://$PROJECT_DIR$/lib/jnlp.jar!/" />
|
||||||
<root url="jar://$PROJECT_DIR$/lib/jogg-0.0.7.jar!/" />
|
<root url="jar://$PROJECT_DIR$/lib/jogg-0.0.7.jar!/" />
|
||||||
@@ -15,8 +14,6 @@
|
|||||||
<root url="jar://$PROJECT_DIR$/lib/lwjgl.jar!/" />
|
<root url="jar://$PROJECT_DIR$/lib/lwjgl.jar!/" />
|
||||||
<root url="jar://$PROJECT_DIR$/lib/lwjgl_util.jar!/" />
|
<root url="jar://$PROJECT_DIR$/lib/lwjgl_util.jar!/" />
|
||||||
<root url="jar://$PROJECT_DIR$/lib/slick.jar!/" />
|
<root url="jar://$PROJECT_DIR$/lib/slick.jar!/" />
|
||||||
<root url="jar://$PROJECT_DIR$/lib/OpenComputers-JNLua.jar!/" />
|
|
||||||
<root url="jar://$PROJECT_DIR$/lib/OpenComputers-LuaJ.jar!/" />
|
|
||||||
<root url="file://$PROJECT_DIR$/lib" />
|
<root url="file://$PROJECT_DIR$/lib" />
|
||||||
</CLASSES>
|
</CLASSES>
|
||||||
<JAVADOC>
|
<JAVADOC>
|
||||||
@@ -29,7 +26,6 @@
|
|||||||
<root url="file://$PROJECT_DIR$/lib" />
|
<root url="file://$PROJECT_DIR$/lib" />
|
||||||
</NATIVE>
|
</NATIVE>
|
||||||
<SOURCES>
|
<SOURCES>
|
||||||
<root url="file://$USER_HOME$/Downloads/slick/src" />
|
|
||||||
<root url="jar://$PROJECT_DIR$/lib/kotlin-runtime-sources.jar!/" />
|
<root url="jar://$PROJECT_DIR$/lib/kotlin-runtime-sources.jar!/" />
|
||||||
<root url="file://$PROJECT_DIR$/lib" />
|
<root url="file://$PROJECT_DIR$/lib" />
|
||||||
</SOURCES>
|
</SOURCES>
|
||||||
|
|||||||
15
.idea/misc.xml
generated
15
.idea/misc.xml
generated
@@ -38,20 +38,7 @@
|
|||||||
<property name="caretWidth" class="java.lang.Integer" />
|
<property name="caretWidth" class="java.lang.Integer" />
|
||||||
</properties>
|
</properties>
|
||||||
</component>
|
</component>
|
||||||
<component name="EntryPointsManager">
|
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
|
||||||
<entry_points version="2.0" />
|
|
||||||
</component>
|
|
||||||
<component name="ProjectLevelVcsManager" settingsEditedManually="false">
|
|
||||||
<OptionsSetting value="true" id="Add" />
|
|
||||||
<OptionsSetting value="true" id="Remove" />
|
|
||||||
<OptionsSetting value="true" id="Checkout" />
|
|
||||||
<OptionsSetting value="true" id="Update" />
|
|
||||||
<OptionsSetting value="true" id="Status" />
|
|
||||||
<OptionsSetting value="true" id="Edit" />
|
|
||||||
<ConfirmationsSetting value="0" id="Add" />
|
|
||||||
<ConfirmationsSetting value="0" id="Remove" />
|
|
||||||
</component>
|
|
||||||
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
|
|
||||||
<output url="file://$PROJECT_DIR$/out" />
|
<output url="file://$PROJECT_DIR$/out" />
|
||||||
</component>
|
</component>
|
||||||
</project>
|
</project>
|
||||||
2
.idea/vcs.xml
generated
2
.idea/vcs.xml
generated
@@ -1,6 +1,6 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<project version="4">
|
<project version="4">
|
||||||
<component name="VcsDirectoryMappings">
|
<component name="VcsDirectoryMappings">
|
||||||
<mapping directory="$PROJECT_DIR$" vcs="Git" />
|
<mapping directory="" vcs="Git" />
|
||||||
</component>
|
</component>
|
||||||
</project>
|
</project>
|
||||||
@@ -5,6 +5,11 @@
|
|||||||
<content url="file://$MODULE_DIR$">
|
<content url="file://$MODULE_DIR$">
|
||||||
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
|
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
|
||||||
<sourceFolder url="file://$MODULE_DIR$/assets" type="java-resource" />
|
<sourceFolder url="file://$MODULE_DIR$/assets" type="java-resource" />
|
||||||
|
<excludeFolder url="file://$MODULE_DIR$/.gradle" />
|
||||||
|
<excludeFolder url="file://$MODULE_DIR$/build" />
|
||||||
|
<excludeFolder url="file://$MODULE_DIR$/core" />
|
||||||
|
<excludeFolder url="file://$MODULE_DIR$/desktop" />
|
||||||
|
<excludeFolder url="file://$MODULE_DIR$/gradle" />
|
||||||
</content>
|
</content>
|
||||||
<orderEntry type="inheritedJdk" />
|
<orderEntry type="inheritedJdk" />
|
||||||
<orderEntry type="sourceFolder" forTests="false" />
|
<orderEntry type="sourceFolder" forTests="false" />
|
||||||
|
|||||||
@@ -275,8 +275,6 @@ constructor() : BasicGameState() {
|
|||||||
actorsDrawFrameBuffer.graphics.clear()
|
actorsDrawFrameBuffer.graphics.clear()
|
||||||
uisDrawFrameBuffer.graphics.clear()
|
uisDrawFrameBuffer.graphics.clear()
|
||||||
|
|
||||||
|
|
||||||
gwin.isAntiAlias = true
|
|
||||||
blendNormal()
|
blendNormal()
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -27,7 +27,7 @@ internal class SetAV : ConsoleCommand {
|
|||||||
|
|
||||||
override fun execute(args: Array<String>) {
|
override fun execute(args: Array<String>) {
|
||||||
fun parseAVInput(arg: String): Any {
|
fun parseAVInput(arg: String): Any {
|
||||||
val `val`: Any
|
var `val`: Any
|
||||||
|
|
||||||
try {
|
try {
|
||||||
`val` = Integer(arg) // try for integer
|
`val` = Integer(arg) // try for integer
|
||||||
|
|||||||
@@ -56,7 +56,7 @@ internal class Filesystem(globals: Globals, computer: BaseTerrarumComputer) {
|
|||||||
throw IOException("path contains invalid characters")
|
throw IOException("path contains invalid characters")
|
||||||
}
|
}
|
||||||
|
|
||||||
val isCaseInsensitive: Boolean
|
var isCaseInsensitive: Boolean
|
||||||
|
|
||||||
init {
|
init {
|
||||||
try {
|
try {
|
||||||
|
|||||||
@@ -162,10 +162,10 @@ object WeatherMixer {
|
|||||||
val skybox: Image
|
val skybox: Image
|
||||||
val extraImages = ArrayList<Image>()
|
val extraImages = ArrayList<Image>()
|
||||||
val classification = JSON.get("classification").asJsonPrimitive.asString
|
val classification = JSON.get("classification").asJsonPrimitive.asString
|
||||||
val mixFrom: String?
|
var mixFrom: String?
|
||||||
try { mixFrom = JSON.get("mixFrom").asJsonPrimitive.asString }
|
try { mixFrom = JSON.get("mixFrom").asJsonPrimitive.asString }
|
||||||
catch (e: NullPointerException) { mixFrom = null }
|
catch (e: NullPointerException) { mixFrom = null }
|
||||||
val mixPercentage: Double?
|
var mixPercentage: Double?
|
||||||
try { mixPercentage = JSON.get("mixPercentage").asJsonPrimitive.asDouble }
|
try { mixPercentage = JSON.get("mixPercentage").asJsonPrimitive.asDouble }
|
||||||
catch (e: NullPointerException) { mixPercentage = null }
|
catch (e: NullPointerException) { mixPercentage = null }
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user