littlejsengine 1.8.1 → 1.8.4

package/src/engineExport.js

@@ -1,10 +1,79 @@
 /** 
  * LittleJS Module Export
- * - Export engine as a module with functions where necessary
+ * - Export engine as a module
  */
 
 export {
-	// Setters for global variables
+
+	// Engine
+	engineName,
+	engineVersion,
+	frameRate,
+	timeDelta,
+	engineObjects,
+	frame,
+	time,
+	timeReal,
+	paused,
+	setPaused,
+	engineInit,
+	engineObjectsUpdate,
+	engineObjectsDestroy,
+	engineObjectsCallback,
+	
+	// Globals
+	debug,
+	showWatermark,
+
+	// Debug
+	ASSERT,
+	debugRect,
+	debugCircle,
+	debugPoint,
+	debugLine,
+	debugAABB,
+	debugText,
+	debugClear,
+	debugSaveCanvas,
+
+	// Settings
+	cameraPos,
+	cameraScale,
+	canvasMaxSize,
+	canvasFixedSize,
+	canvasPixelated,
+	fontDefault,
+	tileSizeDefault,
+	tileFixBleedScale,
+	enablePhysicsSolver,
+	objectDefaultMass,
+	objectDefaultDamping,
+	objectDefaultAngleDamping,
+	objectDefaultElasticity,
+	objectDefaultFriction,
+	objectMaxSpeed,
+	gravity,
+	particleEmitRateScale,
+	glEnable,
+	glOverlay,
+	gamepadsEnable,
+	gamepadDirectionEmulateStick,
+	inputWASDEmulateDirection,
+	touchGamepadEnable,
+	touchGamepadAnalog,
+	touchGamepadSize,
+	touchGamepadAlpha,
+	vibrateEnable,
+	soundEnable,
+	soundVolume,
+	soundDefaultRange,
+	soundDefaultTaper,
+	medalDisplayTime,
+	medalDisplaySlideTime,
+	medalDisplaySize,
+	medalDisplayIconSize,
+
+	// Setters for globals
 	setCameraPos,
 	setCameraScale,
 	setCanvasMaxSize,
@@ -44,58 +113,6 @@ export {
 	setShowWatermark,
 	setDebugKey,
 
-	// Settings
-	canvasMaxSize,
-	canvasFixedSize,
-	canvasPixelated,
-	fontDefault,
-	tileSizeDefault,
-	tileFixBleedScale,
-	enablePhysicsSolver,
-	objectDefaultMass,
-	objectDefaultDamping,
-	objectDefaultAngleDamping,
-	objectDefaultElasticity,
-	objectDefaultFriction,
-	objectMaxSpeed,
-	gravity,
-	particleEmitRateScale,
-	cameraPos,
-	cameraScale,
-	glEnable,
-	glOverlay,
-	gamepadsEnable,
-	gamepadDirectionEmulateStick,
-	inputWASDEmulateDirection,
-	touchGamepadEnable,
-	touchGamepadAnalog,
-	touchGamepadSize,
-	touchGamepadAlpha,
-	vibrateEnable,
-	soundEnable,
-	soundVolume,
-	soundDefaultRange,
-	soundDefaultTaper,
-	medalDisplayTime,
-	medalDisplaySlideTime,
-	medalDisplaySize,
-	medalDisplayIconSize,
-	
-	// Globals
-	debug,
-	showWatermark,
-
-	// Debug
-	ASSERT,
-	debugRect,
-	debugCircle,
-	debugPoint,
-	debugLine,
-	debugAABB,
-	debugText,
-	debugClear,
-	debugSaveCanvas,
-
 	// Utilities
 	PI,
 	abs,
@@ -133,9 +150,6 @@ export {
 	rgb,
 	hsl,
 
-	// Base
-	EngineObject,
-
 	// Draw
 	textureInfos,
 	tile,
@@ -160,6 +174,15 @@ export {
 	isFullscreen,
 	toggleFullscreen,
 
+	// WebGL
+	glCanvas,
+	glContext,
+	glSetTexture,
+	glCompileShader,
+	glCreateProgram,
+	glCreateTexture,
+	glInitPostProcess,
+
 	// Input
 	keyIsDown,
 	keyWasPressed,
@@ -194,6 +217,9 @@ export {
 	playSamples,
 	zzfx,
 
+	// Base Object
+	EngineObject,
+
 	// Tiles
 	tileCollision,
 	tileCollisionSize,
@@ -216,30 +242,4 @@ export {
 	newgroundsInit,
 	Medal,
 	Newgrounds,
-
-	// WebGL
-	glCanvas,
-	glContext,
-	glSetBlendMode,
-	glSetTexture,
-	glCompileShader,
-	glCreateProgram,
-	glCreateTexture,
-	glInitPostProcess,
-
-	// Engine
-	engineName,
-	engineVersion,
-	frameRate,
-	timeDelta,
-	engineObjects,
-	frame,
-	time,
-	timeReal,
-	paused,
-	setPaused,
-	engineInit,
-	engineObjectsUpdate,
-	engineObjectsDestroy,
-	engineObjectsCallback,
 };

package/src/engineObject.js

@@ -44,6 +44,7 @@ class EngineObject
         // set passed in params
         ASSERT(isVector2(pos) && isVector2(size)); // ensure pos and size are vec2s
         ASSERT(typeof tileInfo !== 'number' || !tileInfo); // prevent old style calls
+        ASSERT(!(renderOrder instanceof Color)); // prevent old style calls
         // to fix old calls, replace with tile(tileIndex, tileSize)
 
         /** @property {Vector2} - World space position of the object */

package/src/engineWebGL.js

@@ -42,21 +42,20 @@ function glInit()
         '#version 300 es\n' +         // specify GLSL ES version
         'precision highp float;'+     // use highp for better accuracy
         'uniform mat4 m;'+            // transform matrix
-        'in vec2 p,t;'+               // position, uv
-        'in vec4 c,a;'+               // color, additiveColor
+        'in vec4 p,c,a;'+             // position, uv, color, additiveColor
         'out vec4 v,d,e;'+            // return uv, color, additiveColor
         'void main(){'+               // shader entry point
-        'gl_Position=m*vec4(p,1,1);'+ // transform position
-        'v=vec4(t,p);d=c;e=a;'+       // pass stuff to fragment shader
+        'gl_Position=m*vec4(p.xy,1,1);'+ // transform position
+        'v=p;d=c;e=a;'+               // pass stuff to fragment shader
         '}'                           // end of shader
         ,
         '#version 300 es\n' +         // specify GLSL ES version
         'precision highp float;'+     // use highp for better accuracy
-        'in vec4 v,d,e;'+             // uv, color, additiveColor
+        'in vec4 v,d,e;'+             // position, uv, color, additiveColor
         'uniform sampler2D s;'+       // texture
         'out vec4 c;'+                // out color
         'void main(){'+               // shader entry point
-        'c=texture(s,v.xy)*d+e;'+     // modulate texture by color plus additive
+        'c=texture(s,v.zw)*d+e;'+     // modulate texture by color plus additive
         '}'                           // end of shader
     );
 
@@ -81,7 +80,7 @@ function glPreRender()
     glContext.bindTexture(gl_TEXTURE_2D, glActiveTexture = textureInfos[0].glTexture);
     glContext.bindBuffer(gl_ARRAY_BUFFER, glArrayBuffer);
     glContext.bufferData(gl_ARRAY_BUFFER, gl_VERTEX_BUFFER_SIZE, gl_DYNAMIC_DRAW);
-    glSetBlendMode();
+    glAdditive = 0;
     
     // set vertex attributes
     let offset = 0;
@@ -92,33 +91,25 @@ function glPreRender()
         glContext.vertexAttribPointer(location, size, type, normalize, gl_VERTEX_BYTE_STRIDE, offset);
         offset += size*typeSize;
     }
-    initVertexAttribArray('p', gl_FLOAT, 4, 2);            // position
-    initVertexAttribArray('t', gl_FLOAT, 4, 2);            // texture coords
+    initVertexAttribArray('p', gl_FLOAT, 4, 4);            // position & texture coords
     initVertexAttribArray('c', gl_UNSIGNED_BYTE, 1, 4, 1); // color
     initVertexAttribArray('a', gl_UNSIGNED_BYTE, 1, 4, 1); // additiveColor
 
     // build the transform matrix
     const sx = 2 * cameraScale / mainCanvas.width;
     const sy = 2 * cameraScale / mainCanvas.height;
+    const cx = -1 - sx*cameraPos.x;
+    const cy = -1 - sy*cameraPos.y;
     glContext.uniformMatrix4fv(glContext.getUniformLocation(glShader, 'm'), 0,
         new Float32Array([
-            sx, 0, 0, 0,
-            0, sy, 0, 0,
-            1, 1, -1, 1,
-            -1-sx*cameraPos.x, -1-sy*cameraPos.y, 0, 0
+            sx,  0,  0,  0,
+             0, sy,  0,  0,
+             1,  1, -1,  1,
+            cx, cy,  0,  0
         ])
     );
 }
 
-/** Set the WebGl blend mode, normally you should call setBlendMode instead
- *  @param {Boolean} [additive=0]
- *  @memberof WebGL */
-function glSetBlendMode(additive=0)
-{
-    // setup blending
-    glAdditive = additive;
-}
-
 /** Set the WebGl texture, called automatically if using multiple textures
  *  - This may also flush the gl buffer resulting in more draw calls and worse performance
  *  @param {WebGLTexture} texture
@@ -354,8 +345,11 @@ function glRenderPostProcess()
         glFlush(); // clear out the buffer
         mainContext.drawImage(glCanvas, 0, 0); // copy to the main canvas
     }
-    else // set viewport
+    else
+    {
+        // set the viewport
         glContext.viewport(0, 0, glCanvas.width = mainCanvas.width, glCanvas.height = mainCanvas.height);
+    }
 
     if (glPostIncludeOverlay)
     {