@erik9994857/cag 1.0.3 → 2.0.2

package/src/cli/cag-cli.js

@@ -72,13 +72,11 @@ class CagCLI {
 
       this.printLine("Project: " + engine.getInfo().ID);
       this.printLine("Version: " + engine.getInfo().version);
-      this.printLine("Dependencies: " + engine.getDependencies().join(", "));
-      this.printLine("Code files: " + engine.getCodeFiles().length);
-      this.printLine("Resources: " + Object.keys(engine.getResourceMap()).length);
       this.printLine("");
 
       const CagcParser = require("../parser/cagc-parser");
       const Executor = require("../runtime/executor");
+      const ElectronRunner = require("../runtime/electron-runner");
 
       const cagcParser = new CagcParser();
       const executor = new Executor(engine);
@@ -90,26 +88,45 @@ class CagCLI {
         const fileName = path.basename(filePath);
         const content = fs.readFileSync(filePath, "utf-8");
 
-        this.printLine("Executing: " + fileName);
-
         const parsed = cagcParser.parse(content, fileName);
         const result = executor.execute(parsed);
 
         if (result.errors && result.errors.length > 0) {
           for (let j = 0; j < result.errors.length; j++) {
-            this.printError("  " + result.errors[j]);
+            this.printError(result.errors[j]);
           }
         }
+      }
 
-        if (result.outputs && result.outputs.length > 0) {
-          for (let j = 0; j < result.outputs.length; j++) {
-            this.printLine("  > " + result.outputs[j]);
+      const registry = executor.getRegistry();
+      if (registry.has("Model.API")) {
+        const modelAPI = registry.get("Model.API");
+        const loadedModels = modelAPI.getLoadedModels();
+        const modelNames = Object.keys(loadedModels);
+        if (modelNames.length > 0) {
+          this.printLine("Reading UV mapping...");
+          for (let i = 0; i < modelNames.length; i++) {
+            const name = modelNames[i];
+            const model = loadedModels[name];
+            if (model && model.valid && model.texture) {
+              this.printSuccess("Auto Mapped Custom UV for " + name);
+            } else if (model && model.valid) {
+              this.printLine("  " + name + " (no texture paired)");
+            } else {
+              this.printError("Failed to map UV for " + name);
+            }
           }
+          this.printLine("");
         }
       }
 
+      this.printLine("Launching game...");
       this.printLine("");
-      this.printSuccess("Execution complete.");
+
+      const settings = ElectronRunner.extractSettings(executor);
+      const runner = new ElectronRunner(engine, settings);
+      runner.run();
+
       return 0;
     } catch (e) {
       this.printError(e.message);
@@ -198,7 +215,7 @@ class CagCLI {
       this.printLine("[info.cag] OK");
 
       const deps = engine.getDependencies();
-      const validAPIs = ["Model.API", "WorldGen.API", "Pull.API"];
+      const validAPIs = ["Model.API", "WorldGen.API", "Pull.API", "Chunk.API", "Player.API", "Camera.API", "Render.API", "Window.API"];
       for (let i = 0; i < deps.length; i++) {
         if (validAPIs.indexOf(deps[i]) === -1) {
           this.printError("[main.cag] Unknown dependency: " + deps[i]);

package/src/index.js

@@ -195,7 +195,7 @@ class CaG {
     } else {
       fs.writeFileSync(
         path.join(projectPath, "main.cag"),
-        "Depency Model.API\nDepency WorldGen.API\nDepency Pull.API\n"
+        "Dependency Model.API\nDependency WorldGen.API\nDependency Pull.API\nDependency Chunk.API\nDependency Player.API\nDependency Camera.API\nDependency Render.API\nDependency Window.API\n"
       );
       fs.writeFileSync(
         path.join(projectPath, "info.cag"),
@@ -203,7 +203,7 @@ class CaG {
       );
       fs.writeFileSync(
         path.join(projectPath, "src", "code", "example.cagc"),
-        "Import Model.API\n\n{function use Model.API UseModel Grass\n"
+        "// " + projectName + " - CaG Game\n\nImport Model.API\nImport WorldGen.API\nImport Chunk.API\nImport Player.API\nImport Camera.API\nImport Render.API\nImport Window.API\n\n{function use Window.API SetTitle " + projectName + "\n{function use Window.API SetSize 1280 720\n{function use Render.API SetSkyColor 0.53 0.81 0.92\n{function use Render.API SetFog 0.53 0.81 0.92 64 128\n{function use Render.API SetSunDirection 0.5 1.0 0.3\n{function use Render.API SetAmbientLight 0.3 0.3 0.4\n{function use Camera.API SetFOV 70\n{function use Camera.API SetMode first-person\n{function use Model.API UseModel Grass\n{function use Chunk.API SetSize 16\n{function use Chunk.API SetRenderDistance 1\n{function use WorldGen.API generate world top layer = Grass\n{function use Player.API SetSpeed 0.08\n{function use Player.API SetJumpHeight 0.18\n{function use Player.API Spawn 8 2 8\n"
       );
     }
 

package/src/parser/cag-parser.js

@@ -48,11 +48,11 @@ class CagParser {
         continue;
       }
 
-      if (!line.startsWith("Depency ")) {
-        throw new Error("Invalid main.cag syntax at line " + (i + 1) + ": expected 'Depency (name)'");
+      if (!line.startsWith("Dependency ")) {
+        throw new Error("Invalid main.cag syntax at line " + (i + 1) + ": expected 'Dependency (name)'");
       }
 
-      const depName = line.substring(8).trim();
+      const depName = line.substring(11).trim();
 
       if (depName === "") {
         throw new Error("Empty dependency name at line " + (i + 1));
@@ -73,10 +73,27 @@ class CagParser {
     for (let i = 0; i < lines.length; i++) {
       const line = lines[i].trim();
 
-      if (line === "") {
+      if (line === "" || line.startsWith("//")) {
         continue;
       }
 
+      if (line.startsWith("Set ")) {
+        var setContent = line.substring(4).trim();
+        var eqIdx = setContent.indexOf("=");
+        if (eqIdx !== -1) {
+          var varName = setContent.substring(0, eqIdx).trim();
+          var varValue = setContent.substring(eqIdx + 1).trim();
+          functions.push({
+            type: "set",
+            variable: varName,
+            value: varValue,
+            raw: line,
+            line: i + 1
+          });
+          continue;
+        }
+      }
+
       if (line.startsWith("Import ")) {
         if (currentSection !== "imports") {
           throw new Error("Import statements must be at the top of the file, line " + (i + 1));
@@ -211,6 +228,41 @@ class CagParser {
         1: "retrieve",
         2: "search",
         3: "list"
+      },
+      "Chunk.API": {
+        1: "SetSize",
+        2: "SetRenderDistance",
+        3: "Generate",
+        4: "Unload",
+        5: "ListLoaded"
+      },
+      "Player.API": {
+        1: "Spawn",
+        2: "SetSpeed",
+        3: "SetJumpHeight",
+        4: "SetGravity",
+        5: "GetPosition"
+      },
+      "Camera.API": {
+        1: "SetFOV",
+        2: "SetNearFar",
+        3: "SetMode",
+        4: "SetSensitivity",
+        5: "GetSettings"
+      },
+      "Render.API": {
+        1: "SetFog",
+        2: "SetSkyColor",
+        3: "SetSunDirection",
+        4: "SetAmbientLight",
+        5: "SetRenderDistance"
+      },
+      "Window.API": {
+        1: "SetTitle",
+        2: "SetSize",
+        3: "SetFullscreen",
+        4: "SetBackground",
+        5: "GetSettings"
       }
     };
 

package/src/parser/cagc-parser.js

@@ -3,7 +3,7 @@ const Tokenizer = require("./tokenizer");
 class CagcParser {
   constructor() {
     this.tokenizer = new Tokenizer();
-    this.validAPIs = ["Model.API", "WorldGen.API", "Pull.API"];
+    this.validAPIs = ["Model.API", "WorldGen.API", "Pull.API", "Chunk.API", "Player.API", "Camera.API", "Render.API", "Window.API"];
   }
 
   parse(content, fileName) {
@@ -25,6 +25,13 @@ class CagcParser {
         continue;
       }
 
+      if (token.type === "COMMENT") {
+        while (i < tokens.length && tokens[i].type !== "NEWLINE") {
+          i++;
+        }
+        continue;
+      }
+
       if (token.type === "KEYWORD" && token.value === "Import") {
         const importResult = this.parseImport(tokens, i);
         if (importResult.error) {
@@ -205,7 +212,12 @@ class CagcParser {
     var actions = {
       "Model.API": { 1: "UseModel", 2: "RemoveModel", 3: "ListModels" },
       "WorldGen.API": { 1: "generate", 2: "destroy", 3: "modify" },
-      "Pull.API": { 1: "retrieve", 2: "search", 3: "list" }
+      "Pull.API": { 1: "retrieve", 2: "search", 3: "list" },
+      "Chunk.API": { 1: "SetSize", 2: "SetRenderDistance", 3: "Generate", 4: "Unload", 5: "ListLoaded" },
+      "Player.API": { 1: "Spawn", 2: "SetSpeed", 3: "SetJumpHeight", 4: "SetGravity", 5: "GetPosition" },
+      "Camera.API": { 1: "SetFOV", 2: "SetNearFar", 3: "SetMode", 4: "SetSensitivity", 5: "GetSettings" },
+      "Render.API": { 1: "SetFog", 2: "SetSkyColor", 3: "SetSunDirection", 4: "SetAmbientLight", 5: "SetRenderDistance" },
+      "Window.API": { 1: "SetTitle", 2: "SetSize", 3: "SetFullscreen", 4: "SetBackground", 5: "GetSettings" }
     };
 
     if (actions[api] && actions[api][num]) {

package/src/parser/tokenizer.js

@@ -1,9 +1,11 @@
 class Tokenizer {
   constructor() {
     this.keywords = [
-      "Import", "Depency", "function", "use",
+      "Import", "Dependency", "function", "use", "Set",
       "generate", "retrieve", "search", "list",
-      "world", "top", "layer", "model", "texture"
+      "world", "top", "layer", "model", "texture",
+      "chunk", "player", "camera", "render", "window",
+      "spawn", "fog", "sky", "sun", "ambient", "fov", "speed", "gravity"
     ];
   }
 
@@ -29,6 +31,16 @@ class Tokenizer {
         continue;
       }
 
+      if (char === "/" && i + 1 < content.length && content[i + 1] === "/") {
+        var commentStart = i;
+        while (i < content.length && content[i] !== "\n") {
+          i++;
+          col++;
+        }
+        tokens.push({ type: "COMMENT", value: content.substring(commentStart, i), line: line, col: col - (i - commentStart) });
+        continue;
+      }
+
       if (char === " " || char === "\t") {
         var wsStart = i;
         while (i < content.length && (content[i] === " " || content[i] === "\t")) {