SamGondelman
782a5c491e
removed hand lasers because they had been renamed so they weren't removed
2015-07-28 12:56:31 -07:00
Andrew Meadows
d03a7d1b70
fix physics-tests build errors
2015-07-28 12:24:17 -07:00
Andrew Meadows
2aa453b610
fix build errors for shared-tests
2015-07-28 12:05:45 -07:00
Howard Stearns
e7516aab02
Merge branch 'master' of https://github.com/highfidelity/hifi into rig
2015-07-28 11:17:35 -07:00
Atlante45
8b71462dc1
Remove unnecessary headers
2015-07-28 10:36:00 -07:00
Brad Davis
a049b14d13
Merge remote-tracking branch 'upstream/master' into plugins
2015-07-28 10:04:19 -07:00
Niraj Venkat
34e400ac67
Changing var name to 'DebugAmbientOcclusion'
2015-07-27 17:14:09 -07:00
Howard Stearns
98fe6dbf3d
Rename tests/rig to tests/animation, per Tony.
2015-07-27 14:13:54 -07:00
Howard Stearns
51a12adc08
Less dependencies in tests.
2015-07-27 14:02:47 -07:00
Howard Stearns
146ddd2240
Cleanup false starts.
2015-07-27 13:42:18 -07:00
Howard Stearns
8196770ed3
Wiring, including avatar position/velocity/orientation data, and an enableRig setting so that we don't break stuff unless turned on.
2015-07-27 12:58:43 -07:00
Marcel Verhagen
32d0513962
The 3Dconnextion files from https://github.com/highfidelity/hifi/pull/5351
...
For now without a merge conflict.
Updated the menu name.
Still have to look at the fast zooming and yaw on windows, probably have to add a var to prevent the button changes to be pushed to fast. Not sure why the yaw thing does not always work, could be that the position is also send at the same time and the input mapper does not not process all those synchronical. Probably will have to do something with masking the postion when the rotation is set for yaw.
2015-07-27 19:04:49 +02:00
Howard Stearns
1d99057052
Debug printouts in tests.
2015-07-24 16:08:47 -07:00
Howard Stearns
cff7bb703e
Test evolution.
2015-07-24 14:08:30 -07:00
Howard Stearns
cc26f5165b
Supply neck index per new protocol.
2015-07-23 15:40:33 -07:00
Howard Stearns
eea3ce4369
Make an actual rig in the test case.
2015-07-23 15:11:21 -07:00
Howard Stearns
5a0c1a9402
Checkpoint testing stuff.
2015-07-22 21:03:48 -07:00
SamGondelman
e27ba86f75
fixing merge issues with plugins
2015-07-22 14:57:59 -07:00
Howard Stearns
8173dc2c9a
Remove text extensions reference that isn't needed and which has changed underneath us.
2015-07-22 14:21:42 -07:00
Howard Stearns
a161f527c4
Comments documenting direction and questions.
2015-07-22 11:41:24 -07:00
Howard Stearns
dbb4a8b767
Merge branch 'master' of https://github.com/highfidelity/hifi into rig
2015-07-22 11:40:25 -07:00
Bradley Austin Davis
114ab9e47f
Merge branch 'master' into plugins
2015-07-22 11:47:56 -04:00
SamGondelman
e3bc4b3b89
working on plugin menu manipulation
2015-07-21 13:45:33 -07:00
Brad Davis
5744200f64
Merge remote-tracking branch 'upstream/master' into plugins
...
Conflicts:
interface/CMakeLists.txt
interface/src/Application.cpp
interface/src/Application.h
interface/src/avatar/MyAvatar.h
2015-07-20 19:21:02 -07:00
Anthony J. Thibault
80dea6831c
Merge branch 'plugins' of github.com:highfidelity/hifi into sam/vive-hand-controllers
...
Conflicts:
interface/src/Application.cpp
libraries/input-plugins/src/input-plugins/SixenseManager.cpp
2015-07-20 15:18:23 -07:00
ZappoMan
648d0f6d43
fix a bunch of warnings
2015-07-20 15:12:27 -07:00
Howard Stearns
ed815a0573
Reflect dependencies in unit test setup.
2015-07-17 16:53:41 -07:00
Stephen Birarda
f8c832e50b
resolve conflicts on merge with upstream master
2015-07-17 16:48:46 -07:00
Howard Stearns
d8287ac2b4
Merge branch 'master' of https://github.com/highfidelity/hifi into rig
2015-07-17 14:53:10 -07:00
Anthony J. Thibault
e8da4b9586
merge with plugins, needs testing
2015-07-16 18:47:39 -07:00
Brad Davis
e6e9f017c0
Fixing test code
2015-07-16 17:23:25 -07:00
Howard Stearns
a529cce626
Empty test suite and instructions.
2015-07-16 14:36:28 -07:00
Ryan Huffman
6f112f38c3
Merge branch 'atp' of github.com:birarda/hifi into protocol
2015-07-16 07:57:18 -07:00
Stephen Birarda
05dde9d8f5
resolve conflicts on merge with upstream/master
2015-07-15 16:18:47 -07:00
Ryan Huffman
9a3ba20f11
Merge branch 'atp' of github.com:birarda/hifi into protocol
2015-07-15 15:02:17 -07:00
Ryan Huffman
d9b962c4d9
Add packet tests
2015-07-15 15:02:08 -07:00
Ryan Huffman
07e3cf1348
Add COMPARE_DATA to QTestExtensions
2015-07-15 15:01:56 -07:00
Atlante45
501460d489
Merge branch 'protocol' of https://github.com/huffman/hifi into protocol
2015-07-15 13:14:36 -07:00
ZappoMan
819fa852b8
first pass at GlowEctomy
2015-07-15 12:47:59 -07:00
Stephen Birarda
8b5026a817
cleanup some warnings
2015-07-15 11:20:55 -07:00
Stephen Birarda
f0e07d424d
Merge branch 'atp' into packet-tests
2015-07-15 11:02:52 -07:00
Stephen Birarda
3cd2887a08
add initial packet tests
2015-07-14 16:11:29 -07:00
Anthony J. Thibault
dbc18ce51f
merge with plugins
2015-07-14 12:30:47 -07:00
Brad Hefta-Gaub
049419cec7
Merge pull request #5307 from howard-stearns/remove-octreeFades
...
Remove old octreeFade code that wasn't working anyway
2015-07-14 10:24:01 -07:00
Howard Stearns
5196648b22
Remove obsolete enum member.
2015-07-14 09:57:19 -07:00
Seth Alves
7a6cf40b54
quiet compiler
2015-07-13 07:39:11 -07:00
Seth Alves
5aca0c28ef
quiet compiler
2015-07-13 07:37:59 -07:00
Howard Stearns
d1952583ab
Merge branch 'master' of https://github.com/highfidelity/hifi into remove-octreeFades
2015-07-13 07:24:08 -07:00
Seth Alves
f011d5c7f7
remove commented code
2015-07-12 20:42:17 -07:00
Seth Alves
c17c9f1818
quiet compiler
2015-07-12 10:29:43 -07:00
Howard Stearns
51be245159
Remove old octreeFade code that wasn't working anyway.
2015-07-10 16:55:45 -07:00
Brad Davis
eb9d52fbb3
Helps to actually commit the fix
2015-07-10 16:11:56 -07:00
Brad Davis
3db3676fae
Fixing compile failure
2015-07-10 15:26:22 -07:00
Brad Davis
2ce8dba819
Removing heap allocation from property flag parsing, adding some manual tests
2015-07-10 15:08:10 -07:00
Anthony J. Thibault
474a643611
Added unit test for shared/transform.
...
The getInverseMat is currently failing, it shows the issue that was affecting the
mirror rendering.
2015-07-09 18:53:12 -07:00
Anthony J. Thibault
d75353eeb2
added left/right hand click actions, vive controller should be able to emulate mouse events
2015-07-07 14:35:55 -07:00
Seiji Emery
1fc1c7c794
PR Fixes
2015-07-02 17:29:08 -07:00
Seiji Emery
28543c0bf2
PR Fixes
2015-07-02 17:27:00 -07:00
Seiji Emery
7ba03418fc
PR Fixes
2015-07-02 17:24:03 -07:00
Seiji Emery
a48adf5ce5
Cleanup + formatting
2015-06-30 14:12:58 -07:00
Seiji Emery
8e324f5de2
Fixes
2015-06-29 11:29:10 -07:00
Seiji Emery
b47cb76e3c
Removed all-tests from ALL_BUILD
...
temp-fix for broken builds
2015-06-26 15:44:15 -07:00
Seiji Emery
3bddfc58e9
debug
2015-06-26 14:16:12 -07:00
Seiji Emery
5d5b4dd2f4
...
2015-06-26 13:52:12 -07:00
Seiji Emery
39a6a39f4d
bugfix
...
should fix the build…
2015-06-26 13:48:48 -07:00
Seiji Emery
e81b0a3c3a
Fixed tests for ALL_BUILD
...
Fixed physics tests, disabled out-of-date octree tests, and renamed /
added QTestExtensions to the tests folder (IDE view).
ALL_BUILD will now succeed.
2015-06-26 13:31:31 -07:00
Seiji Emery
67093cb9bd
Refactoring
...
Renamed QFUZZY_COMPARE to QCOMPARE_WITH_ABS_ERROR (and the fuzzyCompare function to getErrorDifference)
2015-06-24 16:34:03 -07:00
Seiji Emery
0ee0c92f2f
Re-added stuff
2015-06-24 14:54:54 -07:00
Seiji Emery
00900d6906
Rewrote MovingPercentileTests
...
(hope someone uses this...)
2015-06-24 14:46:01 -07:00
Seiji Emery
735c4a7dcf
bugfix
2015-06-23 17:45:02 -07:00
Seiji Emery
0f97d95c2f
Removed debug info from cmake files
2015-06-23 17:18:18 -07:00
Seiji Emery
1f0d9a250a
Reverted render-utils and ui tests to be manual tests (not unit tests, and not incorporating QtTest).
2015-06-23 17:13:43 -07:00
Seiji Emery
57b86c0762
Added docs for QTestExtensions.h
2015-06-23 15:27:49 -07:00
Seiji Emery
ede365acc6
Updated AngularConstraintTests
2015-06-23 13:51:26 -07:00
Seiji Emery
cbfd8485e4
Added an implementation stub for JitterTests
...
(the current tests take port and ip address info via command line args, and would be non-trivial to reimplement using QtTest.
The original tests can be run by #defining RUN_MANUALLY in the source file, and running jitter-JitterTests).
2015-06-23 11:50:31 -07:00
Seiji Emery
5a9d2a4d9c
Updated audio-tests
2015-06-23 11:38:22 -07:00
Seiji Emery
da04442f85
Updated networking-tests
2015-06-23 11:25:43 -07:00
Seiji Emery
4cb1dddb89
Refactored OctreeTests to use QtTest.
...
Note: unit tests currently fail, so that needs to be looked into.
2015-06-23 11:05:53 -07:00
Brad Davis
d4b9a739f5
Still working on GL update
2015-06-23 09:49:10 -07:00
Brad Davis
fbf3a0cbe6
Working on GL 4
2015-06-23 09:48:16 -07:00
Bradley Austin Davis
0000b5a8c8
Working on GL 4.1 core
2015-06-23 09:48:15 -07:00
Seiji Emery
dfe58a5ed4
Disabled Model (entity) Tests, as they are waaay out of date and will not run with the current codebase. These should get reimplemented at some point.
2015-06-22 17:42:07 -07:00
Seiji Emery
c61b38f5e6
finished physics tests
2015-06-22 16:25:26 -07:00
Seiji Emery
0d9a661839
physics test cleanup
2015-06-22 15:55:34 -07:00
Seiji Emery
c2b7f70d2b
ShapeColliderTests now uses QtTest
2015-06-22 15:25:24 -07:00
Seiji Emery
01c85e0a2c
cleanup
2015-06-22 10:17:26 -07:00
Seiji Emery
16dd5e0590
Added a custom test macro, QFUZZY_COMPARE (compares two values with an explicit error tolerance), and the infrastructure for defining more.
...
Reworked physics test files, but they're a WIP.
2015-06-21 09:29:09 -07:00
Seiji Emery
d75f3b1398
Fixed test target dependencies (which were not getting added into the *-tests build targets)
2015-06-20 11:49:26 -07:00
Seiji Emery
64922ecc62
Setup cmake build files for QtTest-based unit tests.
2015-06-19 21:39:34 -07:00
Seth Alves
508ae276c6
enable -Wdouble-promotion
2015-06-16 18:23:10 -07:00
Atlante45
0384b74479
Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching
2015-05-29 17:37:53 +02:00
Andrew Meadows
0c6de897f5
replace tab with spaces
2015-05-28 12:26:29 -07:00
Atlante45
bca80addef
Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into text-renderer
2015-05-28 16:13:24 +02:00
andrew
2a6955ce12
fix windows build
2015-05-27 09:14:11 -07:00
Andrew Meadows
39d8244255
use highfideltiy style for class data member names
2015-05-26 22:59:29 -07:00
Andrew Meadows
708203089c
replace tabs with spaces
2015-05-26 22:53:57 -07:00
Andrew Meadows
efbb9b0238
rewritten MassProperties with complete unit tests
2015-05-26 22:48:45 -07:00
Andrew Meadows
16e5710325
Merge pull request #4954 from ZappoMan/entitysmartpointers
...
EnitityItem smart pointers
2015-05-26 14:05:03 -07:00
Atlante45
76fc59675b
Merge branch 'team-teaching' into text-renderer
2015-05-26 20:01:26 +02:00
ZappoMan
c92e7bed87
andrews CR feedback
2015-05-26 09:44:02 -07:00
Atlante45
88d42f931e
Remove unused Headers
2015-05-26 18:12:20 +02:00
ZappoMan
31021c1dfd
more work on smart pointers
2015-05-22 21:46:05 -07:00
ZappoMan
8b78fc4190
EnitityItem smart pointers
2015-05-22 17:57:50 -07:00
Andrew Meadows
461d08c0a9
merge upstream/master into andrew/bispinor
2015-05-22 11:35:02 -07:00
Andrew Meadows
f6721aa6eb
moved ShapeInfoUtil to be ShapeFactory
2015-05-21 15:53:16 -07:00
Seth Alves
a769cfdaf2
client decides on new entity-ids, keep EntityItemID class
2015-05-20 10:42:19 -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
4872a565c9
bid for simulation ownership
2015-05-12 21:46:52 -07:00
Brad Hefta-Gaub
4de6d645e5
Merge pull request #4701 from jherico/infoview
...
Infoviews & Browser in QML
2015-05-06 12:12:21 -07:00
David Rowe
35dbb9491c
Merge branch 'master' into 20518
2015-05-05 13:13:49 -07:00
samcake
61f6139f4f
Merge pull request #4764 from ZappoMan/atmosphereInZones
...
First cut at adding "Atmosphere" support to zone
2015-05-05 11:00:58 -07:00
Bradley Austin Davis
d2a8681139
Merge branch 'master' into infoview
2015-05-05 10:31:19 -07:00
Philip Rosedale
e9476029fb
Merge pull request #4724 from jherico/menu_polish
...
Menu polish
2015-05-04 23:44:06 -07:00
ZappoMan
77232e35f8
Merge branch 'master' of https://github.com/highfidelity/hifi into atmosphereInZones
2015-05-04 17:16:33 -07:00
ZappoMan
4561c59203
wire up zone to environment atmosphere rendering
2015-05-04 13:49:43 -07:00
Stephen Birarda
14fa89858e
use epsilon constant in MovingMinMaxAvgTests
2015-05-04 10:45:26 -07:00
Stephen Birarda
7ce62f49e2
fix absolute value checks in MovingMinMaxAvgTests.cpp
2015-05-01 16:37:53 -07:00
Stephen Birarda
94739cf8d3
move number constants out of SharedUtil to NumericalConstants
2015-05-01 10:26:53 -07:00
David Rowe
d053379831
Add "Mute Face Tracking" menu item
2015-04-30 23:14:21 -07:00
Brad Davis
87ef98005d
menu polish
2015-04-29 02:42:57 -07:00
Bradley Austin Davis
75f6ad3b99
Working on menus look
2015-04-29 00:43:18 -07:00
Brad Davis
0fb8884f9c
Merge branch 'browser' into infoview
...
Conflicts:
tests/ui/src/main.cpp
2015-04-28 17:54:04 -07:00
Brad Davis
9836ffed97
Merge branch 'vr_menus' into infoview
...
Conflicts:
tests/ui/src/main.cpp
2015-04-28 01:17:51 -07:00
Brad Davis
4bb5e562ea
Browser work
2015-04-27 22:39:48 -07:00
Brad Davis
19ca543c2c
Cleaning up code and tweaking menu layout
2015-04-27 19:07:53 -07:00
Brad Davis
7bd8bbf565
Merge branch 'vr_menus' into infoview
2015-04-27 18:33:45 -07:00
Bradley Austin Davis
ca16d37ce5
Mac testing
2015-04-27 12:46:34 -07:00
Brad Davis
c799ecbf83
Fixing bad merge
2015-04-27 12:16:04 -07:00
Brad Davis
d8b814082e
Removing extraneous header
2015-04-27 12:15:16 -07:00
Brad Davis
14b660baf7
Merge branch 'vr_menus' into infoview
...
Conflicts:
tests/ui/src/main.cpp
2015-04-27 11:43:49 -07:00
Brad Davis
76ce34a74b
Scanning for code style
2015-04-27 11:41:10 -07:00
Brad Davis
d55d467d3f
Tweaking VR menu for PR
2015-04-27 11:35:57 -07:00
Brad Davis
fa31ba0754
Info-view
2015-04-26 10:37:14 -07:00
Brad Davis
a96f69a673
Switching to a wrapper mechanism for VR menus
2015-04-25 16:20:15 -07:00
Brad Davis
ee30588fd4
More menu work
2015-04-25 10:41:06 -07:00
Brad Davis
fbdb9b143e
Merge branch 'ui-refactor' into m_and_m
...
Conflicts:
interface/resources/qml/HifiMenu.qml
interface/resources/qml/MessageDialog.qml
interface/resources/qml/Root.qml
interface/resources/qml/TestRoot.qml
interface/resources/qml/controls/Dialog.qml
interface/src/Application.cpp
interface/src/ui/LoginDialog.cpp
libraries/ui/src/MessageDialog.cpp
libraries/ui/src/MessageDialog.h
libraries/ui/src/OffscreenQmlDialog.h
libraries/ui/src/OffscreenUi.cpp
libraries/ui/src/OffscreenUi.h
tests/ui/src/main.cpp
2015-04-24 18:02:12 -07:00
Brad Davis
e7b8efc2d9
Cleaning up unused stuff
2015-04-24 16:44:48 -07:00
Brad Davis
08d60c6a01
Fixing message dialog
2015-04-24 16:19:39 -07:00
Brad Davis
99a6e1f86c
Breaking up offscreen UI work
2015-04-24 13:21:21 -07:00
Brad Davis
1ff8c67576
More work on menus and some code cleanup
2015-04-24 12:54:11 -07:00
Brad Davis
c0d562ed55
Merge branch 'offscreen' into m_and_m
2015-04-23 23:45:11 -07:00
Brad Davis
f17387fab4
Working on menus
2015-04-23 21:23:21 -07:00
Brad Davis
bb1c73adc7
Working on menus
2015-04-23 14:24:01 -07:00
Brad Davis
8cb298a55b
Working on menus
2015-04-23 14:23:15 -07:00
Brad Davis
a9d65f168b
Working on marketplace dialog
2015-04-23 14:23:11 -07:00
Atlante45
0b1d4fb1d6
Merge branch 'master' of https://github.com/highfidelity/hifi into zones
2015-04-23 21:16:11 +02:00
Brad Davis
930ec7a6d8
One more
2015-04-22 19:22:10 -07:00
Brad Davis
c4d2bd2cda
More coding standard fixes
2015-04-22 19:18:09 -07:00
Atlante45
b446644549
Rename CollisionModelURL handle
2015-04-22 21:03:56 +02:00
Brad Davis
16efa2a46f
Improving toggle visibility and loading behavior
2015-04-17 16:59:04 -07:00
Bradley Austin Davis
4b73481604
Respond to changes in the device pixel ratio in the test window
2015-04-17 10:19:31 -07:00
Brad Davis
ce6b7e7aec
Merge branch 'master' into offscreen
...
Conflicts:
interface/src/Menu.cpp
2015-04-16 14:02:40 -07:00
Bradley Austin Davis
f700607a65
Working on OSX functionality
2015-04-15 23:08:55 -07:00
Brad Davis
aba2b395a6
Working on testing the QML ui
2015-04-15 12:35:30 -07:00
Brad Davis
d14d5f3d29
Working on new-UI implementations of address bar and login
2015-04-15 00:36:04 -07:00
Andrew Meadows
da9091a99d
remove SHAPE_TYPE_CONVEX_HULL from libs and tests
2015-04-14 14:54:43 -07:00
Brad Davis
54f2774d2e
Organize projects into folders for IDEs that support it
2015-03-19 15:45:11 -07:00
Philip Rosedale
6a4dbd35b5
Merge pull request #4449 from AndrewMeadows/thermonuclear
...
ShapeManager can release shape by pointer
2015-03-13 17:34:32 -07:00
Andrew Meadows
e4c6d49c4d
ShapeManager can release shape by pointer
2015-03-13 16:36:18 -07:00
Andrew Meadows
d1b977ec9e
remove warnings about unused variables
...
and remind us to impelement unit test for tetrahedron mass props
2015-03-12 16:36:08 -07:00
Andrew Meadows
feafa0a60b
remove old Ragdoll and avatar interactions
2015-03-11 14:29:03 -07:00
Virendra Singh
7954dd4d67
anticlockwise triangle order
2015-03-11 03:27:26 +05:30
Virendra Singh
a0e7125e11
code revamp and correction in parallel axis theorem
2015-03-11 03:11:17 +05:30
Virendra Singh
ce4226d6b9
Merge branch 'master' of git://github.com/highfidelity/hifi into 20304
2015-03-10 22:36:18 +05:30
Seth Alves
99300a5bc8
merge from master
2015-03-09 13:39:51 -07:00
Seth Alves
e4baaa38b4
collision model url
2015-03-07 20:33:00 -08:00
Andrew Meadows
373be95297
entity cubes are in meters
2015-03-06 15:32:03 -08:00
Virendra Singh
84e05e361e
Accuracy improved to 0.01
2015-03-06 22:07:35 +05:30
Virendra Singh
42867bf98d
code revamp
2015-03-06 11:10:38 +05:30
Andrew Meadows
49eee89c19
merge upstream/master into andrew/isentropic
...
Conflicts:
libraries/networking/src/PacketHeaders.cpp
libraries/networking/src/PacketHeaders.h
2015-03-05 08:22:02 -08:00
Virendra Singh
126d3cf237
Merge branch 'master' of git://github.com/highfidelity/hifi into 20304
2015-03-04 08:22:20 +05:30
Virendra Singh
4627d2e7b5
Parallel axis theorem correction
2015-03-04 03:52:59 +05:30
Virendra Singh
7a129235c2
Mass properties unit tests
2015-03-04 01:12:20 +05:30
ZappoMan
5c3c94a618
remove metavoxels
2015-03-02 17:21:43 -08:00
Andrew Meadows
93c77d557a
EntityTree::findClosestEntity() now takes meters
2015-02-26 14:14:17 -08:00
Leonardo Murillo
006b3ed0ac
Merge pull request #4300 from birarda/dependencies
...
NOT MERGEABLE - add some externals as cmake external projects
2015-02-25 13:22:49 -08:00
Seefo
ab590440be
Cleaned up warnings on Windows
2015-02-23 22:15:24 -05:00
Stephen Birarda
5e264f8241
add GLEW as dependency external project
2015-02-20 13:47:38 -08:00
Stephen Birarda
6b08b2993a
fix for bullet system include to silence warnings
2015-02-19 13:03:16 -08:00
Stephen Birarda
6f055ca0d7
add an external project to handle bullet
2015-02-19 12:01:40 -08:00
Stephen Birarda
b2e587dbbd
remove use of include_dependency_includes and use cmake
2015-02-18 14:12:05 -08:00
Stephen Birarda
7d25013659
add DLL copying for all project targets
2015-02-17 17:44:58 -08:00
Stephen Birarda
c110fcbfad
merge with upstream/master
2015-02-17 17:34:48 -08:00
Stephen Birarda
e99012efbb
updates to build guides to remove soxr
2015-02-17 10:33:12 -08:00
Andrew Meadows
53855c89e9
Merge pull request #4289 from birarda/dependencies
...
add gverb and glm as cmake external projects
2015-02-17 10:00:29 -08:00
ZappoMan
1fc0225939
change ScriptCache and SoundCache to derive from Dependency
2015-02-13 15:33:41 -08:00
Stephen Birarda
8c998a65ee
use the glm find_package and check externals
2015-02-13 12:50:32 -08:00
Stephen Birarda
9c13bec476
remove glm include where no longer required
2015-02-13 10:38:01 -08:00
Stephen Birarda
263afdd22c
use external project glm in physics tests
2015-02-13 10:37:17 -08:00
Stephen Birarda
d3973a724c
remove glm requirement in audio tests
2015-02-13 10:35:52 -08:00
Andrew Meadows
e6a6946027
merge upstream/master into andrew/thermonuclear
2015-02-09 12:44:52 -08:00
Andrew Meadows
0ef5d42a5b
unit tests support new ShapeInfo API
2015-02-08 15:13:21 -08:00
Stephen Birarda
41d2da8712
remove doubled Q_INIT_RESOURCE calls
2015-02-06 15:28:36 -08:00
Stephen Birarda
9a98e07b2d
call Q_INIT_RESOURCE from mains to handle static link
2015-02-06 12:39:14 -08:00
Seth Alves
6d5d6b9085
Merge branch 'master' of github.com:highfidelity/hifi into allowed-editors
2015-02-06 09:15:41 -08:00
Seth Alves
60a4f48985
rather than a list of allowed editors, a list of allowed lockers/unlockers
2015-02-06 09:14:40 -08:00
Brad Davis
9b7743c6d3
making test code identical on old and new renderer
2015-02-05 21:25:16 -08:00
Brad Davis
be3cca2d04
Working on performance test
2015-02-05 13:11:35 -08:00
Brad Davis
dc1cc84c1c
Working on porting to mac compatible shaders
2015-02-05 12:58:09 -08:00
Brad Davis
da05c26aad
Moving shaders to standard format, adding bounding box support and using it in text node
2015-02-04 21:32:05 -08:00
Brad Davis
1745ba9a7e
More OSX work, refactoring functions to shared, removing erroneuous Qt 5.4 dependency, fixing PrioVR text api usage
2015-02-04 12:42:27 -08:00
Brad Davis
ba277e802a
Working on OSX compilability
2015-02-04 11:29:31 -08:00
Brad Davis
cb7f4ca672
Pre-pull checking
2015-02-03 23:06:09 -08:00
Brad Davis
42703d2234
Working on testing code
2015-02-03 22:13:16 -08:00
Brad Davis
6cfb51283e
Working on the text renderer
2015-02-03 01:49:06 -08:00
Brad Davis
8d81607e28
Tweaking the example text renderer
2015-02-02 23:27:57 -08:00
Brad Davis
e71b61a256
remove oglplus references
2015-02-02 12:01:21 -08:00
Brad Davis
a096c79747
Working on text rendering test
2015-02-01 19:46:49 -08:00
Brad Davis
6835068496
Adding text rendering test tool
2015-02-01 16:24:43 -08:00
Andrew Meadows
ff171a5782
Bullet is now required dependency
2015-01-15 10:27:43 -08:00
Atlante45
2a82ff9768
Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet_cpp11
...
Conflicts:
assignment-client/src/voxels/VoxelServer.cpp
interface/src/Application.cpp
interface/src/Audio.cpp
interface/src/DatagramProcessor.cpp
interface/src/Menu.cpp
interface/src/Util.cpp
interface/src/avatar/MyAvatar.cpp
interface/src/ui/ApplicationOverlay.cpp
interface/src/ui/PreferencesDialog.cpp
libraries/networking/src/NodeList.cpp
libraries/shared/src/DependencyManager.h
2015-01-13 11:03:14 -08:00
David Rowe
a5b3ae397a
Code review
2015-01-08 18:20:23 -08:00
David Rowe
07b30da2ac
Fix miscellaneous types and casts
2015-01-08 13:44:51 -08:00
ZappoMan
9630279459
Merge branch 'master' of https://github.com/highfidelity/hifi into voxelEctomy
...
Conflicts:
examples/editVoxels.js
examples/fallingSand.js
examples/growTrees.js
interface/src/Application.cpp
interface/src/Application.h
libraries/avatars/CMakeLists.txt
libraries/entities/src/EntityItem.h
2014-12-31 10:50:53 -08:00
ZappoMan
27d8ccb51e
more voxelEctomy
2014-12-30 19:58:04 -08:00
Andrew Meadows
6f72d4ad81
easier to read Bullet to GLM conversions and back
2014-12-30 13:15:57 -08:00
Andrew Meadows
439cdbdac1
re-expose unit tests for legacy shapes
2014-12-29 11:15:09 -08:00
Andrew Meadows
71ab4a5780
fix unit ShapeManager unit tests
2014-12-29 11:07:57 -08:00
Andrew Meadows
9b7e50858a
merge upstream/master into andrew/inertia
...
Conflicts:
libraries/avatars/CMakeLists.txt
libraries/entities/CMakeLists.txt
2014-12-29 09:15:49 -08:00
Atlante45
327daacecd
Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet_cpp11
...
Conflicts:
interface/src/Application.cpp
interface/src/devices/OculusManager.cpp
libraries/networking/src/NodeList.cpp
2014-12-22 13:34:18 -08:00
Sam Gateau
4c670ac17a
merging with upstream master and origin temp0
2014-12-22 10:38:11 -08:00
Sam Gateau
967c6dbc4b
Add the Model library
2014-12-19 16:19:06 -08:00
Stephen Birarda
114e3bb2ff
rename cmake macro to represent actual purpose
2014-12-18 16:51:20 -08:00
Atlante45
aa0998dc7d
Moved LimitedNodeList into DM
2014-12-18 10:32:34 -08:00
Andrew Meadows
ad7641c7e0
repairs to build when Bullet not found
2014-12-11 16:05:45 -08:00
Andrew Meadows
919214b7cb
split ShapeInfo into shared and physics parts
2014-12-02 10:44:40 -08:00
Andrew Meadows
8aba2a06e0
Splitting Bullet stuff out of ShapeInfo
2014-12-01 16:47:33 -08:00
Andrew Meadows
37093cbd00
merge upstream/master into andrew/inertia
...
Conflicts:
interface/src/Application.cpp
2014-11-24 11:24:39 -08:00
Andrzej Kapolka
0a976ad262
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-11-20 11:26:29 -08:00
Atlante45
ae3bcc8f06
No more .f
2014-11-19 16:53:39 -08:00
Andrew Meadows
7c53c7a495
fix build to work when cmake does not fiind Bullet
2014-11-11 12:24:29 -08:00
Andrew Meadows
fa48da6c98
merge upstream/master into andrew/inertia
...
Conflicts:
libraries/entities/src/EntityItem.cpp
2014-11-11 11:14:12 -08:00
Andrzej Kapolka
a77525209d
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-11-10 11:54:05 -08:00
Stephen Birarda
2ca673175a
rename StdDev to StDev, patch its leak
2014-11-07 17:15:54 -08:00
Andrzej Kapolka
4c60be4a31
Fix for hang on test exit.
2014-11-06 19:37:37 -08:00
Andrzej Kapolka
e08a0144c2
Cleanup on aisle three! Removed the color/normal/voxelized spanner bits, as
...
well as the throbbing/scripted guides and the notion of spanner masking.
2014-11-06 19:15:43 -08:00
Andrew Meadows
2734afcf9a
Adding BulletUtil.h with tests.
2014-11-04 16:43:50 -08:00
Andrew Meadows
4a1133fbc2
moved ShapeInfo tests to their own file
2014-11-03 15:25:04 -08:00
Andrew Meadows
aa0172cf8b
Unit tests for ShapeManager
2014-11-03 14:03:05 -08:00
Andrew Meadows
d26540b029
ShapeManager now under unit test
2014-10-31 17:13:17 -07:00
Andrew Meadows
4c3cdf5b7a
move stuff out of shared and into physics library
2014-10-28 13:51:45 -07:00
Leonardo Murillo
a4965e7f60
No need for https when downloading assets
2014-10-23 13:59:08 -06:00
Andrzej Kapolka
bd4738d2c2
Reliable delta fix.
2014-10-21 15:48:53 -07:00
ZappoMan
4c85e9f581
removing particles
2014-10-13 14:10:57 -07:00
Leonardo Murillo
0b7ff18970
Changes in non-Js code
2014-10-06 11:24:10 -06:00
ZappoMan
4b52fddffd
collions with voxels and avatars
2014-09-24 17:37:56 -07:00
ZappoMan
f43ba4a68b
first cut at getting entities to collide
2014-09-24 15:28:04 -07:00
Andrew Meadows
0539246089
merge upstream/master into andrew/ragdoll
2014-09-15 13:56:51 -07:00
ZappoMan
d10bd6857d
add use of missingSet in release build to silence warning
2014-09-13 08:02:38 -07:00
Andrew Meadows
f2882618be
merge upstream/master into andrew/inertia
...
Conflicts:
interface/src/avatar/MyAvatar.cpp
2014-09-12 17:50:26 -07:00
Andrew Meadows
c475d5db36
unit tests for ray-vs-AACubeShape and PlaneShape
2014-09-12 08:41:28 -07:00
Andrew Meadows
08e5dbadfd
added validation of RayIntersectionInfo::_hitShape
2014-09-11 09:44:41 -07:00
Andrew Meadows
0494ffcf38
implement Ray-vs-Capsule and Ray-vs-AACube
2014-09-10 17:01:51 -07:00
Andrew Meadows
4da1ca22ba
Add RayIntersectionInfo and use for shape-vs-ray
2014-09-09 17:35:06 -07:00
ZappoMan
b78b8ccbb0
first cut at replacing radius with dimensions
2014-09-09 13:33:05 -07:00
Andrew Meadows
526d998924
removed warnigs about ill-formed narrowing conversion
2014-09-05 17:21:15 -07:00
AndrewMeadows
bd55da4a83
Merge pull request #3335 from ZappoMan/virtualEntities
...
Model Server to Entity Server Refactoring
2014-09-03 15:48:58 -07:00
Clément Brisset
72af7617fa
Merge pull request #3332 from AndrewMeadows/ragdoll
...
add AACubeShape to ShapeCollider
2014-09-03 14:34:32 -07:00
MarcelEdward
95cab15864
the command:
...
cmake . -GXcode
creates a CMakeFiles direcory in the test directory, causing the creation of the xcode files to fail with an the source directory does not contain a CMakeList.txt file.
This patch updates the CMakeList.txt file in the test directory to ignore that created dir.
2014-09-03 16:34:23 +02:00
Andrew Meadows
ebcc960ec7
merge upstream/master into andrew/ragdoll
2014-08-29 15:48:40 -07:00
Andrew Meadows
a0eb13f6db
collision logic for capsule-side-vs-cube-face
...
with unit tests
2014-08-29 14:23:00 -07:00
ZappoMan
2bcad6ab2b
Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities
...
Conflicts:
assignment-client/src/Agent.cpp
examples/editModels.js
2014-08-28 21:19:56 -07:00
Andrew Meadows
00913d4422
fixes for capsuleVsAACube() with unit tests
2014-08-28 16:51:16 -07:00
Andrew Meadows
f1ae0ce992
moved some functions around
2014-08-27 12:21:03 -07:00
Andrew Meadows
c6253bb51a
AACube vs Sphere and Capsule collision tests
...
Sphere is unit tested.
Also removed the shape collision query against Octree
2014-08-27 12:09:41 -07:00
Craig Hansen-Sturm
e941e58626
merge HEAD with PR-3281
2014-08-26 18:25:40 -07:00
Andrew Meadows
1bd7734ec1
sometimes swap order of shapes for simpler code
2014-08-22 18:07:11 -07:00
Andrew Meadows
de0ebf2f57
make sure all test errors have newline at end
2014-08-22 17:33:31 -07:00
Andrew Meadows
5d39efea82
make sure each test error has a newline at end
2014-08-22 17:26:19 -07:00
Andrew Meadows
1be922f986
add shapeVsList etc to dispatch table
...
renamed some functions for more readability
2014-08-22 11:20:53 -07:00
Andrew Meadows
3ebd8c1969
use dispatchTable for shape-vs-shape collisions
2014-08-21 16:40:25 -07:00
ZappoMan
daffb00bf2
build issues fixed after merge
2014-08-18 15:41:20 -07:00
ZappoMan
32d5eb3cea
Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities
...
Conflicts:
assignment-client/CMakeLists.txt
interface/CMakeLists.txt
libraries/entities/CMakeLists.txt
libraries/models/src/ModelEditPacketSender.cpp
libraries/models/src/ModelEditPacketSender.h
libraries/models/src/ModelItem.cpp
libraries/models/src/ModelItem.h
libraries/octree/src/OctreeEditPacketSender.cpp
libraries/octree/src/OctreeEditPacketSender.h
libraries/octree/src/OctreePacketData.h
libraries/octree/src/OctreeQuery.cpp
libraries/particles/src/ParticleEditPacketSender.cpp
libraries/particles/src/ParticleEditPacketSender.h
libraries/script-engine/CMakeLists.txt
tests/octree/CMakeLists.txt
2014-08-18 15:16:35 -07:00
ZappoMan
be94f98a91
fix warning
2014-08-17 14:10:42 -07:00
ZappoMan
cac4e5ba6c
improved use of MovingMinMaxAvg<> for better performance, added execution timing stats
2014-08-17 14:08:07 -07:00
wangyix
029ef962b7
made JitterTester work on windows
2014-08-14 11:31:31 -07:00
wangyix
81fa5ed41f
readPendingDatagrams stats printed and sent to domain page
...
jittertester now prints out send or receive error msgs
2014-08-13 16:48:06 -07:00
wangyix
db0fbcab97
merge with upstream
2014-08-13 11:09:55 -07:00
wangyix
737228e7bb
another newline
2014-08-12 15:40:58 -07:00
wangyix
3c73fd5e0b
forgot newline
2014-08-12 15:39:03 -07:00
wangyix
53d6cdd67c
forgot more lines
2014-08-12 15:36:51 -07:00
wangyix
d43c39fd57
forgot a line
2014-08-12 15:28:36 -07:00
wangyix
dc46d6b80f
added stdev to jitter tester
2014-08-12 15:27:17 -07:00
wangyix
184e4b8bde
sestets added to jitter tester
2014-08-12 14:38:28 -07:00
wangyix
406be72f41
per-report stats added to jitter tests
2014-08-12 13:46:55 -07:00
wangyix
4ec84b32b0
updated AudioRingBuffer bytes vs samples returns
2014-08-08 17:00:39 -07:00
ZappoMan
027b1d58cc
Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities
...
Conflicts:
interface/src/Application.h
interface/src/entities/EntityTreeRenderer.h
interface/src/models/ModelTreeRenderer.cpp
libraries/models/src/ModelItem.h
libraries/models/src/ModelTree.h
2014-08-08 14:26:56 -07:00
Stephen Birarda
2fda95ae8f
repair build of various tools
2014-08-08 13:17:54 -07:00
Stephen Birarda
b1310c065c
remove TARGET_NAME from cmake macros where it is not required
2014-08-08 13:17:54 -07:00
Stephen Birarda
27419b7b6b
fix some build blockers in test directory
2014-08-08 13:17:54 -07:00
Stephen Birarda
e4d01d269c
use shared dependency linking macro in hifi projects
2014-08-08 13:17:54 -07:00
Stephen Birarda
26f7b1ba62
add macro to link shared dependencies to target
2014-08-08 13:17:54 -07:00
Stephen Birarda
c9f8433a2d
tweak setup_hifi_library to bubble up full path of Qt modules
2014-08-08 13:17:54 -07:00
Stephen Birarda
1f0a722d0d
remove antequated windows libraries that have been replaced by Qt usage
2014-08-08 13:17:54 -07:00
Stephen Birarda
17df6484d4
remove ssize_t and replace with size_t or int where appropriate
2014-08-08 13:17:53 -07:00
Stephen Birarda
87cf262b9e
get to successful cmake after library link macro changes
2014-08-08 13:17:53 -07:00
ZappoMan
d50a607bc7
started support for new entity base class properties like velocity, gravity, damping, and lifetime
2014-08-08 11:38:03 -07:00
ZappoMan
6f479a1026
convert IDs to UUIDs
2014-08-07 17:02:11 -07:00
wangyix
357ba92181
working towards more dials for InboundAdioStream
2014-08-07 12:41:09 -07:00
Philip Rosedale
d552b7ca97
Merge pull request #3246 from wangyix/inbound_audio_stream
...
Improved SequenceNumberStats handling of out-of-sync seq nums
2014-08-04 14:30:45 -07:00
ZappoMan
3a8c5018ee
Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities
...
Conflicts:
interface/src/Application.h
libraries/entities/src/EntityTreeElement.h
libraries/models/src/ModelItem.cpp
libraries/models/src/ModelItem.h
libraries/models/src/ModelTree.cpp
libraries/models/src/ModelTree.h
libraries/models/src/ModelTreeElement.cpp
libraries/networking/src/PacketHeaders.h
libraries/octree/src/OctreeEditPacketSender.cpp
libraries/octree/src/OctreeEditPacketSender.h
2014-08-04 12:01:23 -07:00
wangyix
d394c203b6
improved re-sync handling of SequenceNumberStats
...
removed "duplicate" category since it's not 100% accurate
2014-08-04 11:09:20 -07:00
Philip Rosedale
69558dc574
Merge pull request #3245 from wangyix/inbound_audio_stream
...
Improved SequenceNumberStats
2014-08-04 07:49:31 -07:00
wangyix
1d74ae8197
code cleanup
2014-08-01 16:49:21 -07:00
wangyix
f9ec7b6c18
redesiged SequenceNumberStats child instance handling
2014-08-01 16:13:52 -07:00
ZappoMan
66d45d3544
tweak format of report
2014-08-01 15:25:03 -07:00
ZappoMan
cb02ac16b6
tweak format of report
2014-08-01 15:23:52 -07:00
ZappoMan
ce46e8b812
tweak format of report
2014-08-01 15:14:43 -07:00
ZappoMan
34ca5ded72
add reporting interval
2014-08-01 15:09:11 -07:00
ZappoMan
60899d2a00
oops
2014-08-01 14:55:14 -07:00
ZappoMan
ca4bca7042
more windows headaches memset instead of bzero
2014-08-01 14:11:24 -07:00
ZappoMan
36f635ed8d
change stats to display difference between gap and expected gap
2014-08-01 14:07:14 -07:00
ZappoMan
8db66e4322
use our ported version of usecTimestampNow cause windows sucks
2014-08-01 13:58:38 -07:00
ZappoMan
48b73e3f0e
windows build
2014-08-01 13:42:37 -07:00
ZappoMan
e0946838f3
windows build
2014-08-01 13:34:01 -07:00
ZappoMan
ad4dd9404d
windows build
2014-08-01 13:26:56 -07:00
ZappoMan
ddfdfc9242
windows build
2014-08-01 13:21:46 -07:00
ZappoMan
8c14f948f2
handle first packet stats better
2014-08-01 13:15:57 -07:00
ZappoMan
8359ebb82f
use c std version of usecTimestampNow()
2014-08-01 13:12:37 -07:00
ZappoMan
68074cb22a
added a simple udp send/receive jitter test tool
2014-08-01 12:59:10 -07:00
wangyix
cdcc6ece04
fixed compile errors caused by SequenceNumberStats changes
2014-08-01 10:34:19 -07:00
ZappoMan
77e1867b11
Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities
...
Conflicts:
assignment-client/src/Agent.cpp
assignment-client/src/Agent.h
examples/editModels.js
interface/src/Application.h
2014-07-31 10:34:23 -07:00
Stephen Birarda
2796f71419
library cleanup to suppress warnings on cmake 3.0
2014-07-30 15:06:15 -07:00
ZappoMan
1eb472c43a
Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities
2014-07-15 10:05:06 -07:00
ZappoMan
2baac96665
Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities
...
Conflicts:
examples/sit.js
interface/src/Application.cpp
libraries/models/src/ModelItem.cpp
libraries/models/src/ModelsScriptingInterface.cpp
2014-07-15 10:04:40 -07:00
Aleric Inglewood
147a4119cb
Fix linker problem
...
This fixes the linker problem:
/usr/bin/ld: error: ../../libraries/shared/libshared.a(StreamUtils.cpp.o): multiple
definition of 'operator<<(std::ostream&, glm::detail::tvec3<float, (glm::precision)0> const&)'
/usr/bin/ld: CMakeFiles/physics-tests.dir/src/PhysicsTestUtil.cpp.o: previous definition here
/usr/bin/ld: error: ../../libraries/shared/libshared.a(StreamUtils.cpp.o): multiple
definition of 'operator<<(std::ostream&, glm::detail::tquat<float, (glm::precision)0> const&)'
/usr/bin/ld: CMakeFiles/physics-tests.dir/src/PhysicsTestUtil.cpp.o: previous definition here
/usr/bin/ld: error: ../../libraries/shared/libshared.a(StreamUtils.cpp.o): multiple
definition of 'operator<<(std::ostream&, glm::detail::tmat4x4<float, (glm::precision)0> const&)'
/usr/bin/ld: CMakeFiles/physics-tests.dir/src/PhysicsTestUtil.cpp.o: previous definition here
collect2: error: ld returned 1 exit status
Note these are the serializers to std::ostream that were already there, not the ones
that I added (which are to QDebug). This bug was already there, I only got these errors
now after adding some debug code.
The reason is obvious: they are already defined in libshared.a (through StreamUtils.cpp).
No need to define them again in ./tests/physics/src/PhysicsTestUtil.cpp
2014-07-13 21:59:45 +02:00
ZappoMan
780532bfd8
more model to entity renaming, adding AABox:clamp() and AACube::clamp() fix AddEntity to support adding an entity that extends over bounds of universe
2014-07-10 13:42:49 -07:00
wangyix
35419eb939
Merge remote-tracking branch 'upstream/master' into quick_audio_PR
2014-07-10 11:56:35 -07:00
wangyix
81e168f657
added RingBufferHistory template class, used it in SentPacketHistory and MovingMinMaxAvg
2014-07-09 15:38:03 -07:00
wangyix
d03d3ef817
new auidostreamstats displayed in interface, domain page stats updated
2014-07-09 11:59:50 -07:00
wangyix
54e8ed5e11
added MovingMinMaxAvg and unit test; added additional stats to AudioStreamStats struct
2014-07-09 09:41:49 -07:00
Andrzej Kapolka
b6570dc4ee
Use congestion control on server.
2014-07-08 15:10:05 -07:00
Andrzej Kapolka
02cf1f006e
Change tests to reflect transmission changes and fixed issue with reprocessing
...
already-handled reliable delta.
2014-07-08 13:41:42 -07:00
ZappoMan
e800d5457b
Merge branch 'master' of https://github.com/worklist/hifi into virtualEntities
2014-07-08 13:02:31 -07:00
Andrzej Kapolka
69e7a17f47
Rather than backing out when we find that the delta is too big, we can just
...
write the whole thing and copy it over (with some mapping fiddlery) if it
turns out to be too big.
2014-07-07 16:07:04 -07:00
ZappoMan
3145d150f3
more work on virtual entities, unit tests passing woot
2014-07-07 12:56:32 -07:00
Andrzej Kapolka
fb64d22171
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-07-07 11:09:17 -07:00
Andrzej Kapolka
e15f003639
Bring reliable delta streaming code over from test.
2014-07-07 11:08:43 -07:00
ZappoMan
29e02f2681
more hacking on virtualizing entities
2014-07-07 09:36:31 -07:00
Andrzej Kapolka
da32c6e89b
Push persistent mappings into reliable delta channel before sending and pull
...
transient mappings out after sending.
2014-07-03 17:29:10 -07:00
ZappoMan
ec0c350f60
Merge branch 'master' of https://github.com/worklist/hifi into virtualEntities
...
Conflicts:
interface/src/Application.cpp
interface/src/DatagramProcessor.cpp
libraries/script-engine/src/ScriptEngine.cpp
2014-07-03 14:20:40 -07:00
Brad Hefta-Gaub
dbdce32b68
Merge pull request #3107 from wangyix/master
...
prune missing sequence numbers before sending NACK; AudioRingBuffer frame length can now be specified;
2014-07-03 13:32:31 -07:00
wangyix
94c0c15c76
fixed more small bugs with AudioRingBuffer constructor
2014-07-03 12:06:18 -07:00
Andrzej Kapolka
38383effcc
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-07-03 11:33:22 -07:00
wangyix
059628c26a
fixed bug in SequenceNumberStats and its unit test; test passes now
2014-07-03 10:37:09 -07:00
ZappoMan
2c5209d1e7
virtual entities checkpoint
2014-07-03 09:07:11 -07:00
Andrew Meadows
356a29c2fb
add AngularConstraint::softClamp() for hands
2014-07-03 08:40:34 -07:00
Andrzej Kapolka
282c62a083
Handle LODs correctly (?) for reliable deltas.
2014-07-02 18:49:40 -07:00
Andrzej Kapolka
154eb04336
Working on sending large deltas as reliable messages.
2014-07-02 17:13:39 -07:00
Andrew Meadows
f5debdb930
merge upstream/master into andrew/bispinor
2014-07-02 11:23:42 -07:00
Andrew Meadows
c3f7d9d155
delete AngularConstraints at end of tests
2014-07-02 11:20:14 -07:00
Andrew Meadows
ed78855eb6
remove warnings about signed/unsigned comparisons
2014-07-02 10:49:37 -07:00
ZappoMan
865566414c
Merge branch 'master' of https://github.com/worklist/hifi into renameModelsToEntities
...
Conflicts:
interface/src/entities/EntityTreeRenderer.cpp
libraries/entities/src/EntityItem.h
libraries/models/src/ModelItem.cpp
libraries/models/src/ModelTree.cpp
libraries/models/src/ModelTreeElement.cpp
libraries/models/src/ModelsScriptingInterface.cpp
tests/octree/CMakeLists.txt
tests/octree/src/ModelTests.cpp
2014-07-01 16:32:47 -07:00
wangyix
a5943e3608
made AudioRingBuffer frames capacity variable
2014-07-01 16:24:31 -07:00
Brad Hefta-Gaub
df51d26625
Merge pull request #3094 from wangyix/seqNumberStats
...
Fixed bugs and improved overflow handling in AudioRingBuffer; Added audio stream stats packets; Added seq numbers and tracking to audio packets;
2014-07-01 10:54:35 -07:00
Andrew Meadows
5934ee5b22
added tests for ConeRollerConstraint
2014-07-01 09:35:47 -07:00
Andrew Meadows
9ca1bfdfe5
add AngularConstraint.* with some unit tests
...
more unit tests to follow
2014-06-30 18:05:22 -07:00
wangyix
f2dfa6b978
fixed warnings
2014-06-30 16:10:58 -07:00
wangyix
c789f3c6b9
merge with upstream
2014-06-30 14:13:34 -07:00
Andrzej Kapolka
73a1e759a4
Include an additional bit with the objects that says whether what follows is
...
a delta. The clients may be retaining references to the objects, so we can't
rely on their having been deleted.
2014-06-30 12:35:34 -07:00
Andrzej Kapolka
b623276fde
Increase the LOD threshold for now to get around spanner issue.
2014-06-27 17:39:51 -07:00
Andrzej Kapolka
f2bdacd5a8
Fix for shared object reference tracking.
2014-06-27 16:19:18 -07:00
wangyix
0ae58bd7f9
added senderUUID arg to seq stats
2014-06-27 15:39:11 -07:00
Andrzej Kapolka
d4470c04d6
Modify tests to use Endpoint base class.
2014-06-27 12:34:56 -07:00
ZappoMan
c4fe36b13d
more Models->Entities renaming
2014-06-26 17:01:07 -07:00
ZappoMan
ccc9eabd33
first cut at renaming Models to Entities
2014-06-26 16:39:52 -07:00
Andrzej Kapolka
4b2d122f3d
Working on factoring out the common metavoxel endpoint/client code.
2014-06-26 16:12:11 -07:00
wangyix
2ec04fb756
replaced old seqnum tracking code with SequenceNumberStats
2014-06-25 17:20:57 -07:00
Andrzej Kapolka
5effcd24ff
Only increase/decrease rate when we want to send more/have sent more than the
...
minimum, respectively.
2014-06-25 16:56:02 -07:00
ZappoMan
5d4ce73499
added deleteModels() unit test
2014-06-25 16:46:20 -07:00
wangyix
b220b092f4
added SequenceNumberStats and unit test
2014-06-25 16:35:08 -07:00
Andrzej Kapolka
705445ce62
Basic congestion control using TCP-esque strategy.
2014-06-25 15:48:46 -07:00
ZappoMan
bf0171700a
tweaks to unit tests
2014-06-25 15:35:52 -07:00
ZappoMan
154f203541
add deleteModel unit test
2014-06-25 15:08:08 -07:00
ZappoMan
34fad16dcf
tweaks
2014-06-25 14:12:03 -07:00
ZappoMan
311d8154bd
added bestFit support for testing add
2014-06-25 14:06:28 -07:00
ZappoMan
0f18e4971c
added more debug
2014-06-25 12:03:40 -07:00
Andrzej Kapolka
8999fcef17
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-06-25 11:42:55 -07:00
ZappoMan
142fc02ec5
octree tests tweaks
...
Conflicts:
tests/octree/src/ModelTests.cpp
tests/octree/src/main.cpp
2014-06-25 11:38:18 -07:00
ZappoMan
9e0f010edd
seed random generator to make tests reproducable
2014-06-25 11:14:15 -07:00
ZappoMan
47c0e2266f
added more timing details to model tests
...
Conflicts:
tests/octree/src/ModelTests.cpp
2014-06-25 11:09:41 -07:00
ZappoMan
a7f2d150a4
what's this cmake defines ssize_t???
2014-06-24 20:15:34 -07:00
ZappoMan
fd3916e662
another hack attempt to fix unit tests on windows
2014-06-24 20:10:06 -07:00
ZappoMan
1001ea5f87
fixed some windows warnings
2014-06-24 20:07:47 -07:00
Andrzej Kapolka
e7db355c95
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-06-24 19:11:43 -07:00
Andrzej Kapolka
65e50f32e4
Tests, fixes for SpanList.
2014-06-24 19:10:52 -07:00
ZappoMan
fdb0cf9386
change order of headers
2014-06-24 18:53:20 -07:00
ZappoMan
773e1b0522
try to get tests to build
2014-06-24 18:02:35 -07:00
wangyix
d098edcdf0
Merge remote-tracking branch 'upstream/master'
2014-06-24 17:39:13 -07:00
ZappoMan
3da18ec1c0
try to disable model tests
2014-06-24 17:23:09 -07:00
wangyix
52f00769d4
merged with upstream
2014-06-24 17:22:30 -07:00
wangyix
5fd1d0a87c
added AudioRingBuffer unit test
...
fixed bug with _endOfLastWrite not rolling over in addSilentFrame
2014-06-24 16:51:51 -07:00
ZappoMan
8a1a19b91b
added some more tests
2014-06-24 16:20:04 -07:00
ZappoMan
a019b70e58
Merge branch 'master' of https://github.com/worklist/hifi into experimentalStoreModel
...
Conflicts:
tests/octree/CMakeLists.txt
tests/octree/src/ModelTests.cpp
tests/octree/src/main.cpp
2014-06-24 15:59:17 -07:00
Brad Hefta-Gaub
6d77d438ab
Merge pull request #3057 from AndrewMeadows/ragdoll
...
Ragdoll Part3: avatar shapes self collide (but don't yet affect the joint positions of MyAvatar)
2014-06-24 15:47:18 -07:00
ZappoMan
52b61ebab8
added addModel() performance test
2014-06-23 14:48:12 -07:00
ZappoMan
d42ec973d2
added some performance tests
...
Conflicts:
tests/octree/CMakeLists.txt
tests/octree/src/ModelTests.cpp
tests/octree/src/ModelTests.h
tests/octree/src/main.cpp
2014-06-23 14:21:06 -07:00
ZappoMan
48e779cf8e
added some performance tests
2014-06-23 14:08:47 -07:00
Andrzej Kapolka
e72429171f
Working on congestion tests.
2014-06-23 12:01:49 -07:00
Andrew Meadows
5e4d757e4e
merge upstream/master into andrew/ragdoll
2014-06-23 10:43:40 -07:00
Andrzej Kapolka
626bd42b7b
Use randomColorValue, since we have it.
2014-06-20 18:22:36 -07:00
Andrzej Kapolka
de0c45a919
Spanner mutation in test.
2014-06-20 18:09:51 -07:00
Andrew Meadows
c17b8fdb60
collisions update shapes
...
VerletShapes keep pointers to VerletPoints (rather than to glm::vec3's)
VerletShapes compute lagrangian coefficients
VerletShapes send their movement accumulations to their VerletPoints
2014-06-20 16:31:39 -07:00
Andrzej Kapolka
ce778f47b1
More work on stream testing, fixed bug with differently-ordered edits.
2014-06-20 14:08:39 -07:00
Andrzej Kapolka
24f535e02d
Working on metavoxel streaming tests.
2014-06-19 18:15:17 -07:00
Andrzej Kapolka
7a9c0f0e6a
Working on tests for metavoxel streaming.
2014-06-19 14:50:19 -07:00
ZappoMan
fd966b49b2
added some unit tests for ModelTree
2014-06-19 10:41:00 -07:00
ZappoMan
618f538be5
mostly working, but some blinking when setting glow
2014-06-19 10:40:38 -07:00
Andrew Meadows
c98631f820
merge upstream/master into andrew/ragdoll
2014-06-18 17:23:24 -07:00
ZappoMan
c54bdb3e8d
Merge branch 'master' of https://github.com/worklist/hifi into experimentalStoreModel
2014-06-18 15:20:08 -07:00
Andrew Meadows
715cc3467d
forgot to add the test files
2014-06-18 14:47:39 -07:00
Andrew Meadows
96eebec0fc
unit tests for VerletShapes
2014-06-18 14:06:00 -07:00
Andrzej Kapolka
26159a05d9
Fix for sporadic test failure due to hash ordering.
2014-06-18 13:09:45 -07:00
Andrew Meadows
9e839f0980
Shape::getCenter() -> Shape::getTranslation()
2014-06-18 08:55:48 -07:00
ZappoMan
5a246fab26
Merge branch 'master' of https://github.com/worklist/hifi into experimentalStoreModel
...
Conflicts:
tests/octree/src/main.cpp
2014-06-17 17:45:06 -07:00
Andrzej Kapolka
9ded9b0696
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-06-17 17:07:38 -07:00
Andrzej Kapolka
758beff3d9
Make sure to use same enum streamer for the ones registered by type and the
...
ones registered by scope/name.
2014-06-17 17:06:28 -07:00
Andrew Meadows
b9d4545aef
merge upstream/master into andrew/ragdoll
...
Conflicts:
libraries/shared/src/Shape.h
libraries/shared/src/ShapeCollider.h
2014-06-17 17:03:16 -07:00
Brad Hefta-Gaub
41b3e3e4ea
Merge pull request #3023 from ey6es/metavoxels
...
Refactored type/object streaming, added support for reading into/writing from "generic" containers that don't require the original classes/types.
2014-06-17 16:24:22 -07:00
Brad Hefta-Gaub
6fc05d66c8
Merge pull request #3030 from AndrewMeadows/inertia
...
raycasts against Shapes
2014-06-17 16:10:36 -07:00
ZappoMan
4413049302
fixed a bug in inside out ray casting returning the wrong face
2014-06-17 13:05:35 -07:00
Andrew Meadows
f18864bd72
Moved findRayIntersection() to the Shape classes
2014-06-17 12:36:36 -07:00
Andrzej Kapolka
7931173671
Working on tools to convert bitstreams to/from json.
2014-06-17 12:33:31 -07:00
Andrew Meadows
018ba52b1c
merge upstream/master with andrew/inertia
2014-06-17 10:50:49 -07:00
Andrew Meadows
fa6aed3e01
Add unit tests for ray intersections with shapes.
2014-06-17 10:49:53 -07:00
Andrzej Kapolka
37c977af02
Tests working for reading JSON.
2014-06-16 19:12:21 -07:00
Andrew Meadows
92159a7ed5
Shape::get/setCenter() instead of get/setPosition()
2014-06-16 08:43:27 -07:00
Andrzej Kapolka
aac7459f42
More work on JSON encoding.
2014-06-13 18:32:57 -07:00
Andrzej Kapolka
9fc84d6358
Generics up and running.
2014-06-13 12:00:42 -07:00
ZappoMan
2e5e6e3f61
get model props spanning multiple packets
2014-06-12 13:03:37 -07:00
ZappoMan
2db897a00e
Merge branch 'master' of https://github.com/worklist/hifi into octreeWireformatImprovements
2014-06-11 14:40:25 -07:00
Andrzej Kapolka
d1549b00ab
Might as well include strings in the "simple" random script objects.
2014-06-09 17:22:44 -07:00
Andrzej Kapolka
3293ab788b
Fix for script object deltas.
2014-06-09 17:19:36 -07:00
Andrzej Kapolka
590f045ed1
Script value streaming tests, fixes.
2014-06-09 16:51:41 -07:00
ZappoMan
c5647addf4
Merge branch 'master' of https://github.com/worklist/hifi into octreeWireformatImprovements
2014-06-09 14:10:47 -07:00
ZappoMan
89e24c4f21
add unit tests from new ModelItem serialization
2014-06-09 12:55:55 -07:00
ZappoMan
49a9f2046a
more unit tests
2014-06-09 11:29:17 -07:00
ZappoMan
493ad6ae9e
added test pass/fail counting to octree unit tests
2014-06-09 10:41:43 -07:00
ZappoMan
f3dd34ae54
tweak
2014-06-09 08:03:31 -07:00
Andrzej Kapolka
361461516c
Check the delta-encoded objects, report bytes sent/received.
2014-06-06 14:26:20 -07:00
Andrzej Kapolka
56d9bc5215
Working on delta-streaming tests.
2014-06-06 11:37:45 -07:00
Andrzej Kapolka
0fc6354b6c
Fix for streaming the same object.
2014-06-06 11:18:55 -07:00
Andrzej Kapolka
c333fb904f
Working on tests for delta streaming.
2014-06-05 16:45:13 -07:00
ZappoMan
76731be8c0
added some extra libraries
2014-06-05 16:01:11 -07:00
Andrzej Kapolka
c44dba78cb
Provide a reasonably painless way to stream enums that aren't object
...
properties.
2014-06-05 15:32:55 -07:00
ZappoMan
9d1106885d
added tests for ByteCountCoding
2014-06-05 12:52:18 -07:00
Philip Rosedale
3cc67f5229
Merge pull request #2984 from ZappoMan/octreeWireformatImprovements
...
Octree wireformat improvements checkpoint
2014-06-04 21:58:08 -07:00
Philip Rosedale
b59b26d87b
Merge pull request #2985 from ey6es/metavoxels
...
Pulled in fixes for delta-encoding from "deltatars," added support for version-resilient streaming of Qt enums/flags.
2014-06-04 21:23:46 -07:00
Andrzej Kapolka
54a5bc3a49
More enum stuff, with tests.
2014-06-04 17:24:43 -07:00
wangyix
124bd88b01
added tests for MovingPercentile
2014-06-04 17:23:44 -07:00
ZappoMan
b74676de0d
add more tests for decode
2014-06-04 15:33:22 -07:00
ZappoMan
2066dbcec7
cleanup
2014-06-04 15:16:51 -07:00
ZappoMan
10f7eae7a0
implemented decode
2014-06-04 14:56:13 -07:00
ZappoMan
78d3f1454c
more operators
2014-06-04 14:19:35 -07:00
ZappoMan
2b85145325
added test suite for PropertyFlags, latest work on PropertyFlags
2014-06-04 11:41:09 -07:00
Andrzej Kapolka
90e2145fc4
Working on enum streaming.
2014-06-03 17:17:02 -07:00
Andrzej Kapolka
ac7d23bf54
Working on support for streaming Qt enums/flags.
2014-06-02 19:00:48 -07:00
Andrew Meadows
1d64262067
whoops, committed wrong file. Rolling back.
2014-05-05 08:46:35 -07:00
Andrew Meadows
6cc8d53a6d
fix sphere-cube collisions at edges
2014-05-04 22:14:05 -07:00
Andrew Meadows
c8e56a97cc
fix sphere-cube collisions, with tests
2014-05-02 21:47:27 -07:00
Andrew Meadows
fe42f66cc9
change x.f to be x.0f as per the coding standard
2014-04-23 13:27:43 -07:00
Andrew Meadows
7cb6856415
Adding some collision tests for sphere-vs-AACube
2014-04-22 10:44:41 -07:00
Andrew Meadows
22d2f84cff
merge upstream/master into andrew/scripting
2014-04-09 15:38:56 -07:00
Andrew Meadows
635f832dfe
rename shapeShape() to be collideShapes()
...
Also add collideShapesCoarse()
2014-04-09 13:04:17 -07:00
Stephen Birarda
ae4b8348a2
fix header include guards via regex
2014-04-09 12:03:17 -07:00
Stephen Birarda
c9b58c0ee9
fix headers in h files in tests, fix Andrew's dates
2014-04-09 09:49:47 -07:00
Stephen Birarda
cb402e3eb3
run apache header script on tests
2014-04-09 09:46:43 -07:00
Andrzej Kapolka
cc5ea2a465
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-03-28 11:19:58 -07:00
Andrew Meadows
c383b69b61
merge upstream/master into enforce-standard
...
Conflicts:
interface/src/avatar/Hand.cpp
2014-03-27 10:53:54 -07:00
Andrzej Kapolka
7f3977578e
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-03-26 18:30:06 -07:00
Andrew Meadows
4c64c11144
making some type casts abide by coding standard
2014-03-26 16:58:47 -07:00
Andrew Meadows
06fbd49ffa
Adding StreamUtils for common debug output
2014-03-25 15:29:22 -07:00
Andrzej Kapolka
d569802fbc
More metadata fixes.
2014-03-17 17:21:46 -07:00
Andrzej Kapolka
eb95b01aa1
Fixes to, test for metadata streaming.
2014-03-17 16:10:30 -07:00
Andrzej Kapolka
b21247ca67
Optional hash/full metadata streaming for QObjects.
2014-03-16 17:29:30 -07:00
Andrew Meadows
ab84526a1b
removing compile warnings
2014-03-14 16:12:32 -07:00
Andrzej Kapolka
e249b29b45
Merge pull request #2268 from AndrewMeadows/radians
...
prefer radians over degrees
2014-03-12 12:10:29 -07:00
Andrew Meadows
aa8c2fc8cb
use radians instead of degrees (almost) everywhere
2014-03-11 17:26:58 -07:00
Andrzej Kapolka
3b63424abd
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-03-10 12:27:07 -07:00
ZappoMan
1ceb05bf09
click harder
2014-03-08 18:22:30 -08:00
Andrzej Kapolka
0448596e58
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
...
Conflicts:
interface/src/renderer/FBXReader.cpp
2014-03-05 18:28:25 -08:00
Philip Rosedale
c2a63c4206
Merge pull request #2190 from AndrewMeadows/shapes
...
Collision Shapes
2014-03-05 17:59:42 -08:00
Andrzej Kapolka
d1747ed8d1
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-03-05 17:12:37 -08:00
Stephen Birarda
231dc624ff
replace deprecated qt5 macros in cmake with target_link_libraries
2014-03-04 12:41:24 -08:00
Andrew Meadows
d537b4118d
Merge branch 'master' of ssh://github.com/highfidelity/hifi into shapes
2014-03-04 11:40:59 -08:00
Andrzej Kapolka
cbfc60d017
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-03-04 11:18:54 -08:00
Andrew Meadows
ea0bc52e12
removing unused variables
2014-03-04 09:56:06 -08:00
Andrew Meadows
7ba5bc71ea
Merge branch 'master' of ssh://github.com/highfidelity/hifi into shapes
...
Conflicts:
interface/src/renderer/FBXReader.cpp
interface/src/renderer/Model.cpp
interface/src/renderer/Model.h
2014-03-04 09:01:24 -08:00
Stephen Birarda
628f91cd73
complete quoting of varous Cmake commands, closes #1999
2014-03-03 12:15:05 -08:00
Andrzej Kapolka
949e40a10e
Revert complicated system of "soft" pointers, instead use hard references in
...
write mappings and listen for object destruction.
2014-03-03 11:44:45 -08:00
Andrzej Kapolka
55dca45feb
Working on tests for shared objects.
2014-03-03 10:20:50 -08:00
Andrew Meadows
da0276ac7e
ShapeCollider takes CollisionList argument
...
Also, adding first pass at ListShape
2014-02-26 12:10:16 -08:00
Andrew Meadows
f0e1a6ccd3
more capsuleCapsule tests
2014-02-25 11:38:08 -08:00
Andrew Meadows
9a70a50bdb
capsuleCapsule() collision with preliminary tests
2014-02-25 10:59:12 -08:00
Andrew Meadows
8a3640f016
Adding CapsuleSphere collisions with tests.
2014-02-24 11:38:27 -08:00
Andrew Meadows
0e28e0947c
Adding ShapeColliderTests.*
2014-02-22 13:20:47 -08:00
Andrew Meadows
072369abfe
Adding physics test framework
2014-02-21 16:27:44 -08:00
Andrzej Kapolka
bb56e2847f
Global edits, edits use virtual function.
2014-02-12 20:00:07 -08:00
Andrzej Kapolka
f9b0ff0608
Various bits of streaming work: send delete messages for main channel on
...
reliable channel, test messages on main channel.
2014-02-12 12:33:40 -08:00
Andrzej Kapolka
36f1e59201
Working on support for sending messages through reliable channels.
2014-02-10 20:26:09 -08:00
Andrew Meadows
c8bb539a0c
Theoretical fix for windows build of tests/metavoxels
2014-02-10 16:24:10 -08:00
Andrzej Kapolka
e9579feef5
Reordering testing.
2014-02-10 00:41:15 -08:00
Andrzej Kapolka
ee2984ce6d
Streaming fixes.
2014-02-09 23:38:33 -08:00
Andrzej Kapolka
f81a9d9fe8
Circular buffer work.
2014-02-09 22:29:23 -08:00
Andrzej Kapolka
8c9f06ceec
Fix/tests for streaming.
2014-02-09 17:43:18 -08:00
Andrzej Kapolka
524ceb4ed2
Working on tests for datagram sequencing, added autogenerated ==/!= operators
...
to mtc.
2014-02-09 16:26:53 -08:00
