Commit graph

386 commits

Author SHA1 Message Date
Brad Davis
d14d5f3d29 Working on new-UI implementations of address bar and login 2015-04-15 00:36:04 -07:00
Clément Brisset
36631dd3a3 Merge pull request #4608 from ctrlaltdavid/fix-animation-not-starting
CR for Animation fixes
2015-04-09 11:39:13 +02:00
Sam Gateau
ad9129b552 Fixing all the shaders for entities to work correctly with the now supported color attribute field 2015-04-07 14:26:45 -07:00
David Rowe
43a130dabe Fix Stop button not working at the end of a non-looped animation 2015-04-07 14:02:42 -07:00
Sam Gateau
f0efade06d Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2015-04-07 12:56:21 -07:00
Andrew Meadows
a47170b02c Merge pull request #4601 from samcake/temp1
Introducing gpu::State and using it in the Model rendering path and more...
2015-04-07 12:48:42 -07:00
Sam Gateau
9d6839e6a1 Merge branch 'temp1' of https://github.com/samcake/hifi into orange 2015-04-07 11:45:57 -07:00
Sam Gateau
25643479c9 Fixed the memory leak, due to the location pointer in the Model::RenderPipelineLib which was not smart pointed correctly 2015-04-07 11:20:55 -07:00
Sam Gateau
88afb3cedc solution to the color attribute case 2015-04-07 10:04:51 -07:00
Seth Alves
ef5dffecf6 fix filenames in comments 2015-04-07 10:03:14 -07:00
Sam Gateau
dee651069c adding support for color attribute in FBX, and displaying it correctly 2015-04-06 23:33:13 -07:00
Seth Alves
cd5245d0d6 logging group for render-utils 2015-04-06 18:16:01 -07:00
Sam Gateau
7f46736bb4 playing with the shadwos 2015-04-06 17:17:25 -07:00
Sam Gateau
07e7f6ea1d FIx review comments 2015-04-06 15:40:29 -07:00
Sam Gateau
4aa695d5f3 fixed an issue with skinned normaled map models not doing the correct transformation 2015-04-06 12:24:01 -07:00
Sam Gateau
7de54917b8 Merge branch 'master' of https://github.com/highfidelity/hifi into temp1 2015-04-06 10:20:23 -07:00
Sam Gateau
ecdffadcb7 trying to debug the indirect sh lighting going wrong, the noraml on avatar is not correct 2015-04-06 10:17:31 -07:00
Sam Gateau
a85daaee41 COmmented the review questions in code 2015-04-06 10:03:47 -07:00
Sam Gateau
00817ab64f MErging with origin/orange, brinign the fix for shadows 2015-04-05 18:36:39 -07:00
Sam Gateau
17743c6013 FIxed the broken shadows 2015-04-03 17:58:21 -07:00
Sam Gateau
38d1e29a1d getting ready for pr for a few syntax issues 2015-04-03 17:16:18 -07:00
Sam Gateau
2dcabb97b4 getting ready for pr for a few syntax issues 2015-04-03 17:10:51 -07:00
Sam Gateau
b8db0ff2d7 getting ready for pr for a few syntax issues 2015-04-03 17:05:08 -07:00
Sam Gateau
423434af10 FInd one of the issue with shadows for avatars 2015-04-03 12:34:30 -07:00
Sam Gateau
3f581d03d2 mirror means we render the Closkwise side 2015-04-03 10:45:30 -07:00
Sam Gateau
6f5c411a46 Fixing a few issues and syntax, trying to understand why the shadows are not rendering correctly 2015-04-03 10:32:20 -07:00
Seth Alves
57a4f3abe3 clear _saveNonCollisionGeometry when it's not needed, remove some debug prints 2015-04-02 06:57:27 -07:00
Seth Alves
eb78fa0f85 if switching to the mode where collision hulls are drawn, updateGeometry and simulate 2015-04-01 18:24:25 -07:00
Seth Alves
78af7f900e don't need _collisionGeometryScale 2015-04-01 18:23:25 -07:00
Seth Alves
8940ba0c2a new member variables related to rendering collision hulls 2015-04-01 17:52:18 -07:00
Sam Gateau
0d721ec1e9 merging 2015-03-31 17:47:05 -07:00
Sam Gateau
9b63739a72 Trying to clen up the REnderMode usage in connection with the needed gpu::State for all the different variations 2015-03-31 17:35:34 -07:00
Stephen Birarda
86174d6a29 Merge pull request #4551 from ZappoMan/neverCullAvatarParts
never cull mesh parts for avatars
2015-03-31 16:29:01 -07:00
Brad Hefta-Gaub
b43761a6c1 Merge pull request #4545 from samcake/orange
No more FLat global lighting, always use one of the SPherical harmonics presets
2015-03-31 15:52:49 -07:00
Sam Gateau
74f04c0c84 remove useless comment 2015-03-31 14:57:51 -07:00
ZappoMan
a889191916 never cull mesh parts for avatars 2015-03-31 14:27:34 -07:00
Seth Alves
ea2c5ff622 formatting 2015-03-31 14:04:33 -07:00
Sam Gateau
edf0ca2b06 Forbifd the global ambient lighting to go the simple global value and instead fallback to the first Spherical harmonics preset 2015-03-31 10:29:03 -07:00
samcake
1a18719031 and make it compile on mac... remove the field map from state just because it's unecessary 2015-03-30 21:53:59 -07:00
Philip Rosedale
5325478940 Merge pull request #4528 from ZappoMan/avatarUI
Support for Auto-detecting FST type, and adding type hint to FST files when packaged
2015-03-30 21:31:22 -07:00
Bradley Austin Davis
87c4f8433c Fixing consecutive spaces issue with text renderer 2015-03-30 16:21:57 -07:00
Andrew Meadows
10af59296d Merge pull request #4499 from sethalves/multi-hull-collisions
Multi hull collisions
2015-03-30 12:11:56 -07:00
Sam Gateau
2a58a65a8f back to the office monday morning, State almost working in the full piupeline 2015-03-30 10:10:39 -07:00
Seth Alves
a47ae9212b quiet compiler 2015-03-28 17:13:31 -07:00
Sam Gateau
21b5d6f404 refining the state interface and the GLBackend for it with a true cache 2015-03-28 11:26:06 -07:00
ZappoMan
baa2f947e5 classifying FSTReader and moving ModelType into that class 2015-03-27 16:30:00 -07:00
Seth Alves
fd69a54f10 Merge branch 'master' of github.com:highfidelity/hifi into multi-hull-collisions 2015-03-27 15:55:20 -07:00
Sam Gateau
f1a0783347 Merge branch 'master' of https://github.com/highfidelity/hifi into temp1 2015-03-27 10:34:17 -07:00
Sam Gateau
9c44100bb8 cleaning the State class code 2015-03-27 10:33:29 -07:00
Seth Alves
7da87d6e15 set up a way to request ResourceCache downloads from a non-networking thread. 2015-03-26 18:37:55 -07:00