154 Commits
Author SHA1 Message Date
Mr.doob 2b92a824c2 Added FaceMaterial example in materials demo. 2010-11-17 04:56:47 +00:00
Mr.doob ec0de29153 Merging alteredq branch 2010-11-17 04:53:21 +00:00
Mr.doob 7dd33d6df6 Merging with alteredq branch 2010-11-17 04:51:43 +00:00
Mr.doob 51f91fdd03 Removed alpha component from the Color class
GouraudShading and PhongShading ⟶ SmoothShading
2010-11-17 04:49:30 +00:00
alteredq 3d3708919b Added support to "shading" materials parameter in WebGLRenderer.
This is actually tricky due to multimaterials and vertex normals.

The practical effects of "shading" parameter in WebGLRenderer are currently following:

- if your model has vertex normals, now you can "dumb down" its shading by specifying THREE.FlatShading for MeshLambertMaterial and MeshPhongMaterial
- if your model has only face normals, it will always have just flat shading, no matter which shading you set, no escape from this
- if your model has multiple materials, smooth shading always "wins", meaning if there is at least one smooth shaded material in multimaterial group, all other materials in this group will be also smooth shaded (this is solvable by having multiple normal buffers, but seems wasteful, at least for the moment, till there are no practical use cases)

Currently implemented shading / material combinations:

  - MeshNormalMaterial: FlatShading [default], GouradShading
  - MeshDepthMaterial:  no shading parameter in material, uses own specific shading
  - MeshBasicMaterial: no shading parameter in material, uses own specific shading
  - MeshLambertMaterial: FlatShading, GouraudShading [default]
  - MeshPhongMaterial: FlatShading, PhongShading [default]
2010-11-16 22:38:06 +01:00
Mr.doob f7d71abc3e Improved materials demo. 2010-11-16 17:22:37 +00:00
Mr.doob 23688daf08 Added WIP materials example (showing all at once). 2010-11-16 14:57:06 +00:00
Mr.doob fbfa375d2c src/io/Loader.js ⟶ src/extras/io/Loader.js
Removed Loader.js from compiled lib
Fixed examples
2010-11-16 14:04:54 +00:00
Mr.doob b449fdf5a8 Added a variation of the interactive example (using Tween.js) 2010-11-16 13:35:47 +00:00
Mr.doob dc6e335dc9 Color: Nicer way to check whether the hex has the alpha component or not. Removed unused methods.
CanvasRenderer/SVGRenderer: More code clean up and optimisations.
2010-11-16 12:27:25 +00:00
Mr.doob fe82bdbda9 Came up with a crazy approach to get Vertex Colors. Gouraud yet on step closer.
Changed the DepthMaterial to use this approach instead.
2010-11-16 11:02:45 +00:00
alteredq 9081529d84 Made all examples working again. 2010-11-16 03:06:46 +01:00
alteredq 007ee285fa Added MeshNormalMaterial support to WebGLRenderer. 2010-11-16 02:50:46 +01:00
Mr.doob 4d209ac433 Implemented material blendings (THREE.NormalBlending, THREE.AdditiveBlending, THREE.SubtractiveBlending) in CanvasRenderer
Added MeshNormalMaterial (per face)
2010-11-15 16:52:22 +00:00
Mr.doob 696bd4715f Added another depth material test. 2010-11-15 09:12:37 +00:00
Mr.doob 7d8fd5f874 CanvasRenderer now renders MeshDepthMaterial properly (per vertex). Gouraud is one step closer :)
Cleaned up CanvasRenderer and SVGRenderer code a bit.
2010-11-15 08:50:31 +00:00
Mr.doob 05b496d822 Merge remote branch 'alteredq/materials' into materials 2010-11-15 04:16:51 +00:00
Mr.doob d2b6d7df0c Updating README's example 2010-11-15 04:16:43 +00:00
alteredq 0163e4f2f5 Added (commented out) MeshDepthMaterial support to WebGLRenderer.
It's commented out, as it breaks shader validation in current Chrome :(.

There seems to be some bug in Chrome / ANGLE making it barf when using "gl_FragCoord" in fragment shader.

Curiously, while it breaks both 9.0.576.0 dev channel and latest continuous build 9.0.583.0, it does work fine in canary build with the same version as dev channel (9.0.576.0).

Go figure. Also in Firefox 4 beta 7 it works fine.

It seems there were some recent changes in handling of "gl_FragCoord" on Windows which probably broke something when fixing other bug:

http://code.google.com/p/chromium/issues/detail?id=59762
http://code.google.com/p/angleproject/issues/detail?id=71

TODO: make isolated test case and submit bug report (if this doesn't go away in next Chrome update).
2010-11-15 04:49:28 +01:00
Mr.doob 591c4c5bef Merging alteredq branch. 2010-11-15 02:06:18 +00:00
Mr.doob 5feee3839f Trying to merge... 2010-11-15 01:56:10 +00:00
alteredq b09308c238 Synced with mrdoob's materials branch.
Have to commit broken build (missing MeshDepthMaterial.js) as git doesn't want to proceed with new merge till the old one is not committed :(
2010-11-15 02:54:42 +01:00
alteredq bfb8242928 WebGLRenderer also working.
Not all features from the new material format are implemented yet, though already now it's more powerful than the old format (you can now use  texture also in Basic and Phong materials).

Also started to retire old model format: removed old OBJ converter and meshes that it generated.

TODO:
 - take into account shading and blending parameters
 - transplant cube map support from experimental material
2010-11-15 02:29:03 +01:00
Mr.doob 98dc841aab Added MeshDepthMaterial.
Optimised Particles projection in CanvasRenderer.
2010-11-15 01:17:41 +00:00
Mr.doob 64df690cc0 SVGRenderer also working. 2010-11-13 08:20:35 +00:00
Mr.doob 22f48a731b CanvasRenderer handles textures again.
Most of the examples working.
2010-11-13 07:11:57 +00:00
Mr.doob 237f165555 ParticleCircleMaterial working again with CanvasRenderer 2010-11-13 03:42:13 +00:00
Mr.doob ce3d641ff2 Changed materials format a bit.
Almost done porting CanvasRenderer to the new material system (plus some performance gains on the way :D)
`Color` now handles hex with no alpha byte (probably there is a nicer way of doing it...)
2010-11-13 02:39:27 +00:00
alteredq 7ce3b0f7d2 Experimenting with different syntax for materials (just hex instead of THREE.Color in API), checking how it feels with shaders example. 2010-11-12 18:10:28 +01:00
alteredq c31cb220e3 Renamed examples: shader_test -> materials_shaders, materials_test -> materials_multimaterials 2010-11-12 15:57:07 +01:00
Mr.doob a35b35fde9 * examples/geometry/primitivessrc/extras/primitives
* THREE.Rectangle: `_x1`, ` _x2`, `_y1`, `_y2` ⟶ `_left`, `_right`, `_top`, `_bottom`
2010-11-12 04:02:30 +00:00
alteredq 7c26e04c7a Refactored common functionality out of ascii and binary loaders. 2010-11-09 02:19:34 +01:00
alteredq a0fa2ae3dd Optimized binary model format to use indexed UVs. Updated OBJ slim converter and Loader accordingly.
This saves about 10% from size of textured binary models.
2010-11-08 23:20:25 +01:00
alteredq 188f36be5d Optimized ASCII model format to use indexed UVs. Updated OBJ slim converter and Loader accordingly.
This saves ~22% from size of textured ASCII models.

TODO: make the same for binary model format.
2010-11-08 18:10:43 +01:00
alteredq 7abad40d83 Merge remote branch 'remotes/sole/master' 2010-11-06 19:23:28 +01:00
alteredq 514a2e6135 Merged with latest changes in mrdoob's branch. All hex colors should be now without baked opacity. 2010-11-06 18:59:03 +01:00
alteredq 0cb79310e5 Added experimental binary mesh loader. Updated OBJ converter and examples accordingly.
If you want to use binary format, convert OBJ models using "convert_obj_threejs_slim.py" with "-t binary" option.

This will now create two files:
    JS part with materials
    BIN part with binary buffers

Binary models are loaded like this:

loader.loadBinary( 'obj/lucy/Lucy250k_bin.js', function( geometry ) { createScene( geometry, s ) }, "obj/lucy" );

(difference to ascii format is that url root must be always specified so loader can find binary buffers file, like it already was for textures)

Good news:

- raw binary files are quite smaller than raw ascii files (about half size)
- loading times went down about 20-25%
- now also Firefox can handle 250k triangle mesh (it just bugs about long running script), with ascii format it threw "array initialiser too large" exception

Mixed news:

- gzipped binary files are only about 25% smaller than gzipped ascii files so actual benefits are smaller,
  also it's more likely server will have JS gzipping on by default, while you need to set it up for
  other formats (could be hacked around by naming binary files with JS extension instead of BIN?)

Bad news:

- browser blocking is back :( Not that it ever went completely away (for large models object creation is more costly than loading and it is blocking), but it was slightly better with ascii loader (where data is loaded as worker's JS body).

    - this comes from having to use Ajax to load binary data
    - loading binary data by Ajax from within worker didn't really help, it was in fact slightly slower and browser did freeze :(
    - can't easily embed binary data in JSON (would need to encode it which would make it bigger, defying the purpose)

- Loader got fatter

Also in this commit: renamed Loader.loadAsync() => Loader.loadAsciiOld() and Loader.loadWorker() = Loader.loadAscii() so that names correspond to model formats instead of underlying implementation.

loadAsciiOld - JS exported by Blender and old OBJ converter
loadAscii    - JSON created by slim OBJ converter (-t ascii)
loadBinary   - JSON + BIN created by slim OBJ converter (-t binary)

TODO:

 - look into UV coordinates, should be indexed the same way as vertices, normals and faces are (instead of unrolled per each face)
 - look into HTML5 File API, binary blobs could help
2010-11-06 17:24:58 +01:00
Mr.doob 3cdc007b90 * Fixed some minor issues handling opacity in hex colors 2010-11-06 12:51:09 +00:00
Mr.doob 1849e9050c * Added a nicer interactivity example ⟶ examples/interactive_voxelpainter.html 2010-11-05 06:00:09 +00:00
sole bf6db5a714 merging? 2010-11-05 00:41:20 +00:00
Mr.doob 52045b53cb * examples/geometry_large_mesh.html: credit were credit is due :) 2010-11-05 00:26:33 +00:00
Mr.doobandsole 0ca8efd916 Fixed stats 2010-11-05 08:26:17 +08:00
alteredq c437ce68fe Small clarifications in large mesh example description: model size meanwhile went down to 3.5 MB ;) and file access flag applies to Chrome. 2010-11-05 00:33:24 +01:00
alteredq f6e829ca21 Synced with mrdoob's branch. 2010-11-05 00:25:03 +01:00
Mr.doob 55c40d0fa3 * Renamed examples/large_mesh_test.html to examples/geometry_large_mesh.html
* Added the first WebGL example to README \:D/
2010-11-04 22:29:38 +00:00
Mr.doob 5053cc4e6d * Added 2 more examples to the README.
* Cleaned interactive_cubes example code.
2010-11-04 21:59:42 +00:00
Mr.doob 83690551a3 Added a comment on example/large_mesh_test.html about the --allow-file-access-from-files bit. 2010-11-04 21:08:59 +00:00
Mr.doob 425c01111b Merge remote branch 'alteredq/master' 2010-11-04 20:57:29 +00:00
alteredq 49d1bd170b Made JSON model format slimmer by flattening arrays. Modified Loader and OBJ converter accordingly.
This is a first step towards eventual binary model format.
2010-11-04 21:18:08 +01:00
Mr.doob 8d198002d1 * Fixed a bug in Ray.intersectObject: face.normal needs to be transformed using matrixRotation otherwise rotated objects fail
* A bit nicer example
2010-11-04 20:11:37 +00:00