Andrew Meadows
9ee49c3e1e
Merge pull request #5551 from sethalves/quiet-compiler
...
Quiet compiler
2015-08-18 09:54:29 -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
558f68c150
increase max polyvox dimension from 32 to 128. don't recompress compressed data unless something changed../../libraries/entities-renderer/src/RenderablePolyVoxEntityItem.cpp
2015-08-15 16:53:47 -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
79a7755cdb
add SURFACE_EDGED_MARCHING_CUBES polyvox surface extraction style
2015-08-15 12:18:36 -07:00
ZappoMan
44fcf71f07
change domain to be 32k and still have origin centered at 0
2015-08-14 15:26:49 -07:00
ZappoMan
bdc78e9666
some CR cleanup
2015-08-14 10:16:48 -07:00
ZappoMan
daeb90c1e0
fix clamp in AddEntityOperator
2015-08-14 09:35:39 -07:00
ZappoMan
5fdd7304aa
Merge branch 'master' of https://github.com/highfidelity/hifi into centerOrigin
2015-08-14 09:33:53 -07:00
ericrius1
b8a6105a03
Merge branch 'master' into particleExtensions
2015-08-14 08:56:59 -07:00
ericrius1
e191a301d8
added a spread to defaults to create a default fountain effect
2015-08-13 16:08:38 -07:00
ericrius1
bb84e0e403
fixed defaults
2015-08-13 15:57:45 -07:00
ericrius1
6fe8703492
added defaults to particle effect for velocity and acceleration
2015-08-13 15:50:00 -07:00
ericrius1
5b2e966ca5
fixing accel issues
2015-08-13 10:55:21 -07:00
ericrius1
d38d29e0f5
fixed argument signatues and optimized particle position calculations
2015-08-13 10:35:32 -07:00
ericrius1
f3d6992dd2
remove outdated comment
2015-08-12 17:28:07 -07:00
ericrius1
36ca0c54fc
acceleration spread working properly
2015-08-12 16:13:00 -07:00
ericrius1
16279bd415
emitters trail particles now
2015-08-12 14:01:42 -07:00
ericrius1
528d662c58
getting acceleration spread hooked up
2015-08-12 09:50:01 -07:00
ZappoMan
4fe8f49d4c
move origin to center of domain
2015-08-11 23:47:40 -07:00
ZappoMan
0990229c64
cache calculation of aabox and aacubes
2015-08-11 18:05:22 -07:00
ericrius1
2db053e56a
adding acceleration spread property
2015-08-11 17:09:48 -07:00
ericrius1
0031c2a39a
changed localGravity prop to acceleration, which can be along any arbitrary direction
2015-08-11 16:05:18 -07:00
ericrius1
c2915fc0f5
changing to velocity spread
2015-08-11 15:16:36 -07:00
ericrius1
ddaba19a4e
chaning to velocity from direction
2015-08-11 14:43:05 -07:00
Seth Alves
d6322903a2
quiet compiler
2015-08-11 10:12:46 -07:00
ericrius1
7ed408bf97
fixed merge conflics
2015-08-10 15:50:51 -07:00
ericrius1
d341dc337d
added direction spread property to particle entity to enable users to create more varied effects (such as falling snow
2015-08-10 15:48:28 -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
d568e20e14
spread going accross wire
2015-08-10 15:06:08 -07:00
ericrius1
23dcc647c4
adding more for direction spread
2015-08-10 15:00:21 -07:00
ericrius1
460eaa515b
adding direction spread
2015-08-10 14:19:25 -07:00
ericrius1
c9ad8e6e10
fixed comment formatting.
2015-08-10 12:10: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
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
ae958dd42d
Merge branch 'master' of https://github.com/highfidelity/hifi into RenderableModelEntityItemOptimization
2015-08-10 09:59:45 -07:00
ZappoMan
942958c4f1
only setJointState() if animation frame actually changed
2015-08-09 16:07:56 -07:00
Andrew Meadows
331c8c0967
Merge pull request #5503 from AlexanderOtavka/panel-attachable-improvements
...
Improvements to FloatingUIPanels.
2015-08-07 17:21:51 -07:00
ericrius1
205a2d53b6
no longer returning early on NaN
2015-08-07 16:15:51 -07:00
ZappoMan
cec0f8ed1d
optimize ModelEntityItem::getAnimationFrame()
2015-08-07 13:43:57 -07:00
ericrius1
3910cb0d69
Merge branch 'master' into polyLineInProgress
2015-08-07 10:12:02 -07:00
Seth Alves
c07119c30b
Merge branch 'master' of github.com:highfidelity/hifi into polyvox
2015-08-07 07:37:25 -07:00
Zander Otavka
be4e827281
Merge: master -> panel-attachable-improvements.
2015-08-06 16:29:38 -07:00
Zander Otavka
4a1fcbf160
Fix error in an unused method declaration.
2015-08-05 16:11:09 -07:00
Stephen Birarda
0fe3213d38
Merge branch 'master' of https://github.com/highfidelity/hifi into atp
2015-08-05 11:16:34 -07:00
Stephen Birarda
052978898e
resolve conflicts on merge with upstream master
2015-08-05 11:16:20 -07:00
Andrew Meadows
5be8583b7d
Merge pull request #5494 from sethalves/gzip-json-entity-persist-files
...
gzip json entity persist files
2015-08-05 10:56:03 -07:00
Atlante45
dfaa16d15c
Merge branch 'master' of https://github.com/highfidelity/hifi into protocol
2015-08-05 10:39:02 -07:00
Seth Alves
b318c1122c
Merge branch 'master' of github.com:highfidelity/hifi into polyvox
2015-08-04 16:00:27 -07:00
Seth Alves
adcd91e3ff
Added an option to domain-server settings to persist entities as gzipped json. With this setting enabled, persist files take much less space on disk than with the other two options.
2015-08-04 07:23:24 -07:00
ericrius1
9125b3a2a9
attempting to fix windows and linux builds again
2015-08-03 14:53:02 -07:00
ericrius1
e36099f2b6
fixing ambiguous "call to overloaded function compiler" errors on windows and linux builds
2015-08-03 12:31:21 -07:00
ericrius1
e4ff3fa9da
corrected author name at top of PolyLineEntity.h file
2015-08-03 11:26:48 -07:00
Andrew Meadows
b00d47d62e
merge master into cleanup of legacy shapes
2015-08-03 11:19:29 -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
Stephen Birarda
41c6220731
resolve conflicts on merge with upstream/master
2015-07-31 17:27:23 -07:00
Andrew Meadows
661a916ebd
merge rig into cleanup (removal of legacy shapes)
...
Conflicts:
interface/src/avatar/Avatar.h
tests/physics/src/ShapeColliderTests.cpp
tests/physics/src/ShapeColliderTests.h
2015-07-31 13:40:51 -07:00
Brad Hefta-Gaub
b46a430fba
Merge pull request #5468 from bwent/reset-position
...
Add gettable naturalPosition property for model entities
2015-07-31 11:03:27 -07:00
bwent
aab1f70800
Renaming vars
2015-07-31 10:47:05 -07:00
bwent
67760fad79
Add gettable naturalPosition property for model entities
2015-07-31 10:15:35 -07:00
Stephen Birarda
d340515ab3
complete the initial version of UDTTest
2015-07-30 17:09:25 -07:00
Seth Alves
52ee9526ce
add 3 new texture-url properties for polyvox
2015-07-30 13:20:19 -07:00
Seth Alves
a9556660c4
fix linux build
2015-07-29 20:53:24 -07:00
Andrew Meadows
2c66af67e9
Merge howard/rig into andrew/caesium
2015-07-29 09:04:32 -07:00
Andrew Meadows
0a5ada3c09
remove legacy shapes
2015-07-29 09:02:24 -07:00
Seth Alves
6e5aca6da4
merge from upstream
2015-07-27 16:52:36 -07:00
Anthony J. Thibault
604ef5dc71
Fixed float constant.
2015-07-27 09:28:56 -07:00
Anthony J. Thibault
5844b594dc
Converted magic numbers to constants.
2015-07-27 09:27:16 -07:00
Anthony J. Thibault
5cc0b45850
Improved ParticleEffectEntityItem rendering and updates
...
* Created custom pipelines and shaders for untextured and textured
particle rendering.
* Created custom render payload for particles
* Moved all particle updates into simulation rather then render.
* Uses pendingChanges.updateItem lambda to update the playload with
new data for rendering.
* ParticleEffectEntityItem now updates its dimensions properly,
based on emitter properties.
* Bug fix for dt not accumulating properly, during gaps between updates.
now we just update all the time. (super cheap tho, if there are no particles
animating)
2015-07-26 17:21:17 -07:00
Stephen Birarda
9e7fb9ae16
shuffle Packet headers, use static enum for PacketType
2015-07-23 13:56:47 -07:00
Atlante45
8d6ff2d9f9
Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers
2015-07-20 14:50:44 -07:00
Atlante45
256c786e28
Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers
2015-07-17 17:59:19 -07:00
Stephen Birarda
f8c832e50b
resolve conflicts on merge with upstream master
2015-07-17 16:48:46 -07:00
ericrius1
bad6aa8f0a
adding textures to poly line"
2015-07-17 15:39:44 -07:00
Andrew Meadows
32b1fe0918
proper fix for incorrect render of scaled entities
2015-07-17 15:21:02 -07:00
ericrius1
a44e5f949c
Merge branch 'master' into polyLineInProgress
2015-07-17 15:01:40 -07:00
Andrew Meadows
f09b3eb736
set creation time when loading unknown timestamp
2015-07-17 12:14:07 -07:00
Atlante45
cf453952f4
Rename should nack
2015-07-17 10:52:27 -07:00
Stephen Birarda
0811553c41
add a direct registration for EntityEditPacketSender
2015-07-17 10:49:24 -07:00
Stephen Birarda
2d5428276a
shouldNack default to true
2015-07-17 09:56:27 -07:00
Stephen Birarda
7d60b86f52
kill the PacketLister (AKA Huffman 1 : PacketListener 0)
2015-07-17 09:07:39 -07:00
Andrew Meadows
2441be21e2
restore order of setting properties
2015-07-16 20:58:34 -07:00
Andrew Meadows
18d0cb5158
cleanup of EntityItem ctors and friends
2015-07-16 17:48:28 -07:00
Stephen Birarda
61653bd88d
remove old PacketHeader methods
2015-07-16 16:04:12 -07:00
Atlante45
b4121eb464
Remove unnecessary move
2015-07-16 13:14:17 -07:00
Stephen Birarda
60ae02e4e9
some formatting changes in entities
2015-07-16 12:38:39 -07:00
Stephen Birarda
8921f59e23
fix entity packet send from interface client
2015-07-16 12:09:35 -07:00
Stephen Birarda
05dde9d8f5
resolve conflicts on merge with upstream/master
2015-07-15 16:18:47 -07:00
Stephen Birarda
8b5026a817
cleanup some warnings
2015-07-15 11:20:55 -07:00
Stephen Birarda
b115bd1a55
resolve conflicts on merge with huffman/receive_packets
2015-07-15 10:52:07 -07:00
Ryan Huffman
44c99ef89a
Replace bytesAvailable with bytesLefToRead
2015-07-15 10:44:51 -07:00
Stephen Birarda
e127c5c06d
rename Packet methods for clarity
2015-07-15 10:40:40 -07:00
Stephen Birarda
0327a8d477
fix bytesAvailable, don't double seek in Packet
2015-07-14 20:47:16 -07:00
Stephen Birarda
1450036b59
move EntityEditPacketSender method to slot
2015-07-14 17:18:28 -07:00
Atlante45
fbb6a94579
Merge branch 'receive_packets' of https://github.com/huffman/hifi into protocol
2015-07-14 16:36:28 -07:00
Ryan Huffman
56b5c9acff
Merge branch 'atp' of github.com:birarda/hifi into receive_packets
...
Conflicts:
assignment-client/src/entities/EntityServer.cpp
domain-server/src/DomainServer.cpp
2015-07-14 14:53:45 -07:00
Stephen Birarda
23548a99bc
move NACK packet disabling to EntityEditPacketSender
2015-07-14 14:43:01 -07:00
Stephen Birarda
d617b71232
remove SharedNodePointer from some packet callbacks
2015-07-14 14:27:26 -07:00
Atlante45
bbb00b9d3a
Merge branch 'protocol' of https://github.com/birarda/hifi into protocol
2015-07-14 14:11:41 -07:00
Stephen Birarda
0637f589b5
add PacketListener to help unregister for packets
2015-07-14 13:52:38 -07:00
Atlante45
7bf45308b6
Merge branch 'master' of https://github.com/highfidelity/hifi into clear_cache_and_restart
2015-07-14 12:31:37 -07:00
Ryan Huffman
0edc909818
Merge branch 'protocol' of github.com:birarda/hifi into receive_packets
...
Conflicts:
assignment-client/src/audio/AudioMixer.cpp
interface/src/Application.cpp
libraries/networking/src/Packet.cpp
2015-07-14 10:21:31 -07:00
Stephen Birarda
821c16cbc4
resolve conflicts on merge with uptream/master
2015-07-14 09:52:20 -07:00
Andrew Meadows
7610fe48c2
filter action updates during simulation ownership
...
This fixes a bug where actions can be thrashed (created/deleted)
by late entity update echos from the entity-server.
2015-07-14 09:24:37 -07:00
Clément Brisset
24eb4c8263
Merge pull request #5309 from sethalves/quiet-compiler
...
quiet compiler
2015-07-13 15:55:35 -07:00
Atlante45
c80df94b06
Update includes for moved files
2015-07-13 15:28:55 -07:00
ericrius1
f54d1cf0f6
smoother line drawing over network
2015-07-13 14:24:26 -07:00
Stephen Birarda
d990420565
repairs to octree packet receiving in interface
2015-07-13 13:10:57 -07:00
ericrius1
dab31e5e42
setNormals refactor
2015-07-13 11:32:12 -07:00
Stephen Birarda
264f39fa59
resolve conflicts on merge with upstream/master
2015-07-13 11:25:24 -07:00
ericrius1
0ce6737b34
merged and normals flipping
2015-07-13 09:43:15 -07:00
ericrius1
b3b12bd2dc
adding custom shader for flipped normals
2015-07-13 08:54:53 -07:00
Seth Alves
5aca0c28ef
quiet compiler
2015-07-13 07:37:59 -07:00
Seth Alves
87152a4de2
Merge pull request #5302 from AndrewMeadows/astatine
...
cleanup of ObjectActionSpring and AvatarActionHold
2015-07-12 11:17:09 -07:00
Atlante45
80fe090a94
Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers
2015-07-10 20:20:03 -07:00
Andrew Meadows
9ce9c541de
fix activation of object when action changes
2015-07-10 18:45:40 -07:00
Atlante45
c11864acf3
Merge branch 'master' of https://github.com/highfidelity/hifi into clear_cache_and_restart
2015-07-10 15:57:40 -07:00
Ryan Huffman
1c212ba1a1
Disable disabling of entity nack packet temporarily
2015-07-10 15:01:45 -07:00
ZappoMan
1dd40af162
fix AnimationLoop::setRunning() to not constantly reset the frame when the running state doesn't actually change
2015-07-10 12:43:35 -07:00
Andrew Meadows
71440dfbc5
add checks for NaN
2015-07-10 12:25:11 -07:00
Atlante45
6c591131ba
Made Animations safe for resource reload
2015-07-10 12:01:51 -07:00
Ryan Huffman
ec0fc81b86
Update EntityEditPacketSender to use QSharedPointer<NLPacket>
2015-07-10 08:46:11 -07:00
Seth Alves
bf6fce4e45
remove unneeded const
2015-07-09 17:05:15 -07:00
Ryan Huffman
672c5cc5b3
Properly create QByteArray in EntityEditPacketSender
2015-07-09 15:33:00 -07:00
Seth Alves
2dc4922da3
bring over code from entity-level-locking branch
2015-07-09 15:23:05 -07:00
Seth Alves
a01fb6f1dc
if an action changes its own arguments, cause reserialisation
2015-07-09 14:32:34 -07:00
Ryan Huffman
dd9dea7a97
Merge remote-tracking branch 'birarda/protocol' into receive_packets
...
Conflicts:
interface/src/DatagramProcessor.cpp
interface/src/octree/OctreePacketProcessor.cpp
libraries/entities/src/EntityEditPacketSender.cpp
libraries/networking/src/LimitedNodeList.h
libraries/networking/src/NLPacket.h
2015-07-09 14:08:35 -07:00
Ryan Huffman
0180bdc4fb
Update EntityEditPacketSender to use packet callbacks
2015-07-09 09:24:50 -07:00
Stephen Birarda
19c5f0b67c
resolve conflicts on merge with upstream/master
2015-07-08 22:54:36 -07:00
Atlante45
846e9f8105
Merge branch 'atp' of https://github.com/birarda/hifi into protocol
2015-07-08 19:10:06 -07:00
Stephen Birarda
c2ae73650c
go back to writing the number of deleted IDs
2015-07-08 19:03:42 -07:00
Atlante45
4bc71bb39e
Merge branch 'atp' of https://github.com/birarda/hifi into protocol
2015-07-08 18:55:14 -07:00
Stephen Birarda
da3502eb6c
resolve conflicts on merge with upstream/master
2015-07-08 18:41:48 -07:00
Atlante45
d4e01742e5
Merge branch 'atp' of https://github.com/birarda/hifi into protocol
2015-07-08 18:40:18 -07:00
Brad Davis
49a14e3446
Merge remote-tracking branch 'upstream/master' into entity_parsing
2015-07-08 18:37:41 -07:00
Atlante45
e2718d5c94
Merge branch 'protocol' of https://github.com/birarda/hifi into protocol
2015-07-08 18:26:36 -07:00
Stephen Birarda
5dc09692b4
more packet creation fixes for entitites
2015-07-08 18:13:06 -07:00
Brad Davis
98e0688e98
Reducing heap allocation in network packet parsing
2015-07-08 17:21:38 -07:00
Stephen Birarda
ac40790841
remove a bad replacement from PacketType in EntityTree
2015-07-08 16:54:56 -07:00
Stephen Birarda
fa71c781f4
cleanup edit message memory management in octree packet sending
2015-07-08 14:12:04 -07:00
Stephen Birarda
74940a2132
replace lingering PacketTypes in old format
2015-07-08 10:18:13 -07:00
Andrew Meadows
a0a1b01ea9
coalesce dupe action data members: _id and _type
2015-07-07 17:50:08 -07:00
Andrew Meadows
e9df8cacc7
make some arguments const, cleanup some #includes
2015-07-07 17:50:08 -07:00
Andrew Meadows
77bd7b2821
some ObjectAction methods should be const
2015-07-07 17:50:08 -07:00
Stephen Birarda
ffa6edc904
fix spaces created by xcode find/replace
2015-07-07 15:01:19 -07:00
ZappoMan
a59fd44014
quiet some log spam
2015-07-07 09:04:20 -07:00
ZappoMan
2aa345dfc6
Merge branch 'master' of https://github.com/highfidelity/hifi into inBoundStats
2015-07-03 15:04:59 -07:00
ZappoMan
29a7584ee6
remove dead code
2015-07-03 11:29:59 -07:00
