ohzi-core 12.5.2 → 12.7.0

package/src/scenes/loading_states/LoadingState.js

@@ -1,117 +1,117 @@
-import { ResourceContainer } from 'ohzi-core';
-
-import { AsyncAudiosLoader } from '../../loaders/AsyncAudiosLoader';
-import { AsyncObjectsLoader } from '../../loaders/AsyncObjectsLoader';
-import { AsyncTexturesLoader } from '../../loaders/AsyncTexturesLoader';
-import { CompilatorManager } from './CompilatorManager';
-
-export class LoadingState
-{
-  constructor(scene, { SceneCompilator, TexturesCompilator, AudiosCompilator })
-  {
-    this.scene = scene;
-
-    this.SceneCompilator = SceneCompilator;
-    this.TexturesCompilator = TexturesCompilator;
-    this.AudiosCompilator = AudiosCompilator;
-
-    this.loaders = [];
-    this.compilators = [];
-
-    this.callback_called = false;
-  }
-
-  set_assets(scene_objects, scene_textures, scene_sounds, custom_loaders = [], custom_compilators = [], custom_data = [])
-  {
-    this.scene_objects = scene_objects;
-    this.scene_textures = scene_textures;
-    this.scene_sounds = scene_sounds;
-
-    this.custom_loaders = custom_loaders;
-    this.custom_compilators = custom_compilators;
-    this.custom_data = custom_data;
-  }
-
-  get loading_progress()
-  {
-    let progress = 0;
-
-    for (let i = 0; i < this.loaders.length; i++)
-    {
-      const loader = this.loaders[i];
-      progress += loader.get_progress();
-    }
-    return progress / this.loaders.length;
-  }
-
-  load()
-  {
-    this.setup_loader();
-
-    // TODO: improve this.
-    // We call load method to one of the 3 loaders because they share the same worker.
-    this.loaders[0].load();
-  }
-
-  on_enter()
-  {
-  }
-
-  on_exit()
-  {
-  }
-
-  update()
-  {
-
-  }
-
-  setup_loader()
-  {
-    const compilators = [];
-
-    const assets_worker = ResourceContainer.get('assets_worker');
-    assets_worker.postMessage({ type: 'reset', loader_name: this.scene.name });
-
-    const object_loader = new AsyncObjectsLoader(this.scene.name, this.scene_objects, assets_worker);
-    this.loaders.push(object_loader);
-    compilators.push(new this.SceneCompilator(this.scene));
-
-    const textures_loader = new AsyncTexturesLoader(this.scene.name, this.scene_textures, assets_worker);
-    this.loaders.push(textures_loader);
-    compilators.push(new this.TexturesCompilator(textures_loader.get_assets_names()));
-
-    const audios_loader = new AsyncAudiosLoader(this.scene.name, this.scene_sounds, assets_worker);
-    this.loaders.push(audios_loader);
-    compilators.push(new this.AudiosCompilator(audios_loader.get_assets_names()));
-
-    for (let i = 0; i < this.custom_loaders.length; i++)
-    {
-      const loader = new this.custom_loaders[i](this.scene.name, this.custom_data[i], assets_worker);
-      this.loaders.push(loader);
-      compilators.push(new this.custom_compilators[i](loader.get_assets_names()));
-    }
-
-    this.compilator_manager = new CompilatorManager(compilators);
-  }
-
-  is_loaded()
-  {
-    let loaded = true;
-
-    for (let i = 0; i < this.loaders.length; i++)
-    {
-      const loader = this.loaders[i];
-
-      loaded = loaded && loader.is_loaded();
-    }
-
-    return loaded;
-  }
-
-  is_compiled()
-  {
-    this.compilator_manager.update();
-    return this.compilator_manager.is_finished();
-  }
-}
+import { ResourceContainer } from 'ohzi-core';
+
+import { AsyncAudiosLoader } from '../../loaders/AsyncAudiosLoader';
+import { AsyncObjectsLoader } from '../../loaders/AsyncObjectsLoader';
+import { AsyncTexturesLoader } from '../../loaders/AsyncTexturesLoader';
+import { CompilatorManager } from './CompilatorManager';
+
+export class LoadingState
+{
+  constructor(scene, { SceneCompilator, TexturesCompilator, AudiosCompilator })
+  {
+    this.scene = scene;
+
+    this.SceneCompilator = SceneCompilator;
+    this.TexturesCompilator = TexturesCompilator;
+    this.AudiosCompilator = AudiosCompilator;
+
+    this.loaders = [];
+    this.compilators = [];
+
+    this.callback_called = false;
+  }
+
+  set_assets(scene_objects, scene_textures, scene_sounds, custom_loaders = [], custom_compilators = [], custom_data = [])
+  {
+    this.scene_objects = scene_objects;
+    this.scene_textures = scene_textures;
+    this.scene_sounds = scene_sounds;
+
+    this.custom_loaders = custom_loaders;
+    this.custom_compilators = custom_compilators;
+    this.custom_data = custom_data;
+  }
+
+  get loading_progress()
+  {
+    let progress = 0;
+
+    for (let i = 0; i < this.loaders.length; i++)
+    {
+      const loader = this.loaders[i];
+      progress += loader.get_progress();
+    }
+    return progress / this.loaders.length;
+  }
+
+  load()
+  {
+    this.setup_loader();
+
+    // TODO: improve this.
+    // We call load method to one of the 3 loaders because they share the same worker.
+    this.loaders[0].load();
+  }
+
+  on_enter()
+  {
+  }
+
+  on_exit()
+  {
+  }
+
+  update()
+  {
+
+  }
+
+  setup_loader()
+  {
+    const compilators = [];
+
+    const assets_worker = ResourceContainer.get('assets_worker');
+    assets_worker.postMessage({ type: 'reset', loader_name: this.scene.name });
+
+    const object_loader = new AsyncObjectsLoader(this.scene.name, this.scene_objects, assets_worker);
+    this.loaders.push(object_loader);
+    compilators.push(new this.SceneCompilator(this.scene));
+
+    const textures_loader = new AsyncTexturesLoader(this.scene.name, this.scene_textures, assets_worker);
+    this.loaders.push(textures_loader);
+    compilators.push(new this.TexturesCompilator(textures_loader.get_assets_names()));
+
+    const audios_loader = new AsyncAudiosLoader(this.scene.name, this.scene_sounds, assets_worker);
+    this.loaders.push(audios_loader);
+    compilators.push(new this.AudiosCompilator(audios_loader.get_assets_names()));
+
+    for (let i = 0; i < this.custom_loaders.length; i++)
+    {
+      const loader = new this.custom_loaders[i](this.scene.name, this.custom_data[i], assets_worker);
+      this.loaders.push(loader);
+      compilators.push(new this.custom_compilators[i](loader.get_assets_names()));
+    }
+
+    this.compilator_manager = new CompilatorManager(compilators);
+  }
+
+  is_loaded()
+  {
+    let loaded = true;
+
+    for (let i = 0; i < this.loaders.length; i++)
+    {
+      const loader = this.loaders[i];
+
+      loaded = loaded && loader.is_loaded();
+    }
+
+    return loaded;
+  }
+
+  is_compiled()
+  {
+    this.compilator_manager.update();
+    return this.compilator_manager.is_finished();
+  }
+}

package/src/scenes/loading_states/RegularLoadingState.js

@@ -1,41 +1,41 @@
-import { LoadingState } from './LoadingState';
-
-export class RegularLoadingState extends LoadingState
-{
-  constructor(scene, compilators)
-  {
-    super(scene, compilators);
-
-    this.on_assets_ready_called = false;
-  }
-
-  on_enter()
-  {
-    super.on_enter();
-    // this.setup_loader();
-  }
-
-  on_exit()
-  {
-    super.on_exit();
-  }
-
-  update()
-  {
-    super.update();
-
-    if (this.is_loaded())
-    {
-      if (!this.on_assets_ready_called)
-      {
-        this.scene.on_assets_ready();
-        this.on_assets_ready_called = true;
-      }
-
-      if (this.is_compiled())
-      {
-        this.scene.on_assets_compiled();
-      }
-    }
-  }
-}
+import { LoadingState } from './LoadingState';
+
+export class RegularLoadingState extends LoadingState
+{
+  constructor(scene, compilators)
+  {
+    super(scene, compilators);
+
+    this.on_assets_ready_called = false;
+  }
+
+  on_enter()
+  {
+    super.on_enter();
+    // this.setup_loader();
+  }
+
+  on_exit()
+  {
+    super.on_exit();
+  }
+
+  update()
+  {
+    super.update();
+
+    if (this.is_loaded())
+    {
+      if (!this.on_assets_ready_called)
+      {
+        this.scene.on_assets_ready();
+        this.on_assets_ready_called = true;
+      }
+
+      if (this.is_compiled())
+      {
+        this.scene.on_assets_compiled();
+      }
+    }
+  }
+}

package/src/shaders/add/add.frag

@@ -1,28 +1,28 @@
-uniform sampler2D _MainTex;
-uniform sampler2D _SecondTex;
-
-varying vec2 vUv;
-
-vec4 sampleTex(sampler2D tex, vec2 uv)
-{
-  vec4 col = texture2D( tex, uv);
-
-  #ifndef USE_LINEAR_COLOR_SPACE
-    col.rgb = pow(col.rgb, vec3(2.2));
-  #endif
-
-  return col;
-}
-void main()
-{
-	vec4 col0 = sampleTex(_MainTex, vUv);
-	vec4 col1 = sampleTex(_SecondTex, vUv);
-
-
-  gl_FragColor = col0+col1;
-	// gl_FragColor = texture2D(_SecondTex, vUv);
-  gl_FragColor.rgb = pow(gl_FragColor.rgb, vec3(0.4545));
-
-	// gl_FragColor = texture2D(_MainTex, vUv)+texture2D(_SecondTex, vUv);
-
+uniform sampler2D _MainTex;
+uniform sampler2D _SecondTex;
+
+varying vec2 vUv;
+
+vec4 sampleTex(sampler2D tex, vec2 uv)
+{
+  vec4 col = texture2D( tex, uv);
+
+  #ifndef USE_LINEAR_COLOR_SPACE
+    col.rgb = pow(col.rgb, vec3(2.2));
+  #endif
+
+  return col;
+}
+void main()
+{
+	vec4 col0 = sampleTex(_MainTex, vUv);
+	vec4 col1 = sampleTex(_SecondTex, vUv);
+
+
+  gl_FragColor = col0+col1;
+	// gl_FragColor = texture2D(_SecondTex, vUv);
+  gl_FragColor.rgb = pow(gl_FragColor.rgb, vec3(0.4545));
+
+	// gl_FragColor = texture2D(_MainTex, vUv)+texture2D(_SecondTex, vUv);
+
 }

package/src/shaders/anti_aliasing/fxaa.frag

@@ -1,72 +1,72 @@
-// FXAA shader, GLSL code adapted from:
-// http://horde3d.org/wiki/index.php5?title=Shading_Technique_-_FXAA
-// Whitepaper describing the technique:
-// http://developer.download.nvidia.com/assets/gamedev/files/sdk/11/FXAA_WhitePaper.pdf
-
-// from: https://code.google.com/p/processing/source/browse/trunk/processing/java/libraries/opengl/examples/Shaders/FXAA/data/fxaa.glsl?r=9668
-
-uniform sampler2D _MainTex;
-uniform vec2 _Resolution;
-
-varying vec2 vUv;
-
-
-void main() {
-    // The inverse of the texture dimensions along X and Y
-  vec2 texcoordOffset = 1. / _Resolution;
-
-  //varying vec4 vertColor;
-  vec4 vertTexcoord = vec4( vUv, 1., 1. );
-
-  // The parameters are hardcoded for now, but could be
-  // made into uniforms to control fromt he program.
-  float FXAA_SPAN_MAX = 8.0;
-  float FXAA_REDUCE_MUL = 1.0/8.0;
-  float FXAA_REDUCE_MIN = (1.0/128.0);
-
-  vec3 rgbNW = texture2D(_MainTex, vertTexcoord.xy + (vec2(-1.0, -1.0) * texcoordOffset)).xyz;
-  vec3 rgbNE = texture2D(_MainTex, vertTexcoord.xy + (vec2(+1.0, -1.0) * texcoordOffset)).xyz;
-  vec3 rgbSW = texture2D(_MainTex, vertTexcoord.xy + (vec2(-1.0, +1.0) * texcoordOffset)).xyz;
-  vec3 rgbSE = texture2D(_MainTex, vertTexcoord.xy + (vec2(+1.0, +1.0) * texcoordOffset)).xyz;
-  vec3 rgbM  = texture2D(_MainTex, vertTexcoord.xy).xyz;
-
-  vec3 luma = vec3(0.299, 0.587, 0.114);
-  float lumaNW = dot(rgbNW, luma);
-  float lumaNE = dot(rgbNE, luma);
-  float lumaSW = dot(rgbSW, luma);
-  float lumaSE = dot(rgbSE, luma);
-  float lumaM  = dot( rgbM, luma);
-
-  float lumaMin = min(lumaM, min(min(lumaNW, lumaNE), min(lumaSW, lumaSE)));
-  float lumaMax = max(lumaM, max(max(lumaNW, lumaNE), max(lumaSW, lumaSE)));
-
-  vec2 dir;
-  dir.x = -((lumaNW + lumaNE) - (lumaSW + lumaSE));
-  dir.y =  ((lumaNW + lumaSW) - (lumaNE + lumaSE));
-
-  float dirReduce = max((lumaNW + lumaNE + lumaSW + lumaSE) * (0.25 * FXAA_REDUCE_MUL), FXAA_REDUCE_MIN);
-
-  float rcpDirMin = 1.0/(min(abs(dir.x), abs(dir.y)) + dirReduce);
-
-  dir = min(vec2(FXAA_SPAN_MAX,  FXAA_SPAN_MAX),
-        max(vec2(-FXAA_SPAN_MAX, -FXAA_SPAN_MAX), dir * rcpDirMin)) * texcoordOffset;
-
-  vec3 rgbA = (1.0/2.0) * (
-              texture2D(_MainTex, vertTexcoord.xy + dir * (1.0/3.0 - 0.5)).xyz +
-              texture2D(_MainTex, vertTexcoord.xy + dir * (2.0/3.0 - 0.5)).xyz);
-  vec3 rgbB = rgbA * (1.0/2.0) + (1.0/4.0) * (
-              texture2D(_MainTex, vertTexcoord.xy + dir * (0.0/3.0 - 0.5)).xyz +
-              texture2D(_MainTex, vertTexcoord.xy + dir * (3.0/3.0 - 0.5)).xyz);
-  float lumaB = dot(rgbB, luma);
-
-  if((lumaB < lumaMin) || (lumaB > lumaMax)){
-    gl_FragColor.xyz=rgbA;
-  } else {
-    gl_FragColor.xyz=rgbB;
-  }
-  gl_FragColor.a = 1.0;
-
-  // gl_FragColor = vec4(texture2D(_MainTex, vUv).rgb, 1.0);
-  // gl_FragColor = vec4(1.0, 0.0, 0.0, 0.0);
-  //gl_FragColor *= vertColor;
-}
+// FXAA shader, GLSL code adapted from:
+// http://horde3d.org/wiki/index.php5?title=Shading_Technique_-_FXAA
+// Whitepaper describing the technique:
+// http://developer.download.nvidia.com/assets/gamedev/files/sdk/11/FXAA_WhitePaper.pdf
+
+// from: https://code.google.com/p/processing/source/browse/trunk/processing/java/libraries/opengl/examples/Shaders/FXAA/data/fxaa.glsl?r=9668
+
+uniform sampler2D _MainTex;
+uniform vec2 _Resolution;
+
+varying vec2 vUv;
+
+
+void main() {
+    // The inverse of the texture dimensions along X and Y
+  vec2 texcoordOffset = 1. / _Resolution;
+
+  //varying vec4 vertColor;
+  vec4 vertTexcoord = vec4( vUv, 1., 1. );
+
+  // The parameters are hardcoded for now, but could be
+  // made into uniforms to control fromt he program.
+  float FXAA_SPAN_MAX = 8.0;
+  float FXAA_REDUCE_MUL = 1.0/8.0;
+  float FXAA_REDUCE_MIN = (1.0/128.0);
+
+  vec3 rgbNW = texture2D(_MainTex, vertTexcoord.xy + (vec2(-1.0, -1.0) * texcoordOffset)).xyz;
+  vec3 rgbNE = texture2D(_MainTex, vertTexcoord.xy + (vec2(+1.0, -1.0) * texcoordOffset)).xyz;
+  vec3 rgbSW = texture2D(_MainTex, vertTexcoord.xy + (vec2(-1.0, +1.0) * texcoordOffset)).xyz;
+  vec3 rgbSE = texture2D(_MainTex, vertTexcoord.xy + (vec2(+1.0, +1.0) * texcoordOffset)).xyz;
+  vec3 rgbM  = texture2D(_MainTex, vertTexcoord.xy).xyz;
+
+  vec3 luma = vec3(0.299, 0.587, 0.114);
+  float lumaNW = dot(rgbNW, luma);
+  float lumaNE = dot(rgbNE, luma);
+  float lumaSW = dot(rgbSW, luma);
+  float lumaSE = dot(rgbSE, luma);
+  float lumaM  = dot( rgbM, luma);
+
+  float lumaMin = min(lumaM, min(min(lumaNW, lumaNE), min(lumaSW, lumaSE)));
+  float lumaMax = max(lumaM, max(max(lumaNW, lumaNE), max(lumaSW, lumaSE)));
+
+  vec2 dir;
+  dir.x = -((lumaNW + lumaNE) - (lumaSW + lumaSE));
+  dir.y =  ((lumaNW + lumaSW) - (lumaNE + lumaSE));
+
+  float dirReduce = max((lumaNW + lumaNE + lumaSW + lumaSE) * (0.25 * FXAA_REDUCE_MUL), FXAA_REDUCE_MIN);
+
+  float rcpDirMin = 1.0/(min(abs(dir.x), abs(dir.y)) + dirReduce);
+
+  dir = min(vec2(FXAA_SPAN_MAX,  FXAA_SPAN_MAX),
+        max(vec2(-FXAA_SPAN_MAX, -FXAA_SPAN_MAX), dir * rcpDirMin)) * texcoordOffset;
+
+  vec3 rgbA = (1.0/2.0) * (
+              texture2D(_MainTex, vertTexcoord.xy + dir * (1.0/3.0 - 0.5)).xyz +
+              texture2D(_MainTex, vertTexcoord.xy + dir * (2.0/3.0 - 0.5)).xyz);
+  vec3 rgbB = rgbA * (1.0/2.0) + (1.0/4.0) * (
+              texture2D(_MainTex, vertTexcoord.xy + dir * (0.0/3.0 - 0.5)).xyz +
+              texture2D(_MainTex, vertTexcoord.xy + dir * (3.0/3.0 - 0.5)).xyz);
+  float lumaB = dot(rgbB, luma);
+
+  if((lumaB < lumaMin) || (lumaB > lumaMax)){
+    gl_FragColor.xyz=rgbA;
+  } else {
+    gl_FragColor.xyz=rgbB;
+  }
+  gl_FragColor.a = 1.0;
+
+  // gl_FragColor = vec4(texture2D(_MainTex, vUv).rgb, 1.0);
+  // gl_FragColor = vec4(1.0, 0.0, 0.0, 0.0);
+  //gl_FragColor *= vertColor;
+}

package/src/shaders/basic_color/basic_color.frag

@@ -1,6 +1,6 @@
-uniform vec3 _Color;
-
-void main()
-{
-    gl_FragColor = vec4(_Color, 1.0);
+uniform vec3 _Color;
+
+void main()
+{
+    gl_FragColor = vec4(_Color, 1.0);
 }

package/src/shaders/basic_color/basic_color.vert

@@ -1,10 +1,10 @@
-varying vec2 vUv;
-
-void main()
-{
-  vec3 pos = position;
-  mat4 MVP = projectionMatrix * modelViewMatrix;
-
-  gl_Position = MVP * vec4( pos, 1.0 );
-  vUv = uv;
+varying vec2 vUv;
+
+void main()
+{
+  vec3 pos = position;
+  mat4 MVP = projectionMatrix * modelViewMatrix;
+
+  gl_Position = MVP * vec4( pos, 1.0 );
+  vUv = uv;
 }

package/src/shaders/basic_line/basic_line.frag

@@ -1,37 +1,37 @@
-uniform float _Length;
-uniform float _ElapsedTime;
-uniform float _Thickness;
-uniform vec3  _Color;
-
-varying float line_coverage;
-varying float uv_u;
-
-
-
-
-float aastep(float threshold, float value) {
-  #ifdef GL_OES_standard_derivatives
-    float afwidth = length(vec2(dFdx(value), dFdy(value))) * 0.70710678118654757;
-    return smoothstep(threshold-afwidth, threshold+afwidth, value);
-  #else
-    return step(threshold, value);
-  #endif
-}
-
-void main()
-{
-
-    // float y = fract(line_coverage /_Thickness - _TrueElapsedTime) ;
-
-    // vec2 uv = vec2(uv_u, y);
-
-
-    // vec4 col = texture2D(_ArrowsTex,uv);
-    // col.rgb *= _ForwardColor;
-    // col.a = aastep(0.5, col.a);
-    // gl_FragColor = col;
-    float u = (1.0 - abs(uv_u * 2.0 - 1.0));
-    float diffuse = dot(vec2(u, u), vec2(0.0, 1.0)) * 0.5+0.5;
-    gl_FragColor = vec4(_Color * diffuse, 1.0);
-
+uniform float _Length;
+uniform float _ElapsedTime;
+uniform float _Thickness;
+uniform vec3  _Color;
+
+varying float line_coverage;
+varying float uv_u;
+
+
+
+
+float aastep(float threshold, float value) {
+  #ifdef GL_OES_standard_derivatives
+    float afwidth = length(vec2(dFdx(value), dFdy(value))) * 0.70710678118654757;
+    return smoothstep(threshold-afwidth, threshold+afwidth, value);
+  #else
+    return step(threshold, value);
+  #endif
+}
+
+void main()
+{
+
+    // float y = fract(line_coverage /_Thickness - _TrueElapsedTime) ;
+
+    // vec2 uv = vec2(uv_u, y);
+
+
+    // vec4 col = texture2D(_ArrowsTex,uv);
+    // col.rgb *= _ForwardColor;
+    // col.a = aastep(0.5, col.a);
+    // gl_FragColor = col;
+    float u = (1.0 - abs(uv_u * 2.0 - 1.0));
+    float diffuse = dot(vec2(u, u), vec2(0.0, 1.0)) * 0.5+0.5;
+    gl_FragColor = vec4(_Color * diffuse, 1.0);
+
 }