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
gman
1ab9940107
Add example that shows using three.js for multiple monitors in a circle
2011-10-06 23:43:36 -07:00
Mr.doob
ca517008d1
Trying to use OrthographicCamera in the GUI.
...
Not much luck yet, for some reason the camera zooming doesn't work on the orthographic views :/
2011-10-07 07:53:02 +02:00
Mr.doob
7ec1a88d26
Fixed GUI.
2011-10-07 07:25: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
Mr.doob
fdf6fab7e6
Including @alteredq's post-release normal map improvements into r45.
2011-10-06 23:58:20 +02:00
alteredq
88d54b0cfa
Updated builds.
2011-10-06 23:46:51 +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
b964b7e49f
Merge remote-tracking branch 'guardianResearch/master' into dev
2011-10-06 21:35:31 +02:00
Andrew Strelzoff
485122a150
small fix - screen resize needs to refer to controls.screen sizes
2011-10-06 09:31:22 -05:00
Mr.doob
57769f8fd4
Merge remote-tracking branch 'jsermeno/ortho' into dev
2011-10-06 07:45:55 +02:00
Mr.doob
4172108688
setting REVISION to 46dev
2011-10-06 07:45:20 +02:00
Justin Sermeno
6e6f2453a1
change voxelpainter to use THREE.CombinedCamera
2011-10-05 22:27:34 -07:00
Justin Sermeno
e645a562b0
update voxelpainter to use projector pickingRay()
2011-10-05 22:11:30 -07:00
Mr.doob
b53119097c
Merge branch 'dev'
2011-10-06 06:15:12 +02:00
Mr.doob
f357225c2d
Merging dev branch.
2011-10-06 06:15:03 +02:00
Mr.doob
1dee999e7a
r45
2011-10-06 06:02:27 +02:00
Mr.doob
a57a25f5f1
Merge remote-tracking branch 'alteredq/dev' into dev
2011-10-06 05:14:21 +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
Mr.doob
c164c887f0
Updated builds.
2011-10-06 04:15:30 +02:00
Mr.doob
0651e7d9fa
Merge remote-tracking branch 'alteredq/dev' into dev
2011-10-06 04:12:57 +02:00
alteredq
1042528b39
Added texture coordinates offset and repeat to normal map shader.
2011-10-06 04:11:11 +02:00
Mr.doob
d2162b1111
Merge remote-tracking branch 'alteredq/dev' into dev
2011-10-06 04:10:59 +02:00
Mr.doob
c924ca37c2
Merging with @alteredq's branch.
2011-10-06 04:10:52 +02:00
alteredq
8153982ffb
Added shadow maps handling to normal map shader.
2011-10-06 03:46:42 +02:00
Mr.doob
40d1ea1083
Updated builds.
2011-10-06 03:42:40 +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
4360c07273
Updated builds.
2011-10-06 02:51:48 +02:00
Mr.doob
a52637b892
Merge remote-tracking branch 'jsermeno/ortho' into dev
2011-10-06 02:49:01 +02:00
Mr.doob
a5d9afcdcc
Merge remote-tracking branch 'alteredq/dev' into dev
2011-10-06 02:46:35 +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
alteredq
f485330ae6
Fixed bugs in immediate rendering.
2011-10-05 22:56:03 +02:00
zz85
bf6e906e64
Update builds
2011-10-06 00:56:50 +08:00
zz85
149c20d177
Added new THREE.CombinedCamera. Added orthographic + perspective example
2011-10-06 00:55:26 +08:00
Mr.doob
dd3bf5e9d0
Updated builds.
2011-10-05 17:56:08 +02:00
Justin Sermeno
7d0fbf7a62
change comments
2011-10-05 00:53:33 -07:00
Justin Sermeno
3b60963c64
pickingRay optimizations and comments
2011-10-05 00:43:07 -07:00
Justin Sermeno
bc27e18424
add pickingRay method
2011-10-05 00:31:52 -07:00
Justin Sermeno
1d1e1dfaf7
unproject that alters ray
2011-10-05 00:18:50 -07:00
zz85
94ff102c64
Updated example + merge with doob/dev
2011-10-05 14:29:30 +08:00
Justin Sermeno
923bb7f913
orthographic picking - v1
2011-10-04 23:13:07 -07:00