Adding more TS

CMakeLists.txt

@@ -20,7 +20,7 @@ set(SETTING_GAME_POKER 1)
 set(SETTING_GAME_DAWN 2)
 set(SETTING_GAME_SANDBOX 3)
 
-set(SETTING_GAME SETTING_GAME_POKER)
+set(SETTING_GAME SETTING_GAME_SANDBOX)
 set(SETTING_GAME_NAME "DawnGame")
 
 ################################## Targets #####################################
@@ -70,6 +70,15 @@ if(${SETTING_PLATFORM} EQUAL ${SETTING_PLATFORM_SDL})
   list(APPEND HEADER_FILES ${HDRS})
 endif()
 
+#################################### ASSETS ####################################
+set(SCRIPT_FILES scripts.js)
+add_custom_command(
+  OUTPUT ${SCRIPT_FILES}
+  COMMAND npm run build
+  DEPENDS ${SOURCE_FILES}
+  WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+)
+
 file(COPY ${CMAKE_CURRENT_LIST_DIR}/assets DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
 
 ##################################### LIBS #####################################
@@ -84,7 +93,7 @@ endif()
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
 ################################## EXECUTABLE ##################################
-add_executable(${PROJECT_NAME} ${HEADER_FILES} ${SOURCE_FILES})
+add_executable(${PROJECT_NAME} ${HEADER_FILES} ${SOURCE_FILES} ${SCRIPT_FILES})
 
 ################################# STATIC LIBS ##################################
 # Math

package.json

@@ -0,0 +1,18 @@
+{
+  "name": "Dawn",
+  "version": "1.0.0",
+  "main": "index.js",
+  "repository": "https://YourWishes@github.com/YourWishes/Dawn.git",
+  "author": "Dominic Masters <dominic@domsplace.com>",
+  "license": "MIT",
+  "scripts": {
+    "build:typescript:production": "tsc -p .",
+    "build:production": "npm run build:typescript:production",
+    "bundle:production": "node ./scripts/bundle.js",
+    "build": "npm run build:production && npm run bundle:production"
+  },
+  "devDependencies": {
+    "tsc": "^2.0.3",
+    "typescript": "^4.4.3"
+  }
+}

scripts/bundle.js

@@ -0,0 +1,55 @@
+const path = require('path');
+const fs = require('fs');
+
+const DIR_BUILT_SCRIPTS = path.join('build', 'scripts');
+const DIR_OUT = path.join('build', 'assets', 'scripts');
+
+let doneFiles = [];
+let full = `
+var exports = {};
+`;
+
+const outputFix = (output, dir) => {
+  let out = output.replace(/exports\.\_\_esModule\ =\ true\;/gm, '');
+  
+  // Replace requires with exports.
+  const reg = /var\ (.*?)\ \= require\("(.*?)"\)\;/gm;
+  const matches = out.matchAll(reg);
+  let match;
+  while(!(match = matches.next()).done) {
+    const exp = new RegExp(`${match.value[1]}\.`);
+    exp.multiline = true;
+
+    scanFile(path.join(dir, match.value[2]), dir);
+
+    out = out.replace(match.value[0], '').replace(exp, 'exports.');
+  }
+
+  // Remove exports.whatever = void 0;
+  out = out.replace(/exports\.(.*?) \= void 0\;/gm, '');
+  return out;
+}
+
+const scanFile = (file, dir) => {
+  if(!file.endsWith('.js')) file += '.js';
+  if(doneFiles.indexOf(file) !== -1) return;
+  doneFiles.push(file);
+  const contents = fs.readFileSync(file, 'utf-8');
+  const f = outputFix(contents, dir);
+  full = full + `\n//${file}\n` + f;
+}
+
+const scanDir = dir => fs.readdirSync(dir).forEach(file => {
+  if(!file.endsWith('.js')) return;
+  const joint = path.join(DIR_BUILT_SCRIPTS, file);
+  const stat = fs.statSync(joint);
+  if(stat.isDirectory()) {
+    scanDir(joint);
+  } else {
+    scanFile(joint, dir);
+  }
+});
+
+scanDir(DIR_BUILT_SCRIPTS);
+if(!fs.existsSync(DIR_OUT)) fs.mkdirSync(DIR_OUT);
+fs.writeFileSync(path.join(DIR_OUT, 'main.js'), full);

src/game/game.c

@@ -12,7 +12,7 @@ bool gameInit(game_t *game) {
   engineInit(&game->engine);
 
   // Send off to the game instance
-  return gameInstanceInit(game);
+  return GAME_INIT(game);
 }
 
 bool gameUpdate(game_t *game, float platformDelta) {
@@ -20,7 +20,7 @@ bool gameUpdate(game_t *game, float platformDelta) {
   engineUpdateStart(&game->engine, platformDelta);
 
   // Hand off to the game to update
-  gameInstanceUpdate(game);
+  GAME_UPDATE(game);
 
   // Hand back to the engine.
   return engineUpdateEnd(&game->engine);
@@ -28,7 +28,7 @@ bool gameUpdate(game_t *game, float platformDelta) {
 
 void gameDispose(game_t *game) {
   // Cleanup the game
-  gameInstanceDispose(game);
+  GAME_DISPOSE(game);
 
   engineDispose(&game->engine);
 }

src/game/game.h

@@ -12,12 +12,21 @@
 #if SETTING_GAME == SETTING_GAME_POKER
   #include "poker/game.h"
   typedef pokergame_t game_t;
+  #define GAME_INIT poekrGameInit
+  #define GAME_UPDATE pokerGameUpdate
+  #define GAME_DISPOSE pokerGameDispose
+
 #elif SETTING_GAME == SETTING_GAME_DAWN
   #include "dawn/game.h"
   typedef dawngame_t game_t;
+
 #elif SETTING_GAME == SETTING_GAME_SANDBOX
-  #include "sandbox/game.h"
+  #include "sandbox/sandboxscene.h"
   typedef sandboxscene_t game_t;
+  #define GAME_INIT sandboxSceneInit
+  #define GAME_UPDATE sandboxSceneUpdate
+  #define GAME_DISPOSE sandboxSceneDispose
+  
 #endif
 
 /**

src/game/poker/game.c

@@ -7,7 +7,7 @@
 
 #include "game.h"
 
-bool gameInstanceInit(pokergame_t *game) {
+bool pokerGameInit(pokergame_t *game) {
   // Load the Assets.
   pokerGameAssetsInit(&game->assets);
 
@@ -30,7 +30,7 @@ bool gameInstanceInit(pokergame_t *game) {
   return true;
 } 
 
-void gameInstanceUpdate(pokergame_t *game) {
+void pokerGameUpdate(pokergame_t *game) {
   // Update the VN Engine.
   vnSceneUpdate(&game->scene, &game->engine);
 
@@ -58,7 +58,7 @@ void gameInstanceUpdate(pokergame_t *game) {
   pokerUiRender(&game->ui, &game->engine, &game->assets, &game->poker);
 }
 
-void gameInstanceDispose(pokergame_t *game) {
+void pokerGameDispose(pokergame_t *game) {
   //Cleanup the UI
   pokerUiDispose(&game->ui);
 

src/game/poker/game.h

@@ -24,16 +24,16 @@
  * @param game Game to initialize.
  * @returns True if successful, otherwise false.
  */
-bool gameInstanceInit(pokergame_t *game);
+bool pokerGameInit(pokergame_t *game);
 
 /**
  * Updates the poker game instance.
  * @param game Poker game to update for.
  */
-void gameInstanceUpdate(pokergame_t *game);
+void pokerGameUpdate(pokergame_t *game);
 
 /**
  * Disposes a previously initialized poker game instance.
  * @param game Game to dispose.
  */
-void gameInstanceDispose(pokergame_t *game);
+void pokerGameDispose(pokergame_t *game);

src/game/sandbox/sandboxscene.c

@@ -14,6 +14,14 @@ bool sandboxSceneInit(sandboxscene_t *game) {
     "shaders/textured.vert", "shaders/textured.frag"
   );
 
+  // Init Scripter
+  scripter_t scripter;
+  scripterInit(&scripter, &game->engine);
+  scripter.user = game;
+
+  scriptsApiIo(&scripter);
+  assetScripterAppend(&scripter, "scripts/main.js");
+
   return true;
 }
 

src/game/sandbox/sandboxscene.h

@@ -19,13 +19,15 @@
 
 #include "../../file/xml.h"
 #include "../../file/asset.h"
-#include "../../script/scripter.h"
 #include "../../ui/grid.h"
 #include "../../ui/menu.h"
 #include "../../ui/textmenu.h"
 #include "../../ui/image.h"
 #include "../../ui/framedtextmenu.h"
 
+#include "../../script/scripter.h"
+#include "../../script/api/io.h"
+
 typedef struct {
   engine_t engine;
   camera_t camera;

ts/index.ts

@@ -0,0 +1,7 @@
+import { MESSAGE_TEST } from "./test";
+import { MESSAGE_ALT } from "./test2";
+
+//@ts-ignore
+print(MESSAGE_TEST);
+//@ts-ignore
+print(MESSAGE_ALT);

ts/test.ts

@@ -0,0 +1 @@
+export const MESSAGE_TEST = 'yeet';

ts/test2.ts

@@ -0,0 +1 @@
+export const MESSAGE_ALT = 'hELLO2';

tsconfig.json

@@ -0,0 +1,13 @@
+{
+  "compilerOptions": {
+    "target": "es3",
+    "noImplicitAny": true,
+    "removeComments": true,
+    "preserveConstEnums": true,
+    "outDir": "build/scripts",
+    "noImplicitUseStrict": true,
+    "moduleResolution": "Node"
+  },
+  "include": [ "ts/**/*" ],
+  "exclude": [ "node_modules" ]
+}