Commit Graph

35 Commits (67bad0bd4b44cb1c6930422a00f363b5822182b7)

Author SHA1 Message Date
Ansariel eaa5dc798c Merge branch 'master' of https://bitbucket.org/Ansariel/phoenix-firestorm-atlasaurus
# Conflicts:
#	indra/newview/llfloaterregioninfo.cpp
#	indra/newview/llversioninfo.cpp
#	indra/newview/llviewertexturelist.cpp
2024-07-30 10:45:11 +02:00
Beq b2e4ccbf26 Updated handling of unsupported primitive modes
Added a warning message and return false if prim->mMode is not of expected types.
2024-07-19 07:03:12 +01:00
Zi Ree af93e58192
Initialize array before use (#2011)
gcc detects usage of this array as uninitialized, so make sure it's initialized. I am not sure if this is a legitimate warning, or if the code guarantees the array gets initialized before use in lines 140-142 and this is a performance optimization.
2024-07-12 19:08:56 +03:00
Dave Parks 98941831e4
Fix for GLTF scenes not uploading (#1994) 2024-07-11 11:36:36 -05:00
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
Dave Parks 08b933a0c6
#1870 Tune up for better experience on integrated intel with low memory (#1872)
* More deterministic vsize calculation.   Add control for choosing downscale method.
* Quick hack to make GLTF preview work again
2024-07-03 17:42:24 -05:00
Dave Parks ab87978cbc
1836 dont store texture in system memory unless absolutely necessary (#1843)
* #1836 Texture memory usage overhaul.  Much decrufting
- don't keep a copy of textures in system memory
- use GPU to downrez textures instead of reloading from cache
- use GPU to generate brightness/darkness bumpmaps
2024-06-27 13:12:43 -05:00
Dave Parks 80ea30af1a
#1769 gltf optimization pass (#1816)
#1814 and #1517 Fix mirror update rate and occlusion culling
2024-06-21 13:13:08 -05:00
Brad Linden 8444cd9562 Fix whitespace pre-commit hook failures 2024-06-12 13:51:21 -07:00
Brad Linden 8729c0d2c4 Fixup more signed/unsigned warnings after merge. 2024-06-12 12:53:45 -07:00
Brad Linden d12c897bfc Merge remote-tracking branch 'origin/project/gltf_development' into brad/maint-a-merge-to-gltf-dev
# Conflicts:
 #	indra/newview/gltf/primitive.cpp
2024-06-12 10:31:27 -07:00
Brad Linden 9775d7ea10 Merge remote-tracking branch 'origin/release/maint-a' into project/gltf_development 2024-06-11 17:42:17 -07:00
Brad Linden a7b0f93911 Fixed signed/unsigned warnings after they got enabled in the maint-A merge 2024-06-11 15:39:48 -07:00
Dave Parks f40fbdf4ad
#1718 Add GLTF support for multiple texcoords (#1720)
* Fix for GLTF MeshPrimitiveModes test
2024-06-11 17:10:13 -05:00
Dave Parks 429c92ad75
#1687 Add support for KHR_texture_transform (#1717) 2024-06-11 13:27:54 -05:00
Andrey Lihatskiy 3d4bc98f6b Trim remaining trailing whitespaces after #1695 2024-06-11 17:38:48 +03:00
Ansariel d9789bfaf2 Merge branch 'main' of https://github.com/secondlife/viewer into DRTVWR-600-maint-A
# Conflicts:
#	indra/llappearance/llavatarappearance.h
#	indra/llimage/llimage.cpp
#	indra/llmath/llvolume.cpp
#	indra/llmath/llvolume.h
#	indra/llprimitive/llgltfmaterial.h
#	indra/llrender/llrendertarget.cpp
#	indra/llrender/llshadermgr.cpp
#	indra/newview/lldynamictexture.cpp
#	indra/newview/llenvironment.cpp
#	indra/newview/llfetchedgltfmaterial.cpp
#	indra/newview/llfloaterimagepreview.cpp
#	indra/newview/llfloaterimagepreview.h
#	indra/newview/llfloaterregioninfo.cpp
#	indra/newview/llfloaterregioninfo.h
#	indra/newview/llmaniprotate.cpp
#	indra/newview/llmaniptranslate.cpp
#	indra/newview/llpanelvolume.cpp
#	indra/newview/llselectmgr.cpp
#	indra/newview/llselectmgr.h
#	indra/newview/llsurface.cpp
#	indra/newview/llsurface.h
#	indra/newview/llsurfacepatch.cpp
#	indra/newview/lltexturectrl.cpp
#	indra/newview/lltexturectrl.h
#	indra/newview/lltinygltfhelper.cpp
#	indra/newview/llviewertexture.cpp
#	indra/newview/llviewerwindow.cpp
#	indra/newview/llviewerwindow.h
#	indra/newview/llvlcomposition.cpp
#	indra/newview/llvlcomposition.h
#	indra/newview/llvocache.cpp
#	indra/newview/llvovolume.cpp
#	indra/newview/pipeline.cpp
2024-06-11 13:38:43 +02:00
Dave Parks 4522f33d2b
#1677 Add GLTF extensions serialization and support for KHR_materials_unlit (#1686) 2024-06-10 16:57:31 -05:00
Dave Parks 227e9be068
#1654 generate normals and tangents according to gltf specification (#1662)
* Disable unloading of objects in background. 
* Add unlit GLTF shader variant
2024-06-10 10:43:38 -05:00
Dave Parks 33ddedd6b5
#1638 Add permissions checks to GLTF Save As and Upload buttons (#1653) 2024-06-07 09:51:32 -05:00
RunitaiLinden e279aae51a #1597 Fix for some GLTF transforms not loading properly.
Also incidental fix for unreachable code error.
2024-05-30 13:42:27 -05:00
Dave Parks 15fd13f830
#1530 Increase joint limit for GLTF Assets (#1582)
* Migrate GLTF scene rendering to its own shaders
* Add support for ambient occlusion map separate from metallic roughness map (or absent)
* Use UBO's for GLTF joints
* Better error handling of downloading GLTF assets
2024-05-29 16:56:39 -05:00
Dave Parks 2f41200384
Remove tinygltf dependency from LL::GLTF (#1541)
* #1535 Image loading/saving support in boost::json driven GLTF parser
* #1536 GLB Support in boost::json drvien GLTF parser
2024-05-28 09:45:40 -05:00
Brad Linden 9f6849e081 Merge remote-tracking branch 'origin/project/gltf_development' into brad/merge-maint-a-to-dev 2024-05-23 11:35:23 -07:00
Brad Linden a1f49564d6 Merge remote-tracking branch 'origin/DRTVWR-600-maint-A' into brad/merge-maint-a-to-dev 2024-05-23 11:31:19 -07:00
Dave Parks 03c4458bdc
#1392 GLTF Upload (#1394)
* #1392 WIP -- Functional texture upload, stubbed out .bin upload.

* #1392 GLTF Upload WIP -- Emulates successful upload

Successfully uploads texture
Emulates successful .gltf and .bin upload by injecting into local asset cache.
Emulates rez from inventory by setting sculpt ID of selected object
Currently fails in tinygltf parsing due to missing .bin

* Add missing notification

* Build fix

* #1392 Add boost::json .gltf reading support.

* #1392 boost::json GLTF writing prototype

* Create gltf/README.md

* Update README.md

* Update README.md

* Update README.md

* Update README.md

* Update README.md

* #1392 Add ability to render directly from LL::GLTF::Material

* Fix for mac build

* Mac build fix

* #1392 AssetType and Inventory Type plumbing

* #1392 More sane error handling and scheduling of uploads.

* #1392 Actually attempt to upload glbin

* Mac build fix, upload nudge

* Mac build fix

* Fix glTF asset uploads to server

* Mac build fix (inline not static)

* More consistent inline

* Add glm, mac nudge.

* #1392 For consistency with spec, start using glm over glh:: and LLFoo

* Another attempt at placating Mac builds

* Another Mac nudge

* Mac build take 23

* #1392 Prune LLMatrix4a from GLTF namespace.

* #1392 Fix for orientation being off (glm::quat is wxyz, not xyzw)

* #1392 WIP -- Actually send the sculpt type and id, nudge readme and alpha rendering

* #1392 Working download!

* #1394 Add support for GLTFEnabled SimulatorFeature

* #1392 Review feedback

---------

Co-authored-by: Pepper Linden <3782201+rohvani@users.noreply.github.com>
2024-05-20 13:22:55 -05:00
Andrey Lihatskiy b06a99f7c7 Post-merge spaces fix 2024-05-15 12:47:27 +03:00
Ansariel 799ebf2162 Fix broken merge and BOOL/bool issues 2024-05-10 15:16:06 +02:00
RunitaiLinden a701cce8e0 #1357 Preserve asset "extras" and switch to std::shared_ptr for referencing Asset from LLViewerObject to cut down rebuild time 2024-05-01 09:51:32 -05:00
RunitaiLinden 170765fd35 #1357 Proof of concept on decomposing a GLTF scene into its component parts 2024-04-30 21:57:42 -05:00
RunitaiLinden 5e2bac01cb #1357 GLTF Export Prototype 2024-04-30 17:26:48 -05:00
RunitaiLinden cadc1a02cc
1285 GLTF Animation Prototype 2024-04-24 09:51:15 -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 720f7d7ef5
Fix mac build (#1182)
* Fix mac build

* Mac build take 2

* Mac build take 3
2024-04-10 11:25:07 -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