zz85
1638bfdbee
Merge remote-tracking branch 'upstream/dev'
2011-10-12 17:41:48 +08:00
Mr.doob
698c15fdce
Tab fix.
2011-10-12 05:47:00 +02:00
Mr.doob
e81b2361d7
Merge remote-tracking branch 'cscott/master' into dev
2011-10-11 20:46:34 +02:00
Mr.doob
fb4f5f8467
Merge remote-tracking branch 'Knectar/dev' into dev
2011-10-11 02:21:16 +02:00
C. Scott Ananian
ed38b18fd9
Fix scene loader when there is nothing asynchronous to be loaded.
2011-10-10 18:06:58 -04:00
Daniel
c783410a1a
Octahedron subdivisions to default to 0.
2011-10-10 18:54:56 +01:00
zz85
e3039ae0f7
Merge branch 'gui'
2011-10-11 00:09:51 +08:00
zz85
36089d0251
Fixed sharp corners for Subdivision Modifier
2011-10-11 00:09:24 +08:00
zz85
0f48597f97
cleaner way of doing perspective->orthographic
2011-10-10 11:19:58 +08:00
zz85
85c063dedd
Merge remote-tracking branch 'upstream/dev'
2011-10-09 18:26:27 +08:00
Mr.doob
8edb3f18b2
Removing (now unused) stuff from Projector.
2011-10-09 07:11:19 +02:00
Mr.doob
378c3fdfed
Removing some deprecated warnings.
...
Maybe a bit too early, but just want to see that code clean and simple...
2011-10-09 07:01:18 +02:00
Mr.doob
0971db286f
I wonder if this still affects performance nowadays.
2011-10-09 06:49:07 +02:00
Mr.doob
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... ).
2011-10-09 06:46:03 +02:00
zz85
d497917cb2
Merge remote-tracking branch 'upstream/dev'
2011-10-09 10:39:07 +08:00
zz85
ef1a6785d2
Combined Camera now tries to use Perspective\'s average viewing frustrum for switching to Orthographic view
2011-10-09 10:38:22 +08:00
Mr.doob
1e5fc98582
Reworking Scene Graph setup.
2011-10-09 01:13:46 +02:00
Mr.doob
2c8967b124
Fixed CanvasRenderrer incorrectly SphericalReflectionMapping Face4 rendering.
...
Also replaced WaltHead.js (old format) with WaltHeadLo.js (new format)
2011-10-08 21:04:26 +02:00
Mr.doob
8db9d6fd61
GUI: Snap to axis (press x,y or z when moving). Added TrackballControls
...
Added this.enabled property to TrackballControls.
Simplified TrackballControls code.
2011-10-08 19:43:11 +02:00
zz85
a2c8a2e0b4
added zoom + 6 views for CombinedCamera
2011-10-09 00:09:37 +08:00
zz85
2d20fbe954
Views for CombinedCamera
2011-10-08 18:23:44 +08:00
Mr.doob
df94d2af57
Moved matrixWorldInverse logic to renderers as per @greggman suggestion.
...
Now `Camera` can use inherited `update()`
2011-10-08 03:38:49 +02:00
Mr.doob
7d3e482555
Merge remote-tracking branch 'alteredq/dev' into dev
2011-10-08 00:28:07 +02:00
Mr.doob
7891f2b33b
JSONLoader.load( parameters ) to JSONLoader( url, callback, texturePath )
2011-10-08 00:21:13 +02:00
alteredq
51b6db1c54
Merge remote-tracking branch 'remotes/mrdoob/dev' into dev
2011-10-07 22:54:56 +02:00
alteredq
8ab93926ce
Fixed bug causing disappearing wireframe objects in mixed scenes.
2011-10-07 22:53:57 +02:00
Mr.doob
319d423262
Forgot marklundin's credit.
2011-10-07 21:54:47 +02:00
Mr.doob
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
2011-10-07 21:22:48 +02:00
alteredq
89c578332e
Fixed shading glitches on OpenGL (thanks to @mrdoob for spotting this).
2011-10-07 20:56:24 +02:00
alteredq
7355c2b68b
Changed ambient term to influence also texture in Phong / normal map materials.
...
This feels more intuitive, otherwise ambiently lit textured surfaces look weird.
2011-10-07 19:06:55 +02:00
alteredq
7d2805dd83
Fixed specular term in Phong / normal map materials.
...
Turns out I had it right before after all: to get rid of artefacts it should be multiplied by diffuse term (instead of being patched by conditional).
2011-10-07 18:43:00 +02:00
Mr.doob
e4a17d6369
Merge remote-tracking branch 'greggman/newrot' into dev
2011-10-07 09:01:16 +02:00
Mr.doob
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 :/ :/
2011-10-07 08:55:05 +02:00
Mr.doob
1258e8a771
Ray now also checks object's children.
2011-10-07 07:07:34 +02:00
gman
7f0346f3b8
Update WebGL Renderer so cameras can have parents
2011-10-06 17:58:00 -07:00
Mr.doob
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)
2011-10-07 02:30:10 +02:00
Mr.doob
435f7e7be5
Backwards compatibility for old cameras.
2011-10-07 01:08:59 +02:00
alteredq
b18a38eee5
Merge remote-tracking branch 'remotes/mrdoob/dev' into dev
2011-10-06 23:44:10 +02:00
alteredq
84ed1835ca
Added reflection to normal map shader.
2011-10-06 23:33:01 +02:00
Mr.doob
f357225c2d
Merging dev branch.
2011-10-06 06:15:03 +02:00
alteredq
801fe52d75
Removed unused code from normal map shader.
2011-10-06 05:02:10 +02:00
alteredq
8afaef4597
Merge remote-tracking branch 'remotes/mrdoob/dev' into dev
2011-10-06 04:18:27 +02:00
alteredq
1042528b39
Added texture coordinates offset and repeat to normal map shader.
2011-10-06 04:11:11 +02:00
alteredq
8153982ffb
Added shadow maps handling to normal map shader.
2011-10-06 03:46:42 +02:00
Mr.doob
5b22bffdf8
Merge remote-tracking branch 'arcanin/dev' into dev
2011-10-06 03:40:53 +02:00
Mr.doob
1a48b52540
Added @zz85's setLens() method to PerspectiveCamera too.
2011-10-06 03:24:31 +02:00
Mr.doob
a52637b892
Merge remote-tracking branch 'jsermeno/ortho' into dev
2011-10-06 02:49:01 +02:00
Mr.doob
3678dc63fa
Merging with @alteredq's branch.
2011-10-06 02:46:29 +02:00
Mr.doob
bd062691c2
Merge remote-tracking branch 'zz85/master' into dev
2011-10-06 02:35:26 +02:00
Mr.doob
78344033fa
Reverted AmbientLights changes.
2011-10-06 02:30:26 +02:00
zz85
Mr.doob
C. Scott Ananian
Daniel
alteredq
gman