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

Fix mac build (#1182) 

* Fix mac build

* Mac build take 2

* Mac build take 3
master
RunitaiLinden 2024-04-10 11:25:07 -05:00 committed by GitHub
parent b2a450a308
commit 720f7d7ef5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/gltf/asset.cpp
View File

@ -24,6 +24,8 @@
* $/LicenseInfo$
*/
#include "../llviewerprecompiledheaders.h"
#include "asset.h"
#include "llvolumeoctree.h"

16
indra/newview/gltf/primitive.cpp
View File

@ -9,7 +9,7 @@
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation;
* version 2.1 of the License only.
* version 2.1 of the License only.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@ -24,34 +24,38 @@
* $/LicenseInfo$
*/
#include "../llviewerprecompiledheaders.h"
#include "asset.h"
#include "../lltinygltfhelper.h"
using namespace LL::GLTF;
#ifndef __PRETTY_FUNCTION__
#define __PRETTY_FUNCTION__ __FUNCSIG__
#ifdef _MSC_VER
#define LL_FUNCSIG __FUNCSIG__
#else
#define LL_FUNCSIG __PRETTY_FUNCTION__
#endif
// copy one vec3 from src to dst
template<class S, class T>
void copyVec2(S* src, T& dst)
{
LL_ERRS() << "TODO: implement " << __PRETTY_FUNCTION__ << LL_ENDL;
LL_ERRS() << "TODO: implement " << LL_FUNCSIG << LL_ENDL;
}
// copy one vec3 from src to dst
template<class S, class T>
void copyVec3(S* src, T& dst)
{
LL_ERRS() << "TODO: implement " << __PRETTY_FUNCTION__ << LL_ENDL;
LL_ERRS() << "TODO: implement " << LL_FUNCSIG << LL_ENDL;
}
// copy one vec4 from src to dst
template<class S, class T>
void copyVec4(S* src, T& dst)
{
LL_ERRS() << "TODO: implement " << __PRETTY_FUNCTION__ << LL_ENDL;
LL_ERRS() << "TODO: implement " << LL_FUNCSIG << LL_ENDL;
}
template<>

3
indra/newview/gltfscenemanager.cpp
View File

@ -24,6 +24,8 @@
* $/LicenseInfo$
*/
#include "llviewerprecompiledheaders.h"
#include "gltfscenemanager.h"
#include "llviewermenufile.h"
#include "llappviewer.h"
@ -329,7 +331,6 @@ void renderAssetDebug(LLViewerObject* obj, Asset* asset)
gGL.pushMatrix();
// get raycast in asset space
LLMatrix4a asset_to_agent = getAssetToAgentTransform(obj);
LLMatrix4a agent_to_asset = getAgentToAssetTransform(obj);
LLVector4a start;