home/three.js
2
0
Fork 0
mirror of https://github.com/wahyd4/three.js.git synced 2026-08-11 22:16:05 +10:00
Code Issues Packages Projects Releases Wiki Activity
921 Commits 2 Branches 19 Tags
42bbe967294ea20ebf271de2aef4894de319e1b7
Commit Graph
921 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Mr.doob be0ad84c14 I should learn how to deal with conflicts... 2010-11-30 17:31:39 +00:00
Mr.doob e72b82cda2 Merging with orgicus' branch. 2010-11-30 17:30:45 +00:00
Mr.doob 3f16e36381 Merge remote branch 'alteredq/master' 2010-11-30 17:22:27 +00:00
Mr.doob f9f7d3645f Merging with alteredq's branch. 2010-11-30 17:22:20 +00:00
Mr.doob a6c9984a67 Commented some WIP code in CanvasRenderer so it doesn't throw warnings while compiling. 
Modified build script to avoid the extra full compilation.
 2010-11-30 17:18:05 +00:00
alteredq 144451f1fc Refactored also default attributes out of Fresnel shader and ubershader into buildProgram. 2010-11-30 18:07:18 +01:00
Mr.doob 27ec356ecd Merge remote branch 'alteredq/master' 2010-11-30 16:48:44 +00:00
Mr.doob 47d6116179 Merging with alteredq's branch. 2010-11-30 16:48:33 +00:00
Mr.doob b96de35ca0 Updated README r30 2010-11-30 16:41:59 +00:00
alteredq 8f06a4f37d Refactored default uniforms out of Fresnel shader and ubershader into buildProgram. 
Also yet another fix for car demo load progress.
 2010-11-30 17:40:40 +01:00
Mr.doob d1d60ef4da Updated README 2010-11-30 16:40:40 +00:00
Mr.doob 95ec00f8ac Updated builds. 2010-11-30 16:24:10 +00:00
Mr.doob 0f2badfdd1 Previous commit: Matrix4.transform ⟶ Matrix4.transformVector3 and Matrix4.tranformVector4 
This commit fixes what that change broke.
Removed chromatic distortion from WebGL reflection/refraction.
 2010-11-30 16:15:16 +00:00
Mr.doob 195d9a3820 Merge remote branch 'alteredq/master' 2010-11-30 15:48:52 +00:00
Mr.doob 5ee46bd973 Some Matrix4 optimisations... 2010-11-30 15:48:40 +00:00
George Profenza 38d3d0a364 merged with r29 2010-11-30 14:26:11 +00:00
alteredq de9b681204 Added forgotten MeshShaderMaterial.js Oops :# 2010-11-30 15:25:53 +01:00
alteredq e0c6dcb0cc Switched one more Walt to binary loader with progress reporting. 2010-11-30 15:23:24 +01:00
George Profenza caf2c2000f merging with r29 2010-11-30 13:45:00 +00:00
alteredq 5e3c1fbab8 Forgot to finish transition of car demo to new loading progress handling. 2010-11-30 13:32:53 +01:00
George Profenza 774b5e843d merged with original 2010-11-30 11:54:43 +00:00
Mr.doob ab2d25fcf0 Merge remote branch 'alteredq/master' 2010-11-30 05:06:53 +00:00
Mr.doob 67250c69d9 Merging with alteredq's branch. 2010-11-30 05:06:46 +00:00
Mr.doob dde35ca06e Minor changes. 
Trying to catch a bug with SmoothShading material objects with no vertexNormals.
 2010-11-30 04:56:50 +00:00
alteredq d502ccef1d Moved binary files load progress reporting to Loader.js. Added load progress reporting to demos with larger meshes. 
To be used like this:

    var loader = new THREE.Loader( true );
    container.appendChild( loader.statusDomElement );

    loader.loadBinary( url, function( geometry ) { createScene( geometry ) }, path );

    function createScene( geometry ) {
        ...

        loader.statusDomElement.style.display = "none";

    }
 2010-11-30 02:21:22 +01:00
alteredq 14bccd81ea Synced with mrdoob's branch. 2010-11-30 00:01:42 +01:00
alteredq 45b3ceb7df Added MeshShaderMaterial (and Fresnel shader as its first example). 
MeshShaderMaterial is still work in progress, expect changes.

Nice side effect of WebGLRenderer refactoring: optimized one significant bottleneck (with noticeable effect on framerate in some demos), typed arrays corresponding to matrix uniforms are now set (instead of being created anew in each frame).

Also created fully full build, with all extras included. This helps with deployment, especially when multiple versions of Three have to coexist in the same folder structure (got burned on this few times already).
 2010-11-29 23:44:33 +01:00
George Profenza 0528c143fc blender 2.49 exporter 2010-11-29 15:05:55 +00:00
George Profenza 61d7fe9575 c4d export 2010-11-29 14:40:00 +00:00
George Profenza 1553f48f72 c4d export 2010-11-29 14:36:50 +00:00
Mr.doob 011b123a6e ReflectionMap ⟶ ReflectionMapping 
`RefractionMap` ⟶ `RefractionMapping`
 2010-11-28 09:47:37 +00:00
Mr.doob bddcebce95 Few changes to README 2010-11-28 07:06:16 +00:00
Mr.doob 34f802e392 Code clean up. 
Removed old Blender exporters.
Slim exporter is now Normal exporter (needs some testing).
 2010-11-28 06:52:59 +00:00
Mr.doob a2acf0b390 CanvasRenderer/SVGRenderer: RenderableFace4 is now gone. Unfortunately it created more problems than it solved. 
CanvasRenderer now with ShadingSmooth, or something along the lines...
 2010-11-27 11:30:01 +00:00
Mr.doob 724870d5f1 Crappy/Temporal WebGLRenderer Reflection/Refraction Chromatic Dispersion hack. (Just for kicks) 2010-11-26 21:06:59 +00:00
Mr.doob 66677bc79f Merge remote branch 'feisty/master' 2010-11-26 08:00:12 +00:00
Mr.doob b913baa6f0 Code clean up and minor optimisations. 2010-11-26 07:58:44 +00:00
pyrotechnick 705aa9bf16 adding particles_sprites example to README 2010-11-25 23:28:57 -08:00
Mr.doob 2c50ad366b Merge remote branch 'alteredq/master' 2010-11-26 02:12:00 +00:00
Mr.doob f5f9becaf1 Minor tweaks. 2010-11-26 02:11:31 +00:00
alteredq 38dacb0d1e Some small refactoring in WebGLRenderer. 
There shouldn't be any change in functionality, just moved code around and clarified comments.
 2010-11-26 00:28:04 +01:00
alteredq e1f885fbf0 Made 2d textures reusable in WebGLRenderer. 
2d texture encapsulates bitmap, wrapping and minifying/magnification parameters.

Which reminds me, maybe also minifying/magnification options should be parameters in Texture object.

Though as defaults are "best" (LINEAR / LINEAR_MIPMAP_LINEAR = trilinear filtering), this would make sense just for special use cases like when trying to achieve "retro" look (like in Minecraft, http://gregs-blog.com/2008/01/14/how-to-turn-off-bilinear-filtering-in-opengl/ ;).
 2010-11-25 22:24:21 +01:00
alteredq 739dc0a135 Made mouse wheel in panorama fisheye demo work in Firefox 4, Opera and Explorer 9. 2010-11-25 20:43:34 +01:00
pyrotechnick 716f3c48c2 adding materials_cars example to README 2010-11-25 00:41:10 -08:00
Mr.doob 309927a8dc Merge remote branch 'alteredq/master' 2010-11-25 08:04:57 +00:00
Mr.doob 4fe5e8d292 Renamed vr demo to panorama demo, duplicated to panorama fisheye demo (to avoid confusions). 2010-11-25 08:04:34 +00:00
alteredq 06e64013d9 Fixed bug in SceneUtils. 2010-11-25 04:26:24 +01:00
alteredq a20d9102ce Few small tweaks to cars demo. 
Changed materials a bit to look better with lighter environment map.

Added space to buttons HTML so that Firefox don't draw them sticked together.

Also re-added htaccess for BIN files.
 2010-11-25 02:10:54 +01:00
Mr.doob 8e8dfe2d01 Tweaked cars demo a bit. 2010-11-24 23:55:34 +00:00
alteredq 696c70152d Added cars demo. 
Not sure about adding car models, they are quite big (even binary ones). To be removed if it makes troubles with git / GitHub.
 2010-11-24 23:06:23 +01:00