Compare commits

..

625 Commits

Author SHA1 Message Date
minjaesong
ae52de85a2 it darkens because you forgot the fucking assignment, same mistake from 2013 2019-06-07 10:43:41 +09:00
minjaesong
585a20542f minor improvement 2019-05-25 01:11:42 +09:00
minjaesong
2ab1443885 a little experimets 2019-05-22 00:01:38 +09:00
minjaesong
046f2d4b6c made it work but slower?! 2019-05-21 17:52:20 +09:00
minjaesong
e3fbb57530 something's screwing up but commiting anyway 2019-05-20 23:31:43 +09:00
minjaesong
92d5cac2ff furred npc test might delete later 2019-05-20 12:07:01 +09:00
minjaesong
471b0c805d font: new redesigned hangul 2019-05-14 13:16:10 +09:00
minjaesong
16b7457d08 font: hangul redraw wip -- less "laundry line" 2019-05-12 23:52:27 +09:00
minjaesong
5c20ceeedc font: hangul redraw wip 2019-05-12 17:09:46 +09:00
minjaesong
49df5f9676 gradle script fix typo and add assertion jvm option 2019-05-12 01:03:35 +09:00
minjaesong
48ba273317 comment 2019-05-08 21:23:42 +09:00
minjaesong
52d6955ffc blocksdrawer now draws wire 2019-05-04 18:19:08 +09:00
minjaesong
08f07e566d adding missing resources/moving zip files to lfs 2019-05-04 04:11:33 +09:00
minjaesong
c423190725 block functions now share one centralised core function 2019-05-04 03:29:59 +09:00
minjaesong
61078cf5a8 debug info for upcoming wires 2019-05-02 00:56:25 +09:00
minjaesong
eafdeddc94 fixed a long bug where item would be used twice but discounted by only one on single click 2019-05-01 23:26:01 +09:00
minjaesong
9050378e81 more comments 2019-04-30 03:06:19 +09:00
minjaesong
fecb20da13 sortedarraylist update; physball breaks the actor render dunno why 2019-04-30 02:52:09 +09:00
minjaesong
c89f602c06 actually using (and rediscovering) the kdtree 2019-04-18 23:42:54 +09:00
minjaesong
21e14babb9 gamepad keyboard mockup 2019-04-15 12:26:54 +09:00
minjaesong
a4eac2173a controller getaxisraw, calibration on startup 2019-04-09 23:42:10 +09:00
minjaesong
c74fd0736a fixed: noclipped player won't move up and down when gamepad is plugged in 2019-04-06 03:58:02 +09:00
minjaesong
3ddf3ec123 weponmeleecore 2019-03-19 13:35:58 +09:00
minjaesong
1dcbd3ddbe moduleinfo won't contain bad modules 2019-03-17 13:49:20 +09:00
minjaesong
c81414f097 inventory UI won't rebuild when pie menu is in operation 2019-03-16 03:44:03 +09:00
minjaesong
bc2b1f68d1 always sorting arraylist; more wire stuffs 2019-03-12 22:27:26 +09:00
minjaesong
e1340aac29 colour-changing durability and encumbrance bar 2019-03-12 02:29:58 +09:00
minjaesong
73b18e1252 can retrieve item image for dynamic items 2019-03-12 01:42:07 +09:00
minjaesong
bae9c60c81 not reading material csv issue fixed 2019-03-12 00:47:06 +09:00
minjaesong
7171055016 my CSV was malformed :( 2019-03-11 19:36:42 +09:00
minjaesong
341c35fab7 distinguishable item placeholder image 2019-03-11 00:20:08 +09:00
minjaesong
e13c2ac59b autofill inventory with "available" blocks (has texture) 2019-03-10 23:42:48 +09:00
minjaesong
80c29f871c reading material from the module; pixaxes use it
But "dynamic item" created from the pickaxe class is not right
2019-03-10 23:38:11 +09:00
minjaesong
2570b13ad4 a piece of wire is considered as a tool for inventory (for now) 2019-03-10 18:13:29 +09:00
minjaesong
4b91f485a5 game item to load its own image if needed; common resource pool to assist that 2019-03-10 17:46:48 +09:00
minjaesong
9cf30ab3f4 removing lwjgl patch 2019-03-10 00:31:16 +09:00
minjaesong
63e416f472 minimap: only update and render when needed 2019-03-10 00:28:47 +09:00
minjaesong
464e0380e4 rudimentary minimap draw only 2019-03-08 18:49:38 +09:00
minjaesong
2942276341 minor comment update 2019-03-05 23:39:36 +09:00
minjaesong
d65f0cb17f ingamerenderer: things won't update when the game is paused (e.g. UI open) 2019-03-05 17:45:41 +09:00
minjaesong
ea69f28d05 minimap test: zoom and pan of the image 2019-03-04 18:33:39 +09:00
Minjae Song
3f213cfbe0 requesting xinput will always fail on non-windows 2019-03-04 04:55:12 +09:00
minjaesong
efa5d21717 some more blocks 2019-03-04 02:48:49 +09:00
minjaesong
3cc13f32c9 createtileatlas: fixing a mistake where non-47 blocks won't be rendered to atlas 2019-03-03 21:53:56 +09:00
minjaesong
f3c2ddb3e2 did my best to draw fluids. The thing is, tiles suck at this and I need polygon-based render for fluids 2019-03-03 12:18:04 +09:00
minjaesong
58bbb73cb1 codes to produce fluid atlas 2019-03-03 00:25:42 +09:00
minjaesong
44745bfad1 brighter corners on the tile mask 2019-03-02 22:48:24 +09:00
minjaesong
5daea4fa57 fluid masks tga 2019-03-02 20:20:00 +09:00
minjaesong
98d013267e new blocksdrawer: works well with masktype 0 and 2 2019-03-02 00:57:26 +09:00
minjaesong
522279fec6 blocksdrawer: now generates terrain and wall item image 2019-03-01 23:25:23 +09:00
minjaesong
dfb9d0d8d9 enough resources to test impl the thing 2019-03-01 03:22:46 +09:00
minjaesong
8589847e3d I put wrong colour on the terrain mask type3 2019-03-01 02:20:14 +09:00
minjaesong
4a9b003fe5 test impl of the new block atlas maker 2019-03-01 01:20:07 +09:00
minjaesong
adcedaeba8 dynamic shape: added metadata doc
sililar to the one used in the game's font
2019-02-28 21:57:56 +09:00
minjaesong
9922f81100 block masks and docs according to the new dynamic whatever 2019-02-28 00:15:17 +09:00
minjaesong
c69025a251 completely new terrain masks to cover 256 possible surroundings 2019-02-27 06:28:48 +09:00
minjaesong
a66afb7b6a terrain mask PSDs 2019-02-26 17:26:19 +09:00
minjaesong
f12271f087 WriteWorldInfo: actually working thumbnail export 2019-02-25 02:07:39 +09:00
minjaesong
6afd36db64 prettier text print on Notification 2019-02-24 05:06:54 +09:00
minjaesong
7cbe09eee8 lang updater 2019-02-24 00:27:50 +09:00
minjaesong
e56149f953 more tests with gson (de)serialiser 2019-02-23 17:40:13 +09:00
minjaesong
8ffdf5fbc5 seemingly working savewriter with fixed TEVD 2019-02-23 05:03:20 +09:00
minjaesong
a10d54c314 some random idea 2019-02-22 15:24:56 +09:00
minjaesong
a54ba0925f HasAssembledSprite saves path instead of FileHandle (easier gson-ing) 2019-02-22 15:19:39 +09:00
minjaesong
bcb8db852c inventory: saving ID only, most things still work 2019-02-22 05:22:09 +09:00
minjaesong
53737bd746 gson test in progress 2019-02-22 04:50:43 +09:00
minjaesong
f24ddb5c82 temp minimap placeholder 2019-02-21 03:54:09 +09:00
minjaesong
391463a4e4 world: ZIP compression is the reference now 2019-02-21 00:25:23 +09:00
minjaesong
6dcdf32627 gamepad button label; gamepad calibrate on startup 2019-02-21 00:12:12 +09:00
minjaesong
b55fe09d9f lightmap drawing won't use spritebatch 2019-02-20 23:14:28 +09:00
minjaesong
72ad6dc4e0 payloadutil and unhelpful commit message 2019-02-20 22:43:35 +09:00
minjaesong
390dd51045 actorwbmovable: alias vars are latched to its update; sprite that's out of screen won't render 2019-02-20 15:38:18 +09:00
minjaesong
71baddd8bc inventory equip slot icon 2019-02-20 01:34:47 +09:00
minjaesong
ffb69813ed buildingmaker: can hide/show selection overlay 2019-02-18 16:57:28 +09:00
minjaesong
6c7e1c30c7 buildingmaker block marking 2019-02-18 16:36:21 +09:00
minjaesong
98c602ef65 doc update for UICanvas and UIItem 2019-02-17 19:42:00 +09:00
minjaesong
439312e711 fully working blockchooser 2019-02-17 03:52:27 +09:00
minjaesong
afa942e75d working pen menu 2019-02-16 22:48:27 +09:00
minjaesong
3148f18007 terrain quarried stone fix 2019-02-16 19:56:12 +09:00
minjaesong
448e0aa9c5 penmenu with icons (render only) 2019-02-16 17:52:18 +09:00
minjaesong
7a62c06bc6 buildingmaker penmenu; resolving mouse click clash between world and UIs 2019-02-16 17:11:36 +09:00
minjaesong
66fdb6ab5d new basicinfo ui; each module should be dispose()-able 2019-02-16 01:32:17 +09:00
minjaesong
f8d4d284d6 buildingmaker palette close and open again 2019-02-14 22:33:54 +09:00
minjaesong
fcf9aa1b79 fixing list UI's colours; buildingmaker palette wip 2019-02-14 15:55:31 +09:00
minjaesong
72dbc18128 PUA: LR buttons are now xbox shaped, added xbox one's View and Menu buttons 2019-02-13 17:53:40 +09:00
minjaesong
33db76e3c8 block placing is now primary-use (left click/main trigger/screen tap) 2019-02-12 01:30:31 +09:00
minjaesong
9031ff0c2a inventory wallet view 2019-02-11 18:02:52 +09:00
minjaesong
b9fbacad14 set environment as console if gamepad is detected 2019-02-11 14:54:57 +09:00
minjaesong
21d7b83f96 pov for gdxcontrolleradapter (untested) 2019-02-10 03:48:39 +09:00
minjaesong
10572f4d7e making xinput to actually work (tested with xbone gamepad) 2019-02-09 18:33:54 +09:00
minjaesong
34364af1a1 noop mask doc 2019-02-08 23:50:04 +09:00
minjaesong
003fed6cf0 making gamepad work again 2019-02-08 18:57:47 +09:00
minjaesong
589ac0de95 bgBG: one dark pixel fixed 2019-02-08 09:56:30 +09:00
minjaesong
697449fca9 better and random-coloured grass 2019-02-08 09:27:13 +09:00
minjaesong
3da4719c8e light: skipping some of the update round wasn't a good idea 2019-02-07 18:04:34 +09:00
minjaesong
3f7ce632cb Font fixed, clearing issue #19 #23 2019-02-07 17:31:55 +09:00
minjaesong
5258c4b677 re-impl of once-scrapped "No-op Mask", and it works 2019-02-06 23:31:21 +09:00
minjaesong
28cf447ec4 inventory screen doesn't need two char info display 2019-02-06 11:05:58 +09:00
minjaesong
d1a84b17ab player info cell, INVENTORY UI LEAKS MEMORY 2019-02-06 05:18:00 +09:00
minjaesong
2a08f2c771 lang update (+delete world, worlds: ) 2019-02-06 05:17:02 +09:00
minjaesong
d16d232a0f Lightmap: i'm only doing round 2-4-2 and it works?! 2019-02-04 22:59:42 +09:00
minjaesong
1301943e6a removing maxBlend function; only use maxAndAssign from now on 2019-02-04 18:47:16 +09:00
minjaesong
5d8e64ca7f disabling clamp() on Gdx.color makes it 1+ms faster? 2019-02-04 17:49:43 +09:00
minjaesong
52b1bee3a3 blockprop opacity to be actually cached 2019-02-04 17:17:48 +09:00
minjaesong
a73a865d29 histogram to display UV values 2019-02-04 05:23:07 +09:00
minjaesong
3f108a6ea9 quicker camera on buildingmaker 2019-02-04 01:37:31 +09:00
minjaesong
a831a4d798 fixing mouseUp on NSMenu; making pen on buildingmaker work 2019-02-03 23:53:46 +09:00
minjaesong
e3ed712a42 F3 moved to PostProcessor; palette UI for buildingmaker 2019-02-03 17:01:27 +09:00
minjaesong
daf5c02605 #12 event for world block change -- mainly meant for fixture updating itself 2019-02-02 01:58:49 +09:00
minjaesong
e8b39fc668 blocksdrawer use offsetted time_t 2019-02-02 01:08:14 +09:00
minjaesong
c20d7edb34 closing #22 2019-02-01 22:45:34 +09:00
minjaesong
28f305e76f application icons 2019-02-01 20:15:19 +09:00
minjaesong
4c3fc2352c #21, also making seasonal grasses easier on PSD 2019-02-01 18:47:02 +09:00
minjaesong
01094d49eb wall block item to use its own texture (for real) 2019-02-01 17:28:08 +09:00
minjaesong
7d3bf0eece terrain texture change by all seasons 2019-02-01 15:59:54 +09:00
minjaesong
75f128a8f7 fixed notificator UI 2019-01-31 20:54:25 +09:00
minjaesong
514f1e9012 nsmenu to invoke class with defined args; working settime on buildingmaker 2019-01-31 18:01:33 +09:00
minjaesong
60db83eddb making sure unused screen be disposed, and not breaking the app 2019-01-31 13:29:40 +09:00
minjaesong
90a7fcd4d0 fix memory leak from my ididcy; relationship w #19 needs investigation 2019-01-31 05:02:44 +09:00
minjaesong
d93c6de851 language is moved inside of options 2019-01-31 03:27:03 +09:00
minjaesong
f603b58307 adjusting disposing behavs so that we can go back and forth the ingame and titlescr 2019-01-31 00:12:38 +09:00
minjaesong
074fe2438d inventory gamemenu visual only 2019-01-29 23:37:38 +09:00
minjaesong
69e9fa4b0f 3 screens impl of inventory UI wip 2019-01-29 20:24:11 +09:00
minjaesong
9373feff34 nice try, but it crashes the gpu AND I get <1 fps :( 2019-01-29 17:35:56 +09:00
minjaesong
10c188bea7 wrong colour fixed -- Gdx.Color.toIntBits() returns ABGR, GLSL expects RGBA 2019-01-29 03:04:01 +09:00
minjaesong
cd1ad9277a gpu rendered light wip 2019-01-29 02:21:22 +09:00
minjaesong
465ed0d7a4 inventory ui won't always draw item count 2019-01-28 19:22:47 +09:00
minjaesong
bd1c1bff8a amount of fluid affects the light absorption 2019-01-27 16:58:29 +09:00
minjaesong
8ac5f1dc9e nuked fluidcodex 2019-01-27 05:09:52 +09:00
minjaesong
268907ee9d so not making new objs frequently does make it bit faster... 2019-01-27 02:09:20 +09:00
minjaesong
9937c34d25 light calc takes fluid into account 2019-01-27 00:30:56 +09:00
minjaesong
bdbb30bc58 new watch design consistent with existing UI 2019-01-24 23:46:24 +09:00
minjaesong
bdbf6cd458 new TV-safe watch UI 2019-01-24 02:32:28 +09:00
minjaesong
e4f456ffa7 gapbox toggle with F11 2019-01-23 12:45:40 +09:00
minjaesong
73a6c844c8 less intrusive gapbox colours 2019-01-23 03:52:28 +09:00
minjaesong
84ca954a26 F12 for screenshot; it's high time to care about TVs
(besides, the EBU gap is also a good guideline for placing UIs on edge)
2019-01-23 03:46:46 +09:00
minjaesong
66b18bf8c5 equipped items are drawn into their respective slot 2019-01-23 00:50:20 +09:00
minjaesong
6d0bff2879 greater number of inventory cells 2019-01-23 00:09:31 +09:00
minjaesong
14b485dc32 small number font moved to apploader 2019-01-22 23:05:29 +09:00
minjaesong
a192abd657 glsl works differently on my macbook? 2019-01-22 22:23:30 +09:00
minjaesong
0d534fd60c adding demoworld.gz 2019-01-22 21:34:00 +09:00
minjaesong
a4dabbbf37 adding gradle-wrapper.jar 2019-01-22 21:27:56 +09:00
minjaesong
450874540c initial screen size is read from the config 2019-01-22 20:56:16 +09:00
minjaesong
53c45d6829 smoothDelta is now come from Gdx's LwjglGraphics instead of AppLoader 2019-01-22 13:16:21 +09:00
minjaesong
1c839f7135 test impl kalman delta on gdx 2019-01-22 06:30:11 +09:00
minjaesong
f133406df3 copyright update 2019-01-22 05:57:38 +09:00
minjaesong
ae14026191 implementing the iconic 'lag behind' camera the right way 2019-01-22 05:46:26 +09:00
minjaesong
b9a4e0f64b game actually reads fps setting from config 2019-01-22 05:29:03 +09:00
minjaesong
aef601e9b8 some classes in sprite assembler is now internal 2019-01-22 03:51:18 +09:00
minjaesong
88db71f780 ingame will only render visible actor 2019-01-22 03:50:35 +09:00
minjaesong
ded9cb1a10 instead of dealing with delta, we'll just update multiple times, THIS TIME IN CORRECT WAY
(because it really works :p)
2019-01-22 02:59:22 +09:00
minjaesong
afba402c6c the entire game will use new smooth delta 2019-01-21 05:22:49 +09:00
minjaesong
b027f662ce forgot to comment out the debug print 2019-01-21 01:44:19 +09:00
minjaesong
c60b0b42ad I'll settle with 'Kalman filter with adaptive reset' 2019-01-20 22:50:22 +09:00
minjaesong
40580a57cd smooth delta uses framerate-averaged instead of raw delta; stupid but works :\ 2019-01-20 21:46:11 +09:00
minjaesong
09b4a34d14 trying to get smooth delta (because fuck you GDX) 2019-01-20 20:13:56 +09:00
minjaesong
613b69a20f issue #16: jump height is "close enough", friction and walk/stop needs fix 2019-01-20 07:03:23 +09:00
minjaesong
5738418f39 the simplest case of noclip=true 2019-01-20 06:43:59 +09:00
minjaesong
10cf3fb007 reverting changes on ActorWBMovable: gotta make new branch 2019-01-20 06:39:01 +09:00
minjaesong
be20fd8328 removing default batch on blendxxx() funs 2019-01-20 03:09:23 +09:00
minjaesong
d1a2e6b8f2 issue #16: walking fixed, jump not 2019-01-19 16:44:59 +09:00
minjaesong
5bf8b6cad7 on-the-fly sprite assembly WIP 2019-01-19 04:34:50 +09:00
minjaesong
2c59d60a15 spriteassembler: oob bodyparts will clip, as they should be
...to hide unwanted bodyparts in the skeleton
2019-01-18 18:59:05 +09:00
minjaesong
68df2a223e parallel light always does this random noise 2019-01-18 04:24:14 +09:00
minjaesong
784a6a13e3 f 2019-01-18 03:14:37 +09:00
minjaesong
9040ff2c87 light: seems like the problem is the ram access time 2019-01-17 21:08:50 +09:00
minjaesong
c4510f9c3b still working on light, no improvements perf-wise 2019-01-17 18:28:43 +09:00
minjaesong
ebce90aa4b light: lantern lookup should be faster 2019-01-17 16:06:00 +09:00
minjaesong
25d0e195c3 all my confusions were derived from not wiping old map; fixed things accordingly 2019-01-17 15:12:52 +09:00
minjaesong
e209967730 light: slightly improved performance with careful skipping
(hopefully...)
2019-01-17 06:52:04 +09:00
minjaesong
f689e1de99 added some features and comments for coding convenience 2019-01-17 05:32:52 +09:00
minjaesong
6e33dbdfaf ui itemlist scrolls with wheel 2019-01-16 01:37:44 +09:00
minjaesong
b10e8aa777 lol 2019-01-16 01:23:23 +09:00
minjaesong
6a343ae382 taking screenshot 2019-01-15 16:10:40 +09:00
minjaesong
17b6738308 fixing a new GDX version colouring bug 2019-01-15 06:05:43 +09:00
minjaesong
078cdfefa4 See Github issue #15 2019-01-15 05:50:36 +09:00
minjaesong
81f9c92e48 adding test code to export fboRGB 2019-01-15 03:02:40 +09:00
minjaesong
8237188dc3 a setup to mitigate directional artefacts in light 2019-01-15 01:18:54 +09:00
minjaesong
7b120020e4 map data format adds world generator version and fluids 2019-01-14 23:15:01 +09:00
minjaesong
f4cd4f49b2 width fixes in UI 2019-01-14 02:46:23 +09:00
minjaesong
09b039c62f trying to work on issue #15 and I'm stumped 2019-01-13 23:51:04 +09:00
minjaesong
ff8791f48a Gzipping PSDs; every art must be alpha premultiplied; added converter batch 2019-01-13 21:23:01 +09:00
minjaesong
43bc99548c copyright update 2019-01-13 04:42:40 +09:00
minjaesong
380a14492f grey box issue fixed (github issue #13) 2019-01-13 04:06:53 +09:00
minjaesong
692e08fc1e UI: quickslot register; IngameController: quickslot selection using wheel
This closes github issue #14
2019-01-13 03:02:57 +09:00
minjaesong
33ad8520f8 quickslot selections are controlled by the ingame rather than the 'bar UI' 2019-01-13 02:17:49 +09:00
minjaesong
9aa8eb395d fixed various quirks and removed dirty hacks on quickslot bar/pie 2019-01-12 22:56:48 +09:00
minjaesong
34d50b8d70 fixed wrong coords 2019-01-12 00:59:15 +09:00
minjaesong
07e8e21eae lightmap edge-case fixed
when camera.x is in -15..-1, all thing shifts to left
2019-01-11 04:44:52 +09:00
minjaesong
525273e37f TerrarumSansBitmap update 2019-01-11 03:07:10 +09:00
minjaesong
34a8113d53 tooltip positioning should work again 2019-01-11 03:06:45 +09:00
minjaesong
4f8cf2cb02 csv sort by ID (hacky?) 2019-01-09 15:15:26 +09:00
minjaesong
8a0abf22da circular array is fixed and tested 2019-01-09 05:43:56 +09:00
minjaesong
9140d6d8b0 prolonged alpha blending issue seemingly fixed?
at least it's partially fixed...
2019-01-07 17:34:47 +09:00
minjaesong
9133f05b5e sprite tool exports "formatted" TGA
meaning if alpha is zero, RGB is also zero
2019-01-07 17:11:43 +09:00
minjaesong
790d16b85d gradle tasks for two new apps 2019-01-07 14:19:15 +09:00
minjaesong
adf60e357e sprite assembler can produce intended output 2019-01-07 05:01:28 +09:00
minjaesong
f81db26e60 ALL kwd in transform implemented 2019-01-07 04:24:13 +09:00
minjaesong
655eccbe19 first successful sprite assembly
ALL kwd still not implemented
2019-01-07 04:13:38 +09:00
minjaesong
5b31b4768f screw AWT, we'll use GDX for sprite preview 2019-01-07 00:35:20 +09:00
minjaesong
425cb82133 TODO added: when the transform joint is "ALL" 2019-01-06 22:45:51 +09:00
minjaesong
344e4ebdab adproperties now has transforms list; assembler can make transformed skeleton
new fun: LinearSearch(By)
2019-01-06 22:43:50 +09:00
minjaesong
32afb2e2e5 updated the psd with the actual assembly 2019-01-06 19:28:06 +09:00
minjaesong
3100a093fd animation metadata now contains discovered frame count
...in hacky way
2019-01-06 15:13:17 +09:00
minjaesong
fb06200d26 ADProperties now properly stores parsed mumbojumbo 2019-01-06 04:19:21 +09:00
minjaesong
1696cc8601 fixed a bug properties view won't show scroll bars 2019-01-06 03:25:40 +09:00
minjaesong
4072b9fb09 adproperties now hold filename-related info 2019-01-06 02:57:49 +09:00
minjaesong
36160a6579 sprite assembler app can read and disp ADL
garbage code not properly handled
2019-01-06 02:06:51 +09:00
minjaesong
4986d570a0 sprite assembler test assets 2019-01-06 00:30:43 +09:00
minjaesong
1965eabaa3 joints in skeleton are ordered according to drawing order, PSD also updated 2019-01-05 16:53:21 +09:00
minjaesong
90784afd48 TIL you can go multiline on Java .properties 2019-01-05 16:33:40 +09:00
minjaesong
258364f37e skeleton datasets from sprite_joints.psd 2019-01-05 16:23:19 +09:00
minjaesong
f99531c9d4 testing how joints of sprites should look like
humanoid only
2019-01-05 04:53:22 +09:00
minjaesong
74cfc05fba parsing ADL
a road to auto-gen'd spriteanimation spritesheet
2019-01-05 02:19:56 +09:00
minjaesong
15868a5a2d forgot to update tga file 2019-01-04 21:19:11 +09:00
minjaesong
3abca8989a somewhat successful walk/idle anim impl 2019-01-04 17:44:22 +09:00
minjaesong
ae9a1ebcb4 write to the actual file 2019-01-03 13:02:54 +09:00
Minjae Song
18a05ace64 new csv and it asks number of lines to init 2019-01-02 22:41:20 +09:00
Minjae Song
3b2c38cf0b csv reader can read file, stringify (not real save) and read the save itself wrote 2019-01-02 22:25:44 +09:00
Minjae Song
6ecbb672fb csv editor read file with imperfections 2019-01-02 22:03:52 +09:00
Minjae Song
30954d239a CSV editor: test export of spreadsheet
Seems working?
2019-01-02 10:55:32 +09:00
Minjae Song
edd15a4f79 watch is semitransparent when EL is off 2019-01-01 22:29:18 +09:00
Minjae Song
db110d1ca4 csv editor wip 2019-01-01 21:00:33 +09:00
Minjae Song
e3e97000a7 New year's first commit
is just a comment
2019-01-01 00:10:37 +09:00
Minjae Song
ce2d9a271a slow descend of the platform fixed 2018-12-31 21:34:50 +09:00
Minjae Song
222aef7e3d more screwing around and commenting 2018-12-31 00:50:44 +09:00
Minjae Song
08bbdaf70b platform sorta works as intended 2018-12-31 00:00:47 +09:00
Minjae Song
7300b05442 removing useless list "affectingTiles" 2018-12-30 23:41:57 +09:00
Minjae Song
cd13e04658 platform going down with Down button on keeb 2018-12-30 20:17:28 +09:00
Minjae Song
48de42d98b jumping up to the platform working 2018-12-30 20:02:24 +09:00
Minjae Song
35c0c45500 WIP platforms, at least "should I collide with this?" is one single function 2018-12-30 19:50:22 +09:00
Minjae Song
6c01aa9b0b removed FLUID prop from the blocks 2018-12-29 21:04:27 +09:00
Minjae Song
2335312081 WIP removing fluid marker block
see "work_files/todo_platforms.png"
2018-12-29 17:04:46 +09:00
Minjae Song
abfd9b68fc detailed impl of fixtures WIP 2018-12-29 04:11:26 +09:00
Minjae Song
500c72ebc9 Summary
Description
2018-12-26 19:26:08 +09:00
Minjae Song
00fc4f1b8c reduced boot time by not using proper wall tex; darker wall draw 2018-12-25 16:28:38 +09:00
Minjae Song
98755fab61 still cleaning up
Making wall item textures takes SO long
2018-12-25 15:39:01 +09:00
Minjae Song
09d8702089 have been forgetting to update fullscreenquad on resize :\ 2018-12-25 05:34:59 +09:00
Minjae Song
9080127d38 when it's not dev build, title bar shows less info
they take some processing time
2018-12-25 01:58:18 +09:00
Minjae Song
d7664c7f46 moved things a lot just so that splash screen shows up WHILE things load 2018-12-25 01:39:22 +09:00
Minjae Song
47da7d5b81 Added JoiseDoc 2018-12-24 22:49:08 +09:00
Minjae Song
ef3690765d simplified fluid render 2018-12-23 02:13:41 +09:00
Minjae Song
33c333e7fa new version number
eheheheh
2018-12-22 02:10:33 +09:00
Minjae Song
10128a20a0 rendering scheme of the world changed, fluids draw as intended
But my idea wasn't very stellar, *sigh*
2018-12-22 02:08:08 +09:00
Minjae Song
764945fc30 prep for fluid exclusive render 2018-12-19 22:23:50 +09:00
Minjae Song
3098c0afd2 fluidmap won't have errenous behaviour at the world edge; tga alpha fix 2018-12-19 01:53:09 +09:00
Minjae Song
101c67a107 water flow works
turns out, var.coerceIn() returns value and does not modify the var
2018-12-18 01:48:38 +09:00
Minjae Song
a1661fbb4e fluid multiplies themselves ?! 2018-12-17 22:39:19 +09:00
Minjae Song
04c5e32ddf test: tiles tex blend according to seasons 2018-12-17 04:30:08 +09:00
Minjae Song
b78d488044 duh 2018-12-16 16:17:05 +09:00
Minjae Song
832e296bc5 rename TARGET_FPS to PHYS_TIME_FRAME; shader to use multiple atlas tex; and things 2018-12-16 15:30:25 +09:00
Minjae Song
46e5860143 at least this fluid sim passes collection assertion codes 2018-12-16 02:55:12 +09:00
Minjae Song
4fa44abd3e bugs on fluid sim, Type is NULL but fill isn't 0/new temporary fluid draw 2018-12-16 02:10:04 +09:00
Minjae Song
191a91cb81 blockingthreadpool test done
not very effective
2018-12-15 14:43:55 +09:00
Minjae Song
388d3d6f2f noise generator: automated test and reporting 2018-12-14 23:19:40 +09:00
Minjae Song
b1b29387e3 new thread pooling strategy and test program WIP 2018-12-14 22:53:25 +09:00
Minjae Song
764edea832 Update ThreadParallel.kt 2018-12-14 15:06:55 +09:00
Minjae Song
16e4067d89 working very crude fluid sim 2018-12-14 00:52:10 +09:00
Minjae Song
05a8f47006 implementing water sim but not actually working 2018-12-13 04:45:09 +09:00
Minjae Song
1f1d6f1eda preparing fluid updater: debug water bucket 2018-12-12 23:29:30 +09:00
Minjae Song
27f79238a1 perhaps missed this from before? 2018-12-12 20:47:06 +09:00
Minjae Song
6d553ea583 replacing water/lava tiles with one fluid marker
actual fluid not implemented
2018-12-12 20:32:13 +09:00
Minjae Song
ad8d3ba210 see page 9 2018-12-12 18:49:18 +09:00
Minjae Song
e441cdf5f0 fluid layer data and fluid sim specifications
See added note FLUID_SIMULATION
2018-12-12 18:39:14 +09:00
Minjae Song
9c3c35067d adjusted items ID range for more static items 2018-12-12 03:00:49 +09:00
Minjae Song
7a60ae0629 support for screen-overlay actors; buildingmaker has light now 2018-12-12 02:52:33 +09:00
Minjae Song
258273fd25 nonprivate lateinits are bitch 2018-12-11 16:39:27 +09:00
Minjae Song
dc502b2f12 Summary 2018-12-11 16:14:11 +09:00
Minjae Song
803e59a0ee Merge remote-tracking branch 'origin/master' 2018-12-11 16:08:41 +09:00
Minjae Song
e31eaf0241 matching blendglow's version with others 2018-12-11 11:06:03 +09:00
Minjae Song
8181bec481 things "look" good enough, should stop here and work on the main game 2018-12-11 04:02:23 +09:00
Minjae Song
7c1d6e6b88 fix: textbuttonlist selector appearance bug, nsmenu not closing its child 2018-12-11 02:22:31 +09:00
Minjae Song
7e7e54eed7 other commit didn't work, duh; this SHOULD fix shit
the other commit: "prev commit didn't work" at 2018-12-09 (16a7d2abe7)
2018-12-10 20:35:54 +09:00
Minjae Song
57c9b7b277 yaml: adding generic parse-as-invokable 2018-12-10 04:15:57 +09:00
Minjae Song
984eb4de00 nsmenu working submenu navigation; new graphics bug discovered 2018-12-10 03:33:08 +09:00
Minjae Song
c4b4bfd2fc UINSMenu is made to show how to code 'UI dragging' 2018-12-09 20:00:52 +09:00
Minjae Song
cf9bce5bac NSMenu WIP 2018-12-09 17:51:17 +09:00
Minjae Song
16a7d2abe7 prev commit didn't work 2018-12-09 17:31:17 +09:00
Minjae Song
a690b46456 textbuttonlist fixed incorrect vertical placement 2018-12-09 17:24:26 +09:00
Minjae Song
b55cd415f2 'the entire screen is shifted!' bug fixed 2018-12-09 13:38:25 +09:00
minjaesong
4c2b73197d NSMenu WIP, but also caught a source of the old bug 2018-12-09 04:40:46 +09:00
minjaesong
1c1ae37f41 moved white box tex to AppLoader; textButton now has alignment option 2018-12-09 04:36:53 +09:00
minjaesong
57fa6de62a making Yaml and BFS of QNDTree work 2018-12-09 01:52:57 +09:00
minjaesong
6f0a923df7 WIP new UI elem 2018-12-08 23:26:01 +09:00
minjaesong
4b04bf3781 replaced a hack that starts random game on title screen 2018-12-08 18:30:10 +09:00
minjaesong
eca0469f32 bringing back onscreen debug info 2018-12-08 05:05:42 +09:00
minjaesong
d588f73ed6 Memory leak alleviated FUCK YEAH? 2018-12-08 04:26:01 +09:00
minjaesong
b40a78b706 Update LightmapRendererNew.kt 2018-12-07 06:15:41 +09:00
minjaesong
93a43899e7 why they are keep resurrecting 2018-12-03 22:37:51 +09:00
minjaesong
155ba9eb56 Update .gitignore 2018-12-03 11:05:35 +09:00
minjaesong
4224d56b25 exit now gracefully calls gdx.app.exit 2018-12-03 00:34:31 +09:00
minjaesong
cc14218dd5 removing kotlin-stdlib.jar again duuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuh 2018-12-03 00:25:01 +09:00
minjaesong
b856829ca9 Merge branch 'gradle-migration-1' 2018-12-02 23:01:25 +09:00
minjaesong
4239bbe05b removing unused and failed opus impl attempts 2018-12-02 22:45:08 +09:00
minjaesong
c43d2e6e68 gradle migration 1 2018-12-02 19:31:38 +09:00
minjaesong
a9bc4f47f8 Update .gitignore 2018-12-02 19:28:38 +09:00
minjaesong
1ce2d69809 Update .gitignore 2018-12-02 19:19:17 +09:00
minjaesong
bf9c172206 minor edits 2018-12-02 17:34:01 +09:00
minjaesong
e966063e80 minor edits 2018-12-02 17:34:01 +09:00
minjaesong
fa86ca2e05 rem external_resource_packs.zip 2018-11-22 19:14:49 +09:00
minjaesong
8ef45968c2 rem external_resource_packs.zip 2018-11-22 19:14:49 +09:00
minjaesong
9cc0a62188 rem workspace.xml 2018-11-22 19:09:48 +09:00
minjaesong
df738348f6 rem workspace.xml 2018-11-22 19:09:48 +09:00
minjaesong
f3b0044d5f fixing one of the new bugs: block duplication artefact on render 2018-11-20 22:16:20 +09:00
minjaesong
3561ff9132 fixing one of the new bugs: block duplication artefact on render 2018-11-20 22:16:20 +09:00
minjaesong
f5d36e2c92 physics anomaly at x 0..33? are fixed, other issues (re)introduced
See ActorWBMovable@Line1238
2018-11-20 06:08:21 +09:00
minjaesong
0056f92b65 physics anomaly at x 0..33? are fixed, other issues (re)introduced
See ActorWBMovable@Line1238
2018-11-20 06:08:21 +09:00
minjaesong
8da80e88a3 Reverting GDX to nightly-20170610
Due to the some fuck rendering issue on certain graphics processors (maybe?)
2018-11-20 04:27:14 +09:00
minjaesong
deaee71a44 Reverting GDX to nightly-20170610
Due to the some fuck rendering issue on certain graphics processors (maybe?)
2018-11-20 04:27:14 +09:00
minjaesong
f21ed3bf0d commiting minor changes cause I need to track down some bugs
- Text on small font goes dark gradually (?)
2018-11-20 04:10:13 +09:00
minjaesong
49966a53f6 commiting minor changes cause I need to track down some bugs
- Text on small font goes dark gradually (?)
2018-11-20 04:10:13 +09:00
minjaesong
4d0c772dd8 1dim-ised lightmap 2018-11-16 22:44:54 +09:00
minjaesong
0123cc5b1a 1dim-ised lightmap 2018-11-16 22:44:54 +09:00
minjaesong
f4f0e59811 lightbufferastex is now properly disposed of
should help with my mem leak probs
2018-11-16 20:42:30 +09:00
minjaesong
0695e3325d lightbufferastex is now properly disposed of
should help with my mem leak probs
2018-11-16 20:42:30 +09:00
minjaesong
d9f576e4dc change in ingame config: useamericanunit -> temperatureunit 2018-11-16 20:37:44 +09:00
minjaesong
d830fa2873 change in ingame config: useamericanunit -> temperatureunit 2018-11-16 20:37:44 +09:00
minjaesong
091f79c7f8 reconfiguring docs and libs
- Targeting Java 10
- Gdx nightly 20181111 (1.9.9)
2018-11-11 20:13:31 +09:00
minjaesong
a2f88ebbf1 reconfiguring docs and libs
- Targeting Java 10
- Gdx nightly 20181111 (1.9.9)
2018-11-11 20:13:31 +09:00
minjaesong
8942f352a1 drawing of the tile breakage 2018-11-10 21:09:02 +09:00
minjaesong
f721ad0db9 drawing of the tile breakage 2018-11-10 21:09:02 +09:00
minjaesong
1aa90077a4 Can setTitle() cause memleak (right before test commit) 2018-11-08 22:42:27 +09:00
minjaesong
c6e9a46c3e Can setTitle() cause memleak (right before test commit) 2018-11-08 22:42:27 +09:00
minjaesong
3360ab0dfe starting day of the game is now Spring 1st 2018-11-06 23:49:22 +09:00
minjaesong
4c3354f22c starting day of the game is now Spring 1st 2018-11-06 23:49:22 +09:00
minjaesong
4eee5ee2b1 a new watchface to support seasons instead of months 2018-11-06 23:40:36 +09:00
minjaesong
92091532e0 a new watchface to support seasons instead of months 2018-11-06 23:40:36 +09:00
minjaesong
c7c68187eb fixed a NaN bug caused by a zero-width/height hitbox
Also inventory is widened to 10x7 of prev 9x7
2018-11-06 04:02:33 +09:00
minjaesong
81b65d57ca fixed a NaN bug caused by a zero-width/height hitbox
Also inventory is widened to 10x7 of prev 9x7
2018-11-06 04:02:33 +09:00
minjaesong
5c8cdd3162 new ingame calendar impl
for some reason it runs slower that it should do
2018-10-30 22:47:41 +09:00
minjaesong
ec871318a9 new ingame calendar impl
for some reason it runs slower that it should do
2018-10-30 22:47:41 +09:00
minjaesong
73d1a1bdc5 new RNG for everything; Joise update 2018-10-27 00:03:06 +09:00
minjaesong
0e93f6609b new RNG for everything; Joise update 2018-10-27 00:03:06 +09:00
minjaesong
ee3d98662c read world info 2018-10-09 23:49:14 +09:00
minjaesong
3612b55f97 read world info 2018-10-09 23:49:14 +09:00
minjaesong
d77b552518 writeworldinfo tested to be working 2018-10-08 18:15:05 +09:00
minjaesong
e156349ec0 writeworldinfo tested to be working 2018-10-08 18:15:05 +09:00
Minjae Song
5f75288dc7 worldinfo writer 2018-10-08 01:16:29 +09:00
Minjae Song
4658fa2aed worldinfo writer 2018-10-08 01:16:29 +09:00
Minjae Song
74d76440ee new outputstream for bytearray64 2018-10-06 01:16:26 +09:00
Minjae Song
630d6d2fed new outputstream for bytearray64 2018-10-06 01:16:26 +09:00
minjaesong
e072aff897 testing the GDX's LZMA de/compressor 2018-10-06 00:49:06 +09:00
minjaesong
879583623d testing the GDX's LZMA de/compressor 2018-10-06 00:49:06 +09:00
minjaesong
397b2a8795 abolished a need to pass world as parametre
+ simply changing the single variable (ingame.world) will update all the renderer's behaviour
+ somehow my git changelogs are exploding
2018-10-05 23:40:03 +09:00
minjaesong
5189c46ce5 abolished a need to pass world as parametre
+ simply changing the single variable (ingame.world) will update all the renderer's behaviour
+ somehow my git changelogs are exploding
2018-10-05 23:40:03 +09:00
minjaesong
ae1e99aa3e layer seems load, need to write better test-able code 2018-10-05 22:13:55 +09:00
minjaesong
3735ce351e layer seems load, need to write better test-able code 2018-10-05 22:13:55 +09:00
minjaesong
17e550a6a0 layer write should write proper zlib 2018-10-05 01:23:18 +09:00
minjaesong
3045534222 layer write should write proper zlib 2018-10-05 01:23:18 +09:00
minjaesong
292de8d56a it's not zipping correctly; some fixes on readlayer 2018-10-05 01:11:12 +09:00
minjaesong
434a2dbca3 it's not zipping correctly; some fixes on readlayer 2018-10-05 01:11:12 +09:00
minjaesong
626aa710c1 layer export: tested output seems legit but can't confirm 2018-10-04 23:46:24 +09:00
minjaesong
2239625efe layer export: tested output seems legit but can't confirm 2018-10-04 23:46:24 +09:00
minjaesong
78fc6fc657 GameWorld: adding "worldIndex"; more save/load stuffs 2018-10-03 23:15:24 +09:00
minjaesong
76e8727bfc GameWorld: adding "worldIndex"; more save/load stuffs 2018-10-03 23:15:24 +09:00
minjaesong
d2b7c76734 new map data format and its read/writer
!! UNTESTED !! UNTESTED !! UNTESTED !!
2018-10-03 19:20:11 +09:00
minjaesong
6fd2a4d69f new map data format and its read/writer
!! UNTESTED !! UNTESTED !! UNTESTED !!
2018-10-03 19:20:11 +09:00
minjaesong
4cfd3b8c45 decided not to GZip the CSVs; hack it away! 2018-10-02 21:13:02 +09:00
minjaesong
197afc21ce decided not to GZip the CSVs; hack it away! 2018-10-02 21:13:02 +09:00
minjaesong
e645eaade9 newer map data format 2018-10-02 21:10:02 +09:00
minjaesong
62edf9c3ae newer map data format 2018-10-02 21:10:02 +09:00
minjaesong
af34d94e6a the event works; ingame works; but starts as "bugged noclip" 2018-10-02 00:12:04 +09:00
minjaesong
c452017c84 the event works; ingame works; but starts as "bugged noclip" 2018-10-02 00:12:04 +09:00
minjaesong
98539e698f World Click events
let's hope it works w/o tests as I can't get to the Ingame now
2018-10-01 23:51:04 +09:00
minjaesong
5367b97943 World Click events
let's hope it works w/o tests as I can't get to the Ingame now
2018-10-01 23:51:04 +09:00
minjaesong
03b642ddd3 player is now nullable; wtf is calling Ingame 5 times? 2018-09-17 01:46:50 +09:00
minjaesong
1b94d2ea14 player is now nullable; wtf is calling Ingame 5 times? 2018-09-17 01:46:50 +09:00
minjaesong
967eafe8a3 serialised RNG; font update 2018-09-16 03:32:12 +09:00
minjaesong
d16e916502 serialised RNG; font update 2018-09-16 03:32:12 +09:00
minjaesong
69eb2d7a3b title remocon: menu UI with no child should be displayed now 2018-09-15 01:08:10 +09:00
minjaesong
7069528714 title remocon: menu UI with no child should be displayed now 2018-09-15 01:08:10 +09:00
minjaesong
6d4ac92133 font update; ui remocon fix; save doc elaboration
UI RemoCon fix: RemoCon will no longer widen to the screen width when being used
2018-09-14 01:14:13 +09:00
minjaesong
79f3e8e28d font update; ui remocon fix; save doc elaboration
UI RemoCon fix: RemoCon will no longer widen to the screen width when being used
2018-09-14 01:14:13 +09:00
minjaesong
b40af8e1b3 more remoCon thingies 2018-08-30 21:30:39 +09:00
minjaesong
0658d95b12 more remoCon thingies 2018-08-30 21:30:39 +09:00
minjaesong
c381250665 UI Remote Controller reworked (now 90% less stupidity) 2018-08-30 17:24:53 +09:00
minjaesong
ad26b0f80c UI Remote Controller reworked (now 90% less stupidity) 2018-08-30 17:24:53 +09:00
minjaesong
497a88c8de font updates; PBS 2018-08-23 21:06:08 +09:00
minjaesong
c953d84af9 font updates; PBS 2018-08-23 21:06:08 +09:00
minjaesong
0bad86bb9d partially working sky model 2018-08-05 21:57:39 +09:00
minjaesong
809f1ad26f partially working sky model 2018-08-05 21:57:39 +09:00
minjaesong
eee8a18875 dump (another useless message) 2018-08-05 21:57:18 +09:00
minjaesong
932222a9c6 dump (another useless message) 2018-08-05 21:57:18 +09:00
minjaesong
24b2e2a2af ENVIRON guide update straight from my observation 2018-07-21 19:58:56 +09:00
minjaesong
2d68fcd7c9 ENVIRON guide update straight from my observation 2018-07-21 19:58:56 +09:00
minjaesong
e48731b2e3 reducing down HistoricalFigure to nothing
It doesn't seem like a good idea
2018-07-03 22:45:00 +09:00
minjaesong
78e329d1c8 reducing down HistoricalFigure to nothing
It doesn't seem like a good idea
2018-07-03 22:45:00 +09:00
minjaesong
8f9022827c removing branching on tiling shader, improving performance
Now tga export needs extra care, but boy that 5 FPS improvement
2018-07-03 22:17:34 +09:00
minjaesong
ab49846611 removing branching on tiling shader, improving performance
Now tga export needs extra care, but boy that 5 FPS improvement
2018-07-03 22:17:34 +09:00
minjaesong
de19f49d26 making debugwindow to appear again 2018-07-03 14:33:20 +09:00
minjaesong
1476ea737e making debugwindow to appear again 2018-07-03 14:33:20 +09:00
minjaesong
9ade08013f intro screen flipped correctly, build passes 2018-07-03 14:28:30 +09:00
minjaesong
305e992da6 intro screen flipped correctly, build passes 2018-07-03 14:28:30 +09:00
minjaesong
6b929ac107 PostProcessor working: nested FBO won't work, use FrameBufferManager 2018-07-03 13:48:34 +09:00
minjaesong
7a05931da8 PostProcessor working: nested FBO won't work, use FrameBufferManager 2018-07-03 13:48:34 +09:00
minjaesong
108a3e6188 title screen using IngameRenderer 2018-07-01 01:38:07 +09:00
minjaesong
c1f829291a title screen using IngameRenderer 2018-07-01 01:38:07 +09:00
minjaesong
07681110c7 IngameRenderer: damned thing finally works somewhat 2018-06-30 16:47:22 +09:00
minjaesong
069eca7d9c IngameRenderer: damned thing finally works somewhat 2018-06-30 16:47:22 +09:00
minjaesong
abd1827182 still broken, still renders
because im going to break it once again
See my comment in PostProcessor.kt
2018-06-28 21:31:39 +09:00
minjaesong
872124429d still broken, still renders
because im going to break it once again
See my comment in PostProcessor.kt
2018-06-28 21:31:39 +09:00
minjaesong
9736d39e04 trying to optimise the rendering, this is BEFORE job 2018-06-26 09:10:05 +09:00
minjaesong
1ca3fff17e trying to optimise the rendering, this is BEFORE job 2018-06-26 09:10:05 +09:00
minjaesong
8daf0a2c38 still wip modularisation, game somehow boots 2018-06-21 17:33:22 +09:00
minjaesong
d7c8b7f8f7 still wip modularisation, game somehow boots 2018-06-21 17:33:22 +09:00
minjaesong
6bbfd5d167 scrollable inventory with up/down UI button 2018-05-09 19:41:04 +09:00
minjaesong
baf2a47d75 scrollable inventory with up/down UI button 2018-05-09 19:41:04 +09:00
minjaesong
4664c9ba0d ModMgr: I can load class by name; dropped Groovy script support, coding must go to JAR 2018-05-09 05:34:39 +09:00
minjaesong
33c326febe ModMgr: I can load class by name; dropped Groovy script support, coding must go to JAR 2018-05-09 05:34:39 +09:00
minjaesong
fded7f1dfb computery stuff and new set of wires 2018-03-04 19:15:43 +09:00
minjaesong
da796194d6 computery stuff and new set of wires 2018-03-04 19:15:43 +09:00
minjaesong
d11fd281f4 colourutil update 2018-02-16 10:49:13 +09:00
minjaesong
85dac4a109 colourutil update 2018-02-16 10:49:13 +09:00
minjaesong
40423ede52 adopting Java 9/Kotlin 1.2 2018-02-10 21:40:17 +09:00
minjaesong
2701934f89 adopting Java 9/Kotlin 1.2 2018-02-10 21:40:17 +09:00
minjaesong
941d9fa107 rain megaparticle experiment 2017-12-18 20:45:32 +09:00
minjaesong
c8debd351f rain megaparticle experiment 2017-12-18 20:45:32 +09:00
minjaesong
c5fa83b2f4 196 dithering instead of 625 2017-12-10 14:33:12 +09:00
minjaesong
24a6aa5a9a 196 dithering instead of 625 2017-12-10 14:33:12 +09:00
minjaesong
51a2e47430 cheat detected notification 2017-12-10 14:32:32 +09:00
minjaesong
f3075dfc18 cheat detected notification 2017-12-10 14:32:32 +09:00
minjaesong
6715308f88 language vars are fully moved to apploader 2017-11-25 22:29:59 +09:00
minjaesong
6901b17bb6 language vars are fully moved to apploader 2017-11-25 22:29:59 +09:00
minjaesong
35f2cf6b4d tooltip UI; tooltip in the inventory 2017-11-25 17:56:57 +09:00
minjaesong
d9258bcb84 tooltip UI; tooltip in the inventory 2017-11-25 17:56:57 +09:00
minjaesong
f45a3d252a inventory grid mode buttons working highlight 2017-11-07 23:29:07 +09:00
minjaesong
b5e908d271 inventory grid mode buttons working highlight 2017-11-07 23:29:07 +09:00
minjaesong
ade77473c4 map & save button for inventory 2017-11-03 22:48:13 +09:00
minjaesong
60d1a5cea2 map & save button for inventory 2017-11-03 22:48:13 +09:00
minjaesong
7cd7b4047f postprocessor for 3dlut colcorr; dithering should be managed in "dirty" way
dirty way: loads dithered/passthru shader according to the game's config (boolean fxdither)
2017-11-02 17:47:52 +09:00
minjaesong
a22d2dbb92 postprocessor for 3dlut colcorr; dithering should be managed in "dirty" way
dirty way: loads dithered/passthru shader according to the game's config (boolean fxdither)
2017-11-02 17:47:52 +09:00
minjaesong
f5636fe0d3 hacked the titlescreen to fix resize-related UI shit 2017-11-01 15:46:09 +09:00
minjaesong
b892d2e70c hacked the titlescreen to fix resize-related UI shit 2017-11-01 15:46:09 +09:00
minjaesong
948f922041 encumbrance meter for new inventory 2017-10-30 04:28:27 +09:00
minjaesong
cec6d9c3c2 encumbrance meter for new inventory 2017-10-30 04:28:27 +09:00
minjaesong
6c72bef0de black background for inventory 2017-10-29 13:26:34 +09:00
minjaesong
0266f518fc black background for inventory 2017-10-29 13:26:34 +09:00
minjaesong
fe21340186 working "equipped" view with unequip 2017-10-28 15:07:58 +09:00
minjaesong
f72f18a821 working "equipped" view with unequip 2017-10-28 15:07:58 +09:00
minjaesong
516314c47f "equipped" indicator on item grid 2017-10-25 05:53:39 +09:00
minjaesong
c2ac328cab "equipped" indicator on item grid 2017-10-25 05:53:39 +09:00
minjaesong
55cdac9269 fixed uiItem stupidity with uiCanvas; it activated even if its parent is invisible 2017-10-24 07:25:05 +09:00
minjaesong
07d609ca72 fixed uiItem stupidity with uiCanvas; it activated even if its parent is invisible 2017-10-24 07:25:05 +09:00
minjaesong
a506269906 catbar and grid: updates and renders as intended 2017-10-24 00:21:13 +09:00
minjaesong
af027e616d catbar and grid: updates and renders as intended 2017-10-24 00:21:13 +09:00
minjaesong
77b563396e at least some of the new UIs are working 2017-10-23 03:44:45 +09:00
minjaesong
04161525eb at least some of the new UIs are working 2017-10-23 03:44:45 +09:00
minjaesong
98a67c80c6 new inventory design: is it good?
See work_files/inventory_nouveau_2.psd
2017-10-22 02:03:23 +09:00
minjaesong
0023b4a4a8 new inventory design: is it good?
See work_files/inventory_nouveau_2.psd
2017-10-22 02:03:23 +09:00
minjaesong
a8398765c6 somehow fixed a consolewin bug
- It would read a key even if it's closed
2017-10-18 03:52:11 +09:00
minjaesong
a5d0d5e525 somehow fixed a consolewin bug
- It would read a key even if it's closed
2017-10-18 03:52:11 +09:00
minjaesong
6df79b96dd lightmap draw shift fixed; game will properly resize 2017-10-16 22:47:16 +09:00
minjaesong
5b8bee6777 lightmap draw shift fixed; game will properly resize 2017-10-16 22:47:16 +09:00
minjaesong
83b9f74100 renderFront is fixed 2017-10-14 02:48:52 +09:00
minjaesong
76260cbc18 renderFront is fixed 2017-10-14 02:48:52 +09:00
minjaesong
d9a01a70c3 sprite shift re-fixed with a correct method 2017-10-14 02:13:06 +09:00
minjaesong
a7849d2635 sprite shift re-fixed with a correct method 2017-10-14 02:13:06 +09:00
minjaesong
06949848f8 player sprites now aligned to hitbox && drawn at centre of the screen 2017-10-13 00:36:03 +09:00
minjaesong
595681d6e9 player sprites now aligned to hitbox && drawn at centre of the screen 2017-10-13 00:36:03 +09:00
minjaesong
0e1c46f18d Houston, we have a render (again) 2017-10-07 22:21:37 +09:00
minjaesong
3505b38789 Houston, we have a render (again) 2017-10-07 22:21:37 +09:00
minjaesong
fe8163c1e4 Feature idea I had around for months 2017-09-22 00:22:35 +09:00
minjaesong
42efbd5297 Feature idea I had around for months 2017-09-22 00:22:35 +09:00
minjaesong
e3ac877c3d Rectified heretic YY-MM-DD to standard YYYY-MM-DD 2017-09-20 14:36:40 +09:00
minjaesong
3569e3ccbf Rectified heretic YY-MM-DD to standard YYYY-MM-DD 2017-09-20 14:36:40 +09:00
minjaesong
b560011d2f Scientifically correct moondial
Flipped crescents are my mistake 😄
2017-09-19 14:43:06 +09:00
minjaesong
e31640cba6 Scientifically correct moondial
Flipped crescents are my mistake 😄
2017-09-19 14:43:06 +09:00
minjaesong
e76458bff6 we've got something
- except actor's RGB won't draw; only the glow does
2017-09-18 02:32:47 +09:00
minjaesong
9645b28674 we've got something
- except actor's RGB won't draw; only the glow does
2017-09-18 02:32:47 +09:00
minjaesong
558430b4f3 fixed camera not putting actor at the centre of the screen
- Actually may not be fixed, but it does not cause render bugs at least!
2017-09-17 23:42:13 +09:00
minjaesong
e9f8f47e20 fixed camera not putting actor at the centre of the screen
- Actually may not be fixed, but it does not cause render bugs at least!
2017-09-17 23:42:13 +09:00
minjaesong
1149311076 module UI now has margin; game update will drop consecutive updates if its try count is exhausted (reduced lag after window move/resize) 2017-09-15 01:40:12 +09:00
minjaesong
d3b54ae300 module UI now has margin; game update will drop consecutive updates if its try count is exhausted (reduced lag after window move/resize) 2017-09-15 01:40:12 +09:00
minjaesong
ef176909b4 Ingame: great, nothing renders :( 2017-09-15 00:40:11 +09:00
minjaesong
553816e8c4 Ingame: great, nothing renders :( 2017-09-15 00:40:11 +09:00
minjaesong
1d8e66a9cc simple hack for out-of-place render of terrain and lightmap
- Just made them not have negative value
2017-09-14 02:13:37 +09:00
minjaesong
772436b16b simple hack for out-of-place render of terrain and lightmap
- Just made them not have negative value
2017-09-14 02:13:37 +09:00
minjaesong
cdf961df09 Guess it's fully working for titlescreen 2017-09-13 18:10:03 +09:00
minjaesong
f6c5d22dc2 Guess it's fully working for titlescreen 2017-09-13 18:10:03 +09:00
minjaesong
01a32ad00c NOT using a trick in issue #5 was the key, also closes issue #8 2017-09-13 01:06:01 +09:00
minjaesong
dcd21bc3fa NOT using a trick in issue #5 was the key, also closes issue #8 2017-09-13 01:06:01 +09:00
minjaesong
7ffb417618 almost works but dae fucking jitter again 2017-09-12 23:52:16 +09:00
minjaesong
b05706a7c5 almost works but dae fucking jitter again 2017-09-12 23:52:16 +09:00
minjaesong
82ddfeb6ee Light fuck: At least I've figured out what the fuck was wrong with. 2017-09-12 21:29:45 +09:00
minjaesong
59270f2c40 Light fuck: At least I've figured out what the fuck was wrong with. 2017-09-12 21:29:45 +09:00
minjaesong
e67b97257c at least now I know which part is to be patched... 2017-09-09 02:45:58 +09:00
minjaesong
636b0ffe4f at least now I know which part is to be patched... 2017-09-09 02:45:58 +09:00
minjaesong
e6e962ecf7 terrain AND wall renders 2017-09-01 01:05:21 +09:00
minjaesong
81c031966c terrain AND wall renders 2017-09-01 01:05:21 +09:00
minjaesong
749a82bcf7 now I can't even tell if it's working as intended or not 2017-08-30 22:16:10 +09:00
minjaesong
b040531f99 now I can't even tell if it's working as intended or not 2017-08-30 22:16:10 +09:00
minjaesong
f9897bc439 new blocks drawer WIP 2017-08-29 21:06:30 +09:00
minjaesong
ff434b45fc new blocks drawer WIP 2017-08-29 21:06:30 +09:00
minjaesong
1c6560797d terrain atlas: added black patch 2017-08-28 20:37:39 +09:00
minjaesong
ff95f9e402 terrain atlas: added black patch 2017-08-28 20:37:39 +09:00
minjaesong
75192bef17 camera moving works 2017-08-28 02:27:53 +09:00
minjaesong
bdff19237e camera moving works 2017-08-28 02:27:53 +09:00
minjaesong
05560cf04c Tiling shader -- FIXME: cameraTranslation not working as it should 2017-08-27 23:55:54 +09:00
minjaesong
5d03bb96f3 Tiling shader -- FIXME: cameraTranslation not working as it should 2017-08-27 23:55:54 +09:00
minjaesong
ee7d51c21b fucking finally... (needs cleanup) 2017-08-27 23:47:30 +09:00
minjaesong
6ce45abfc4 fucking finally... (needs cleanup) 2017-08-27 23:47:30 +09:00
minjaesong
2928aa2eb7 tiling using shader, sorta works 2017-08-26 23:48:07 +09:00
minjaesong
c94418e98f tiling using shader, sorta works 2017-08-26 23:48:07 +09:00
minjaesong
d0702c9159 trying to tile by shader 2017-08-25 19:37:12 +09:00
minjaesong
1be8e5d0c7 trying to tile by shader 2017-08-25 19:37:12 +09:00
minjaesong
2bf9acb07a some sort of error screen impl 2017-08-20 22:10:47 +09:00
minjaesong
388e4675f4 some sort of error screen impl 2017-08-20 22:10:47 +09:00
minjaesong
25ce7958ae better dithering 2017-08-07 01:09:04 +09:00
minjaesong
ad60b21d2a better dithering 2017-08-07 01:09:04 +09:00
minjaesong
64f36d2d7c load app using apploader -- no more black screen on app load 2017-08-01 23:55:48 +09:00
minjaesong
93b18dfb18 load app using apploader -- no more black screen on app load 2017-08-01 23:55:48 +09:00
minjaesong
65bc67710c RemoCons fully working; also fixed my stupidity 2017-07-26 17:03:22 +09:00
minjaesong
f1afb67c77 RemoCons fully working; also fixed my stupidity 2017-07-26 17:03:22 +09:00
minjaesong
86d3a4a08d UIs wont FOR SURE update (more like, process events) anymore when they are not visible 2017-07-25 18:34:23 +09:00
minjaesong
9731c8384a UIs wont FOR SURE update (more like, process events) anymore when they are not visible 2017-07-25 18:34:23 +09:00
minjaesong
33da9777ea UI: sub-UIs work? 2017-07-25 17:21:02 +09:00
minjaesong
33657624a6 UI: sub-UIs work? 2017-07-25 17:21:02 +09:00
minjaesong
07ee987411 fixed quickbar and piemenu texture 2017-07-23 19:55:06 +09:00
minjaesong
3578df4770 fixed quickbar and piemenu texture 2017-07-23 19:55:06 +09:00
minjaesong
72b7adcf39 more compatible shader 2017-07-23 18:23:53 +09:00
minjaesong
0fe3e7949b more compatible shader 2017-07-23 18:23:53 +09:00
minjaesong
c595270faa leak patched I guess 2017-07-23 17:38:57 +09:00
minjaesong
d421d7964b leak patched I guess 2017-07-23 17:38:57 +09:00
minjaesong
d753365e54 titlescreen: camera follows terraini undulation 2017-07-22 18:27:58 +09:00
minjaesong
b6c3467fe1 titlescreen: camera follows terraini undulation 2017-07-22 18:27:58 +09:00
minjaesong
116b4cc390 title screen renders well 2017-07-21 20:28:12 +09:00
minjaesong
f912b33f09 title screen renders well 2017-07-21 20:28:12 +09:00
minjaesong
a5dd5b9e98 generalised things so that they would work outside of ingame.world; title screen wip 2017-07-21 19:59:51 +09:00
minjaesong
4087a93142 generalised things so that they would work outside of ingame.world; title screen wip 2017-07-21 19:59:51 +09:00
minjaesong
f51417e709 action listener on textbutton list 2017-07-20 22:25:40 +09:00
minjaesong
cf9414f2df action listener on textbutton list 2017-07-20 22:25:40 +09:00
minjaesong
fd7d724f39 parallax (sky looks bluer when you go up) 2017-07-20 18:39:05 +09:00
minjaesong
329beb3197 parallax (sky looks bluer when you go up) 2017-07-20 18:39:05 +09:00
minjaesong
528fdc9fc5 limitedly successful attempt to create a title screen 2017-07-20 00:36:41 +09:00
minjaesong
81f0499c9d limitedly successful attempt to create a title screen 2017-07-20 00:36:41 +09:00
minjaesong
33a774b5b7 Ingame's Player is now mandatory; player spawn on right position 2017-07-18 00:19:55 +09:00
minjaesong
3727a9d27f Ingame's Player is now mandatory; player spawn on right position 2017-07-18 00:19:55 +09:00
minjaesong
58205e5eb5 Inventory UI: items page button 2017-07-17 14:37:10 +09:00
minjaesong
2f75e276b2 Inventory UI: items page button 2017-07-17 14:37:10 +09:00
minjaesong
31b7203d01 some bayer matrix things and my discoveries 2017-07-17 12:22:15 +09:00
minjaesong
5a0b3c6eb1 some bayer matrix things and my discoveries 2017-07-17 12:22:15 +09:00
minjaesong
c9932fc81b simplified a structure of UIs a bit 2017-07-16 23:15:32 +09:00
minjaesong
dad876308c simplified a structure of UIs a bit 2017-07-16 23:15:32 +09:00
minjaesong
145a4e5e71 dithered skybox 2017-07-16 05:03:04 +09:00
minjaesong
98409f09c0 dithered skybox 2017-07-16 05:03:04 +09:00
minjaesong
81529eb215 bayer-dithering shader revisited 2017-07-15 18:35:57 +09:00
minjaesong
b9c93dd6b0 bayer-dithering shader revisited 2017-07-15 18:35:57 +09:00
minjaesong
057df6632a camera clamping, UI resize 2017-07-15 02:02:30 +09:00
minjaesong
81acfecbd7 camera clamping, UI resize 2017-07-15 02:02:30 +09:00
minjaesong
5499ded796 wall render bug fixed
- wall wouldn't render if transparent-yet-sold tiles like glass is placed on top of it
2017-07-15 00:02:00 +09:00
minjaesong
1002f910e4 wall render bug fixed
- wall wouldn't render if transparent-yet-sold tiles like glass is placed on top of it
2017-07-15 00:02:00 +09:00
minjaesong
61427b849a load screen adj, faster gravity response for standard 2017-07-14 18:48:48 +09:00
minjaesong
eff1cb1e62 load screen adj, faster gravity response for standard 2017-07-14 18:48:48 +09:00
minjaesong
a53f818ba6 Rudimentary load screen works (only with Ingame screen) 2017-07-13 19:10:11 +09:00
minjaesong
70236f42ff Rudimentary load screen works (only with Ingame screen) 2017-07-13 19:10:11 +09:00
minjaesong
d9a3318768 GenuineSonic 2017-07-13 18:07:12 +09:00
minjaesong
9a935c2e15 GenuineSonic 2017-07-13 18:07:12 +09:00
minjaesong
d241e5cbb0 disposable UI; loading screen mockup (i heard like loading screen -- sonic 06) 2017-07-13 17:53:40 +09:00
minjaesong
8438714062 disposable UI; loading screen mockup (i heard like loading screen -- sonic 06) 2017-07-13 17:53:40 +09:00
minjaesong
49a9278c59 load screen render, fixed some init code of the app 2017-07-13 03:59:26 +09:00
minjaesong
fcdac4b759 load screen render, fixed some init code of the app 2017-07-13 03:59:26 +09:00
minjaesong
fc9516fd39 how changing the screen should be done 2017-07-13 01:34:09 +09:00
minjaesong
e74a738274 how changing the screen should be done 2017-07-13 01:34:09 +09:00
minjaesong
6bff02d91e lightmap downsample works, sampling bug fixed with Filter.NEAREST, now having shrinkage issue 2017-07-12 14:33:59 +09:00
minjaesong
86fad6390f lightmap downsample works, sampling bug fixed with Filter.NEAREST, now having shrinkage issue 2017-07-12 14:33:59 +09:00
minjaesong
bad6ff296a working UV simulation using alpha channel 2017-07-12 02:35:36 +09:00
minjaesong
7fc2d85c46 working UV simulation using alpha channel 2017-07-12 02:35:36 +09:00
minjaesong
1e9c04d7c0 working world-glow blend 2017-07-11 13:34:14 +09:00
minjaesong
e01ad32849 working world-glow blend 2017-07-11 13:34:14 +09:00
minjaesong
3ffdd7233f prep for draw glow 2017-07-09 20:29:35 +09:00
minjaesong
06cab5effc prep for draw glow 2017-07-09 20:29:35 +09:00
minjaesong
5a5fb45c3b diching RGB10; colors are now fully vec3 2017-07-09 02:21:24 +09:00
minjaesong
c96fb5e017 diching RGB10; colors are now fully vec3 2017-07-09 02:21:24 +09:00
minjaesong
1a33c3be5a float lightmap seems it does have little boost on fps 2017-07-09 00:51:25 +09:00
minjaesong
b3a355f51d float lightmap seems it does have little boost on fps 2017-07-09 00:51:25 +09:00
minjaesong
0ad7db3b51 failed attempt at multithreading 2017-07-08 22:34:45 +09:00
minjaesong
b57b0cb04c failed attempt at multithreading 2017-07-08 22:34:45 +09:00
minjaesong
8504337da9 asynch update and render (aka frameskip) 2017-07-08 20:38:05 +09:00
minjaesong
f71905b880 asynch update and render (aka frameskip) 2017-07-08 20:38:05 +09:00
minjaesong
f2f5cd7daf former bug fixed; now we have ceiling-stair-clip bug 2017-07-07 02:11:24 +09:00
minjaesong
235f774ff6 former bug fixed; now we have ceiling-stair-clip bug 2017-07-07 02:11:24 +09:00
minjaesong
464d30a384 improved collision displacer: no more clip-to-climb-up-rightside-only thingy 2017-07-07 00:01:20 +09:00
minjaesong
3b99546f33 improved collision displacer: no more clip-to-climb-up-rightside-only thingy 2017-07-07 00:01:20 +09:00
minjaesong
009b55481b new collision displacer: got one-block-ceiling-passthru bug, but otherwise tolerable 2017-07-06 16:35:58 +09:00
minjaesong
19a094b2fa new collision displacer: got one-block-ceiling-passthru bug, but otherwise tolerable 2017-07-06 16:35:58 +09:00
minjaesong
72e7931f4d 4096 shader finally works... perhaps it needs bayer matrix? 2017-07-05 18:30:53 +09:00
minjaesong
3eadb6b5e5 4096 shader finally works... perhaps it needs bayer matrix? 2017-07-05 18:30:53 +09:00
minjaesong
0e4dd79cc1 downsampling sorta works, ONLY WHEN (width or height % 4) is 0 or 1 2017-07-05 16:03:50 +09:00
minjaesong
1ca162f72e downsampling sorta works, ONLY WHEN (width or height % 4) is 0 or 1 2017-07-05 16:03:50 +09:00
minjaesong
f676938176 control scheme update 2017-07-05 12:49:26 +09:00
minjaesong
28b67ec68b control scheme update 2017-07-05 12:49:26 +09:00
minjaesong
8a759cb178 Ladies and Gents, we have shader-powered smooth lighting! 2017-07-05 02:20:10 +09:00
minjaesong
c7add8f0a8 Ladies and Gents, we have shader-powered smooth lighting! 2017-07-05 02:20:10 +09:00
minjaesong
66e4dcd1c4 shader seems working!; it's messed up by all the test codes but I commit anyway 2017-07-05 02:05:03 +09:00
minjaesong
d707287754 shader seems working!; it's messed up by all the test codes but I commit anyway 2017-07-05 02:05:03 +09:00
minjaesong
d9381fc58e blur shader works 2017-07-04 23:30:48 +09:00
minjaesong
cf6e268ff6 blur shader works 2017-07-04 23:30:48 +09:00
minjaesong
039ccea58f shader does work at least... 2017-07-04 22:04:07 +09:00
minjaesong
bba2f3ce20 shader does work at least... 2017-07-04 22:04:07 +09:00
minjaesong
b592b8fa0f killed old zoom so that framebuffer would render without hack 2017-07-04 20:11:54 +09:00
minjaesong
2ac7efeaac killed old zoom so that framebuffer would render without hack 2017-07-04 20:11:54 +09:00
minjaesong
b82d172d58 needs more shader (for smoothing out lightmap render) 2017-07-04 14:58:18 +09:00
minjaesong
fbe02ab19c needs more shader (for smoothing out lightmap render) 2017-07-04 14:58:18 +09:00
minjaesong
41f9f4032d barely managed to fix inventory UI 2017-07-04 01:27:18 +09:00
minjaesong
7ca4d03cf8 barely managed to fix inventory UI 2017-07-04 01:27:18 +09:00
minjaesong
7b2b6caf82 dunno why but setting camera position to negative works... 2017-07-03 23:42:59 +09:00
minjaesong
924c7db5eb dunno why but setting camera position to negative works... 2017-07-03 23:42:59 +09:00
minjaesong
b7fb8ff4da putting ore vein prototype on main sheet; also a commit before fuck-up 2017-07-03 19:26:00 +09:00
minjaesong
6b37b2b9d6 putting ore vein prototype on main sheet; also a commit before fuck-up 2017-07-03 19:26:00 +09:00
minjaesong
2ea3ce0c67 fixed bug: things go dark as inventory is opened
Not cloning the color when MULing was the culprit
2017-07-03 02:55:33 +09:00
minjaesong
b04d062935 fixed bug: things go dark as inventory is opened
Not cloning the color when MULing was the culprit
2017-07-03 02:55:33 +09:00
minjaesong
9b32cf63ff fixed bad color rendering on blocksdrawer and lightmaprenderer 2017-07-02 21:53:50 +09:00
minjaesong
d357ef0245 fixed bad color rendering on blocksdrawer and lightmaprenderer 2017-07-02 21:53:50 +09:00
minjaesong
2129cce7f3 debugger's got its colour codes back 2017-07-02 15:28:45 +09:00
minjaesong
3b24ce306f debugger's got its colour codes back 2017-07-02 15:28:45 +09:00
minjaesong
c8c1bdf836 proper sprite flip draw 2017-07-02 00:45:57 +09:00
minjaesong
7f5760f84e proper sprite flip draw 2017-07-02 00:45:57 +09:00
minjaesong
4a54c87826 keyboard control ported to GDX (at least as much as I can right now) 2017-07-01 18:31:00 +09:00
minjaesong
e2da14da8a keyboard control ported to GDX (at least as much as I can right now) 2017-07-01 18:31:00 +09:00
minjaesong
7248616e58 ore veins 2017-06-30 02:06:53 +09:00
minjaesong
54c643b35e ore veins 2017-06-30 02:06:53 +09:00
minjaesong
33b5a21c26 blocks camera and framebuffer seems working 2017-06-30 01:50:06 +09:00
minjaesong
5ad34b96ac blocks camera and framebuffer seems working 2017-06-30 01:50:06 +09:00
minjaesong
1095cb451f can see camera working but not the actor gravity 2017-06-28 22:15:42 +09:00
minjaesong
62ff6e9ded can see camera working but not the actor gravity 2017-06-28 22:15:42 +09:00
1896 changed files with 38626 additions and 160105 deletions

8
.gitattributes vendored
View File

@@ -5,11 +5,3 @@
*.opus filter=lfs diff=lfs merge=lfs -text
*.pdf filter=lfs diff=lfs merge=lfs -text
*.zip filter=lfs diff=lfs merge=lfs -text
*.kra filter=lfs diff=lfs merge=lfs -text
*.png filter=lfs diff=lfs merge=lfs -text
*.icns filter=lfs diff=lfs merge=lfs -text
*.jar filter=lfs diff=lfs merge=lfs -text
*.bin filter=lfs diff=lfs merge=lfs -text
*.tga binary diff=hex
*.kra binary diff=hex

37
.gitignore vendored
View File

@@ -1,49 +1,34 @@
### IntelliJ IDEA ###
out/
!**/src/main/**/out/
!**/src/test/**/out/
# Build-related
out/*
bin/*
build/*
assets_release/*
.gradle/*
TerrarumBuild.jar
buildapp/out/Terrarum*
buildapp/TerrarumLinux.*
buildapp/TerrarumMac.*
buildapp/TerrarumWindows.*
assets/mods/*/*.jar
work_files/skylight/hosek_model_source/*.bin
# Java native errors
hs_err_pid*
replay_pid*
# OS files
Thumbs.db
.DS_Store
desktop.ini
.directory
*/.directory
# Resources that should not be tracked
assets/mods/basegame/demoworld
external_resource_packs
#assets/mods/basegame/demoworld.gz
external_resource_packs.zip
# IntelliJ
workspace.xml
*/workspace.xml
# Temporary files
.tmp*
tmp_*
*.bak
*-autosave.kra
## Microsoft Office
~$*
## Generic temp files in Linux
*~
## Vim temp files
*.swp
*.swo
# Eclipse MAT heap files
*.hprof
*.bin
*.index
*.threads
*_Leak_Suspects.zip
desktop.ini

1
.idea/.name generated Normal file
View File

@@ -0,0 +1 @@
Terrarum_renewed

9
.idea/artifacts/ModuleBasegame.xml generated Normal file
View File

@@ -0,0 +1,9 @@
<component name="ArtifactManager">
<artifact type="jar" name="ModuleBasegame">
<output-path>$PROJECT_DIR$/out/artifacts/ModuleBasegame</output-path>
<root id="archive" name="ModuleBasegame.jar">
<element id="module-output" name="ingamemodule_basegame" />
<element id="library" level="project" name="lib" />
</root>
</artifact>
</component>

View File

@@ -1,10 +0,0 @@
<component name="ArtifactManager">
<artifact type="jar" name="ModuleComputers">
<output-path>$PROJECT_DIR$/assets/mods/dwarventech</output-path>
<root id="archive" name="ModuleComputers.jar">
<element id="module-output" name="ModuleComputers" />
<element id="extracted-dir" path="$PROJECT_DIR$/ModuleComputers/lib/TerrarumTSVM.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/ModuleComputers/lib/TerranVirtualDisk.jar" path-in-jar="/" />
</root>
</artifact>
</component>

View File

@@ -1,8 +0,0 @@
<component name="ArtifactManager">
<artifact type="jar" name="MusicPlayer">
<output-path>$PROJECT_DIR$/assets/mods/musicplayer</output-path>
<root id="archive" name="MusicPlayer.jar">
<element id="module-output" name="MusicPlayer" />
</root>
</artifact>
</component>

View File

@@ -1,86 +0,0 @@
<component name="ArtifactManager">
<artifact type="jar" name="SpriteAssemblerApp">
<output-path>$PROJECT_DIR$/out</output-path>
<root id="archive" name="terrarum.terrarum.jar">
<element id="directory" name="META-INF">
<element id="file-copy" path="$PROJECT_DIR$/src/net/torvald/terrarum/spriteassembler/META-INF/MANIFEST.MF" />
</element>
<element id="module-output" name="TerrarumBuild" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/Terrarum_Joise.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/commons-csv-1.8.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/TerrarumSansBitmap.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/gdx-controllers-core-2.2.1.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/GetCpuName.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/prtree.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/commons-codec-1.15.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/jxinput-1.0.0.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/gdx-controllers-desktop-2.2.1.jar" path-in-jar="/" />
<element id="extracted-dir" path="$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib/1.8.21/kotlin-stdlib-1.8.21.jar" path-in-jar="/" />
<element id="extracted-dir" path="$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.8.21/kotlin-stdlib-jdk7-1.8.21.jar" path-in-jar="/" />
<element id="extracted-dir" path="$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-common/1.8.21/kotlin-stdlib-common-1.8.21.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/gdx-jnigen-loader-2.3.1.jar" path-in-jar="/" />
<element id="extracted-dir" path="$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.8.21/kotlin-stdlib-jdk8-1.8.21.jar" path-in-jar="/" />
<element id="extracted-dir" path="$MAVEN_REPOSITORY$/org/jetbrains/annotations/13.0/annotations-13.0.jar" path-in-jar="/" />
<element id="extracted-dir" path="$KOTLIN_BUNDLED$/lib/kotlin-stdlib.jar" path-in-jar="/" />
<element id="extracted-dir" path="$KOTLIN_BUNDLED$/lib/kotlin-stdlib-jdk8.jar" path-in-jar="/" />
<element id="extracted-dir" path="$KOTLIN_BUNDLED$/lib/kotlin-stdlib-jdk7.jar" path-in-jar="/" />
<element id="extracted-dir" path="$KOTLIN_BUNDLED$/lib/kotlin-reflect.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/graal-sdk-22.3.1.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/icu4j-71.1.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/js-22.3.1-edit.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/js-scriptengine-22.3.1.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/regex-22.3.1-edit.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/truffle-api-22.3.1.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/gdx-1.12.0.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/gdx-backend-lwjgl3-1.12.0.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-3.3.2.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-3.3.2-natives-linux.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-3.3.2-natives-linux-arm32.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-3.3.2-natives-linux-arm64.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-3.3.2-natives-macos.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-3.3.2-natives-macos-arm64.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-3.3.2-natives-windows.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-3.3.2-natives-windows-x86.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-glfw-3.3.2.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-glfw-3.3.2-natives-linux.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-glfw-3.3.2-natives-linux-arm32.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-glfw-3.3.2-natives-linux-arm64.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-glfw-3.3.2-natives-macos.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-glfw-3.3.2-natives-macos-arm64.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-glfw-3.3.2-natives-windows.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-glfw-3.3.2-natives-windows-x86.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-jemalloc-3.3.2.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-jemalloc-3.3.2-natives-linux.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-jemalloc-3.3.2-natives-linux-arm32.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-jemalloc-3.3.2-natives-linux-arm64.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-jemalloc-3.3.2-natives-macos.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-jemalloc-3.3.2-natives-macos-arm64.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-jemalloc-3.3.2-natives-windows.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-jemalloc-3.3.2-natives-windows-x86.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-openal-3.3.2.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-openal-3.3.2-natives-linux.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-openal-3.3.2-natives-linux-arm32.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-openal-3.3.2-natives-linux-arm64.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-openal-3.3.2-natives-macos.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-openal-3.3.2-natives-macos-arm64.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-openal-3.3.2-natives-windows.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-openal-3.3.2-natives-windows-x86.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-opengl-3.3.2.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-opengl-3.3.2-natives-linux.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-opengl-3.3.2-natives-linux-arm32.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-opengl-3.3.2-natives-linux-arm64.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-opengl-3.3.2-natives-macos.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-opengl-3.3.2-natives-macos-arm64.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-opengl-3.3.2-natives-windows.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-opengl-3.3.2-natives-windows-x86.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-stb-3.3.2.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-stb-3.3.2-natives-linux.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-stb-3.3.2-natives-linux-arm32.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-stb-3.3.2-natives-linux-arm64.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-stb-3.3.2-natives-macos.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-stb-3.3.2-natives-macos-arm64.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-stb-3.3.2-natives-windows.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-stb-3.3.2-natives-windows-x86.jar" path-in-jar="/" />
</root>
</artifact>
</component>

View File

@@ -1,95 +1,11 @@
<component name="ArtifactManager">
<artifact type="jar" name="TerrarumBuild">
<output-path>$PROJECT_DIR$/out</output-path>
<output-path>$PROJECT_DIR$/</output-path>
<root id="archive" name="TerrarumBuild.jar">
<element id="directory" name="META-INF">
<element id="file-copy" path="$PROJECT_DIR$/src/META-INF/MANIFEST.MF" />
</element>
<element id="module-output" name="TerrarumBuild" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/jlayer-1.0.1-gdx.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/jorbis-0.0.17.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/commons-codec-1.15.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/gdx-controllers-core-2.2.1.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/gdx-controllers-desktop-2.2.1.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/GetCpuName.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/jxinput-1.0.0.jar" path-in-jar="/" />
<element id="extracted-dir" path="$KOTLIN_BUNDLED$/lib/kotlin-stdlib.jar" path-in-jar="/" />
<element id="extracted-dir" path="$KOTLIN_BUNDLED$/lib/kotlin-reflect.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/commons-csv-1.8.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/prtree.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/Terrarum_Joise.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/TerrarumSansBitmap.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/gdx-jnigen-loader-2.3.1.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/js-scriptengine-22.3.1.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/truffle-api-22.3.1.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/icu4j-71.1.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/regex-22.3.1-edit.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/js-22.3.1-edit.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/graal-sdk-22.3.1.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/commons-math3-3.6.1.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/gdx-1.12.0.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/gdx-backend-lwjgl3-1.12.0.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-3.3.2.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-3.3.2-natives-linux.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-3.3.2-natives-linux-arm32.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-3.3.2-natives-linux-arm64.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-3.3.2-natives-macos.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-3.3.2-natives-macos-arm64.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-3.3.2-natives-windows.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-3.3.2-natives-windows-x86.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-glfw-3.3.2.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-glfw-3.3.2-natives-linux.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-glfw-3.3.2-natives-linux-arm32.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-glfw-3.3.2-natives-linux-arm64.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-glfw-3.3.2-natives-macos.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-glfw-3.3.2-natives-macos-arm64.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-glfw-3.3.2-natives-windows.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-glfw-3.3.2-natives-windows-x86.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-jemalloc-3.3.2.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-jemalloc-3.3.2-natives-linux.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-jemalloc-3.3.2-natives-linux-arm32.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-jemalloc-3.3.2-natives-linux-arm64.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-jemalloc-3.3.2-natives-macos.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-jemalloc-3.3.2-natives-macos-arm64.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-jemalloc-3.3.2-natives-windows.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-jemalloc-3.3.2-natives-windows-x86.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-openal-3.3.2.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-openal-3.3.2-natives-linux.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-openal-3.3.2-natives-linux-arm32.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-openal-3.3.2-natives-linux-arm64.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-openal-3.3.2-natives-macos.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-openal-3.3.2-natives-macos-arm64.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-openal-3.3.2-natives-windows.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-openal-3.3.2-natives-windows-x86.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-opengl-3.3.2.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-opengl-3.3.2-natives-linux.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-opengl-3.3.2-natives-linux-arm32.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-opengl-3.3.2-natives-linux-arm64.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-opengl-3.3.2-natives-macos.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-opengl-3.3.2-natives-macos-arm64.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-opengl-3.3.2-natives-windows.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-opengl-3.3.2-natives-windows-x86.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-stb-3.3.2.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-stb-3.3.2-natives-linux.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-stb-3.3.2-natives-linux-arm32.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-stb-3.3.2-natives-linux-arm64.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-stb-3.3.2-natives-macos.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-stb-3.3.2-natives-macos-arm64.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-stb-3.3.2-natives-windows.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-stb-3.3.2-natives-windows-x86.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/gdx-platform-1.12.0-natives-arm64-v8a.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/gdx-platform-1.12.0-natives-desktop.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/gdx-platform-1.12.0-natives-x86_64.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/JTransforms-3.1.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/JLargeArrays-1.5.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/aircompressor-0.25.jar" path-in-jar="/" />
<element id="extracted-dir" path="$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.8.22/kotlin-stdlib-jdk8-1.8.22.jar" path-in-jar="/" />
<element id="extracted-dir" path="$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib/1.8.22/kotlin-stdlib-1.8.22.jar" path-in-jar="/" />
<element id="extracted-dir" path="$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-common/1.8.22/kotlin-stdlib-common-1.8.22.jar" path-in-jar="/" />
<element id="extracted-dir" path="$MAVEN_REPOSITORY$/org/jetbrains/annotations/13.0/annotations-13.0.jar" path-in-jar="/" />
<element id="extracted-dir" path="$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.8.22/kotlin-stdlib-jdk7-1.8.22.jar" path-in-jar="/" />
<element id="extracted-dir" path="$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-reflect/1.8.22/kotlin-reflect-1.8.22.jar" path-in-jar="/" />
<element id="extracted-dir" path="$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-test/1.8.22/kotlin-test-1.8.22.jar" path-in-jar="/" />
<element id="module-output" name="Terrarum_renewed" />
</root>
</artifact>
</component>

View File

@@ -1,18 +1,41 @@
<component name="ProjectCodeStyleConfiguration">
<code_scheme name="Project" version="173">
<JetCodeStyleSettings>
<option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
<option name="ALIGN_IN_COLUMNS_CASE_BRANCH" value="true" />
</JetCodeStyleSettings>
<MarkdownNavigatorCodeStyleSettings>
<option name="RIGHT_MARGIN" value="72" />
</MarkdownNavigatorCodeStyleSettings>
<XML>
<option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
</XML>
<codeStyleSettings language="JAVA">
<option name="KEEP_FIRST_COLUMN_COMMENT" value="false" />
<option name="ELSE_ON_NEW_LINE" value="true" />
<option name="CATCH_ON_NEW_LINE" value="true" />
<option name="FINALLY_ON_NEW_LINE" value="true" />
<option name="ALIGN_MULTILINE_CHAINED_METHODS" value="true" />
<option name="ALIGN_MULTILINE_PARAMETERS" value="false" />
<option name="ALIGN_MULTILINE_TERNARY_OPERATION" value="true" />
<option name="CALL_PARAMETERS_WRAP" value="1" />
<option name="CALL_PARAMETERS_RPAREN_ON_NEXT_LINE" value="true" />
<option name="METHOD_PARAMETERS_WRAP" value="1" />
<option name="THROWS_LIST_WRAP" value="1" />
<option name="TERNARY_OPERATION_WRAP" value="5" />
<option name="TERNARY_OPERATION_SIGNS_ON_NEXT_LINE" value="true" />
<option name="KEEP_SIMPLE_CLASSES_IN_ONE_LINE" value="true" />
<option name="FOR_STATEMENT_WRAP" value="5" />
<option name="ARRAY_INITIALIZER_WRAP" value="5" />
<option name="ARRAY_INITIALIZER_RBRACE_ON_NEXT_LINE" value="true" />
<option name="WRAP_ON_TYPING" value="0" />
</codeStyleSettings>
<codeStyleSettings language="kotlin">
<option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
<option name="KEEP_BLANK_LINES_IN_DECLARATIONS" value="5" />
<option name="KEEP_BLANK_LINES_IN_CODE" value="5" />
<option name="ELSE_ON_NEW_LINE" value="true" />
<option name="CATCH_ON_NEW_LINE" value="true" />
<option name="FINALLY_ON_NEW_LINE" value="true" />
<option name="ALIGN_MULTILINE_BINARY_OPERATION" value="true" />
</codeStyleSettings>
</code_scheme>
</component>

6
.idea/compiler.xml generated
View File

@@ -1,11 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="CompilerConfiguration">
<option name="BUILD_PROCESS_HEAP_SIZE" value="2048" />
<annotationProcessing>
<profile default="true" name="Default" enabled="true" />
</annotationProcessing>
<bytecodeTargetLevel target="17" />
<bytecodeTargetLevel target="10">
<module name="terrarum_main" target="11" />
<module name="terrarum_test" target="11" />
</bytecodeTargetLevel>
</component>
<component name="JavacSettings">
<option name="PREFER_TARGET_JDK_COMPILER" value="false" />

View File

@@ -5,9 +5,6 @@
<inspection_tool class="ConstantConditionIf" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
<inspection_tool class="CsvValidation" enabled="false" level="WARNING" enabled_by_default="false" />
<inspection_tool class="ExplicitThis" enabled="false" level="INFORMATION" enabled_by_default="false" />
<inspection_tool class="JsonStandardCompliance" enabled="true" level="ERROR" enabled_by_default="true">
<option name="myWarnAboutComments" value="false" />
</inspection_tool>
<inspection_tool class="KotlinDoubleNegation" enabled="true" level="WARNING" enabled_by_default="true" />
<inspection_tool class="NullChecksToSafeCall" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
<inspection_tool class="RedundantCompanionReference" enabled="false" level="WARNING" enabled_by_default="false" />

12
.idea/kotlinc.xml generated
View File

@@ -1,13 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="Kotlin2JsCompilerArguments">
<option name="sourceMapEmbedSources" />
</component>
<component name="Kotlin2JvmCompilerArguments">
<option name="jvmTarget" value="17" />
</component>
<component name="KotlinCommonCompilerArguments">
<option name="apiVersion" value="1.8" />
<option name="languageVersion" value="1.8" />
</component>
<component name="KotlinJpsPluginSettings">
<option name="version" value="1.8.0" />
<option name="jvmTarget" value="1.8" />
</component>
</project>

View File

@@ -1,11 +0,0 @@
<component name="libraryTable">
<library name="GetCpuName-src">
<CLASSES>
<root url="jar://$PROJECT_DIR$/lib/GetCpuName.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$PROJECT_DIR$/lib/GetCpuName-src.jar!/" />
</SOURCES>
</library>
</component>

View File

@@ -1,26 +1,15 @@
<component name="libraryTable">
<library name="KotlinJavaRuntime" type="repository">
<properties maven-id="org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.22" />
<library name="KotlinJavaRuntime">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.8.22/kotlin-stdlib-jdk8-1.8.22.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib/1.8.22/kotlin-stdlib-1.8.22.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-common/1.8.22/kotlin-stdlib-common-1.8.22.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/annotations/13.0/annotations-13.0.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.8.22/kotlin-stdlib-jdk7-1.8.22.jar!/" />
<root url="jar://$KOTLIN_BUNDLED$/lib/kotlin-stdlib.jar!/" />
<root url="jar://$KOTLIN_BUNDLED$/lib/kotlin-reflect.jar!/" />
<root url="jar://$KOTLIN_BUNDLED$/lib/kotlin-test.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.8.22/kotlin-stdlib-jdk8-1.8.22-javadoc.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib/1.8.22/kotlin-stdlib-1.8.22-javadoc.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-common/1.8.22/kotlin-stdlib-common-1.8.22-javadoc.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/annotations/13.0/annotations-13.0-javadoc.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.8.22/kotlin-stdlib-jdk7-1.8.22-javadoc.jar!/" />
</JAVADOC>
<JAVADOC />
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.8.22/kotlin-stdlib-jdk8-1.8.22-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib/1.8.22/kotlin-stdlib-1.8.22-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-common/1.8.22/kotlin-stdlib-common-1.8.22-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/annotations/13.0/annotations-13.0-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.8.22/kotlin-stdlib-jdk7-1.8.22-sources.jar!/" />
<root url="jar://$KOTLIN_BUNDLED$/lib/kotlin-stdlib-sources.jar!/" />
<root url="jar://$KOTLIN_BUNDLED$/lib/kotlin-reflect-sources.jar!/" />
<root url="jar://$KOTLIN_BUNDLED$/lib/kotlin-test-sources.jar!/" />
</SOURCES>
</library>
</component>

View File

@@ -1,10 +0,0 @@
<component name="libraryTable">
<library name="ModuleComputersLib">
<CLASSES>
<root url="file://$PROJECT_DIR$/ModuleComputers/lib" />
</CLASSES>
<JAVADOC />
<SOURCES />
<jarDirectory url="file://$PROJECT_DIR$/ModuleComputers/lib" recursive="false" />
</library>
</component>

View File

@@ -1,11 +0,0 @@
<component name="libraryTable">
<library name="TerrarumSansBitmap">
<CLASSES>
<root url="jar://$PROJECT_DIR$/lib/TerrarumSansBitmap.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$PROJECT_DIR$/lib/TerrarumSansBitmap.jar!/" />
</SOURCES>
</library>
</component>

View File

@@ -1,11 +0,0 @@
<component name="libraryTable">
<library name="Terrarum_Joise">
<CLASSES>
<root url="jar://$PROJECT_DIR$/lib/Terrarum_Joise.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$PROJECT_DIR$/lib/Terrarum_Joise.jar!/" />
</SOURCES>
</library>
</component>

View File

@@ -1,14 +0,0 @@
<component name="libraryTable">
<library name="apache.commons.math3" type="repository">
<properties maven-id="org.apache.commons:commons-math3:3.6.1" />
<CLASSES>
<root url="jar://$PROJECT_DIR$/lib/commons-math3-3.6.1.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$PROJECT_DIR$/lib/commons-math3-3.6.1-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$PROJECT_DIR$/lib/commons-math3-3.6.1-sources.jar!/" />
</SOURCES>
</library>
</component>

View File

@@ -1,17 +0,0 @@
<component name="libraryTable">
<library name="badlogicgames.gdx" type="repository">
<properties maven-id="com.badlogicgames.gdx:gdx:1.12.0" />
<CLASSES>
<root url="jar://$PROJECT_DIR$/lib/gdx-1.12.0.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/gdx-jnigen-loader-2.3.1.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$PROJECT_DIR$/lib/gdx-1.12.0-javadoc.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/gdx-jnigen-loader-2.3.1-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$PROJECT_DIR$/lib/gdx-1.12.0-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/gdx-jnigen-loader-2.3.1-sources.jar!/" />
</SOURCES>
</library>
</component>

View File

@@ -1,170 +0,0 @@
<component name="libraryTable">
<library name="badlogicgames.gdx.backend.lwjgl3" type="repository">
<properties maven-id="com.badlogicgames.gdx:gdx-backend-lwjgl3:1.12.0" />
<CLASSES>
<root url="jar://$PROJECT_DIR$/lib/gdx-backend-lwjgl3-1.12.0.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/gdx-1.12.0.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/gdx-jnigen-loader-2.3.1.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/lwjgl-3.3.2.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/lwjgl-3.3.2-natives-linux.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/lwjgl-3.3.2-natives-linux-arm32.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/lwjgl-3.3.2-natives-linux-arm64.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/lwjgl-3.3.2-natives-macos.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/lwjgl-3.3.2-natives-macos-arm64.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/lwjgl-3.3.2-natives-windows.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/lwjgl-3.3.2-natives-windows-x86.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/lwjgl-glfw-3.3.2.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/lwjgl-glfw-3.3.2-natives-linux.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/lwjgl-glfw-3.3.2-natives-linux-arm32.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/lwjgl-glfw-3.3.2-natives-linux-arm64.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/lwjgl-glfw-3.3.2-natives-macos.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/lwjgl-glfw-3.3.2-natives-macos-arm64.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/lwjgl-glfw-3.3.2-natives-windows.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/lwjgl-glfw-3.3.2-natives-windows-x86.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/lwjgl-jemalloc-3.3.2.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/lwjgl-jemalloc-3.3.2-natives-linux.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/lwjgl-jemalloc-3.3.2-natives-linux-arm32.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/lwjgl-jemalloc-3.3.2-natives-linux-arm64.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/lwjgl-jemalloc-3.3.2-natives-macos.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/lwjgl-jemalloc-3.3.2-natives-macos-arm64.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/lwjgl-jemalloc-3.3.2-natives-windows.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/lwjgl-jemalloc-3.3.2-natives-windows-x86.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/lwjgl-openal-3.3.2.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/lwjgl-openal-3.3.2-natives-linux.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/lwjgl-openal-3.3.2-natives-linux-arm32.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/lwjgl-openal-3.3.2-natives-linux-arm64.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/lwjgl-openal-3.3.2-natives-macos.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/lwjgl-openal-3.3.2-natives-macos-arm64.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/lwjgl-openal-3.3.2-natives-windows.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/lwjgl-openal-3.3.2-natives-windows-x86.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/lwjgl-opengl-3.3.2.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/lwjgl-opengl-3.3.2-natives-linux.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/lwjgl-opengl-3.3.2-natives-linux-arm32.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/lwjgl-opengl-3.3.2-natives-linux-arm64.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/lwjgl-opengl-3.3.2-natives-macos.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/lwjgl-opengl-3.3.2-natives-macos-arm64.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/lwjgl-opengl-3.3.2-natives-windows.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/lwjgl-opengl-3.3.2-natives-windows-x86.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/lwjgl-stb-3.3.2.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/lwjgl-stb-3.3.2-natives-linux.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/lwjgl-stb-3.3.2-natives-linux-arm32.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/lwjgl-stb-3.3.2-natives-linux-arm64.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/lwjgl-stb-3.3.2-natives-macos.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/lwjgl-stb-3.3.2-natives-macos-arm64.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/lwjgl-stb-3.3.2-natives-windows.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/lwjgl-stb-3.3.2-natives-windows-x86.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/jlayer-1.0.1-gdx.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/jorbis-0.0.17.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$PROJECT_DIR$/lib/gdx-backend-lwjgl3-1.12.0-javadoc.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/gdx-1.12.0-javadoc.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/gdx-jnigen-loader-2.3.1-javadoc.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/lwjgl-3.3.2-javadoc.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/lwjgl-3.3.2-javadoc.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/lwjgl-3.3.2-javadoc.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/lwjgl-3.3.2-javadoc.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/lwjgl-3.3.2-javadoc.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/lwjgl-3.3.2-javadoc.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/lwjgl-3.3.2-javadoc.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/lwjgl-3.3.2-javadoc.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/lwjgl-glfw-3.3.2-javadoc.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/lwjgl-glfw-3.3.2-javadoc.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/lwjgl-glfw-3.3.2-javadoc.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/lwjgl-glfw-3.3.2-javadoc.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/lwjgl-glfw-3.3.2-javadoc.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/lwjgl-glfw-3.3.2-javadoc.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/lwjgl-glfw-3.3.2-javadoc.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/lwjgl-glfw-3.3.2-javadoc.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/lwjgl-jemalloc-3.3.2-javadoc.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/lwjgl-jemalloc-3.3.2-javadoc.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/lwjgl-jemalloc-3.3.2-javadoc.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/lwjgl-jemalloc-3.3.2-javadoc.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/lwjgl-jemalloc-3.3.2-javadoc.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/lwjgl-jemalloc-3.3.2-javadoc.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/lwjgl-jemalloc-3.3.2-javadoc.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/lwjgl-jemalloc-3.3.2-javadoc.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/lwjgl-openal-3.3.2-javadoc.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/lwjgl-openal-3.3.2-javadoc.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/lwjgl-openal-3.3.2-javadoc.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/lwjgl-openal-3.3.2-javadoc.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/lwjgl-openal-3.3.2-javadoc.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/lwjgl-openal-3.3.2-javadoc.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/lwjgl-openal-3.3.2-javadoc.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/lwjgl-openal-3.3.2-javadoc.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/lwjgl-opengl-3.3.2-javadoc.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/lwjgl-opengl-3.3.2-javadoc.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/lwjgl-opengl-3.3.2-javadoc.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/lwjgl-opengl-3.3.2-javadoc.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/lwjgl-opengl-3.3.2-javadoc.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/lwjgl-opengl-3.3.2-javadoc.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/lwjgl-opengl-3.3.2-javadoc.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/lwjgl-opengl-3.3.2-javadoc.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/lwjgl-stb-3.3.2-javadoc.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/lwjgl-stb-3.3.2-javadoc.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/lwjgl-stb-3.3.2-javadoc.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/lwjgl-stb-3.3.2-javadoc.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/lwjgl-stb-3.3.2-javadoc.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/lwjgl-stb-3.3.2-javadoc.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/lwjgl-stb-3.3.2-javadoc.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/lwjgl-stb-3.3.2-javadoc.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/jlayer-1.0.1-gdx-javadoc.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/jorbis-0.0.17-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$PROJECT_DIR$/lib/gdx-backend-lwjgl3-1.12.0-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/gdx-1.12.0-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/gdx-jnigen-loader-2.3.1-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/lwjgl-3.3.2-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/lwjgl-3.3.2-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/lwjgl-3.3.2-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/lwjgl-3.3.2-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/lwjgl-3.3.2-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/lwjgl-3.3.2-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/lwjgl-3.3.2-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/lwjgl-3.3.2-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/lwjgl-glfw-3.3.2-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/lwjgl-glfw-3.3.2-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/lwjgl-glfw-3.3.2-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/lwjgl-glfw-3.3.2-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/lwjgl-glfw-3.3.2-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/lwjgl-glfw-3.3.2-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/lwjgl-glfw-3.3.2-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/lwjgl-glfw-3.3.2-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/lwjgl-jemalloc-3.3.2-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/lwjgl-jemalloc-3.3.2-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/lwjgl-jemalloc-3.3.2-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/lwjgl-jemalloc-3.3.2-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/lwjgl-jemalloc-3.3.2-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/lwjgl-jemalloc-3.3.2-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/lwjgl-jemalloc-3.3.2-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/lwjgl-jemalloc-3.3.2-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/lwjgl-openal-3.3.2-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/lwjgl-openal-3.3.2-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/lwjgl-openal-3.3.2-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/lwjgl-openal-3.3.2-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/lwjgl-openal-3.3.2-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/lwjgl-openal-3.3.2-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/lwjgl-openal-3.3.2-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/lwjgl-openal-3.3.2-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/lwjgl-opengl-3.3.2-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/lwjgl-opengl-3.3.2-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/lwjgl-opengl-3.3.2-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/lwjgl-opengl-3.3.2-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/lwjgl-opengl-3.3.2-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/lwjgl-opengl-3.3.2-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/lwjgl-opengl-3.3.2-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/lwjgl-opengl-3.3.2-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/lwjgl-stb-3.3.2-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/lwjgl-stb-3.3.2-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/lwjgl-stb-3.3.2-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/lwjgl-stb-3.3.2-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/lwjgl-stb-3.3.2-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/lwjgl-stb-3.3.2-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/lwjgl-stb-3.3.2-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/lwjgl-stb-3.3.2-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/jlayer-1.0.1-gdx-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/jorbis-0.0.17-sources.jar!/" />
</SOURCES>
</library>
</component>

View File

@@ -1,14 +0,0 @@
<component name="libraryTable">
<library name="commons-codec:commons-codec:1.15" type="repository">
<properties maven-id="commons-codec:commons-codec:1.15" />
<CLASSES>
<root url="jar://$PROJECT_DIR$/lib/commons-codec-1.15.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$PROJECT_DIR$/lib/commons-codec-1.15-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$PROJECT_DIR$/lib/commons-codec-1.15-sources.jar!/" />
</SOURCES>
</library>
</component>

View File

@@ -1,13 +0,0 @@
<component name="libraryTable">
<library name="gdx-controllers-core-2.2.1">
<CLASSES>
<root url="jar://$PROJECT_DIR$/lib/gdx-controllers-core-2.2.1.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$PROJECT_DIR$/lib/gdx-controllers-core-2.2.1-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$PROJECT_DIR$/lib/gdx-controllers-core-2.2.1-sources.jar!/" />
</SOURCES>
</library>
</component>

View File

@@ -1,13 +0,0 @@
<component name="libraryTable">
<library name="gdx-controllers-desktop-2.2.1">
<CLASSES>
<root url="jar://$PROJECT_DIR$/lib/gdx-controllers-desktop-2.2.1.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$PROJECT_DIR$/lib/gdx-controllers-desktop-2.2.1-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$PROJECT_DIR$/lib/gdx-controllers-desktop-2.2.1-sources.jar!/" />
</SOURCES>
</library>
</component>

View File

@@ -1,11 +0,0 @@
<component name="libraryTable">
<library name="gdx-platform-1.12.0-natives">
<CLASSES>
<root url="jar://$PROJECT_DIR$/lib/gdx-platform-1.12.0-natives-arm64-v8a.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/gdx-platform-1.12.0-natives-desktop.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/gdx-platform-1.12.0-natives-x86_64.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</component>

View File

@@ -1,14 +0,0 @@
<component name="libraryTable">
<library name="github.wendykierp.JTransforms" type="repository">
<properties maven-id="com.github.wendykierp:JTransforms:3.1" />
<CLASSES>
<root url="jar://$PROJECT_DIR$/lib/JTransforms-3.1.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/JLargeArrays-1.5.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$PROJECT_DIR$/lib/JTransforms-3.1-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/JLargeArrays-1.5-sources.jar!/" />
</SOURCES>
</library>
</component>

View File

@@ -1,28 +0,0 @@
<component name="libraryTable">
<library name="graalvm-js 22.3.1">
<CLASSES>
<root url="jar://$PROJECT_DIR$/lib/graal-sdk-22.3.1.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/icu4j-71.1.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/js-22.3.1-edit.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/js-scriptengine-22.3.1.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/regex-22.3.1-edit.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/truffle-api-22.3.1.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$PROJECT_DIR$/lib/graal-sdk-22.3.1-javadoc.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/icu4j-71.1-javadoc.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/js-22.3.1-javadoc.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/js-scriptengine-22.3.1-javadoc.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/regex-22.3.1-javadoc.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/truffle-api-22.3.1-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$PROJECT_DIR$/lib/graal-sdk-22.3.1-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/icu4j-71.1-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/js-22.3.1-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/js-scriptengine-22.3.1-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/regex-22.3.1-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/truffle-api-22.3.1-sources.jar!/" />
</SOURCES>
</library>
</component>

View File

@@ -1,14 +0,0 @@
<component name="libraryTable">
<library name="io.airlift.aircompressor" type="repository">
<properties maven-id="io.airlift:aircompressor:0.25" />
<CLASSES>
<root url="jar://$PROJECT_DIR$/lib/aircompressor-0.25.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$PROJECT_DIR$/lib/aircompressor-0.25-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$PROJECT_DIR$/lib/aircompressor-0.25-sources.jar!/" />
</SOURCES>
</library>
</component>

View File

@@ -1,14 +0,0 @@
<component name="libraryTable">
<library name="io.github.classgraph" type="repository">
<properties maven-id="io.github.classgraph:classgraph:4.8.157" />
<CLASSES>
<root url="jar://$PROJECT_DIR$/lib/classgraph-4.8.157.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$PROJECT_DIR$/lib/classgraph-4.8.157-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$PROJECT_DIR$/lib/classgraph-4.8.157-sources.jar!/" />
</SOURCES>
</library>
</component>

View File

@@ -1,13 +0,0 @@
<component name="libraryTable">
<library name="jetbrains.kotlin.reflect" type="repository">
<properties maven-id="org.jetbrains.kotlin:kotlin-reflect:1.8.22" />
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-reflect/1.8.22/kotlin-reflect-1.8.22.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib/1.8.22/kotlin-stdlib-1.8.22.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-common/1.8.22/kotlin-stdlib-common-1.8.22.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/annotations/13.0/annotations-13.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</component>

View File

@@ -1,26 +0,0 @@
<component name="libraryTable">
<library name="jetbrains.kotlin.test" type="repository">
<properties maven-id="org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.22" />
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.8.22/kotlin-stdlib-jdk8-1.8.22.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib/1.8.22/kotlin-stdlib-1.8.22.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-common/1.8.22/kotlin-stdlib-common-1.8.22.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/annotations/13.0/annotations-13.0.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.8.22/kotlin-stdlib-jdk7-1.8.22.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.8.22/kotlin-stdlib-jdk8-1.8.22-javadoc.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib/1.8.22/kotlin-stdlib-1.8.22-javadoc.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-common/1.8.22/kotlin-stdlib-common-1.8.22-javadoc.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/annotations/13.0/annotations-13.0-javadoc.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.8.22/kotlin-stdlib-jdk7-1.8.22-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.8.22/kotlin-stdlib-jdk8-1.8.22-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib/1.8.22/kotlin-stdlib-1.8.22-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-common/1.8.22/kotlin-stdlib-common-1.8.22-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/annotations/13.0/annotations-13.0-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.8.22/kotlin-stdlib-jdk7-1.8.22-sources.jar!/" />
</SOURCES>
</library>
</component>

View File

@@ -1,13 +0,0 @@
<component name="libraryTable">
<library name="jetbrains.kotlin.test1" type="repository">
<properties maven-id="org.jetbrains.kotlin:kotlin-test:1.8.22" />
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-test/1.8.22/kotlin-test-1.8.22.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib/1.8.22/kotlin-stdlib-1.8.22.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-common/1.8.22/kotlin-stdlib-common-1.8.22.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/annotations/13.0/annotations-13.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</component>

View File

@@ -1,13 +0,0 @@
<component name="libraryTable">
<library name="jxinput-1.0.0">
<CLASSES>
<root url="jar://$PROJECT_DIR$/lib/jxinput-1.0.0.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$PROJECT_DIR$/lib/jxinput-1.0.0-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$PROJECT_DIR$/lib/jxinput-1.0.0-sources.jar!/" />
</SOURCES>
</library>
</component>

26
.idea/libraries/lib.xml generated Normal file
View File

@@ -0,0 +1,26 @@
<component name="libraryTable">
<library name="lib">
<CLASSES>
<root url="file://$PROJECT_DIR$/lib" />
</CLASSES>
<JAVADOC>
<root url="file://$PROJECT_DIR$/lib/javadoc" />
<root url="http://libgdx.badlogicgames.com/nightlies/docs/api/" />
<root url="https://libgdx.badlogicgames.com/ci/nightlies/docs/api/" />
<root url="jar://$PROJECT_DIR$/lib/javadoc/gdx-docs.zip!/" />
</JAVADOC>
<NATIVE>
<root url="file://$PROJECT_DIR$/lib" />
<root url="file://$PROJECT_DIR$/lib/x86" />
<root url="file://$PROJECT_DIR$/lib/x86_64" />
</NATIVE>
<SOURCES>
<root url="file://$PROJECT_DIR$/lib/source" />
<root url="jar://$PROJECT_DIR$/lib/Terrarum_Joise.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/source/gdx-backend-lwjgl-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/TerrarumSansBitmap.jar!/" />
</SOURCES>
<jarDirectory url="file://$PROJECT_DIR$/lib" recursive="false" />
<jarDirectory url="file://$PROJECT_DIR$/lib/source" recursive="false" type="SOURCES" />
</library>
</component>

View File

@@ -1,14 +0,0 @@
<component name="libraryTable">
<library name="org.apache.commons:commons-csv:1.8" type="repository">
<properties maven-id="org.apache.commons:commons-csv:1.8" />
<CLASSES>
<root url="jar://$PROJECT_DIR$/lib/commons-csv-1.8.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$PROJECT_DIR$/lib/commons-csv-1.8-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$PROJECT_DIR$/lib/commons-csv-1.8-sources.jar!/" />
</SOURCES>
</library>
</component>

View File

@@ -1,11 +0,0 @@
<component name="libraryTable">
<library name="prtree">
<CLASSES>
<root url="jar://$PROJECT_DIR$/lib/prtree.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$PROJECT_DIR$/lib/prtree.jar!/" />
</SOURCES>
</library>
</component>

View File

@@ -1,8 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="MarkdownExportedFiles">
<htmlFiles />
<imageFiles />
<otherFiles />
</component>
</project>

5
.idea/misc.xml generated
View File

@@ -38,10 +38,7 @@
<property name="caretWidth" class="java.lang.Integer" />
</properties>
</component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="17" project-jdk-type="JavaSDK">
<component name="ProjectRootManager" version="2" languageLevel="JDK_X" default="false" project-jdk-name="13-incubate" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/out" />
</component>
<component name="SuppressKotlinCodeStyleNotification">
<option name="disableForAll" value="true" />
</component>
</project>

8
.idea/modules.xml generated
View File

@@ -1,13 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ModuleRenamingHistory">
<module old-name="terrarum" new-name="TerrarumBuild" />
</component>
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/ModuleComputers/ModuleComputers.iml" filepath="$PROJECT_DIR$/ModuleComputers/ModuleComputers.iml" />
<module fileurl="file://$PROJECT_DIR$/MusicPlayer/MusicPlayer.iml" filepath="$PROJECT_DIR$/MusicPlayer/MusicPlayer.iml" />
<module fileurl="file://$PROJECT_DIR$/TerrarumBuild.iml" filepath="$PROJECT_DIR$/TerrarumBuild.iml" />
<module fileurl="file://$PROJECT_DIR$/ingamemodule_basegame/ingamemodule_basegame.iml" filepath="$PROJECT_DIR$/ingamemodule_basegame/ingamemodule_basegame.iml" />
<module fileurl="file://$PROJECT_DIR$//terrarum.iml" filepath="$PROJECT_DIR$//terrarum.iml" group="terrarum" />
</modules>
</component>
</project>

View File

@@ -1,11 +0,0 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="Build Version Number" type="Application" factoryName="Application">
<option name="ALTERNATIVE_JRE_PATH" value="17" />
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="true" />
<option name="MAIN_CLASS_NAME" value="net.torvald.terrarum.PrebuildKt" />
<module name="TerrarumBuild" />
<method v="2">
<option name="Make" enabled="true" />
</method>
</configuration>
</component>

View File

@@ -1,19 +0,0 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="Principii" type="Application" factoryName="Application" nameIsGenerated="true">
<option name="MAIN_CLASS_NAME" value="net.torvald.terrarum.Principii" />
<module name="TerrarumBuild" />
<extension name="coverage">
<pattern>
<option name="PATTERN" value="net.torvald.terrarum.*" />
<option name="ENABLED" value="true" />
</pattern>
</extension>
<method v="2">
<option name="BuildArtifacts" enabled="true">
<artifact name="ModuleComputers" />
<artifact name="TerrarumBuild" />
</option>
<option name="Make" enabled="true" />
</method>
</configuration>
</component>

View File

@@ -1,11 +0,0 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="QuickDirtyLint" type="Application" factoryName="Application">
<option name="ALTERNATIVE_JRE_PATH" value="17" />
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="true" />
<option name="MAIN_CLASS_NAME" value="net.torvald.terrarum.QuickDirtyLintKt" />
<module name="TerrarumBuild" />
<method v="2">
<option name="Make" enabled="true" />
</method>
</configuration>
</component>

View File

@@ -1,15 +0,0 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="SpriteAssemblerApp" type="JarApplication">
<option name="JAR_PATH" value="$PROJECT_DIR$/out/SpriteAssemblerApp.jar" />
<option name="VM_PARAMETERS" value="-ea" />
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="true" />
<option name="ALTERNATIVE_JRE_PATH" value="17" />
<module name="TerrarumBuild" />
<method v="2">
<option name="BuildArtifacts" enabled="true">
<artifact name="SpriteAssemblerApp" />
</option>
</method>
</configuration>
</component>

View File

@@ -1,19 +0,0 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="Terrarum" type="JarApplication">
<option name="JAR_PATH" value="$PROJECT_DIR$/out/TerrarumBuild.jar" />
<option name="VM_PARAMETERS" value="-ea -Dswing.aatext=true -Dawt.useSystemAAFontSettings=lcd" />
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="true" />
<option name="ALTERNATIVE_JRE_PATH" value="17" />
<module name="TerrarumBuild" />
<method v="2">
<option name="RunConfigurationTask" enabled="true" run_configuration_name="Build Version Number" run_configuration_type="Application" />
<option name="BuildArtifacts" enabled="true">
<artifact name="ModuleComputers" />
<artifact name="MusicPlayer" />
<artifact name="TerrarumBuild" />
</option>
<option name="RunConfigurationTask" enabled="false" run_configuration_name="QuickDirtyLint" run_configuration_type="Application" />
</method>
</configuration>
</component>

View File

@@ -1,19 +0,0 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="Terrarum (no DEV MODE)" type="JarApplication">
<option name="JAR_PATH" value="$PROJECT_DIR$/out/TerrarumBuild.jar" />
<option name="VM_PARAMETERS" value="-Dswing.aatext=true -Dawt.useSystemAAFontSettings=lcd" />
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="true" />
<option name="ALTERNATIVE_JRE_PATH" value="17" />
<module name="TerrarumBuild" />
<method v="2">
<option name="RunConfigurationTask" enabled="true" run_configuration_name="Build Version Number" run_configuration_type="Application" />
<option name="BuildArtifacts" enabled="true">
<artifact name="ModuleComputers" />
<artifact name="MusicPlayer" />
<artifact name="TerrarumBuild" />
</option>
<option name="RunConfigurationTask" enabled="true" run_configuration_name="QuickDirtyLint" run_configuration_type="Application" />
</method>
</configuration>
</component>

View File

@@ -1,4 +1,6 @@
Copyright (C) 2013-2024 Minjae Song ("CuriousTorvald")
*Terrarum*
Copyright (C) 2013-2019 Minjaesong (Torvald)
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -12,3 +14,166 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
----
*Terrarum Sans Bitmap*
Copyright (c) 2017-2019 Minjae Song (Torvald) and the contributors
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
----
*Simplex Noise Generator*, version 2012-03-09 by Stefan Gustavson
Released as public domain
----
*Joise*
Copyright (C) 2013 Jason Taylor
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*Accidental Noise Library*
Joise is a derivative work based on Josua Tippetts' C++ library:
http://accidentalnoise.sourceforge.net/index.html
Copyright (C) 2011 Joshua Tippetts
This software is provided 'as-is', without any express or implied
warranty. In no event will the authors be held liable for any damages
arising from the use of this software.
Permission is granted to anyone to use this software for any purpose,
including commercial applications, and to alter it and redistribute it
freely, subject to the following restrictions:
1. The origin of this software must not be misrepresented; you must not
claim that you wrote the original software. If you use this software
in a product, an acknowledgment in the product documentation would be
appreciated but is not required.
2. Altered source versions must be plainly marked as such, and must not be
misrepresented as being the original software.
3. This notice may not be removed or altered from any source distribution.
----
*Vector2.java*, *Epsilon.java*
Copyright (c) 2010-2015 William Bittle http://www.dyn4j.org/
All rights reserved.
Redistribution and use in source and binary forms, with or without modification, are permitted
provided that the following conditions are met:
* Redistributions of source code must retain the above copyright notice, this list of conditions
and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright notice, this list of conditions
and the following disclaimer in the documentation and/or other materials provided with the
distribution.
* Neither the name of dyn4j nor the names of its contributors may be used to endorse or
promote products derived from this software without specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
Kotlin translated and modified code Copyright (C) 2016 Minjaesong (Torvald)
----
Ambient sound recordings:
ambient_forest_01.ogg
ambient_meadow_01.ogg
ambient_windy_01.ogg
ambient_woods_01.ogg
crickets_01.ogg
crickets_02.ogg
Copyright (C) 2012, 2013, 2015, 2016, 2017 Klankbeeld
Sound from http://www.freesound.org/people/klankbeeld/
----
LuaJ
Copyright (c) 2007 LuaJ. All rights reserved.
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
----
Some of the resources were created by _raxod502_.
Copyright (c) 2016 Radon Rosborough
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.

View File

@@ -1,22 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="ModuleComputersLib" level="project" />
<orderEntry type="module" module-name="TerrarumBuild" scope="PROVIDED" />
<orderEntry type="library" scope="PROVIDED" name="graalvm-js 22.3.1" level="project" />
<orderEntry type="library" scope="PROVIDED" name="TerrarumSansBitmap" level="project" />
<orderEntry type="library" scope="PROVIDED" name="badlogicgames.gdx" level="project" />
<orderEntry type="library" scope="PROVIDED" name="badlogicgames.gdx.backend.lwjgl3" level="project" />
<orderEntry type="library" scope="PROVIDED" name="KotlinJavaRuntime" level="project" />
<orderEntry type="library" scope="PROVIDED" name="jetbrains.kotlin.reflect" level="project" />
<orderEntry type="library" scope="PROVIDED" name="jetbrains.kotlin.test" level="project" />
<orderEntry type="library" scope="PROVIDED" name="io.airlift.aircompressor" level="project" />
<orderEntry type="library" scope="PROVIDED" name="jetbrains.kotlin.test1" level="project" />
</component>
</module>

Binary file not shown.

View File

@@ -1,11 +0,0 @@
/**
* Created by minjaesong on 2022-02-27.
*/
module ModuleComputers {
requires gdx;
requires Terrarum;
requires TerrarumSansBitmap;
requires kotlin.stdlib;
requires kotlin.coroutines.core;
requires TerrarumTSVM;
}

View File

@@ -1,21 +0,0 @@
package net.torvald.terrarum.modulecomputers
import net.torvald.terrarum.ModMgr
import net.torvald.terrarum.ModuleEntryPoint
/**
* Created by minjaesong on 2021-12-03.
*/
class EntryPoint : ModuleEntryPoint() {
private val moduleName = "dwarventech"
override fun invoke() {
ModMgr.GameItemLoader.invoke(moduleName)
println("[${moduleName[0].toUpperCase()}${moduleName.substring(1)}] Dirtboard(tm) go drrrrr")
}
override fun dispose() {
}
}

View File

@@ -1,35 +0,0 @@
package net.torvald.terrarum.modulecomputers.console
import com.badlogic.gdx.Gdx
import net.torvald.gdx.graphics.PixmapIO2
import net.torvald.spriteanimation.SpriteAnimation
import net.torvald.terrarum.App
import net.torvald.terrarum.Terrarum
import net.torvald.terrarum.console.ConsoleCommand
import net.torvald.terrarum.console.Echo
import net.torvald.terrarumsansbitmap.gdx.TextureRegionPack
/**
* Created by minjaesong on 2022-02-27.
*/
internal object Dumpsprite : ConsoleCommand {
override fun execute(args: Array<String>) {
val player = Terrarum.ingame!!.actorNowPlaying!!.sprite!!
val field = SpriteAnimation::class.java.getDeclaredField("textureRegion")
field.isAccessible = true
val textureRegion = field.get(player) as TextureRegionPack
val texture = textureRegion.texture.textureData
val pixmap = texture.consumePixmap()
PixmapIO2.writeTGA(Gdx.files.absolute("${App.defaultDir}/Exports/PlayerTexture.tga"), pixmap, false)
}
override fun printUsage() {
Echo("A spear to test the ingame's shield")
}
}

View File

@@ -1,125 +0,0 @@
package net.torvald.terrarum.modulecomputers.gameactors
import com.badlogic.gdx.utils.Disposable
import net.torvald.terrarum.*
import net.torvald.terrarum.TerrarumAppConfiguration.TILE_SIZE
import net.torvald.terrarum.gameactors.AVKey
import net.torvald.terrarum.modulebasegame.gameactors.BlockBox
import net.torvald.terrarum.modulebasegame.gameactors.FixtureBase
import net.torvald.terrarum.modulebasegame.gameactors.FixtureInventory
import net.torvald.terrarum.modulecomputers.ui.UIHomeComputer
import net.torvald.tsvm.*
import net.torvald.tsvm.peripheral.AdapterConfig
import net.torvald.tsvm.peripheral.GraphicsAdapter
import net.torvald.tsvm.peripheral.VMProgramRom
/**
* Created by minjaesong on 2021-12-04.
*/
class FixtureHomeComputer : FixtureBase {
// TODO: write serialiser for TSVM && allow mods to have their own serialiser
private val vm = VM(ModMgr.getGdxFile("dwarventech", "bios").path(), 0x200000, TheRealWorld(), arrayOf(
VMProgramRom(ModMgr.getGdxFile("dwarventech", "bios/tsvmbios.js").path())
))
@Transient private lateinit var vmRunner: VMRunner
// @Transient private lateinit var coroutineJob: Job
@Transient private var vmStarted = false
@Transient private lateinit var disposableObj: Disposable
constructor() : super(
BlockBox(BlockBox.NO_COLLISION, 1, 1),
mainUI = UIHomeComputer(),
inventory = FixtureInventory(40, FixtureInventory.CAPACITY_MODE_COUNT),
nameFun = { "Computer" }
) {
density = 1400.0
setHitboxDimension(TerrarumAppConfiguration.TILE_SIZE, TerrarumAppConfiguration.TILE_SIZE, 0, 0)
makeNewSprite(FixtureBase.getSpritesheet("dwarventech", "sprites/fixtures/desktop_computer.tga", TILE_SIZE, TILE_SIZE)).let {
it.setRowsAndFrames(1,1)
}
actorValue[AVKey.BASEMASS] = 20.0
val gpu = GraphicsAdapter(ModMgr.getGdxFile("dwarventech", "gui").path(), vm, GRAPHICSCONFIG)
// vm.getIO().blockTransferPorts[0].attachDevice(TestDiskDrive(vm, 0, ...))
vm.peripheralTable[1] = PeripheralEntry(
gpu,
GraphicsAdapter.VRAM_SIZE,
16,
0
)
vm.getPrintStream = { gpu.getPrintStream() }
vm.getErrorStream = { gpu.getErrorStream() }
vm.getInputStream = { gpu.getInputStream() }
(mainUI as UIHomeComputer).vm = vm
(mainUI as UIHomeComputer).fixture = this
vmRunner = VMRunnerFactory(ModMgr.getGdxFile("dwarventech", "bios").path(), vm, "js")
}
fun startVM() {
/*if (!vmStarted) {
vmStarted = true
coroutineJob = GlobalScope.launch {
vmRunner.executeCommand(vm.roms[0]!!.readAll())
}
disposableObj = Disposable {
vmRunner.close()
coroutineJob.cancel("fixture disposal")
vm.dispose()
}
INGAME.disposables.add(disposableObj)
}*/
}
fun stopVM() {
/*if (vmStarted) {
vmStarted = false
vmRunner.close()
coroutineJob.cancel("fixture disposal")
vm.dispose()
INGAME.disposables.remove(disposableObj)
}*/
}
override fun reload() {
super.reload()
val gpu = GraphicsAdapter(ModMgr.getGdxFile("dwarventech", "gui").path(), vm, GRAPHICSCONFIG)
// vm.getIO().blockTransferPorts[0].attachDevice(TestDiskDrive(vm, 0, ...))
vm.peripheralTable[1] = PeripheralEntry(
gpu,
GraphicsAdapter.VRAM_SIZE,
16,
0
)
vm.getPrintStream = { gpu.getPrintStream() }
vm.getErrorStream = { gpu.getErrorStream() }
vm.getInputStream = { gpu.getInputStream() }
(mainUI as UIHomeComputer).vm = vm
(mainUI as UIHomeComputer).fixture = this
vmRunner = VMRunnerFactory(ModMgr.getGdxFile("dwarventech", "bios").path(), vm, "js")
}
companion object {
val GRAPHICSCONFIG = AdapterConfig(
"crt_color",
560, 448, 80, 32, 253, 255, 256 shl 10, "FontROM7x14.tga", 0.0f, GraphicsAdapter.TEXT_TILING_SHADER_COLOUR
)
}
}

View File

@@ -1,28 +0,0 @@
package net.torvald.terrarum.modulecomputers.gameitems
import com.badlogic.gdx.graphics.g2d.TextureRegion
import net.torvald.terrarum.Terrarum
import net.torvald.terrarum.TerrarumAppConfiguration
import net.torvald.terrarum.gameactors.ActorWithBody
import net.torvald.terrarum.gameitems.GameItem
import net.torvald.terrarum.gameitems.ItemID
import net.torvald.terrarum.gameitems.mouseInInteractableRange
import net.torvald.terrarum.itemproperties.Material
import net.torvald.terrarum.modulebasegame.gameactors.IngamePlayer
import net.torvald.terrarum.modulebasegame.gameitems.FixtureItemBase
import net.torvald.terrarum.modulecomputers.gameactors.FixtureHomeComputer
/**
* Created by minjaesong on 2021-12-04.
*/
class ItemHomeComputer(originalID: ItemID) : FixtureItemBase(originalID, "net.torvald.terrarum.modulecomputers.gameactors.FixtureHomeComputer") {
override var dynamicID: ItemID = originalID
override var baseMass = 20.0
override val isDynamic = false
override val materialId = ""
override val itemImage: TextureRegion
get() = FixtureItemBase.getItemImageFromSheet("dwarventech", "sprites/fixtures/desktop_computer.tga", TerrarumAppConfiguration.TILE_SIZE, TerrarumAppConfiguration.TILE_SIZE)
override var baseToolSize: Double? = baseMass
override var originalName = "ITEM_DESKTOP_COMPUTER"
}

View File

@@ -1,149 +0,0 @@
package net.torvald.terrarum.modulecomputers.gameitems
import com.badlogic.gdx.graphics.Camera
import com.badlogic.gdx.graphics.Color
import com.badlogic.gdx.graphics.OrthographicCamera
import com.badlogic.gdx.graphics.g2d.SpriteBatch
import com.badlogic.gdx.graphics.g2d.TextureRegion
import com.badlogic.gdx.utils.Disposable
import net.torvald.terrarum.*
import net.torvald.terrarum.gameactors.ActorWithBody
import net.torvald.terrarum.gameitems.GameItem
import net.torvald.terrarum.gameitems.ItemID
import net.torvald.terrarum.itemproperties.Material
import net.torvald.terrarum.modulebasegame.TerrarumIngame
import net.torvald.terrarum.modulebasegame.gameitems.FixtureItemBase
import net.torvald.terrarum.modulecomputers.tsvmperipheral.WorldRadar
import net.torvald.terrarum.ui.Toolkit
import net.torvald.terrarum.ui.UICanvas
import net.torvald.tsvm.*
import net.torvald.tsvm.peripheral.ExtDisp
import net.torvald.tsvm.peripheral.VMProgramRom
/**
* Created by minjaesong on 2021-12-03.
*/
class ItemWearableWorldRadar(originalID: String) {// : GameItem(originalID) {
/*
override var dynamicID: ItemID = originalID
override val originalName = "ITEM_COMPUTER_DIRTBOARD_FAKETM"
override var baseMass = 2.0
override var stackable = true
override var inventoryCategory = Category.TOOL
override val isUnique = false
override val isDynamic = true
override val materialId = ""
override val itemImage: TextureRegion
get() = FixtureItemBase.getItemImageFromSingleImage("basegame", "sprites/fixtures/signal_source.tga")
override var baseToolSize: Double? = baseMass
private val vm = VM(ModMgr.getGdxFile("dwarventech", "bios").path(), 73728, TheRealWorld(), arrayOf(
VMProgramRom(ModMgr.getGdxFile("dwarventech", "bios/pipboot.rom").path()),
VMProgramRom(ModMgr.getGdxFile("dwarventech", "bios/pipcode.bas").path())
))
private val ui = WearableWorldRadarUI(vm)
// FIXME initialise computer stuff when the Item is first used, not when it's registered by the Modmgr
init {
super.equipPosition = EquipPosition.HAND_GRIP
}
private var booted = false
private var disposed = false
private lateinit var vmRunner: VMRunner
private lateinit var coroutineJob: Job
init {
App.disposables.add(ui)
}
private fun boot() {
vm.getIO().blockTransferPorts[1].attachDevice(WorldRadar())
vm.peripheralTable[1] = PeripheralEntry(
ExtDisp(vm, 160, 140), 32768, 1, 0
)
// MMIO stops working when somethingStream is not defined
vm.getPrintStream = { System.out }
vm.getErrorStream = { System.err }
vm.getInputStream = { System.`in` }
vmRunner = VMRunnerFactory(ModMgr.getGdxFile("dwarventech", "bios").path(), vm, "js")
coroutineJob = GlobalScope.launch {
vmRunner.executeCommand(vm.roms[0]!!.readAll())
}
INGAME.disposables.add(Disposable {
closeVM()
})
booted = true
}
private fun closeVM() {
if (!disposed) {
vmRunner.close()
coroutineJob.cancel("item disposal")
vm.dispose()
}
disposed = true
booted = false
}
override fun effectWhileEquipped(actor: ActorWithBody, delta: Float) {
if (!booted) {
booted = true
boot()
}
(Terrarum.ingame!! as TerrarumIngame).wearableDeviceUI = ui
}
override fun effectOnUnequip(actor: ActorWithBody, delta: Float) {
(Terrarum.ingame!! as TerrarumIngame).wearableDeviceUI = null
closeVM()
}
*/
}
class WearableWorldRadarUI(val device: VM) : UICanvas() {
override var width = 160
override var height = 140
override var openCloseTime = 0f
override fun updateUI(delta: Float) {
device.update(delta)
}
override fun renderUI(frameDelta: Float, batch: SpriteBatch, camera: OrthographicCamera) {
batch.end()
batch.color = Color.WHITE
(device.peripheralTable[1].peripheral as? ExtDisp)?.render(batch, posX.toFloat(), posY.toFloat())
batch.begin()
batch.color = Toolkit.Theme.COL_INACTIVE
Toolkit.drawBoxBorder(batch, posX - 1, posY - 1, width + 2, height + 2)
}
override fun doOpening(delta: Float) {
}
override fun doClosing(delta: Float) {
}
override fun endOpening(delta: Float) {
}
override fun endClosing(delta: Float) {
}
override fun dispose() {
}
}

View File

@@ -1,137 +0,0 @@
package net.torvald.terrarum.modulecomputers.tsvmperipheral
import net.torvald.terrarum.Point2i
import net.torvald.terrarum.Terrarum
import net.torvald.terrarum.blockproperties.Block
import net.torvald.tsvm.VM
import net.torvald.tsvm.peripheral.BlockTransferInterface
import net.torvald.tsvm.peripheral.TestDiskDrive
import net.torvald.tsvm.peripheral.trimNull
import java.io.ByteArrayOutputStream
/**
* Created by minjaesong on 2021-12-02.
*/
class WorldRadar : BlockTransferInterface(false, true) {
private val W = 160
private val H = 140
private val AIR_OUT = 0.toByte()
private val GRASS_OUT = 2.toByte()
private val DIRT_OUT = 4.toByte()
private val STONE_OUT = 7.toByte()
init {
statusCode = TestDiskDrive.STATE_CODE_STANDBY
}
private val messageComposeBuffer = ByteArrayOutputStream(BLOCK_SIZE) // always use this and don't alter blockSendBuffer please
private var blockSendBuffer = ByteArray(1)
private var blockSendCount = 0
private fun resetBuf() {
blockSendCount = 0
messageComposeBuffer.reset()
}
override fun hasNext(): Boolean {
return (blockSendCount * BLOCK_SIZE < blockSendBuffer.size)
}
override fun startSendImpl(recipient: BlockTransferInterface): Int {
if (blockSendCount == 0) {
blockSendBuffer = messageComposeBuffer.toByteArray()
}
val sendSize = if (blockSendBuffer.size - (blockSendCount * BLOCK_SIZE) < BLOCK_SIZE)
blockSendBuffer.size % BLOCK_SIZE
else BLOCK_SIZE
recipient.writeout(ByteArray(sendSize) {
blockSendBuffer[blockSendCount * BLOCK_SIZE + it]
})
blockSendCount += 1
return sendSize
}
private var oldCmdbuf = HashMap<Int,Byte>(1024)
private fun getNearbyTilesPos(x: Int, y: Int): Array<Point2i> {
return arrayOf(
Point2i(x + 1, y),
Point2i(x, y + 1),
Point2i(x - 1, y),
Point2i(x, y - 1),
)
}
override fun writeoutImpl(inputData: ByteArray) {
val inputString = inputData.trimNull().toString(VM.CHARSET)
// prepare draw commands
/*
* draw command format:
*
* <Y> <X> <COL>
*
* marking rules:
*
* : exposed = has at least 1 nonsolid on 4 sides
*
* 1. exposed grass -> 2
* 2. exposed dirt -> 4
* 3. exposed stone -> 7
* 4. stone exposed to dirt/grass -> 7
*/
if (inputString.startsWith("POLL")) {
resetBuf()
val cmdbuf = HashMap<Int,Byte>(1024)
Terrarum.ingame?.let { ingame -> ingame.actorNowPlaying?.let {
val px = it.intTilewiseHitbox.canonicalX.toInt()
val py = it.intTilewiseHitbox.canonicalY.toInt()
for (yy in 1..H) {
for (xx in 1..W) {
val tx = px - (W/2) + xx
val ty = py - (H/2) + yy
val yx = (yy - 1).shl(8) or xx
val nearby = getNearbyTilesPos(tx, ty).map { ingame.world.getTileFromTerrain(it.x, it.y) } // up, left, right, down
val block = ingame.world.getTileFromTerrain(tx, ty)
val blockprop = Terrarum.blockCodex[block]
if (blockprop.isSolid) {
// TODO create extension function nearby.contains { predicate :: ItemID -> Boolean }
// for some reason I can't use material?
if (block == Block.GRASS && nearby.contains(Block.AIR)) {
cmdbuf[yx] = GRASS_OUT
}
else if (block == Block.DIRT && nearby.contains(Block.AIR)) {
cmdbuf[yx] = DIRT_OUT
}
else if (block == Block.STONE && (nearby.contains(Block.AIR) || nearby.contains(Block.GRASS) || nearby.contains(Block.DIRT))) {
cmdbuf[yx] = STONE_OUT
}
}
}
}
(oldCmdbuf.keys union cmdbuf.keys).sorted().forEach { key ->
val value = (cmdbuf[key] ?: AIR_OUT).toInt()
val x = key % 256
val y = key / 256
messageComposeBuffer.write(y)
messageComposeBuffer.write(x)
messageComposeBuffer.write(value)
}
oldCmdbuf = cmdbuf
}}
}
}
}

View File

@@ -1,90 +0,0 @@
package net.torvald.terrarum.modulecomputers.ui
import com.badlogic.gdx.Gdx
import com.badlogic.gdx.Input
import com.badlogic.gdx.graphics.*
import com.badlogic.gdx.graphics.g2d.SpriteBatch
import com.badlogic.gdx.graphics.glutils.FrameBuffer
import net.torvald.terrarum.*
import net.torvald.terrarum.langpack.Lang
import net.torvald.terrarum.modulecomputers.gameactors.FixtureHomeComputer
import net.torvald.terrarum.ui.Toolkit
import net.torvald.terrarum.ui.UICanvas
import net.torvald.tsvm.VM
import net.torvald.tsvm.peripheral.GraphicsAdapter
import net.torvald.unicode.*
internal class UIHomeComputer : UICanvas(
toggleKeyLiteral = null,
toggleButtonLiteral = "control_gamepad_start",
) {
override var width = 640
override var height = 480
override var openCloseTime = 0f
private val drawOffX = (width - 560).div(2).toFloat()
private val drawOffY = (height - 448).div(2).toFloat()
private var batch: FlippingSpriteBatch
private var camera: OrthographicCamera
internal lateinit var vm: VM
internal lateinit var fixture: FixtureHomeComputer
init {
batch = FlippingSpriteBatch()
camera = OrthographicCamera(width.toFloat(), height.toFloat())
//val m = Matrix4()
//m.setToOrtho2D(0f, 0f, width.toFloat(), height.toFloat())
batch.projectionMatrix = camera.combined
}
private val fbo = FrameBuffer(Pixmap.Format.RGBA8888, width, height, false)
private val controlHelp =
"${getKeycapPC(ControlPresets.getKey("control_key_inventory"))} ${Lang["GAME_ACTION_CLOSE"]}\u3000 " +
"$KEYCAP_CTRL$KEYCAP_SHIFT$KEYCAP_T$KEYCAP_R Terminate\u3000" +
"$KEYCAP_CTRL$KEYCAP_SHIFT$KEYCAP_R$KEYCAP_S Reset\u3000" +
"$KEYCAP_CTRL$KEYCAP_SHIFT$KEYCAP_R$KEYCAP_Q SysRq"
override fun updateUI(delta: Float) {
}
override fun renderUI(frameDelta: Float, otherBatch: SpriteBatch, otherCamera: OrthographicCamera) {
otherBatch.end()
fbo.inAction(camera, batch) {
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 ->
val clearCol = gpu.getBackgroundColour()
Gdx.gl.glClearColor(clearCol.r, clearCol.g, clearCol.b, clearCol.a)
Gdx.gl.glClear(GL20.GL_COLOR_BUFFER_BIT)
gpu.render(Gdx.graphics.deltaTime, batch, drawOffX, drawOffY, true, fbo) // gpu.render will internally end() the fbo then begin() again before using the batch I've fed in
}
}
otherBatch.begin()
otherBatch.shader = null
blendNormalStraightAlpha(otherBatch)
otherBatch.color = Color.WHITE
otherBatch.draw(fbo.colorBufferTexture, posX.toFloat(), posY.toFloat(), width.toFloat(), height.toFloat())
otherBatch.color = Toolkit.Theme.COL_INACTIVE
Toolkit.drawBoxBorder(otherBatch, posX - 1, posY - 1, width + 2, height + 2)
App.fontGame.draw(otherBatch, controlHelp, posX, posY + height + 4)
}
override fun doOpening(delta: Float) {
super.doOpening(delta)
fixture.startVM()
}
override fun dispose() {
fbo.dispose()
}
}

View File

@@ -1,18 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" scope="PROVIDED" name="jetbrains.kotlin.test" level="project" />
<orderEntry type="module" module-name="TerrarumBuild" scope="PROVIDED" />
<orderEntry type="library" scope="PROVIDED" name="badlogicgames.gdx" level="project" />
<orderEntry type="library" scope="PROVIDED" name="io.airlift.aircompressor" level="project" />
<orderEntry type="library" scope="PROVIDED" name="TerrarumSansBitmap" level="project" />
<orderEntry type="library" scope="PROVIDED" name="apache.commons.math3" level="project" />
<orderEntry type="library" scope="PROVIDED" name="jetbrains.kotlin.test1" level="project" />
</component>
</module>

View File

@@ -1,19 +0,0 @@
package net.torvald.terrarum.musicplayer
import net.torvald.terrarum.IngameInstance
import net.torvald.terrarum.ModMgr
import net.torvald.terrarum.ModuleEntryPoint
import net.torvald.terrarum.modulebasegame.TerrarumIngame
import net.torvald.terrarum.musicplayer.gui.MusicPlayer
/**
* Created by minjaesong on 2023-12-23.
*/
class EntryPoint : ModuleEntryPoint() {
override fun invoke() {
ModMgr.GameExtraGuiLoader.register { ingame: TerrarumIngame -> MusicPlayer(ingame) }
}
override fun dispose() {
}
}

View File

@@ -1,50 +1,72 @@
## Aperçu ##
This project is to create a modular game engine that accommodates a 2D side-scrolling tilemap platformer, and a game that runs on top of it.
This project is to create a side-view flatformer game, an attempt to create friendlier *Dwarf Fortress* adventurer mode, with more rogue-like stuff such as permanent death, randomness and *lots of fun*.
The project is divided into two parts: **Terrarum the Game Engine** and **Terrarum the actual game**.
Backend used is LWJGL/Slick2D, frontend — the Engine — is custom-built. The repository contains both frontend and the actual game, as well as documentation for the backends.
## Terrarum the Game Engine ##
This project mainly uses Kotlin as a main language and Python/Lua for tools.
This game engine aims to provide following features:
Documentations and resources for work (such as .psd) are also included in the repository. You will need Mac computer to read and edit documentations in .gcx and .numbers format. (we're planning to change them)
- Tiled lighting simulation with transmittance sim in full RGB and UV for fluorescence
- Corner Occlusion
- 2D Skeletal Sprite
- Built-in Mod support
- Simple AABB Physics
- Fluid simulation based on Cellular Automata
- Built-in multilingual font — please refer to [its own Repository](https://github.com/curioustorvald/Terrarum-sans-bitmap)
Any contribution in this project must be made sorely in English, Korean part is just there for my Korean friend; so be sure to use English in codes, comments, etc.
## Terrarum the Actual Game ##
## Setup ##
*Terrarum* is a side-view tilemap platformer-adventure-sandbox game.
* Requirements:
- JDK 8 or higher
- Working copy of IntelliJ IDEA from JetBrains s.r.o., community edition is okay to use.
* Required libraries are included in the repository.
## Player Setup ##
### System Requirements ###
Requires 64 bit processor and operation system.
| | Minimum | Recommended |
|---|---|---|
|OS|Windows 7/macOS Sierra/Ubuntu 16.04|Windows 10/macOS Big Sur/Linux with Kernel 5.4|
|CPU|AMD Phenom X4 9600/Intel Core 2 Duo E8400|AMD Ryzen 5 1500X/Intel Core i7-4770K/Apple M1|
|Memory|4 GB RAM|8 GB RAM|
|OpenGL|3.3|4.0|
|Graphics|GeForce 9600 GT|Anything that supports OpenGL 4.0|
|Storage|2 GB available|2 GB available but faster|
## The Engine ##
- Playing the game on the Minimum Requirement is ill advised: framerate will be sub-20 and the world generation will take more than 10 minutes
Please refer to [```THE_ENGINE.md```](THE_ENGINE.md).
## Development Environment ##
- Requirements:
- JDK 17 or higher
- IntelliJ IDEA Community Edition
## Contribution guidelines ##
Kotlin runtimes must be downloaded using the IntelliJ IDEA. All other libraries are included in the repository.
Please refer to [```CONTRIBUTING.md```](CONTRIBUTING.md).
## Who do I talk to? ##
* Repo owner or admin
* Other community or team contact
## Tags ##
* Rogue-like
* Adventure
* Procedural Generation
* Open World
* Sandbox
* Survival
* (Crafting)
* 2D
* Singleplayer
* Platformer
* (Atmospheric)
* Indie
* Pixel Graphics
## Disclaim ##
Just in case, use this software at your own risk.
The project includes modified version of the GraalVM-JS, in which the only difference is the `regex-22.3.1-edit.jar` is a modification of `regex-22.3.1.jar` where the only difference is its `MANIFEST.MD`
## Copyright ##
Please refer to [```COPYING.md```](COPYING.md) but it's mostly GPL 3.
Copyright 2015-2016 Torvald (skyhi14 _at_ icloud _dot_ com). All rights reserved. This game is proprietary until things are completed enough to be playable.
## 개요 ##
이 변변한 이름 없는 프로젝트는 사이드뷰 발판 게임 형식으로 더 친절한 〈드워프 포트리스〉의 모험가 모드를 지향하는 게임 제작 프로젝트입니다. 영구 사망, 무작위성, __넘쳐나는 재미__와 같이 ‘로그라이크’스러운 요소를 지닙니다.
이 프로젝트는 주 언어로 코틀린을 사용하며 파이선·루아 등으로 작성된 툴을 이용합니다.
개발 문서와 작업용 리소스(psd 등) 또한 이 저장소에 포함되어 있습니다. gcx와 numbers 형식으로 된 문서를 읽고 수정하기 위해 맥 컴퓨터가 필요할 수 있습니다.
이 프로젝트에 대한 기여는 영어로 이루어져야 합니다. 따라서 코드나 주석 등을 작성할 때는 영어를 사용해 주십시오.

View File

@@ -1,52 +1,21 @@
## Prefix-ID Referencing
Every blocks and items have Prefix-ID Referencing scheme, which is defined as follows:
```<Prefix>@<Modname>:<Integer ID>```
where Prefix is predefined (see below), Integer ID is arbitrarily chosen within a domain.
### Prefixes
|Name|Description|
|----|-----------|
|wall|Wall, only used by the Inventory to differentiate walls from blocks (therefore wall shares same "ID Space" with blocks)|
|item|Item (Static)|
|wire|Wires|
Notes:
- BlockCodex and ItemCodex will not store prefix part of the ID, as blocks and walls are identical in properties
- Wires and Fluids use the same "ID Space" as the tiles; they just happened to exclusive to their own layers.
This simplifies many things e.g. only one TileID-to-AtlasTileNumber map is needed and the renderer will
greatly benefit from it.
### Predefined Modnames
|Name|Description|
|----|-----------|
|dyn|Dynamic Item|
|actor|Actor As an Item. Integer ID is identical to the actor's Reference ID|
|virt|Virtual Tile Number|
### Integer ID Domains
|Range|Description|
|-----|-----------|
|1..2147483647|Integer ID for dynamic items|
|0x1000_0000..0x7FFF_FFFF|Reference ID for Actors (1879M possible)|
|1..2147483647|Integer ID for virtual tiles|
|0..4095|Tiles (4096 possible)|
|4096..8191|Walls (4096 possible)|
|8192..8447|Wires (256 possible)|
|8448..0x0F_FFFF|Items (static) (1M possible)|
|0x10_0000..0x0FFF_FFFF|Items (dynamic\*) (267M possible)|
|0x1000_0000..0x7FFF_FFFF|Actors (1879M possible)|
|-2147483648..-1 (all negative numbers)|Faction (2147M possible)|
* dynamic items have own properties that will persist through savegame.
Actor range in-depth
Actors range in-depth
|Range|Description|
|-----|-----------|
|0x1000_0000..0x1FFF_FFFF|Rendered behind (e.g. tapestries)|
|0x2000_0000..0x4FFF_FFFF|Regular actors (e.g. almost all of them)|
|0x5000_0000..0x5FFF_FFFF|Special (e.g. weapon swung, bullets, dropped item, particles)|
|0x6000_0000..0x6EFF_FFFF|Rendered front (e.g. fake tile)|
|0x6F00_0000..0x6FFE_FFFF|unassigned|
|0x6FFF_0000..0x6FFF_FFFF|Rendered front--wires|
|0x7000_0000..0x7FFF_FFFF|Rendered as screen overlay, not affected by light nor environment overlays|
Actor IDs are assigned in 256 groups, single actor can have 256 sub-actors
|0x6000_0000..0x6FFF_FFFF|Rendered front (e.g. fake tile)|
|0x7000_0000..0x7FFF_FFFF|Rendered as screen overlay, not affected by light nor environment overlays|

74
SAVE_FORMAT.md Normal file
View File

@@ -0,0 +1,74 @@
## Format ##
Contain everything on [TEVD](github.com/minjaesong/TerranVirtualDisk)
* Save meta
- binary
- Filename : world (with no extension)
|Type |Mnemonic |Description |
|----------|-----------|-----------------------------|
|Byte[4] |TESV |Magic |
|Byte[n] |name |Savegame name, UTF-8 |
|Byte |NULL |String terminator |
|Byte[8] |terraseed |Terrain seed |
|Byte[8] |rogueseed |Randomiser seed |
|Byte[4] |crc1 |CRC-32 of worldinfo1 entry |
|Byte[4] |crc2 |CRC-32 of worldinfo2 entry |
|Byte[4] |crc3 |CRC-32 of worldinfo3 entry |
|Byte[4] |crc4 |CRC-32 of worldinfo4 entry |
|Byte[32] |hash4321 |SHA-256 of crc4..crc3..crc2..crc1|
|Int |refid |Reference ID of the player |
|Long |time_t |Current world's time_t |
|Byte[6] |t_create |Creation time of the savefile in time_t|
|Byte[6] |t_lastacc |Last play time in time_t |
|Int |t_wasted |Total playtime in time_t |
Endianness: Big
each entry on the disk contains CRC of its data, we can compare CRC saved in meta && CRC of entry header && CRC of actual content
* Actor/Faction data
- GSON
- Filename : (refid) (with no extension)
* Prop data
- CSV
- Filename : (with no extension)
worldinfo2 -- tileprop
worldinfo3 -- itemprop
worldinfo4 -- materialprop
worldinfo5 -- modules loadorder
* Human-readable
- Tiles_list.txt -- list of tiles in csv
- Items_list.txt -- list of items in csv
- Materials_list.txt -- list of materials in csv
- load_order.txt -- module load order
## How it works ##
* If hash discrepancy has detected, (hash of csv in save dir != stored hash || hash of TEMD != stored hash), printout "Save file corrupted. Continue?" with prompt "Yes/No"
Directory:
+--- <save1.tevd>
--- 2a93bc5f (item ID) Actor/DynamicItem/Faction/etc. data (JSON)
--- 423bdc83 (item ID) Actor/DynamicItem/Faction/etc. data (JSON)
--- Items_list.txt Human-readable
--- Materials_list.txt Human-readable
--- Tiles_list.txt Human-readable
--- world save meta (binary)
--- worldinfo1 TEMD (binary)
--- worldinfo2 tileprop (CSV)
--- worldinfo3 itemprop (CSV)
--- worldinfo4 materialprop (CSV)
+--- computers
--- (UUID) virtual disk
+--- tapestries
--- (random Int) tapestry
Alongside with save1.tevd (extension should not exist in real game), keep save1.backup.tevd as a last-working save.

25
SYSTEM_REQUIREMENTS.md Normal file
View File

@@ -0,0 +1,25 @@
## Minimum requirements ##
* Processor with 2.4 GHz speed
* GPU that can support OpenGL 2.1, is capable of 4K texture
* 6 GB of RAM
* 4 GB of free disk space
* Windows Vista/Mac OS X Lion or higher (Mac OS X Snow Leopard is incompatible with a shader the game uses)
* PC: Java 8, Up-to-date graphics driver
## Recommended requirements ##
* Processor with 3.0 GHz speed, 4 threads available
* GPU that can support OpenGL 2.1, is capable of 4K texture
* 8 GB of RAM
* 8 GB of free disk space
* Windows Vista/Mac OS X Lion or higher
* PC: Java 8, Up-to-date graphics driver
## Tested environment ##
(to devs: please extend this list with your test results!)
* MacBookPro9,2 (MacBook Pro 13 inch mid-2012)
* Intel 6700K, nVidia GTX970, Windows 10

View File

@@ -1,33 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/net/torvald/terrarum/tests" isTestSource="true" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="GetCpuName-src" level="project" />
<orderEntry type="library" name="prtree" level="project" />
<orderEntry type="library" name="Terrarum_Joise" level="project" />
<orderEntry type="library" name="TerrarumSansBitmap" level="project" />
<orderEntry type="library" name="commons-codec:commons-codec:1.15" level="project" />
<orderEntry type="library" name="org.apache.commons:commons-csv:1.8" level="project" />
<orderEntry type="library" name="gdx-controllers-core-2.2.1" level="project" />
<orderEntry type="library" name="gdx-controllers-desktop-2.2.1" level="project" />
<orderEntry type="library" name="jxinput-1.0.0" level="project" />
<orderEntry type="library" name="gdx-platform-1.12.0-natives" level="project" />
<orderEntry type="library" name="graalvm-js 22.3.1" level="project" />
<orderEntry type="library" name="KotlinJavaRuntime" level="project" />
<orderEntry type="library" name="badlogicgames.gdx" level="project" />
<orderEntry type="library" name="badlogicgames.gdx.backend.lwjgl3" level="project" />
<orderEntry type="library" name="jetbrains.kotlin.reflect" level="project" />
<orderEntry type="library" name="jetbrains.kotlin.test" level="project" />
<orderEntry type="library" name="io.github.classgraph" level="project" />
<orderEntry type="library" name="apache.commons.math3" level="project" />
<orderEntry type="library" name="github.wendykierp.JTransforms" level="project" />
<orderEntry type="library" name="io.airlift.aircompressor" level="project" />
<orderEntry type="library" name="jetbrains.kotlin.test1" level="project" />
</component>
</module>

BIN
TerrarumBuild.jar Normal file

Binary file not shown.

BIN
assets/32opus_poke.ogg LFS Normal file

Binary file not shown.

14
assets/4096.frag Normal file
View File

@@ -0,0 +1,14 @@
varying vec4 v_color;
varying vec2 v_texCoords;
uniform sampler2D u_texture;
void main(void) {
vec4 color = texture2D(u_texture, v_texCoords).rgba;
color.r = floor(15.0 * color.r + 0.5) / 15.0;
color.g = floor(15.0 * color.g + 0.5) / 15.0;
color.b = floor(15.0 * color.b + 0.5) / 15.0;
// a: passthrough
gl_FragColor = color;
}

14
assets/4096.vert Normal file
View File

@@ -0,0 +1,14 @@
attribute vec4 a_position;
attribute vec4 a_color;
attribute vec2 a_texCoord0;
uniform mat4 u_projTrans;
varying vec4 v_color;
varying vec2 v_texCoords;
void main() {
v_color = a_color;
v_texCoords = a_texCoord0;
gl_Position = u_projTrans * a_position;
}

86
assets/4096_bayer.frag Normal file
View File

@@ -0,0 +1,86 @@
#version 120
#ifdef GL_ES
precision mediump float;
#endif
varying vec4 v_color;
varying vec2 v_texCoords;
uniform sampler2D u_texture;
// "steps" of R, G and B. Must be integer && equal or greater than 2
uniform float rcount = 64.0;
uniform float gcount = 64.0;
uniform float bcount = 64.0;
uniform float acount = 1.0;
/*int bayer[7 * 7] = int[](
32,42,10,27,37,5,15,
1,18,28,45,13,23,40,
26,36,4,14,31,48,9,
44,12,22,39,0,17,34,
20,30,47,8,25,35,3,
38,6,16,33,43,11,21,
7,24,41,2,19,29,46
); // I kind of accidentally create it...
float bayerSize = 7.0;*/
/*int bayer[9 * 9] = int[](
50,71,2,23,44,56,77,17,29,
72,12,33,45,66,6,18,39,60,
22,43,55,76,16,28,49,70,1,
53,65,5,26,38,59,80,11,32,
75,15,27,48,69,0,21,42,54,
25,37,58,79,10,31,52,64,4,
47,68,8,20,41,62,74,14,35,
78,9,30,51,63,3,24,36,57,
19,40,61,73,13,34,46,67,7
); // I kind of accidentally create it...
float bayerSize = 9.0;*/
//int bayer[25 * 25] = int[](165,530,106,302,540,219,477,100,231,417,314,223,424,37,207,434,326,22,448,338,111,454,523,278,579,334,19,410,495,57,352,158,318,598,109,509,157,524,282,606,83,225,539,163,234,607,313,206,71,470,251,608,216,135,275,609,415,29,451,204,397,21,373,107,462,348,482,120,362,508,33,147,572,388,142,447,77,345,565,439,104,215,546,279,69,567,311,585,258,177,17,266,601,55,428,270,461,331,26,560,164,271,486,186,16,336,457,150,342,471,245,161,56,396,496,555,385,146,321,190,526,97,182,511,297,429,553,49,374,536,263,575,43,501,124,368,538,450,121,309,84,210,449,561,79,356,610,256,378,58,105,315,156,244,423,118,183,408,220,611,15,198,293,596,221,375,581,39,238,500,287,14,437,139,595,227,403,590,478,68,612,295,517,87,312,413,515,78,433,13,476,134,340,414,160,466,213,547,324,456,542,141,12,335,214,357,11,381,242,469,159,265,383,176,545,285,197,503,108,576,51,387,98,200,34,358,489,277,570,96,441,554,123,534,52,556,112,605,330,70,392,613,28,288,361,232,602,300,502,267,102,195,399,152,484,264,166,289,427,192,298,407,25,249,520,114,233,444,543,170,498,131,452,66,562,310,586,54,531,346,42,614,354,23,588,491,151,468,353,187,483,369,153,85,425,10,276,371,174,420,32,459,222,304,136,421,103,458,230,339,67,260,578,93,544,9,280,594,327,248,582,472,50,615,254,537,359,91,600,475,212,525,168,558,128,455,370,179,301,405,209,467,48,442,127,355,184,332,481,126,286,175,436,273,31,377,306,36,412,294,616,8,473,60,603,116,347,532,191,568,61,522,90,218,391,592,62,514,122,552,149,617,241,513,81,202,272,557,333,226,507,255,72,305,402,229,418,296,551,7,411,317,236,416,337,480,64,389,132,350,487,404,89,162,435,44,419,618,113,505,20,604,138,465,188,493,133,580,6,169,259,320,548,193,593,40,178,512,364,591,144,319,196,386,261,351,205,384,76,269,38,349,208,504,440,99,490,5,426,243,322,574,281,4,237,460,527,3,549,155,577,47,533,316,619,394,519,82,268,325,566,199,299,119,529,75,400,125,492,344,86,217,308,463,80,395,284,474,117,201,95,235,422,620,143,45,372,597,453,343,185,479,247,569,171,409,584,129,365,239,488,94,224,438,559,283,541,18,194,401,516,262,148,41,250,621,24,329,92,446,27,291,485,35,622,180,535,379,30,341,443,145,363,494,246,101,445,550,390,499,115,432,521,211,623,253,528,189,430,307,53,323,130,624,172,46,589,292,63,599,328,203,74,290,181,376,274,140,393,59,367,88,380,137,506,252,571,431,240,497,382,228,464,167,398,2,573,366,518,1,583,73,563,303,510,154,564,257,587,65,406,173,0,360,110);
int bayer[14 * 14] = int[](131,187,8,78,50,18,134,89,155,102,29,95,184,73,22,86,113,171,142,105,34,166,9,60,151,128,40,110,168,137,45,28,64,188,82,54,124,189,80,13,156,56,7,61,186,121,154,6,108,177,24,100,38,176,93,123,83,148,96,17,88,133,44,145,69,161,139,72,30,181,115,27,163,47,178,65,164,14,120,48,5,127,153,52,190,58,126,81,116,21,106,77,173,92,191,63,99,12,76,144,4,185,37,149,192,39,135,23,117,31,170,132,35,172,103,66,129,79,3,97,57,159,70,141,53,94,114,20,49,158,19,146,169,122,183,11,104,180,2,165,152,87,182,118,91,42,67,25,84,147,43,85,125,68,16,136,71,10,193,112,160,138,51,111,162,26,194,46,174,107,41,143,33,74,1,101,195,15,75,140,109,90,32,62,157,98,167,119,179,59,36,130,175,55,0,150);
float bayerSize = 14.0;
float bayerDivider = bayerSize * bayerSize;
vec4 gammaIn(vec4 col) {
return pow(col, vec4(2.2));
}
vec4 gammaOut(vec4 col) {
return pow(col, vec4(1.0 / 2.2));
}
vec4 nearestColour(vec4 incolor) {
vec4 rgbaCounts = vec4(rcount, gcount, bcount, acount);
vec4 color = incolor;
color.r = floor((rgbaCounts.r - 1.0) * color.r + 0.5) / (rgbaCounts.r - 1.0);
color.g = floor((rgbaCounts.g - 1.0) * color.g + 0.5) / (rgbaCounts.g - 1.0);
color.b = floor((rgbaCounts.b - 1.0) * color.b + 0.5) / (rgbaCounts.b - 1.0);
color.a = 1.0;//floor((rgbaCounts.a - 1.0) * color.a + 0.5) / (rgbaCounts.a - 1.0);
return color;
}
void main(void) {
float spread = 1.0 / (0.299 * (rcount - 1.0) + 0.587 * (gcount - 1.0) + 0.114 * (bcount - 1.0)); // this spread value is optimised one -- try your own values for various effects!
// create texture coordinates based on pixelSize //
vec4 inColor = (texture2D(u_texture, v_texCoords));
vec2 entry = mod(gl_FragCoord.xy, vec2(bayerSize, bayerSize));
gl_FragColor = nearestColour(inColor + spread * (bayer[int(entry.y) * int(bayerSize) + int(entry.x)] / bayerDivider - 0.5));
//gl_FragColor = nearestColour(inColor);
//gl_FragColor = inColor;
}

View File

@@ -0,0 +1,97 @@
#version 120
#ifdef GL_ES
precision mediump float;
#endif
varying vec4 v_color;
varying vec2 v_texCoords;
uniform sampler2D u_texture;
uniform vec3 topColor;
uniform vec3 bottomColor;
uniform float parallax = 0.0; // +1.0: all top col, -1.0: all bototm col, 0.0: normal grad
uniform float parallax_size = 1.0/3.0; // 0: no parallax
// "steps" of R, G and B. Must be integer && equal or greater than 2
uniform float rcount = 64.0; // it even works on 256.0!
uniform float gcount = 64.0; // using 64: has less banding and most monitors are internally 6-bit
uniform float bcount = 64.0;
/*int bayer[7 * 7] = int[](
32,42,10,27,37,5,15,
1,18,28,45,13,23,40,
26,36,4,14,31,48,9,
44,12,22,39,0,17,34,
20,30,47,8,25,35,3,
38,6,16,33,43,11,21,
7,24,41,2,19,29,46
); // I kind of accidentally create it...
float bayerSize = 7.0;*/
/*int bayer[9 * 9] = int[](
50,71,2,23,44,56,77,17,29,
72,12,33,45,66,6,18,39,60,
22,43,55,76,16,28,49,70,1,
53,65,5,26,38,59,80,11,32,
75,15,27,48,69,0,21,42,54,
25,37,58,79,10,31,52,64,4,
47,68,8,20,41,62,74,14,35,
78,9,30,51,63,3,24,36,57,
19,40,61,73,13,34,46,67,7
); // I kind of accidentally create it...
float bayerSize = 9.0;*/
//int bayer[25 * 25] = int[](165,530,106,302,540,219,477,100,231,417,314,223,424,37,207,434,326,22,448,338,111,454,523,278,579,334,19,410,495,57,352,158,318,598,109,509,157,524,282,606,83,225,539,163,234,607,313,206,71,470,251,608,216,135,275,609,415,29,451,204,397,21,373,107,462,348,482,120,362,508,33,147,572,388,142,447,77,345,565,439,104,215,546,279,69,567,311,585,258,177,17,266,601,55,428,270,461,331,26,560,164,271,486,186,16,336,457,150,342,471,245,161,56,396,496,555,385,146,321,190,526,97,182,511,297,429,553,49,374,536,263,575,43,501,124,368,538,450,121,309,84,210,449,561,79,356,610,256,378,58,105,315,156,244,423,118,183,408,220,611,15,198,293,596,221,375,581,39,238,500,287,14,437,139,595,227,403,590,478,68,612,295,517,87,312,413,515,78,433,13,476,134,340,414,160,466,213,547,324,456,542,141,12,335,214,357,11,381,242,469,159,265,383,176,545,285,197,503,108,576,51,387,98,200,34,358,489,277,570,96,441,554,123,534,52,556,112,605,330,70,392,613,28,288,361,232,602,300,502,267,102,195,399,152,484,264,166,289,427,192,298,407,25,249,520,114,233,444,543,170,498,131,452,66,562,310,586,54,531,346,42,614,354,23,588,491,151,468,353,187,483,369,153,85,425,10,276,371,174,420,32,459,222,304,136,421,103,458,230,339,67,260,578,93,544,9,280,594,327,248,582,472,50,615,254,537,359,91,600,475,212,525,168,558,128,455,370,179,301,405,209,467,48,442,127,355,184,332,481,126,286,175,436,273,31,377,306,36,412,294,616,8,473,60,603,116,347,532,191,568,61,522,90,218,391,592,62,514,122,552,149,617,241,513,81,202,272,557,333,226,507,255,72,305,402,229,418,296,551,7,411,317,236,416,337,480,64,389,132,350,487,404,89,162,435,44,419,618,113,505,20,604,138,465,188,493,133,580,6,169,259,320,548,193,593,40,178,512,364,591,144,319,196,386,261,351,205,384,76,269,38,349,208,504,440,99,490,5,426,243,322,574,281,4,237,460,527,3,549,155,577,47,533,316,619,394,519,82,268,325,566,199,299,119,529,75,400,125,492,344,86,217,308,463,80,395,284,474,117,201,95,235,422,620,143,45,372,597,453,343,185,479,247,569,171,409,584,129,365,239,488,94,224,438,559,283,541,18,194,401,516,262,148,41,250,621,24,329,92,446,27,291,485,35,622,180,535,379,30,341,443,145,363,494,246,101,445,550,390,499,115,432,521,211,623,253,528,189,430,307,53,323,130,624,172,46,589,292,63,599,328,203,74,290,181,376,274,140,393,59,367,88,380,137,506,252,571,431,240,497,382,228,464,167,398,2,573,366,518,1,583,73,563,303,510,154,564,257,587,65,406,173,0,360,110);
int bayer[14 * 14] = int[](131,187,8,78,50,18,134,89,155,102,29,95,184,73,22,86,113,171,142,105,34,166,9,60,151,128,40,110,168,137,45,28,64,188,82,54,124,189,80,13,156,56,7,61,186,121,154,6,108,177,24,100,38,176,93,123,83,148,96,17,88,133,44,145,69,161,139,72,30,181,115,27,163,47,178,65,164,14,120,48,5,127,153,52,190,58,126,81,116,21,106,77,173,92,191,63,99,12,76,144,4,185,37,149,192,39,135,23,117,31,170,132,35,172,103,66,129,79,3,97,57,159,70,141,53,94,114,20,49,158,19,146,169,122,183,11,104,180,2,165,152,87,182,118,91,42,67,25,84,147,43,85,125,68,16,136,71,10,193,112,160,138,51,111,162,26,194,46,174,107,41,143,33,74,1,101,195,15,75,140,109,90,32,62,157,98,167,119,179,59,36,130,175,55,0,150);
float bayerSize = 14.0;
float bayerDivider = bayerSize * bayerSize;
vec4 nearestColour(vec4 incolor) {
vec4 rgbaCounts = vec4(rcount, gcount, bcount, 1.0);
vec4 color = incolor;
color.r = floor((rgbaCounts.r - 1.0) * color.r + 0.5) / (rgbaCounts.r - 1.0);
color.g = floor((rgbaCounts.g - 1.0) * color.g + 0.5) / (rgbaCounts.g - 1.0);
color.b = floor((rgbaCounts.b - 1.0) * color.b + 0.5) / (rgbaCounts.b - 1.0);
color.a = 1.0;
return color;
}
void main(void) {
float spread = 1.0 / (0.299 * (rcount - 1.0) + 0.587 * (gcount - 1.0) + 0.114 * (bcount - 1.0)); // this spread value is optimised one -- try your own values for various effects!
float scale = v_texCoords.y * (1.0 - parallax_size) + (parallax_size / 2.0) + (parallax * parallax_size / 2.0);
float inR = mix(bottomColor.r, topColor.r, scale);
float inG = mix(bottomColor.g, topColor.g, scale);
float inB = mix(bottomColor.b, topColor.b, scale);
vec4 inColor = vec4(inR, inG, inB, 1.0);
vec2 entry = mod(gl_FragCoord.xy, vec2(bayerSize, bayerSize));
gl_FragColor = nearestColour(inColor + spread * (bayer[int(entry.y) * int(bayerSize) + int(entry.x)] / bayerDivider - 0.5));
}
/*
UV mapping coord.y
-+ <- 1.0 =
D| = // parallax of +1
i| = =
s| = // parallax of 0
p| = =
.| = // parallax of -1
-+ <- 0.0 =
*/

View File

@@ -1,20 +1,20 @@
#version 120
#ifdef GL_ES
precision mediump float;
#endif
in vec4 v_color;
in vec2 v_texCoords;
varying vec4 v_color;
varying vec2 v_texCoords;
uniform sampler2D u_texture; // world texture, has alpha value that is meaningful
uniform sampler2D tex1; // lightmap texture
uniform vec2 tex1Offset;
out vec4 fragColor;
void main() {
vec4 colorTex0 = texture(u_texture, v_texCoords); // world texture
vec4 colorTex1 = texture(tex1, v_texCoords); // lightmap (RGBA)
vec4 colorTex0 = texture2D(u_texture, v_texCoords); // world texture
vec4 colorTex1 = texture2D(tex1, v_texCoords); // lightmap (RGBA)
colorTex1 = vec4(colorTex1.www, 1.0);
fragColor = colorTex0 * colorTex1;
gl_FragColor = colorTex0 * colorTex1;
}

8
assets/aonly.frag Normal file
View File

@@ -0,0 +1,8 @@
varying vec4 v_color;
varying vec2 v_texCoords;
uniform sampler2D u_texture;
void main(void) {
vec3 alpha = texture2D(u_texture, v_texCoords).aaa;
gl_FragColor = vec4(alpha, 1.0);
}

BIN
assets/appicon128.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 462 B

BIN
assets/appicon16.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 366 B

BIN
assets/appicon256.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 559 B

BIN
assets/appicon32.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 387 B

BIN
assets/appicon64.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 418 B

18
assets/blendGlow.frag Normal file
View File

@@ -0,0 +1,18 @@
#version 120
#ifdef GL_ES
precision mediump float;
#endif
varying vec4 v_color;
varying vec2 v_texCoords;
uniform sampler2D u_texture; // world texture, has alpha value that is meaningful
uniform sampler2D tex1; // glow texture, SHOULD contain alpha of all 1.0
void main(void) {
vec4 colorTex0 = texture2D(u_texture, v_texCoords); // lightmap (RGB) pre-mixed
vec4 colorTex1 = texture2D(tex1, v_texCoords); // lightmap (A) pre-mixed
gl_FragColor = vec4(max(colorTex0.rgb, colorTex1.rgb), colorTex0.a);
}

View File

@@ -1,12 +1,11 @@
in vec4 a_position;
in vec4 a_color;
in vec2 a_texCoord0;
attribute vec4 a_position;
attribute vec4 a_color;
attribute vec2 a_texCoord0;
uniform mat4 u_projTrans; // camera.combined
out vec4 v_color;
out vec2 v_texCoords;
varying vec4 v_color;
varying vec2 v_texCoords;
void main() {
v_color = a_color;

View File

@@ -3,25 +3,25 @@
#endif
in vec4 v_color;
in vec2 v_texCoords;
varying vec4 v_color;
varying vec2 v_texCoords;
uniform sampler2D u_texture;
uniform vec2 iResolution;
uniform float flip;
uniform vec2 direction;
out vec4 fragColor;
vec4 blur(sampler2D image, vec2 uv, vec2 resolution, vec2 direction) {
vec4 color = vec4(0.0);
vec2 off1 = vec2(1.3846153846) * direction;
vec2 off2 = vec2(3.2307692308) * direction;
color += texture(image, uv) * 0.2270270270;
color += texture(image, uv + (off1 / resolution)) * 0.3162162162;
color += texture(image, uv - (off1 / resolution)) * 0.3162162162;
color += texture(image, uv + (off2 / resolution)) * 0.0702702703;
color += texture(image, uv - (off2 / resolution)) * 0.0702702703;
color += texture2D(image, uv) * 0.2270270270;
color += texture2D(image, uv + (off1 / resolution)) * 0.3162162162;
color += texture2D(image, uv - (off1 / resolution)) * 0.3162162162;
color += texture2D(image, uv + (off2 / resolution)) * 0.0702702703;
color += texture2D(image, uv - (off2 / resolution)) * 0.0702702703;
return color;
}
@@ -31,5 +31,5 @@ void main() {
uv.y = 1.0 - uv.y;
}
fragColor = blur(u_texture, uv, iResolution.xy, direction);
gl_FragColor = blur(u_texture, uv, iResolution.xy, direction);
}

View File

@@ -1,12 +1,11 @@
in vec4 a_position;
in vec4 a_color;
in vec2 a_texCoord0;
attribute vec4 a_position;
attribute vec4 a_color;
attribute vec2 a_texCoord0;
uniform mat4 u_projTrans;
out vec4 v_color;
out vec2 v_texCoords;
varying vec4 v_color;
varying vec2 v_texCoords;
void main() {
v_color = a_color;

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 MiB

Binary file not shown.

Binary file not shown.

View File

@@ -1,10 +1,11 @@
#version 120
#ifdef GL_ES
precision mediump float;
#endif
in vec4 v_color;
in vec2 v_texCoords;
varying vec4 v_color;
varying vec2 v_texCoords;
uniform sampler2D u_texture;
uniform vec2 resolution;
@@ -16,12 +17,11 @@ vec3 scanline_darkening = vec3(0.66, 0.66, 0.66);
uniform float alternative_scanline = 0.0; // 1.0: true
uniform float blur_blend = 0.5;
out vec4 fragColor;
void main(void) {
vec4 color = texture(u_texture, v_texCoords).rgba;
vec4 color_pre = texture(u_texture, (v_texCoords + (vec2(-1.0, 0.0) / resolution))).rgba;
vec4 color_next = texture(u_texture, (v_texCoords + (vec2( 1.0, 0.0) / resolution))).rgba;
vec4 color = texture2D(u_texture, v_texCoords).rgba;
vec4 color_pre = texture2D(u_texture, (v_texCoords + (vec2(-1.0, 0.0) / resolution))).rgba;
vec4 color_next = texture2D(u_texture, (v_texCoords + (vec2( 1.0, 0.0) / resolution))).rgba;
color = color * (1.0 - blur_blend) + color_pre * (blur_blend / 2.0) + color_next * (blur_blend / 2.0);
@@ -40,6 +40,6 @@ void main(void) {
out_color = out_color * scanline_darkening;
}
fragColor = vec4(out_color, 1);
//fragColor = texture(u_texture, v_texCoords);
gl_FragColor = vec4(out_color, 1);
//gl_FragColor = texture2D(u_texture, v_texCoords);
}

Binary file not shown.

Binary file not shown.

Before

Width:  |  Height:  |  Size: 132 B

After

Width:  |  Height:  |  Size: 6.7 MiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 132 B

After

Width:  |  Height:  |  Size: 6.9 MiB

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

BIN
assets/graphics/fonts/terrarum-sans-bitmap/ascii_variable.tga LFS Executable file → Normal file

Binary file not shown.

View File

Some files were not shown because too many files have changed in this diff Show More