Brad Davis
59dc6c9cca
Merge remote-tracking branch 'upstream/master' into plugins
2015-08-10 11:47:54 -07:00
Andrew Meadows
5acd1e7d58
Merge pull request #5467 from sethalves/polyvox
...
Polyvox improvements (Warning: protocol change)
2015-08-10 11:12:10 -07:00
Bradley Austin Davis
cd6667303e
Merge remote-tracking branch 'upstream/master' into plugins
2015-08-07 15:32:33 -07:00
Seth Alves
732f9ceca5
pass voxel dimensions from PolyVoxEntityItem to pixel-shader so that the textures line up with the edges
2015-08-07 14:21:20 -07:00
ZappoMan
cec0f8ed1d
optimize ModelEntityItem::getAnimationFrame()
2015-08-07 13:43:57 -07:00
Seth Alves
f9685efa4b
set payload bounds for polyvoxs
2015-08-07 13:43:34 -07:00
Seth Alves
fcb30dbbe7
hook textures up to polyvoxs
2015-08-07 13:33:00 -07:00
ZappoMan
f4c3c30f6a
quick optimization to RenderableModelEntityItem::render()
2015-08-07 12:49:48 -07:00
Seth Alves
19aec4a3e7
update polyvox shader
2015-08-07 09:07:54 -07:00
Seth Alves
c07119c30b
Merge branch 'master' of github.com:highfidelity/hifi into polyvox
2015-08-07 07:37:25 -07:00
Bradley Austin Davis
7e60aee1bf
Merge branch 'master' into plugins
...
Conflicts:
interface/src/Application.cpp
interface/src/Application.h
interface/src/avatar/Head.cpp
interface/src/avatar/MyAvatar.cpp
interface/src/avatar/MyAvatar.h
interface/src/avatar/SkeletonModel.cpp
interface/src/avatar/SkeletonModel.h
interface/src/devices/3DConnexionClient.cpp
interface/src/ui/overlays/Overlays.cpp
2015-08-06 11:03:37 -07:00
Seth Alves
80909b4531
work toward getting textures on polyvox entities
2015-08-04 17:53:47 -07:00
Seth Alves
56c0f9c814
work toward getting textures on polyvox entities
2015-08-04 17:37:15 -07:00
Seth Alves
419caccd8e
unmangle merge
2015-08-04 17:06:17 -07:00
Seth Alves
78091fd983
Merge branch 'master' of github.com:highfidelity/hifi into polyvox-render
2015-08-04 16:56:45 -07:00
Seth Alves
b318c1122c
Merge branch 'master' of github.com:highfidelity/hifi into polyvox
2015-08-04 16:00:27 -07:00
Sam Gateau
d07ab353fc
remove glLineWidth completely because it s not available anymore for wide lines in core
2015-08-04 11:57:20 -07:00
Seth Alves
dbda5ba40e
change polyvox rendering
2015-08-04 11:26:29 -07:00
Bradley Austin Davis
3c76c0d4b6
Merge remote-tracking branch 'upstream/master' into core
2015-08-04 10:23:54 -07:00
Bradley Austin Davis
53ccbfc4fa
Merge branch 'core' into plugins
2015-08-03 22:25:50 -07:00
Bradley Austin Davis
f19653f3e2
Integrate glew
2015-08-01 20:08:19 -07:00
Brad Davis
b84eef93c9
Core profile shader work and test code
2015-08-01 14:43:52 -07:00
Seth Alves
dbca3fe2fb
attempt to give polyvox its own rendering bung
2015-08-01 05:58:22 -07:00
Seth Alves
443b9e1e78
attempt to give polyvox its own rendering bung
2015-07-31 21:58:43 -07:00
Seth Alves
299d834e0e
Merge branch 'master' of github.com:highfidelity/hifi into polyvox
2015-07-31 15:30:28 -07:00
Brad Davis
155f88e267
Merge remote-tracking branch 'upstream/master' into plugins
...
Conflicts:
interface/src/devices/OculusManager.cpp
interface/src/devices/TV3DManager.cpp
interface/src/devices/TV3DManager.h
libraries/gpu/src/gpu/GPUConfig.h
2015-07-31 10:28:06 -07:00
Howard Stearns
b685378ab0
Merge branch 'master' of https://github.com/highfidelity/hifi into rig
2015-07-31 10:08:30 -07:00
Seth Alves
3b88500735
Merge branch 'polyvox' of github.com:sethalves/hifi into polyvox
2015-07-30 21:22:52 -07:00
Seth Alves
f2fb156d66
merge from upstream
2015-07-30 21:21:13 -07:00
Seth Alves
8d2aacb46d
send X texture to renderer
2015-07-30 15:36:07 -07:00
Brad Davis
f7a2513f26
Merge remote-tracking branch 'upstream/master' into plugins
...
Conflicts:
interface/CMakeLists.txt
interface/src/Application.cpp
interface/src/Menu.cpp
interface/src/Menu.h
interface/src/avatar/MyAvatar.h
tests/ui/src/main.cpp
2015-07-30 12:55:22 -07:00
Sam Gateau
d84e2d31ea
Merge with master
2015-07-30 11:20:00 -07:00
Seth Alves
03456f1a06
Merge branch 'master' of github.com:highfidelity/hifi into polyvox
2015-07-30 10:13:44 -07:00
Howard Stearns
06aa107762
Merge branch 'master' of https://github.com/highfidelity/hifi into rig
2015-07-30 09:57:02 -07:00
Andrew Meadows
77a12eb50e
compile on linux with GLEW
2015-07-28 17:53:01 -07:00
ZappoMan
c15161b71a
fix crash in Particle Entities and pendingChanges.updateItem()
2015-07-28 14:56:38 -07:00
Seth Alves
be39e5d6cf
Merge branch 'master' of github.com:highfidelity/hifi into polyvox
2015-07-27 19:13:48 -07:00
Sam Gateau
baf7873ce1
Merge branch 'master' of https://github.com/highfidelity/hifi into punk
2015-07-27 17:40:19 -07:00
Sam Gateau
f525a8a245
Removing all the unecessary calls of Batch from the gl legacy time
2015-07-27 17:17:56 -07:00
Howard Stearns
80763b3fc5
Merge branch 'master' of https://github.com/highfidelity/hifi into rig
2015-07-27 13:45:25 -07:00
Anthony J. Thibault
5844b594dc
Converted magic numbers to constants.
2015-07-27 09:27:16 -07:00
Seth Alves
9631268710
don't double-call updateOnCount when RenderablePolyVoxEntityItem::setAll is called
2015-07-26 21:03:11 -07:00
Anthony J. Thibault
5cc0b45850
Improved ParticleEffectEntityItem rendering and updates
...
* Created custom pipelines and shaders for untextured and textured
particle rendering.
* Created custom render payload for particles
* Moved all particle updates into simulation rather then render.
* Uses pendingChanges.updateItem lambda to update the playload with
new data for rendering.
* ParticleEffectEntityItem now updates its dimensions properly,
based on emitter properties.
* Bug fix for dt not accumulating properly, during gaps between updates.
now we just update all the time. (super cheap tho, if there are no particles
animating)
2015-07-26 17:21:17 -07:00
Seth Alves
ee334ff826
JointStates are owned by Rig objects. Model, FaceModel, SkeletonModel call into their Rig pointer to access JointStates.
2015-07-22 18:43:10 -07:00
Atlante45
8d6ff2d9f9
Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers
2015-07-20 14:50:44 -07:00
Atlante45
59acfc9f47
Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers
2015-07-20 13:51:51 -07:00
Stephen Birarda
0177513285
resolve conflicts on merge with upstream/master
2015-07-20 12:29:38 -07:00
Brad Davis
d68618e206
Removing GL headers from most files, and some naked GL from application.cpp
2015-07-18 00:46:09 -07:00
Atlante45
256c786e28
Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers
2015-07-17 17:59:19 -07:00
Stephen Birarda
f8c832e50b
resolve conflicts on merge with upstream master
2015-07-17 16:48:46 -07:00
