livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix the include mess in DAE export

master
Ansariel 2025-12-11 15:10:53 +01:00
parent c6cdaf705d
commit 5e8f6df24a
2 changed files with 8 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
indra/newview/daeexport.cpp
View File

@ -26,39 +26,17 @@
#include "daeexport.h" #include "daeexport.h"
//colladadom includes //colladadom includes
#if LL_MSVC #ifdef __GNUC__
#pragma warning (push)
#pragma warning (disable : 4068)
#pragma warning (disable : 4263)
#pragma warning (disable : 4264)
#endif
#pragma GCC diagnostic ignored "-Woverloaded-virtual" #pragma GCC diagnostic ignored "-Woverloaded-virtual"
#endif
#include "fix_macros.h"
#include "dae.h" #include "dae.h"
//#include "dom.h"
#include "dom/domAsset.h" #include "dom/domAsset.h"
#include "dom/domBind_material.h"
#include "dom/domCOLLADA.h" #include "dom/domCOLLADA.h"
#include "dom/domConstants.h"
#include "dom/domController.h" #include "dom/domController.h"
#include "dom/domEffect.h" #include "dom/domEffect.h"
#include "dom/domGeometry.h" #include "dom/domGeometry.h"
#include "dom/domInstance_geometry.h"
#include "dom/domInstance_material.h"
#include "dom/domInstance_node.h"
#include "dom/domInstance_effect.h"
#include "dom/domMaterial.h"
#include "dom/domMatrix.h" #include "dom/domMatrix.h"
#include "dom/domNode.h"
#include "dom/domProfile_COMMON.h"
#include "dom/domRotate.h"
#include "dom/domScale.h"
#include "dom/domTranslate.h"
#include "dom/domVisual_scene.h"
#if LL_MSVC
#pragma warning (pop)
#endif
// llimage includes // llimage includes
#include "llimagej2c.h" #include "llimagej2c.h"
@ -66,7 +44,6 @@
#include "llimagetga.h" #include "llimagetga.h"
// llui includes // llui includes
#include "llscrollcontainer.h"
#include "lltexturectrl.h" #include "lltexturectrl.h"
// newview includes // newview includes
@ -77,21 +54,18 @@
#include "llnotificationsutil.h" #include "llnotificationsutil.h"
#include "llselectmgr.h" #include "llselectmgr.h"
#include "lltexturecache.h" #include "lltexturecache.h"
#include "lltrans.h"
#include "llversioninfo.h" #include "llversioninfo.h"
#include "llviewercontrol.h" #include "llviewercontrol.h"
#include "llviewermenufile.h" #include "llviewermenufile.h"
#include "llviewernetwork.h" #include "llviewernetwork.h"
#include "llviewerregion.h"
#include "llviewertexturelist.h" #include "llviewertexturelist.h"
#include "llvovolume.h"
#include "fsexportperms.h" #include "fsexportperms.h"
static const F32 TEXTURE_DOWNLOAD_TIMEOUT = 60.f; static constexpr F32 TEXTURE_DOWNLOAD_TIMEOUT = 60.f;
// *FIXME: Don't hard code these and allow the floater to resize. Right now, I'm too lazy. <FS:CR> // *FIXME: Don't hard code these and allow the floater to resize. Right now, I'm too lazy. <FS:CR>
static const S32 EXPANDED_WIDTH = 500; static constexpr S32 EXPANDED_WIDTH = 500;
static const S32 COLLAPSED_WIDTH = 250; static constexpr S32 COLLAPSED_WIDTH = 250;
namespace DAEExportUtil namespace DAEExportUtil
{ {

7
indra/newview/daeexport.h
View File

@ -28,10 +28,10 @@
#include "llfloater.h" #include "llfloater.h"
#include "lltextureentry.h" #include "lltextureentry.h"
#include "lltexturecache.h" #include "lltexturecache.h"
#include <dom/domElements.h>
class LLViewerObject; class LLViewerObject;
class LLObjectSelection; class LLObjectSelection;
class daeElement;
class DAESaver class DAESaver
{ {
@ -43,7 +43,7 @@ public:
LLColor4 color; LLColor4 color;
std::string name; std::string name;
bool matches(LLTextureEntry* te) bool matches(LLTextureEntry* te) const
{ {
return (textureID == te->getID()) && (color == te->getColor()); return (textureID == te->getID()) && (color == te->getColor());
} }
@ -58,7 +58,7 @@ public:
return !(*this == rhs); return !(*this == rhs);
} }
MaterialInfo() {} MaterialInfo() = default;
MaterialInfo(const MaterialInfo& rhs) MaterialInfo(const MaterialInfo& rhs)
{ {
@ -133,7 +133,6 @@ private:
void onClickExport(); void onClickExport();
void onExportFileSelected(const std::vector<std::string>& filenames); void onExportFileSelected(const std::vector<std::string>& filenames);
void onTextureExportCheck(); void onTextureExportCheck();
void onCommitTextureType();
void saveTextures(); void saveTextures();
void addSelectedObjects(); void addSelectedObjects();
void addTexturePreview(); void addTexturePreview();