curioustorvald/Terrarum
1
0
Fork 0
mirror of https://github.com/curioustorvald/Terrarum.git synced 2026-06-13 03:54:06 +09:00
Code Issues Packages Projects Releases Wiki Activity

update keyboard layout

Browse Source
This commit is contained in:
minjaesong
2022-09-19 00:02:54 +09:00
parent 17f85aa155
commit 64189318cb
11 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.idea/codeStyles/Project.xml generated
View File

@@ -6,9 +6,6 @@
<MarkdownNavigatorCodeStyleSettings> <MarkdownNavigatorCodeStyleSettings>
<option name="RIGHT_MARGIN" value="72" /> <option name="RIGHT_MARGIN" value="72" />
</MarkdownNavigatorCodeStyleSettings> </MarkdownNavigatorCodeStyleSettings>
<XML>
<option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
</XML>
<codeStyleSettings language="JAVA"> <codeStyleSettings language="JAVA">
<option name="KEEP_FIRST_COLUMN_COMMENT" value="false" /> <option name="KEEP_FIRST_COLUMN_COMMENT" value="false" />
<option name="ELSE_ON_NEW_LINE" value="true" /> <option name="ELSE_ON_NEW_LINE" value="true" />

3
ModuleComputers/src/net/torvald/terrarum/modulecomputers/gameactors/FixtureHomeComputer.kt
View File

@@ -174,7 +174,8 @@ internal class UIHomeComputer : UICanvas(
otherBatch.end() otherBatch.end()
fbo.inAction(camera, batch) { fbo.inAction(camera, batch) {
Gdx.gl.glClearColor(0f,0f,0f,1f) // to hide the crap might be there Gdx.gl.glClearColor(0f,0f,0f,1f)
Gdx.gl.glClear(GL20.GL_COLOR_BUFFER_BIT) // to hide the crap might be there
(vm.peripheralTable[1].peripheral as? GraphicsAdapter)?.let { gpu -> (vm.peripheralTable[1].peripheral as? GraphicsAdapter)?.let { gpu ->
val clearCol = gpu.getBackgroundColour() val clearCol = gpu.getBackgroundColour()

2
assets/keylayout/ko_kr_2set_ksx5002.ime
View File

@@ -343,7 +343,7 @@ let bufAssemble = (isPreview) => {
} }
//let bufDebugStringify = (buf) => [0,1,2].map(i => (buf[i] == undefined) ? "·" : `\\u${buf[i].codePointAt(0).toString(16).toUpperCase()}`).join(' ') //let bufDebugStringify = (buf) => [0,1,2].map(i => (buf[i] == undefined) ? "·" : `\\u${buf[i].codePointAt(0).toString(16).toUpperCase()}`).join(' ')
let bufDebugStringify = (buf) => [0,1,2].map(i => (buf[i] == undefined) ? "·" : `${buf[i]}`).join(' ') let bufDebugStringify = (buf) => [0,1,2].map(i => (buf[i] == undefined) ? "·" : `${buf[i]}`).join(' ')
return Object.freeze({"n":"두벌식 표준","v":"one","c":"CuriousTo\uA75Bvald","m":"rewrite", return Object.freeze({"n":"두벌식 표준","v":"none","c":"CuriousTo\uA75Bvald","m":"rewrite",
"t":states.keylayouts.map(it => [it[0],it[1]]), "t":states.keylayouts.map(it => [it[0],it[1]]),
"l":"koKR", "l":"koKR",
// return: [displayed output, composed output] // return: [displayed output, composed output]

2
assets/keylayout/ko_kr_2set_ksx5002_alt.ime
View File

@@ -343,7 +343,7 @@ let bufAssemble = () => {
} }
//let bufDebugStringify = (buf) => [0,1,2].map(i => (buf[i] == undefined) ? "·" : `\\u${buf[i].codePointAt(0).toString(16).toUpperCase()}`).join(' ') //let bufDebugStringify = (buf) => [0,1,2].map(i => (buf[i] == undefined) ? "·" : `\\u${buf[i].codePointAt(0).toString(16).toUpperCase()}`).join(' ')
let bufDebugStringify = (buf) => [0,1,2].map(i => (buf[i] == undefined) ? "·" : `${buf[i]}`).join(' ') let bufDebugStringify = (buf) => [0,1,2].map(i => (buf[i] == undefined) ? "·" : `${buf[i]}`).join(' ')
return Object.freeze({"n":"두벌식 수정 표준","v":"one","c":"CuriousTo\uA75Bvald","m":"rewrite", return Object.freeze({"n":"두벌식 수정 표준","v":"none","c":"CuriousTo\uA75Bvald","m":"rewrite",
"t":states.keylayouts.map(it => [it[0],it[1]]), "t":states.keylayouts.map(it => [it[0],it[1]]),
"l":"koKR", "l":"koKR",
// return: [displayed output, composed output] // return: [displayed output, composed output]

2
assets/keylayout/ko_kr_3set_390.ime
View File

@@ -372,7 +372,7 @@ let bufAssemble = (normalise) => {
let isBufferEmpty = (buf) => buf[0] === undefined && buf[1] === undefined && buf[2] === undefined let isBufferEmpty = (buf) => buf[0] === undefined && buf[1] === undefined && buf[2] === undefined
let isBufferNotEmpty = (buf) => buf[0] !== undefined || buf[1] !== undefined || buf[2] !== undefined let isBufferNotEmpty = (buf) => buf[0] !== undefined || buf[1] !== undefined || buf[2] !== undefined
let bufDebugStringify = (buf) => [0,1,2].map(i => (buf[i] == undefined) ? "·" : `\\u${buf[i].codePointAt(0).toString(16).toUpperCase()}`).join(' ') let bufDebugStringify = (buf) => [0,1,2].map(i => (buf[i] == undefined) ? "·" : `\\u${buf[i].codePointAt(0).toString(16).toUpperCase()}`).join(' ')
return Object.freeze({"n":"세벌식 3-90","v":"one","c":"CuriousTo\uA75Bvald","m":"rewrite", return Object.freeze({"n":"세벌식 3-90","v":"none","c":"CuriousTo\uA75Bvald","m":"rewrite",
"t":states.keylayouts.map(it => [it[0],it[1]]), "t":states.keylayouts.map(it => [it[0],it[1]]),
"l":"koKR", "l":"koKR",
// return: [displayed output, composed output] // return: [displayed output, composed output]

2
assets/keylayout/ko_kr_3set_391.ime
View File

@@ -372,7 +372,7 @@ let bufAssemble = (normalise) => {
let isBufferEmpty = (buf) => buf[0] === undefined && buf[1] === undefined && buf[2] === undefined let isBufferEmpty = (buf) => buf[0] === undefined && buf[1] === undefined && buf[2] === undefined
let isBufferNotEmpty = (buf) => buf[0] !== undefined || buf[1] !== undefined || buf[2] !== undefined let isBufferNotEmpty = (buf) => buf[0] !== undefined || buf[1] !== undefined || buf[2] !== undefined
let bufDebugStringify = (buf) => [0,1,2].map(i => (buf[i] == undefined) ? "·" : `\\u${buf[i].codePointAt(0).toString(16).toUpperCase()}`).join(' ') let bufDebugStringify = (buf) => [0,1,2].map(i => (buf[i] == undefined) ? "·" : `\\u${buf[i].codePointAt(0).toString(16).toUpperCase()}`).join(' ')
return Object.freeze({"n":"세벌식 공자판","v":"one","c":"CuriousTo\uA75Bvald","m":"rewrite", return Object.freeze({"n":"세벌식 공자판","v":"none","c":"CuriousTo\uA75Bvald","m":"rewrite",
"t":states.keylayouts.map(it => [it[0],it[1]]), "t":states.keylayouts.map(it => [it[0],it[1]]),
"l":"koKR", "l":"koKR",
// return: [displayed output, composed output] // return: [displayed output, composed output]

2
assets/keylayout/ko_kr_3set_shin_03.ime
View File

@@ -382,7 +382,7 @@ let bufAssemble = (normalise) => {
let isBufferEmpty = (buf) => buf[0] === undefined && buf[1] === undefined && buf[2] === undefined let isBufferEmpty = (buf) => buf[0] === undefined && buf[1] === undefined && buf[2] === undefined
let isBufferNotEmpty = (buf) => buf[0] !== undefined || buf[1] !== undefined || buf[2] !== undefined let isBufferNotEmpty = (buf) => buf[0] !== undefined || buf[1] !== undefined || buf[2] !== undefined
let bufDebugStringify = (buf) => [0,1,2].map(i => (buf[i] == undefined) ? "·" : `\\u${buf[i].codePointAt(0).toString(16).toUpperCase()}`).join(' ') let bufDebugStringify = (buf) => [0,1,2].map(i => (buf[i] == undefined) ? "·" : `\\u${buf[i].codePointAt(0).toString(16).toUpperCase()}`).join(' ')
return Object.freeze({"n":"신세벌식 ’03","v":"one","c":"CuriousTo\uA75Bvald","m":"rewrite", return Object.freeze({"n":"신세벌식 ’03","v":"none","c":"CuriousTo\uA75Bvald","m":"rewrite",
"t":states.keylayouts.map(it => [it[0],it[1]]), "t":states.keylayouts.map(it => [it[0],it[1]]),
"l":"koKR", "l":"koKR",
// return: [displayed output, composed output] // return: [displayed output, composed output]

2
assets/keylayout/ko_kr_3set_shin_p2.ime
View File

@@ -382,7 +382,7 @@ let bufAssemble = (normalise) => {
let isBufferEmpty = (buf) => buf[0] === undefined && buf[1] === undefined && buf[2] === undefined let isBufferEmpty = (buf) => buf[0] === undefined && buf[1] === undefined && buf[2] === undefined
let isBufferNotEmpty = (buf) => buf[0] !== undefined || buf[1] !== undefined || buf[2] !== undefined let isBufferNotEmpty = (buf) => buf[0] !== undefined || buf[1] !== undefined || buf[2] !== undefined
let bufDebugStringify = (buf) => [0,1,2].map(i => (buf[i] == undefined) ? "·" : `\\u${buf[i].codePointAt(0).toString(16).toUpperCase()}`).join(' ') let bufDebugStringify = (buf) => [0,1,2].map(i => (buf[i] == undefined) ? "·" : `\\u${buf[i].codePointAt(0).toString(16).toUpperCase()}`).join(' ')
return Object.freeze({"n":"신세벌식 P2","v":"one","c":"CuriousTo\uA75Bvald","m":"rewrite", return Object.freeze({"n":"신세벌식 P2","v":"none","c":"CuriousTo\uA75Bvald","m":"rewrite",
"t":states.keylayouts.map(it => [it[0],it[1]]), "t":states.keylayouts.map(it => [it[0],it[1]]),
"l":"koKR", "l":"koKR",
// return: [displayed output, composed output] // return: [displayed output, composed output]

2
assets/keylayout/ko_kr_teletype_changbongson.ime
View File

@@ -258,7 +258,7 @@ let states = {"keylayouts":[[""],[undefined],
let reset = () => { let reset = () => {
states.code = 0 states.code = 0
} }
return Object.freeze({"n":"ﾺￇﾵￜﾤ ﾸￂﾷﾲￌﾷﾵￆﾤ","v":"one","c":"CuriousTo\uA75Bvald","m":"rewrite", return Object.freeze({"n":"ﾺￇﾵￜﾤ ﾸￂﾷﾲￌﾷﾵￆﾤ","v":"none","c":"CuriousTo\uA75Bvald","m":"rewrite",
"t":states.keylayouts.map(it => [it[0],it[1]]), "t":states.keylayouts.map(it => [it[0],it[1]]),
"l":"koKRabc", "l":"koKRabc",
// return: [displayed output, composed output] // return: [displayed output, composed output]

2
assets/keylayout/ko_kr_teletype_ksx.ime
View File

@@ -258,7 +258,7 @@ let states = {"keylayouts":[[""],[undefined],
let reset = () => { let reset = () => {
states.code = 0 states.code = 0
} }
return Object.freeze({"n":"ﾺￇﾵￜﾤ ﾧￓﾲￆﾩﾵￜﾡ","v":"one","c":"CuriousTo\uA75Bvald","m":"rewrite", return Object.freeze({"n":"ﾺￇﾵￜﾤ ﾧￓﾲￆﾩﾵￜﾡ","v":"none","c":"CuriousTo\uA75Bvald","m":"rewrite",
"t":states.keylayouts.map(it => [it[0],it[1]]), "t":states.keylayouts.map(it => [it[0],it[1]]),
"l":"koKRabc", "l":"koKRabc",
// return: [displayed output, composed output] // return: [displayed output, composed output]

10
src/net/torvald/terrarum/worlddrawer/WorldCamera.kt
View File

@@ -2,12 +2,16 @@ package net.torvald.terrarum.worlddrawer
import com.badlogic.gdx.Gdx import com.badlogic.gdx.Gdx
import com.jme3.math.FastMath import com.jme3.math.FastMath
import net.torvald.terrarum.* import net.torvald.terrarum.App
import net.torvald.terrarum.Terrarum
import net.torvald.terrarum.TerrarumAppConfiguration.TILE_SIZE import net.torvald.terrarum.TerrarumAppConfiguration.TILE_SIZE
import net.torvald.terrarum.ceilInt
import net.torvald.terrarum.gameactors.ActorWithBody import net.torvald.terrarum.gameactors.ActorWithBody
import net.torvald.terrarum.gameworld.GameWorld import net.torvald.terrarum.gameworld.GameWorld
import net.torvald.terrarum.gameworld.fmod import net.torvald.terrarum.gameworld.fmod
import net.torvald.terrarum.sqr
import org.dyn4j.geometry.Vector2 import org.dyn4j.geometry.Vector2
import kotlin.math.roundToInt
/** /**
* Created by minjaesong on 2016-12-30. * Created by minjaesong on 2016-12-30.
@@ -114,8 +118,8 @@ object WorldCamera {
val camSpeed = (1f - (1f / (2f * fpsRatio))).coerceIn(0.5f, 1f) val camSpeed = (1f - (1f / (2f * fpsRatio))).coerceIn(0.5f, 1f)
x = FastMath.interpolateLinear(camSpeed, oldX.toFloat(), newX.toFloat()).floorInt() fmod worldWidth x = FastMath.interpolateLinear(camSpeed, oldX.toFloat(), newX.toFloat()).roundToInt() fmod worldWidth
y = FastMath.interpolateLinear(camSpeed, oldY.toFloat(), newY.toFloat()).floorInt().clampCameraY(world) y = FastMath.interpolateLinear(camSpeed, oldY.toFloat(), newY.toFloat()).roundToInt().clampCameraY(world)
xEnd = x + width xEnd = x + width
yEnd = y + height yEnd = y + height