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

Commit Graph

  • 592ea71e48 Merge remote branch 'upstream/master' Julian Walker 2010-11-15 22:18:58 -08:00
  • 1f0b44a860 Added multiplyScalar and divideScalar to Vector4. Julian Walker 2010-11-15 22:18:40 -08:00
  • c6d69d8286 Refactored the CanvasRenderer a bit. Mr.doob 2010-11-16 05:54:37 +00:00
  • 9081529d84 Made all examples working again. alteredq 2010-11-16 03:06:46 +01:00
  • 007ee285fa Added MeshNormalMaterial support to WebGLRenderer. alteredq 2010-11-16 02:50:46 +01:00
  • 7b58b806d3 Fixed NormalToComponent function (it was over saturated). Mr.doob 2010-11-15 17:04:10 +00:00
  • bf3dede88a Implemented MeshNormalMaterial in SVGRenderer SubstractiveBlending ⟶ SubtractiveBlending Mr.doob 2010-11-15 16:56:14 +00:00
  • 4d209ac433 Implemented material blendings (THREE.NormalBlending, THREE.AdditiveBlending, THREE.SubtractiveBlending) in CanvasRenderer Added MeshNormalMaterial (per face) Mr.doob 2010-11-15 16:52:22 +00:00
  • 696bd4715f Added another depth material test. Mr.doob 2010-11-15 09:12:37 +00:00
  • 7d8fd5f874 CanvasRenderer now renders MeshDepthMaterial properly (per vertex). Gouraud is one step closer :) Cleaned up CanvasRenderer and SVGRenderer code a bit. Mr.doob 2010-11-15 08:50:31 +00:00
  • 05b496d822 Merge remote branch 'alteredq/materials' into materials Mr.doob 2010-11-15 04:16:51 +00:00
  • d2b6d7df0c Updating README's example Mr.doob 2010-11-15 04:16:43 +00:00
  • 0163e4f2f5 Added (commented out) MeshDepthMaterial support to WebGLRenderer. alteredq 2010-11-15 04:49:28 +01:00
  • 7264105fe9 Merge remote branch 'alteredq/materials' into materials Mr.doob 2010-11-15 02:06:27 +00:00
  • 591c4c5bef Merging alteredq branch. Mr.doob 2010-11-15 02:06:18 +00:00
  • 6f58fb8e11 Compiled again just in case. Mr.doob 2010-11-15 02:02:45 +00:00
  • 5daf1e0192 Merge remote branch 'alteredq/materials' into materials Mr.doob 2010-11-15 02:01:20 +00:00
  • 10449405dd I know I can do it... Mr.doob 2010-11-15 02:00:29 +00:00
  • b6e42d54d9 Added missing MeshDepthMaterial.js alteredq 2010-11-15 02:59:04 +01:00
  • fa48600918 Trying to merge... Mr.doob 2010-11-15 01:58:08 +00:00
  • 5feee3839f Trying to merge... Mr.doob 2010-11-15 01:56:10 +00:00
  • b09308c238 Synced with mrdoob's materials branch. alteredq 2010-11-15 02:54:42 +01:00
  • 11bde7e2d3 Just realised that the tweak is not needed. Mr.doob 2010-11-15 01:54:00 +00:00
  • aebe898625 Forgot to commit MeshDepthMaterial Mr.doob 2010-11-15 01:48:36 +00:00
  • bfb8242928 WebGLRenderer also working. alteredq 2010-11-15 02:29:03 +01:00
  • 98dc841aab Added MeshDepthMaterial. Optimised Particles projection in CanvasRenderer. Mr.doob 2010-11-15 01:17:41 +00:00
  • 64df690cc0 SVGRenderer also working. Mr.doob 2010-11-13 08:20:35 +00:00
  • 22f48a731b CanvasRenderer handles textures again. Most of the examples working. Mr.doob 2010-11-13 07:11:57 +00:00
  • adb275a093 Material constants and THREE.Texture Mr.doob 2010-11-13 05:55:09 +00:00
  • 237f165555 ParticleCircleMaterial working again with CanvasRenderer Mr.doob 2010-11-13 03:42:13 +00:00
  • ce3d641ff2 Changed materials format a bit. Almost done porting CanvasRenderer to the new material system (plus some performance gains on the way :D) Color now handles hex with no alpha byte (probably there is a nicer way of doing it...) Mr.doob 2010-11-13 02:39:27 +00:00
  • 25d8237283 Fixed broken syntax for new material triplet. alteredq 2010-11-12 20:30:36 +01:00
  • 7ce3b0f7d2 Experimenting with different syntax for materials (just hex instead of THREE.Color in API), checking how it feels with shaders example. alteredq 2010-11-12 18:10:28 +01:00
  • ed6f2ccd79 Testing workflow with branches - this should merge changes from "master" branch to "materials". unknown 2010-11-12 17:06:59 +01:00
  • 9d79aba4d8 Merge branch 'master' into materials unknown 2010-11-12 17:05:22 +01:00
  • c31cb220e3 Renamed examples: shader_test -> materials_shaders, materials_test -> materials_multimaterials alteredq 2010-11-12 15:57:07 +01:00
  • 477b1e8440 First attempt at MeshBasicMaterial / MeshLambertMaterial / MeshPhongMaterial. Also: testing branching :) alteredq 2010-11-12 15:40:47 +01:00
  • f424dc849a LineBasicMaterial params.color ⟶ params.diffuse_color Mr.doob 2010-11-12 05:04:33 +00:00
  • 08ef7e0e6c Properly renaming LineColorMaterial ⟶ LineBasicMaterial Mr.doob 2010-11-12 04:42:07 +00:00
  • facf7ff039 * Starting the materials refactoring (testing branching too) Mr.doob 2010-11-12 04:37:36 +00:00
  • b978e9e592 * Minor tweaks on Rectangle.js r28 Mr.doob 2010-11-12 04:19:21 +00:00
  • 0340404cfc * examples/geometry/primitives ⟶ src/extras/primitives Mr.doob 2010-11-12 04:03:27 +00:00
  • a35b35fde9 * examples/geometry/primitives ⟶ src/extras/primitives * THREE.Rectangle: _x1, _x2, _y1, _y2 ⟶ _left, _right, _top, _bottom Mr.doob 2010-11-12 04:02:30 +00:00
  • 94e77e4cb4 Added caching of element offsets optimization to binary loader. alteredq 2010-11-12 01:09:48 +01:00
  • 1e36ddee47 Applied mrdoob's optimizations from ascii loader also to binary loader. alteredq 2010-11-11 21:49:29 +01:00
  • 453c6efc0d At Loader.js, as far as I can see we don't need all that stride stuff. Removed/Simplified from createModel() by now. That saves *a lot* of multiplications at init of the geometry. Mr.doob 2010-11-11 13:01:40 +00:00
  • 55baeb7ee4 Merge remote branch 'alteredq/master' Mr.doob 2010-11-11 05:28:15 +00:00
  • f9ec9325f9 Tested exporters with new Blender 2.55 Beta. It seems both old and new one work without any changes \o/ alteredq 2010-11-11 01:54:02 +01:00
  • b31c9bd8a3 Added handling of empty material slots in new Blender exporter. alteredq 2010-11-10 23:59:08 +01:00
  • 237c6656f2 Merge remote branch 'alteredq/master' Mr.doob 2010-11-10 16:47:26 +00:00
  • 017cb72335 Merge remote branch 'upstream/master' Julian Walker 2010-11-09 22:14:03 -08:00
  • ca7e2fc923 Added model alignment to new Blender exporter. alteredq 2010-11-10 02:16:29 +01:00
  • f34ca2e477 Merge remote branch 'alteredq/master' Mr.doob 2010-11-10 00:09:04 +00:00
  • baced836f3 Merge remote branch 'remotes/upstream/master' alteredq 2010-11-09 22:47:16 +01:00
  • c545318b51 Added experimental Blender exporter for the new ascii JSON format. alteredq 2010-11-09 22:44:22 +01:00
  • b3bacc8af8 Refactored OBJ slim converter (to make it easier to reuse ASCII converter snippets in Blender exporter). alteredq 2010-11-09 22:22:39 +01:00
  • a7d70a0eff * Builders clean up Mr.doob 2010-11-09 06:27:44 +00:00
  • 06cef27b81 Merge remote branch 'alteredq/master' Mr.doob 2010-11-09 05:54:19 +00:00
  • 7c26e04c7a Refactored common functionality out of ascii and binary loaders. alteredq 2010-11-09 02:19:34 +01:00
  • c2ae485dea Merge remote branch 'alteredq/master' Mr.doob 2010-11-09 00:14:34 +00:00
  • 5182d90429 Merge remote branch 'remotes/upstream/master' alteredq 2010-11-08 23:41:11 +01:00
  • cdb6b868b3 Added a little sanity check in binary format loader (commented out debug log of computed total file size which should match with real file size). alteredq 2010-11-08 23:40:12 +01:00
  • a0fa2ae3dd Optimized binary model format to use indexed UVs. Updated OBJ slim converter and Loader accordingly. alteredq 2010-11-08 23:20:25 +01:00
  • 35b21b1f4e * LICENSE: Changed copyright * AUTHORS: Just realised there is a github page with that info already. https://github.com/mrdoob/three.js/contributors Mr.doob 2010-11-08 21:46:38 +00:00
  • ecf97e0d4c Synced with sole's branch. alteredq 2010-11-08 20:10:32 +01:00
  • 97425e01ae Merge remote branch 'remotes/sole/master' alteredq 2010-11-08 20:04:26 +01:00
  • 1ca0bf23dc Merge remote branch 'remotes/upstream/master' alteredq 2010-11-08 18:17:02 +01:00
  • 188f36be5d Optimized ASCII model format to use indexed UVs. Updated OBJ slim converter and Loader accordingly. alteredq 2010-11-08 18:10:43 +01:00
  • b489e524ea Build system: now --debug applies to the current build (can generate debug versions of every type of build: canvas, dom, etc) sole 2010-11-08 11:43:13 +00:00
  • 39f88e74b2 * Fixed markup error in README Mr.doob 2010-11-08 09:38:23 +00:00
  • 7059050d19 * Updated README (examples/projects) Mr.doob 2010-11-08 09:36:28 +00:00
  • cb626b9d95 Merged with alteredq version (support python 2.6) and also made it more explicit as per mrdoobs suggestion sole 2010-11-07 19:46:53 +00:00
  • b14f09be61 Merged with sole's branch: took new Python build script, made it work with my ancient Python 2.6. alteredq 2010-11-06 19:50:37 +01:00
  • 7abad40d83 Merge remote branch 'remotes/sole/master' alteredq 2010-11-06 19:23:28 +01:00
  • 514a2e6135 Merged with latest changes in mrdoob's branch. All hex colors should be now without baked opacity. alteredq 2010-11-06 18:59:03 +01:00
  • 0cb79310e5 Added experimental binary mesh loader. Updated OBJ converter and examples accordingly. alteredq 2010-11-06 17:24:58 +01:00
  • 3cdc007b90 * Fixed some minor issues handling opacity in hex colors Mr.doob 2010-11-06 12:51:09 +00:00
  • e43af53f19 refactored build system sole 2010-11-05 14:21:54 +00:00
  • 1849e9050c * Added a nicer interactivity example ⟶ examples/interactive_voxelpainter.html Mr.doob 2010-11-05 06:00:09 +00:00
  • bf6db5a714 merging? sole 2010-11-05 00:41:20 +00:00
  • 52045b53cb * examples/geometry_large_mesh.html: credit were credit is due :) Mr.doob 2010-11-05 00:26:33 +00:00
  • 0ca8efd916 Fixed stats Mr.doobandsole 2010-05-13 01:16:59 +08:00
  • c437ce68fe Small clarifications in large mesh example description: model size meanwhile went down to 3.5 MB ;) and file access flag applies to Chrome. alteredq 2010-11-05 00:33:24 +01:00
  • f6e829ca21 Synced with mrdoob's branch. alteredq 2010-11-05 00:25:03 +01:00
  • 55c40d0fa3 * Renamed examples/large_mesh_test.html to examples/geometry_large_mesh.html * Added the first WebGL example to README \:D/ Mr.doob 2010-11-04 22:29:38 +00:00
  • 5053cc4e6d * Added 2 more examples to the README. * Cleaned interactive_cubes example code. Mr.doob 2010-11-04 21:59:42 +00:00
  • 1aca787cb1 Forgot to recompile the builds Mr.doob 2010-11-04 21:23:34 +00:00
  • 83690551a3 Added a comment on example/large_mesh_test.html about the --allow-file-access-from-files bit. Mr.doob 2010-11-04 21:08:59 +00:00
  • 425c01111b Merge remote branch 'alteredq/master' Mr.doob 2010-11-04 20:57:29 +00:00
  • 047f190d4d Avoiding merge conflicts (I'm sure there is a way to handle these in this client, maybe not yet...) Mr.doob 2010-11-04 20:55:58 +00:00
  • 49d1bd170b Made JSON model format slimmer by flattening arrays. Modified Loader and OBJ converter accordingly. alteredq 2010-11-04 21:18:08 +01:00
  • 8d198002d1 * Fixed a bug in Ray.intersectObject: face.normal needs to be transformed using matrixRotation otherwise rotated objects fail * A bit nicer example Mr.doob 2010-11-04 20:11:37 +00:00
  • bae0a2e06b Synced with mrdoob's branch. alteredq 2010-11-04 11:59:06 +01:00
  • 9a62d1173a Refactored ClickResolver to Ray and Projector.unprojectVector working. Unimpressive example added interactive_spheres.html` Mr.doob 2010-11-04 03:35:08 +00:00
  • 5192428f25 Added Loader class providing both asynchronous JS and web worker based loading of models. alteredq 2010-11-03 18:12:31 +01:00
  • 8cb2f9e2a1 Merge remote branch 'alteredq/master' Mr.doob 2010-11-02 19:38:30 +00:00
  • fb4935d35b Trying to avoid merge conflicts :S Mr.doob 2010-11-02 19:38:04 +00:00
  • b57169bc84 Projector.unprojectVector() apparently working Work in progress refactoring ClickResolver.js to Ray.js Mr.doob 2010-11-02 19:27:31 +00:00
  • 88c5d3e571 Forgot to build one-file version and to bump up version number. alteredq 2010-11-02 19:28:53 +01:00
  • 2b1f0a9b97 Added Lucy model (100k triangles version). The example using it already went to previous commit. alteredq 2010-11-02 19:15:26 +01:00