Commit Graph
2375 Commits
Author SHA1 Message Date
Mr.doob 2ea8cbae2a Fixed a bug in GeometryUtils.merge where it would create a material index per face. 2011-11-24 03:26:46 +01:00
Mr.doob cd33824929 Merge remote-tracking branch 'alteredq/dev' into dev 2011-11-22 18:15:35 +01:00
Mr.doob 8749fe04db Color.getHex() de-obfuscated.
Is not used so much anymore so we can have it with a less obfuscating syntax.
2011-11-22 18:15:15 +01:00
alteredq 43036191c6 Added frustum culling also for ParticleSystems.
This is optional, for now by default it's off, like it was before. It's up to application to update geometry bounding sphere if vertex positions change (like for meshes).
2011-11-22 06:26:00 +01:00
alteredq bac513dda9 Merge remote-tracking branch 'remotes/mrdoob/dev' into dev 2011-11-22 06:03:52 +01:00
alteredq 0fd25ba910 Added keeping stats also for point sprites. 2011-11-22 05:57:27 +01:00
Mr.doob aac4384e1c Updated builds. 2011-11-21 23:37:22 +01:00
Mr.doob 976607d346 Merge remote-tracking branch 'AddictArts/dev' into dev 2011-11-21 23:32:17 +01:00
Erik Kitson cbccd87d57 Reverted changes to Animation class and moved to new KeyFrameAnimation class. 2011-11-21 14:07:47 -08:00
Mr.doob f14e3dc72f Added .crossOrigin to Loader and ImageUtils.
Should fix #779...
2011-11-21 22:06:34 +01:00
Mr.doob 3be2cdae2c Better Rectangle.intersects() formula. 2011-11-21 20:18:37 +01:00
alteredq d906f301bd Updated builds. 2011-11-21 15:34:14 +01:00
alteredq 90097cf401 Merge remote-tracking branch 'remotes/mrdoob/dev' into dev 2011-11-21 15:32:03 +01:00
alteredq 7168bc2435 Added more random functions to THREE.Math 2011-11-21 15:30:42 +01:00
Mr.doob 606f008bec Fixed wrapping handling in ColladaLoader. 2011-11-21 07:35:16 +01:00
Mr.doob 618a079045 Changed some more .children to .childNodes. (Fixes webgl_collada.html example) 2011-11-21 07:08:53 +01:00
Mr.doob 13e3c8f255 Updated builds. 2011-11-21 06:20:23 +01:00
Mr.doob 1e6ed88594 Merge remote-tracking branch 'AddictArts/dev' into dev 2011-11-21 06:10:56 +01:00
Erik Kitson ef56fd9b79 Fixed references to Firefox-specific "children" attribute. 2011-11-20 19:59:34 -08:00
alteredq 655b1efbde Merge remote-tracking branch 'remotes/mrdoob/dev' into dev
Animation / skinning / path controller are now broken :/
2011-11-20 22:16:54 +01:00
alteredq e207f5e852 Changed lights to use global positions.
This should allow attaching of lights to objects. As a side effect, directional lights positions don't need to be normalized explicitly anymore.

Also changed viewport dimensions passed to render plugins to work with render targets with different dimensions than the screen framebuffer.

And fixed new dependencies in build script.
2011-11-20 20:18:16 +01:00
Mr.doob e16e443394 Better use of generated texture. 2011-11-20 19:19:14 +01:00
Mr.doob db6cb6d1cf Fixed ColladaLoader issue where node id was non-existent.
Fixes issue #747
2011-11-20 19:01:09 +01:00
Mr.doob 5d5bb3db00 Added .crossOrigin = '' to Loader.load_image() (thanks @remoe). 2011-11-20 18:43:18 +01:00
Mr.doob 48b3a72538 Simplified geometries example. 2011-11-20 16:28:03 +01:00
Mr.doob 032c511220 Updated builds. 2011-11-20 16:18:27 +01:00
Mr.doob b23690f90b ColladaLoader, checking if responseXML exist before parsing it. Removed ?rnd= bit, not sure why that was there... 2011-11-20 16:10:48 +01:00
Mr.doob 3623a444a3 ColladaLoader tried to access children-less object childrens. Changend JSONLoader try/catch code (better error logs this way). 2011-11-20 15:20:20 +01:00
Mr.doob 31abf51900 Merge remote-tracking branch 'jterrace/master' into dev 2011-11-20 14:31:38 +01:00
Jeff Terrace c6b1bd8c34 Fix collada loader to load faces with multiple materials properly, setting materialIndex 2011-11-19 21:32:43 -05:00
alteredq 247ec49013 Small refactoring in plugins. 2011-11-19 04:28:49 +01:00
Erik Kitson 01ac1e3d17 Added proper up-axis conversion for COLLADA models. Added support for key-framed animation. 2011-11-18 16:47:39 -08:00
alteredq 10052662ab Merge branch 'dev' into renderer_plugins 2011-11-19 01:22:41 +01:00
Erik Kitson 09304ba87c Fixed bug caused by incorrect use of Matrix4.decompose(). Also fixed bug in Animation - reference to deprecated Object3D.update() function. 2011-11-18 16:22:20 -08:00
alteredq 91233570cf Transplanted bug fixes from @ekitson's commit.
"Fixed typos in Matrix4's transpose() and getInverse()"

https://github.com/AddictArts/three.js/commit/62d2560b3c7b9868fc25f628c4022448aaff6b00
2011-11-19 01:18:39 +01:00
alteredq 3ded4a408f Changed Projector to use Frustum.
Also some bugfixes in ShadowMapPlugin and SpritePlugin.
2011-11-19 00:48:17 +01:00
alteredq 0c78ae95e9 Rest of the commit.
Because TortoiseGit suddenly refuses to make single commit with added and changed files :/
2011-11-18 23:56:45 +01:00
alteredq c16ce4b26a Moved shadow map into separate plugin.
This is still pretty rough, will need to clean it more.
2011-11-18 23:55:35 +01:00
Erik Kitson 05b6489520 Removed unnecessary vertex hashing which caused bugs if geometry was small enough for the hash function's rounding to cause loss of precision. Added support for faces with vcount greater than 4 by subdividing. Fixed texture bugs: V for UV was inverted, UVs not set for Face4s, offset and repeat and wrap options not set properly.
Work by: Erik Kitson and Khang Duong
2011-11-18 13:26:06 -08:00
John Pywtorak e338d8e053 Removed the unused initial xml doc creation that happens automatically from the XHR which returns an XML DOM object. 2011-11-18 11:19:24 -08:00
John Pywtorak 60f43847fc Merge branch 'dev' of github.com:AddictArts/three.js into dev 2011-11-18 10:48:18 -08:00
John Pywtorak 1db29f1893 Changed console error to return null and updated WebGLRenderer to handle null value. A valid matrix with no rotation and 0 scale will have a 0 determinant and does not need a normal matrix.
Work By: Erik Kitson
2011-11-18 10:48:04 -08:00
Erik Kitson 62d2560b3c Fixed typos in Matrix4's transpose() and getInverse(). Also added convenience functions for adding a translation or rotation to a matrix (rather than just setting them).
Work by: Erik Kitson and Khang Duong
2011-11-18 10:40:52 -08:00
alteredq 4be5880b0f Made SpritePlugin and LensFlare plugins default.
Also some refactoring in plugins.

Still not really satisfied with a solution, will need to handle somehow ordering of plugins (both among them and with respect to rest of rendering, this would be needed for example to be able to redo shadow maps as a plugin).
2011-11-18 17:19:10 +01:00
alteredq 1dcf5fc79b Moved sprite handling into plugin.
Work in progress. Still just experimenting. Probably will make some auto-adding of plugins.
2011-11-18 05:08:40 +01:00
alteredq 5c0cbaf5ac Moved sprite handling into plugin.
Work in progress. Still just experimenting. Probably some auto-adding of plugins would be useful.
2011-11-18 05:08:11 +01:00
alteredq 0eaeaad4f4 Added lens flares example. 2011-11-18 04:24:12 +01:00
alteredq 982ce5baa1 Added forgotten file. 2011-11-18 01:29:00 +01:00
alteredq ebf93289f8 Resurrected lens flares as custom plugin.
Still a bit dirty but less than it was before. Maybe also sprites could be pluginized.
2011-11-18 01:26:20 +01:00
alteredq 81297f6879 Updated builds. 2011-11-17 01:33:42 +01:00