Sancaros/phantasmal-world
1
0
Fork 0
mirror of https://github.com/DaanVandenBosch/phantasmal-world.git synced 2025-04-05 23:38:30 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
625 Commits 6 Branches 1 Tag 210 MiB
9765449564
Commit Graph

314 Commits

Author SHA1 Message Date
Daan Vanden Bosch
f8a9c65086 NPC wave numbers are now shown in the entity info view. 2019-12-21 15:56:24 +01:00
Daan Vanden Bosch
ccf8ea6630 ASM editor is now readonly when necessary again. 2019-12-21 14:33:14 +01:00
Daan Vanden Bosch
202c01bf25 Added support for p_dead_v3 opcode. 2019-12-20 21:13:59 +01:00
Daan Vanden Bosch
02332929af Fixed conditional jump instructions. Floor-local threads are now started up but not yet terminated when necessary. 2019-12-20 21:03:15 +01:00
Daan Vanden Bosch
8e0b7abc52 The current stepping line is now automatically scrolled into view. 2019-12-20 18:26:16 +01:00
Daan Vanden Bosch
e4dda8c1c7 Added key bindings for debugging actions. 2019-12-20 18:20:02 +01:00
Daan Vanden Bosch
c7cbc4a377 Stepping over sync calls works now. 2019-12-20 18:08:04 +01:00
Daan Vanden Bosch
027b50d3e4 Fixed sync calls and step out now works too. 2019-12-20 17:57:34 +01:00
Daan Vanden Bosch
714a2b500e Removed unnecessary code. 2019-12-20 16:11:45 +01:00
Daan Vanden Bosch
663ad75435 Debugging now happens in the VM itself, this simplifies the code. 2019-12-20 16:10:50 +01:00
Daan Vanden Bosch
352365170f Fixed bug that resulted in the starting floor's floor_handler to run too early. 2019-12-20 00:32:56 +01:00
Daan Vanden Bosch
3fee246bd8 Fixed a bug in game state reset when debugging. 2019-12-20 00:22:41 +01:00
Daan Vanden Bosch
f8fc12c468 Fixed some bugs and added VM support for bb_map_designate. 2019-12-20 00:11:54 +01:00
Daan Vanden Bosch
aa0d398545 The floor handler for the initial area is now run when running a quest. 2019-12-19 22:14:59 +01:00
Daan Vanden Bosch
17daa26fb3 Area geometry in editor 3D view no longer disappears when running a quest. 2019-12-19 21:11:48 +01:00
Daan Vanden Bosch
52f2ddccd2 Virtual machine now suspends instead of halts when there no threads anymore. 2019-12-19 20:45:02 +01:00
Daan Vanden Bosch
88a60a9223 Area selection is now enabled even when running a quest. 2019-12-19 20:11:12 +01:00
Daan Vanden Bosch
c1b733cadf Entity controls are now disabled when running a quest. 2019-12-19 20:02:52 +01:00
Daan Vanden Bosch
1c48ca15ec Removed unnecessary console.log statement. 2019-12-19 18:54:38 +01:00
Daan Vanden Bosch
20885cb0f2 Simplified Widget.finalize_construction. Added game state to QuestRunner and modified execution flow to enable loading of area/entity models. Split QuestModelManager into two different classes so a different loading strategy can used in the quest runner view. Quest runner view is now automatically created when running a quest. 2019-12-19 18:54:01 +01:00
Daan Vanden Bosch
4d6bf4ba5c Fixed VM unit tests. 2019-12-19 14:41:31 +01:00
Daan Vanden Bosch
0585bbacec Removed VM dependency on QuestModel. 2019-12-19 14:35:13 +01:00
Daan Vanden Bosch
3714f5582a Renamed ZeroableBuffer to Memory and put it into its own file. 2019-12-19 13:58:11 +01:00
Daan Vanden Bosch
fcff6a2cd6 Almost all quest editor UI elements are now disabled when running a quest in the VM. 2019-12-19 00:11:42 +01:00
Daan Vanden Bosch
3bd3be8c4a Moved Thread to its own file and renamed vm/index.ts to vm/VirtualMachine.ts. 2019-12-18 23:40:38 +01:00
Daan Vanden Bosch
786e83ad99 Put breakpoints in script editor gutter behind feature flag. 2019-12-18 23:03:29 +01:00
Daan Vanden Bosch
86187a0539 Fixed bug in script editor that would add breakpoints whenever a line was deleted. 2019-12-18 22:58:46 +01:00
Daan Vanden Bosch
46b62cfaf7 Stack arguments are now always popped, even if an opcode is not implemented. 2019-12-18 22:47:53 +01:00
Daan Vanden Bosch
2366cb3aa0 Refactored script debugging code to avoid circular dependencies and separate concerns. 2019-12-18 22:37:26 +01:00
Daan Vanden Bosch
c0e9856d8a Using Select instead of DropDown in RegistersView. Only use monospace font in register container. 2019-12-18 20:20:32 +01:00
Daan Vanden Bosch
28b8fa03d9 Simplified quest logging system. 2019-12-18 20:06:09 +01:00
Daan Vanden Bosch
4ee4de95fa *Fully* put new VM views behind feature flag. 2019-12-17 22:12:55 +01:00
Daan Vanden Bosch
b9ca58ee16 Fixed bug in area mesh loading. Put new VM views behind feature flag. 2019-12-17 22:09:15 +01:00
Daan Vanden Bosch
b2c8a56a7b Fixed bug in QuestEntityControls that resulted in entities being positioned incorrectly when transitioning between sections. 2019-12-17 22:03:17 +01:00
jtuu
bb1a6b185e Added an execution count to QuestRunner to prevent the browser from freezing. 2019-11-23 17:01:04 +02:00
jtuu
8c102976a8 Added a VM registers viewer. 2019-11-21 23:04:16 +02:00
jtuu
d16c1634ba Modified QuestRunner to set paused state to false every time the execution loop is started regardless of whether any breakpoints are hit. 2019-11-21 19:52:42 +02:00
jtuu
b24afee12a Fixed VM threading in auto-advance mode. 
Now when a thread is started at least one advance is required to have valid execution state.
 2019-11-21 15:22:47 +02:00
jtuu
8582a25bc3 Lint 2019-11-16 18:07:21 +02:00
jtuu
918d8f7bdc The script editor is now set to readonly mode when a quest is running. 2019-11-16 17:35:20 +02:00
jtuu
f6f5fa7c3f QuestRunner now works in inline args mode. 2019-11-16 17:08:09 +02:00
jtuu
c57595a7af Simplified the way the VM manages the registers and the string argument store. 2019-11-16 00:16:09 +02:00
jtuu
0365b40e55 Added stop button. 2019-11-15 20:17:24 +02:00
jtuu
24abf3ae7f Modified QuestRunner's execution flow. 
Now it goes like this:
1. Advance instruction pointer.
2. Check for breakpoints.
3. Execute instruction.

Also fixed some bugs.
 2019-11-15 19:59:05 +02:00
jtuu
6e41b6fb79 Reworked script editor decorations. 
Breakpoints now move correctly when script is edited.
 2019-11-15 19:59:05 +02:00
jtuu
8c4e0c2ed2 Hooked up the stepping buttons to their respective methods in QuestRunner. 2019-11-15 19:59:05 +02:00
jtuu
b8f0cbfcb3 Added running and paused properties to QuestRunner. 
Also tried to improve the situation with the circular dependencies.
 2019-11-15 19:59:05 +02:00
jtuu
a219200291 Added buttons for VM controls. 
Also added new icons.
 2019-11-15 19:59:05 +02:00
jtuu
69f044ead1 [VM] Changed how mapping labels to segment indices works slightly. 2019-11-15 19:59:05 +02:00
jtuu
5c6dc50b4e Started working on stepping execution for QuestRunner. 
Step over and step in kind of work but there are still bugs. Step out is unimplemented.
 2019-11-15 19:59:05 +02:00
jtuu
911bde2bd9 Highlight the source location currently being executed when VM pauses. 2019-11-14 00:34:07 +02:00
jtuu
90ad66e96d Breakpoints now cause VM to pause. 2019-11-14 00:31:20 +02:00
jtuu
144e9513ac Added toggleable icons that represent breakpoints in the script editor. 2019-11-13 21:51:30 +02:00
jtuu
fbc9d96d25 Fixed VM state resetting. 2019-11-13 21:50:01 +02:00
jtuu
d2b57bb0c6 [VM] Implemented template string parsing for arg_pushs. 
Most of the tags aren't implemented though.
 2019-11-13 19:10:30 +02:00
jtuu
66525ca00c Added definition for opcode 0xf882 get_pl_job. 2019-11-12 17:10:03 +02:00
jtuu
d85de25f31 [VM] Fixed a bug where string arguments did not have a null terminator. 2019-11-11 23:00:56 +02:00
jtuu
f6b766bda3 Fixed VM tests that were broken by the changes to ExecutionResult. 2019-11-11 18:09:51 +02:00
jtuu
b8db5d46fc [VM] Allow last instruction to return an ExecutionResult other than Halted. 
The next call to execute will then be a no-op and return Halted.
 2019-11-11 18:07:26 +02:00
jtuu
87cabac307 Added a unit test for list opcode. 2019-11-11 16:08:38 +02:00
jtuu
6b2a61bc4f Added RegTupRef argument support for the argument stack. 2019-11-11 16:07:25 +02:00
jtuu
fbd4df4b58 Changed the way VM input is handled. 
Now the VM informs the runner when it requires input via ExecutionResult. Input is provided to the VM by calling methods directly on it.
Also implemented opcode list.
 2019-11-11 15:21:13 +02:00
jtuu
b9e762fa6e Use the new message log in QuestRunner. 2019-11-08 18:34:58 +02:00
jtuu
7e99857baf Added a message log in the quest editor. 
QuestEditorStore was extended to hold the state of the message log. The view is handled by a new core GUI class MessageLog.
 2019-11-08 15:07:46 +02:00
Daan Vanden Bosch
9545f056ab Added QuestRunner for managing game state, orchestrating the VM and controlling the visual aspects of a virtual quest run. 2019-11-05 21:07:17 +01:00
Daan Vanden Bosch
4a755a884f Entity world-relative rotation now stays constant while translating manually. 2019-11-04 18:02:30 +01:00
Daan Vanden Bosch
db9d15b78a Fixed bug in computation of inverse rotation of section. The bug manifested while manually translating an entity across a rotated section. 2019-11-04 18:01:11 +01:00
Daan Vanden Bosch
8212348a81 Made event rendering more robust. Added call_now option to ListProperty.observe_list. 2019-11-04 17:19:57 +01:00
jtuu
e7a39168ae [VM] Print a warning instead of throwing an error when a unimplemented opcode is encountered. 2019-11-01 21:05:20 +02:00
jtuu
4441435302 [VM] Implemented opcode set_episode and made it possible to load the entire quest in the VM. 2019-11-01 21:04:50 +02:00
jtuu
89a119e90d Modified the function convert_quest_from_model to do a deep copy of the given object. 
Added a couple other cloning functions.
 2019-11-01 18:13:32 +02:00
Daan Vanden Bosch
af5c27a565 Removed unnecessary console.log statements. 2019-10-31 19:11:58 +01:00
Daan Vanden Bosch
ee76fb8aea Merge remote-tracking branch 'github/master' 2019-10-31 19:11:20 +01:00
Daan Vanden Bosch
f1fa19238d Event DAG edges are now shown with lines. 2019-10-31 19:11:14 +01:00
jtuu
c726cd3461 [VM] Implemented gettime opcode. 2019-10-30 23:00:06 +02:00
jtuu
260c070f34 [VM] Implemented get_random opcode and added a unit test for it. 2019-10-30 21:02:35 +02:00
Daan Vanden Bosch
95da6e9e57 Logging when duplicate events are encountered. 2019-10-29 15:26:10 +01:00
Daan Vanden Bosch
5f1b3d5ff1 Quest events are now grouped in DAGs. 2019-10-29 15:22:46 +01:00
Daan Vanden Bosch
dff39bd194 Improved events view UI. 2019-10-27 23:21:58 +01:00
Daan Vanden Bosch
13fd0a984c Fixed bug in QuestModel. 2019-10-27 22:47:38 +01:00
Daan Vanden Bosch
2ed9659d9b Only the current area's event chains are now shown. 2019-10-27 22:40:26 +01:00
Daan Vanden Bosch
d6ebb8e21a Added simple transparency to entities. Seems to work for most entities except for those that use translucent texture to emulate light rays etc. 2019-10-27 16:45:30 +01:00
jtuu
27e0d2fd6d [VM] Added a unit test for float arithmetic. 2019-10-17 23:57:47 +03:00
jtuu
f42d66e7e1 [VM] Transform float arithmethic arguments to valid 32-bit floats. 2019-10-17 23:53:15 +03:00
jtuu
48f525a3bd [VM] Fixed floating point arithmetic opcodes. 
They were broken because they weren't actually using floats.
 2019-10-17 22:11:59 +03:00
jtuu
2906c8b577 [VM] Added unit tests for integer arithmetic. 2019-10-17 21:48:21 +03:00
jtuu
fc2e7647fe [VM] Throw error on division by zero. 2019-10-17 21:38:47 +03:00
jtuu
cd52ca4576 [VM] Made the implementation of opcodes letb and letw more correct. 2019-10-17 20:02:53 +03:00
jtuu
4b7e03931c [VM] Implemented opcodes leta, flet and fleti. 2019-10-17 19:58:31 +03:00
jtuu
da6cdc7d74 [VM] Reset state more thoroughly when halting and loading new object code. 2019-10-17 18:44:05 +03:00
jtuu
755e38c76a Removed unused imports. 2019-10-17 17:53:20 +03:00
jtuu
4e9507cd3e Changed argument type of VirtualMachineIO.prototype.error from string to Error. 
Also lint.
 2019-10-17 17:50:19 +03:00
jtuu
bcc24e7a47 [VM] Added a unit test for window_msg. 2019-10-17 15:56:22 +03:00
jtuu
064f0659e4 Moved a function to test utils. 2019-10-17 15:14:13 +03:00
jtuu
cb81b988e5 [VM] Made the methods for getting register values public to enable unit tests. 
Also renamed them so it's more obvious what they do.
 2019-10-17 14:45:59 +03:00
jtuu
416e15e68e [VM] Changed some warnings into errors and added source locations to warnings. 2019-10-17 14:40:47 +03:00
jtuu
f3c26f9eda [VM] Added an interface for handling the virtual machine's IO. 2019-10-17 14:21:45 +03:00
jtuu
f8dc1af8ea Split VM code into separate files. 2019-10-15 15:34:30 +03:00
jtuu
9facc6357c Dispose threads when VM halts. 2019-10-11 15:02:54 +03:00
jtuu
c7b27846c8 [VM] Quick and dirty implementation of window_msg, add_msg and winend. 2019-10-11 12:49:20 +03:00
jtuu
21299646e4 [VM] Implemented arg_pushs and arg_pusha. 2019-10-11 11:11:06 +03:00
jtuu
2909b1bb3e Reworked VirtualMachineMemoryBuffer to extend ArrayBufferCursor. 2019-10-11 10:49:47 +03:00
jtuu
6ed419cf35 Use undefined instead of null as the empty value. 2019-10-11 09:14:34 +03:00
Daan Vanden Bosch
9b1bc675a2 Fixed compilation issues and fixed bug in SimpleListProperty (length was not correctly initialized). 2019-10-11 00:04:01 +02:00
Daan Vanden Bosch
a5dd34cda7 Merge remote-tracking branch 'github/master' 2019-10-10 23:12:04 +02:00
Daan Vanden Bosch
ff8f02fe5b Refactored events model and added a basic view for it behind a feature flag. 2019-10-10 23:11:52 +02:00
jtuu
f8c75d7dad [VM] Reworked the argument stack to emulate the PSOBB client more accurately. 2019-10-10 21:07:21 +03:00
jtuu
5248dbe0a0 [VM] Reworked register storage to emulate the PSOBB client more accurately. 2019-10-10 21:07:21 +03:00
Daan Vanden Bosch
c287fdeb2f Renamed event-related types. Updated feature list. 2019-10-10 19:47:38 +02:00
Daan Vanden Bosch
9803bfe125 Wave data is now parsed/written and converted to models. 2019-10-10 13:47:43 +02:00
jtuu
dbe4f3ab78 [VM] Implemented stack_push(m) and stack_pop(m) opcodes. 2019-10-07 20:52:44 +03:00
Daan Vanden Bosch
345c9ab0dc Improved typing of ListProperty. 2019-10-07 18:26:45 +02:00
Daan Vanden Bosch
295bb71c15 Merge remote-tracking branch 'github/master' 2019-10-05 21:12:11 +02:00
Daan Vanden Bosch
0583b7499e Added ASM editor history navigation with mouse buttons and keyboard. 2019-10-05 21:11:58 +02:00
jtuu
f0d1d67b24 Lint and remove console.logs. 2019-10-04 14:21:51 +03:00
jtuu
3a8b189b0a [VM] Implemented conditional jump opcodes. 
jmp_on, jmp_off, jmp_=, jmpi_=, jmp_!=, jmpi_!=, ujmp_>, ujmpi_>, jmp_>, jmpi_>, ujmp_<, ujmpi_<, jmp_<, jmpi_<, ujmp_>=, ujmpi_>=, jmp_>=, jmpi_>=, ujmp_<=, ujmpi_<=, jmp_<=, jmpi_<=
 2019-10-04 14:17:34 +03:00
Daan Vanden Bosch
efed622e94 Fixed regression. 2019-10-03 17:28:48 +02:00
Daan Vanden Bosch
421487e21f String segment strings are now displayed with "\n" escape sequence instead of "<cr>". 2019-10-03 17:06:23 +02:00
Daan Vanden Bosch
544ed46263 "Go to label definition" now works with arguments passed via the stack. 2019-10-03 16:40:43 +02:00
Daan Vanden Bosch
ee4a293d3e Fixed some bugs. 2019-10-03 00:18:11 +02:00
Daan Vanden Bosch
b85b7147a6 Removed an unnecessary todo and added a useful one. 2019-10-03 00:07:40 +02:00
Daan Vanden Bosch
f67752e277 "Go to label definition" now works fully for instructions with inline arguments. 2019-10-02 23:59:24 +02:00
Daan Vanden Bosch
90f0e0f7bd Basic go to label definition functionality. 2019-10-02 23:34:09 +02:00
Daan Vanden Bosch
971444f847 F5 keybinding for "Run in VM". Bugfix for feature flags. 2019-10-02 21:15:35 +02:00
jtuu
1a7e9ee9ac [VM] Put the "run in VM" button behind a feature flag called "vm". 2019-10-02 21:46:20 +03:00
jtuu
d9110f0041 [VM] Push entire Arg object to stack instead of just its value. 2019-10-02 21:46:19 +03:00
jtuu
2e672c12b2 [VM] Implemented shift_left and shift_right opcodes. 2019-10-02 21:46:17 +03:00
jtuu
c628c30e1b [VM] Compare opcode numbers not the objects. 2019-10-02 21:46:13 +03:00
jtuu
78ed5c8071 [VM] Implemented opcodes for basic numeric operations. 2019-10-02 21:46:11 +03:00
jtuu
bdd7e8b174 [VM] Assign arguments to variables to make accessing them terser. 2019-10-02 21:46:09 +03:00
jtuu
806ab0ddd5 [VM] Implement arg_pushr, b, w, and s correctly. Remove arg_pusha and o because they are tricky and low priority. 2019-10-02 21:46:07 +03:00
jtuu
98acdbf7f9 [VM] Added arg stack. 2019-10-02 21:46:05 +03:00
jtuu
80a4aa784f [VM] Added a button to run the current quest in the VM. 
Made the VM work with output from the assembler.
Added some comments to the VM and cleaned it up a little bit.
 2019-10-02 21:43:53 +03:00
Daan Vanden Bosch
bffd8f51d9 Fixed unit tests. 2019-10-02 20:20:59 +02:00
Daan Vanden Bosch
ed571b9061 Added asm meta data to IR. 2019-10-02 19:57:43 +02:00
Daan Vanden Bosch
7bde9988e8 Tiny bugfix. 2019-10-02 18:32:00 +02:00
Daan Vanden Bosch
fc5a34946e Opcode is now structured cloning-safe. All IR is now structured cloning-safe. 2019-10-02 14:25:47 +02:00
Daan Vanden Bosch
16b89a01d0 Param is now structured cloning-safe. 2019-10-02 13:56:00 +02:00
Daan Vanden Bosch
fa76002d1c Instruction is now structured cloning-safe. 2019-10-02 13:44:55 +02:00
Daan Vanden Bosch
431c0545f2 Added the basic Monaco machinery for providing symbol definitions. 2019-10-02 13:28:14 +02:00
Daan Vanden Bosch
825f14dc90 Fixed a disassembler bug: va list arg_push* instructions would not be output when in automatic stack management mode. 2019-10-01 22:47:01 +02:00
Daan Vanden Bosch
df2bb7a6ab Fixed an assembler and a disassembler bug. 2019-10-01 22:18:14 +02:00
Daan Vanden Bosch
edc6428a3d Fixed regression. 2019-10-01 18:36:35 +02:00
Daan Vanden Bosch
9b3d280e4f Upgraded all dependencies and fixed linting warnings/errors resulting from eslint upgrade. 2019-10-01 18:30:26 +02:00
Daan Vanden Bosch
c64ba16c7a The ASM editor command palette can now be opened with ctrl-shift-p. 2019-10-01 17:41:28 +02:00
Daan Vanden Bosch
75c19cf112 The 3D view is now focused when dropping an entity on it. 2019-10-01 17:10:19 +02:00
Daan Vanden Bosch
b6619644d1 When the mouse leaves the 3D view while hovering over an entity it is now correctly de-highlighted. 2019-09-29 18:58:32 +02:00
Daan Vanden Bosch
4bf2148b39 Entities can be rotated via the entity info view. 2019-09-29 18:53:01 +02:00
Daan Vanden Bosch
1498b37f67 Reduced GC pressure while rotating entities. 2019-09-28 21:31:04 +02:00
Daan Vanden Bosch
9e2858dae2 Entities can now be rotated around their y-axis by right-click dragging. 2019-09-28 21:11:57 +02:00