Skip to content

Commit f87ae50

Browse files
author
Rafael Miranda
committedMar 20, 2017
Fixed conflicts
2 parents 67d2bc5 + ffbc9ff commit f87ae50

File tree

7 files changed

+447
-288
lines changed

7 files changed

+447
-288
lines changed
 

‎build/embed.js

+191-32
Large diffs are not rendered by default.

‎build/embed.min.js

+2-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎build/three.js

+4-3
Original file line numberDiff line numberDiff line change
@@ -5245,6 +5245,8 @@ Vector4.prototype = {
52455245

52465246
};
52475247

5248+
var ColorKeywords;
5249+
52485250
/**
52495251
* @author mrdoob / http://mrdoob.com/
52505252
*/
@@ -5471,7 +5473,7 @@ Color.prototype = {
54715473
if ( style && style.length > 0 ) {
54725474

54735475
// color keywords
5474-
var hex = exports.ColorKeywords[ style ];
5476+
var hex = ColorKeywords[ style ];
54755477

54765478
if ( hex !== undefined ) {
54775479

@@ -5739,7 +5741,7 @@ Color.prototype = {
57395741

57405742
};
57415743

5742-
exports.ColorKeywords = { 'aliceblue': 0xF0F8FF, 'antiquewhite': 0xFAEBD7, 'aqua': 0x00FFFF, 'aquamarine': 0x7FFFD4, 'azure': 0xF0FFFF,
5744+
ColorKeywords = { 'aliceblue': 0xF0F8FF, 'antiquewhite': 0xFAEBD7, 'aqua': 0x00FFFF, 'aquamarine': 0x7FFFD4, 'azure': 0xF0FFFF,
57435745
'beige': 0xF5F5DC, 'bisque': 0xFFE4C4, 'black': 0x000000, 'blanchedalmond': 0xFFEBCD, 'blue': 0x0000FF, 'blueviolet': 0x8A2BE2,
57445746
'brown': 0xA52A2A, 'burlywood': 0xDEB887, 'cadetblue': 0x5F9EA0, 'chartreuse': 0x7FFF00, 'chocolate': 0xD2691E, 'coral': 0xFF7F50,
57455747
'cornflowerblue': 0x6495ED, 'cornsilk': 0xFFF8DC, 'crimson': 0xDC143C, 'cyan': 0x00FFFF, 'darkblue': 0x00008B, 'darkcyan': 0x008B8B,
@@ -23944,7 +23946,6 @@ exports.VideoTexture = VideoTexture;
2394423946
exports.MeshBasicMaterial = MeshBasicMaterial;
2394523947
exports.TextureLoader = TextureLoader;
2394623948
exports.PerspectiveCamera = PerspectiveCamera;
23947-
exports.Object3DIdCount = Object3DIdCount;
2394823949
exports.Object3D = Object3D;
2394923950
exports.Raycaster = Raycaster;
2395023951
exports.Quaternion = Quaternion;

‎build/three.min.js

+245-245
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎build/vrview.min.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@
88
"eventemitter3": "^1.2.0",
99
"shaka-player": "^2.0.0",
1010
"stats-js": "^1.0.0-alpha1",
11-
"three": "^0.81.0",
11+
"three": "^0.84.0",
1212
"tween.js": "^16.3.4",
1313
"urijs": "^1.18.2",
1414
"webvr-boilerplate": "^0.4.6",
15-
"webvr-polyfill": "^0.9.18"
15+
"webvr-polyfill": "^0.9.26"
1616
},
1717
"devDependencies": {
1818
"browserify": "^13.1.1",

‎src/third_party/three/Three.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ export { VideoTexture } from '../../../node_modules/three/src/textures/VideoText
77
export { MeshBasicMaterial } from '../../../node_modules/three/src/materials/MeshBasicMaterial.js';
88
export { TextureLoader } from '../../../node_modules/three/src/loaders/TextureLoader.js';
99
export { PerspectiveCamera } from '../../../node_modules/three/src/cameras/PerspectiveCamera.js';
10-
export { Object3DIdCount, Object3D } from '../../../node_modules/three/src/core/Object3D.js';
10+
export { Object3D } from '../../../node_modules/three/src/core/Object3D.js';
1111
export { Raycaster } from '../../../node_modules/three/src/core/Raycaster.js';
1212
export { _Math as Math } from '../../../node_modules/three/src/math/Math.js';
1313
export { Quaternion } from '../../../node_modules/three/src/math/Quaternion.js';
@@ -17,7 +17,7 @@ export { Matrix3 } from '../../../node_modules/three/src/math/Matrix3.js';
1717
export { Vector4 } from '../../../node_modules/three/src/math/Vector4.js';
1818
export { Vector3 } from '../../../node_modules/three/src/math/Vector3.js';
1919
export { Vector2 } from '../../../node_modules/three/src/math/Vector2.js';
20-
export { ColorKeywords, Color } from '../../../node_modules/three/src/math/Color.js';
20+
export { Color } from '../../../node_modules/three/src/math/Color.js';
2121
export { TorusGeometry } from '../../../node_modules/three/src/geometries/TorusGeometry.js';
2222
export { SphereGeometry } from '../../../node_modules/three/src/geometries/SphereGeometry.js';
2323
export { CircleGeometry } from '../../../node_modules/three/src/geometries/CircleGeometry.js';

0 commit comments

Comments
 (0)
Please sign in to comment.