Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-04-09 23:44:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
86618 commits 6 branches 1 tag 1.1 GiB
Commit graph

1340 commits

Author SHA1 Message Date
Brad Davis
ae8f841912 Shader refactoring for explicit bindings 2018-08-03 14:58:11 -07:00
Brad Davis
04e84f1d23 Moving to cmake time shader compiling 2018-08-03 14:58:11 -07:00
Sam Gondelman
8201997a16
Merge pull request #13660 from SamGondelman/parabolic 
Parabolic Picking + Pointers
 2018-07-30 10:49:02 -07:00
Andrew Meadows
207aea8712 remove cruft from rendering collision shapes 2018-07-16 10:29:34 -07:00
SamGondelman
bfcf4f7865 add parabola test, performance optimization 2018-07-03 15:14:43 -07:00
Andrew Meadows
4329ea5240 Merge master' into 'workload' 2018-06-04 16:11:25 -07:00
Brad Hefta-Gaub
81d873a273
Merge pull request #13285 from hyperlogic/bug-fix/make-rotation-constraint-tests-pass 
Make RotationConstraintTests pass
 2018-05-31 21:37:36 -07:00
Anthony J. Thibault
ddce4750ee Make RotationConstraintTests pass 
A previous bug fix made ElbowConstraint::apply() always return true.
Because it as always modifying the rotation via swingTwistDecomposition().
The tests now no longer check for a false value.
 2018-05-31 17:14:16 -07:00
Andrew Meadows
003e444246 Merge branch 'master' into 'workload' 2018-05-30 16:04:13 -07:00
Brad Davis
7e16325805 Unit testing cached and uncached shader loading 2018-05-24 12:42:34 -07:00
Bradley Austin Davis
3beb77694f Cached shader binaries and uniform data for shaders 2018-05-24 12:42:33 -07:00
Andrew Meadows
d50da2babc Merge 'master' into 'workload' 2018-05-23 14:51:05 -07:00
Sam Gateau
937955dd45
Merge pull request #13191 from jherico/feature/unit_testing 
More unit testing work
 2018-05-22 10:00:24 -07:00
Brad Davis
fb81cf927a Faster texture transfers 2018-05-18 09:21:02 -07:00
Brad Davis
1aba6e8fe1 Fix unit test compile issues 2018-05-17 15:34:57 -07:00
Brad Davis
e81d2809c1 Fix unit testing setup 2018-05-17 15:05:40 -07:00
Andrew Meadows
c7c4324b3c Merge 'master' into 'workload' 2018-05-15 10:22:50 -07:00
Brad Davis
cb336bdeab Fix linux build problems 2018-05-10 10:55:50 -07:00
Brad Davis
57691d5d66 Cache downloaded assets 2018-05-09 13:20:48 -07:00
Brad Davis
7fbad47351 Working on texture test 2018-05-09 13:20:48 -07:00
Brad Davis
1d403b4d67 Add texture transfer testing 2018-05-09 13:20:47 -07:00
Brad Davis
e9dc3c650b Breakup building and testing 2018-05-09 13:20:47 -07:00
Brad Davis
6e16109fa4 Fix unit test compile failures and crashes 2018-05-09 13:20:47 -07:00
Brad Davis
d5afb3a49b Move non-automated tests into new folder 2018-05-09 13:20:47 -07:00
Seth Alves
0589e2f6a0 Merge branch 'master' of github.com:highfidelity/hifi into qml-test 2018-05-05 09:43:32 -07:00
Clement
da9fb9c751 Fix non self-sufficient headers 2018-05-04 16:26:41 -07:00
Seth Alves
cc4d04aaef experimenting 2018-05-04 14:45:57 -07:00
Bradley Austin Davis
81df7a1293 Fix texture leak in QML surface test 2018-05-04 12:41:39 -07:00
Clement
487a63025f Fix warning 2018-05-03 18:19:52 -07:00
Clement
27c471ee97 Move all wire frustums to conical frustums 2018-05-03 18:19:29 -07:00
Andrew Meadows
99a75c5a87 Merge 'master' into 'workload' 2018-05-02 17:28:36 -07:00
Clement
21213e81f4 Multiview support for priority queue 2018-05-01 18:03:21 -07:00
John Conklin II
250aa3ab43
Merge pull request #13027 from jherico/fix/web_crash2 
Some fixes for QML surfaces
 2018-05-01 12:39:46 -07:00
samcake
b3408ae4c0 Merge branch 'master' of https://github.com/highfidelity/hifi into upstream-workload 2018-05-01 11:39:54 -07:00
Seth Alves
a245bb2174 fix libquazip debug filename. link libatomic where needed 2018-04-28 13:30:28 -07:00
Brad Davis
8e42bb8c87 Restore the stop functionality for a browser view when it's being destroyed 2018-04-27 17:35:38 -07:00
Brad Davis
575520fe30 Ensure we actually delete the QML scenegraph! 2018-04-27 15:08:10 -07:00
Brad Davis
5f8149fd68 Remove debugging pragma 2018-04-27 13:57:22 -07:00
Brad Davis
f2172d84a0 Add stress test for QML web content 2018-04-27 08:35:20 -07:00
samcake
5db3eee4ad Merge branch 'master' of https://github.com/highfidelity/hifi into workload 2018-04-25 15:21:43 -07:00
samcake
33bbbcef83 Merging with master 2018-04-24 11:49:34 -07:00
samcake
382161659e Merge branch 'master' of https://github.com/highfidelity/hifi into taa-zvork 2018-04-24 11:37:00 -07:00
Brad Davis
ecaf162afb Fixing PR build 2018-04-23 20:41:36 -07:00
samcake
0f4aa7e27e Merge branch 'master' of https://github.com/highfidelity/hifi into workload 2018-04-20 09:31:36 -07:00
Olivier Prat
c6d598cc88 Jitter is now set through a batch command 2018-04-20 10:52:50 +02:00
samcake
a6bd589f4f Merging upstream 2018-04-19 12:20:10 -07:00
Clement
2e8a6e1961 Remove more dead octree code 2018-04-17 18:21:51 -07:00
samcake
59a081bcdb merge with upstream 2018-03-30 18:08:38 -07:00
Stephen Birarda
ab4f110ea4 add single quote tests to JS baking tests 2018-03-22 13:41:33 -07:00
SamGondelman
21381a7295 fix building with gles on desktop (still crashes) 2018-03-14 11:44:00 -07:00
samcake
f8acca76e2 Merge branch 'master' of https://github.com/highfidelity/hifi into workload-master 2018-03-13 09:31:50 -07:00
Olivier Prat
da6bd92ff6 Merged with master 2018-03-09 10:07:25 +01:00
samcake
d4d5f3a7f0 Merge branch 'master' of https://github.com/highfidelity/hifi into master-workload 2018-03-02 08:50:47 -08:00
Sam Gateau
88ecfe7895
Merge pull request #12464 from jherico/android_dev 
Android Master
 2018-03-01 17:22:34 -08:00
Anthony J. Thibault
cb1d453f10 Removed RigTests 2018-02-28 17:15:24 -08:00
Anthony J. Thibault
470aa53454 AnimTest now passes 2018-02-28 17:12:57 -08:00
Anthony J. Thibault
95dfee25b9 Relaxed tolerance on AnimIK test so it can pass... 2018-02-28 16:43:49 -08:00
Anthony J. Thibault
f291ddae97 Animation unit tests now compile. 
not all of them pass tho...
 2018-02-28 15:55:08 -08:00
Andrew Meadows
3ca21dda67 Merge hifi/master of into hifi/workload 2018-02-28 10:28:31 -08:00
Brad Davis
136ced98c3 Merge remote-tracking branch 'upstream/master' into android_dev 2018-02-27 13:44:00 -08:00
John Conklin II
48f0cded05
Merge pull request #12440 from humbletim/Leopoly_Phase1_010_graphics-scripting 
Leopoly_Phase1_010 Graphics Scripting
 2018-02-27 07:53:25 -08:00
Olivier Prat
2d71d7da9f Merge branch 'master' of http://github.com/highfidelity/hifi into taa 2018-02-27 09:11:43 +01:00
Brad Davis
0550138609 Merge remote-tracking branch 'upstream/master' into android_dev 2018-02-23 12:48:10 -08:00
Brad Davis
aeb29db37d Merge remote-tracking branch 'upstream/stable' into android_stable 2018-02-22 17:35:00 -08:00
Atlante45
277e556b48 Create a standard function to init Hifi Apps 2018-02-22 17:06:09 -08:00
Andrew Meadows
a4442828be fix workoad unit tests 2018-02-22 14:39:13 -08:00
Andrew Meadows
9246f6c24a render-perf depdends on workload library 2018-02-20 19:15:54 -08:00
SamGondelman
4c6169ec78 merge and a little cleanup 2018-02-20 15:45:34 -08:00
SamGondelman
4f0f6709c1 fix build errors 2018-02-20 13:56:06 -08:00
Olivier Prat
f5a2557a2e Merged with master 2018-02-19 17:28:39 +01:00
Andrew Meadows
6d347cf44f revert deadlock, remove Space stubbery in EntityTree 2018-02-15 17:40:15 -08:00
Andrew Meadows
f35469c0de give EntityTree a workload/Space instance 2018-02-15 12:57:58 -08:00
Andrew Meadows
693e27716e pull task out of render and into its own lib 2018-02-14 13:26:42 -08:00
Andrew Meadows
8231a56b22 pull task out of render and into its own lib 2018-02-13 08:56:11 -08:00
Andrew Meadows
a8ad846f2b cleanup 2018-02-13 08:54:44 -08:00
Andrew Meadows
be38a4bc71 creating workload lib 2018-02-13 08:54:44 -08:00
Sam Gateau
714e3f445d
Merge pull request #11537 from jherico/threaded_qml 
Migrating QML rendering off the main thread
 2018-02-12 15:32:33 -08:00
Sam Gateau
f3918ad216
Merge pull request #12367 from AndrewMeadows/fix-shared-unit-tests 
Fix shared unit tests
 2018-02-09 17:18:35 -08:00
Sam Gateau
f20e1a727e Removing the specular pipeline since we now take care of it with the base shader, remove unused shader include files adding the tone map pass 2018-02-08 23:07:39 -08:00
Andrew Meadows
64ec4dac7a remove broken DEV_BUILD context 2018-02-07 16:49:42 -08:00
Andrew Meadows
b3452f274e use glm::nan() for platform-agnostic code 2018-02-07 16:49:22 -08:00
Andrew Meadows
f0bb4d3da7 fix API bitrot and remove extra whitespace 2018-02-07 16:48:43 -08:00
Andrew Meadows
572edab79f remove dupe const 2018-02-07 16:48:31 -08:00
Bradley Austin Davis
fd007e845d Squashed scribe changes 2018-02-07 10:29:29 -08:00
Bradley Austin Davis
0455fb37b6 Merge remote-tracking branch 'upstream/master' into fix/shader_length 2018-02-06 15:55:01 -08:00
Brad Davis
7d5502eb92 Migrating QML rendering off the main thread 2018-02-06 11:53:09 -08:00
Bradley Austin Davis
f291715f87 Merge remote-tracking branch 'zvork/scribe' into fix/shader_length 2018-02-06 10:36:15 -08:00
Andrew Meadows
96c97547f9
Merge pull request #12205 from jherico/no_widgets 
Remove some unneeded Qt dependencies
 2018-02-05 15:32:54 -08:00
Bradley Austin Davis
f611990b10 Fix overlimit shader char strings 2018-02-05 15:27:19 -08:00
Olivier Prat
92279b5939 Merged with master 2018-02-05 18:24:05 +01:00
Olivier Prat
ac92b3c130 Merge branch 'master' of http://github.com/highfidelity/hifi into scribe 2018-02-02 14:01:59 +01:00
samcake
062bfbd7b6 Merging with master 2018-01-30 18:33:34 -08:00
Atlante45
bc819c698e Merge branch 'stable' of https://github.com/highfidelity/hifi into merge-back 2018-01-30 16:09:30 -08:00
samcake
f078ff611a Refining the declaraion signatures and adding the binary capture 2018-01-30 15:10:52 -08:00
Olivier Prat
5e6300ce46 Merged with master 2018-01-30 09:52:30 +01:00
Brad Davis
0781d8eaf0 Remove some unneeded Qt dependencies 2018-01-28 22:18:24 -08:00
Atlante45
314c51ab3b Fix settings init in all exe 2018-01-26 15:53:08 -08:00
Seth Alves
e3f859329d
Merge pull request #12245 from sethalves/fix-asan-build 
fix asan build
 2018-01-25 10:15:29 -08:00
Anthony J. Thibault
58d3d8ef3d Bug fix for incorrect positioned eyes on other peoples avatars 
There was a bug in writeBitVector(), where the last byte was not consistantly written into the destination buffer.
A unit test was added to verify that writeBitVector() and readBitVector() are correct.

(cherry picked from commit a252e90f96)
 2018-01-24 21:14:29 -08:00
Anthony J. Thibault
a252e90f96 Bug fix for incorrect positioned eyes on other peoples avatars 
There was a bug in writeBitVector(), where the last byte was not consistantly written into the destination buffer.
A unit test was added to verify that writeBitVector() and readBitVector() are correct.
 2018-01-24 18:58:08 -08:00
Olivier Prat
95882e0cde Merged with master 2018-01-24 10:51:54 +01:00
Seth Alves
64a55f1393 fix asan build 2018-01-23 20:36:11 -08:00
Brad Davis
d2fe9e2710 PR feedback 2018-01-19 20:24:34 -08:00
Brad Davis
bdfa1273ba Merge remote-tracking branch 'upstream/master' into android 2018-01-18 17:33:10 -08:00
Clément Brisset
956f45b5af
Merge pull request #11932 from birarda/bug/baking-folder-number 
fix sparse rectification for small textures, export for same model at diff URL
 2018-01-18 14:25:33 -08:00
Olivier Prat
efa6a8c0b5 Merged with master 2018-01-17 15:49:46 +01:00
Olivier Prat
49549ced17 Fixed compilation with new shader system 2018-01-17 10:52:58 +01:00
Brad Davis
6a06bf405a Merge remote-tracking branch 'upstream/master' into android 2018-01-16 18:24:44 -08:00
Olivier Prat
3911ce59cc Scribe now outputs .h and .cpp. Need to change how shader source is referenced in C++ code 2018-01-16 19:02:12 +01:00
humbletim
b91d536dd0 rename model:: -> graphics:: 2018-01-16 12:46:16 -05:00
humbletim
08ccda9cfc rename libraries/model(src/model) -> libraries/graphics(src/graphics) 2018-01-16 12:44:44 -05:00
Olivier Prat
cdb94d0832 Merge branch 'master' of git://github.com/highfidelity/hifi into scribe 2018-01-16 16:43:50 +01:00
Brad Davis
1da29862e7 Fix for OSX build 2018-01-15 11:57:06 -08:00
Brad Davis
db30e9c45f Fixing PR builds 2018-01-15 09:47:31 -08:00
Brad Davis
58530c595a Pre-merge cleanup 2018-01-14 19:48:12 -08:00
Brad Davis
c924cbf2a7 Remove explicit gpu-gl dependencies 2018-01-13 12:20:41 -08:00
Sam Gateau
df0660f823 Merge branch 'master' of https://github.com/highfidelity/hifi into android-gles 2018-01-13 01:00:41 -08:00
Brad Davis
ab7aa52a10 GLES emulaton on windows 2018-01-12 19:17:35 -08:00
Olivier Prat
814de4ab81 Scribe now outputs shaders as cpp files. 2018-01-12 11:59:19 +01:00
Anthony J. Thibault
fbea22e0f0 Renamed imag component to dual, using the correct nomenclature 
Also removed incomplete test from unit tests.
 2018-01-08 18:21:23 -08:00
Anthony J. Thibault
532c8a23f9 tests 2018-01-04 16:09:03 -08:00
Anthony J. Thibault
565875e823 WIP first attempt at dual quat skinning 2018-01-04 16:09:02 -08:00
Sam Gateau
db4f9909c7
Merge pull request #12017 from Zvork/glcolor 
Removed glColor reset hack in MeshPartPayload
 2017-12-22 14:25:51 -08:00
Olivier Prat
bd666406f4 Removed glColor reset hack in MeshPartPayload and replaced it by a reset of the color attribute to white in the execution of the setInputFormat command of the various GLBackends 2017-12-19 14:17:17 +01:00
Olivier Prat
92e1fe8e5c Removed jitter samples from shader and added name to batches in DEBUG mode to ease render debug 2017-12-08 18:02:27 +01:00
Zach Fox
b2bafed2bb Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist 2017-12-07 11:21:24 -08:00
Atlante45
a4b3180271 Fix sparse rectification for small textures 2017-12-05 14:44:11 -08:00
Brad Hefta-Gaub
5914f27027
Merge pull request #11706 from luiscuenca/webAudioDev_fresh 
QML & Web generated audio now follow the client audio device selection
 2017-11-21 11:29:48 -08:00
Brad Davis
d71fd151c5 Fixing button model exposure 2017-11-13 16:45:27 -08:00
Brad Davis
7bf1b176d7 Renaming Tablet API to Tablets, supporting dev-mode QML loading from filesystem 2017-11-10 14:21:24 -08:00
Anthony Thibault
08c12a1ced
Merge pull request #11704 from AndrewMeadows/shape-manager-key 
cleanup ShapeInfo hash generation
 2017-11-10 11:31:46 -08:00
ZappoMan
d4b4d188ed allow splitting of edit or add entity packets across multiple edit packets when property list is larger than MTU 2017-11-04 13:40:41 -07:00
luiscuenca
bda63e38a9 Updating all wasapi dependencies 2017-10-27 13:38:13 -07:00
luiscuenca
76223aa06f Force wasapi to compile with domain-server (TEST) 2017-10-27 13:07:16 -07:00
luiscuenca
a466cf7124 make wasapi compile first 2017-10-27 11:51:19 -07:00
luiscuenca
70b37f2e8a Cleaning some old tabs 2017-10-27 11:32:44 -07:00
luiscuenca
f32282afdd Clean update bug 8027 2017-10-27 11:03:02 -07:00
Andrew Meadows
45e571dd02 cleanup ShapeInfo::getHash() 2017-10-27 07:52:51 -07:00
LaShonda Hopper
5b50b362f1 [WL21389] WL21389 PR2: Representation of collision shapes need updating (details below). 
This commit adds support for the polyhedrons and polygons sans
Torus and Quad which aren't currently supported within GeometryCache.

* Moves GeometryCache::_shapes from public to private scope
    * Nothing aside from the class should be directly altering this, only querying
    * Updated instances of direct referencing which looks to have been limited to prior
      testing of instancing and shapes.
* Adds an accessor function for ShapeData to GeometryCache
* Consolidates point list generation to helper function
    * GeometryCache::computeSimpleHullPointListForShape
* Moves GeometryCache::Shape to entity::Shape mapping to GeometryCache from
  RenderableShapeEntityItem
    * Adds conversion accessor to GeometryCache, GeometryCache::Shape getShapeForEntityShape
* Sets ShapeEntityItem::ShapeInfoCalculator callback committed earlier.
    * This helps circumvent the issue with library inclusion.  entity-render knows about
      entity; however, entity doesn't know about entity-renderer; however, GeometryCache
      data is needed within entity::ShapeEntityItem to compose the ShapeInfo point list data.
    * This callback is set up within Application::init of the Interface as it knows about
      both halves of the equation, and the callback needs to be setup prior to any entities
      collision data getting generated.
* Removes _type reset within ShapeInfo::setPointCollection
    * This should avoid any issues due to subversively setting the type or
      incorrectly setting the type as a tangential operation.
        * Audited instances of ShapeInfo::setPointCollection and all seemed to be
          calling the function immediately after having set the type via
          ShapeInfo::setParams
* Adds new ShapeType: SHAPE_TYPE_CIRCLE
    * This type is reserved for the circle which is now treated as a special
      type of Cylinder_Y with regard to collision as opposed to a simple hull.
    * Fixes the issue where jumping on a circle, at times, would
      result in the avatar sliding off towards an edge as if atop a
      squished cone.
* Also updates ShapeInfo::getType() to return ShapeType as opposed to int
    * Auditing calls showed that majority of places were comparing against ShapeType
    * ShapeType::_type is a ShapeType so returning the type explicitly
      is more consistent.
        * ShapeInfo file houses ShapeType enum so any file aware of ShapeInfo is aware of
          ShapeType enumeration.
* entity::Quad defaults to SHAPE_TYPE_ELLIPSOID
    * Like entity::Shape::Torus, entity::Shape::Quad is currently unsupported within
      GeometryCache::buildShapes.
    * Also it appears that a Quad shape can't be created within world via the creation menu.
        * There's no explicit option at present to create one.
        * Trying subvert the Cube/Box creation option to generate one results in an enforced
          stubby box as opposed to a quad.
    * Given the aforementioned points, entity::Shape::Quad will default to
      SHAPE_TYPE_ELLIPSOID as opposed to SHAPE_TYPE_BOX.
        * Added Todo regarding the shape being unsupported along with a notation to create
          a special ShapeType, SHAPE_TYPE_QUAD, for it should it be added in the future.
* Adds some comments and has some minor clean up.

Reviewed-by: Leander Hasty <leander@1stplayable.com>

Changes Committed:
	modified:   interface/src/Application.cpp
	modified:   interface/src/Util.cpp
	modified:   interface/src/Util.h
	modified:   libraries/entities-renderer/src/RenderableShapeEntityItem.cpp
	modified:   libraries/entities/src/ShapeEntityItem.cpp
	modified:   libraries/entities/src/ShapeEntityItem.h
	modified:   libraries/physics/src/ShapeFactory.cpp
	modified:   libraries/render-utils/src/GeometryCache.cpp
	modified:   libraries/render-utils/src/GeometryCache.h
	modified:   libraries/shared/src/ShapeInfo.cpp
	modified:   libraries/shared/src/ShapeInfo.h
	modified:   tests/gpu-test/src/TestInstancedShapes.cpp
 2017-10-24 14:16:17 -04:00
Stephen Birarda
8a331e29a2 Merge pull request #11455 from utkarshgautamnyu/feat/JS-Baker 
Feat/JS-Baker
 2017-10-12 16:16:02 -05:00
utkarshgautamnyu
75aa3a73ad changed pointer args to references in JSBaker:bakeJS() 2017-10-12 12:08:44 -07:00
utkarshgautamnyu
da8b2d2137 Update JSBakerTest.cpp 2017-09-29 13:33:07 -07:00
utkarshgautamnyu
cae1560708 Update JSBakerTest.cpp 2017-09-28 13:25:08 -07:00
utkarshgautamnyu
16a75d20dc Update JSBakerTest.cpp 2017-09-28 11:58:07 -07:00
utkarshgautamnyu
305719da24 Update JSBakerTest.h 2017-09-28 11:47:39 -07:00
utkarshgautamnyu
463afd6be5 made updates to fix building 2017-09-28 11:12:26 -07:00
utkarshgautamnyu
290e3d307c Create JSBakerTest.cpp 2017-09-27 18:06:35 -07:00
utkarshgautamnyu
354fa12d36 Create JSBakerTest.h 2017-09-27 18:05:28 -07:00
utkarshgautamnyu
e4c25c0aa1 Create CMakeLists 2017-09-27 18:04:08 -07:00
samcake
f16c552978 Merge branch 'master' of https://github.com/highfidelity/hifi into blue 2017-09-26 17:18:05 -07:00