Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-05-07 12:39:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
81756 commits 22 branches 28 tags 1.2 GiB
Commit graph

792 commits

Author SHA1 Message Date
SamGondelman
248c2621a4 fix blendshapes crash 2018-08-29 17:57:54 -07:00
SamGondelman
0c8a4cc81e merge with master 2018-08-28 17:31:51 -07:00
SamGondelman
aae06e8f49 faster aabox ray intersection and pre-computed inverse direction 2018-08-27 15:40:33 -07:00
SamGondelman
ff6020e0ef fix compile errors, maybe 2018-08-24 15:41:25 -07:00
SamGondelman
70f4d0c634 Merge remote-tracking branch 'upstream/master' into perf 2018-08-24 14:04:37 -07:00
SamGondelman
b5b7167644 add to stats 2018-08-23 17:56:24 -07:00
SamGondelman
5c0b12abf6 ordered ray/parabola intersection code 2018-08-22 16:29:17 -07:00
SamGondelman
9ab1fc0500 Merge remote-tracking branch 'upstream/master' into perf 2018-08-20 17:04:42 -07:00
SamGondelman
05ff99a1d2 working on blendshapes 2018-08-20 11:40:25 -07:00
amantley
274bf33318 fix for the avatar scale reset when we re-enter hmd mode 2018-08-07 18:29:51 -07:00
SamGondelman
318ef907b8 parabola/polyvox, fixing some bugs 2018-07-24 10:08:35 -07:00
SamGondelman
956c1511b6 Merge remote-tracking branch 'upstream/master' into parabolic 2018-07-19 15:23:25 -07:00
Wayne Chen
8f23fb01a4 removing unused variables 2018-07-10 07:30:02 -07:00
Wayne Chen
bf5cdb0e5f removing unused variables from lambda capture expressions 2018-07-09 22:31:49 -07:00
SamGondelman
ca5ce888f4 parabola triangle intersection 2018-07-09 18:11:57 -07:00
humbletim
dc5c5c20df raypick partIndex commit 
include shapeID for accessing proper material index

add raypick shapeID test script
 2018-06-18 18:22:30 -04:00
John Conklin II
2483c45f40
Merge pull request #13350 from sabrina-shanman/bulletcollisionrenderonly 
Remove functionality for rendering collision models directly in the Model class
 2018-06-15 14:46:40 -07:00
sabrina-shanman
79fd3cb181 Rename createVisibleRenderItemSet() to createRenderItemSet() in Model class 2018-06-14 15:49:40 -07:00
sabrina-shanman
3c4050884e Remove straggler ifdef in Model class 2018-06-14 14:40:22 -07:00
sabrina-shanman
82fddfc31f Remove unused constant in Model.cpp 2018-06-13 13:03:07 -07:00
sabrina-shanman
440c77905a Remove functionality for rendering collision meshes directly in the Model class 2018-06-11 11:03:57 -07:00
howard-stearns
df0ecb44a8 fix crash setting model texture 
(cherry picked from commit b152bf02af4eb17cf5c169ca9c577154c83901f7)
 2018-06-07 13:21:45 -07:00
samcake
386c0f9ab2 Re review adjustments 2018-05-31 12:16:57 -07:00
Sam Gateau
513acc529e INtroduce RenderConstants header file to define the alias names for Tag and Layer for Hifi REnder Engine 2018-05-30 23:31:54 -07:00
samcake
873cabe284 Cleaning the code 2018-05-29 17:46:25 -07:00
Sam Gateau
2f94c43968 Removing the getLayer from the meshPArtPayload and check that it s working 2018-05-28 23:20:04 -07:00
Sam Gateau
678effdb48 Cleaning up the Model set ItemKey flags and bringing Item::Layer in the ItemKey 2018-05-26 23:28:59 -07:00
samcake
221b513b19 Oh boy 2018-05-25 16:33:34 -07:00
SamGondelman
9f3a431c5d minimum entity dimension 2018-04-12 14:12:52 -07:00
SamGondelman
444534f4ff model behaves correctly if missing material 
(cherry picked from commit 1e89debc4e)
 2018-03-16 15:51:37 -07:00
NissimHadar
fda32e4aa4 Merge branch 'master' of github.com:highfidelity/hifi into shadowControlsOffZvork 2018-03-08 12:16:36 -08:00
NissimHadar
0f2cf8ea85 Re-implemented shadow controls. 2018-03-01 14:24:20 -08:00
SamGondelman
cc53b338db Merge remote-tracking branch 'upstream/master' into scriptableMaterials 2018-02-27 13:30:03 -08:00
SamGondelman
0fca56eef0 Revert "Merge pull request #12407 from NissimHadar/shadowControlsOffZvork" 
This reverts commit 3201d2ba21, reversing
changes made to c0f20900a0.
 2018-02-27 11:33:05 -08:00
SamGondelman
a4b04d9d43 merge 2018-02-27 10:08:30 -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
humbletim
d3bae87066 * remove unneeded Q_DECLARE_METATYPEs 
* CR feedback
 2018-02-26 19:07:55 -05:00
SamGondelman
6fe2d46d7c merge 2018-02-26 12:40:14 -08:00
Anthony J. Thibault
f5fcaae283 Merge branch 'master' into bug-fix/entity-mat-avatar-dual-quaternions 2018-02-26 10:55:44 -08:00
Anthony J. Thibault
0404b722e4 Code review feedback 2018-02-26 10:00:32 -08:00
humbletim
3dbe5d79bb fix windows punctilious warnings 2018-02-26 06:01:16 -05:00
humbletim
f824edd04e * remove Model_temporary_hack 
* split gpuhelpers and mesh part
* fix objwriter
* more work on bufferview helpers
* cr cleanup
 2018-02-26 04:58:22 -05:00
SamGondelman
b56f755034 material reflection 2018-02-23 17:58:46 -08:00
humbletim
f8fe06213d CR feedback; whitespace / remove unnecessary diffs 2018-02-23 09:11:23 -05:00
humbletim
6ea4b660b7 CR feedback; remove ok bool pointer and all metadata; cleanup 2018-02-23 07:47:39 -05:00
Anthony J. Thibault
0469eafbe4 Switch between dualQuats and matrix skinning based on model entity scale factor. 2018-02-22 18:35:16 -08:00
Anthony J. Thibault
86351f19a9 Merge branch 'master' into bug-fix/entity-mat-avatar-dual-quaternions 2018-02-22 08:44:21 -08:00
humbletim
010c714abc restore original Entities.getMeshes 2018-02-22 08:51:54 -05:00
humbletim
e4a2a589a5 CR fedback and cleanup 2018-02-22 07:56:09 -05:00
humbletim
72fca7e57e Merge remote-tracking branch 'samuel/scriptableMaterials' into Leopoly_Phase1_010_graphics-scripting-merge 2018-02-22 05:18:05 -05:00
humbletim
be8d79f53f CR fedback and cleanup 2018-02-22 05:15:01 -05:00
Nissim Hadar
bf4ba07b72 Added parameters to canCastShadow - still sucks. 2018-02-21 12:36:34 -08:00
SamGondelman
4c6169ec78 merge and a little cleanup 2018-02-20 15:45:34 -08:00
humbletim
5791ca4c51 interim checkin 2018-02-20 12:22:04 -05:00
Nissim Hadar
b2a06cdb98 Merge branch 'master' of https://github.com/highfidelity/hifi into shadowControlsOffZvork 
# Conflicts:
#	libraries/entities/src/EntityItemProperties.cpp
#	libraries/entities/src/ShapeEntityItem.h
#	libraries/networking/src/udt/PacketHeaders.cpp
#	libraries/networking/src/udt/PacketHeaders.h
 2018-02-19 13:05:57 -08:00
Nissim Hadar
194c7f4101 WIP - for review. 2018-02-16 09:28:15 -08:00
SamGondelman
b189433855 merge 2018-02-15 15:50:36 -08:00
SamGondelman
2d754edf74 CR 2018-02-15 15:48:41 -08:00
Sam Gondelman
15cdfef16a
Merge branch 'master' into decals 2018-02-14 17:33:01 -08:00
SamGondelman
324eefc914 remove fresnel, add unlit, fix overlays, cleanup 2018-02-14 17:02:07 -08:00
samcake
1d3ae1b187 Work in progress to get the render items beeing tagged correctly for groupCulled 2018-02-13 17:50:01 -08:00
SamGondelman
38290064c1 replace materials by name, hide material mode for now 2018-02-13 13:24:08 -08:00
Anthony J. Thibault
7f5f48bca9 Models can now switch between dual quats and matrix palette skinning. 
but not dynamically, because we still only compile one version of the shader.
 2018-02-13 11:37:14 -08:00
Anthony J. Thibault
cf5452313a WIP check in of making the use of dq or mat dynamic per model 2018-02-12 18:44:24 -08:00
SamGondelman
9e8aa1898c warnings, load material from URL, shapeID -> parentMaterialID 2018-02-12 12:50:09 -08:00
SamGondelman
84cd0e1529 wip live material swapping on model entities, model overlays, avatars, 
and albedo swap on shape entities
 2018-02-09 12:00:08 -08:00
humbletim
a08770c816 cleanup 2018-02-09 02:29:20 -05:00
humbletim
06afaa7470 BufferView <-> QVariant/QScriptValue conversion 
update MeshProxy/SimpleMeshProxy and ScriptableModel

ModelScriptingInterface / scriptable::ModelProvider

integration

update to RC-63

initial graphics-scripting refactoring

graphics-scripting baseline commit

wip commit

Geometry -> MeshPart

remove SimpleMeshProxy

collapse graphics-utils -> graphics-scripting

scriptable::Model => scriptable::ScriptableModel
 2018-02-01 16:30:29 -05:00
Seth Alves
64a46bf5df merge from upstream 2018-01-31 10:43:41 -08:00
MiladNazeri
3585bead96
Merge pull request #12037 from humbletim/Leopoly_Phase1_004_RayPick-Changes 
Leopoly_Phase1_004_RayPick-Changes
 2018-01-29 14:02:38 -08:00
samcake
8dfa3aace3 cleaning en route 2018-01-26 17:34:37 -08:00
Seth Alves
1cbc2e31cf merge from upstream 2018-01-23 15:21:03 -08:00
humbletim
65455e7b50 Merge remote-tracking branch 'upstream/master' into Leopoly_Phase1_004_RayPick-Changes 2018-01-23 14:57:33 -05:00
Seth Alves
7c32d3c536 flip logic back around 2018-01-18 13:49:17 -08:00
Seth Alves
0ad4cdc41b works now 2018-01-18 13:15:47 -08:00
Seth Alves
fb974b0b9c attempt to straighten out use of view-visibility masks 2018-01-18 10:09:23 -08:00
Brad Davis
cbb2d9d854 Merge remote-tracking branch 'upstream/master' into android 2018-01-17 17:51:39 -08:00
Seth Alves
33c586de60
Merge pull request #12188 from hyperlogic/feature/small-anim-refactor 
Remove dangerous "Use Anim Pre and Post Rotations" menu item
 2018-01-17 13:41:51 -08:00
Bradley Austin Davis
25b778be1d Tracking down remaining SOX crashes 2018-01-17 12:18:39 -08:00
Seth Alves
69a33428c0
Merge pull request #12078 from druiz17/soft-entities 
Soft Entities
 2018-01-17 08:02:37 -08:00
Anthony J. Thibault
bc587bf6d8 Removal of legacy Rig methods 2018-01-16 18:19:35 -08:00
Anthony J. Thibault
576273efe3 Remove Rig::restoreJointPosition and references to it. 2018-01-16 18:01:58 -08:00
humbletim
b91d536dd0 rename model:: -> graphics:: 2018-01-16 12:46:16 -05:00
Dante Ruiz
645f608814 fixing merge conflict 2018-01-15 10:45:51 -08:00
Dante Ruiz
c76fdd1f5f adding scale 2018-01-15 10:43:26 -08:00
Dante Ruiz
283b9a8003 fix softEntity edge cases 2018-01-12 15:31:54 -08:00
Anthony J. Thibault
088f227df2 Pass model offset from avatar skeletonModel to attached entity 2018-01-12 10:26:02 -08:00
Anthony J. Thibault
7753b8a0b5 Merge branch 'master' into feature/dual-quat 2018-01-11 17:31:29 -08:00
Dante Ruiz
96a97b5938 added model transform override 2018-01-11 16:41:45 -08:00
Olivier Prat
db9e5fdae8 Merged from master but rendering seems broken 2018-01-09 11:05:34 +01:00
Anthony J. Thibault
59b843781e Merge branch 'master' into feature/dual-quat 2018-01-08 13:18:42 -08:00
Olivier Prat
b296b96e5e Merged with master 2018-01-06 10:01:00 +01:00
Anthony J. Thibault
51ab38f484 warning fix 2018-01-04 17:32:22 -08:00
David Back
6b9658f8cf merge 2018-01-04 16:41:58 -08:00
Anthony J. Thibault
b8c88fca3b Dual Quaternion skinning optimization 
Reduce expensive conversion from quat -> matrix -> quat, by keeping
the inverseBindPose in a Transform instance instead of a mat4.
 2018-01-04 16:17:23 -08:00
Anthony J. Thibault
aacf2d489f removed comments 2018-01-04 16:17:21 -08:00
Anthony J. Thibault
bcd813ac62 Optimizations and cleanup 2018-01-04 16:15:44 -08:00
Anthony J. Thibault
e86fd4f992 Removed SKIN_COMP define, re-enabled cauterization 2018-01-04 16:15:42 -08:00
Anthony J. Thibault
8bdddf7211 Full Dual Quaternion support 2018-01-04 16:15:38 -08:00
Anthony J. Thibault
18113d824c Created Model::TransformComponents class 2018-01-04 16:13:44 -08:00
Anthony J. Thibault
23affb570b WIP checkpoint, root transforms for shapes and non-animated fbx files are working. 2018-01-04 16:09:06 -08:00
Anthony J. Thibault
565875e823 WIP first attempt at dual quat skinning 2018-01-04 16:09:02 -08:00
humbletim
513a69cdcd changes per CR feedback 2018-01-03 04:08:43 -05:00
Sam Gondelman
2898fa557e
typo 2017-12-23 00:53:11 -08:00
David Back
01fcd453b8 Merge branch 'master' of https://github.com/highfidelity/hifi into polyobjimportfixes 2017-12-22 16:41:17 -08:00
SamGondelman
c38ef77b26 fix model overlays visibility change 2017-12-22 15:04:06 -08:00
David Back
f800a6d6fc scale change 2017-12-21 17:00:27 -08:00
David Back
fd297f1c03 convert negative relative indices to absolute indices 2017-12-21 10:36:41 -08:00
humbletim
a146b778f7 support additional .extraInfo for ray intersections 2017-12-21 12:35:13 -05:00
SamGondelman
2ba3e337db cleanup 2017-12-20 14:18:01 -08:00
SamGondelman
bd06dc6443 cleaning up modelmeshpartpayload 2017-12-20 11:00:14 -08:00
Olivier Prat
116756c976 Parallel optimizations of setBlendedVertices 2017-12-18 11:22:43 +01:00
Olivier Prat
264f41472d Added tangents to blendshape for possible break of bump mapping when doing blend shape animations 2017-12-15 12:06:07 +01:00
Olivier Prat
f38e473218 Working packing of normals and tangents in GL_INT_10_10_10_2_REV format. Need to check this with all available 3D data input formats 2017-12-14 17:57:34 +01:00
Anthony J. Thibault
542af47e9e Fix for hand controller avatar scaling. 
* Added getDomainMaxScale() and getDomainMinScale() to JS api.
* Updated scaleAvatar controller module to use this to prevent scaling past the limits.
* Made sure that getDomainMaxScale() getDomainMinScale() and getUnscaledEyeHeight are thread safe,
  so that they can be invoked on the script thread.
* Added signals to Model class that can be used to let observers know when the Rig has finished initializing it's skeleton.
  and also when the skeleton is no longer valid.  These hooks are used to cache the unscaled eye height of the avatar.
 2017-12-07 17:08:13 -08:00
Anthony J. Thibault
9f54ce55f3 Change domain setting from min/max avatar scale to min/max avatar height 
* Domain settings version has been bumped from version 2.0 to 2.1
* Old domain settings for avatar scale will be auto-converted to avatar height
* Avatar code has been changed so that limitDomainScale() works with the new height limits
* Avatar getUnscaledEyeHeight() was added to C++.
* MyAvatar.getHeight() was added to JS.
 2017-11-21 13:25:47 -08:00
samcake
053052a95d removing warnings 2017-11-03 13:28:20 -07:00
Sam Gateau
390f5b53ca cleaning more code 2017-11-02 23:55:44 -07:00
Sam Gateau
c11f46a8d3 cleaning more code 2017-11-02 23:35:18 -07:00
Sam Gateau
421aacd8eb Yes 2017-11-02 22:45:19 -07:00
Sam Gateau
f097d66721 YEp it s working 2017-11-02 19:49:01 -07:00
samcake
d33c75865e Removing unecessary test 2017-11-02 18:11:13 -07:00
samcake
83bfa1c5f2 Progressing on the cluster updates 2017-11-02 17:57:46 -07:00
Sam Gateau
56510abd1e Trying to set the ClusterBuffer in the render loop instead of the game loop 2017-11-02 03:45:27 -07:00
Andrew Meadows
27f4d182d9 fix scale of rendered collision geometry 2017-10-24 13:23:46 -07:00
Andrew Meadows
c79bf3bc04 cleanup WANT_DETAILED_PROFILING 2017-10-19 14:31:50 -07:00
Andrew Meadows
339edc67c8 ifdef out more per-frame-per-entity profiling 2017-10-16 17:27:53 -07:00
Andrew Meadows
fb1c075a12 fix animating entities 2017-10-16 15:55:25 -07:00
Sam Gateau
f143c28625 Merge pull request #11542 from SamGondelman/bubbleBoy 
Move HUD and HUD overlay rendering out of display plugin
 2017-10-10 14:26:20 -07:00
Bradley Austin Davis
c92588685b Merge pull request #11533 from SamGondelman/modelMaster 
Fix model loading for real this time
 2017-10-08 10:23:13 -07:00
SamGondelman
7e6d5d9d98 merge with master 2017-10-06 14:57:08 -07:00
SamGondelman
a6b7578c3c start fixing asynch issue, fixes model loading! 2017-10-05 12:30:00 -07:00
SamGondelman
3a6e84e681 trying to fix model issue 2017-10-04 17:26:12 -07:00
SamGondelman
477dfdff1e wip hud layering and fix crashes 2017-10-04 11:45:21 -07:00
samcake
b5c942f7f6 Merge branch 'master' of https://github.com/highfidelity/hifi into game-render-interface 2017-09-26 10:47:59 -07:00
Sam Gateau
f90dc64241 Merge branch 'master' of https://github.com/highfidelity/hifi into blue 2017-09-24 19:32:57 -07:00
SamGondelman
86198606e0 add _modelJustLoaded and updateTransforForSkinnedMesh on creation 2017-09-22 17:12:44 -07:00
SamGondelman
9f12d3a365 fix missing models 2017-09-21 17:57:25 -07:00
samcake
eed099502a minimise the changes compared to upstream 2017-09-21 17:20:32 -07:00
samcake
510ecbb137 Merging with upstream 2017-09-21 16:59:15 -07:00
samcake
fd8868f609 Moving the render transform evaualtion in game loop for Models 2017-09-19 17:30:20 -07:00
samcake
bff578b283 Working version that fixes the web overlay / tablet 2017-09-14 17:07:50 -07:00
samcake
10b1e3f561 Trying to implement differnet solution to the transform updates problem and debug 2017-09-12 14:35:25 -07:00
samcake
01e4bfc53e Trying to avoid calling getTransform on nestables from render thread 2017-09-11 17:36:10 -07:00
Seth Alves
a3f4aeb182 code review 2017-07-24 19:41:30 -07:00
Seth Alves
a1107deef1 cleanups 2017-07-23 08:21:50 -07:00
Seth Alves
47ea32f4d3 vertex color support in ModelScriptingInterface 2017-07-23 08:06:26 -07:00
Seth Alves
72e5fecb4e do Model::getMeshes on the correct thread. added ModelScriptingInterface::getVertexCount and ModelScriptingInterface::getVertex 2017-07-20 16:34:34 -07:00
Seth Alves
be48268be8 getMeshes handles registration point 2017-07-19 15:02:40 -07:00
Seth Alves
750b7192af trying to get the resulting model to line up with the originals 2017-07-19 13:58:03 -07:00