Commit graph

779 commits

Author SHA1 Message Date
ZappoMan
12becb9d19 improve octree stats display 2014-03-11 16:22:35 -07:00
ZappoMan
f4d487464a more constructor cleanup 2014-03-09 00:01:47 -08:00
ZappoMan
1ceb05bf09 click harder 2014-03-08 18:22:30 -08:00
Philip Rosedale
e4924cdca8 Merge pull request #2202 from birarda/authentication
remove deprecated qt5 methods in CMakeList files
2014-03-04 18:30:22 -08:00
Stephen Birarda
231dc624ff replace deprecated qt5 macros in cmake with target_link_libraries 2014-03-04 12:41:24 -08:00
Atlante45
894f85fcb5 Merge branch 'master' of https://github.com/highfidelity/hifi into local_voxels 2014-03-04 10:49:26 -08:00
Atlante45
f1ce034c35 Merge branch 'master' of https://github.com/highfidelity/hifi into local_voxels 2014-03-03 16:47:42 -08:00
Atlante45
ef9ff0fa74 Put initialization and deletion of localVoxelSystems on render thread 2014-03-03 16:46:25 -08:00
Stephen Birarda
bb3a8677be Merge branch 'master' of https://github.com/highfidelity/hifi into cmake-quotes 2014-03-03 16:31:25 -08:00
Stephen Birarda
628f91cd73 complete quoting of varous Cmake commands, closes #1999 2014-03-03 12:15:05 -08:00
Stephen Birarda
60eb588e96 remove some unecessary null pointer checks 2014-03-03 11:36:01 -08:00
ZappoMan
372561195a remove voxel drumming from C++ 2014-03-03 04:00:06 -08:00
ZappoMan
bde39d9832 expose getVoxelEnclosingPoint() to JS, and clean up JS version of findRayIntersection() 2014-03-02 20:28:20 -08:00
ZappoMan
855e351f39 remove some ray pick helper code that was only used by hover voxel, main ray pick still exists 2014-03-02 19:37:40 -08:00
ZappoMan
f0e73d2f98 removed VoxelSystem::findRayIntersection() use tree directly 2014-03-02 15:46:33 -08:00
ZappoMan
ded7328959 clean up application access to deleteVoxelAt()/createVoxel()/getVoxelAt() to access VoxelTree directly 2014-03-02 15:17:49 -08:00
ZappoMan
de0baddef6 remove scene utils from voxels 2014-03-02 13:42:33 -08:00
ZappoMan
5b72f01b99 more cruft removal getting rid of false color in VoxelTreeElement 2014-03-02 12:33:52 -08:00
ZappoMan
b66c346f20 more cruft removal 2014-03-02 12:19:50 -08:00
ZappoMan
c5197b390e removed a bunch of cruft from VoxelSystem 2014-03-02 12:13:00 -08:00
Atlante45
20b921f4f8 Fixed typo 2014-02-28 11:26:17 -08:00
Atlante45
b854c450f4 Moved LocalVoxels class 2014-02-28 11:25:07 -08:00
Atlante45
2ee7974fa8 Merge branch 'master' of https://github.com/highfidelity/hifi into local_voxels 2014-02-27 17:53:59 -08:00
Atlante45
11e80e0aaa Added getVoxelAt for LocalVoxels + handle the case of the domain tree 2014-02-27 17:52:44 -08:00
Atlante45
b07081407a Made commom string name static const 2014-02-27 14:47:05 -08:00
ZappoMan
a28f016de0 removing VoxelQuery 2014-02-26 01:28:08 -08:00
ZappoMan
e96206914e early cut at headless viewers 2014-02-26 01:24:12 -08:00
Atlante45
4130313618 Added meta object for js LocalVoxels object 2014-02-25 16:29:54 -08:00
Atlante45
80337d2409 Base classe for shared named trees 2014-02-25 16:29:48 -08:00
ZappoMan
766a922fb3 add work around for voxel add of larger voxel on top of smaller voxels 2014-02-23 19:02:10 -08:00
ZappoMan
892cc01dd9 added Voxels.getVoxelAt() to inspect local tree 2014-02-23 13:18:36 -08:00
ZappoMan
f1577d12a0 make changes to local tree in Voxels JS interface 2014-02-23 12:36:38 -08:00
ZappoMan
03d6173c90 add Voxels.getFaceVector() to JS 2014-02-23 11:38:23 -08:00
matsukaze
e800c80d61 Merge remote-tracking branch 'upstream/master' 2014-02-20 23:32:06 -05:00
matsukaze
943b0b1b15 Removed primitiveIndex 2014-02-20 23:30:29 -05:00
matsukaze
b813438307 Consolidate primitive index with buffer index.
Removed the extra space associated with primitive index and use buffer
index for both the VBO and primitive renderers since they are exclusive.
2014-02-20 08:48:40 -05:00
ZappoMan
bf814410ac first cut at exposing clipboard support to JavaScript 2014-02-19 00:10:16 -08:00
matsukaze
9e5c8b1634 Merging upstream master 2014-02-12 12:32:53 -05:00
Philip Rosedale
dabf3e34d6 Merge pull request #1964 from ZappoMan/multiple_voxel_scripts_crash
Fixes various crashes in running multiple voxel scripts simultaneously
2014-02-10 15:43:37 -08:00
ZappoMan
f8a24a2e99 fix crash in multiple voxel edit scripts running simultaneously 2014-02-10 12:19:46 -08:00
ZappoMan
a0789d3a29 clean up bad edit packet warnings to help reduce log clutter 2014-02-10 11:21:27 -08:00
ZappoMan
02e6a3336d added several new JS events attributes 2014-02-09 01:05:27 -08:00
ZappoMan
07585dbe5b add scripts to voxels 2014-02-08 12:07:24 -08:00
matsukaze
ab0b7bba00 Fixes for style conformance: tabs to spaces 2014-02-07 22:52:08 -05:00
matsukaze
52290266b0 Fixes for style conformance: replace constants with enums 2014-02-07 22:11:47 -05:00
ZappoMan
802f72c732 more ray picking and intersection work 2014-02-07 15:06:32 -08:00
ZappoMan
e162aa4a40 Merge branch 'master' of https://github.com/worklist/hifi into ray_cast_scripting 2014-02-07 14:47:25 -08:00
ZappoMan
c64b934d33 first cut at ray cast scripting 2014-02-07 11:23:04 -08:00
Stephen Birarda
c1132726bf use SharedNodePointer in place of Node where appropriate 2014-02-06 14:58:03 -08:00
Brad Hefta-Gaub
8fbce35944 fix slight glitch in last child delete from larger voxel 2014-02-06 03:44:21 -08:00