Browse Source

Editor: Added RaytracingRenderer.
Ray direction needs to be "unhacked" Also fov to ray.z...

Mr.doob 11 years ago
parent
commit
21d78ed5b7
3 changed files with 9 additions and 2 deletions
  1. 1 0
      editor/index.html
  2. 2 1
      editor/js/Sidebar.Renderer.js
  3. 6 1
      editor/js/Viewport.js

+ 1 - 0
editor/index.html

@@ -27,6 +27,7 @@
 		<script src="../examples/js/loaders/ctm/CTMLoader.js"></script>
 		<script src="../examples/js/exporters/SceneExporter.js"></script>
 		<script src="../examples/js/exporters/OBJExporter.js"></script>
+		<script src="../examples/js/renderers/RaytracingRenderer.js"></script>
 		<script src="../examples/js/renderers/SoftwareRenderer.js"></script>
 		<script src="../examples/js/renderers/SVGRenderer.js"></script>
 

+ 2 - 1
editor/js/Sidebar.Renderer.js

@@ -7,8 +7,9 @@ Sidebar.Renderer = function ( editor ) {
 		'WebGLRenderer': THREE.WebGLRenderer,
 		'WebGLRenderer3': THREE.WebGLRenderer3,
 		'CanvasRenderer': THREE.CanvasRenderer,
+		'SVGRenderer': THREE.SVGRenderer,
 		'SoftwareRenderer': THREE.SoftwareRenderer,
-		'SVGRenderer': THREE.SVGRenderer
+		'RaytracingRenderer': THREE.RaytracingRenderer
 
 	};
 

+ 6 - 1
editor/js/Viewport.js

@@ -577,7 +577,12 @@ var Viewport = function ( editor ) {
 
 		renderer.clear();
 		renderer.render( scene, camera );
-		renderer.render( sceneHelpers, camera );
+
+		if ( renderer instanceof THREE.RaytracingRenderer === false ) {
+
+			renderer.render( sceneHelpers, camera );
+
+		}
 
 	}