Nissim Hadar
b1174ce40c
Merge branch 'master' into hazeZone
2017-10-12 17:04:42 -07:00
Stephen Birarda
8a331e29a2
Merge pull request #11455 from utkarshgautamnyu/feat/JS-Baker
...
Feat/JS-Baker
2017-10-12 16:16:02 -05:00
Brad Hefta-Gaub
1bba5ff812
Merge pull request #11554 from sethalves/import-av-entities
...
Import av entities
2017-10-12 13:30:53 -07:00
beholder
c31aa6bcdb
8213 Keyboard Input Field: Reveals Passwords
2017-10-12 22:08:46 +03:00
utkarshgautamnyu
49f601329f
Update JSBaker.h
2017-10-12 11:35:38 -07:00
utkarshgautamnyu
f3983b3edc
Update JSBaker.cpp
2017-10-12 11:34:28 -07:00
Nissim Hadar
dc45c7af75
Implemented radio-buttons.
2017-10-12 11:18:18 -07:00
vladest
145149fedd
Merge branch 'master' into tablet_extended_sounds
2017-10-12 18:01:23 +02:00
Nissim Hadar
30fdf9d08e
Merge branch 'master' into hazeZone
2017-10-11 22:12:52 -07:00
Nissim Hadar
a21995db24
Added checkbox for altitude effect.
2017-10-11 22:10:58 -07:00
Nissim Hadar
96fd3123e8
Changed haze altitude to ceiling.
2017-10-11 20:36:24 -07:00
Nissim Hadar
832f9fb6e3
Renamed HAZE_MODE_RANGE_ONLY to HAZE_MODE_ENABLED.
2017-10-11 19:10:51 -07:00
Nissim Hadar
ea6b9ed28e
Removed ...ALTITUDE_MODE from combo.
2017-10-11 18:58:59 -07:00
Anthony J. Thibault
0a943fbe7b
Crash/Deadlock fix: Web3DOverlay could be destroyed on wrong thread.
...
When script calls Entities.getChildrenIDs*() it is possible to deadlock the main thread, and also invoke
the destructor of Entities and Overlays, which is very NOT thread safe.
The fix is to use a pattern already in use in several places in our codebase.
Use the custom deleter parameter of std::shared_ptr to call deleteLater() instead of destroying the object in place.
This allows any thread to use shared_ptrs of SpatiallyNestables without fear.
2017-10-11 17:32:34 -07:00
Sam Gateau
7edb41b0ea
Merge pull request #11577 from samcake/orange
...
Fix the HDR generation of cube maps from equirect images (1x2)
2017-10-11 17:12:27 -07:00
Brad Hefta-Gaub
cd2a742974
Merge pull request #11576 from SamGondelman/pointerEvents
...
Remove unused HFMetaEvents
2017-10-11 16:10:43 -07:00
samcake
592a4de1e5
Fix the HDR generation of cube maps from equirect images (1x2)
2017-10-11 15:56:22 -07:00
SamGondelman
403b18977b
remove unused HFMetaEvents
2017-10-11 14:37:23 -07:00
Ryan Huffman
c6672fc4ac
Fix KTX requests thrashing if a mip level can't be assigned
...
When downloading a mip level and assigning it to the underlying
resource, we weren't checking to see if the assignment was successful.
If it was unsuccessful, we would queue up a request for the next mip
which would end up being a request for the same mip that was just
attempted. This change fixes this problem by checking to see if the
texture's available mip level is at least <= the assigned mip level.
2017-10-11 14:20:57 -07:00
Seth Alves
ca128a3251
merge from upstream
2017-10-11 11:09:33 -07:00
Bradley Austin Davis
1e91c5cfce
Merge pull request #11561 from AndrewMeadows/improve-geometry-cache
...
more correct use of BufferView in GeometryCache
2017-10-11 11:03:53 -07:00
utkarshgautamnyu
6e4a5da69d
Update JSBaker.h
2017-10-11 10:44:19 -07:00
utkarshgautamnyu
1d373c2988
Update JSBaker.cpp
2017-10-11 10:38:48 -07:00
John Conklin II
4394415058
Merge pull request #11565 from huffman/fix/fst-texdir
...
Fix .fst texdir not being followed
2017-10-11 10:24:37 -07:00
Andrew Meadows
d9ba75ca72
fix warning about implicit cast from 64 to 32 bits
2017-10-11 06:07:07 -07:00
Ryan Huffman
69b6a8c163
Fix .fst texdir not being followed
...
Although the texdir was being acknowledged and used as the
_textureBaseURL inside of the Geometry* classes, it was being
overwritten in code meant to handle redirects. Basically, when a
geometry resource request is redirected (via ATP, HTTP, etc.), we needed
to update the _textureBaseURL to take the new location into account.
Previously we were overwriting the _textureBaseURL all the time, even
when not being redirected, but this updates it to only be overwritten
when the request is redirected.
There is at least 1 known case that this does not handle: a .fst with
its `texdir` set, that points at an fbx that gets redirected.
2017-10-10 18:29:59 -07:00
Ken Cooke
22f38f2965
Merge branch 'master' of https://github.com/highfidelity/hifi into audio-mac-bugfix2
2017-10-10 17:44:25 -07:00
Andrew Meadows
886422cbef
remove unused variable
2017-10-10 17:07:17 -07:00
Andrew Meadows
4bf99fe9d2
remove unused variable
2017-10-10 17:05:54 -07:00
Andrew Meadows
026195223a
more correct use of BufferView in GeometryCache
2017-10-10 17:02:26 -07:00
Atlante45
6dd49f5c32
Merge branch 'stable' of https://github.com/highfidelity/hifi into new-master
2017-10-10 16:53:34 -07:00
Atlante45
cea0f48e5c
Fix warnings
2017-10-10 15:19:09 -07:00
Sam Gateau
f143c28625
Merge pull request #11542 from SamGondelman/bubbleBoy
...
Move HUD and HUD overlay rendering out of display plugin
2017-10-10 14:26:20 -07:00
Sam Gateau
c44efda978
Merge pull request #11349 from Zvork/hdrcube
...
Under the hood support for HDR cube maps
2017-10-10 11:43:41 -07:00
Clément Brisset
3b48833cc0
Merge pull request #11451 from huffman/feat/upload-user-event
...
Add uploading to asset server event
2017-10-10 11:03:33 -07:00
Nissim Hadar
3070778b39
Fixed typo in comment.
2017-10-10 10:20:04 -07:00
Daniela
a46ef56af9
Merge with hifi:master. Packet Headers version were increased.
2017-10-10 17:26:33 +01:00
Ken Cooke
b026a0461d
Fix clang warnings for left-shift of signed int
2017-10-10 09:13:06 -07:00
Olivier Prat
db9a9e723c
Merged with master
2017-10-10 12:11:23 +02:00
Nissim Hadar
c9be5ea100
Merge branch 'master' of https://github.com/highfidelity/hifi into hazeZone
2017-10-09 18:01:48 -07:00
Seth Alves
559f229bd1
Merge pull request #11552 from SamGondelman/animationMaster
...
Cherry-pick "Model asks for renderUpdate if animating" into master
2017-10-09 17:57:19 -07:00
Nissim Hadar
71f567f15a
Merge branch 'master' into hazeZone
2017-10-09 17:28:10 -07:00
Nissim Hadar
7d5a887f43
Refactoring.
2017-10-09 17:25:19 -07:00
SamGondelman
ee02fa9a91
model asks for renderUpdate if animating
...
(cherry picked from commit 873ae9b9d6
)
2017-10-09 13:55:48 -07:00
SamGondelman
873ae9b9d6
model asks for renderUpdate if animating
2017-10-09 13:36:38 -07:00
Seth Alves
23f41457be
Revert "Revert "fix importing of avatar entities""
...
This reverts commit 28a8b18060
.
2017-10-09 11:52:43 -07:00
SamGondelman
3acbd7820b
build error
2017-10-09 11:48:54 -07:00
Stephen Birarda
72b23a0fbb
update default avatar to be better with oculus grab triggers
2017-10-09 10:33:34 -07:00
Andrew Meadows
0bcecdbe66
be picky when finding nearby entities at login
2017-10-09 10:27:46 -07:00
Seth Alves
4d2f16efc3
allow project to be built with clang on Linux
2017-10-08 18:01:41 -07:00
Bradley Austin Davis
c92588685b
Merge pull request #11533 from SamGondelman/modelMaster
...
Fix model loading for real this time
2017-10-08 10:23:13 -07:00
Seth Alves
28a8b18060
Revert "fix importing of avatar entities"
2017-10-07 16:54:05 -07:00
Brad Hefta-Gaub
62fc193bff
Merge pull request #11532 from sethalves/import-av-entities
...
fix importing of avatar entities
2017-10-06 17:59:54 -07:00
Brad Hefta-Gaub
80f0bd3b79
Merge pull request #11494 from humbletim/add-console-output-basenames
...
[experiment/feedback] Include script name with all JS/QML debug output
2017-10-06 17:58:19 -07:00
Nissim Hadar
e02876f1ea
Zone position/direction sent to haze uniform.
2017-10-06 17:24:20 -07:00
SamGondelman
b4a3ab9204
fix debugDeferredLighting
2017-10-06 15:46:10 -07:00
SamGondelman
e95ecc3f27
fix missing sensorToWorld matrix
2017-10-06 15:37:23 -07:00
SamGondelman
7e6d5d9d98
merge with master
2017-10-06 14:57:08 -07:00
Nissim Hadar
e34fb1c874
Merge branch 'master' into hazeZone
2017-10-06 13:20:12 -07:00
Nissim Hadar
8fad23aefd
Keylight working.
2017-10-06 12:49:43 -07:00
Nissim Hadar
47a6f2d7c9
Initial work on adding keylight direction.
2017-10-06 12:01:15 -07:00
Nissim Hadar
9918757061
Initial work on adding keylight direction.
2017-10-06 11:43:57 -07:00
Seth Alves
9064114ce5
fix mistaken logic-flip in recent PR
2017-10-06 11:03:48 -07:00
Seth Alves
195d96bd43
Merge branch 'master' of github.com:highfidelity/hifi into import-av-entities
2017-10-06 11:02:35 -07:00
Seth Alves
f4dedf05bb
move variables into block that needs them
2017-10-06 11:02:26 -07:00
Ryan Huffman
9c06afc4c8
Merge pull request #11326 from cain-kilgore/21537
...
WL 21537 - Improve log naming
2017-10-06 08:51:42 -07:00
Ken Cooke
4f19366349
Remove debug code
2017-10-06 08:05:55 -07:00
Ken Cooke
c6f3a9d9c3
Better comments
2017-10-06 08:04:18 -07:00
Ken Cooke
516e983dfb
Refactor peakhold to avoid mixed signed/unsigned fixed-point math
2017-10-06 08:03:25 -07:00
Seth Alves
8d00731620
Merge branch 'master' of github.com:highfidelity/hifi into import-av-entities
2017-10-06 07:20:34 -07:00
Nissim Hadar
76aace980a
Merge branch 'master' into hazeZone
2017-10-05 20:32:43 -07:00
Nissim Hadar
320c888ce4
Added checkbox to allow separate control of keylight attenuation.
2017-10-05 20:31:45 -07:00
Nissim Hadar
3afab3c1d3
Keylight attenuation implemented.
2017-10-05 18:25:02 -07:00
Chris Collins
c8301890e6
Merge pull request #11530 from kencooke/audio-mac-bugfix
...
Fix microphone audio on the Mac
2017-10-05 15:57:56 -07:00
SamGondelman
601b30f062
fix flash when switching display modes
2017-10-05 15:31:45 -07:00
Nissim Hadar
414cae8df7
Implemented haze colours.
2017-10-05 13:29:32 -07:00
Nissim Hadar
cbaae2c79b
WIP - haze colour.
2017-10-05 12:59:56 -07:00
SamGondelman
a6b7578c3c
start fixing asynch issue, fixes model loading!
2017-10-05 12:30:00 -07:00
Nissim Hadar
395d9cbd6b
WIP - haze colour.
2017-10-05 12:13:37 -07:00
Seth Alves
b96fac2f00
Merge branch 'master' of github.com:highfidelity/hifi into import-av-entities
2017-10-05 11:43:25 -07:00
Seth Alves
53a49272dc
fix importing of avatar-entities
2017-10-05 11:43:19 -07:00
Cain Kilgore
b3c3b2d34f
Switched Time & Session ID Over
2017-10-05 19:42:31 +01:00
Nissim Hadar
1e2bd23c0b
Fixed typo in variable name.
2017-10-05 11:31:08 -07:00
Ken Cooke
8822b1bfa4
Minor cleanup
2017-10-05 09:49:38 -07:00
Ken Cooke
82d13090f9
Better comments
2017-10-05 09:28:30 -07:00
Ken Cooke
d8341a0929
Work around compiler optimization bug
2017-10-05 09:27:07 -07:00
Ryan Huffman
de2c1aabac
Add removal of temporary files in FBXBaker
2017-10-05 09:08:42 -07:00
Ken Cooke
218de29356
disable compiler optimization as temporary fix
2017-10-05 07:39:21 -07:00
Nissim Hadar
794cb961d5
Merge branch 'master' into hazeZone
2017-10-04 23:03:59 -07:00
Nissim Hadar
ad03301df8
WIP - implementing range+altitude mode.
2017-10-04 23:03:21 -07:00
Nissim Hadar
8b72e3044a
WIP - implementing range+altitude mode.
2017-10-04 22:26:53 -07:00
Nissim Hadar
6dcd8b7b57
Haze Range works.
2017-10-04 21:47:20 -07:00
Nissim Hadar
97f775f6f1
Clean-up.
2017-10-04 21:36:42 -07:00
Sam Gateau
25dae2f24e
Merge pull request #11499 from samcake/blue
...
Moving Camera update and render frame to Game Loop (Main thread)
2017-10-04 18:42:02 -07:00
Sam Gateau
02bcbe6d5f
Merge pull request #11512 from AndrewMeadows/more-profile-details
...
expose performance hot spot in stats details
2017-10-04 18:34:19 -07:00
SamGondelman
3a6e84e681
trying to fix model issue
2017-10-04 17:26:12 -07:00
SamGondelman
215193ad90
try to improve performance
...
(cherry picked from commit a5f5f9fc5d
)
2017-10-04 13:50:35 -07:00
Nissim Hadar
eef778a463
Replaced uint8_t with uint32_t in server packet.
2017-10-04 13:47:13 -07:00
Nissim Hadar
62cfaaaf38
Sam's corrections.
2017-10-04 12:56:14 -07:00
SamGondelman
a5f5f9fc5d
try to improve performance
2017-10-04 12:05:13 -07:00
Nissim Hadar
2ce86ebfae
WIP - working on byte order in server messages.
2017-10-04 11:56:35 -07:00
SamGondelman
477dfdff1e
wip hud layering and fix crashes
2017-10-04 11:45:21 -07:00
samcake
d7333d3fa3
Merging with master
2017-10-04 10:55:38 -07:00
Nissim Hadar
3f677ec7c9
WIP - working on byte order in server messages.
2017-10-04 10:23:59 -07:00
Nissim Hadar
8c430d36fa
WIP - working on byte order in server messages.
2017-10-03 21:59:40 -07:00
Nissim Hadar
76f843c741
WIP - working on byte order in server messages.
2017-10-03 21:46:50 -07:00
Nissim Hadar
75509b9ecb
WIP - working on byte order in server messages.
2017-10-03 21:39:41 -07:00
Nissim Hadar
4019c3bc10
WIP - working on byte order in server messages.
2017-10-03 21:36:20 -07:00
Nissim Hadar
3505fedc00
WIP - working on byte order in server messages.
2017-10-03 21:34:21 -07:00
Nissim Hadar
16a10a8a0c
WIP - working on byte order in server messages.
2017-10-03 20:57:56 -07:00
Nissim Hadar
89381e7c8e
Moved _hazeProperties.getProperties(properties); into the ReadLock
2017-10-03 19:43:35 -07:00
Nissim Hadar
c1f4735468
Replaced HazeMode with uint8_t in transport protocol.
2017-10-03 19:39:34 -07:00
Brad Hefta-Gaub
a1979a2600
Merge branch 'master' into RC-56
2017-10-03 18:16:21 -07:00
Nissim Hadar
d4acb00aa5
Merge branch 'master' into hazeZone
2017-10-03 17:44:31 -07:00
Nissim Hadar
48e5b9d1bc
Haze enable/disable from UI works.
2017-10-03 17:42:04 -07:00
Seth Alves
75d2a2bd47
Merge pull request #11517 from SamGondelman/registration
...
Fix entities with registration points rendering in the wrong place
2017-10-03 16:09:27 -07:00
SamGondelman
fa838e4715
merge from master
2017-10-03 15:53:33 -07:00
SamGondelman
fc6e5df2cb
fix text/web registration point usage
2017-10-03 15:02:21 -07:00
SamGondelman
c9d2d40e1e
possibly fix registration offset issue
2017-10-03 14:44:11 -07:00
Seth Alves
6040c4a3e8
Merge branch 'master' of github.com:highfidelity/hifi into import-av-entities
2017-10-03 14:06:01 -07:00
Anthony Thibault
2dc080479c
Merge pull request #11513 from hyperlogic/bug-fix/set-compund-shape-url-deadlock
...
Bug fix for deadlock in ModelEntityItem::setCompundShapeURL()
2017-10-03 13:31:01 -07:00
Seth Alves
05e173a1d0
Merge branch 'master' of github.com:highfidelity/hifi into import-av-entities
2017-10-03 13:11:03 -07:00
SamGondelman
a6f2545511
fix local t pose
2017-10-03 12:51:37 -07:00
Andrew Meadows
46e809bbb2
use a better variable name
2017-10-03 12:35:03 -07:00
Andrew Meadows
ef326a3851
expose performance hot spot in stats details
2017-10-03 12:35:02 -07:00
Anthony J. Thibault
1389c2e31d
Bug fix for deadlock in ModelEntityItem::setCompundShapeURL()
...
The fix was to prevent ModelEntityItem::hasCompoundShapeURL() from taking
a readlock on the entity, instead a finer grained lock (ThreadSafeValueCache)
is made around the _compoundShapeURL QString.
2017-10-03 12:15:23 -07:00
Zach Fox
ea3da6c9dd
Merge pull request #11495 from zfox23/pop_interfaceChanges2
...
Commerce: One step closer!
2017-10-03 11:56:00 -07:00
Sam Gateau
ab8757eeb2
Merge pull request #11504 from AndrewMeadows/main-loop-stats-audit
...
Tweak debug stats for more clarity
2017-10-03 11:23:16 -07:00
Nissim Hadar
86c497a12f
Merge branch 'master' into hazeZone
...
# Conflicts:
# libraries/networking/src/udt/PacketHeaders.cpp
# libraries/networking/src/udt/PacketHeaders.h
2017-10-03 10:34:33 -07:00
Howard Stearns
22f0ef33ed
Merge pull request #11496 from howard-stearns/certificate-properties
...
Certificate properties
2017-10-03 10:06:48 -07:00
Nissim Hadar
1cf7f5a732
For testing.
2017-10-03 09:54:44 -07:00
Seth Alves
41dfdf4d82
Merge pull request #11509 from druiz17/fix-hud-module
...
Hud module. check if laser is pointing at UI element without moving the reticle first
2017-10-03 09:44:45 -07:00
Daniela
2b18296cfd
Merge remote-tracking branch 'upstream/master'
...
# the commit.
2017-10-03 15:26:22 +01:00
Daniela
1d6985a9eb
Fix Animation hue bug.
2017-10-03 15:25:54 +01:00
Sam Gateau
316156db46
Merge branch 'master' of https://github.com/highfidelity/hifi into blue
2017-10-02 21:31:59 -07:00
Sam Gateau
acb99592ee
fixing th e bug on exit due to the debug anim draw of the avatars
2017-10-02 21:31:30 -07:00
Nissim Hadar
93a2776cb5
Changes for debug
2017-10-02 18:13:23 -07:00
Nissim Hadar
999c3201c3
Merge branch 'master' into hazeZone
2017-10-02 16:54:45 -07:00
Nissim Hadar
cdbf067a24
Rename (haze)getParametersBuffer to getHazeParametersBuffer.
...
Add corrections from Sam
2017-10-02 16:54:02 -07:00
druiz17
8a0ecf4e6f
propertly determine is laser intersects with HUD UI
2017-10-02 16:46:43 -07:00
Seth Alves
e7fa8131ea
make json importer understand AVATAR_SELF_ID
2017-10-02 16:44:03 -07:00
Howard Stearns
9b0ebf0e07
doh! string not boolean
2017-10-02 16:18:28 -07:00
Seth Alves
ca11d19b3e
allow importing of avatar entities from json
2017-10-02 16:06:44 -07:00
Howard Stearns
0b7af66016
more linux warnings
2017-10-02 15:38:59 -07:00
Nissim Hadar
ca4c5969d9
Clean-up.
2017-10-02 14:36:45 -07:00
druiz17
68780f56b7
Merge branch 'master' of github.com:highfidelity/hifi into fix-hud-module
2017-10-02 14:06:26 -07:00
Howard Stearns
136381adb9
fatal compiler warning on mac/linux
2017-10-02 13:56:15 -07:00
Andrew Meadows
8d2153d2f3
cleanup debug stats, use more correct names
2017-10-02 13:08:17 -07:00
Andrew Meadows
e9d48a2713
fix warning about double-to-float conversion
2017-10-02 13:08:17 -07:00
Andrew Meadows
7df8816a81
faster rate counting
2017-10-02 13:08:17 -07:00
Nissim Hadar
29d5e772d4
Removed "..Is.." from various methods.
2017-10-02 12:42:46 -07:00
Howard Stearns
7b0321c1e1
guess for mac/linux openssl
2017-10-02 12:30:25 -07:00
beholder
cc8f1352da
7951 Reload button in Running Scripts dialog stops script
2017-10-02 22:18:03 +03:00
Nissim Hadar
93bc3bec52
Removed (unused) _haze.
2017-10-02 12:14:21 -07:00
Nissim Hadar
48fb7522c0
Removed blank line
2017-10-02 11:42:04 -07:00
Howard Stearns
5c5f052bc2
explicit free, and remove header that isn't available on mac/linux
2017-10-02 10:28:47 -07:00
Nissim Hadar
20a42d6fbd
Fixed model name string
2017-10-02 10:11:34 -07:00
Howard Stearns
0f6884dd80
fix mac/linux compiler error
2017-10-02 09:44:10 -07:00
Zach Fox
1ec0f5d9a0
Merge branch 'master' of https://github.com/highfidelity/hifi into pop_interfaceChanges2
2017-10-02 09:26:59 -07:00
Nissim Hadar
97756146b1
Attempt to add qml configuration
2017-10-02 09:09:36 -07:00
vladest
e360c1363e
Merge branch 'master' into tablet_extended_sounds
2017-10-02 18:03:49 +02:00
Nissim Hadar
bdd469cec4
Integrated haze shader into this branch.
2017-10-01 21:52:34 -07:00
Nissim Hadar
ffecf42ebb
Some clean-up.
2017-10-01 21:12:29 -07:00
Nissim Hadar
5a7fed022c
Merging haze branch.
2017-09-30 00:04:28 -07:00
Nissim Hadar
95f8f1ffc5
Added Varying8
2017-09-29 18:05:48 -07:00
samcake
577378f539
Adding stuff that seems to break?
2017-09-29 17:45:10 -07:00
Nissim Hadar
951ce247a2
Working on adding zone to haze.
2017-09-29 17:36:14 -07:00
druiz17
20918641f4
saving work
2017-09-29 16:48:25 -07:00
Howard Stearns
73c8da99dc
Merge branch 'master' of https://github.com/highfidelity/hifi into certificate-properties
2017-09-29 16:46:43 -07:00
Howard Stearns
58255abe12
animation url and computing certificateID
2017-09-29 16:32:25 -07:00
Nissim Hadar
2e1919eba5
Merge branch 'master' into hazeZone
2017-09-29 15:16:46 -07:00
Nissim Hadar
f26345a3f0
Working on adding zone to haze.
2017-09-29 15:15:49 -07:00
samcake
225d2bbbb4
Merge branch 'master' of https://github.com/highfidelity/hifi into blue
2017-09-29 13:47:37 -07:00
SamGondelman
b8ea6c22fa
no tpose when switching avatars
...
(cherry picked from commit fcfac9efc0
)
2017-09-29 13:47:09 -07:00
Sam Gateau
fb5fd346ff
Merge pull request #11492 from SamGondelman/tPose
...
Fix getting stuck in T-Pose on avatar switch
2017-09-29 13:37:31 -07:00
Zach Fox
96b6a2f013
Fix entity add after incomplete rezCertified implementation
...
(cherry picked from commit 0f66fb41fd
)
2017-09-29 13:27:21 -07:00
humbletim
fd917917c4
include the source basename in Script.print() && QML/Script console.*() debug output
2017-09-29 14:48:01 -04:00
Andrew Meadows
8134e2b7f9
fix const violation
2017-09-29 11:34:36 -07:00
Andrew Meadows
32910e6f40
use [this] for lambda capture list
2017-09-29 11:34:35 -07:00
Andrew Meadows
f5f1a64c92
use const ref on pointer, and use dynamic_cast
2017-09-29 11:34:35 -07:00
Andrew Meadows
b16d666026
remove dupe addToNeedsParentFixupList() call
2017-09-29 11:34:35 -07:00
Andrew Meadows
0c934e863b
clarify some comments
2017-09-29 11:34:35 -07:00
Andrew Meadows
5dcd6bc496
namechange: apparentAngle --> angularDiameter
2017-09-29 11:34:35 -07:00
Andrew Meadows
1c30f7424e
remove cruft and add comments
2017-09-29 11:34:35 -07:00
Andrew Meadows
49e11d2173
fix Differential scan logic for LOD culling
2017-09-29 11:34:35 -07:00
SamGondelman
f2de03bc38
small fixes and LOD cull children instead of parent
2017-09-29 11:34:35 -07:00
Andrew Meadows
b1b7764056
use 20 degrees of OVERSEND
2017-09-29 11:34:35 -07:00
SamGondelman
c39ac93fc8
fix isVerySimilar
2017-09-29 11:34:35 -07:00
Andrew Meadows
355a59edb1
fix missing entities in differential traversal
2017-09-29 11:34:35 -07:00
Andrew Meadows
d55d45f6aa
check radius in ViewFrustum::isVerySimilar()
2017-09-29 11:34:35 -07:00
Andrew Meadows
a55661e1ff
remove ViewFrustum::calculateProjection()
2017-09-29 11:34:35 -07:00
Andrew Meadows
a22e577100
zero out OVERSEND hack
2017-09-29 11:34:35 -07:00
Andrew Meadows
d061627a1d
reasonable values for iitial OctreeQueryNode view
...
make sure newViewFrustum is fully initialized before using it
2017-09-29 11:34:34 -07:00
Andrew Meadows
0597970bb4
faster, more correct ViewFrustum::isVerySimilar()
...
remove OVERSEND hack
add ViewFrustum::calculateProjection() method used by OctreeQueryNode
2017-09-29 11:34:34 -07:00
SamGondelman
defed80be7
edited entities are not repeatedly sent if out of view, handles cases where usesViewFrustum changes
2017-09-29 11:34:34 -07:00
SamGondelman
7938e301e7
full scene traversal and json filters
2017-09-29 11:34:34 -07:00
SamGondelman
0ad5f47bfd
trying to fix entity editing bugs, needs testing
2017-09-29 11:34:34 -07:00
SamGondelman
6c066605cd
add state to entity tree send thread
2017-09-29 11:34:34 -07:00
Andrew Meadows
b6818c4369
first-pass sending entities from _sendQueue
2017-09-29 11:34:34 -07:00
Andrew Meadows
1562fb153e
cherrypick traverseTreeAndBuildNextPacketPayload()
2017-09-29 11:34:34 -07:00