Commit Graph

  • 0f48597f97 cleaner way of doing perspective->orthographic zz85 2011-10-10 11:19:58 +08:00
  • 85c063dedd Merge remote-tracking branch 'upstream/dev' zz85 2011-10-09 18:26:27 +08:00
  • 8edb3f18b2 Removing (now unused) stuff from Projector. Mr.doob 2011-10-09 07:11:19 +02:00
  • 378c3fdfed Removing some deprecated warnings. Maybe a bit too early, but just want to see that code clean and simple... Mr.doob 2011-10-09 07:01:18 +02:00
  • 0971db286f I wonder if this still affects performance nowadays. Mr.doob 2011-10-09 06:49:07 +02:00
  • 6419bd37d9 Got CanvasRenderer and SVGRenderer using the new Scene Graph. * The new system allow us to add lights and cameras as children of any object without hacks. * The Camera needs to be added to a Scene. If the Camera has no parent it's added to the Scene being renderer automatically. * I'll work on implementing this into the WebGLRenderrer tomorrow (gonna be a looong day... ). Mr.doob 2011-10-09 06:46:03 +02:00
  • 785ac754e8 Adding WaltHead back to subdivision example zz85 2011-10-09 10:53:24 +08:00
  • d497917cb2 Merge remote-tracking branch 'upstream/dev' zz85 2011-10-09 10:39:07 +08:00
  • 74bc0e7c6a Merge branch 'gui' zz85 2011-10-09 10:38:38 +08:00
  • ef1a6785d2 Combined Camera now tries to use Perspective\'s average viewing frustrum for switching to Orthographic view zz85 2011-10-09 10:38:22 +08:00
  • 1e5fc98582 Reworking Scene Graph setup. Mr.doob 2011-10-09 01:13:46 +02:00
  • 9a6a20b57b GUI: Small tweaks to loaders code. Mr.doob 2011-10-09 01:11:29 +02:00
  • 330b64b080 Removed some (now gone) WaltHead.js includes. Mr.doob 2011-10-08 21:10:17 +02:00
  • 2c8967b124 Fixed CanvasRenderrer incorrectly SphericalReflectionMapping Face4 rendering. Also replaced WaltHead.js (old format) with WaltHeadLo.js (new format) Mr.doob 2011-10-08 21:04:26 +02:00
  • 8db9d6fd61 GUI: Snap to axis (press x,y or z when moving). Added TrackballControls Added this.enabled property to TrackballControls. Simplified TrackballControls code. Mr.doob 2011-10-08 19:43:11 +02:00
  • a2c8a2e0b4 added zoom + 6 views for CombinedCamera zz85 2011-10-09 00:09:37 +08:00
  • 2d20fbe954 Views for CombinedCamera zz85 2011-10-08 18:23:44 +08:00
  • 71ebe4e544 GUI: Replaced the 4 views with just a single perspective view. Mr.doob 2011-10-08 05:37:11 +02:00
  • 9498ebc3b2 Gui code change zz85 2011-10-08 10:23:15 +08:00
  • 13c08981db Merge branch 'master' into gui zz85 2011-10-08 10:19:12 +08:00
  • 07442382f6 Testing viewports zz85 2011-10-08 10:08:18 +08:00
  • df94d2af57 Moved matrixWorldInverse logic to renderers as per @greggman suggestion. Now Camera can use inherited update() Mr.doob 2011-10-08 03:38:49 +02:00
  • 3a2c28488b Merge remote-tracking branch 'alteredq/dev' into dev Mr.doob 2011-10-08 02:37:16 +02:00
  • ed8df3acab Corrected README typo Mr.doob 2011-10-08 02:36:54 +02:00
  • 456fe3ccff Rewritten URL and BlobBuilder shims. alteredq 2011-10-08 02:13:33 +02:00
  • ae8c84a7fe Made GUI drag-n-drop work also in Firefox. alteredq 2011-10-08 01:31:13 +02:00
  • d4704fe8db Updated builds. Mr.doob 2011-10-08 00:30:20 +02:00
  • 7d3e482555 Merge remote-tracking branch 'alteredq/dev' into dev Mr.doob 2011-10-08 00:28:07 +02:00
  • b66c1e5744 GUI: Added support for dropping .js files Remembered that @alteredq managed to get this working on a viewer for ro.me. So I just copied the code :) Mr.doob 2011-10-08 00:22:26 +02:00
  • 7891f2b33b JSONLoader.load( parameters ) to JSONLoader( url, callback, texturePath ) Mr.doob 2011-10-08 00:21:13 +02:00
  • 51b6db1c54 Merge remote-tracking branch 'remotes/mrdoob/dev' into dev alteredq 2011-10-07 22:54:56 +02:00
  • 8ab93926ce Fixed bug causing disappearing wireframe objects in mixed scenes. alteredq 2011-10-07 22:53:57 +02:00
  • 319d423262 Forgot marklundin's credit. Mr.doob 2011-10-07 21:54:47 +02:00
  • 2928cce2d9 Parallax Barrier WebGL Renderer Pretty useless, no way I can try it and it's probably done in hardware anyway. But looks cool :P http://en.wikipedia.org/wiki/Parallax_barrier Mr.doob 2011-10-07 21:22:48 +02:00
  • fbbfb3b683 Merge remote-tracking branch 'alteredq/dev' into dev Mr.doob 2011-10-07 21:02:44 +02:00
  • 89c578332e Fixed shading glitches on OpenGL (thanks to @mrdoob for spotting this). alteredq 2011-10-07 20:56:24 +02:00
  • 77af9c0cde Implemented @jeromeetienne's webgl voxelpainter changes. Mr.doob 2011-10-07 20:54:45 +02:00
  • 869927a80e Merge remote-tracking branch 'alteredq/dev' into dev Mr.doob 2011-10-07 20:30:30 +02:00
  • c7d304db57 Fixed ambient occlusion in Minecraft example. alteredq 2011-10-07 20:24:50 +02:00
  • f5aa95396f Merge remote-tracking branch 'alteredq/dev' into dev Mr.doob 2011-10-07 20:07:41 +02:00
  • c3d706e295 preserveDrawingBuffer isn't needed anymore. Mr.doob 2011-10-07 20:06:24 +02:00
  • 3a6138d080 Merge remote-tracking branch 'remotes/mrdoob/dev' into dev alteredq 2011-10-07 20:06:07 +02:00
  • 40bca923c3 Added WebGL trails example. Mr.doob 2011-10-07 19:45:02 +02:00
  • 7355c2b68b Changed ambient term to influence also texture in Phong / normal map materials. alteredq 2011-10-07 19:06:55 +02:00
  • 7d2805dd83 Fixed specular term in Phong / normal map materials. alteredq 2011-10-07 18:43:00 +02:00
  • fc496e86ec Some fixes to GUI Codegen + Preview zz85 2011-10-07 18:08:38 +08:00
  • 3343729ad0 Updated builds. Mr.doob 2011-10-07 09:03:57 +02:00
  • e4a17d6369 Merge remote-tracking branch 'greggman/newrot' into dev Mr.doob 2011-10-07 09:01:16 +02:00
  • 4e5dff61c8 Added basic Collada file drop support to the GUI. Unfortunately "File" doesn't have path information, so textures won't load :/ Tried to also drop .js files, but the Workers part ruined the party too :/ :/ Mr.doob 2011-10-07 08:55:05 +02:00
  • 1ab9940107 Add example that shows using three.js for multiple monitors in a circle gman 2011-10-06 18:00:54 -07:00
  • ca517008d1 Trying to use OrthographicCamera in the GUI. Not much luck yet, for some reason the camera zooming doesn't work on the orthographic views :/ Mr.doob 2011-10-07 07:53:02 +02:00
  • 7ec1a88d26 Fixed GUI. Mr.doob 2011-10-07 07:25:05 +02:00
  • 1258e8a771 Ray now also checks object's children. Mr.doob 2011-10-07 07:07:34 +02:00
  • 7f0346f3b8 Update WebGL Renderer so cameras can have parents gman 2011-10-06 17:58:00 -07:00
  • 81d338e915 ColladaLoader fixes. * Fixed ColladaLoader and Loader url base extraction code. * ColladaLoader now ignores non-joint nodes when constructing the skeleton. (Hopefuly, in a year time, I'll find this fix stupid) Mr.doob 2011-10-07 02:30:10 +02:00
  • 435f7e7be5 Backwards compatibility for old cameras. Mr.doob 2011-10-07 01:08:59 +02:00
  • fdf6fab7e6 Including @alteredq's post-release normal map improvements into r45. Mr.doob 2011-10-06 23:58:20 +02:00
  • 88d54b0cfa Updated builds. alteredq 2011-10-06 23:46:51 +02:00
  • b18a38eee5 Merge remote-tracking branch 'remotes/mrdoob/dev' into dev alteredq 2011-10-06 23:44:10 +02:00
  • 84ed1835ca Added reflection to normal map shader. alteredq 2011-10-06 23:33:01 +02:00
  • b964b7e49f Merge remote-tracking branch 'guardianResearch/master' into dev Mr.doob 2011-10-06 21:35:31 +02:00
  • 485122a150 small fix - screen resize needs to refer to controls.screen sizes Andrew Strelzoff 2011-10-06 09:31:22 -05:00
  • 57769f8fd4 Merge remote-tracking branch 'jsermeno/ortho' into dev Mr.doob 2011-10-06 07:45:55 +02:00
  • 4172108688 setting REVISION to 46dev Mr.doob 2011-10-06 07:45:20 +02:00
  • 6e6f2453a1 change voxelpainter to use THREE.CombinedCamera Justin Sermeno 2011-10-05 22:27:34 -07:00
  • e645a562b0 update voxelpainter to use projector pickingRay() Justin Sermeno 2011-10-05 22:11:30 -07:00
  • b53119097c Merge branch 'dev' Mr.doob 2011-10-06 06:15:12 +02:00
  • f357225c2d Merging dev branch. Mr.doob 2011-10-06 06:15:03 +02:00
  • 1dee999e7a r45 Mr.doob 2011-10-06 06:02:27 +02:00
  • a57a25f5f1 Merge remote-tracking branch 'alteredq/dev' into dev Mr.doob 2011-10-06 05:14:21 +02:00
  • 801fe52d75 Removed unused code from normal map shader. alteredq 2011-10-06 05:02:10 +02:00
  • 8afaef4597 Merge remote-tracking branch 'remotes/mrdoob/dev' into dev alteredq 2011-10-06 04:18:27 +02:00
  • c164c887f0 Updated builds. Mr.doob 2011-10-06 04:15:30 +02:00
  • 0651e7d9fa Merge remote-tracking branch 'alteredq/dev' into dev Mr.doob 2011-10-06 04:12:57 +02:00
  • 1042528b39 Added texture coordinates offset and repeat to normal map shader. alteredq 2011-10-06 04:11:11 +02:00
  • d2162b1111 Merge remote-tracking branch 'alteredq/dev' into dev Mr.doob 2011-10-06 04:10:59 +02:00
  • c924ca37c2 Merging with @alteredq's branch. Mr.doob 2011-10-06 04:10:52 +02:00
  • 8153982ffb Added shadow maps handling to normal map shader. alteredq 2011-10-06 03:46:42 +02:00
  • 40d1ea1083 Updated builds. Mr.doob 2011-10-06 03:42:40 +02:00
  • 5b22bffdf8 Merge remote-tracking branch 'arcanin/dev' into dev Mr.doob 2011-10-06 03:40:53 +02:00
  • 1a48b52540 Added @zz85's setLens() method to PerspectiveCamera too. Mr.doob 2011-10-06 03:24:31 +02:00
  • 4360c07273 Updated builds. Mr.doob 2011-10-06 02:51:48 +02:00
  • a52637b892 Merge remote-tracking branch 'jsermeno/ortho' into dev Mr.doob 2011-10-06 02:49:01 +02:00
  • a5d9afcdcc Merge remote-tracking branch 'alteredq/dev' into dev Mr.doob 2011-10-06 02:46:35 +02:00
  • 3678dc63fa Merging with @alteredq's branch. Mr.doob 2011-10-06 02:46:29 +02:00
  • bd062691c2 Merge remote-tracking branch 'zz85/master' into dev Mr.doob 2011-10-06 02:35:26 +02:00
  • 78344033fa Reverted AmbientLights changes. Mr.doob 2011-10-06 02:30:26 +02:00
  • f485330ae6 Fixed bugs in immediate rendering. alteredq 2011-10-05 22:56:03 +02:00
  • bf6e906e64 Update builds zz85 2011-10-06 00:56:50 +08:00
  • 149c20d177 Added new THREE.CombinedCamera. Added orthographic + perspective example zz85 2011-10-06 00:55:26 +08:00
  • dd3bf5e9d0 Updated builds. Mr.doob 2011-10-05 17:56:08 +02:00
  • 7d0fbf7a62 change comments Justin Sermeno 2011-10-05 00:53:33 -07:00
  • 3b60963c64 pickingRay optimizations and comments Justin Sermeno 2011-10-05 00:43:07 -07:00
  • bc27e18424 add pickingRay method Justin Sermeno 2011-10-05 00:31:52 -07:00
  • 1d1e1dfaf7 unproject that alters ray Justin Sermeno 2011-10-05 00:18:50 -07:00
  • 94ff102c64 Updated example + merge with doob/dev zz85 2011-10-05 14:29:30 +08:00
  • 923bb7f913 orthographic picking - v1 Justin Sermeno 2011-10-04 23:13:07 -07:00
  • 40decb9093 I have unmerged changes?? zz85 2011-10-05 13:56:56 +08:00
  • c89e3fe49a More breakage... * Added scene.ambientColor and Scene now ignores AmbientLights (transferring hex for temporal backwards compatibility) * CanvasRenderer and SVGRenderer using scene.ambientColor. Tried to update WebGLRenderer too, but the method in question doesn't seem to have access to the scene :S * Removed scene.origin and updated examples that used it. * Improved subdivision example Mr.doob 2011-10-05 07:26:29 +02:00
  • 412c545c47 Updated the rest of examples. alteredq 2011-10-05 05:05:13 +02:00