 Mr.doob
|
7264105fe9
Merge remote branch 'alteredq/materials' into materials
|
15 年之前 |
|
Mr.doob
|
591c4c5bef
Merging alteredq branch.
|
15 年之前 |
|
Mr.doob
|
6f58fb8e11
Compiled again just in case.
|
15 年之前 |
|
Mr.doob
|
5daf1e0192
Merge remote branch 'alteredq/materials' into materials
|
15 年之前 |
|
Mr.doob
|
10449405dd
I know I can do it...
|
15 年之前 |
 alteredq
|
b6e42d54d9
Added missing MeshDepthMaterial.js
|
15 年之前 |
|
Mr.doob
|
fa48600918
Trying to merge...
|
15 年之前 |
|
Mr.doob
|
5feee3839f
Trying to merge...
|
15 年之前 |
|
alteredq
|
b09308c238
Synced with mrdoob's materials branch.
|
15 年之前 |
|
Mr.doob
|
11bde7e2d3
Just realised that the tweak is not needed.
|
15 年之前 |
|
Mr.doob
|
aebe898625
Forgot to commit MeshDepthMaterial
|
15 年之前 |
|
alteredq
|
bfb8242928
WebGLRenderer also working.
|
15 年之前 |
|
Mr.doob
|
98dc841aab
Added MeshDepthMaterial.
|
15 年之前 |
|
Mr.doob
|
64df690cc0
SVGRenderer also working.
|
15 年之前 |
|
Mr.doob
|
22f48a731b
CanvasRenderer handles textures again.
|
15 年之前 |
|
Mr.doob
|
adb275a093
Material constants and `THREE.Texture`
|
15 年之前 |
|
Mr.doob
|
237f165555
ParticleCircleMaterial working again with CanvasRenderer
|
15 年之前 |
|
Mr.doob
|
ce3d641ff2
Changed materials format a bit.
|
15 年之前 |
|
alteredq
|
25d8237283
Fixed broken syntax for new material triplet.
|
15 年之前 |
|
alteredq
|
7ce3b0f7d2
Experimenting with different syntax for materials (just hex instead of THREE.Color in API), checking how it feels with shaders example.
|
15 年之前 |
 unknown
|
ed6f2ccd79
Testing workflow with branches - this should merge changes from "master" branch to "materials".
|
15 年之前 |
|
unknown
|
9d79aba4d8
Merge branch 'master' into materials
|
15 年之前 |
|
alteredq
|
c31cb220e3
Renamed examples: shader_test -> materials_shaders, materials_test -> materials_multimaterials
|
15 年之前 |
|
alteredq
|
477b1e8440
First attempt at MeshBasicMaterial / MeshLambertMaterial / MeshPhongMaterial. Also: testing branching :)
|
15 年之前 |
|
Mr.doob
|
f424dc849a
LineBasicMaterial params.color ⟶ params.diffuse_color
|
15 年之前 |
|
Mr.doob
|
08ef7e0e6c
Properly renaming LineColorMaterial ⟶ LineBasicMaterial
|
15 年之前 |
|
Mr.doob
|
facf7ff039
* Starting the materials refactoring (testing branching too)
|
15 年之前 |
|
Mr.doob
|
b978e9e592
* Minor tweaks on Rectangle.js
|
15 年之前 |
|
Mr.doob
|
0340404cfc
* `examples/geometry/primitives` ⟶ `src/extras/primitives`
|
15 年之前 |
|
Mr.doob
|
a35b35fde9
* `examples/geometry/primitives` ⟶ `src/extras/primitives`
|
15 年之前 |
