Commit graph

9027 commits

Author SHA1 Message Date
Seth Alves
517d4372fa debugging 2015-05-26 16:53:11 -07:00
Seth Alves
0ecd60a489 update voxel mesh when new data arrives from the wire 2015-05-26 16:45:29 -07:00
Seth Alves
55028f6cb0 voxel data sent over wire and saved to json 2015-05-26 16:34:35 -07:00
Seth Alves
66760afadb quiet compiler 2015-05-26 14:27:22 -07:00
Seth Alves
22cc298861 Merge branch 'polyvox' of github.com:sethalves/hifi into polyvox 2015-05-26 14:26:11 -07:00
Seth Alves
cdef502e2e expose setVoxelSphere to js 2015-05-26 14:26:05 -07:00
Seth Alves
28e052ffdb Merge branch 'polyvox' of github.com:sethalves/hifi into polyvox 2015-05-26 14:12:11 -07:00
Seth Alves
728e6d121b changes sam made to get normals to work on a mesh 2015-05-26 14:12:01 -07:00
Andrew Meadows
16e5710325 Merge pull request #4954 from ZappoMan/entitysmartpointers
EnitityItem smart pointers
2015-05-26 14:05:03 -07:00
Seth Alves
1ec384ab4d allow QByteArray data to be sent with a length. Use appendRawData in places that used to append raw byte-arrays 2015-05-26 13:43:22 -07:00
Seth Alves
988ecf9d55 send PolyVox voxel dimensions and compressed data over the wire 2015-05-26 13:18:52 -07:00
Seth Alves
ed6fdcfb31 add QByteArray data uppacking 2015-05-26 13:18:25 -07:00
Howard Stearns
3a7a290094 Uglify conditional returns. :-) 2015-05-26 11:38:36 -07:00
Howard Stearns
5608892a15 Remove obsolete comment. 2015-05-26 11:16:11 -07:00
Howard Stearns
bbdf9f1d9f Remove changingEntityID. 2015-05-26 11:14:23 -07:00
Seth Alves
d71921fd03 Merge branch 'master' of github.com:highfidelity/hifi into polyvox 2015-05-26 10:46:02 -07:00
Seth Alves
92c55d69ba Merge pull request #4944 from AndrewMeadows/bispinor
avatar-avatar collisions work again
2015-05-26 10:36:54 -07:00
ZappoMan
c4f96b09a2 sam's feedback on shared pointers in master 2015-05-26 09:55:28 -07:00
Seth Alves
59f68f5625 added voxel-data compression code to see what the sizes are like 2015-05-26 09:52:18 -07:00
ZappoMan
c92e7bed87 andrews CR feedback 2015-05-26 09:44:02 -07:00
Seth Alves
a251ae7f50 far is a reserved word 2015-05-26 09:06:51 -07:00
Seth Alves
727f457f91 hook up RenderablePolyVoxEntityItem::findDetailedRayIntersection to polyvox library's version 2015-05-25 21:01:20 -07:00
Howard Stearns
069e6237cc Noop change with more declarations, in hopes of convincing MSVS how lambdas work.
(Hey, it's worth a try...)
2015-05-25 16:52:14 -07:00
samcake
ffca6a6502 Merge pull request #4935 from sethalves/sam-model-fixes
fixes Sam made in my branch while trying to get a mesh to render
2015-05-25 16:39:25 -07:00
Howard Stearns
1b134d60d5 Fix typo that messed up the otherEntity for collisions. 2015-05-25 15:46:55 -07:00
Seth Alves
9735174036 Merge branch 'master' of github.com:highfidelity/hifi into polyvox 2015-05-25 15:37:23 -07:00
Anthony Thibault
18d683bced Particle entities should avoid resetting simulation when setMaxParticles is called.
This caused all particles to disappear when a network packet was received.
2015-05-25 12:22:38 -07:00
Howard Stearns
599886079d Restore blank line for minimum diff. 2015-05-25 11:33:12 -07:00
Howard Stearns
4266a99d78 Put the javascript methods on Script, not Entities, and other minimum-diff cleanup. 2015-05-25 11:28:33 -07:00
Howard Stearns
a0d09c0a6d Mulitple independent handlers for same entity/event. 2015-05-24 11:48:11 -07:00
Howard Stearns
b884d3cf90 Handle all the signals. 2015-05-24 09:57:12 -07:00
Howard Stearns
1dd2b7275e Simpler and more uniform version that handles all the standard entity-script events. 2015-05-23 18:11:05 -07:00
Howard Stearns
277f5ef3a4 Working experimental first version. 2015-05-23 13:35:35 -07:00
Atlante45
9e121aa387 Fix incorrect scale constants 2015-05-23 20:13:14 +02:00
ZappoMan
76c5bd1ab7 verify that entityitem cleanup is happening correctly 2015-05-22 22:01:25 -07:00
ZappoMan
9fa9942861 more work on smart pointers 2015-05-22 21:45:57 -07:00
ZappoMan
8b78fc4190 EnitityItem smart pointers 2015-05-22 17:57:50 -07:00
Seth Alves
6c67d14fbc experimenting with physics 2015-05-22 16:21:09 -07:00
Seth Alves
e702518041 adjust logic around timestamps used by entity-server to know if something was sent. adjust which physics variables are adjusted by a non-sim-owner packet 2015-05-22 16:11:29 -07:00
David Rowe
a01830f8f8 Fix some double to float conversion warnings in Windows builds 2015-05-22 12:32:02 -07:00
Andrew Meadows
461d08c0a9 merge upstream/master into andrew/bispinor 2015-05-22 11:35:02 -07:00
Andrew Meadows
bf225e4886 fix bug masking physics shape changes 2015-05-22 11:33:45 -07:00
Andrew Meadows
0431e8da36 put avatar body in right spot, and give it mass 2015-05-22 11:08:56 -07:00
Seth Alves
380fed7aee metersToVoxelCoordinates and voxelCoordinatesToMeters 2015-05-22 10:37:48 -07:00
Clément Brisset
e276926608 Add include/remove duplicate type 2015-05-22 18:23:42 +01:00
Atlante45
c6ce5e7680 PerformanceTimer deactivated when not in use 2015-05-22 18:54:40 +02:00
Seth Alves
ed082800f5 Merge branch 'master' of github.com:highfidelity/hifi into polyvox 2015-05-22 08:38:22 -07:00
Eric Levin
fe99941de3 fixed problem with particle entities not showing up on other clients by adding properties to decodeEditEntityPacket and encodeEntityEditPacket methods in EntityItemProperties.cpp 2015-05-21 19:35:27 -07:00
Seth Alves
258e3b901d fixes Sam made in my branch while trying to get a mesh to render 2015-05-21 18:20:52 -07:00
Seth Alves
1100c832eb clean up diff 2015-05-21 18:18:04 -07:00
Seth Alves
f85cc89946 clean up diff 2015-05-21 18:17:07 -07:00
Seth Alves
a882fc7fb1 pull out common parts of the two sphere-in-volumes 2015-05-21 18:07:46 -07:00
Seth Alves
8b2d570f3f clearSphereInVolume 2015-05-21 17:04:57 -07:00
Seth Alves
478cb40135 draws in the right place, now 2015-05-21 16:46:27 -07:00
Seth Alves
2cb73b5430 added a volex-volume size member variable. drawing transform still isn't quite right 2015-05-21 16:31:01 -07:00
Andrew Meadows
466af03fa9 support for ShapeInfo::offset 2015-05-21 16:25:05 -07:00
Andrew Meadows
f6721aa6eb moved ShapeInfoUtil to be ShapeFactory 2015-05-21 15:53:16 -07:00
Andrew Meadows
2e3973dfdd impl AvatarMotionState::set/getWorldTransform() 2015-05-21 15:34:30 -07:00
Seth Alves
bbb61a77d9 dodge stride bug in mesh code 2015-05-21 14:47:23 -07:00
Andrew Meadows
67f5d0773d some list management of AvatarMotionStates 2015-05-21 14:40:47 -07:00
Seth Alves
fd19c63449 fix bug in mesh 2015-05-21 14:26:40 -07:00
Seth Alves
fe188f9a43 something draws, now 2015-05-21 10:42:14 -07:00
Seth Alves
72e227eefe Merge branch 'master' of github.com:highfidelity/hifi into polyvox 2015-05-21 09:55:14 -07:00
Seth Alves
52ce26d80d Merge branch 'master' of github.com:highfidelity/hifi into no-id-swap-redux 2015-05-21 09:20:56 -07:00
Philip Rosedale
1b0ef406ed Merge pull request #4921 from birarda/domain-toggle
add a global toggle for restricted users
2015-05-20 21:27:10 -07:00
Seth Alves
de6422683a cleanups, trying to figure out why this doesn't draw 2015-05-20 21:21:39 -07:00
Seth Alves
38edc27cbb Merge branch 'master' of github.com:highfidelity/hifi into no-id-swap-redux 2015-05-20 18:24:40 -07:00
Seth Alves
c3b26b78a0 Merge branch 'polyvox' of github.com:sethalves/hifi into polyvox 2015-05-20 18:22:16 -07:00
Seth Alves
138077ede9 hook up mesh renderer 2015-05-20 18:22:07 -07:00
Seth Alves
d7ccd23b07 Merge branch 'master' of github.com:highfidelity/hifi into polyvox 2015-05-20 18:08:29 -07:00
Stephen Birarda
427e2e7dbf Merge branch 'master' of https://github.com/highfidelity/hifi into domain-toggle 2015-05-20 18:00:40 -07:00
Stephen Birarda
b6f458eaf1 Merge branch 'master' of https://github.com/highfidelity/hifi into ac-ice-connect 2015-05-20 17:59:40 -07:00
Seth Alves
aa1d3eb82a respond to code review 2015-05-20 17:31:57 -07:00
Stephen Birarda
7373bb6817 contain QSharedMemory for local server port to reader 2015-05-20 17:11:08 -07:00
samcake
496898273c Merge pull request #4846 from jherico/dk1
Second attempt at fixing the HMD eye projections, without breaking the camera this time.
2015-05-20 17:02:28 -07:00
Stephen Birarda
6306b69ec8 add a version and handle remapping for restricted access 2015-05-20 16:27:53 -07:00
Seth Alves
782402b4c8 Merge branch 'master' of github.com:highfidelity/hifi into no-id-swap-redux 2015-05-20 14:53:05 -07:00
Seth Alves
4a59dc24c5 split entity-add and entity-edit messages 2015-05-20 14:52:03 -07:00
Brad Hefta-Gaub
39ab2f43bf Merge pull request #4885 from Atlante45/warings
Quiet warnings
2015-05-20 14:45:55 -07:00
Brad Hefta-Gaub
07366ca173 Merge pull request #4917 from huffman/fix-spotlight-size
Fix spotlight dimensions
2015-05-20 14:45:23 -07:00
Seth Alves
124ff68cee make EntityItemID a subclass of QUuid 2015-05-20 14:22:08 -07:00
Seth Alves
f522334c99 sort out script interface changes 2015-05-20 12:30:06 -07:00
Howard Stearns
c5b8dd51d8 Fix https://app.asana.com/0/32622044445063/34195351184789
Handle collision events when we do other updates (and their entity scripts) rather than when we do the physic updates while the tree is locked.
Given that, remove the check that kept sound from playing (or scripts from running) when we would have deadlocked, because now we don't.
2015-05-20 11:07:03 -07:00
Seth Alves
a769cfdaf2 client decides on new entity-ids, keep EntityItemID class 2015-05-20 10:42:19 -07:00
Brad Davis
827d7f6221 Merge branch 'master' into dk1 2015-05-20 09:41:20 -07:00
Ryan Huffman
6f69ed2561 Fix calculated dimensions of spotlight
The spotlights region of effect is the intersection of the spotlight
with radius r, and the sphere of radius r
2015-05-20 09:11:48 -07:00
Ryan Huffman
bb38b3eb3f Update default light cutoff to PI / 2 2015-05-20 09:11:21 -07:00
Seth Alves
f2c1c43da3 polyvox code runs, no rendering yet 2015-05-20 08:44:41 -07:00
Seth Alves
4b263cf5c8 derieve PolyVox Entity from Model Entity 2015-05-19 21:40:05 -07:00
Andrew Meadows
2f4162f447 cleanup of AvatarManger API 2015-05-19 16:53:30 -07:00
Seth Alves
4166c3224f link polyvox library in with entities 2015-05-19 16:24:13 -07:00
Seth Alves
b32e069f1d bump protocol version 2015-05-19 14:45:01 -07:00
Seth Alves
f9d46b0cb5 interface decides on entityIDs rather than bouncing a temporary id through the entity server 2015-05-19 14:25:23 -07:00
Andrew Meadows
f86c419988 stubbery for collidable avatars 2015-05-19 14:15:26 -07:00
Andrew Meadows
ead1d9f4d1 formatting 2015-05-19 14:15:09 -07:00
Howard Stearns
bb4df26690 Fix indentation. 2015-05-18 14:25:35 -07:00
Howard Stearns
95be605233 Typo: unlock=>lock in rednerDebugMeshBoxes. 2015-05-18 14:05:13 -07:00
Howard Stearns
7e1b6a48c5 Merge branch 'master' of https://github.com/highfidelity/hifi into grab-picking-crash 2015-05-18 13:35:28 -07:00
Howard Stearns
f2a66f3106 Simplest fix for the grab crash that occurs with animated complex models.
(e.g., clicking on air hockey props in front of a spinning windmill).
2015-05-18 13:08:11 -07:00
ZappoMan
1bb682180c workaround for segregateMeshGroups() crash 2015-05-18 12:24:18 -07:00