Commit Graph

  • 9226142a00 Merge branch 'master' of https://github.com/empaempa/three.js alteredq 2011-04-06 16:16:14 +02:00
  • 5ef9e04535 removed finish Mikael Emtinger 2011-04-06 16:15:15 +02:00
  • 51bcda74d4 Merge remote branch 'remotes/empaempa/master' alteredq 2011-04-06 16:13:38 +02:00
  • 2c8b6b35fe Fixed bug in lens flare Mikael Emtinger 2011-04-06 16:11:06 +02:00
  • e0768d0605 Merged with empaempa's branch. alteredq 2011-04-06 15:26:19 +02:00
  • f70aaed1d8 Merge branch 'master' of git://github.com/mrdoob/three.js Mikael Emtinger 2011-04-06 12:18:11 +02:00
  • c3ab2eb1e9 Rewrote lens flares to not use readPixels. There are different solutions based on availablity of vertex textures. If available, occlusion calculation is more exact and handles partial occlusion on screen edges. If not available, occlusion calculation is less exact (because it's made on each fragment so it has to be fast) and partial occlusion by screen edge is not possible (same reason). Mikael Emtinger 2011-04-06 12:17:42 +02:00
  • f221b853b7 Refactoring and optimizations in collision system and examples. alteredq 2011-04-06 00:07:13 +02:00
  • 1fd801719f Added option to have flat shading for renderBufferImmediate. alteredq 2011-04-05 20:30:58 +02:00
  • 5c943cab3e Fixed broken MarchingCubes. alteredq 2011-04-05 16:47:24 +02:00
  • 4470e0f619 Merged physics branch into master. alteredq 2011-04-05 16:10:23 +02:00
  • 07294ccfaf Merge remote branch 'remotes/drojdjou/master' into physics alteredq 2011-04-05 12:06:13 +02:00
  • 65e3f92d55 Merged latest master branch into physics branch. alteredq 2011-04-05 12:04:24 +02:00
  • 0017fa4285 Removed comments from Collision classes Bartek Drozdz 2011-04-05 11:44:37 +02:00
  • 0209928118 Fixed reaction and trigger collisions examples. alteredq 2011-04-05 11:40:44 +02:00
  • 693a36f509 Moved scene loader from SceneUtils into SceneLoader. alteredq 2011-04-05 08:59:45 +02:00
  • 55a3d8290d Changed hardcoded uv scale to uniform in lava shader example. alteredq 2011-04-05 08:39:08 +02:00
  • f7e3a80d70 Added edges computation to OBJ converter. alteredq 2011-04-05 03:37:13 +02:00
  • 7915999bdd Added edges to Blender exporter, JSONLoader and Geometry. alteredq 2011-04-05 00:18:36 +02:00
  • 9850695f38 Collisions system initial commit. Bartek Drozdz 2011-04-04 18:13:54 +02:00
  • 5742cceefd Ray: Added support for object.flipSided and object.doubleSided properties. Mr.doob 2011-04-04 13:10:25 +01:00
  • b899391008 Updated buillds. Mr.doob 2011-04-04 05:13:04 +01:00
  • 51b56fe695 Merge remote branch 'alteredq/master' into experimental Mr.doob 2011-04-04 05:00:33 +01:00
  • abb4a774cd Merging with alteredq. Mr.doob 2011-04-04 05:00:21 +01:00
  • 3f20fee01a Merge remote branch 'empaempa/master' into experimental Mr.doob 2011-04-04 04:57:18 +01:00
  • 63ab3c2d80 Merge remote branch 'tarmour/master' Mr.doob 2011-04-04 04:55:27 +01:00
  • 28869a95a7 Added the same onDocumentMouseWheel() function and event handlers as in canvas_geometry_panorama_fisheye.html so that mousewheel zooming works on Firefox 4 and other browsers. Theo ArmourandMr.doob 2011-04-04 05:10:21 +08:00
  • 00b0f6df41 Fleshed out more face color pipeline (OBJ converter, Blender importer and loaders). alteredq 2011-04-04 03:35:04 +02:00
  • db96a4a861 Added support for morph colors to JSONLoader and Geometry. alteredq 2011-04-04 01:09:13 +02:00
  • 0acad374a1 Added .fog as parameter (to used for enabeling refreshing and setting of fog uniforms in MeshShaderMateiral) Mikael Emtinger 2011-04-04 00:19:42 +02:00
  • df7216e7a6 Added handling of morph colors to OBJ converter. alteredq 2011-04-04 00:05:52 +02:00
  • c3f7b1b5de Added the same onDocumentMouseWheel() function and event handlers as in canvas_geometry_panorama_fisheye.html so that mousewheel zooming works on Firefox 4 and other browsers. Theo Armour 2011-04-03 14:10:21 -07:00
  • e7b6f4ad3c Merged with mrdoob Mikael Emtinger 2011-04-03 20:44:15 +02:00
  • ea42310975 Added .boundTo in custom attributes. If not defined, it assumes that the custom attribute data has the length of vertices (boundTo="vertices"). If boundTo="faces", the custom attribute data has the length of faces.length. If boundTo="faceVertices" the cursom attribute data has the length of: numFace3*3 + numFace4*4. Mikael Emtinger 2011-04-03 20:42:24 +02:00
  • 6992b8e455 Merge remote branch 'alteredq/master' r38 Mr.doob 2011-04-03 07:56:58 +01:00
  • 70ff34b8a3 Updated Stats.js widget. Mr.doob 2011-04-03 07:56:41 +01:00
  • 477b0095a9 Added dumping of scale to Blender exporter / handling of scale to JSONLoader. alteredq 2011-04-03 08:48:08 +02:00
  • e6fd2d0516 Blender Exporter: Added option for truncating vertex values. Added scale parameter. Mr.doob 2011-04-03 05:17:48 +01:00
  • 09e976f299 Blender exporter: Scene export option False by default. Mr.doob 2011-04-03 04:04:36 +01:00
  • 7e6ba581de Removed some bottlenecks in shader building / sharing. alteredq 2011-04-03 04:19:00 +02:00
  • c2a401f2b8 Added option not to export materials to Blender exporter. alteredq 2011-04-03 00:22:20 +02:00
  • 5a684c29ea Fixed broken video texture example. alteredq 2011-04-02 21:06:37 +02:00
  • a719d289cc Fixed broken ribbons example. alteredq 2011-04-02 20:59:59 +02:00
  • 575deaadc5 Fixed broken depth-of-field example. alteredq 2011-04-02 20:46:34 +02:00
  • 08642c5239 Merged with mrdoob. Added depthBuffer/stencilBuffer flags to WebGLRenderTarget and support for that in WebGLRenderer. Done to support stencil shadows in renderTarget. For some reason { depthBuffer:false, stencilBuffer:true } doesn't work so this is deafulted to both:false. Mikael Emtinger 2011-04-02 11:40:03 +02:00
  • 9abbb97d4c Fixed Blender exporter not checking if material texture actually has some image. alteredq 2011-04-02 09:31:50 +02:00
  • e19bf17645 Synced with mrdoob's branch. alteredq 2011-04-02 09:16:29 +02:00
  • 1001b76351 Added lava shader example. alteredq 2011-04-02 09:02:35 +02:00
  • 8c3fa8f401 WebGLRenderer: Removed unneded program checks. Mr.doob 2011-04-02 07:24:30 +01:00
  • 3b43c79679 Added possibility of enforcing vertical angle constraint to QuakeCamera. alteredq 2011-04-02 01:32:53 +02:00
  • b35b70a0e0 Fixed bug in stencil shadow renderer. Added Q-button to Quake Camera to freeze update (good to have when debugging stuff so camera go away) Mikael Emtinger 2011-04-01 18:19:18 +02:00
  • 27b0ee0be7 Updated Loader to handle more material parameters (blending, transparent, depthTest). alteredq 2011-04-01 15:53:39 +02:00
  • 29da25e746 WebGLRenderer: Added internal cache for compiled shaders. Already compiled shaders get reused. Mr.doob 2011-04-01 07:38:22 +01:00
  • b6aa8c8433 And some more globals, third time is a charm? alteredq 2011-04-01 04:08:41 +02:00
  • a53921fb22 Fixed more globals in JSONLoader. Also updated ubiquity test includes. alteredq 2011-04-01 03:57:06 +02:00
  • 2d7833d32e Fixed runaway globals in JSONLoader. alteredq 2011-04-01 03:34:26 +02:00
  • d12252421e Synced with mrdoob's branch. alteredq 2011-03-31 23:48:38 +02:00
  • 816d19a8d6 REVISION ++ Mr.doob 2011-03-31 22:29:53 +01:00
  • f518051f1f Fixed some spurious invisible character in WebGLRenderer. alteredq 2011-03-31 23:25:48 +02:00
  • 70594cc9ce Fixed so dirty=false after uploading custom attribute Mikael Emtinger 2011-03-31 15:45:48 +02:00
  • e88b1b4783 Merged with mrdoob. Fixed so lens flares uses AdditiveBlending in example. Mikael Emtinger 2011-03-31 13:57:52 +02:00
  • a0b0de46ff Added support for custom attributes in MeshShaderMaterial. Added support for THREE.Vector4 as uniform. Mikael Emtinger 2011-03-31 13:54:33 +02:00
  • d5cff3fd37 WebGLRenderer: Removed dupe blending. Mr.doob 2011-03-31 08:43:37 +01:00
  • 36cd380725 Synced with mrdoob's branch. alteredq 2011-03-31 09:12:57 +02:00
  • bfceae1655 Minor formating clean up. Mr.doob 2011-03-31 07:42:30 +01:00
  • 0014ce7215 Fixed glass transparency in scene example. Mr.doob 2011-03-31 07:29:10 +01:00
  • 8af4dd49c1 WebGLRenderer now uses material.transparent to determine whether a material is transparent or not. Moved materials/RenderTarget.js ⟶ renderer/WebGLRenderTarget.js Mr.doob 2011-03-31 07:22:44 +01:00
  • cc453b6bda Merged with empaempa's branch. alteredq 2011-03-31 06:21:25 +02:00
  • 1b98dbb033 Improved grass example. Mr.doob 2011-03-31 05:15:27 +01:00
  • a0636d934b Messed up merge with empaempa. alteredq 2011-03-31 05:42:49 +02:00
  • 7b07f34b7d merged with mrdoob. fixed so depthMask is correctly restored after stencil and lensflares. removed all enable/disable _gl.BLEND as it's always on. Mikael Emtinger 2011-03-30 20:52:23 +02:00
  • 49773aab42 Merge remote branch 'alteredq/master' Mr.doob 2011-03-30 08:49:15 +01:00
  • 97c556cb3d Unneded property set. Mr.doob 2011-03-30 08:48:56 +01:00
  • f51a53bd23 Synced with mrdoob's branch. alteredq 2011-03-30 06:41:48 +02:00
  • ccc566463e Replaced QuakeCamera's dragToLook parameter with activeLook parameter. alteredq 2011-03-30 06:38:24 +02:00
  • 8b63842305 CanvasRenderer: Hocked materials linecap/linejoin/wireframeLinecap/wireframeLinejoin with context.linecap/linejoin. Made it 'round','round' by default again. Mr.doob 2011-03-30 02:08:05 +01:00
  • 01d60217cc Updated builds. Mr.doob 2011-03-29 20:30:06 +01:00
  • 11d29f464b Merge remote branch 'alteredq/master' Mr.doob 2011-03-29 20:25:23 +01:00
  • 67c7b15552 Reverting Camera.update as how it was before (as it turned out that wasn't the problem). This needs more testing. Mr.doob 2011-03-29 20:23:55 +01:00
  • 3536f3f2f5 Merged with MrDoob Mikael Emtinger 2011-03-29 20:50:45 +02:00
  • 220983f455 Updated Blender importer to show textures. alteredq 2011-03-29 18:10:34 +02:00
  • 764121a86e Merge branch 'master' of http://github.com/mrdoob/three.js alteredq 2011-03-29 15:00:38 +02:00
  • ac6f422a6f Added LensFlares. Note that a new blending mode has been added. Added an (quite ugly example). NOTE: this doesn't seem to work on Chrome+Mac+NVIDIA unless you turn off antialias (which I've done in the example). Mikael Emtinger 2011-03-29 13:30:53 +02:00
  • 3960e5c8ef Camera was hitting infinite loop when useTarget = true. Hopefully this fixes it.(Thx bai) Mr.doob 2011-03-29 10:11:01 +01:00
  • 532929d510 WebGLRenderer: Added distance (falloff) to PointLight. Mr.doob 2011-03-29 06:13:21 +01:00
  • 10e86a45fe Added handling of materials and textures to Blender importer. alteredq 2011-03-29 05:51:49 +02:00
  • 449a981925 CanvasRenderer: Added distance(falloff) to PointLight. Removed illumination to ParticleCanvasMaterial. Mr.doob 2011-03-29 03:50:04 +01:00
  • 377d1904de Modified cubemap example to be more in the way one would render a Skybox like. Mr.doob 2011-03-28 17:11:27 +01:00
  • 6552dd559a Updated all builds. alteredq 2011-03-28 16:51:27 +02:00
  • fd145f038e Reverted accidental reverting of mrdoob's changes. alteredq 2011-03-28 16:45:11 +02:00
  • dc8c98db5f Put some shader attributes behind #ifdef in buildProgram. alteredq 2011-03-28 16:24:22 +02:00
  • 827dcdd908 Added handling of UVs to Blender importer. alteredq 2011-03-28 04:17:38 +02:00
  • 32cd7c25c2 Added handling of vertex colors to Blender importer. alteredq 2011-03-28 02:49:28 +02:00
  • 012b9a7c04 Added handling of normals to Blender importer. alteredq 2011-03-28 00:44:19 +02:00
  • 49872b2afd Disabled antialias for examples that use full-screen postprocessing. alteredq 2011-03-27 21:19:49 +02:00
  • 5c684f93d8 Updated builds. Mr.doob 2011-03-27 08:04:26 +01:00
  • a23f8309ed Merge remote branch 'alteredq/master' Mr.doob 2011-03-27 08:03:19 +01:00
  • ba7ad63043 WebGLRenderer: Minor syntax clean up. Removed the rest of premultiplied alpha ops. Mr.doob 2011-03-27 08:03:00 +01:00
  • 33e5a9bfe0 Added very basic Three.js Blender importer. alteredq 2011-03-27 08:47:11 +02:00
  • f1a91c9fd5 Fixed bug in max exporter. alteredq 2011-03-26 20:49:52 +01:00