Andrew Meadows
7642e9fd1e
remove cmake warning about untestable CPP file
...
also: fix some broken unit tests
2016-10-05 13:06:36 -07:00
Brad Davis
f3f55c9857
Fixing render-perf
2016-10-02 11:44:35 -07:00
Brad Davis
488d191428
Remove all oglplus usage and references
2016-10-02 11:44:34 -07:00
samcake
9b94a025fc
Refining the voxelization of the sphere in the view frustum grid
2016-09-26 18:41:53 -07:00
Brad Davis
2dd93e0586
Disable debug command list
2016-09-23 12:05:14 -07:00
Brad Davis
2886c51a29
Fixing use of widgets in test app
2016-09-23 12:05:08 -07:00
Brad Davis
2de7f62b95
Fixing loop logic
2016-09-23 12:05:07 -07:00
Brad Davis
5dbaa671ca
Add some more debugging in render perf test
2016-09-23 12:05:03 -07:00
Brad Davis
2a058fa419
Add file logging to perf tool
2016-09-23 12:04:59 -07:00
Brad Davis
f33d3a3b36
Migrate logging functionality to shared library
2016-09-23 12:04:58 -07:00
Brad Davis
0953027ef3
Identify pre-generated textures
2016-09-23 12:04:56 -07:00
Brad Davis
fa23fa7b2d
Working on cubemap mip bug
2016-09-23 12:04:55 -07:00
Brad Davis
2b5ed86a62
Fixing warnings
2016-09-23 12:04:45 -07:00
Brad Davis
93b0364f73
Working on sparse stability
2016-09-23 12:04:43 -07:00
Brad Davis
a7f0ba24ed
Dynamic texture memory management
2016-09-23 12:04:42 -07:00
samcake
3bcea4310d
Fixing the vizualisation shader for world to cluster space
2016-09-10 10:41:18 -07:00
samcake
108910052a
Adding the reverse transformation
2016-09-09 19:00:54 -07:00
Brad Davis
ecfe56085d
GLM update and GLI integration
2016-09-09 10:18:15 -07:00
Brad Hefta-Gaub
b56ad737d4
Merge pull request #8567 from hyperlogic/feature/tablet-ui-foundation
...
Web Entities Virtual Keyboard + Event Bridge support
2016-09-08 18:36:46 -07:00
Brad Hefta-Gaub
3d54600843
Merge pull request #8513 from Atlante45/feat/network-port
...
Add settings to change local port
2016-09-08 18:10:32 -07:00
samcake
139ba1b71c
REnaming the shaders correctly
2016-09-07 14:56:01 -07:00
Anthony J. Thibault
dc0d0c2d5c
Merge branch 'master' into feature/tablet-ui-foundation
2016-09-07 09:49:55 -07:00
sam
248f172832
Merge branch 'master' of https://github.com/highfidelity/hifi into hdr
2016-09-06 23:37:16 -07:00
SamGondelman
9d447d4dcc
enabled qnetworkrequest redirects everywhere I could find them
2016-09-06 17:35:06 -07:00
Atlante45
eb007b24cd
Use invalid port to signal no value passed
2016-09-06 11:59:07 -07:00
samcake
92a9037b07
Merge branch 'master' of https://github.com/highfidelity/hifi into hdr
2016-09-06 09:20:25 -07:00
Brad Davis
13a4671705
Texture load profiling test
2016-09-02 17:45:26 -07:00
Anthony J. Thibault
9122a33fff
only raise the webEntity virtual keyboard in HMD mode
2016-09-02 16:53:40 -07:00
samcake
560163bb75
removing a warning
2016-09-02 10:51:19 -07:00
samcake
354cbbc927
Investigate why the disable depth Bclamp doesn't work
2016-08-31 19:14:35 -07:00
Brad Davis
179e3565ef
More render-perf tweaks
2016-08-29 11:22:56 -07:00
Brad Davis
617633b85c
Moving to custom context creation
2016-08-29 11:21:54 -07:00
Brad Davis
0213dd0359
Don't bottleneck the render-perf tool on new frame creation
2016-08-26 19:08:50 -07:00
Andrew Meadows
cbacb02010
more unit tests for CollisionRenderMeshCache
2016-08-24 22:25:45 -07:00
Andrew Meadows
0d84e6ece5
first CollisionRenderMeshCache unit test
2016-08-24 22:25:45 -07:00
Andrew Meadows
c1216cbcaf
stubbery for CollisionRenderMeshCacheTests
2016-08-24 22:25:45 -07:00
Andrew Meadows
e473edff4a
fix shapeManagerTests
2016-08-24 22:25:45 -07:00
Zach Pomerantz
8c559bc65d
use lights from nontextured skyboxes
2016-08-16 13:27:22 -07:00
Brad Davis
0c990c621d
Fix perf tool build
2016-08-12 22:29:01 -07:00
Brad Davis
f9d522a1ae
Re-remove web from render-perf tool, add frame timing stats
2016-08-12 22:28:55 -07:00
Brad Davis
d548da02d9
Expose whether nsight is running to the app, disable some stuff under nsight
2016-08-12 22:28:50 -07:00
Brad Davis
4795ddd014
Perf test improvments (skybox support)
2016-08-12 22:28:49 -07:00
Bradley Austin Davis
d2fd7f88fd
Enabling OSX Oculus plugin
2016-08-12 22:28:43 -07:00
Brad Davis
c2509e9492
Working on draw crash bug, adding render thread trash handling
2016-08-12 22:28:27 -07:00
Brad Davis
adcfd55cc0
Batch replay reprojection
2016-08-12 22:28:23 -07:00
Bradley Austin Davis
274321de8a
First pass at threaded rendering
2016-08-12 22:18:36 -07:00
SamGondelman
9b27f8bc0f
Merge remote-tracking branch 'upstream/master' into loadingFade
2016-08-09 14:55:14 -07:00
Ryan Huffman
6854f9fda4
Remove stars shaders and renderable
2016-08-08 16:03:03 -07:00
SamGondelman
2eb0c7735f
working on fading shape entities
2016-08-03 13:30:05 -07:00
Bradley Austin Davis
5bbcbbb811
Update render perf tool to use the new API
2016-07-26 17:06:44 -07:00
Brad Hefta-Gaub
43064807d1
Merge pull request #8292 from jherico/webui
...
Fix some UI elements triggered by WebViews
2016-07-23 13:47:04 -07:00
Brad Davis
4cbf804dd4
More work on perf testing
2016-07-21 22:32:13 -07:00
Brad Davis
faba1a4b4e
Fix UI elements triggered by WebViews
2016-07-21 15:13:07 -07:00
samcake
744474982d
Merge branch 'master' of https://github.com/highfidelity/hifi into skin
2016-07-17 13:28:03 -07:00
Brad Hefta-Gaub
72739cb6d9
Merge pull request #8228 from jherico/render-perf-updates
...
More render performace testing work
2016-07-15 12:50:38 -07:00
samcake
219b41e813
Fix the mini mirror perf issue and improve the debugDeferredLighting script
2016-07-13 17:37:35 -07:00
samcake
8acc18ae8b
Merge branch 'master' of https://github.com/highfidelity/hifi into skin
2016-07-13 11:42:07 -07:00
samcake
9f91dd5bfc
Cleaning the gpu-test app to work with the new deferred pipeline
2016-07-13 10:19:42 -07:00
Brad Davis
6336362d40
Fixing decoration inflation
2016-07-12 17:23:13 -07:00
Brad Davis
f2220288fb
Expand frame decoration when mouse is over a window in HMD mode
2016-07-12 16:40:53 -07:00
Brad Davis
029251f293
More render performace testing work
2016-07-12 11:51:58 -07:00
samcake
5d4b55eeea
Merge branch 'master' of https://github.com/highfidelity/hifi into skin
2016-07-12 09:19:28 -07:00
samcake
ba7590712a
BRinging the intermediate render textures in the pipeline as varyings and not throug the singletonn anymore
2016-07-11 18:33:57 -07:00
Brad Hefta-Gaub
bcee128de0
Merge pull request #6959 from Triplelexx/20769
...
CR for Job #20769 - Touchscreen camera input for Interface
2016-07-11 14:24:52 -07:00
samcake
ed67fe4051
Merge branch 'master' of https://github.com/highfidelity/hifi into skin
2016-07-08 09:04:40 -07:00
Brad Davis
dfdc1ca1c6
Ensuring render thread is highest priority
2016-07-07 11:14:56 -07:00
Brad Davis
5be238db08
Suppressing glew link warnings
2016-07-07 11:10:59 -07:00
Brad Davis
09f2a10613
Add rendering performance tool
2016-07-07 11:10:58 -07:00
samcake
7f6c441b22
COmpiling the test
2016-07-01 15:05:52 -07:00
samcake
ab98614dd4
Fixing the basic to compile the TestWindow
2016-07-01 14:39:32 -07:00
samcake
b37df393e2
Merging with the new GL45Backend
2016-06-29 10:40:28 -07:00
Brad Davis
b16812aa4d
Adding GL 4.5 backend
2016-06-28 18:55:24 -07:00
samcake
ec68eba3cb
Merge branch 'master' of https://github.com/highfidelity/hifi into skin
2016-06-24 09:37:52 -07:00
Triplelexx
90cd335bda
missed a brace
2016-06-24 10:48:25 +01:00
Triplelexx
fd4d9761ce
merge master and resolve conflicts
...
* remove use of jointsCaptured flag in inputDevice update, TouchscreenDevice now locks the userInputMapper * resolve conflict in Application.cpp, userInputMapper no longer loads default mapping
2016-06-24 03:34:39 +01:00
Brad Hefta-Gaub
da74114b32
Merge pull request #8070 from AndrewMeadows/triangle-soup-4
...
support btBvhTriangleMeshShape for static mesh entities
2016-06-23 12:17:32 -07:00
samcake
90e5697940
Merge branch 'master' of https://github.com/highfidelity/hifi into skin
2016-06-22 09:06:47 -07:00
howard-stearns
8421931c56
Merge branch 'master' of https://github.com/highfidelity/hifi into vive-ui
2016-06-21 14:47:45 -07:00
Brad Hefta-Gaub
c322317878
rework plugins to not depend on PluginContainer unless they want to
2016-06-21 12:07:05 -07:00
samcake
0c882832bf
Bringing the Scattering type to the pixels and having a different shading during the lighting pass (for global right now)
2016-06-20 17:58:35 -07:00
Andrew Meadows
d64729372a
ShapeInfo name changes
2016-06-20 17:29:20 -07:00
Brad Davis
37e9f66639
Additional toolbar work
2016-06-20 15:41:21 -07:00
samcake
37a6d29406
Finally clean the lighting pass for global and local lights, split it into global and locals and make it work with the stereo single drawcall
2016-06-17 17:19:49 -07:00
Bradley Austin Davis
ec615caa80
Support toolbar API
2016-06-17 13:06:42 -07:00
Brad Davis
b9ee0c087e
Add a constant hud toggle button to the UI
2016-06-07 13:45:23 -07:00
Brad Davis
4e49f3f942
Fix browser and update dialogs
2016-06-02 19:54:25 -07:00
Brad Davis
8c13ff4ee1
Pinned UI support
2016-06-02 17:24:25 -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
David Rowe
b9aa667c55
Fix QML test environment
2016-05-25 10:37:30 +12:00
Brad Hefta-Gaub
b8b39b962d
Merge pull request #7868 from jherico/entity_shape
...
Add a generic shape primitive
2016-05-24 08:40:58 -07:00
Brad Hefta-Gaub
49ded9c4df
Merge pull request #7873 from ctrlaltdavid/20917
...
restyle file browser
2016-05-24 08:40:38 -07:00
David Rowe
504516b627
Merge branch 'master' into 20917
2016-05-24 08:03:54 +12:00
Anthony J. Thibault
a1c32f8c44
Merge branch 'master' into tony/improved-avatar-mixer-precision
2016-05-23 10:24:52 -07:00
Brad Davis
2c703e963c
More shapes
2016-05-22 19:48:59 -07:00
Brad Davis
cd1e910844
Add a generic shape primitive
2016-05-21 23:46:44 -07:00
Seth Alves
40e862cf9e
quiet gcc 5 warnings
2016-05-21 16:53:01 -07:00
Brad Davis
07562f72af
Doing a pass over the input plugins and controller code
2016-05-20 14:50:23 -07:00
David Rowe
17b3101ca5
Merge branch 'master' into 20917
2016-05-20 18:50:01 +12:00
Atlante45
8be6bc6460
Add missing overrides
2016-05-19 22:00:22 -07:00
Anthony J. Thibault
818d1f4601
Added six byte quaternion compression routines & tests
2016-05-16 17:48:54 -07:00
Brad Davis
5ba8372c21
Moving GL backend out of GPU
2016-05-16 12:54:17 -07:00
David Rowe
88130ee5c8
Merge branch 'master' into 20917
2016-05-14 12:13:39 +12:00
Brad Davis
85272a87ba
Merge pull request #7859 from samcake/lemon
...
Introduce the "Unlit" shading model support and apply it to Web Enitities
2016-05-12 15:09:50 -07:00
David Rowe
8f214a6b14
Merge branch 'master' into 99997
2016-05-12 17:50:34 +12:00
Brad Hefta-Gaub
d656f61c64
Merge pull request #7759 from jherico/app_plugin_type
...
Don't expose raw pointer to the display plugin
2016-05-11 14:49:22 -07:00
samcake
1ec9ef560e
Fixing the srgb color format conversion for web entities
2016-05-11 10:46:54 -07:00
David Rowe
b8c0ec86af
Hide file filter if only 1 file type
2016-05-10 15:09:13 +12:00
David Rowe
6e59abc8f6
Switch file selection dialog over to using UI Toolkit files
2016-05-10 12:13:46 +12:00
Brad Davis
c54d0bc993
Don't expose raw pointer to the display plugin
2016-05-08 10:35:31 -07:00
Atlante45
df2683d989
Fix compile error
2016-05-05 16:09:45 -07:00
Anthony J. Thibault
d9063b199e
GeometryUtils: coneSphereAngle test
2016-04-26 13:31:06 -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
David Rowe
a7b82e8cae
Decouple ui and shared libraries
2016-04-22 12:58:47 +12:00
Brad Davis
6c30194916
Support lowering the minimum mip of a texture at runtime
2016-04-21 14:46:12 -07:00
Brad Davis
b50f835d35
Warning and error fixes
2016-04-17 10:22:26 -07:00
Brad Davis
75c99fe416
Working on GPU library test code
2016-04-17 10:20:01 -07:00
Atlante45
afdfef1482
Make sure we don't use raw resource ptr
2016-04-12 13:51:11 -07:00
Zach Pomerantz
be489e8728
Codify qt qml version in one header
2016-04-07 17:35:31 -07:00
Triplelexx
11af0a421b
Merge branch 'master' into 20769
2016-04-03 22:57:55 +01:00
David Rowe
2ac9f282c7
Merge branch 'master' into 20855
2016-03-31 17:00:09 +13:00
Anthony J. Thibault
f4d834b07b
OctreeTests: added unit tests for EntityTreeElement child accessors
2016-03-30 16:15:29 -07:00
David Rowe
510d167c87
Merge branch 'master' into 20855
2016-03-31 08:43:35 +13:00
Anthony J. Thibault
c671fe7966
Updated AABox tests
2016-03-26 13:36:56 -07:00
Anthony J. Thibault
b4e70d9101
WIP: checkpoint
...
* bug fix in AABox::operator+=
* added AABox::emiggen
* Avatar now has a default bound for it's skinned mesh.
* WIP: AABox tests; NEED MORE
* Model: split collision and model mesh render items.
Because ModelMeshRenderItems need special handling to update bounds for animated joints.
* Model: dynamically update the bound for rigidly bound animated meshes
* Rig: added access to geometryToRigTransform
* RenderableModelEntityItem: try to update bounds for skinned mesh to be the entity dimentions (this doesn't seem to be working)
* Geometry.cpp: removed unused bounds parameter in evalPartBounds
* ModelMeshPartPayload: bounds updating
* non-animated: use existing _localBound
* rigid bound mesh: use _localBound transformed by clusterMatrix joint transform
* fully skinned mesh: use _skinnedMeshBound provided by the application.
2016-03-25 21:29:20 -07:00
David Rowe
9280443425
Merge branch 'master' into 20855
2016-03-25 09:06:20 +13:00
Andrew Meadows
ecfe198e35
patch btCompoundShape memory leak
2016-03-23 14:39:49 -07:00
Andrew Meadows
119ef24d5d
cleanup ShapeManager API and fix bitrot in tests
2016-03-23 14:39:49 -07:00
Andrew Meadows
a52ac3cc50
remove excess whitespace
2016-03-23 14:39:49 -07:00
David Rowe
42b606c09d
Merge branch 'master' into 20855
2016-03-22 18:51:07 +13:00
Anthony J. Thibault
df5afffc77
AnimUtil: prevent accumulateTime from looping forever
...
This might happen with large dts, large timeScales.
2016-03-21 11:58:13 -07:00
David Rowe
3fa678a652
Style tabs and background
2016-03-19 14:52:40 +13:00
Bradley Austin Davis
7045680bc7
Reduce crashes on switching display plugins
2016-03-17 10:13:52 -07:00
Andrew Meadows
71a81331d1
unit tests for dynamic twist limit adjustment
2016-03-11 14:47:48 -08:00
Andrew Meadows
749dcf2c1d
dynamic adjustment for swing
2016-03-11 14:47:47 -08:00
Andrew Meadows
df9ccf76ab
fix animation-tests
2016-03-11 14:47:47 -08:00
Zach Pomerantz
755efd1840
Update test shaders
2016-03-10 23:03:03 -08:00
Stephen Birarda
a9dd88d834
Merge pull request #7320 from zzmp/feat/shader-includes
...
Compile shaders into separate dir for inclusion
2016-03-10 21:07:49 -08:00
Zach Pomerantz
11867aa71d
Compile shaders to their own folders
2016-03-10 20:10:54 -08:00
Anthony J. Thibault
4a78300607
MyAvatar: Allow user to raise hands directly overhead.
...
Previously we were using a infinitely tall vertical cylinder
to push hand IK targets out of the body, this had the
side-effect of preventing the hands from being raised over
the head. Now, we collide against the same 3d capsule
used by the physics system for avatar collisions.
2016-03-10 10:20:17 -08:00
Brad Davis
d428f3b96f
Working on crash bugs
2016-03-09 14:00:05 -08:00
Seth Alves
efdef52081
Merge pull request #7269 from ctrlaltdavid/20822
...
Restyle bookmark dialogs
2016-03-09 07:31:15 -08:00
David Rowe
edc50f102d
Fix "duplicate bookmark" dialog
2016-03-09 11:55:09 +13:00
David Rowe
10e4e5e3a7
Use OffscreenUI icon enum instead of QMessageBox icon enum
2016-03-09 11:33:55 +13:00
David Rowe
03fb6b1444
Add ability to have icons in query dialogs
...
Add icon to bookmark dialogs' titles.
2016-03-09 10:45:14 +13:00
Brad Davis
28103cf5ef
Migrate composition of the overlay and pointer to the present thread
2016-03-07 17:14:41 -08:00
David Rowe
ba1e8db34a
Add QML UI test dialogs for creating and deleting bookmarks
2016-03-08 13:51:13 +13:00
David Rowe
c83ed578db
Merge branch 'master' into 20812
2016-03-03 02:01:20 +13:00
David Rowe
247ba7d3dd
Merge branch 'master' into 20812
2016-02-27 11:05:47 +13:00
samcake
3ee6f9d6f2
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2016-02-25 23:48:53 -08:00
Andrew Meadows
f964df6c97
final names for ViewFrustum intersection tests
2016-02-25 18:09:35 -08:00