Commit Graph
1165 Commits
Author SHA1 Message Date
Mr.doob bfceae1655 Minor formating clean up. 2011-03-31 07:42:30 +01:00
Mr.doob 0014ce7215 Fixed glass transparency in scene example. 2011-03-31 07:29:10 +01:00
Mr.doob 8af4dd49c1 WebGLRenderer now uses material.transparent to determine whether a material is transparent or not.
Moved materials/RenderTarget.js ⟶ renderer/WebGLRenderTarget.js
2011-03-31 07:22:44 +01:00
Mr.doob 1b98dbb033 Improved grass example. 2011-03-31 05:15:27 +01:00
Mikael Emtinger 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. 2011-03-30 20:52:23 +02:00
Mr.doob 49773aab42 Merge remote branch 'alteredq/master' 2011-03-30 08:49:15 +01:00
Mr.doob 97c556cb3d Unneded property set. 2011-03-30 08:48:56 +01:00
alteredq f51a53bd23 Synced with mrdoob's branch. 2011-03-30 06:41:48 +02:00
alteredq ccc566463e Replaced QuakeCamera's dragToLook parameter with activeLook parameter.
DragToLook was weird, instead activeLook can be now used for simple switching on/off of mouse look around.
2011-03-30 06:38:24 +02:00
Mr.doob 8b63842305 CanvasRenderer: Hocked materials linecap/linejoin/wireframeLinecap/wireframeLinejoin with context.linecap/linejoin. Made it 'round','round' by default again. 2011-03-30 02:08:05 +01:00
Mr.doob 01d60217cc Updated builds. 2011-03-29 20:30:06 +01:00
Mr.doob 11d29f464b Merge remote branch 'alteredq/master' 2011-03-29 20:25:23 +01:00
Mr.doob 67c7b15552 Reverting Camera.update as how it was before (as it turned out that wasn't the problem). This needs more testing. 2011-03-29 20:23:55 +01:00
Mikael Emtinger 3536f3f2f5 Merged with MrDoob 2011-03-29 20:50:45 +02:00
alteredq 220983f455 Updated Blender importer to show textures. 2011-03-29 18:10:34 +02:00
alteredq 764121a86e Merge branch 'master' of http://github.com/mrdoob/three.js 2011-03-29 15:00:38 +02:00
Mikael Emtinger 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). 2011-03-29 13:30:53 +02:00
Mr.doob 3960e5c8ef Camera was hitting infinite loop when useTarget = true. Hopefully this fixes it.(Thx bai) 2011-03-29 10:11:01 +01:00
Mr.doob 532929d510 WebGLRenderer: Added distance (falloff) to PointLight. 2011-03-29 06:13:21 +01:00
alteredq 10e86a45fe Added handling of materials and textures to Blender importer.
Also added custom property to materials to be able to select if vertex colors should be used for the material.
2011-03-29 05:51:49 +02:00
Mr.doob 449a981925 CanvasRenderer: Added distance(falloff) to PointLight. Removed illumination to ParticleCanvasMaterial. 2011-03-29 03:50:04 +01:00
Mr.doob 377d1904de Modified cubemap example to be more in the way one would render a Skybox like. 2011-03-28 17:11:27 +01:00
alteredq 6552dd559a Updated all builds. 2011-03-28 16:51:27 +02:00
alteredq fd145f038e Reverted accidental reverting of mrdoob's changes. 2011-03-28 16:45:11 +02:00
alteredq dc8c98db5f Put some shader attributes behind #ifdef in buildProgram.
This is to see if it helps with shader validation complains that recently started to pop up in Chrome ANGLE (but curiously not in Firefox ANGLE).
2011-03-28 16:24:22 +02:00
alteredq 827dcdd908 Added handling of UVs to Blender importer. 2011-03-28 04:17:38 +02:00
alteredq 32cd7c25c2 Added handling of vertex colors to Blender importer. 2011-03-28 02:49:28 +02:00
alteredq 012b9a7c04 Added handling of normals to Blender importer.
There is checkbox for choosing whether Blender should recalculate vertex normals or whether to use normals from the data.

Using vertex normals from the data can in some cases lead to artefacts. This is probably caused by sharing of vertices across several faces (I didn't find a way how to specify vertex normals per face use of vertex; there is just API for setting normals to vertices).

If you select "recalculate vertex normals" (default), this sets faces to use smooth shading, which upon subsequent mesh update computes correct vertex normals (but it will lose eventual smoothing groups baked in vertex normals).
2011-03-28 00:44:19 +02:00
alteredq 49872b2afd Disabled antialias for examples that use full-screen postprocessing.
It doesn't have effect there anyway as scene is rendered to FBO without multisampling.

Turning antialiasing off here didn't have much effect on performance though (unlike for particles).
2011-03-27 21:19:49 +02:00
Mr.doob 5c684f93d8 Updated builds. 2011-03-27 08:04:26 +01:00
Mr.doob a23f8309ed Merge remote branch 'alteredq/master' 2011-03-27 08:03:19 +01:00
Mr.doob ba7ad63043 WebGLRenderer: Minor syntax clean up. Removed the rest of premultiplied alpha ops. 2011-03-27 08:03:00 +01:00
alteredq 33e5a9bfe0 Added very basic Three.js Blender importer.
Very much work in progress, for the moment it creates just pure geometry (no normals, uvs, colors or materials).

Also fixed bug in JSONLoader in handling of face uvs.
2011-03-27 08:47:11 +02:00
alteredq f1a91c9fd5 Fixed bug in max exporter.
Vertex color parameter was undefined for dummy materials.
2011-03-26 20:49:52 +01:00
Mr.doob 754aebf84a Reverted Detector.js as Chrome's issue seems to be fixed now. 2011-03-26 12:42:16 +00:00
Mr.doob d6949ea2ce NormalBlending is now 1:1 with Blender :_)
No wonder there were premultiplied-alpha-looking issues. We were doing it ourselves :P
2011-03-26 12:17:37 +00:00
Mr.doob 6c1b9c589d Merge remote branch 'alteredq/master' 2011-03-26 10:49:53 +00:00
Mr.doob 59443e5725 WebGLRenderer: Some clean up of blending modes.
NormalBlending is a bit better. But it's now producing some premultiplied-alpha-looking issues still :/

Created a couple of tools for making this process less painful:

http://mrdoob.com/lab/javascript/webgl/blending/blendfunc.html
http://mrdoob.com/lab/javascript/webgl/blending/blendfuncseparate.html
2011-03-26 10:41:58 +00:00
alteredq 812c6dff96 For some reason last commit didn't update everything. 2011-03-26 06:38:21 +01:00
alteredq b31b8eebcd Changed exporters, converters and example models to use more proper JSON.
Single quote property names and hex numbers are not valid in JSON.
2011-03-26 06:05:46 +01:00
alteredq 633276ddd8 Quick fix for Detector that got broken with latest Chrome canary.
For some reason Chrome canary 12.0.713.0 doesn't have "window.WebGLRenderingContext".
2011-03-25 17:40:56 +01:00
Mikael Emtinger 9ee4c267b1 In the middle of lens flares 2011-03-25 17:05:40 +01:00
alteredq f052891b2b Forgot comma in scene template. 2011-03-25 15:54:46 +01:00
alteredq 3943ca604a Added handling of custom properties to Blender exporter. 2011-03-25 14:50:46 +01:00
alteredq a89ec4fede Added exporting of group ids to Blender scene exporter.
Also fixed multimaterial ids list.
2011-03-25 14:28:28 +01:00
alteredq 8abdf466ce Synced with mrdoob's branch. 2011-03-25 12:46:14 +01:00
Mr.doob a3e29e5beb I think BillboardBlending is how NormalBlending is supposed to be.
Also changed AdditiveBlending.
2011-03-25 07:02:04 +00:00
alteredq 4f80bbf808 Merged with mrdoob's branch. 2011-03-25 04:52:13 +01:00
alteredq 1859fe4057 Updated Blender exporter to be able to export scenes.
Work-in-progress.

So close yet so far. Test scene almost works, just two things are not rotated properly (which means maybe everything will need to be reworked :(
2011-03-25 04:39:04 +01:00
alteredq 0496571235 Updated model loader, scene loader and scene format.
- model loader now handles "wireframe" parameter

- scene light colors are now specified via hex numbers

- scene format now includes additional parameter "urlBaseType" specifying where loader will look for included files:
    - options are "relativeToHTML" (look for files under HTML url http://example.com/mydemo/index.html)
      and "relativeToScene" (look for files under url from where scene was loaded http://example.com/assets/myscene/scene.js)
2011-03-25 03:22:32 +01:00