Commit Graph

389 Commits (ee49b3b045e366aec466f46743214386d7fecb21)

Author SHA1 Message Date
Andrey Lihatskiy b06a99f7c7 Post-merge spaces fix 2024-05-15 12:47:27 +03:00
Rye Mutt 51c7108650 Update to use newer mikktspace generation lib changes from Blender for bug/crash fixes 2024-04-19 10:55:36 -04:00
RunitaiLinden b2a450a308
#1126 gltf scene import prototype (#1172)
* #1126 GLTF Scene import initial prototype (working geometry import for some assets)

* #1126 WIP -- Expand support for more vertex formats, PoC material import, shadow support, scale support

* #1126 move GLTF implementation to newview/gltf

* #1126 Refactor attribute loading to be less copy/pasta for each combination of types

* #1126 Partially working object selection.  Ability to have multiple scenes at once.  Helpful message on how to use the preview button.

* #1126 Add bounding box debug display and untangle GLTF raycast from LLVOVolume raycast

* #1126 Working raycast on GLTF scenes.

* #1126 Remove some #pragma optimize offs
2024-04-09 19:21:10 -05:00
Brad Linden 5a47a3cb23 Merge remote-tracking branch 'origin/main' into release/materials_featurette 2024-04-09 14:17:34 -07:00
Andrey Kleshchev 563c35e1b4 Issue#894 Crash at load3 in cacheOptimize 2024-02-27 17:14:03 +02:00
Cosmic Linden a91f08ba84 Merge branch 'DRTVWR-559' into DRTVWR-592 2023-10-13 14:02:51 -07:00
Cosmic Linden 763a9b5249 DRTVWR-592: Working tangent calculation, not yet used 2023-10-13 09:57:32 -07:00
Cosmic Linden a280bacfea SL-20157: Fix scale of avatar mesh parts when mikktspace tangent generation fails 2023-09-12 10:50:26 -07:00
Andrey Kleshchev ca84e0e0c0 SL-5161 Avatars should stay hidden longer if they are waiting for meshes or skin data 2023-06-23 13:01:19 +03:00
Brad Linden 2f44377b3e Merge remote-tracking branch 'origin/main' into DRTVWR-559 2023-05-17 11:17:48 -07:00
RunitaiLinden 1cadfd44fe DRTVWR-559 WIP - optimize ARC calculation et al. 2023-05-03 17:30:02 -05:00
RunitaiLinden 6c5b907670 SL-19358 Fix for explody meshes. 2023-04-13 19:41:11 -05:00
Rye Mutt 3377b19de4
Fix double copy of tangents array (#107) 2023-03-06 09:15:38 -06:00
Andrey Kleshchev 6c54c9f8a9 Merge branch 'main' into DRTVWR-577-maint-S
# Conflicts:
#	indra/llcommon/llsdserialize.cpp
#	indra/llcommon/llsdserialize.h
#	indra/newview/llfilepicker.h
#	indra/newview/llfilepicker_mac.h
#	indra/newview/llfilepicker_mac.mm
2023-02-09 22:33:52 +02:00
Brad Linden 5fabfa50d7 Merge remote-tracking branch 'origin/main' into DRTVWR-559 2023-02-02 12:11:40 -08:00
Brad Linden eb526fec0a Merge remote-tracking branch 'origin/main' into DRTVWR-559 2022-12-12 17:59:34 -08:00
Andrey Lihatskiy f836194516 Merge branch 'main' into DRTVWR-570-maint-Q
# Conflicts:
#	doc/contributions.txt
#	indra/newview/app_settings/shaders/class1/deferred/materialF.glsl
#	indra/newview/llfloater360capture.cpp
2022-12-12 20:53:11 +02:00
Nat Goodspeed 12f66fda13 DRTVWR-565: Merge branch 'origin/contribute' into DRTVWR-565 2022-12-12 13:27:57 -05:00
Nat Goodspeed 5a74f7648a DRTVWR-575: A few more tweaks addressing size_t wider than 32 bits. 2022-11-03 15:18:32 -04:00
Andrey Kleshchev 24fb2f8336 Merge branch 'master' (DRTVWR-548) into DRTVWR-559
# Conflicts:
#	indra/llrender/llgl.cpp
#	indra/llrender/llrendertarget.cpp
#	indra/newview/VIEWER_VERSION.txt
#	indra/newview/app_settings/shaders/class1/deferred/materialF.glsl
#	indra/newview/llfloaterpreference.cpp
#	indra/newview/llviewercontrol.cpp
#	indra/newview/llviewermenu.cpp
#	indra/newview/llviewertexturelist.cpp
#	indra/newview/llvovolume.cpp
2022-10-21 18:19:27 +03:00
Andrey Lihatskiy e0ace0c722 Merge branch 'master' into DRTVWR-570-maint-Q
# Conflicts:
# indra/newview/llnetmap.cpp
# indra/newview/llnetmap.h
2022-10-20 22:34:11 +03:00
Andrey Lihatskiy 97b676b60f Merge branch 'master' into DRTVWR-565-maint-P 2022-10-20 21:43:54 +03:00
Rye Mutt 1b31ab5c52 Introduce a U8* based interface to unzip_llsd and unpackVolumeFaces 2022-09-27 17:59:21 -04:00
Dave Parks 75de4d3276 SL-18156 Cleanup of MikktSpace integration, apply MikktSpace tangents to all meshes. 2022-09-23 12:53:24 -05:00
Dave Parks 09f3d6eaee Merge branch 'DRTVWR-559' of ssh://bitbucket.org/lindenlab/viewer into DRTVWR-559 2022-09-16 16:25:38 -05:00
Dave Parks 8dc59e5ef3 SL-18128 Clear out much OpenGL cruft and switch to core profile on AMD 2022-09-16 16:25:26 -05:00
Andrey Kleshchev 7649114588 Merge branch master (DRTVWR-571) into DRTVWR-559
# Conflicts:
#	indra/newview/llpanelface.cpp
#	indra/newview/llpanelface.h
2022-09-16 21:07:39 +03:00
Dave Parks 82ab5f9765 SL-18156 WIP -- Add NormalizedScale/NormalizedTranslation to mesh assets to recover mesh's original coordinate frame when generating tangents post download. 2022-09-15 17:23:34 -05:00
Andrey Lihatskiy 329268c5f7 Merge branch 'master' into DRTVWR-548-maint-N
# Conflicts:
#	indra/newview/llmodelpreview.h
2022-09-15 20:44:04 +03:00
Andrey Lihatskiy b5861e58cb Merge branch 'master' into DRTVWR-565-maint-P 2022-09-15 20:43:02 +03:00
Dave Parks e49d602bd9 SL-18095 Add tangents to mesh assets so we can calculate mikktspace tangents in the mesh's original coordinate frame. 2022-09-12 19:48:33 -05:00
Dave Parks d7c77e5c64 SL-18095 WIP -- Use meshoptimizer to re-weld and cache optimize after generating tangents 2022-09-12 11:48:16 -05:00
Dave Parks c822da9fe6 SL-18095 WIP -- Allow mikktspace generator to add more vertices (skip re-welding step for now). 2022-09-09 20:56:22 -05:00
Dave Parks 8ad7240a3b SL-18095 WIP -- Add Mikktspace tangent generation for PBR materials and switch to per-pixel binormal generation. Still bugged with some test content. 2022-09-08 10:06:53 -05:00
Andrey Kleshchev 09400b74ad SL-17902 Crash at LLAlignedArray, out of bounds 2022-08-04 22:14:08 +03:00
Andrey Lihatskiy 59ab8e78f4 Merge branch 'master' into DRTVWR-544-maint
# Conflicts:
#	indra/newview/llpanelface.cpp
#	indra/newview/llpanelface.h
#	indra/newview/llpanelobject.cpp
2022-08-04 00:17:55 +03:00
Andrey Lihatskiy ea26ee5e92 Merge branch 'master' into DRTVWR-548-maint-N
# Conflicts:
#	indra/newview/llfloaterworldmap.cpp
#	indra/newview/llvovolume.cpp
2022-08-04 00:15:36 +03:00
Andrey Lihatskiy dfc1175546 Merge branch 'master' into DRTVWR-565-maint-P 2022-08-04 00:12:26 +03:00
Cosmic Linden cdff716908 SL-17801: Don't let external code delete the raw pointer to the picking octree 2022-07-26 10:40:19 -07:00
Cosmic Linden f1128da8da SL-17801: Use raw array for mOctreeTriangles to avoid memory alignment issues, increasing risk of crashes during picking due to SIMD operations 2022-07-26 10:40:19 -07:00
Cosmic Linden 4ef83bb8bd SL-17801: Add various safeguards to keep triangle indices count valid 2022-07-21 15:19:00 -07:00
Andrey Kleshchev f4e6ccc2c4 SL-17796 Crash at LLVolumeFace::getVertexData 2022-07-19 21:08:51 +03:00
Andrey Kleshchev a330095650 SL-16793 Potential crash at createSide 2022-07-07 00:01:33 +03:00
Andrey Kleshchev c01388fb0b SL-16793 Crash at LLProfile::addHole
addHole can be accessed from main tread and from mesh thread, safeguard pt
2022-07-06 21:24:25 +03:00
Cosmic Linden 162280cd98 SL-17021: Templatize LLOctreeNode and related classes to allow for option to store elements in octrees as raw pointers. Use for faster allocation in LLVolumeFace::createOctree. 2022-06-21 12:33:32 -07:00
Maxim Nikolenko 076a895062 SL-17635 remove unused variables 2022-06-21 17:55:29 +03:00
Andrey Kleshchev f451672b0c SL-17475 Fix wrong remap buffer size 2022-06-16 16:46:04 +03:00
Andrey Kleshchev b1cbf369cf SL-17475 Use a shadow indices buffer before simplification 2022-06-14 21:41:27 +03:00
Andrey Kleshchev 45bcefd981 SL-17475 fix remap causing an assert 2022-06-14 16:40:56 +03:00
Andrey Kleshchev b08340f183 SL-17475 Remap models before simplification 2022-06-11 10:23:46 +03:00