aotrautils 0.0.523 → 0.0.525

aotrautils/aotrautils.build.js

@@ -1,6 +1,6 @@
 
 
-/*utils COMMONS library associated with aotra version : «1_29072022-2359 (15/03/2023-00:52:31)»*/
+/*utils COMMONS library associated with aotra version : «1_29072022-2359 (01/07/2023-00:22:56)»*/
 /*-----------------------------------------------------------------------------*/
 
 
@@ -2852,16 +2852,19 @@ window.containsOneOf=function(container, objectsToFind,/*OPTIONAL*/useRegexp=fal
 	});
 };
 
-window.contains=function(container, objectToFind,/*OPTIONAL*/useRegexp=false,searchInKeysOnly=false){
+
+window.contains=function(container, objectToFind=null,/*OPTIONAL*/useRegexp=false,searchInKeysOnly=false){
 	if(nothing(container)){
 		// //TRACE
 		// console.log("WARN : Container is empty ! Cannot search for «"+objectToFind+"».");
 		return false;
 	}
-	if(!isString(container) && objectToFind && isFunction(objectToFind)){
-		return !!foreach(container, (item, keyOrIndex)=>{
-			if(objectToFind(item, keyOrIndex))	return true;
+	if(!isString(container) && !objectToFind && window.contains.filterFunction && isFunction(window.contains.filterFunction)){
+		const itemIsFound=!!foreach(container, (item, keyOrIndex)=>{
+			if(window.contains.filterFunction(item, keyOrIndex))	return true;
 		});
+		delete window.contains.filterFunction;
+		return itemIsFound;
 	}else{
 		// Note : We also allow the search of null plain items in a container !
 		
@@ -2893,6 +2896,11 @@ window.contains=function(container, objectToFind,/*OPTIONAL*/useRegexp=false,sea
 		return new RegExp(chunk, "gm").test(str);
 	}
 };
+window.contains.filter=function(filterFunctionParam){
+	window.contains.filterFunction=filterFunctionParam;
+	return window.contains;
+}
+
 
 window.hasKey=function(container, keyToFind){
 	let result=foreach(container,(item,key)=>{
@@ -4866,7 +4874,7 @@ AOTRAUTILS_LIB_IS_LOADED=true;
 
 
 
-/*utils CLIENT library associated with aotra version : «1_29072022-2359 (15/03/2023-00:52:31)»*/
+/*utils CLIENT library associated with aotra version : «1_29072022-2359 (01/07/2023-00:22:56)»*/
 /*-----------------------------------------------------------------------------*/
 /* ## Utility global methods in a browser (htmljs) client environment.
  *
@@ -6224,7 +6232,21 @@ function createCookie(name, value, days=null){
   document.cookie=name + "=" + value + expires + "; path=/";
 }
 
-function storeString(name, value,/* OPTIONAL */forceUseCookie){
+/*public*/function storeString(name, value, forceUseCookie=false, chunksSize=null){
+	const strLength=value.length;
+	if(!chunksSize || strLength<=chunksSize)	return storeSingleString(name, value, forceUseCookie);
+	const maxNumberOfChunks=Math.ceil(strLength/chunksSize);
+	for(let nameIndex=1,chunksIndex=0,chunk;chunksIndex<maxNumberOfChunks;){
+		chunk=value.substr(chunksIndex*chunksSize,Math.min(strLength,(chunksIndex+1)*chunksSize)-chunksIndex*chunksSize);
+		const nameStr=name+nameIndex;
+		storeSingleString(nameStr, chunk, forceUseCookie);
+		nameIndex++;
+		chunksIndex++;
+	}
+	return value;
+}
+/*private*/function storeSingleString(name, value, forceUseCookie=false){
+	
 	if((!isHTML5StorageSupported("local") || forceUseCookie ) && (typeof jQuery === "undefined"  || !jQuery )){
 		// TRACE
 		log("WARN : Storage is not supported by this browser, writing to cookie.");
@@ -6258,7 +6280,19 @@ function getCookie(cookieName){
   return "";
 }
 
-function getStringFromStorage(name,/* OPTIONAL */forceUseCookie=false){
+/*public*/function getStringFromStorage(name, forceUseCookie=false, readChunked=false){
+	const foundString=getSingleStringFromStorage(name, forceUseCookie);
+	if(!readChunked || foundString)	return foundString;
+	let result="";
+	for(let nameIndex=1,foundValue=getSingleStringFromStorage(name+nameIndex, forceUseCookie);
+			foundValue!==null;){
+		result+=foundValue;
+		nameIndex++;
+		foundValue=getSingleStringFromStorage(name+nameIndex, forceUseCookie);
+	}
+	return result;
+}
+/*public*/function getSingleStringFromStorage(name, forceUseCookie=false){
 	if((!isHTML5StorageSupported("local") || forceUseCookie  ) && (typeof jQuery === "undefined" || !jQuery ) ){
 		// TRACE
 		log("WARN : Storage is not supported by this browser, reading from cookie.");
@@ -6277,6 +6311,8 @@ function getStringFromStorage(name,/* OPTIONAL */forceUseCookie=false){
 	return result;
 }
 
+
+
 function isHTML5StorageSupported(type){
 	if (!nothing(type) && type === "local"){
 		try {
@@ -6442,6 +6478,43 @@ Function.prototype.clone=function(){
 	return temp;
 };
 
+
+/*public*/function downloadFile(name, content){
+	const tempElement=document.createElement("a");
+	tempElement.setAttribute("href","data:text/plain;charset=utf-8,"+encodeURIComponent(content));
+	tempElement.setAttribute("download",name);
+	tempElement.style.display="none";
+	
+	document.body.appendChild(tempElement);
+	tempElement.click();
+	document.body.removeChild(tempElement);
+}
+
+/*public*/function readFileContent(element){ // Needs an <input type="file" /> element
+	return new Promise((onComplete,onError)=>{
+		if(!element){
+			onError(new Error("File input element is null, cannot read file."));
+			return;
+		}
+		
+		try{
+			
+			let file=element.files[0];
+			if(!file)	return null;
+			const reader=new FileReader();
+			reader.onload=(e)=>{
+				const content=e.target.result;
+				onComplete(content);
+			};
+	
+			reader.readAsText(file);
+		}catch(error){
+			onError(error);
+		}
+	});
+}
+
+
 // Drawing and graphics management :
 
 function getBeamLikeGradient(ctx, displayX1, displayY1, displayX2, displayY2, size, color, alpha,/* OPTIONAL */zoomFactor){
@@ -7988,9 +8061,9 @@ function filterPoints(allPoints ,ctx/*DBG*/){
 	  					mediaHandler.video.volume=0.0000000000001;
 	//  				mediaHandler.video.autoplay=true;
 	
-							if(tagConfig && tagConfig.videoToUse && tagConfig.videoZoom){
-								if(isNumber(tagConfig.videoZoom)){
-									mediaHandler.video.style.scale=tagConfig.videoZoom;
+							if(tagConfig && tagConfig.videoToUse && tagConfig.videoScale){
+								if(isNumber(tagConfig.videoScale)){
+									mediaHandler.video.style.scale=tagConfig.videoScale;
 								}
 							}
 							
@@ -8181,7 +8254,7 @@ function filterPoints(allPoints ,ctx/*DBG*/){
 
 // CAUTION : uses a temporary canvas !
 drawVideoImage=function(canvas,videoImage,
-		/*OPTIONAL*/xParam,/*OPTIONAL*/yParam,/*OPTIONAL*/zoomParam,
+		/*OPTIONAL*/xParam,/*OPTIONAL*/yParam,/*OPTIONAL*/zoomsParam,
 		/*OPTIONAL*/newWidthParam,/*OPTIONAL*/newHeightParam,
 		/*OPTIONAL*/isMessWithAlpha){
 	
@@ -8191,7 +8264,7 @@ drawVideoImage=function(canvas,videoImage,
 	
 	var x=nonull(xParam,0);
 	var y=nonull(yParam,0);
-	var zoom=nonull(zoomParam,1);
+	const zooms=nonull(zoomsParam,{zx:1,zy:1});
 	
 	var newWidth=newWidthParam?newWidthParam:canvas.width;
 	var newHeight=newHeightParam?newHeightParam:canvas.height;
@@ -8275,7 +8348,7 @@ drawVideoImage=function(canvas,videoImage,
 			
 			tempCtx.restore();
 	
-			ctx.scale(nonull(scaleX,scaleY)*zoom, nonull(scaleY,scaleX)*zoom); // default values are replaceable (to make sure we actually choose one) !
+			ctx.scale(nonull(scaleX,scaleY)*zooms.zx, nonull(scaleY,scaleX)*zooms.zy); // default values are replaceable (to make sure we actually choose one) !
 	
 	//	NO : PROVOKES BLINKING:	ctx.clearRect(0, 0, newWidth, newHeight);
 			ctx.drawImage(tempCanvas,x,y);
@@ -8869,29 +8942,29 @@ function loadSound(filePath,doOnLoaded=null,doOnEnded=null){
 
 
 
-function getCenteredZoneCoords(xParam,yParam,width,height,center={x:"left",y:"top"}){
+function getZoomedCenteredZoneCoords(xParam,yParam,width,height,center={x:"left",y:"top"}, zooms={zx:1,zy:1}){
 
 	if(center===null)	center={x:"left",y:"top"};
 	
 	let x=xParam; // case "left"
 	if(center.x==="center"){
-		x=xParam-Math.floor(width*.5);
+		x=(xParam-Math.floor(width*.5));
 	}else if(center.x==="right"){
-		x=xParam-width;
+		x=(xParam-width);
 	}
 
 	let y=yParam; // case "top"
 	if(center.y==="center"){
-		y=yParam-Math.floor(height*.5);
+		y=(yParam-Math.floor(height*.5));
 	}else if(center.y==="bottom"){
-		y=yParam-height;
+		y=(yParam-height);
 	}
 	
-	return {x:x,y:y,w:width,h:height,center:center};
+	return {x:x*zooms.zx, y:y*zooms.zy, w:width*zooms.zx, h:height*zooms.zy, center:center};
 }
 
 
-function drawImageAndCenter(ctx,image,xParam=0,yParam=0,zooms={zx:1,zy:1},center={x:"left",y:"top"},
+function drawImageAndCenterWithZooms(ctx,image,xParam=0,yParam=0,zooms={zx:1,zy:1},center={x:"left",y:"top"},
 			scaleFactorW=1,scaleFactorH=1,
 			sizeW=null,sizeH=null,
 			opacity=1,
@@ -8902,11 +8975,14 @@ function drawImageAndCenter(ctx,image,xParam=0,yParam=0,zooms={zx:1,zy:1},center
 	
 	let clipPos=(clip?{x:clip.x, y:clip.y}:{x:0,y:0});
 	let clipSize=(clip?{w:clip.w, h:clip.h}:{w:image.width,h:image.height});
+
+	const drawingWidth=nonull(sizeW, Math.trunc(clipSize.w*scaleFactorW));
+	const drawingHeight=nonull(sizeH, Math.trunc(clipSize.h*scaleFactorH));
+	zooms=nonull(zooms,{zx:1,zy:1});
+	const zoomedDrawingWidth=drawingWidth*zooms.zx;
+	const zoomedDrawingHeight=drawingHeight*zooms.zy;
 	
-	let drawingWidth=nonull(sizeW, Math.trunc(clipSize.w*scaleFactorW));
-	let drawingHeight=nonull(sizeH, Math.trunc(clipSize.h*scaleFactorH));
-	
-	let centeredCoords=getCenteredZoneCoords(xParam,yParam,drawingWidth,drawingHeight,center);
+	const zoomedCenteredCoords=getZoomedCenteredZoneCoords(xParam,yParam,drawingWidth,drawingHeight,center,zooms);
 	
 	if((opacity!==1 && opacity!==0 ) || alphaAngleRadians!=null){
 		if(!preserveContextState || alphaAngleRadians!=null)	ctx.save();
@@ -8918,6 +8994,10 @@ function drawImageAndCenter(ctx,image,xParam=0,yParam=0,zooms={zx:1,zy:1},center
 	
 	if(opacity!==0){
 
+		const x=zoomedCenteredCoords.x;
+		const y=zoomedCenteredCoords.y;
+			
+
 		if(alphaAngleRadians==null){
 		
 			ctx.drawImage(image,
@@ -8925,39 +9005,31 @@ function drawImageAndCenter(ctx,image,xParam=0,yParam=0,zooms={zx:1,zy:1},center
 					clipPos.x, clipPos.y,
 					clipSize.w, clipSize.h,
 					// Drawing destination (including scaling) :
-					centeredCoords.x, centeredCoords.y,
-					drawingWidth, drawingHeight);
+					x, y,
+					zoomedDrawingWidth, zoomedDrawingHeight);
 		}else{
 		
 			let angleRadians=alphaAngleRadians;
 
-			let demiW=drawingWidth*.5;
-			let demiH=drawingHeight*.5;
+			let demiW=zoomedDrawingWidth*.5;
+			let demiH=zoomedDrawingHeight*.5;
 
 			// Default rotation center is the center of the image :			
 			let rotationCenterOffsetX=demiW;
 			let rotationCenterOffsetY=demiH;
 			if(center){
-				if(center.x=="left")		rotationCenterOffsetX=0;
-				else if(center.x=="right")	rotationCenterOffsetX=drawingWidth;
+				if(center.x=="left")				rotationCenterOffsetX=0;
+				else if(center.x=="right")	rotationCenterOffsetX=zoomedDrawingWidth;
 				// Default rotation center is the center of the image.
-				if(center.y=="top")			rotationCenterOffsetY=0;	 			// CAUTION : Y axis is inverted here !
-				else if(center.y=="bottom")	rotationCenterOffsetY=drawingHeight;	// CAUTION : Y axis is inverted here !
+				if(center.y=="top")					rotationCenterOffsetY=0;	 			// CAUTION : Y axis is inverted here !
+				else if(center.y=="bottom")	rotationCenterOffsetY=zoomedDrawingHeight;	// CAUTION : Y axis is inverted here !
 				// Default rotation center is the center of the image.
 			}
-			
-			// OLD : 
-//			let x=centeredCoords.x;
-//			let y=centeredCoords.y;
-//			let t=Math.rotateAround(angleRadians, demiW, demiH);
-//			ctx.translate(x+demiW -t.x, y+demiH -t.y);
-//			ctx.rotate(angleRadians);
-
-			let x=centeredCoords.x;
-			let y=centeredCoords.y;
-			const a= Math.coerceAngle(-angleRadians,true,true); // BECAUSE Y AXIS IS INVERTED !
-			let t=Math.rotateAround(a, rotationCenterOffsetX, rotationCenterOffsetY);
-			ctx.translate(x+rotationCenterOffsetX-t.x, y-t.y+rotationCenterOffsetY);
+
+
+			const a=Math.coerceAngle(-angleRadians,true,true); // BECAUSE Y AXIS IS INVERTED !
+			const t=Math.rotateAround(a, rotationCenterOffsetX, rotationCenterOffsetY);
+			ctx.translate((x+rotationCenterOffsetX-t.x), (y-t.y+rotationCenterOffsetY));
 			ctx.rotate(a);
 
 			ctx.drawImage(image,
@@ -8966,7 +9038,7 @@ function drawImageAndCenter(ctx,image,xParam=0,yParam=0,zooms={zx:1,zy:1},center
 					clipSize.w, clipSize.h,
 					// Drawing destination (including scaling) :
 					0,0,
-					drawingWidth, drawingHeight);
+					zoomedDrawingWidth, zoomedDrawingHeight);
 		
 		}
 				
@@ -8977,7 +9049,7 @@ function drawImageAndCenter(ctx,image,xParam=0,yParam=0,zooms={zx:1,zy:1},center
 		ctx.restore();
 	}
 	
-	return centeredCoords;
+	return zoomedCenteredCoords;
 }
 
 
@@ -8989,7 +9061,8 @@ function drawImageAndCenter(ctx,image,xParam=0,yParam=0,zooms={zx:1,zy:1},center
 function getSpriteMonoThreaded(imagesPool,/*OPTIONAL*/refreshMillis=null,
 		clipSize={w:100,h:100},scaleFactorW=1,scaleFactorH=1,
 		orientation="horizontal",xOffset=0,yOffset=0,isLoop=true,isRandom=false,
-		center={x:"left",y:"top"}, zoom=1){
+		center={x:"left",y:"top"},
+		zoomsParam={zx:1,zy:1}){
 
 	
 	// Two-states : started, stopped.
@@ -9005,7 +9078,7 @@ function getSpriteMonoThreaded(imagesPool,/*OPTIONAL*/refreshMillis=null,
 		scaleFactorH:scaleFactorH,
 		xOffset:xOffset,
 		yOffset:yOffset,
-		zoom:nonull(zoom,1),
+		zooms:nonull(zoomsParam,{zx:1,zy:1}),
 		
 		// Clip only attributes:
 		clipSize:(isClip?clipSize:null),
@@ -9025,7 +9098,7 @@ function getSpriteMonoThreaded(imagesPool,/*OPTIONAL*/refreshMillis=null,
 		},
 		
 		// Draw :
-		drawOnEachStep:function(ctx,xParam,yParam,angle=null,opacity=1){
+		drawOnEachStepZoomedIfNeeded:function(ctx,xParam,yParam,angle=null,opacity=1){
 			
 			let drawingWidth, drawingHeight;
 			let img=null;
@@ -9062,31 +9135,19 @@ function getSpriteMonoThreaded(imagesPool,/*OPTIONAL*/refreshMillis=null,
 			}
 			
 
-// OLD :		
-//			let centeredCoords=getCenteredZoneCoords(xParam,yParam,drawingWidth,drawingHeight,self.center);
-//			
-//			// TODO : ADD COLOR LAYER !...
-//			
-//			// Drawing the sprite image, centered with the wished center :
-//			ctx.drawImage(
-//					nonull(img, self.imagesPool),
-//					(isClip?clipX:0), (isClip?clipY:0),
-//					self.clipSize.w, self.clipSize.h,
-//					centeredCoords.x+self.xOffset, centeredCoords.y+self.yOffset, 
-//					drawingWidth, drawingHeight);
-					
-
 			const xImage=xParam+self.xOffset;
 			const yImage=yParam+self.yOffset;
 			
-			drawImageAndCenter(ctx, nonull(img,self.imagesPool),
+			const zooms=self.zooms;
+			
+			drawImageAndCenterWithZooms(ctx, nonull(img,self.imagesPool),
 				xImage, yImage, 
-				{zx:1,zy:1},
+				zooms,
 				self.center, 
-				(self.scaleFactorW*self.zoom),
-				(self.scaleFactorH*self.zoom),
-				(!isClip?(drawingWidth*self.zoom):null),
-				(!isClip?(drawingHeight*self.zoom):null),
+				(self.scaleFactorW),
+				(self.scaleFactorH),
+				(!isClip?(drawingWidth):null),
+				(!isClip?(drawingHeight):null),
 				opacity,
 				false,
 				(isClip?{x:clipX,y:clipY, w:self.clipSize.w, h:self.clipSize.h}:{x:0,y:0, w:self.clipSize.w, h:self.clipSize.h}),
@@ -9114,10 +9175,6 @@ function getSpriteMonoThreaded(imagesPool,/*OPTIONAL*/refreshMillis=null,
 					}
 				}
 
-				// DOES NOT WORK :
-//				return ctx.getImageData(clipX,clipY,drawingWidth,drawingHeight);
-//			}else{
-//				return ctx.getImageData(0,0,drawingWidth,drawingHeight);
 			}
 		},
 		
@@ -13078,7 +13135,13 @@ createOritaMicroClient=function(url, port, isNode=false, staticMicroClientIdPara
 };
 
 
-/*utils GEOMETRY library associated with aotra version : «1_29072022-2359 (15/03/2023-00:52:31)»*/
+
+
+
+
+
+
+/*utils GEOMETRY library associated with aotra version : «1_29072022-2359 (01/07/2023-00:22:56)»*/
 /*-----------------------------------------------------------------------------*/
 
 
@@ -13743,7 +13806,18 @@ window.getSunShadowProjectedPoint=function(originalPoint,angleDegreesParam,groun
 }
 
 
-window.isInZone=function(point, zone, zoneOffsets=null, center={x:"center",y:"center",z:"center"}, invertYAxis=false){
+window.isInZone=function(point, zone, zoneOffsets=null, center={x:"center",y:"center",z:"center"}, invertYAxis=false, zooms=null){
+	
+	if(!center){
+		center={x:"center",y:"center",z:"center"}
+	}
+	if(invertYAxis==null){
+		invertYAxis=false;
+	}
+	if(zooms){
+		point=getZoomedPosition(point, zooms);
+		zone=getZoomedZone(zone, zooms);
+	}
 	
 	let pointX=point.x;
 	let pointY=point.y;
@@ -14306,7 +14380,7 @@ function rayVsUnitSphereClosestPoint(p, r) {
 // MUST REMAIN AT THE END OF THIS LIBRARY FILE !
 
 AOTRAUTILS_GEOMETRY_LIB_IS_LOADED=true;
-/*utils SERVER library associated with aotra version : «1_29072022-2359 (15/03/2023-00:52:31)»*/
+/*utils SERVER library associated with aotra version : «1_29072022-2359 (01/07/2023-00:22:56)»*/
 /*-----------------------------------------------------------------------------*/
 
 
@@ -14734,6 +14808,7 @@ WebsocketImplementation={
 						};
 						
 						
+						///!!!
 						nodeServerInstance.receptionEntryPoints.push(receptionEntryPoint);
 						
 						// SPECIAL FOR THE SOCKETIO IMPLEMENTATION :
@@ -15069,6 +15144,7 @@ WebsocketImplementation={
 						};
 						
 						
+						///!!!
 						nodeClientInstance.receptionEntryPoints.push(receptionEntryPoint);
 						
 						// SPECIAL FOR THE SOCKETIO IMPLEMENTATION :
@@ -15266,8 +15342,9 @@ WebsocketImplementation={
 								}
 						};
 						
+						///!!!
 						// TODO : ADD TO ALL OTHER SUBSYSTEMS !
-						if(!contains(browserInstance.receptionEntryPoints,(l)=>(l.id && receptionEntryPoint.id && l.id===receptionEntryPoint.id)))
+						if(!contains.filter((l)=>(l.id && receptionEntryPoint.id && l.id===receptionEntryPoint.id))(browserInstance.receptionEntryPoints))
 							browserInstance.receptionEntryPoints.push(receptionEntryPoint);
 						
 						// SPECIAL FOR THE SOCKETIO IMPLEMENTATION :

aotrautils/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "aotrautils",
-	"version": "0.0.523",
+	"version": "0.0.525",
 	"main": "aotrautils.build.js",
 	"description": "A library for vanilla javascript utils (client-side) used in aotra javascript CMS",
 	"author": "Jeremie Ratomposon <info@alqemia.com> (https://alqemia.com)",