Seth Alves
f8f62a4ff1
remove unused function
2016-06-13 15:10:52 -07:00
Seth Alves
eba518cb65
try to make code that converts bullet-calculated values to parent-frame values more effecient
2016-06-13 14:26:41 -07:00
Seth Alves
99bfc76dd3
Merge branch 'master' of github.com:highfidelity/hifi into quiet-es-sim-spam
2016-06-13 11:14:26 -07:00
Seth Alves
4c45d081cd
merge from upstream
2016-06-10 19:57:46 -07:00
Seth Alves
96bf66d14a
Merge branch 'master' of github.com:highfidelity/hifi into quiet-es-sim-spam
2016-06-10 11:49:45 -07:00
Seth Alves
e1ae2a193f
EntityMotionState now uses parent-relative position and rotation and velocity when deciding if it needs to send an edit packet to the entity-server
2016-06-10 11:49:15 -07:00
Seth Alves
203ea5ddc7
Merge branch 'master' of github.com:highfidelity/hifi into permissions-grid
2016-06-09 09:53:33 -07:00
Brad Davis
ff8d4883b1
Attempt to get better logging from pure virtual call crashes
2016-06-08 22:35:39 -07:00
Brad Hefta-Gaub
0df72548f8
Merge pull request #8024 from kencooke/audio-src-avx2
...
AVX2 optimized audio resampler
2016-06-08 12:43:52 -07:00
Ken Cooke
27d39eb1b0
Lightweight functions to detect SSE3, SSSE3, SSE4.1, SSS4.2, AVX and AVX2.
...
These are cross platform, and return false on unsupported platforms.
2016-06-07 06:53:50 -07:00
Seth Alves
e16d1fdc23
Merge branch 'master' of github.com:highfidelity/hifi into permissions-grid
2016-06-06 16:32:26 -07:00
Brad Hefta-Gaub
5190d8ab6b
Merge pull request #8023 from jherico/settings
...
Eliminate extraneous writes for unchanged values
2016-06-06 12:22:11 -07:00
Seth Alves
d202a2bf11
better handling of missing settings keys
2016-06-06 11:59:39 -07:00
Brad Hefta-Gaub
f2bedc546f
Merge pull request #8019 from jherico/settings
...
Eliminate file IO contentions for settings
2016-06-04 21:04:50 -07:00
Brad Davis
bc81f00dc7
Eliminate extraneous writes for unchanged values
2016-06-04 20:47:10 -07:00
Brad Davis
65d8f65ed7
Fix unix builds, make settings ACID
2016-06-04 18:39:46 -07:00
Brad Davis
39dcd1f9bd
Eliminate file IO contentions for the settings
2016-06-04 17:55:30 -07:00
Andrew Meadows
bce8879d7c
remove ShapeInfo::clearPoints()
...
use getPoints() by ref and then clear
2016-06-03 10:47:54 -07:00
Andrew Meadows
9dc0fa7796
don't automatically clear ShapeInfo points
2016-06-03 10:47:54 -07:00
Andrew Meadows
211bbb88e6
purge SHAPE_TYPE_ELLIPSOID which wasn't used
2016-06-03 10:47:54 -07:00
Andrew Meadows
5d9e320dd7
purge SHAPE_TYPE_LINE
2016-06-03 10:47:54 -07:00
Andrew Meadows
d591561a88
remove RenderableModelEntityItem::_points
...
use ShapeInfo::_points instead
2016-06-03 10:47:54 -07:00
Andrew Meadows
1132b4666a
Merge pull request #7975 from jherico/shared_shapes
...
Moving shape definition to a shared location
2016-05-27 07:28:11 -07:00
Brad Davis
6a962d7aab
Unix build fix
2016-05-26 15:51:36 -07:00
Brad Davis
2c02c963d4
Moving shape definition to a shared location
2016-05-26 12:22:39 -07:00
Brad Hefta-Gaub
06cb625d09
Merge pull request #7959 from hyperlogic/tony/improved-avatar-mixer-precision
...
Improved Avatar Mixer Rotation Precision
2016-05-25 17:14:12 -07:00
Anthony J. Thibault
a1c32f8c44
Merge branch 'master' into tony/improved-avatar-mixer-precision
2016-05-23 10:24:52 -07:00
Seth Alves
40e862cf9e
quiet gcc 5 warnings
2016-05-21 16:53:01 -07:00
Andrew Meadows
83b8ef8131
clean up stream formatting of vec3 and friends
2016-05-20 09:41:26 -07:00
Andrew Meadows
f3fc00bc3a
add comment for why MAX_HULL_POINTS is 42
2016-05-20 09:41:26 -07:00
Andrew Meadows
5a826d696a
cleanup after code review
2016-05-20 09:41:26 -07:00
Andrew Meadows
7866fcf78c
trim high-point convex hulls
2016-05-20 09:41:26 -07:00
Anthony J. Thibault
b95ba8141c
AvatarData packet overhaul, uses a structure instead of raw memcpy
2016-05-19 20:26:00 -07:00
Brad Hefta-Gaub
d521cd82a0
Merge pull request #7908 from Atlante45/fix/settings
...
fix settings getting reset
2016-05-19 17:53:15 -07:00
Brad Hefta-Gaub
cef4a49c35
Merge pull request #7867 from huffman/fix/query-octree-crash
...
Fix crash in JurisdictionMap
2016-05-19 11:53:54 -07:00
Atlante45
10c412d8c7
Fix settings getting reset
...
fixes bugzid:531
When a setting handle was created but never initialized/used, it
would override the current value with the default value on destruction.
2016-05-18 11:36:14 -07:00
Zach Pomerantz
59e17c2d5f
Fix abs of unsigned warning
2016-05-17 22:57:29 -07:00
Anthony J. Thibault
2c6b0e5c95
Fix for linux warning.
2016-05-17 17:32:09 -07:00
Ryan Huffman
013d902376
Add vector include to OctalCode.h
2016-05-17 10:59:51 -07:00
Ryan Huffman
5fc18eafda
Rename OctalCodePtr related functions
2016-05-17 10:59:51 -07:00
Ryan Huffman
35f147f557
Cleanup use of OctalCodePtrList and add allocateOctalCodePtr
2016-05-17 10:59:51 -07:00
Ryan Huffman
e819ab8475
Add mutex protection around octal code getters
2016-05-17 10:59:51 -07:00
Ryan Huffman
ef6d758e7f
Fix JurisdictionMap multithreading issues
...
Make octal code pointers use shared_ptr, add locks around access.
2016-05-17 10:59:51 -07:00
Anthony J. Thibault
818d1f4601
Added six byte quaternion compression routines & tests
2016-05-16 17:48:54 -07:00
Anthony Thibault
8fecb51dde
Merge pull request #7846 from hyperlogic/tony/improved-avatar-debug-draw
...
Eye tracking bug fix and debug rendering improvements
2016-05-11 17:41:49 -07:00
Brad Hefta-Gaub
e01681eb52
Merge pull request #7856 from ZappoMan/NUEtweaks
...
don't show help or login on first run
2016-05-11 10:53:09 -07:00
Anthony J. Thibault
80a349c65b
Merge branch 'master' into tony/improved-avatar-debug-draw
2016-05-10 14:50:13 -07:00
Brad Hefta-Gaub
df34b49b41
fix white space
2016-05-10 11:34:11 -07:00
Brad Hefta-Gaub
33c5cb519a
cleanup firstRun with a common setting
2016-05-10 11:32:29 -07:00
Andrew Meadows
db9a4d6b8f
cleanup for code review
2016-05-10 07:49:11 -07:00
Anthony J. Thibault
9821c276ad
warning fix in release
2016-05-09 13:56:56 -07:00
Anthony J. Thibault
7f5296f566
Increased tolerance for near zero length vectors
...
Also, replaced some magic numbers with constants.
2016-05-09 11:53:09 -07:00
Anthony Thibault
cb5c7a3559
compile fix for macosx
2016-05-08 17:14:14 -07:00
Anthony J. Thibault
641e152699
Eye tracking bug fix and debug rendering improvement
...
* Bug fix for eye tracking in HMD, the "up" orientation of your eyes now match your head.
* DebugDraw: added drawRay method.
* Application: Renamed preRender to postUpdate
* AvatarManager: added postUpdate method that iterates over all avatars.
* MyAvatar: Renamed preRender to preDisplaySide
* MyAvatar: split preRender code into postUpdate and preDisplaySide.
* Removed "Show who is looking at me", "Render focus indicator" and "Render lookat target" debug draw.
* Split "Show Look At Vectors" into "Show My Look At Vectors" and "Show Other Look At Vectors", to make it easier to debug eye tracking.
* "Show Look at Vectors" now draws the right eye red and the left eye blue.
* Removed Avatar and MyAvatar renderBody
* Removed look at rendering from head.
* GLMHelpers: Bugfix for generateBasisVectors when up primary and secondary axis were orthogonal
2016-05-08 16:20:32 -07:00
Andrew Meadows
eeb100b62f
use glm::isnan() instead of isnan() from math.h
2016-05-05 18:28:27 -07:00
Andrew Meadows
01950fba96
recover unused code that may prove useful someday
2016-05-05 18:28:27 -07:00
Andrew Meadows
64c2e2d175
remove warning about unused variable
2016-05-05 18:28:27 -07:00
Andrew Meadows
2cbc771eba
reorder data members, remove cruft, 744->616 bytes
2016-05-05 18:28:27 -07:00
Andrew Meadows
bcf2cc8074
use references not pointers for ViewFrustums
...
also unravelling some spaghetti:
(1) split Octree stuff out of ViewFrustum
(2) moved ViewFrustum from octree to shared lib
(3) removed some cruft
2016-05-05 18:28:27 -07:00
Andrew Meadows
60a72c6660
getViewFrustum() provides const pointer
2016-05-05 18:28:27 -07:00
Zach Pomerantz
1553f532ba
Specialize usleep for Win32
2016-05-04 15:40:53 -07:00
Zach Pomerantz
526143b097
Improve perf of Win32 usleep
2016-05-04 13:36:07 -07:00
Zach Pomerantz
0f6162d683
Use appropriate units for timing tests
2016-05-04 13:23:10 -07:00
Brad Hefta-Gaub
754ef071eb
Merge pull request #7786 from sethalves/web-scripts-use-local-libs
...
allow scripts on the web to refer to local libraries with /~/
2016-05-03 11:10:48 -07:00
Geenz
85e0620261
Merge branch 'master' of https://github.com/highfidelity/hifi
2016-04-30 15:40:28 -04:00
Seth Alves
b28cfd27ec
fix problem where canonicalFilePath will strip a trailing slash
2016-04-29 13:17:59 -07:00
Andrew Meadows
b95c81d0ba
Merge pull request #7763 from huffman/fix/gpu-ident-debug
...
Fix assert crash in GPUIdent
2016-04-28 08:02:11 -07:00
Geenz
ae5ef6d948
Remove toLinearVec3 from ColorUtils
...
toGamma22Vec3 should probably stay since that is a valid conversion from linear to a gamma space of 2.2.
2016-04-26 17:00:59 -04:00
Anthony J. Thibault
d9063b199e
GeometryUtils: coneSphereAngle test
2016-04-26 13:31:06 -07:00
Ryan Huffman
e5f2658fd9
Update GPUIdent to take address of spInstance directly
2016-04-26 09:23:08 -07:00
Geenz
ba5fa70b83
Convert sRGB values for materials.
2016-04-25 13:31:50 -04:00
Geenz
97931d96b8
Move sRGB calcs to ColorUtils
...
And start consolidating any conversions with calls into ColorUtils.
2016-04-25 12:59:16 -04:00
Brad Hefta-Gaub
04dab65b59
Merge pull request #7727 from ZappoMan/supportLargeClockSkew
...
support for larger than 35 minute clock skew
2016-04-23 08:42:38 -07:00
Brad Hefta-Gaub
f1f9c6740d
Merge pull request #7745 from jherico/mac_texture_fix
...
Fixing texture storage allocation on OSX/GL 4.1
2016-04-22 17:07:12 -07:00
Bradley Austin Davis
d87c92baee
Fixing memory detection on OSX
2016-04-22 16:30:36 -07:00
Chris Collins
9bd9de5710
Merge pull request #7636 from samcake/red
...
Stereo drawcall amplification
2016-04-22 15:46:18 -07:00
Brad Hefta-Gaub
410bf3c95a
Merge pull request #7711 from AndrewMeadows/faster-kinematics
...
faster hifi kinematic motion calculations take-4
2016-04-22 13:41:02 -07:00
Brad Hefta-Gaub
c410242fb2
Merge pull request #7688 from jherico/texture_derez
...
Reducing GPU texture memory footprint
2016-04-22 13:20:54 -07:00
Seth Alves
e827a99222
Merge pull request #7732 from Atlante45/fix/settings-crash
...
Fix crash on exit in Settings
2016-04-22 11:46:30 -07:00
Andrew Meadows
afcf6d68a7
move deactivation thresholds to shared header
2016-04-22 09:38:43 -07:00
Andrew Meadows
c8f0b0501a
avoid active object update cycles
2016-04-22 09:38:43 -07:00
Andrew Meadows
3639ffe53e
optimize kinematic motion math
2016-04-22 09:38:43 -07:00
Andrew Meadows
905c5398c4
add EntityItem::set/getTransformAndVelocities()
2016-04-22 09:38:43 -07:00
Brad Hefta-Gaub
72c81e2378
Merge branch 'master' of https://github.com/highfidelity/hifi into supportLargeClockSkew
2016-04-21 16:26:44 -07:00
Brad Hefta-Gaub
d87d631871
Merge pull request #7708 from zzmp/feat/render-rates
...
Add renderRates.js to visualize rates over time
2016-04-21 15:59:58 -07:00
Brad Hefta-Gaub
2abcc454b0
CR feedback
2016-04-21 15:48:18 -07:00
Brad Davis
2689f2cc4a
Add MB/KB/Byte conversion macros
2016-04-21 14:46:11 -07:00
Howard Stearns
7f748153c5
Mac code for gpu memory.
2016-04-21 14:46:08 -07:00
Atlante45
0c32f47f50
Don't call virtual method from base dtor
2016-04-21 13:25:31 -07:00
Brad Hefta-Gaub
f9c4959578
remove some debugging, tweak formatting
2016-04-21 09:53:00 -07:00
Brad Hefta-Gaub
ddf5b0f316
some debugging
2016-04-21 10:32:22 -07:00
howard-stearns
c274df6066
uint64
2016-04-20 22:57:33 -07:00
howard-stearns
904e87313e
Match the gpu adapter names gainst the vendor and renderer names used by
...
the ogl we're using, so that we pick the right GPU to get info from.
2016-04-20 22:57:32 -07:00
howard-stearns
b403dcb0d9
An experiment to see if dual-card Windows desktops can be made to answer
...
the correct card.
2016-04-20 22:57:32 -07:00
howard-stearns
cb137635db
Fix stupid MSVC default indentation.
2016-04-20 22:57:31 -07:00
howard-stearns
c12772e4c6
GPU identification utilities
2016-04-20 22:57:30 -07:00
Brad Hefta-Gaub
31f9d592e0
support for larger than 35 minute clock skew
2016-04-20 18:42:00 -07:00
Zach Pomerantz
477d6f40e4
Avoid use of atomic copy ctor in RateCounter
2016-04-20 13:39:57 -07:00
samcake
474d667f27
One more uneeded change
2016-04-19 11:03:35 -07:00
samcake
28521aa66a
REmoving uneeded changes
2016-04-19 11:01:41 -07:00