malc-game-engine 1.0.3 → 1.0.4

package/malc.js

@@ -40,7 +40,39 @@ function generateId(prefix) {
     return `${prefix}_${Date.now()}_${Math.random().toString(36).substr(2, 9)}`;
 }
 
-// ========== COLORED TEXT FUNCTIONS (SAFE VERSION) ==========
+// ========== COLORED TEXT FUNCTION (STANDALONE) ==========
+function coloredText(str, x, y, horizontal, vertical, maxWidth) {
+    const p = _p5.prototype; // Use the current p5 instance
+    const parts = parseColoredText(str);
+    let currentX = x;
+    let currentY = y;
+    
+    p.push();
+    p.textAlign(horizontal || LEFT, vertical || BASELINE);
+    
+    for (const part of parts) {
+        if (part.isNewline) {
+            currentX = x;
+            currentY += p.textLeading() || p.textSize() * 1.2;
+            continue;
+        }
+        
+        if (part.color) {
+            try {
+                p.fill(part.color);
+            } catch (e) {
+                p.fill(255);
+            }
+        }
+        
+        p.text(part.text, currentX, currentY, maxWidth);
+        currentX += p.textWidth(part.text);
+    }
+    
+    p.pop();
+}
+
+// Keep these helper functions (they don't need to change)
 function parseColoredLine(str) {
     const regex = /\\([^|\\\n]+)\|([^|]+)\|/g;
     const parts = [];
@@ -95,36 +127,6 @@ function parseColoredText(str) {
     return result;
 }
 
-function renderColoredText(p, str, x, y, horizontal, vertical, maxWidth) {
-    const parts = parseColoredText(str);
-    let currentX = x;
-    let currentY = y;
-    
-    p.push();
-    p.textAlign(horizontal, vertical);
-    
-    for (const part of parts) {
-        if (part.isNewline) {
-            currentX = x;
-            currentY += p.textLeading() || p.textSize() * 1.2;
-            continue;
-        }
-        
-        if (part.color) {
-            try {
-                p.fill(part.color);
-            } catch (e) {
-                p.fill(255);
-            }
-        }
-        
-        p.text(part.text, currentX, currentY, maxWidth);
-        currentX += p.textWidth(part.text);
-    }
-    
-    p.pop();
-}
-
 // ========== SCENE CLASS (DEFINED FIRST) ==========
 class Scene {
     static scenes = [];
@@ -1132,49 +1134,45 @@ class Button extends gameObject {
     }
 
     render() {
-        if (!this.active) return;
-        
-        let btnFormat = this.formatting.button;
-        let buttonColor;
-        
-        if (this.isDisabled) {
-            buttonColor = btnFormat.colors.disabled;
-        } else if (this.isPressed) {
-            buttonColor = btnFormat.colors.pressed;
-        } else if (this.isHovered) {
-            buttonColor = btnFormat.colors.hover;
-        } else {
-            buttonColor = btnFormat.colors.normal;
-        }
-        
-        let originalColor = this.formatting.color;
-        this.formatting.color = buttonColor;
-        
-        super.render();
-        
-        if(!this.visible) return;
-        
-        _p5.prototype.push();
-        _p5.prototype.translate(this.x, this.y);
-        if (this.rotationMode == "degrees") _p5.prototype.angleMode(_p5.prototype.DEGREES);
-        _p5.prototype.rotate(this.rotation);
-        
-        _p5.prototype.textStyle(btnFormat.text.style);
-        _p5.prototype.textSize(btnFormat.text.size);
-        _p5.prototype.fill(btnFormat.text.color);
-        
-        // Use colored text if available, otherwise use normal text
-        if (_p5.prototype.coloredText) {
-            _p5.prototype.coloredText(btnFormat.text.display, 0, 0, _p5.prototype.CENTER, _p5.prototype.CENTER);
-        } else {
-            _p5.prototype.text(btnFormat.text.display, 0, 0);
-        }
-        
-        _p5.prototype.pop();
-        
-        this.formatting.color = originalColor;
+    if (!this.active) return;
+    
+    let btnFormat = this.formatting.button;
+    let buttonColor;
+    
+    if (this.isDisabled) {
+        buttonColor = btnFormat.colors.disabled;
+    } else if (this.isPressed) {
+        buttonColor = btnFormat.colors.pressed;
+    } else if (this.isHovered) {
+        buttonColor = btnFormat.colors.hover;
+    } else {
+        buttonColor = btnFormat.colors.normal;
     }
     
+    let originalColor = this.formatting.color;
+    this.formatting.color = buttonColor;
+    
+    super.render();
+    
+    if(!this.visible) return;
+    
+    _p5.prototype.push();
+    _p5.prototype.translate(this.x, this.y);
+    if (this.rotationMode == "degrees") _p5.prototype.angleMode(_p5.prototype.DEGREES);
+    _p5.prototype.rotate(this.rotation);
+    
+    _p5.prototype.textStyle(btnFormat.text.style);
+    _p5.prototype.textSize(btnFormat.text.size);
+    _p5.prototype.fill(btnFormat.text.color);
+    
+    // Use the standalone coloredText function
+    coloredText(btnFormat.text.display, 0, 0, _p5.prototype.CENTER, _p5.prototype.CENTER);
+    
+    _p5.prototype.pop();
+    
+    this.formatting.color = originalColor;
+}
+    
     // ========== BUTTON-SPECIFIC HELPER METHODS ==========
     
     setText(text) {
@@ -2559,7 +2557,7 @@ const helpDocs = {
 
 // ========== MALC MAIN OBJECT ==========
 const MALC = {
-    version: "1.0.3",
+    version: "1.0.4", // Increment version
     
     // Core classes
     gameObject: gameObject,
@@ -2585,6 +2583,7 @@ const MALC = {
     // Utility functions
     generateId: generateId,
     getTimestamp: getTimestamp,
+    coloredText: coloredText, // Add this line
     
     // Gravity constants
     GRAVITY: GRAVITY,
@@ -2688,50 +2687,39 @@ const MALC = {
         this.mouse = new MouseHandler();
         window.mouse = this.mouse;
         
-        // Add coloredText method to p5 instance safely
-        if (!_p5.prototype.coloredText) {
-            _p5.prototype.coloredText = function(str, x, y, horizontal, vertical, maxWidth) {
-                renderColoredText(this, str, x, y, horizontal || LEFT, vertical || BASELINE, maxWidth);
-                return this;
-            };
-        }
+        
         
         // Start FPS tracking
         refreshLoop();
         
         // Create default scenes
-        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 = "...";
-                
-                if (_p5.prototype.coloredText) {
-                    _p5.prototype.coloredText(`\\lime|Loading Game${dots}| `, 120, 200, _p5.prototype.LEFT, _p5.prototype.CENTER);
-                } else {
-                    _p5.prototype.text(`Loading Game${dots}`, 120, 200);
-                }
-                
-                _p5.prototype.textSize(16);
-                
-                let num = (Math.floor(self.timeActive / 100) / 10);
-                let percentText = `${ Math.round((10 - num) * 10) / 10 + ((num + "").length < 2 ? ".0" : "")}`;
-                
-                if (_p5.prototype.coloredText) {
-                    _p5.prototype.coloredText(`\\red|${percentText}|`, 200, 225, _p5.prototype.CENTER, _p5.prototype.CENTER);
-                } else {
-                    _p5.prototype.text(percentText, 200, 225);
-                }
-            } catch (e) {
-                // Fallback if coloredText fails
-                _p5.prototype.text(`Loading Game...`, 120, 200);
-            }
-        });
+        // Create default scenes
+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 = "...";
+        
+        // Use standalone coloredText function
+        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" : "")}`;
+        
+        // Use standalone coloredText function
+        coloredText(`\\red|${percentText}|`, 200, 225, _p5.prototype.CENTER, _p5.prototype.CENTER);
+    } catch (e) {
+        // Fallback if coloredText fails
+        _p5.prototype.text(`Loading Game...`, 120, 200);
+    }
+});
         
         Scene.activeScene = "loading";
         
@@ -2771,4 +2759,4 @@ MALC.mouse = new MouseHandler();
 
 return MALC;
 
-}));
+}));

package/malc.min.js

@@ -1,15 +1,15 @@
 (function(root,factory){if(typeof define==='function'&&define.amd){define(['p5'],factory)}else if(typeof module==='object'&&module.exports){module.exports=factory(require('p5'))}else{root.MALC=factory(root.p5)}}(typeof self!=='undefined'?self:this,function(p5){const _p5=p5;const MALCgameObjects=[];const MALCbuttons=[];const MALCScene=[];var UIPlanes=[];var buttonsToggled=!0;const GRAVITY=0.5;const TERMINAL_VELOCITY=20;function getTimestamp(){return new Date().getTime()}
 function generateId(prefix){return `${prefix}_${Date.now()}_${Math.random().toString(36).substr(2, 9)}`}
+function coloredText(str,x,y,horizontal,vertical,maxWidth){const p=_p5.prototype;const parts=parseColoredText(str);let currentX=x;let currentY=y;p.push();p.textAlign(horizontal||LEFT,vertical||BASELINE);for(const part of parts){if(part.isNewline){currentX=x;currentY+=p.textLeading()||p.textSize()*1.2;continue}
+if(part.color){try{p.fill(part.color)}catch(e){p.fill(255)}}
+p.text(part.text,currentX,currentY,maxWidth);currentX+=p.textWidth(part.text)}
+p.pop()}
 function parseColoredLine(str){const regex=/\\([^|\\\n]+)\|([^|]+)\|/g;const parts=[];let lastIndex=0;let match;while((match=regex.exec(str))!==null){if(match.index>lastIndex){parts.push({text:str.substring(lastIndex,match.index),color:null})}
 parts.push({text:match[2],color:match[1]});lastIndex=match.index+match[0].length}
 if(lastIndex<str.length){parts.push({text:str.substring(lastIndex),color:null})}
 return parts.length?parts:[{text:str,color:null}]}
 function parseColoredText(str){const lines=str.split('\n');const result=[];for(let i=0;i<lines.length;i++){const line=lines[i];const parts=parseColoredLine(line);result.push(...parts);if(i<lines.length-1){result.push({text:'\n',color:null,isNewline:!0})}}
 return result}
-function renderColoredText(p,str,x,y,horizontal,vertical,maxWidth){const parts=parseColoredText(str);let currentX=x;let currentY=y;p.push();p.textAlign(horizontal,vertical);for(const part of parts){if(part.isNewline){currentX=x;currentY+=p.textLeading()||p.textSize()*1.2;continue}
-if(part.color){try{p.fill(part.color)}catch(e){p.fill(255)}}
-p.text(part.text,currentX,currentY,maxWidth);currentX+=p.textWidth(part.text)}
-p.pop()}
 class Scene{static scenes=[];static activeScene="blank";static started=!1;static sceneHistory=[];static historyLimit=10;static update(){this.started=!0;this.scenes=MALCScene;let activeSceneFound=!1;this.scenes.forEach(S=>{if(S.id==this.activeScene){activeSceneFound=!0;this.scenes.forEach(s=>{if(s!=S){s._active=!1;s.active=!1;s.objects.forEach(o=>{if(o&&typeof o.active!=='undefined')o.active=!1})}});S.active=!0;if(!S._active){S.activated=MALC.time.getTime();if(typeof S.onActivate=='function')S.onActivate();}
 S._active=!0;S.timeActive=MALC.time.getTime()-S.activated;S.objects.forEach(o=>{if(o&&typeof o.active!=='undefined')o.active=!0});_p5.prototype.push();if(window.camera&&typeof window.camera.render=='function'){window.camera.render()}
 S.render();_p5.prototype.pop()}});if(!activeSceneFound&&this.activeScene!="blank"){console.warn(`Scene "${this.activeScene}" not found, switching to blank`);this.activeScene="blank"}}
@@ -120,8 +120,7 @@ update(boolean){super.update(boolean);if(this.cooldownActive){let currentTime=Da
 this.isHovered=this.events.hover();this.isPressed=this.events.pressed();if(this.events.clicked()&&this.onClick&&!this.isDisabled&&!this.cooldownActive){this.onClick(this);this.lastClickTime=Date.now();this.cooldownActive=!0}
 MALCbuttons[this.buttonIndex]=this}
 render(){if(!this.active)return;let btnFormat=this.formatting.button;let buttonColor;if(this.isDisabled){buttonColor=btnFormat.colors.disabled}else if(this.isPressed){buttonColor=btnFormat.colors.pressed}else if(this.isHovered){buttonColor=btnFormat.colors.hover}else{buttonColor=btnFormat.colors.normal}
-let originalColor=this.formatting.color;this.formatting.color=buttonColor;super.render();if(!this.visible)return;_p5.prototype.push();_p5.prototype.translate(this.x,this.y);if(this.rotationMode=="degrees")_p5.prototype.angleMode(_p5.prototype.DEGREES);_p5.prototype.rotate(this.rotation);_p5.prototype.textStyle(btnFormat.text.style);_p5.prototype.textSize(btnFormat.text.size);_p5.prototype.fill(btnFormat.text.color);if(_p5.prototype.coloredText){_p5.prototype.coloredText(btnFormat.text.display,0,0,_p5.prototype.CENTER,_p5.prototype.CENTER)}else{_p5.prototype.text(btnFormat.text.display,0,0)}
-_p5.prototype.pop();this.formatting.color=originalColor}
+let originalColor=this.formatting.color;this.formatting.color=buttonColor;super.render();if(!this.visible)return;_p5.prototype.push();_p5.prototype.translate(this.x,this.y);if(this.rotationMode=="degrees")_p5.prototype.angleMode(_p5.prototype.DEGREES);_p5.prototype.rotate(this.rotation);_p5.prototype.textStyle(btnFormat.text.style);_p5.prototype.textSize(btnFormat.text.size);_p5.prototype.fill(btnFormat.text.color);coloredText(btnFormat.text.display,0,0,_p5.prototype.CENTER,_p5.prototype.CENTER);_p5.prototype.pop();this.formatting.color=originalColor}
 setText(text){this.formatting.button.text.display=text;return this}
 getRGBFromColor(colorInput){let c=_p5.prototype.color(colorInput);return[_p5.prototype.red(c),_p5.prototype.green(c),_p5.prototype.blue(c)]}
 getBrightness(colorInput){let rgb=this.getRGBFromColor(colorInput);return 0.299*rgb[0]+0.587*rgb[1]+0.114*rgb[2]}
@@ -283,7 +282,7 @@ const helpDocs={overview:`
         function draw() {
             MALC.update(); // Updates all MALC systems
         }
-    `};const MALC={version:"1.0.3",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,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.4",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}`)})}
@@ -292,8 +291,6 @@ 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){_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;if(!_p5.prototype.coloredText){_p5.prototype.coloredText=function(str,x,y,horizontal,vertical,maxWidth){renderColoredText(this,str,x,y,horizontal||LEFT,vertical||BASELINE,maxWidth);return this}}
-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="...";if(_p5.prototype.coloredText){_p5.prototype.coloredText(`\\lime|Loading Game${dots}| `,120,200,_p5.prototype.LEFT,_p5.prototype.CENTER)}else{_p5.prototype.text(`Loading Game${dots}`,120,200)}
-_p5.prototype.textSize(16);let num=(Math.floor(self.timeActive/100)/10);let percentText=`${ Math.round((10 - num) * 10) / 10 + ((num + "").length < 2 ? ".0" : "")}`;if(_p5.prototype.coloredText){_p5.prototype.coloredText(`\\red|${percentText}|`,200,225,_p5.prototype.CENTER,_p5.prototype.CENTER)}else{_p5.prototype.text(percentText,200,225)}}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:function(){this.time=new Date();this.timer=this.time-this.startTime;if(this.mouse){this.mouse.rawX=_p5.prototype.mouseX;this.mouse.rawY=_p5.prototype.mouseY;this.mouse.x=this.mouse.rawX+window.camera.getOrientation()[0];this.mouse.y=this.mouse.rawY+window.camera.getOrientation()[1];this.mouse.down=_p5.prototype.mouseIsPressed}
+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:function(){this.time=new Date();this.timer=this.time-this.startTime;if(this.mouse){this.mouse.rawX=_p5.prototype.mouseX;this.mouse.rawY=_p5.prototype.mouseY;this.mouse.x=this.mouse.rawX+window.camera.getOrientation()[0];this.mouse.y=this.mouse.rawY+window.camera.getOrientation()[1];this.mouse.down=_p5.prototype.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}))

package/package.json

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