Commit graph

183 commits

Author SHA1 Message Date
Seth Alves
93992bb427 Merge branch 'model-scripting-2' of github.com:sethalves/hifi into model-scripting-2 2017-03-23 09:55:35 -07:00
Seth Alves
ce9bb439b3 change Model api in anticipation of more than just PolyVox being able to give meshes to javascript 2017-03-23 09:55:30 -07:00
Seth Alves
df875ab504 make RenderablePolyVoxEntityItem::setSphere affect any voxel the sphere touches rather than just the ones whose center the sphere touches 2017-03-22 16:21:45 -07:00
Seth Alves
98cae8d152 added EntityScriptingInterface::getEntityLocalTransform. try harder to make sure polyvox mesh is ready before giving it to javascript 2017-03-20 09:37:46 -07:00
Seth Alves
35c38b8130 Merge branch 'master' of github.com:highfidelity/hifi into model-scripting-1 2017-03-18 10:18:27 -07:00
samcake
e1a0984fed Merge pull request #9906 from samcake/red
Expose rendering in wireframe mode
2017-03-17 17:09:44 -07:00
Seth Alves
b3603ce8b3 Entities.voxelsToMesh, Model.transformMesh, Model.appendMeshes, Model.meshToOBJ appear to work now 2017-03-17 16:52:56 -07:00
Seth Alves
200550aba9 ModelScriptingInterface::appendMeshes 2017-03-16 15:22:34 -07:00
samcake
0399249a03 Expeand the wireframe to the primitive entities and the polyvox 2017-03-15 16:58:31 -07:00
Seth Alves
40b87171a9 quiet warnings 2017-03-14 17:49:39 -07:00
Seth Alves
e8a9ff867d merge from upstream 2017-03-13 17:57:01 -07:00
Seth Alves
6b230bad14 oops 2017-02-27 20:56:25 -08:00
Seth Alves
88c850afa2 voxel-paint paints with capsules rather than spheres 2017-02-26 12:56:17 -08:00
Seth Alves
542cb7ab85 optimize RenderablePolyVoxEntityItem::compressVolumeDataAndSendEditPacket 2017-02-26 09:03:34 -08:00
Seth Alves
6227db9fc0 optimize RenderablePolyVoxEntityItem::setSphere 2017-02-26 08:30:29 -08:00
Seth Alves
422b0bb952 don't set _dirtyFlags if polyvox is collisionless 2017-02-25 21:14:13 -08:00
Seth Alves
7a31a99e3c back out previous experiment 2017-02-25 21:13:20 -08:00
Seth Alves
1e81edbaea make a copy of volData before computing the visual mesh 2017-02-25 15:32:08 -08:00
Seth Alves
76c873ce81 don't compute polyvox shapes if they are collisionless 2017-02-25 11:34:48 -08:00
Seth Alves
bb3155ee61 obj file is now produced in /tmp 2017-01-31 14:29:42 -08:00
Seth Alves
d158f6afd1 hook up a way to get mesh out of polyvox 2017-01-28 20:42:14 -08:00
Brad Hefta-Gaub
dbbed462b4 cleanup naked qDebug() calls 2016-12-19 22:24:25 -08:00
Seth Alves
8ee1fac367 don't try to render until mesh is ready 2016-11-18 16:33:48 -08:00
Seth Alves
b2a28147c0 more time 2016-11-18 15:36:29 -08:00
Seth Alves
3278478a60 cleanups 2016-11-18 15:26:16 -08:00
Seth Alves
a66a1d392e hack to avoid crash 2016-11-18 15:24:19 -08:00
Seth Alves
1714d4fe06 fix build 2016-11-18 05:40:57 -08:00
Seth Alves
8530156227 experimenting 2016-11-17 16:06:35 -08:00
Seth Alves
1eb17b9786 fix bug that caused polyvox rendering to mishandle its gpu buffers 2016-11-17 14:11:09 -08:00
Seth Alves
697369dece avoid crash on startup 2016-11-16 16:11:17 -08:00
Seth Alves
a14ff22df3 update render-land bounds when polyvox moves 2016-11-16 15:10:43 -08:00
Seth Alves
d097fa7982 fix polyvox memory leak 2016-11-16 14:10:50 -08:00
Seth Alves
d0c0cdd82f polyvox corners stitch together reliably. surface-extractor dropdown in edit.js works again 2016-11-02 16:31:34 -07:00
Brad Davis
ecfe56085d GLM update and GLI integration 2016-09-09 10:18:15 -07:00
Andrew Meadows
9fc77ccfa2 use reference to avoid big copy 2016-06-20 17:29:20 -07:00
Andrew Meadows
d64729372a ShapeInfo name changes 2016-06-20 17:29:20 -07:00
Seth Alves
f90b9ec65d Merge branch 'master' of github.com:highfidelity/hifi into avatar-entities-3 2016-05-10 12:08:45 -07:00
Seth Alves
91ff851bf8 fix call to queueEditEntityMessage 2016-05-07 16:59:54 -07:00
Seth Alves
a0771f8ee5 use smart pointers for entity simulations 2016-05-07 09:14:33 -07:00
Andrew Meadows
b5ad989811 more optimized uses of EntityItem::getDimensions() 2016-04-27 11:04:22 -07:00
Seth Alves
f3ba16ab3e fix locking around polyvox state flags 2016-03-25 14:06:57 -07:00
Seth Alves
ae6d6f4bb3 added comments, minor cleanups 2016-03-24 21:37:46 -07:00
Seth Alves
1b88284bf7 more threading cleanups 2016-03-24 19:14:25 -07:00
Seth Alves
f8fe7b5868 add back getMesh call 2016-03-24 17:22:34 -07:00
Seth Alves
6abed67c05 cleanups 2016-03-24 15:46:30 -07:00
Seth Alves
7c910fcf5e further reworking of polyvox threading 2016-03-24 15:28:19 -07:00
Seth Alves
462da3aaf3 don't call getMesh from render 2016-03-23 22:46:43 -07:00
Seth Alves
2d7f32a554 redo polyvox locking 2016-03-23 22:03:27 -07:00
Seth Alves
5c585acd9a offset is included in shape key for models 2016-03-06 14:29:30 -08:00
Seth Alves
dcb720a832 fix polyvox hull when registration changes. 2016-03-06 14:09:45 -08:00