Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-17 00:18:59 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
30023 commits 25 branches 0 tags 1.1 GiB
Commit graph

699 commits

Author SHA1 Message Date
Seth Alves
2dc2757eca code review 2015-08-18 13:03:54 -07:00
Seth Alves
1a71c3cc04 Merge branch 'master' of github.com:highfidelity/hifi into polyvox 2015-08-17 10:17:58 -07:00
Seth Alves
af11e97daa fix broken optimisation for skipping internal voxels when making collision hull 2015-08-17 08:49:00 -07:00
Brad Davis
db4d98ccb5 Polyvox shader fix 2015-08-16 23:21:45 -07:00
Seth Alves
1ee773a532 don't include interrior voxels in cubic collision hull 2015-08-16 14:11:37 -07:00
Seth Alves
c60a8e7dfc minecraft style voxel editing largely works 2015-08-16 12:52:55 -07:00
Seth Alves
a57278ba3c ray-picks against cubic-voxels seem right, now 2015-08-16 11:51:04 -07:00
Seth Alves
0230d9397c attempt to find exact ray intersection with cubic polyvox -- not working right, yet. 2015-08-16 11:04:52 -07:00
Seth Alves
b129c2a933 in edged mode, make sure border voxels are zeroed out. expose some more voxel matrix math to javascript 2015-08-16 09:36:54 -07:00
Seth Alves
c6530c4cec fix newly created polyvox collision-hull bug 2015-08-15 16:16:27 -07:00
Seth Alves
5ecdbaa19d have functions that change polyvox voxes return true if they changed anything, else false. added voxelCoordsToWorldCoords and worldCoordsToVoxelCoords 2015-08-15 15:18:25 -07:00
Seth Alves
09a9deabdb compute polyvox collision hull differently for marching-cube surfaces 2015-08-15 12:55:24 -07:00
Seth Alves
79a7755cdb add SURFACE_EDGED_MARCHING_CUBES polyvox surface extraction style 2015-08-15 12:18:36 -07:00
Seth Alves
27e5322cb4 compute polyvox collision hull differently for marching-cube surfaces 2015-08-15 11:25:27 -07:00
Brad Davis
208e41efd1 WebEntity keyboard input with mouse hover 2015-08-14 16:18:38 -07:00
Brad Davis
0fa3044231 QML framerate improvments 2015-08-12 16:24:34 -07:00
Brad Davis
19d31938d3 Merge remote-tracking branch 'upstream/master' into plugins 2015-08-10 21:25:35 -07:00
Seth Alves
b26d6d2b9c Merge pull request #5542 from ZappoMan/RenderableModelEntityItemOptimization 
Renderable model entity item optimizations
 2015-08-10 15:10:12 -07:00
ericrius1
8e7398ac7d small comment change 2015-08-10 13:41:30 -07:00
ericrius1
0f7c21ddd7 rearranged entity props and added check in setNormals to avoid uninitialized binormal values 2015-08-10 11:55:47 -07:00
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
ericrius1
c299d77c92 fixed implicit double to float casting and incorrect header author attribution 2015-08-10 10:57:53 -07:00
ZappoMan
942958c4f1 only setJointState() if animation frame actually changed 2015-08-09 16:07:56 -07:00
ericrius1
19e645fc65 fixed the way colors are handled to work with new core profile changes 2015-08-07 16:26:52 -07:00
ericrius1
205a2d53b6 no longer returning early on NaN 2015-08-07 16:15:51 -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
ericrius1
d735c85806 moving polyLineEntity over to core profile 2015-08-07 11:41:55 -07:00
ericrius1
3910cb0d69 Merge branch 'master' into polyLineInProgress 2015-08-07 10:12:02 -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
ericrius1
12770edbe1 Merge branch 'master' into polyLineInProgress 2015-08-03 15:52:26 -07:00
ericrius1
94acb23f27 no longer redefining payloadRender method in effort to avoid linux build errors 2015-08-03 15:51:11 -07:00
ericrius1
b2753507dc cleanup of comments and dead code 2015-08-03 09:35:47 -07:00
ericrius1
47bc8f50ab cleaning 2015-08-03 08:45:14 -07:00