Commit Graph

24 Commits (d65de99052d5ff08c7c4290a1f1b8e396105b8af)

Author SHA1 Message Date
Ansariel 9fdca96f8b Re-enable compiler warnings C4244 and C4396 except for lltracerecording.h and llunittype.h for now 2024-07-08 20:27:14 +02:00
Ansariel 15b3c9f164 Fix a few merge issues 2024-06-13 02:22:03 +02:00
Brad Linden 8444cd9562 Fix whitespace pre-commit hook failures 2024-06-12 13:51:21 -07:00
RunitaiLinden c6d752b880 Merge remote-tracking branch 'origin/DRTVWR-600-maint-A' into gltf-dev-maint-a-merge 2024-05-06 16:48:58 -05:00
Dave Parks 76101843c0
Merge pull request #1399 from secondlife/release/materials_featurette
#1382 Fix for scrubbing occlusion channel of ORM map (#1383)
2024-05-03 10:16:14 -05:00
RunitaiLinden 812e2cda54
#1382 Fix for scrubbing occlusion channel of ORM map (#1383) 2024-05-01 14:37:50 -05:00
RunitaiLinden 5e2bac01cb #1357 GLTF Export Prototype 2024-04-30 17:26:48 -05:00
RunitaiLinden bc93177ea0
1176 integrate llgltfnode with selection manager and llmaniptranslate/rotate (#1258)
* #1176 Somewhat working GLTF Node support for translate tool

* #1176 Missing file from last commit

* #1176 Better translation for rotated nodes.

* #1176 Fix for objects snapping back to original position

* #1176 GLTF Samples compatibility pass -- attempt at improving rotation manip support, incidental cleanup, GLTF node debug display

* #1176 Clean out some unused and not working functions.

* #1176 Fix for mac build, incidental cleanup

* Mac build fix
2024-04-17 16:12:49 -05: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
Andrey Lihatskiy 71ed19839e Merge branch 'main' into DRTVWR-600-maint-A
# Conflicts:
#	indra/newview/llappviewer.cpp
#	indra/newview/llfloaterchangeitemthumbnail.cpp
#	indra/newview/llpanelprofile.cpp
#	indra/newview/llselectmgr.cpp
#	indra/newview/lltexturectrl.cpp
#	indra/newview/lltexturectrl.h
#	indra/newview/lltooldraganddrop.cpp
#	indra/newview/llviewerdisplay.cpp
#	indra/newview/llvovolume.cpp
2024-03-27 00:45:06 +02:00
Ansariel 60d3dd98a4 Convert remaining BOOL to bool 2024-02-21 23:14:31 +02:00
Rye Mutt bf43a8574c
Fix failure to optimize away alpha channel on some GLTF upload paths (#606)
Co-authored-by: RunitaiLinden <davep@lindenlab.com>
2024-01-16 11:09:26 -06:00
Alexander Gavriliuk 74c8b028d4 SL-20743 Use LLMutex in LLImageBase for internal data thread-safety 2023-12-21 19:12:52 +01:00
Dave Parks b9b913a60a SL-19349 Fix for hang on bulk upload of materials, add bulk upload option to material selector, incidental decruft. 2023-03-07 09:38:43 -06:00
Cosmic Linden d6841c0798 SL-19080: Update GLTF Material asset upload to v1.1, with stricter GLTF compliance and removal of unsupported features 2023-02-09 15:05:19 -08:00
Dave Parks dbc641ce52 SL-18861 Optimize away alpha channel on GLTF material imports. 2022-12-16 12:22:23 -06:00
Andrey Kleshchev 321c7895d0 SL-18741 Basic bulk upload for gltf materials #1 2022-12-02 10:24:23 +02:00
Andrey Kleshchev 172366121a SL-18560 Mac build fix 2022-11-04 19:35:16 +02:00
Andrey Kleshchev 11c87378be SL-18560 Make local materials save correctly from right-click menu 2022-11-04 18:57:48 +02:00
Andrey Kleshchev e6fb0a9397 SL-18391 Removed direct dependency of local materials onto tinygltf 2022-11-01 18:51:47 +02:00
Dave Parks f6762c3de5 SL-18105 Add to/from json capability to LLGLTFMaterial 2022-10-14 17:35:48 -05:00
Andrey Kleshchev 9346b45188 SL-17653 Multi-material file support for local materials 2022-09-29 22:39:32 +03:00
Dave Parks 8f1d226865 SL-18134 Rename Albedo to Base Color to be more consistent with GLTF spec 2022-09-23 11:19:56 -05:00
Andrey Kleshchev 4bb419031c SL-17653 Basic local gltf materials 2022-08-23 00:22:10 +03:00