home/three.js
2
0
Fork 0
mirror of https://github.com/wahyd4/three.js.git synced 2026-08-09 04:56:01 +10:00
Code Issues Packages Projects Releases Wiki Activity
1,365 Commits 2 Branches 19 Tags
r40
Commit Graph
1365 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Mr.doob 44a8652c37 REVISION ++ r40 2011-04-24 12:57:28 +01:00
alteredq 8062c3bf31 Added HSV -> RGB color conversion to Color. 2011-04-23 10:57:34 +02:00
Mr.doob e457b4f8ae Added drawCalls property to WebGLRenderer::data object. 2011-04-22 00:35:43 +02:00
alteredq 7ee6cc33eb OBJ converter: add option for scaling and truncating vertex coordinates (flag "-x scale"). 
To be used like this:

python convert_obj_three.py -i lucy100k.obj -o Lucy100k_slim.js -a center -s flat -x 100

It should work also for morph vertices.
 2011-04-21 14:36:53 +02:00
alteredq abbfd7a493 Fixed handling of vertexColors parameter in Blender JSON importer. 2011-04-21 13:58:52 +02:00
alteredq 614925336d Added support for empty objects and meshes without geometries to Blender scene exporter and SceneLoader. 2011-04-21 13:28:04 +02:00
alteredq 4637b69d58 Synced with mrdoob's branch. 2011-04-21 12:19:44 +02:00
Mr.doob c1ce040781 Updated Projector's Particle handling (it wasn't using hierarchy). 2011-04-21 10:42:30 +02:00
Mr.doob 0a11daf348 Updated builds. Fixed Trident. 2011-04-21 01:59:33 +02:00
Mikael Emtinger 360ef808bb Merge branch 'master' of https://github.com/alteredq/three.js 2011-04-21 01:24:58 +02:00
Mikael Emtinger 78050886eb Merge branch 'master' of git://github.com/mrdoob/three.js 2011-04-21 01:24:47 +02:00
Mikael Emtinger e08e3456b0 Changed so objects added in sceneB in sceneA.addChild( sceneB ) actually propagates all the way up to sceneA, so they become rendered. 2011-04-21 01:24:29 +02:00
alteredq b6e3089425 Added embedded meshes to Blender scene exporter. 2011-04-20 15:59:48 +02:00
alteredq d7ec2be764 Added embedded ascii JSON meshes to SceneLoader. 2011-04-19 20:47:35 +02:00
alteredq b9977ede37 Added triggers type to Blender exporter and scene loader. 2011-04-19 18:08:39 +02:00
alteredq c0e232d019 Updated builds. 2011-04-19 07:44:16 +02:00
alteredq 7b6cee3f41 Merge remote branch 'remotes/empaempa/master' 2011-04-19 07:28:57 +02:00
Mikael Emtinger 40eae8ae10 Fixed bug related to morphColors in JSONLoader. Changed reading of custom attributes from geometry group to material to let material instead of geometry rule of the source of data. 2011-04-18 22:36:23 +02:00
Mr.doob b18b6f9fbe Added Trident to Geometry example. Found out that handling scene.objects from API wise is a bit confusing (childs are there too). 2011-04-18 16:29:00 +02:00
Mr.doob 3875d33ac4 Update builds. 2011-04-18 16:11:25 +02:00
Mr.doob a3f5f5b614 Merge remote-tracking branch 'sroucheray/Branch_r39' into test 2011-04-18 16:08:19 +02:00
Mr.doob 1cf6fafadc Update builds. 2011-04-18 15:52:22 +02:00
Mikael Emtinger aa9193e43c Fixed bug that caused env-maps and cube maps to break. 2011-04-18 15:18:20 +02:00
Mikael Emtinger 7816ffe1d1 Merge branch 'master' of git://github.com/mrdoob/three.js 2011-04-18 14:20:34 +02:00
Mikael Emtinger 24eaf4abc9 Fixed some bugs around setting uniforms and morph targets. Added a small feature to custom attributes to allow re-use. 2011-04-18 14:17:19 +02:00
sroucheray 39e993d50d Include Trident.js in the EXTRAS_FILES Build array 2011-04-17 22:41:32 +02:00
sroucheray eddf6aeeff Merge branch 'master' of git://github.com/mrdoob/three.js into Branch_r39 2011-04-17 22:37:39 +02:00
sroucheray 2d49fd2b84 Trident is a utility 3D object, it simply displays the 3 axis arrows. 
It can be added to the scene or as a child of any Object3D.
It is specially useful for debugging purpose.
The Trident name is borrowed from the Away3D project http://away3d.com/livedocs/3.6.0_lib/away3d/primitives/Trident.html
 2011-04-17 22:36:40 +02:00
Mr.doob 61553c5710 Commented console.log. 2011-04-17 17:50:24 +02:00
alteredq bd56143eb4 Updated a bit message and links in Detector. 2011-04-16 18:36:03 +02:00
alteredq 9ae036fd22 More refactoring / optimizations of collision system. 2011-04-16 04:47:20 +02:00
alteredq 0c6076d39b Added merge to CollisionSystem. Also some refactoring and optimizations. 
Still there are some new objects created per frame there.
 2011-04-16 04:17:32 +02:00
alteredq 526bd322ba Fixed typo in example. 2011-04-16 01:29:42 +02:00
alteredq aac5b6117b Refactored SceneLoader. 
Just a single callback is now passed  to loader.load( "scene.js", callbackFinal ) - callback which is called when everything from the scene was already loaded.

If you want to use also callbacks for initialization of procedural synchronously created elements, you can set property of loader:

loader.callbackSync = function( result ) { ... }

If you want to get callback for load progress, set:

loader.callbackProgress = function( progress, result ) { ... }

Also added per scene creation of collision systems (it used to be singleton).
 2011-04-16 00:40:07 +02:00
alteredq f51d3f4da3 Fixed forgotten namespace in PathCamera. 2011-04-15 04:36:17 +02:00
alteredq 3505923be5 Changed default in OBJ converter to no alignment. 2011-04-15 04:17:36 +02:00
alteredq 67147df926 Fixed bug in RollCamera and FlyCamera. 
Only the first update should set the last updated timestamp, not constructor.
 2011-04-15 02:15:37 +02:00
Mr.doob 86c8dbf92b Updating builds. 2011-04-14 22:16:06 +01:00
Mr.doob 6b536f0c52 Merge remote branch 'alteredq/master' into experimental 2011-04-14 22:12:23 +01:00
Mr.doob 47c71c59a1 Merge remote branch 'drojdjou/master' into experimental 2011-04-14 22:12:17 +01:00
Mr.doob e2b8dbf285 Merging with drojdjou's branch. 2011-04-14 22:12:11 +01:00
Mr.doob c095191b08 Merge remote branch 'empaempa/master' into experimental 2011-04-14 22:06:19 +01:00
Mr.doob 8019b3b382 Merging with empaempa's branch. 2011-04-14 22:06:07 +01:00
Bartek Drozdz 5b5a2482c1 Added example with getting normal 2011-04-14 17:48:39 +02:00
Bartek Drozdz 5c55a4f751 Fixed the normal on mesh collision. 2011-04-14 17:23:35 +02:00
alteredq 99630c2dff Fixed few spurious globals in WebGLRenderer. 2011-04-14 16:52:23 +02:00
Mikael Emtinger 0198766fed Added .name and .getChildByName( "objectName", doRecurse ) to Object3D. Added so scene-loader fills in .name property. 2011-04-14 16:23:21 +02:00
alteredq 86aa767a6a Added vertical look constraint parameter to RollCamera. 2011-04-14 16:21:50 +02:00
alteredq 68f660901d Added new callbacks for assets load tracking also to SceneLoader. 
It works both for JSON models and textures. Handling of every asynchronously loaded asset triggers calls to "onLoadStart" and "onLoadComplete" callbacks.
 2011-04-14 03:27:22 +02:00
alteredq cb3f2fff7d Fleshed out RollCamera: refactored code out of example, add more keyboard controls, API and made it framerate independent. 2011-04-14 00:31:40 +02:00