Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-04-10 06:12:11 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
47762 commits 6 branches 1 tag 1.1 GiB
Commit graph

956 commits

Author SHA1 Message Date
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
Andrew Meadows
5d1e283508 namechange TouchesKeyhole to IntersectsKeyhole 2016-02-25 18:09:35 -08:00
Andrew Meadows
2591c5ee3e cleanup names that use "keyhole" 2016-02-25 18:09:35 -08:00
Andrew Meadows
9409339230 add ViewFrustum::cubeInKeyhole() 2016-02-25 18:09:35 -08:00
Andrew Meadows
669cc75596 adding ViewFrustumTests 2016-02-25 18:09:35 -08:00
Andrew Meadows
92581587b1 cleaned up AACubeTests, added AABoxTests 2016-02-25 18:09:35 -08:00
Andrew Meadows
5c11963de2 add unit tests for AACube 2016-02-25 18:09:35 -08:00
Andrew Meadows
dfdf375853 use shapeInFrustum() names again 
but at the same time make the code more redable
also: add some more efficient shape-touches-view methods
and cleanup some whitespace
 2016-02-25 18:09:35 -08:00
Andrew Meadows
8200babf78 fix warning about unused variable 2016-02-25 18:09:35 -08:00
David Rowe
4cc36d1df0 Update QML UI test environment for Settings > General dialog 2016-02-25 17:13:48 +13:00
samcake
ae6e625894 Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2016-02-24 17:30:40 -08:00
samcake
a0d7ce145e Adding support for emissive and occlusion maps, on to pr land 2016-02-24 17:30:29 -08:00
David Rowe
49c229897f Give the "change avatar?" confirmation dialog a default action 2016-02-23 17:55:36 +13:00
David Rowe
26a46207c2 Set up QML tests for message box modal dialog restyling 2016-02-22 17:03:48 +13:00
samcake
39a7852979 MOving forward with PBR rendering, cleaning up the lighting shaders and the packi/unpack deferredBuffer shaders 2016-02-19 18:43:07 -08:00
Triplelexx
087e2e7f66 revise touchscreen camera control manipulation 
Touchscreen camera control is now via a touchscreen device. Input must
be enabled with the menu option. Currently supports dragging and
gesturing to control avatar camera. Gesturing is handled by integration
of the Qt implementation.
 2016-02-19 13:47:28 +00:00
David Rowe
54b27f3ac3 Merge branch 'master' into 20805 2016-02-18 23:35:37 +13:00
David Rowe
c07b1f9b1e Tidying 2016-02-18 23:06:26 +13:00
David Rowe
42a44e0f67 First pass at restyling dialog frame 
"Pin" button is implemented but disabled (as it was before).
 2016-02-13 15:15:01 +13:00
Anthony J. Thibault
111ed65bf8 Controller Pose values are relative to Avatar. 
Pass a InputCalibrationData to each inputPlugin and inputDevice.
This contains the most up sensorToWorldMatrix, avatarMat and hmdSensorMatrix.
Each input plugin can use this data to transform it's poses into Avatar space
before sending it up the chain.

This fixes a bug in the handControllerGrab.js script that relied on the hand controller
rotation/positions being in the avatar frame.
 2016-02-11 17:18:01 -08:00
Chris Collins
c6bc91f8b2 Merge pull request #7084 from jherico/toolTabs 
Allow closed tabs to delete properly
 2016-02-11 13:20:20 -08:00
David Rowe
b3233c2d21 Add Running Scripts dialog to UI tests 2016-02-12 10:13:28 +13:00
Brad Davis
2ee1f18e06 Allow closed tabs to delete properly 2016-02-11 10:27:24 -08:00
Brad Hefta-Gaub
d77d102384 add support for persisting the mono preview mode option 2016-02-10 22:01:17 -08:00
Brad Hefta-Gaub
d7db08d150 Merge pull request #7042 from howard-stearns/virtualBaton 
Virtual baton
 2016-02-10 13:48:34 -08:00
Howard Stearns
4241f4b305 Convert all simple one-liners containing ') { ' to instead take up three lines. 2016-02-10 12:03:07 -08:00
Chris Collins
e61636e8a7 Merge pull request #7028 from zzmp/fix/overlay 
Add transparency and layering for overlays
sam is doing it
 2016-02-09 09:18:32 -08:00
Howard Stearns
61e521bc63 Fix build (and remove unneeded test file). 2016-02-08 09:33:32 -08:00
Howard Stearns
4a50d7c456 Merge branch 'master' of https://github.com/highfidelity/hifi into virtualBaton 2016-02-07 18:41:04 -08:00
Howard Stearns
b08f364447 yes! 2016-02-07 18:29:10 -08:00
Bradley Austin Davis
dc0e038535 Add drive selection to the file dialog 2016-02-04 13:51:43 -08:00
Zach Pomerantz
d14ce8a9fe Pass an explicit pipeline to render.*Instance calls 2016-02-03 19:18:56 -08:00
Atlante45
72790d361b Update gpu-test 2016-02-01 18:50:01 +01:00
Atlante45
ccb183e518 Unify Named/Normal calls 2016-02-01 18:50:01 +01:00
Brad Hefta-Gaub
721a911cf1 Merge pull request #6972 from jherico/qml 
Small QML Fixes
 2016-01-29 09:57:15 -08:00
Brad Davis
afd3ddf534 Cleaning up message box 2016-01-28 21:17:05 -08:00
Brad Davis
5b817ccc21 Make all 2D overlays QML 2016-01-28 16:03:26 -08:00
Brad Davis
18d6a09dc9 Better preferences dialog initial state 2016-01-28 09:20:31 -08:00
Brad Davis
664100b9b1 Attachment dialog 2016-01-26 21:55:40 -08:00
Brad Davis
fee920723a Cleaning up test project 2016-01-26 17:25:20 -08:00
Brad Davis
e52e35df8c Better initial window positioning 2016-01-23 22:06:13 -08:00
Brad Davis
71ae36f5c0 Button prefs and conditionally enabled prefs 2016-01-22 19:06:30 -08:00
Brad Davis
858bbbf987 Adding OffscreenUI API for QInputDialog functionality 2016-01-22 17:31:03 -08:00
Brad Davis
c7186590ea Support for directory browsing 2016-01-22 17:30:09 -08:00
Brad Davis
205ab05506 First pass on preferences dialog 
Conflicts:
	tests/ui/qmlscratch.pro
 2016-01-22 17:30:07 -08:00
Anthony J. Thibault
8bfa80d5fc Merge remote-tracking branch 'upstream/master' into tony/hmd-recenter-on-rotation 2016-01-22 13:37:43 -08:00
Brad Davis
f343598d91 Focus hack for menu fix 2016-01-22 00:55:32 -08:00
Brad Davis
3d46eda165 Frame construction in onCompleted was messing up the browser keyboard focus 2016-01-22 00:55:31 -08:00
Brad Hefta-Gaub
e1c369dc10 Merge pull request #6766 from samcake/hdr 
Ambient Occlusion
 2016-01-21 18:10:52 -08:00
Anthony J. Thibault
ca8a832818 CharacterController: added hard limit to follow displacement 
To prevent tunneling when the rigid body cannot reach it's target due to being blocked by a wall or some other obstacle.

Also, added unit tests for physics/BulletUtil rotateVector and clampLength functions.
 2016-01-21 17:27:45 -08:00
Anthony J. Thibault
a91c181a89 MyAvatar: Recenter when the head turns away from the hips 
Compute HMD facing moving average.
When the moving average diverges from the hips by more then 45 degrees, recenter the body.

Also, the follow code has been changed, instead of a follow velocity being passed to the CharacterController
a desired target is passed.  The CharacterController homes toward it's target based on the time remaining.
Any follow deltas applied to move the avatar's position closer to it's target is stored and re-applied
to the bodySensorMatrix.  This centralizes the moving/homing code to one place, the CharacterContoller.

A new FollowHelper class was also introduced, it groups together the data and logic necessary to perform the
re-centering/follow procedure.  This "hopefully" makes it easier to maintain.
 2016-01-21 16:38:42 -08:00
samcake
2471a88e85 Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-01-21 15:53:25 -08:00
Brad Davis
f9f9ddd8bd Yet more atmosphere removal 2016-01-21 15:15:17 -08:00
Brad Davis
b8109af196 Ignite the atmosphere 2016-01-21 15:15:15 -08:00
Leonardo Murillo
098b7a4ff3 Merge pull request #6870 from birarda/console 
Your Stack Manager is now a Server Console
 2016-01-21 14:31:34 -06:00
Brad Davis
d2900200a1 More cleanup & menu fixing 2016-01-20 11:23:56 -08:00
Stephen Birarda
8bc063e758 Merge branch 'master' of https://github.com/highfidelity/hifi into console 2016-01-19 16:21:19 -08:00
samcake
df496b065c Merging with master 2016-01-18 16:40:34 -08:00
Brad Davis
5aa8398adb Working on keyboard focus issues 2016-01-17 20:56:07 -08:00
Brad Davis
746c388f7a Cleanup of QML windowing and message boxes 2016-01-15 23:14:49 -08:00
samcake
577666da6e Merging upstream master 2016-01-14 15:10:54 -08:00
Atlante45
c30569cd55 Naming coding standard 2016-01-13 11:47:43 -08:00
Atlante45
205c14eb43 Remove unused headers 2016-01-13 11:47:43 -08:00
samcake
31bea5034c Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-01-12 10:02:15 -08:00
Zach Pomerantz
801dde7950 Merge branch 'master' of github.com:highfidelity/hifi into feat/render-shape 2016-01-11 16:38:04 -08:00
Anthony J. Thibault
e4e4cb0110 Bug fix for Transform.postMult() with non-uniform scale. 
Previously it would not flag the matrix as non-uniform, this would
cause some operations (such as inverse) to be incorrect.
 2016-01-11 12:03:44 -08:00
Zach Pomerantz
d8ff133cc6 Fix include in gpu-test 2016-01-05 18:11:24 -08:00
Stephen Birarda
8d0478dbef remove ALL_TEST_TARGETS debug 2016-01-04 16:03:40 -08:00
samcake
387706ea64 Fix shader-test compilation 2016-01-04 19:45:43 -04:00
Andrew Meadows
ec27c75332 Merge pull request #6660 from hyperlogic/tony/anim-expressions 
AnimExpression: boolean expression parser and evaluator
 2015-12-30 08:36:44 -08:00
Anthony J. Thibault
5d596bcbc4 Added tests for GLMHelpers::safeEulerAngles. 
To verify that converting to and from quats and eulers will use the same angle order.

Also I fixed some naming inconsistencies in GeometryUtilTests.
 2015-12-29 10:07:38 -08:00
samcake
f9070ee989 Cleanup cruft in the shaders, glowIntensity and alphaThreshold not needed anymore 2015-12-22 12:41:31 -08:00
samcake
1e8e3fec87 Merge branch 'master' of https://github.com/highfidelity/hifi into graphicsMaster 2015-12-19 11:38:20 -08:00
Brad Davis
6098c4a1d6 Revert "Revert "Migrate QML based web views to Qt WebEngine"" 
This reverts commit 1f3adeb666.
 2015-12-18 17:18:46 -08:00
samcake
7e66515beb Merge branch 'master' of https://github.com/highfidelity/hifi into graphicsMaster 2015-12-18 17:13:48 -08:00
Brad Davis
1f3adeb666 Revert "Migrate QML based web views to Qt WebEngine" 2015-12-18 17:09:38 -08:00
samcake
41525a7c4d Merge branch 'master' of https://github.com/highfidelity/hifi into graphicsMaster 2015-12-18 16:20:41 -08:00
Brad Davis
88b88a3306 Fixing warnings 2015-12-18 14:32:35 -08:00
Brad Davis
82c865af2c Rename QmlWebWindow to OverlayWebWindow, move ctor registration to script engine 2015-12-17 12:20:38 -08:00
Brad Davis
fa5bab08b1 Support web content inside QML 2015-12-16 16:25:38 -08:00
Anthony J. Thibault
ab85e2967a AnimExpression: support for unary not. 2015-12-15 13:18:30 -08:00
Anthony J. Thibault
22756d168b Changed grammar to support boolean and and or. 2015-12-15 10:35:35 -08:00
Anthony J. Thibault
2b0ed55077 Merge branch 'master' into tony/anim-expressions 2015-12-15 10:35:19 -08:00
samcake
3554f54e17 Merge branch 'master' of https://github.com/highfidelity/hifi into graphicsMaster 2015-12-14 17:38:56 -08:00
Atlante45
146581714a More warning fixes 2015-12-11 16:17:41 -08:00
Atlante45
ce51350b65 Fix warnings on windows 64bit 2015-12-11 15:42:15 -08:00
Sam Cake
7e59d5cc04 Fixing the failing test for shader compilations (because we removed the shadowing shaders) 2015-12-07 01:27:50 -08:00
Brad Hefta-Gaub
f71d2d00d2 Merge pull request #6548 from jherico/threaded_present 
Threaded present
 2015-12-04 13:42:09 -08:00
Brad Davis
11917ca501 Fixing preview / vsync functionality 2015-12-04 12:46:19 -08:00
Brad Hefta-Gaub
15c4dbfb11 Merge pull request #6554 from Atlante45/warnings 
Last of the OpenGL warnings on OS X
 2015-12-04 11:24:28 -08:00
Brad Hefta-Gaub
d07629489c Merge pull request #6543 from Atlante45/pointer 
gpu::Shader::create* return shared_ptr
 2015-12-04 11:17:02 -08:00
Atlante45
528a17422d Last of the OpenGL warnings on OS X 2015-12-04 10:33:10 -08:00
Brad Davis
c4514743d1 Fixing tests, moving some plugin container stuff to base class 2015-12-04 10:28:19 -08:00
Brad Davis
b9ace94ff1 Prototyping threaded present 2015-12-04 10:28:16 -08:00
Brad Hefta-Gaub
6fbb67021f Merge pull request #6530 from hyperlogic/tony/mirrored-model-entity-fix 
Fix for mirrored transforms in FBX models
 2015-12-03 17:01:21 -08:00
Anthony J. Thibault
99223d0a3c AnimExpression: support for parsing simple expressions 
supports parens, binary +, -, / and *.
/ and * have higher precedence then + and -
 2015-12-03 15:02:00 -08:00
Atlante45
3da80f5861 gpu::Shader::create* return shared_ptr 2015-12-03 14:56:07 -08:00
Brad Davis
cc80dfb9e1 Fixing case on gl surface format helper 2015-12-03 13:08:26 -08:00
Anthony J. Thibault
710ce7e639 Merge branch 'master' into tony/anim-expressions 2015-12-03 09:56:28 -08:00
Anthony J. Thibault
4f836568ad Tests to verify AnimPose decomposition is working. 2015-12-02 17:26:32 -08:00
Anthony J. Thibault
f120e10ff4 Merge branch 'master' into tony/remove-joint-states 2015-11-24 15:00:05 -08:00
Anthony J. Thibault
0b410ecd92 RigTests build again 2015-11-21 11:09:31 -08:00
Anthony J. Thibault
cb89f09635 Removed EntityRig and AvatarRig. One Rig to rule them all. 2015-11-20 14:27:01 -08:00
Leonardo Murillo
9ad865c7f0 checkpoint 2015-11-20 15:19:45 -06:00