creativelifeform / three-nebula / 441

pending completion

Build # 441

Build Type

Pull #68

travis-ci

Committed by

web-flow

Commit Message

Added test for not setting rotation in MeshRenderer.onParticleUpdate if the target is a THREE.Sprite

Pull Request Pull Request #68: Feature/issue 65 performance improvements

Run Details

621 of 962 branches covered (64.55%)

Branch coverage included in aggregate %.

14 of 14 new or added lines in 2 files covered. (100.0%)

1534 of 1951 relevant lines covered (78.63%)

128.89 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

93.75

/src/renderer/MeshRenderer.js

import BaseRenderer from './BaseRenderer';
import { PUID } from '../utils';
import { Pool } from '../core';
import { RENDERER_TYPE_MESH as type } from './types';

/**
 * @requires THREE - { Mesh, BoxGeometry, MeshLambertMaterial }
 */
export default class MeshRenderer extends BaseRenderer {
  /**
   * @param {object} container - An Object3D container, usually a THREE.Scene
   * @param {object} THREE - THREE Api
   */
  constructor(container, THREE) {
    super(type);

    this.container = container;
    this._targetPool = new Pool();
    this._materialPool = new Pool();
    this._body = new THREE.Mesh(
      new THREE.BoxGeometry(50, 50, 50),
      new THREE.MeshLambertMaterial({ color: '#ff0000' })
    );
    this.ThreeSprite = THREE.Sprite;
  }

  isThreeSprite(particle) {
    return particle.target instanceof this.ThreeSprite;
  }

  onSystemUpdate() {}

  onParticleCreated(particle) {
    if (!particle.target) {
      //set target
      if (!particle.body) particle.body = this._body;
      particle.target = this._targetPool.get(particle.body);

      //set material
      if (particle.useAlpha || particle.useColor) {
        particle.target.material.__puid = PUID.id(particle.body.material);
        particle.target.material = this._materialPool.get(
          particle.target.material
        );
      }
    }

    if (particle.target) {
      particle.target.position.copy(particle.position);
      this.container.add(particle.target);
    }
  }

  onParticleUpdate(particle) {
    const { target, useAlpha, useColor, rotation } = particle;

    if (!target) {
      return;
    }

    target.position.copy(particle.position);

    if (!this.isThreeSprite(particle)) {
      target.rotation.set(rotation.x, rotation.y, rotation.z);
    }

    this.scale(particle);

    if (useAlpha) {
      target.material.opacity = particle.alpha;
      target.material.transparent = true;
    }

    if (useColor) {
      target.material.color.copy(particle.color);
    }
  }

  scale(particle) {
    particle.target.scale.set(particle.scale, particle.scale, particle.scale);
  }

  onParticleDead(particle) {
    if (particle.target) {
      if (particle.useAlpha || particle.useColor)
        this._materialPool.expire(particle.target.material);

      this._targetPool.expire(particle.target);
      this.container.remove(particle.target);
      particle.target = null;
    }
  }
}

1	import BaseRenderer from './BaseRenderer';	1✔
2	import { PUID } from '../utils';	1✔
3	import { Pool } from '../core';	1✔
4	import { RENDERER_TYPE_MESH as type } from './types';	1✔
5
6	/**
7	* @requires THREE - { Mesh, BoxGeometry, MeshLambertMaterial }
8	*/
9	export default class MeshRenderer extends BaseRenderer {
10	/**
11	* @param {object} container - An Object3D container, usually a THREE.Scene
12	* @param {object} THREE - THREE Api
13	*/
14	constructor(container, THREE) {	34✔
15	super(type);	17✔
16
17	this.container = container;	17✔
18	this._targetPool = new Pool();	17✔
19	this._materialPool = new Pool();	17✔
20	this._body = new THREE.Mesh(	17✔
21	new THREE.BoxGeometry(50, 50, 50),
22	new THREE.MeshLambertMaterial({ color: '#ff0000' })
23	);
24	this.ThreeSprite = THREE.Sprite;	17✔
25	}
26
27	isThreeSprite(particle) {
28	return particle.target instanceof this.ThreeSprite;	1,005✔
29	}
30
31	onSystemUpdate() {}
32
33	onParticleCreated(particle) {
34	if (!particle.target) {	1,013✔
35	//set target
36	if (!particle.body) particle.body = this._body;	1,012✔
37	particle.target = this._targetPool.get(particle.body);	1,012✔
38
39	//set material
40	if (particle.useAlpha \|\| particle.useColor) {	1,012✔
41	particle.target.material.__puid = PUID.id(particle.body.material);	3✔
42	particle.target.material = this._materialPool.get(	3✔
43	particle.target.material
44	);
45	}
46	}
47
48	if (particle.target) {	1,013!
49	particle.target.position.copy(particle.position);	1,013✔
50	this.container.add(particle.target);	1,013✔
51	}
52	}
53
54	onParticleUpdate(particle) {
55	const { target, useAlpha, useColor, rotation } = particle;	1,005✔
56
57	if (!target) {	1,005!
58	return;	×
59	}
60
61	target.position.copy(particle.position);	1,005✔
62
63	if (!this.isThreeSprite(particle)) {	1,005✔
64	target.rotation.set(rotation.x, rotation.y, rotation.z);	4✔
65	}
66
67	this.scale(particle);	1,005✔
68
69	if (useAlpha) {	1,005✔
70	target.material.opacity = particle.alpha;	1✔
71	target.material.transparent = true;	1✔
72	}
73
74	if (useColor) {	1,005✔
75	target.material.color.copy(particle.color);	1✔
76	}
77	}
78
79	scale(particle) {
80	particle.target.scale.set(particle.scale, particle.scale, particle.scale);	5✔
81	}
82
83	onParticleDead(particle) {
84	if (particle.target) {	3!
85	if (particle.useAlpha \|\| particle.useColor)	3✔
86	this._materialPool.expire(particle.target.material);	2✔
87
88	this._targetPool.expire(particle.target);	3✔
89	this.container.remove(particle.target);	3✔
90	particle.target = null;	3✔
91	}
92	}
93	}

creativelifeform / three-nebula / 441

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous