Mr.doob
6992b8e455
Merge remote branch 'alteredq/master'
2011-04-03 07:56:58 +01:00
Mr.doob
70ff34b8a3
Updated Stats.js widget.
2011-04-03 07:56:41 +01:00
alteredq
477b0095a9
Added dumping of scale to Blender exporter / handling of scale to JSONLoader.
...
This is backwards compatible: for existing models that don't have scale nothing should change.
2011-04-03 08:48:08 +02:00
Mr.doob
e6fd2d0516
Blender Exporter: Added option for truncating vertex values. Added scale parameter.
2011-04-03 05:17:48 +01:00
Mr.doob
09e976f299
Blender exporter: Scene export option False by default.
2011-04-03 04:04:36 +01:00
alteredq
7e6ba581de
Removed some bottlenecks in shader building / sharing.
...
- for shader reuse materials from the standard library are now identified just by shader name (MeshShaderMaterials still use full code)
- unique shader id strings are constructed via array.join instead of string plus
- uniform and attribute locations are now cached in buildProgram (biggest one)
Also some smaller optimizations and cleanups in DOF example.
2011-04-03 04:19:00 +02:00
alteredq
c2a401f2b8
Added option not to export materials to Blender exporter.
...
In such case faces will not get material index in JSON data and then no material reference in Face objects, so MeshFaceMaterial is not going to show anything and you have to add your own material for the whole mesh after loading.
Tested on few models and it seems to work, new JSON format allows to omit materials :)
2011-04-03 00:22:20 +02:00
alteredq
5a684c29ea
Fixed broken video texture example.
...
Hope it's the last one. Also here performance is ok.
2011-04-02 21:06:37 +02:00
alteredq
a719d289cc
Fixed broken ribbons example.
...
Interestingly here performance doesn't seem to be affected.
2011-04-02 20:59:59 +02:00
alteredq
575deaadc5
Fixed broken depth-of-field example.
...
Still something is wrong with this new implicit way of sharing programs. DOF example is noticeably slower than it was before, especially in ANGLE :(.
2011-04-02 20:46:34 +02:00
alteredq
9abbb97d4c
Fixed Blender exporter not checking if material texture actually has some image.
2011-04-02 09:31:50 +02:00
alteredq
e19bf17645
Synced with mrdoob's branch.
2011-04-02 09:16:29 +02:00
alteredq
1001b76351
Added lava shader example.
2011-04-02 09:02:35 +02:00
Mr.doob
8c3fa8f401
WebGLRenderer: Removed unneded program checks.
2011-04-02 07:24:30 +01:00
alteredq
3b43c79679
Added possibility of enforcing vertical angle constraint to QuakeCamera.
2011-04-02 01:32:53 +02:00
alteredq
27b0ee0be7
Updated Loader to handle more material parameters (blending, transparent, depthTest).
2011-04-01 15:53:39 +02:00
Mr.doob
29da25e746
WebGLRenderer: Added internal cache for compiled shaders. Already compiled shaders get reused.
2011-04-01 07:38:22 +01:00
alteredq
b6aa8c8433
And some more globals, third time is a charm?
2011-04-01 04:08:41 +02:00
alteredq
a53921fb22
Fixed more globals in JSONLoader. Also updated ubiquity test includes.
2011-04-01 03:57:06 +02:00
alteredq
2d7833d32e
Fixed runaway globals in JSONLoader.
2011-04-01 03:34:26 +02:00
alteredq
d12252421e
Synced with mrdoob's branch.
2011-03-31 23:48:38 +02:00
Mr.doob
816d19a8d6
REVISION ++
2011-03-31 22:29:53 +01:00
alteredq
f518051f1f
Fixed some spurious invisible character in WebGLRenderer.
...
No idea where they came from, looks like maybe some different encoding than ascii?
In Scite / Chrome console they look like 0Â.
2011-03-31 23:25:48 +02:00
Mikael Emtinger
70594cc9ce
Fixed so dirty=false after uploading custom attribute
2011-03-31 15:45:48 +02:00
Mikael Emtinger
e88b1b4783
Merged with mrdoob.
...
Fixed so lens flares uses AdditiveBlending in example.
2011-03-31 13:57:52 +02:00
Mikael Emtinger
a0b0de46ff
Added support for custom attributes in MeshShaderMaterial.
...
Added support for THREE.Vector4 as uniform.
2011-03-31 13:54:33 +02:00
Mr.doob
d5cff3fd37
WebGLRenderer: Removed dupe blending.
2011-03-31 08:43:37 +01:00
alteredq
36cd380725
Synced with mrdoob's branch.
2011-03-31 09:12:57 +02:00
Mr.doob
bfceae1655
Minor formating clean up.
2011-03-31 07:42:30 +01:00
Mr.doob
0014ce7215
Fixed glass transparency in scene example.
2011-03-31 07:29:10 +01:00
Mr.doob
8af4dd49c1
WebGLRenderer now uses material.transparent to determine whether a material is transparent or not.
...
Moved materials/RenderTarget.js ⟶ renderer/WebGLRenderTarget.js
2011-03-31 07:22:44 +01:00
alteredq
cc453b6bda
Merged with empaempa's branch.
...
Hopefully now it's proper. All examples are working.
2011-03-31 06:21:25 +02:00
Mr.doob
1b98dbb033
Improved grass example.
2011-03-31 05:15:27 +01:00
alteredq
a0636d934b
Messed up merge with empaempa.
2011-03-31 05:42:49 +02:00
Mikael Emtinger
7b07f34b7d
merged with mrdoob. fixed so depthMask is correctly restored after stencil and lensflares. removed all enable/disable _gl.BLEND as it's always on.
2011-03-30 20:52:23 +02:00
Mr.doob
49773aab42
Merge remote branch 'alteredq/master'
2011-03-30 08:49:15 +01:00
Mr.doob
97c556cb3d
Unneded property set.
2011-03-30 08:48:56 +01:00
alteredq
f51a53bd23
Synced with mrdoob's branch.
2011-03-30 06:41:48 +02:00
alteredq
ccc566463e
Replaced QuakeCamera's dragToLook parameter with activeLook parameter.
...
DragToLook was weird, instead activeLook can be now used for simple switching on/off of mouse look around.
2011-03-30 06:38:24 +02:00
Mr.doob
8b63842305
CanvasRenderer: Hocked materials linecap/linejoin/wireframeLinecap/wireframeLinejoin with context.linecap/linejoin. Made it 'round','round' by default again.
2011-03-30 02:08:05 +01:00
Mr.doob
01d60217cc
Updated builds.
2011-03-29 20:30:06 +01:00
Mr.doob
11d29f464b
Merge remote branch 'alteredq/master'
2011-03-29 20:25:23 +01:00
Mr.doob
67c7b15552
Reverting Camera.update as how it was before (as it turned out that wasn't the problem). This needs more testing.
2011-03-29 20:23:55 +01:00
Mikael Emtinger
3536f3f2f5
Merged with MrDoob
2011-03-29 20:50:45 +02:00
alteredq
220983f455
Updated Blender importer to show textures.
2011-03-29 18:10:34 +02:00
alteredq
764121a86e
Merge branch 'master' of http://github.com/mrdoob/three.js
2011-03-29 15:00:38 +02:00
Mikael Emtinger
ac6f422a6f
Added LensFlares. Note that a new blending mode has been added. Added an (quite ugly example). NOTE: this doesn't seem to work on Chrome+Mac+NVIDIA unless you turn off antialias (which I've done in the example).
2011-03-29 13:30:53 +02:00
Mr.doob
3960e5c8ef
Camera was hitting infinite loop when useTarget = true. Hopefully this fixes it.(Thx bai)
2011-03-29 10:11:01 +01:00
Mr.doob
532929d510
WebGLRenderer: Added distance (falloff) to PointLight.
2011-03-29 06:13:21 +01:00
alteredq
10e86a45fe
Added handling of materials and textures to Blender importer.
...
Also added custom property to materials to be able to select if vertex colors should be used for the material.
2011-03-29 05:51:49 +02:00
Mr.doob
alteredq
Mikael Emtinger