Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Instanced mesh #10750

Closed
wants to merge 47 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
47 commits
Select commit Hold shift + click to select a range
813f4d5
working sh adows and movement, but no normals
pailhead Feb 6, 2017
0fb9988
tested normals and shadows
pailhead Feb 7, 2017
39e01ef
removed normal matrix
pailhead Feb 7, 2017
ae2f2d9
cleanup
pailhead Feb 7, 2017
b3c7ad5
try to remove build
pailhead Feb 7, 2017
8f7359f
test
pailhead Feb 7, 2017
e87b6ab
Merge remote-tracking branch 'mrdoob/dev' into InstancedMesh
pailhead Feb 11, 2017
96cdc13
cleaned up, no more renderer code
pailhead Feb 11, 2017
7a926bf
material doesnt need properties any more
pailhead Feb 11, 2017
a6b5653
remove new line from common
pailhead Feb 11, 2017
d52ccc8
fixed namespace issues
pailhead Feb 11, 2017
1bc0716
removed duplicated import
pailhead Feb 11, 2017
81784f5
duplicated import
pailhead Feb 11, 2017
7edc61d
hooked distance material
pailhead Feb 11, 2017
9635865
should be all fixed
pailhead Feb 11, 2017
06f3b27
Merge branch 'dev' of https://github.com/mrdoob/three.js into Instanc…
pailhead Feb 25, 2017
b33788b
removed ifndef catch
pailhead Feb 25, 2017
9064747
interface test
pailhead Mar 5, 2017
6a39427
added dynamic updates
pailhead Mar 8, 2017
4b98384
Merge branch 'dev' of https://github.com/mrdoob/three.js into Instanc…
pailhead Mar 8, 2017
8afedc7
Merge branch 'dev' of https://github.com/mrdoob/three.js into Instanc…
pailhead Mar 22, 2017
1153341
version 3 dynamic matrices in glsl
pailhead Mar 23, 2017
7456ab9
Merge branch 'dev' of https://github.com/mrdoob/three.js into Instanc…
pailhead Mar 24, 2017
80476a4
refactoring , new api
pailhead Mar 24, 2017
6eb4d22
Merge branch 'dev' of https://github.com/mrdoob/three.js into Instanc…
pailhead Mar 24, 2017
7021f7f
new interface , glsl
pailhead Mar 24, 2017
fb24e85
Fix getInstanceMatrix.
puckey Apr 1, 2017
8a5f064
Merge pull request #1 from puckey/InstancedMesh
pailhead Apr 2, 2017
f9b7a26
dynamic flag
pailhead Apr 2, 2017
cd56a80
merge
pailhead May 3, 2017
b5fd2d7
Merge branch 'dev' of https://github.com/mrdoob/three.js into Instanc…
pailhead May 6, 2017
4ffde8a
merge dynamic, puckey's rotation fix
pailhead May 6, 2017
22cd370
remove dead code
pailhead May 6, 2017
0956028
color feature
pailhead May 6, 2017
552092a
Merge branch 'dev' of https://github.com/mrdoob/three.js into Instanc…
pailhead May 6, 2017
4f7a470
Fix example
pailhead May 6, 2017
d4f58fc
Add color, fix uniform scale
pailhead May 6, 2017
c9f57cb
Reduce number of mads
May 8, 2017
9a23cc7
Avoid doing multiplication separate for each component?
May 8, 2017
2575b99
shadow fix
pailhead May 10, 2017
e2cb53b
merge dev
pailhead May 10, 2017
a8fd457
fix double matrix computation
pailhead May 10, 2017
ea12cbc
avoid 2 matrix operations
pailhead May 10, 2017
4ff3332
Merge branch 'dev' of https://github.com/mrdoob/three.js into Instanc…
pailhead May 10, 2017
9f4d31f
THREE namespace was left in InstancedBufferAttribute
pailhead May 11, 2017
f8decf5
add getters
pailhead May 12, 2017
48b7220
test getters?
pailhead Jun 10, 2017
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions examples/files.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
var files = {
"webgl": [

"webgl_instanced_mesh",
"webgl_animation_cloth",
"webgl_animation_keyframes_json",
"webgl_animation_scene",
Expand Down
Loading