elation-engine 0.9.126 → 0.9.127

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "elation-engine",
   "description": "WebGL/WebVR engine written in Javascript",
-  "version": "0.9.126",
+  "version": "0.9.127",
   "main": "",
   "author": "James Baicoianu",
   "license": "MIT",

package/scripts/assets.js

@@ -2204,13 +2204,14 @@ console.log('set up hls', hlsConfig);
     fragment_src: false,
     vertex_src: false,
     hasalpha: false,
-    uniforms: {},
+    uniforms: [],
 
     _construct: function(args) {
       elation.class.call(this, args);
       this.instances = [];
+      if (!this.uniforms) this.uniforms = [];
       if (this.shadertype == 'shadertoy') {
-        this.uniforms = [
+        this.uniforms.push.apply(this.uniforms, [
           { name: 'iResolution', value: new THREE.Vector3(512, 512, 0, 0) },
           { name: 'iTime', value: 0 },
           { name: 'iTimeDelta', value: 0 },
@@ -2221,7 +2222,7 @@ console.log('set up hls', hlsConfig);
           { name: 'iChannel1', value: new THREE.Texture() },
           { name: 'iChannel2', value: new THREE.Texture() },
           { name: 'iChannel3', value: new THREE.Texture() },
-        ];
+        ]);
         this.uniformsMap = this.parseUniforms(this.uniforms);
         // FIXME - this hack is used to update the Shadertoy uniforms at 60fps, but it should be abstracted out and driven by the object that's using the shader
         // As a general shader harness, this will give us the means to update uniforms based on custom functions, so we can pass in things like mouse position,

package/scripts/systems/world.js

@@ -13,7 +13,7 @@ elation.require([
     };
     this.persistdelay = 1000;
     this.lastpersist = 0;
-    this.framechanges = [];
+    this.framechanges = new Set();
     this.eventMappedObjects = new Set();
 
     //this.scene['world-3d'].fog = new THREE.FogExp2(0x000000, 0.0000008);
@@ -52,6 +52,7 @@ elation.require([
         }
       }
       var uniques = this.uniques;
+/*
       while (this.framechanges.length > 0) {
         var changed = this.framechanges.pop();
         if (!uniques[changed.id]) {
@@ -59,6 +60,14 @@ elation.require([
           changed.applyChanges();
         }
       }
+*/
+      this.framechanges.forEach(changed => {
+        if (!uniques[changed.id]) {
+          uniques[changed.id] = true;
+          changed.applyChanges();
+        }
+      });
+      this.framechanges.clear();
     }
     this.engine_stop = function(ev) {
       console.log('SHUTDOWN: world');
@@ -127,7 +136,8 @@ elation.require([
     this.thing_change_queued = function(ev) {
       var thing = ev.target;
       if (thing) {
-        this.framechanges.push(thing);
+        //this.framechanges.push(thing);
+        this.framechanges.add(thing);
         this.engine.systems.render.setdirty();
       }
     }

package/scripts/things/player.js

@@ -43,7 +43,7 @@ elation.require(['engine.things.generic', 'engine.things.camera', 'engine.things
         'look_down': ['keyboard_down,gamepad_any_axis_3', elation.bind(this, this.updateControls)],
         'run': ['keyboard_shift,gamepad_any_button_10', elation.bind(this, this.updateControls)],
         //'crouch': ['keyboard_c', elation.bind(this, this.updateControls)],
-        'jump': ['keyboard_space,gamepad_any_button_1', elation.bind(this, this.handleJump)],
+        'jump': ['keyboard_space', elation.bind(this, this.handleJump)],
         //'toss': ['keyboard_space,gamepad_any_button_0,mouse_button_0', elation.bind(this, this.toss)],
         //'toss_cube': ['keyboard_shift_space,gamepad_any_button_1', elation.bind(this, this.toss_cube)],
         //'use': ['keyboard_e,gamepad_any_button_0,mouse_button_0', elation.bind(this, this.handleUse)],

package/scripts/things/skybox.js

@@ -9,6 +9,7 @@ elation.require(['engine.things.generic'], function() {
     this.setTexture = function(texture) {
       var scene = this.engine.systems.world.scene['world-3d'];
       scene.background = texture;
+      elation.events.fire({element: this, type: 'skybox_update', bubbles: true});
     }
   }, elation.engine.things.generic);
 });