Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-14 01:56:48 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
52126 commits 74 branches 59 tags 1.2 GiB
Commit graph

183 commits

Author SHA1 Message Date
Seth Alves
8bc2c76a8b change shape-key when registration point changes so shape cache doesn't incorrectly reuse the old shape 2016-03-05 08:01:30 -08:00
Seth Alves
9346171695 if entity registration isn't default, adjust physics shapes to match 2016-03-04 16:47:30 -08:00
samcake
1c53f9bc87 Fix the cleanup of the render::Item::ID in the EntityITem Rendereable wich were often not invalidated after beeing removed from the scene. THis caused a bug with particule system when beeing added /removed / updated quickly 2016-02-23 10:40:50 -08:00
Atlante45
11dc3cd261 Move primitive rendering out of DeferredLightingEffect 2016-01-13 11:47:43 -08:00
Seth Alves
10b82945a6 formatting 2015-12-16 10:16:01 -08:00
Seth Alves
008065ba38 Merge branch 'master' of github.com:highfidelity/hifi into near-grab-via-parenting 2015-12-14 09:15:56 -08:00
Seth Alves
c74f8bca49 location getters also return a success boolean so that callers can know if the value they are receiving is bad due to lack of information about an object's parent 2015-12-14 09:13:36 -08:00
Atlante45
eb8fc2e156 Fix last of the windows warnings 2015-12-11 17:37:36 -08:00
Atlante45
ce51350b65 Fix warnings on windows 64bit 2015-12-11 15:42:15 -08:00
Brad Hefta-Gaub
d07629489c Merge pull request #6543 from Atlante45/pointer 
gpu::Shader::create* return shared_ptr
 2015-12-04 11:17:02 -08:00
Atlante45
3da80f5861 gpu::Shader::create* return shared_ptr 2015-12-03 14:56:07 -08:00
Seth Alves
b7ebe5b92b merge from upstream 2015-11-30 16:59:52 -08:00
Seth Alves
4646c0c103 unmangle merge 2015-11-21 10:49:31 -08:00
Seth Alves
f013f95e9b merge from upstream 2015-11-21 08:43:00 -08:00
Anthony J. Thibault
a77ea8da43 Removed JointStates! You won't be missed. 2015-11-20 14:15:37 -08:00
Seth Alves
f07d5d9d3f show network and physics status on boxes and spheres 2015-11-11 11:32:12 -08:00
Seth Alves
39b92d2b52 terse log when ownership changes 2015-11-10 17:06:12 -08:00
Seth Alves
bc516c0b86 use render-item status getters to display physics debugging information 2015-11-06 11:32:56 -08:00
Seth Alves
61269c3ce8 fix up entity constructors so that setProperties isn't called during the constructor 2015-10-23 13:52:50 -07:00
Seth Alves
d86d69aeba keep track of children. use local position and orientation on the wire. 2015-10-22 15:36:03 -07:00
Andrew Meadows
fa17b77d70 move DIRTY_FLAGS out of EntityItem namespace 2015-10-15 09:34:09 -07:00
Brad Hefta-Gaub
430cbcca7e first cut at adding surface normals to ray intersection 2015-09-27 21:57:50 -07:00
Seth Alves
31fcd55d47 octree uses shared pointers 2015-09-08 11:59:48 -07:00
Seth Alves
1b92ae95d7 put glm:: before vec3 2015-09-04 09:41:53 -07:00
Seth Alves
07b241c778 code review 2015-09-03 11:05:44 -07:00
Seth Alves
2fe6e9c317 use AABox's ray intersection code rather than the goofed-up version that was here 2015-09-02 16:30:11 -07:00
Seth Alves
16ee5199e8 change how polyvox neighbors are notified of updates 2015-09-02 09:30:32 -07:00
Seth Alves
8608e4f2b0 small bug-fixes 2015-09-01 16:51:55 -07:00
Seth Alves
9256917f15 rebake mesh when a neighbor changes 2015-09-01 16:21:12 -07:00
Seth Alves
264d39aa9b have knitted polyvoxes keep track of low-axis neighbors as well as high 2015-09-01 14:49:17 -07:00
Seth Alves
930c5cefc9 fix setSphere to create a world-space sphere rather than a voxel-space one 2015-09-01 11:10:21 -07:00
Seth Alves
7369ca19e9 allow setting cuboid voxel spaces. clean up some locking 2015-08-31 18:01:15 -07:00
Seth Alves
4d06890d90 lock/unlock less 2015-08-31 15:24:15 -07:00
Seth Alves
376a6bbb21 don't reload textures if the url didn't change 2015-08-31 11:48:08 -07:00
Seth Alves
41a2ff2fff working on stitching marching-cube polyvoxs together 2015-08-30 18:42:15 -07:00
Seth Alves
64d0ce47f3 attempting to stitch polyvox entites together 2015-08-30 09:59:33 -07:00
Seth Alves
540af4afcb remove unneeded call to computeShapeInfoWorker 2015-08-28 12:47:04 -07:00
Seth Alves
a5cd3ff046 release _threadRunning if decompressVolumeDataAsync exits early 2015-08-28 11:04:56 -07:00
Seth Alves
1ac5c19f44 if someone else changes a polyvox, we need to localy recompute the collision shape 2015-08-28 10:39:23 -07:00
Seth Alves
0bcd6b8ec5 remove no-longer-used #define 2015-08-28 10:30:56 -07:00
Seth Alves
b09de4ff65 fix worldCoordsToVoxelCoords for non-edged voxels. voxel.js now adds/delete where you click rather than near to there. 2015-08-26 21:51:28 -07:00
Seth Alves
6f46832069 clean up some commented code. attempt to fix ray-casting in non-edged polyvox -- still isn't correct 2015-08-25 21:30:38 -07:00
Seth Alves
da6a1c958b clean up debugging prints 2015-08-25 16:40:58 -07:00
Seth Alves
3c35d90908 don't recompute meshes if nothing changed 2015-08-25 13:13:01 -07:00
Seth Alves
f6c440756c do slow polyvox operations on a thread 2015-08-25 11:46:51 -07:00
Seth Alves
7cb9968864 more work on polyvox threading 2015-08-25 05:53:36 -07:00
Seth Alves
dc31c7e233 back out previous attempt at theading polyvox code. lay groundwork for threading that can be reasoned about 2015-08-23 08:14:05 -07:00
Seth Alves
9937416729 attempt to move some time-consuming polyvox stuff off of the main thread 2015-08-21 11:23:13 -07:00
Seth Alves
f563b2aeba clean up debugging prints 2015-08-19 19:15:04 -07:00
Seth Alves
2dc2757eca code review 2015-08-18 13:03:54 -07:00
Seth Alves
af11e97daa fix broken optimisation for skipping internal voxels when making collision hull 2015-08-17 08:49:00 -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
ericrius1
0f7c21ddd7 rearranged entity props and added check in setNormals to avoid uninitialized binormal values 2015-08-10 11:55:47 -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
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
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
dbda5ba40e change polyvox rendering 2015-08-04 11:26:29 -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
Seth Alves
8d2aacb46d send X texture to renderer 2015-07-30 15:36:07 -07:00
Andrew Meadows
77a12eb50e compile on linux with GLEW 2015-07-28 17:53:01 -07:00
Seth Alves
9631268710 don't double-call updateOnCount when RenderablePolyVoxEntityItem::setAll is called 2015-07-26 21:03:11 -07:00
Atlante45
59acfc9f47 Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers 2015-07-20 13:51:51 -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
7b5a5a339a Use make_shared/create to make shared pointers 2015-07-01 19:46:06 -07:00
Stephen Birarda
c6df573933 fix some OS X warnings, add description to tooltip 2015-06-26 10:50:31 -07:00
Seth Alves
021dc64789 merge from upstream 2015-06-18 15:03:09 -07:00
Seth Alves
b258aeaa3d merge from master 2015-06-18 10:04:14 -07:00
Seth Alves
22ac61e476 work around hiding of virtual functions in PolyVox entity classses 2015-06-17 14:40:24 -07:00
Seth Alves
508ae276c6 enable -Wdouble-promotion 2015-06-16 18:23:10 -07:00
Seth Alves
d7eddc398b don't make changes if the polyvox is locked 2015-06-16 10:14:01 -07:00
Seth Alves
445381bb6b fix DEFAULT_VOXEL_DATA, recompress voxel data when a script calls setVoxel. Use provided transform when rendering. 2015-06-15 16:07:28 -07:00
Seth Alves
983ae5b2f0 quiet compiler, fix some whitespace 2015-06-08 21:19:37 -07:00
Atlante45
260272d288 Transform to polyvox corner for render 2015-06-05 14:32:47 +02:00
ZappoMan
7c40b666e8 Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching-scene-api 2015-06-03 09:52:40 -07:00
Seth Alves
20d3814c1b code review 2015-06-02 10:00:07 -07:00
Seth Alves
ea3f002a65 ifdef out debug pritns 2015-06-01 14:38:07 -07:00
Seth Alves
d1bb6473d9 more work on edge handling and resizing 2015-06-01 13:57:28 -07:00
Seth Alves
43a1519e29 better handling of changes to the size of voxel space. limit each dimension to 32 2015-06-01 12:01:45 -07:00
Seth Alves
00af0a4376 trying to make thing behave when voxel-space is resized 2015-06-01 07:15:37 -07:00
Seth Alves
cfeab893e7 fix voxelToLocalMatrix 2015-05-31 09:28:33 -07:00
Seth Alves
b9202ebfb6 added SURFACE_EDGED_CUBIC surface extractor which pads the outsides of the voxel-space with empty cells to change how the edges of the surface look 2015-05-31 09:14:59 -07:00
Seth Alves
a3589788df allow edit.js to change between cubic and marching-cubes surface extractor on polyvox entity-items. 2015-05-30 18:33:35 -07:00
Seth Alves
c5a0dd72ec keep track of number of non-zero voxels, use this information when deciding on shape-type 2015-05-30 18:13:57 -07:00
Seth Alves
fe59f8846f recompute polyvox mesh when setVoxelSurfaceStyle is called. remove left-over color stuff from polyvox. don't require that a polyvox be rendered before computing its physics shape 2015-05-30 16:43:11 -07:00
Seth Alves
96a40bd673 basic collisions with cubic polyvoxes 2015-05-29 18:50:26 -07:00
Atlante45
e9edc3e789 PolyVox entities use simple program 2015-05-29 20:05:38 +02:00
Atlante45
ad2d4d5e85 PolyVox entities render in Batch 2015-05-29 17:44:41 +02:00