206 Commits
Author SHA1 Message Date
Mr.doob 0f2badfdd1 Previous commit: Matrix4.transformMatrix4.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
alteredq e0c6dcb0cc Switched one more Walt to binary loader with progress reporting. 2010-11-30 15:23:24 +01:00
alteredq 5e3c1fbab8 Forgot to finish transition of car demo to new loading progress handling. 2010-11-30 13:32:53 +01: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
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 b913baa6f0 Code clean up and minor optimisations. 2010-11-26 07:58:44 +00: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 739dc0a135 Made mouse wheel in panorama fisheye demo work in Firefox 4, Opera and Explorer 9. 2010-11-25 20:43:34 +01: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 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
Mr.doob 6441992a17 Removed unused Walt Disney head. 2010-11-24 07:37:50 +00:00
Mr.doob 14eb44a279 ParticleBasicMaterial with a map attached are back on CanvasRenderer.
Added a simple example for that.
2010-11-24 07:22:06 +00:00
alteredq d3cd0887d2 Added handling of object removal to WebGLRender. Added visibility parameter to Object3D. 2010-11-24 03:43:44 +01:00
alteredq e546ae3c48 Refactored panorama creation helpers into SceneUtils.js
This cleaned up cube mapping examples quite a bit ;)
2010-11-22 17:33:41 +01:00
alteredq 558e7c5db8 Added texture wrapping parameter to Texture.js. Fixed OBJ converter example to have tiled texture.
Wrapping options follow WebGL specs: ClampToEdge [default], Repeat, MirroredRepeat.
2010-11-22 16:43:55 +01:00
alteredq 755769841d Changed title tags in cube mapping demos (so that it's easier to tell them apart in bookmarks / history). 2010-11-22 16:01:36 +01:00
alteredq b409e5b04e Proper merge with mrdoob's branch.
All cube mapping examples should work and be consistent between MeshCubeMaterial and 6 texture versions.
2010-11-22 14:13:41 +01:00
alteredq 9cd7308d2b Attempt to merge with mrdoob's branch.
This version is inconsistent. Will follow with another merge.
2010-11-22 13:48:30 +01:00
Mr.doob a1d014c110 Cube.js matching WebGLRenderer cubemap. 2010-11-22 11:45:42 +00:00
Mr.doob 3ce86f1a5b THREE.loadImageArray ⟶ ImageUtils.loadArray
Made up MeshCubeMaterial (missing from alteredq branch)
2010-11-22 08:49:45 +00:00
Mr.doob 45553e88db Merging with alteredq's branch. 2010-11-22 07:46:59 +00:00
alteredq 0cdd188e17 Added MeshCubeMaterial: WebGLRenderer specific material for more efficient rendering of panoramas when doing cube mapping.
Also moved loadImageArray utility function from examples into TextureCube.js

To be used like this:

    var urls = [ "px.jpg", "nx.jpg", "py.jpg", "ny.jpg", "pz.jpg", "nz.jpg" ];
    var images = THREE.loadImageArray( urls );
    var textureCube = new THREE.TextureCube( images );

    // create scene

    var objectMaterial = new THREE.MeshBasicMaterial( { color: 0xffffff, env_map: textureCube } )
    createScene( objectMaterial );

    // create panorama

    var size = 100000;
    var panoMaterial = new THREE.MeshCubeMaterial( { env_map: textureCube } );
    var mesh = new THREE.Mesh( new Cube( size, size, size, 1, 1, null, true ), panoMaterial );
    sceneCube.addObject( mesh );

Warning: this functionality is currently changing a lot, expect things to get broken before stabilization.
2010-11-22 02:10:07 +01:00
Mr.doob cf7dc4d2d9 Cube.js now does merge vertices pass. 2010-11-21 10:44:42 +00:00
Mr.doob 0bc79b591b Cube tweaks reverted. It was yet again a left-handed to right-handed problem.
Would be nice if everyone in the internets used the same coordinate system :P
2010-11-21 08:08:11 +00:00
Mr.doob 7b0039ec95 Cube: Swapped Top/Bottom with Front/Back.
Trying to get to the same order of alteredq's cubemap.
2010-11-21 01:38:12 +00:00
Mr.doob c663b05453 Added a proper Cube.
Updated some examples.
CanvasRenderer: Skip render when opacity is 0.
2010-11-21 00:36:17 +00:00
alteredq ad8531a2d1 Forgot to change deployment links. 2010-11-20 08:33:21 +01:00
alteredq 946cc6a26c And refraction /reflection cube mapping is fixed. Also added two new examples for refraction.
Fix is a bit dirty, but at least it's short ;)
2010-11-20 05:20:19 +01:00
alteredq 19a7022411 Merged with mrdoob's branch. 2010-11-19 18:55:16 +01:00
alteredq fbd12838b1 Added refractive mapping and mixing combination mode for the environment map and the underlying material.
This commit has handful of things going on:

- had to sacrifice one light to please ANGLE, making it again up to 4 instead of up to 5 total lights :(

- Basic / Lambert / Phong materials now have new parameters:

    "combine": THREE.Mix | THREE.Multiply [default]

      - tells how to combine environment map with the original material:

         - "Multiply" creates chrome-like metallic look (it's what was already there),
           color of the underlying material is multiplied with the environment map,
           this creates different colored metals

         - "Mix" creates shiny plastic look
            color of the underlying material is lerped with the environment map,
            amount of the contribution from the environment map is controlled
            by another new parameter "reflectivity"

    "reflectivity": <float> [from <0.0, 1.0>]

       - controls mixing of underlying material and environment map for "Mix" combine mode
          0: pure underlying material, zero contribution from environment map (Basic/Lambert/Phong)
          1: pure environment map, zero contribution from underlying material (uncolored chrome look)

    "refraction_ratio": <float>

      - controls refractive mapping, ratio of the index of refraction in the medium containing the incident ray
        to that of the medium being entered
      - sensible values seem to be from ~0.6 - 1.0
        (in theory, e.g. air/glass should be 0.75, but this looks weird, values between 0.9 - 1.0 give the most interesting results,
         though maybe there is bug somewhere in my code)

      - for use refraction mapping, just add parameter to TextureCube like this (default is reflection mapping)

          "new THREE.TextureCube( images, THREE.RefractionMap )"
2010-11-19 18:23:31 +01:00
Mr.doob d961ee52c8 Started GeometryUtils class.
MeshUtils.merge( object1, object2 [ geometry | mesh ] ): Merges object2 into object1. Implemented in materials_cubemap_sky.
2010-11-19 09:08:20 +00:00
Mr.doob 2be2673df3 Fixed skybox effect on cubemap demos
CanvasRenderer code clean up
2010-11-19 07:23:43 +00:00
Mr.doob eb9c33b2b4 Cubemap examples: Ambient lights aren't needed anymore... 2010-11-19 03:56:44 +00:00
Mr.doob d21c297993 Cleaned up the escher cubemap code a bit. Also, I think it looks much nicer without illumination... ?
At first I though the cube around the sphere was x-inverted (unless the in tention is to simulate refraction...) I've tried changing that but the effect is still weird. I guess those textures work mainly for the sphere and not for the panorama.

I reused the code and did another example using the skymap. More to come ;)

I can see some lines at the edges of the planes though. I guess that's antialiasing kicking in. Should be fixed with a proper cube mesh I guess.

CanvasRenderer has a property called `autoClear` which is true by default. By making it false you have control of when the renderer cleans the screen (by calling renderer.clear()). I wonder if something like that can be added to the WebGLRenderer? That way we can render the cube outside the spheres from a diferent camera (centered in the middle of the screen) than the spheres floating.

Also, added `shading` parameter to `MeshBasicMaterial` (environment mapping was being rendered faceted when using `MeshBasicMaterial` because `shading` was missing (and thus Faceted)).
2010-11-19 03:49:20 +00:00
alteredq 9543cf2e25 Committed deployment version by mistake. 2010-11-19 01:20:43 +01:00
alteredq 1c6be1c70b Added second cube mapping example.
Also refactored a bit texture cube code, to make it easier to reuse.
2010-11-19 00:12:32 +01:00
alteredq d1931198ea Fixed wrong orientation of bottom and top textures in textured cube. 2010-11-18 18:53:52 +01:00
alteredq 3ee99dc4c5 Added cube mapping to WebGLRenderer. Also added cube map example. Finally ;)
TODO:

  - maybe image array loader should go into TextureCube.js so that people could just reuse the code

  - it may be worth to be able to specify different combination of environment map and underlying material (in single render pass),
    currently color/color map/environment map are multiplied, though addition also produces very interesting looking materials
2010-11-18 02:00:11 +01:00
alteredq 59280c0cbb Fixed performance issue in WebGL version of materials test. We are back at 60 fps ;) 2010-11-17 23:42:24 +01:00
alteredq 5535f71130 Added checks for nonexisting face materials if MeshFaceMaterial is used.
Cloned materials.html -> materials_gl.html to have easier test for WebGLRenderer.

TODO:

Investigate why this test is so slow. It shouldn't be, materials_shaders.html is more complex and yet it is much faster (36 vs 60 fps).

MeshFaceMaterial with every face different is pretty bad use case for WebGLRenderer, but this still doesn't fully explain slowdown :(.
2010-11-17 21:19:27 +01:00