ZappoMan
684ee3bdd0
Merge branch 'master' of https://github.com/highfidelity/hifi into centerOrigin
2015-08-19 11:20:15 -07:00
Andrew Meadows
990dce6795
Merge pull request #5578 from sethalves/polyvox
...
Polyvox improvements
2015-08-19 10:31:13 -07:00
Seth Alves
2dc2757eca
code review
2015-08-18 13:03:54 -07:00
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
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
Seth Alves
d6322903a2
quiet compiler
2015-08-11 10:12:46 -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
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
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
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
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
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
