diff --git a/docs/api/core/Geometry2.html b/docs/api/core/Geometry2.html
deleted file mode 100644
index 68ab230d9d41625202522e3b596f6181620762d9..0000000000000000000000000000000000000000
--- a/docs/api/core/Geometry2.html
+++ /dev/null
@@ -1,48 +0,0 @@
-
-
-
-
-
-
-
-
-
- [page:BufferGeometry] →
-
- [name]
-
- todo
-
- Example
-
- todo
-
- Constructor
-
-
- todo
-
-
-
- Properties
-
- todo
-
- todo
-
-
-
- Methods
-
-
- todo
- todo
-
- todo
-
-
- Source
-
- [link:https://github.com/mrdoob/three.js/blob/master/src/[path].js src/[path].js]
-
-
diff --git a/docs/api/extras/geometries/BoxGeometry2.html b/docs/api/extras/geometries/BoxGeometry2.html
deleted file mode 100644
index cc863128faf7459071473e27e44aacb8b0226b9d..0000000000000000000000000000000000000000
--- a/docs/api/extras/geometries/BoxGeometry2.html
+++ /dev/null
@@ -1,48 +0,0 @@
-
-
-
-
-
-
-
-
-
- [page:Geometry2] →
-
- [name]
-
- todo
-
- Example
-
- todo
-
- Constructor
-
-
- todo
-
-
-
- Properties
-
- todo
-
- todo
-
-
-
- Methods
-
-
- todo
- todo
-
- todo
-
-
- Source
-
- [link:https://github.com/mrdoob/three.js/blob/master/src/[path].js src/[path].js]
-
-
diff --git a/docs/api/extras/geometries/PlaneGeometry2.html b/docs/api/extras/geometries/PlaneGeometry2.html
deleted file mode 100644
index cc863128faf7459071473e27e44aacb8b0226b9d..0000000000000000000000000000000000000000
--- a/docs/api/extras/geometries/PlaneGeometry2.html
+++ /dev/null
@@ -1,48 +0,0 @@
-
-
-
-
-
-
-
-
-
- [page:Geometry2] →
-
- [name]
-
- todo
-
- Example
-
- todo
-
- Constructor
-
-
- todo
-
-
-
- Properties
-
- todo
-
- todo
-
-
-
- Methods
-
-
- todo
- todo
-
- todo
-
-
- Source
-
- [link:https://github.com/mrdoob/three.js/blob/master/src/[path].js src/[path].js]
-
-
diff --git a/docs/api/loaders/Geometry2Loader.html b/docs/api/loaders/Geometry2Loader.html
deleted file mode 100644
index 9d8440d511e3d5b4941ada170562729bc43f4888..0000000000000000000000000000000000000000
--- a/docs/api/loaders/Geometry2Loader.html
+++ /dev/null
@@ -1,46 +0,0 @@
-
-
-
-
-
-
-
-
-
- [name]
-
- todo
-
- Example
-
- todo
-
- Constructor
-
-
- todo
-
-
-
- Properties
-
- todo
-
- todo
-
-
-
- Methods
-
-
- todo
- todo
-
- todo
-
-
- Source
-
- [link:https://github.com/mrdoob/three.js/blob/master/src/[path].js src/[path].js]
-
-
diff --git a/docs/list.js b/docs/list.js
index 564fc1fcd7e835fef1a5c77db165d459fb09616d..6deb1528993bbcde4ccaabc0732bf6f13c620a28 100644
--- a/docs/list.js
+++ b/docs/list.js
@@ -27,7 +27,6 @@ var list = {
[ "EventDispatcher", "api/core/EventDispatcher" ],
[ "Face3", "api/core/Face3" ],
[ "Geometry", "api/core/Geometry" ],
- [ "Geometry2", "api/core/Geometry2" ],
[ "Object3D", "api/core/Object3D" ],
[ "Projector", "api/core/Projector" ],
[ "Raycaster", "api/core/Raycaster" ],
@@ -46,7 +45,6 @@ var list = {
"Loaders": [
[ "BufferGeometryLoader", "api/loaders/BufferGeometryLoader" ],
- [ "Geometry2Loader", "api/loaders/Geometry2Loader" ],
[ "ImageLoader", "api/loaders/ImageLoader" ],
[ "JSONLoader", "api/loaders/JSONLoader" ],
[ "Loader", "api/loaders/Loader" ],
@@ -184,7 +182,6 @@ var list = {
"Extras / Geometries": [
[ "BoxGeometry", "api/extras/geometries/BoxGeometry" ],
- [ "BoxGeometry2", "api/extras/geometries/BoxGeometry2" ],
[ "CircleGeometry", "api/extras/geometries/CircleGeometry" ],
[ "CubeGeometry", "api/extras/geometries/CubeGeometry" ],
[ "CylinderGeometry", "api/extras/geometries/CylinderGeometry" ],
@@ -194,7 +191,6 @@ var list = {
[ "OctahedronGeometry", "api/extras/geometries/OctahedronGeometry" ],
[ "ParametricGeometry", "api/extras/geometries/ParametricGeometry" ],
[ "PlaneGeometry", "api/extras/geometries/PlaneGeometry" ],
- [ "PlaneGeometry2", "api/extras/geometries/PlaneGeometry2" ],
[ "PolyhedronGeometry", "api/extras/geometries/PolyhedronGeometry" ],
[ "RingGeometry", "api/extras/geometries/RingGeometry" ],
[ "ShapeGeometry", "api/extras/geometries/ShapeGeometry" ],
diff --git a/editor/js/Editor.js b/editor/js/Editor.js
index e73be7e96b65781b5054dcf7591f1693061c64ff..3e9ea09e14714135913e163e1bd0c1b9d1f461f8 100644
--- a/editor/js/Editor.js
+++ b/editor/js/Editor.js
@@ -357,7 +357,6 @@ Editor.prototype = {
'TorusKnotGeometry': THREE.TorusKnotGeometry,
'TubeGeometry': THREE.TubeGeometry,
'Geometry': THREE.Geometry,
- 'Geometry2': THREE.Geometry2,
'BufferGeometry': THREE.BufferGeometry
};
diff --git a/editor/js/Menubar.File.js b/editor/js/Menubar.File.js
index 21503af0381ed874e83733abfe7dc7c7c6244437..729654a1b3ba6081b8a437ca95b83224bc4b47c1 100644
--- a/editor/js/Menubar.File.js
+++ b/editor/js/Menubar.File.js
@@ -10,7 +10,6 @@ Menubar.File = function ( editor ) {
var output = exporter.parse( object.geometry );
if ( exporter instanceof THREE.BufferGeometryExporter ||
- exporter instanceof THREE.Geometry2Exporter ||
exporter instanceof THREE.GeometryExporter ) {
output = JSON.stringify( output, null, '\t' );
@@ -116,10 +115,6 @@ Menubar.File = function ( editor ) {
exportGeometry( THREE.BufferGeometryExporter );
- } else if ( geometry instanceof THREE.Geometry2 ) {
-
- exportGeometry( THREE.Geometry2Exporter );
-
} else if ( geometry instanceof THREE.Geometry ) {
exportGeometry( THREE.GeometryExporter );
diff --git a/editor/js/Sidebar.Geometry.js b/editor/js/Sidebar.Geometry.js
index c85a59780d4edfb7d4687445de2d4fa1d1c22f26..2f5a727b4979a5c5b250de0f395ac725059ef1c5 100644
--- a/editor/js/Sidebar.Geometry.js
+++ b/editor/js/Sidebar.Geometry.js
@@ -165,11 +165,6 @@ Sidebar.Geometry = function ( editor ) {
geometryVertices.setValue( geometry.vertices.length );
geometryFaces.setValue( geometry.faces.length );
- } else if ( geometry instanceof THREE.Geometry2 ) {
-
- geometryVertices.setValue( geometry.vertices.length / 3 );
- geometryFaces.setValue( geometry.vertices.length / 9 );
-
} else if ( geometry instanceof THREE.BufferGeometry ) {
geometryVertices.setValue( geometry.attributes.position.array.length / 3 );
diff --git a/editor/js/Sidebar.Material.js b/editor/js/Sidebar.Material.js
index bb9968a12ebc35ed76bf73d50147c084287609cf..7818f4514e204be6f675f034711a0e74d75f2a06 100644
--- a/editor/js/Sidebar.Material.js
+++ b/editor/js/Sidebar.Material.js
@@ -313,7 +313,6 @@ Sidebar.Material = function ( editor ) {
if ( object instanceof THREE.Sprite ) objectHasUvs = true;
if ( geometry instanceof THREE.Geometry && geometry.faceVertexUvs[ 0 ].length > 0 ) objectHasUvs = true;
- if ( geometry instanceof THREE.Geometry2 && geometry.uvs.length > 0 ) objectHasUvs = true;
if ( geometry instanceof THREE.BufferGeometry && geometry.attributes.uv !== undefined ) objectHasUvs = true;
if ( material ) {
diff --git a/editor/js/Viewport.js b/editor/js/Viewport.js
index 31e46f8b9ea90d4eef28e7e307aa7657c856a410..f0fd02f940da0194c53c6f7d45ff8faa4adb7c59 100644
--- a/editor/js/Viewport.js
+++ b/editor/js/Viewport.js
@@ -497,11 +497,6 @@ var Viewport = function ( editor ) {
vertices += geometry.vertices.length;
faces += geometry.faces.length;
- } else if ( geometry instanceof THREE.Geometry2 ) {
-
- vertices += geometry.vertices.length / 3;
- faces += geometry.vertices.length / 9;
-
} else if ( geometry instanceof THREE.BufferGeometry ) {
vertices += geometry.attributes.position.array.length / 3;
diff --git a/examples/canvas_geometry2_sandbox.html b/examples/canvas_geometry2_sandbox.html
index a268d14d5faa37d9b01f92a889581b78cfc2ef4d..d28173de659a7ca9295d93d8d61fabf21bd9fcd8 100644
--- a/examples/canvas_geometry2_sandbox.html
+++ b/examples/canvas_geometry2_sandbox.html
@@ -21,6 +21,11 @@
+
+
+
+
+