malc-game-engine 1.0.5 → 1.0.7

package/malc.js

@@ -1,6 +1,6 @@
 /**
  * MALC Game Engine Library
- * Version: 1.0.5
+ * Version: 1.0.7
  * Description: A comprehensive 2D game engine for p5.js
  */
 
@@ -909,7 +909,20 @@ class gameObject {
     directionTo(x, y, err = 0.5) {
         let pa = [x - this.x, y - this.y];
         
-        let angle = (x && y) ? _p5.prototype.atan(pa[1]/pa[0]) : this.rotation;
+        let angle = this.rotation;
+        
+        // Safely calculate angle
+        try {
+            if (x && y) {
+                angle = _p5.prototype.atan(pa[1]/pa[0]);
+            }
+        } catch (e) {
+            // Fallback to native Math.atan
+            if (x && y) {
+                angle = Math.atan(pa[1]/pa[0]);
+            }
+        }
+        
         var quads = [
             pa[0] < -err && pa[1] > err,
             pa[0] < -err && pa[1] < -err,
@@ -919,7 +932,12 @@ class gameObject {
             (pa[1] < err && pa[1] > -err),
         ];
         
-        let da = (_p5.prototype.atan(pa[1]/pa[0]) * 180)/Math.PI;
+        let da = 0;
+        try {
+            da = (_p5.prototype.atan(pa[1]/pa[0]) * 180)/Math.PI;
+        } catch (e) {
+            da = (Math.atan(pa[1]/pa[0]) * 180)/Math.PI;
+        }
         
         if((pa[1] > -err && pa[1] < err) && (pa[0] > -err && pa[0] < err)){
             angle = NaN;
@@ -2557,7 +2575,7 @@ const helpDocs = {
 
 // ========== MALC MAIN OBJECT ==========
 const MALC = {
-    version: "1.0.5", // Increment version
+    version: "1.0.7", // Increment version
     
     // Core classes
     gameObject: gameObject,
@@ -2675,9 +2693,10 @@ const MALC = {
     
     // Initialize the engine
     
+    // Initialize the engine
     init: function(canvasX, canvasY) {
-        // Use the current p5 instance (this) to create the canvas
-        this.createCanvas(canvasX, canvasY);
+        // Use the p5 instance that was passed to the factory function
+        _p5.prototype.createCanvas(canvasX, canvasY);
         
         this.time = new Date();
         this.startTime = this.time.getTime();
@@ -2696,7 +2715,8 @@ const MALC = {
         new Scene("blank", 70);
         new Scene("loading", 50, function(self) {
             try {
-                this.textSize(24);
+                // Use _p5.prototype here too
+                _p5.prototype.textSize(24);
                 let timed = (self.timeActive / 250 % 4);
                 let dots = "";
                 
@@ -2704,16 +2724,16 @@ const MALC = {
                 else if (timed < 2) dots = "..";
                 else if (timed < 3) dots = "...";
                 
-                coloredText(`\\lime|Loading Game${dots}| `, 120, 200, this.LEFT, this.CENTER);
+                coloredText(`\\lime|Loading Game${dots}| `, 120, 200, _p5.prototype.LEFT, _p5.prototype.CENTER);
                 
-                this.textSize(16);
+                _p5.prototype.textSize(16);
                 
                 let num = (Math.floor(self.timeActive / 100) / 10);
                 let percentText = `${ Math.round((10 - num) * 10) / 10 + ((num + "").length < 2 ? ".0" : "")}`;
                 
-                coloredText(`\\red|${percentText}|`, 200, 225, this.CENTER, this.CENTER);
+                coloredText(`\\red|${percentText}|`, 200, 225, _p5.prototype.CENTER, _p5.prototype.CENTER);
             } catch (e) {
-                this.text(`Loading Game...`, 120, 200);
+                _p5.prototype.text(`Loading Game...`, 120, 200);
             }
         });
         
@@ -2724,30 +2744,75 @@ const MALC = {
     },
         
         // Update all systems (call in draw)
-        update: function() {
-        this.time = new Date();
-        this.timer = this.time - this.startTime;
-        
-        if (this.mouse) {
-            this.mouse.rawX = this.mouseX;
-            this.mouse.rawY = this.mouseY;
-            this.mouse.x = this.mouse.rawX + window.camera.getOrientation()[0];
-            this.mouse.y = this.mouse.rawY + window.camera.getOrientation()[1];
-            this.mouse.down = this.mouseIsPressed;
-        }
-        
-        controller.update();
+        update() {
+            if (!this.active) return;
+            
+            // Apply gravity if enabled
+            this.applyGravity();
+            
+            let vel = this.velocity[0];
+            let angle = this.velocity[1];
+            
+            if (this.velocityMode == "polar") {
+                let linked = false;
+                if (!/unlinked/i.test(this.rvm) && /linked/i.test(this.rvm)) {
+                    this.velocity[1] = this.rotation;
+                    linked = true;
+                }
         
-        gameObject.update();
-        Button.updateButton();
+                let rot = linked ? 
+                    (this.rotationMode == "degrees" ? (this.rotation) : this._toRadians(this.rotation)) : 
+                    (this.rotationMode == "degrees" ? (this.velocity[1]) : (this.velocity[1]));
+                
+                if(isNaN(rot)){
+                    vel = 0;
+                    rot = 0;
+                }
+                
+                // SAFELY call p5 math functions
+                let vx = 0;
+                let vy = 0;
+                
+                try {
+                    vx = vel * _p5.prototype.cos(rot);
+                    vy = vel * _p5.prototype.sin(rot);
+                } catch (e) {
+                    // Fallback if p5 isn't ready
+                    vx = vel * Math.cos(rot);
+                    vy = vel * Math.sin(rot);
+                }
         
-        this.fps = fps;
+                this.velocityMatrix = [vx, vy];
+                
+                // Don't apply horizontal movement if gravity is enabled and we're grounded with friction
+                if (!(this.gravity.enabled && this.gravity.grounded && this.gravity.friction > 0)) {
+                    this.x += vx;
+                }
+                
+                // Vertical movement is handled by gravity when enabled
+                if (!this.gravity.enabled) {
+                    this.y += vy;
+                }
+            } else {
+                // Cartesian velocity mode
+                if (!(this.gravity.enabled && this.gravity.grounded && this.gravity.friction > 0)) {
+                    this.x += vel;
+                }
+                if (!this.gravity.enabled) {
+                    this.y += angle;
+                }
+            }
+            
+            // Update parent scene reference
+            this.updateParentScene();
+            
+            MALCgameObjects[this.objectInstance] = this;
+        }
         
-        if (typeof window.camera.render == "function") {
-            window.camera.render();
+        // Helper method for radians conversion without p5
+        _toRadians(degrees) {
+            return degrees * Math.PI / 180;
         }
-        Scene.update();
-    }
 };
 
 // Initialize mouse and keyboard handlers
@@ -2757,3 +2822,5 @@ return MALC;
 
 }));
 
+
+

package/malc.min.js

@@ -99,7 +99,9 @@ removeFromAllScenes(){this.scenes.forEach(sceneId=>{let scene=Scene.getSceneById
 updateParentScene(){if(Scene.activeScene){let activeScene=Scene.getSceneById(Scene.activeScene);if(activeScene&&this.belongsToScene(activeScene.id)){this.parentScene=activeScene}}}
 distanceTo(target){let dx=target.x!==undefined?target.x-this.x:target[0]-this.x;let dy=target.y!==undefined?target.y-this.y:target[1]-this.y;return Math.sqrt(dx*dx+dy*dy)}
 collidesWith(other){return(this.x<other.x+other.width&&this.x+this.width>other.x&&this.y<other.y+other.height&&this.y+this.height>other.y)}
-directionTo(x,y,err=0.5){let pa=[x-this.x,y-this.y];let angle=(x&&y)?_p5.prototype.atan(pa[1]/pa[0]):this.rotation;var quads=[pa[0]<-err&&pa[1]>err,pa[0]<-err&&pa[1]<-err,pa[0]>err&&pa[1]>err,pa[0]>err&&pa[1]<-err,(pa[0]<err&&pa[0]>-err),(pa[1]<err&&pa[1]>-err),];let da=(_p5.prototype.atan(pa[1]/pa[0])*180)/Math.PI;if((pa[1]>-err&&pa[1]<err)&&(pa[0]>-err&&pa[0]<err)){angle=NaN}else if(quads[0]){angle=da+180}else if(quads[1]){angle=da+180}else if(quads[2]){angle=da}else if(quads[3]){angle=da}else if(quads[4]){if(pa[1]<-err){angle=-90}else if(pa[1]>err){angle=90}}else if(quads[5]){if(pa[0]<-err){angle=180}else if(pa[0]>err){angle=0}}
+directionTo(x,y,err=0.5){let pa=[x-this.x,y-this.y];let angle=this.rotation;try{if(x&&y){angle=_p5.prototype.atan(pa[1]/pa[0])}}catch(e){if(x&&y){angle=Math.atan(pa[1]/pa[0])}}
+var quads=[pa[0]<-err&&pa[1]>err,pa[0]<-err&&pa[1]<-err,pa[0]>err&&pa[1]>err,pa[0]>err&&pa[1]<-err,(pa[0]<err&&pa[0]>-err),(pa[1]<err&&pa[1]>-err),];let da=0;try{da=(_p5.prototype.atan(pa[1]/pa[0])*180)/Math.PI}catch(e){da=(Math.atan(pa[1]/pa[0])*180)/Math.PI}
+if((pa[1]>-err&&pa[1]<err)&&(pa[0]>-err&&pa[0]<err)){angle=NaN}else if(quads[0]){angle=da+180}else if(quads[1]){angle=da+180}else if(quads[2]){angle=da}else if(quads[3]){angle=da}else if(quads[4]){if(pa[1]<-err){angle=-90}else if(pa[1]>err){angle=90}}else if(quads[5]){if(pa[0]<-err){angle=180}else if(pa[0]>err){angle=0}}
 return angle}
 pointTo(target){this.rotation=this.directionTo(target);return this}
 setPosition(x,y){this.x=x;this.y=y;return this}
@@ -282,7 +284,7 @@ const helpDocs={overview:`
         function draw() {
             MALC.update(); // Updates all MALC systems
         }
-    `};const MALC={version:"1.0.5",gameObject:gameObject,Button:Button,Scene:Scene,UIPlane:UIPlane,Camera:Camera,mouse:null,keyboard:keyboard,controller:controller,fps:fps,getFPS:getFPS,time:new Date(),startTime:new Date().getTime(),timer:0,generateId:generateId,getTimestamp:getTimestamp,coloredText:coloredText,GRAVITY:GRAVITY,TERMINAL_VELOCITY:TERMINAL_VELOCITY,help:function(topic="overview"){if(topic==="overview"){console.log(helpDocs.overview);return helpDocs.overview}
+    `};const MALC={version:"1.0.7",gameObject:gameObject,Button:Button,Scene:Scene,UIPlane:UIPlane,Camera:Camera,mouse:null,keyboard:keyboard,controller:controller,fps:fps,getFPS:getFPS,time:new Date(),startTime:new Date().getTime(),timer:0,generateId:generateId,getTimestamp:getTimestamp,coloredText:coloredText,GRAVITY:GRAVITY,TERMINAL_VELOCITY:TERMINAL_VELOCITY,help:function(topic="overview"){if(topic==="overview"){console.log(helpDocs.overview);return helpDocs.overview}
 if(helpDocs.classes[topic]){console.log(`=== ${topic.toUpperCase()} ===`);console.log(helpDocs.classes[topic].description);console.log("\nConstructor:",helpDocs.classes[topic].constructor);if(helpDocs.classes[topic].properties){console.log("\nProperties:");Object.entries(helpDocs.classes[topic].properties).forEach(([prop,desc])=>{console.log(`  ${prop}: ${desc}`)})}
 if(helpDocs.classes[topic].methods){console.log("\nMethods:");Object.entries(helpDocs.classes[topic].methods).forEach(([method,desc])=>{console.log(`  ${method}: ${desc}`)})}
 if(helpDocs.classes[topic].staticMethods){console.log("\nStatic Methods:");Object.entries(helpDocs.classes[topic].staticMethods).forEach(([method,desc])=>{console.log(`  static ${method}: ${desc}`)})}
@@ -291,6 +293,11 @@ if(helpDocs.input[topic]){console.log(`=== ${topic.toUpperCase()} ===`);console.
 return helpDocs.input[topic]}
 if(helpDocs.utilities[topic]){console.log(`=== ${topic.toUpperCase()} ===`);console.log(helpDocs.utilities[topic]);return helpDocs.utilities[topic]}
 if(topic==="quickStart"||topic==="start"){console.log(helpDocs.quickStart);return helpDocs.quickStart}
-console.log(`Help topic "${topic}" not found. Try: overview, classes (gameObject, Button, Scene, UIPlane, Camera), input (mouse, keyboard, controller), utilities (coloredText, getFPS), quickStart`);return null},helpTopics:function(){const topics=["overview","classes: "+Object.keys(helpDocs.classes).join(", "),"input: "+Object.keys(helpDocs.input).join(", "),"utilities: "+Object.keys(helpDocs.utilities).join(", "),"quickStart"];console.log("Available help topics:\n"+topics.join("\n"));return topics},init:function(canvasX,canvasY){this.createCanvas(canvasX,canvasY);this.time=new Date();this.startTime=this.time.getTime();window.camera=new Camera(canvasX,canvasY);this.mouse=new MouseHandler();window.mouse=this.mouse;refreshLoop();new Scene("blank",70);new Scene("loading",50,function(self){try{this.textSize(24);let timed=(self.timeActive/250%4);let dots="";if(timed<1)dots=".";else if(timed<2)dots="..";else if(timed<3)dots="...";coloredText(`\\lime|Loading Game${dots}| `,120,200,this.LEFT,this.CENTER);this.textSize(16);let num=(Math.floor(self.timeActive/100)/10);let percentText=`${ Math.round((10 - num) * 10) / 10 + ((num + "").length < 2 ? ".0" : "")}`;coloredText(`\\red|${percentText}|`,200,225,this.CENTER,this.CENTER)}catch(e){this.text(`Loading Game...`,120,200)}});Scene.activeScene="loading";console.log("MALC Game Engine initialized v"+this.version);console.log("Type MALC.help() for documentation")},update:function(){this.time=new Date();this.timer=this.time-this.startTime;if(this.mouse){this.mouse.rawX=this.mouseX;this.mouse.rawY=this.mouseY;this.mouse.x=this.mouse.rawX+window.camera.getOrientation()[0];this.mouse.y=this.mouse.rawY+window.camera.getOrientation()[1];this.mouse.down=this.mouseIsPressed}
-controller.update();gameObject.update();Button.updateButton();this.fps=fps;if(typeof window.camera.render=="function"){window.camera.render()}
-Scene.update()}};MALC.mouse=new MouseHandler();return MALC}))
+console.log(`Help topic "${topic}" not found. Try: overview, classes (gameObject, Button, Scene, UIPlane, Camera), input (mouse, keyboard, controller), utilities (coloredText, getFPS), quickStart`);return null},helpTopics:function(){const topics=["overview","classes: "+Object.keys(helpDocs.classes).join(", "),"input: "+Object.keys(helpDocs.input).join(", "),"utilities: "+Object.keys(helpDocs.utilities).join(", "),"quickStart"];console.log("Available help topics:\n"+topics.join("\n"));return topics},init:function(canvasX,canvasY){_p5.prototype.createCanvas(canvasX,canvasY);this.time=new Date();this.startTime=this.time.getTime();window.camera=new Camera(canvasX,canvasY);this.mouse=new MouseHandler();window.mouse=this.mouse;refreshLoop();new Scene("blank",70);new Scene("loading",50,function(self){try{_p5.prototype.textSize(24);let timed=(self.timeActive/250%4);let dots="";if(timed<1)dots=".";else if(timed<2)dots="..";else if(timed<3)dots="...";coloredText(`\\lime|Loading Game${dots}| `,120,200,_p5.prototype.LEFT,_p5.prototype.CENTER);_p5.prototype.textSize(16);let num=(Math.floor(self.timeActive/100)/10);let percentText=`${ Math.round((10 - num) * 10) / 10 + ((num + "").length < 2 ? ".0" : "")}`;coloredText(`\\red|${percentText}|`,200,225,_p5.prototype.CENTER,_p5.prototype.CENTER)}catch(e){_p5.prototype.text(`Loading Game...`,120,200)}});Scene.activeScene="loading";console.log("MALC Game Engine initialized v"+this.version);console.log("Type MALC.help() for documentation")},update(){if(!this.active)return;this.applyGravity();let vel=this.velocity[0];let angle=this.velocity[1];if(this.velocityMode=="polar"){let linked=!1;if(!/unlinked/i.test(this.rvm)&&/linked/i.test(this.rvm)){this.velocity[1]=this.rotation;linked=!0}
+let rot=linked?(this.rotationMode=="degrees"?(this.rotation):this._toRadians(this.rotation)):(this.rotationMode=="degrees"?(this.velocity[1]):(this.velocity[1]));if(isNaN(rot)){vel=0;rot=0}
+let vx=0;let vy=0;try{vx=vel*_p5.prototype.cos(rot);vy=vel*_p5.prototype.sin(rot)}catch(e){vx=vel*Math.cos(rot);vy=vel*Math.sin(rot)}
+this.velocityMatrix=[vx,vy];if(!(this.gravity.enabled&&this.gravity.grounded&&this.gravity.friction>0)){this.x+=vx}
+if(!this.gravity.enabled){this.y+=vy}}else{if(!(this.gravity.enabled&&this.gravity.grounded&&this.gravity.friction>0)){this.x+=vel}
+if(!this.gravity.enabled){this.y+=angle}}
+this.updateParentScene();MALCgameObjects[this.objectInstance]=this}
+_toRadians(degrees){return degrees*Math.PI/180}};MALC.mouse=new MouseHandler();return MALC}))

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "malc-game-engine",
-  "version": "1.0.5",
+  "version": "1.0.7",
   "description": "A comprehensive 2D game engine for p5.js",
   "main": "malc.js",
   "unpkg": "malc.min.js",