Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[LLMeshRepo sync] Change camelcase LLConvexDecomp to lowercase, so mergetool is happy~

Browse Source
This commit is contained in:
Inusaito Sayori
2014-04-17 18:20:34 -04:00
parent beacb5c701
commit 4c82a5660f
11 changed files with 14 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
indra/libndhacd/CMakeLists.txt
View File

@@ -7,7 +7,7 @@ include(00-Common)
include_directories(${LIBS_OPEN_DIR}/libhacd) include_directories(${LIBS_OPEN_DIR}/libhacd)
set (libndhacd_SOURCE_FILES set (libndhacd_SOURCE_FILES
LLConvexDecomposition.cpp llconvexdecomposition.cpp
nd_hacdConvexDecomposition.cpp nd_hacdConvexDecomposition.cpp
nd_hacdStructs.cpp nd_hacdStructs.cpp
nd_hacdUtils.cpp nd_hacdUtils.cpp
@@ -16,12 +16,12 @@ set (libndhacd_SOURCE_FILES
) )
set (libndhacd_HEADER_FILES set (libndhacd_HEADER_FILES
LLConvexDecomposition.h llconvexdecomposition.h
ndConvexDecomposition.h ndConvexDecomposition.h
nd_hacdConvexDecomposition.h nd_hacdConvexDecomposition.h
nd_hacdStructs.h nd_hacdStructs.h
nd_StructTracer.h nd_StructTracer.h
LLConvexDecompositionStubImpl.h llconvexdecompositionstubimpl.h
nd_EnterExitTracer.h nd_EnterExitTracer.h
nd_hacdDefines.h nd_hacdDefines.h
nd_hacdUtils.h nd_hacdUtils.h

4
indra/libndhacd/LLConvexDecomposition.cpp → indra/libndhacd/llconvexdecomposition.cpp
View File

@@ -1,5 +1,5 @@
/** /**
* @file LLConvexDecomposition.cpp * @file llconvexdecomposition.cpp
* @author falcon@lindenlab.com * @author falcon@lindenlab.com
* @brief A stub implementation of LLConvexDecomposition interface * @brief A stub implementation of LLConvexDecomposition interface
* *
@@ -35,7 +35,7 @@
#include "nd_hacdConvexDecomposition.h" #include "nd_hacdConvexDecomposition.h"
#include "LLConvexDecomposition.h" #include "llconvexdecomposition.h"
/*static */bool LLConvexDecomposition::s_isInitialized = false; /*static */bool LLConvexDecomposition::s_isInitialized = false;

2
indra/libndhacd/LLConvexDecomposition.h → indra/libndhacd/llconvexdecomposition.h
View File

@@ -1,5 +1,5 @@
/** /**
* @file LLConvexDecomposition.cpp * @file llconvexdecomposition.cpp
* @brief LLConvexDecomposition interface definition * @brief LLConvexDecomposition interface definition
* *
* $LicenseInfo:firstyear=2011&license=viewerlgpl$ * $LicenseInfo:firstyear=2011&license=viewerlgpl$

4
indra/libndhacd/LLConvexDecompositionStubImpl.cpp → indra/libndhacd/llconvexdecompositionstubimpl.cpp
View File

@@ -1,5 +1,5 @@
/** /**
* @file LLConvexDecompositionStubImpl.cpp * @file llconvexdecompositionstubimpl.cpp
* @author falcon@lindenlab.com * @author falcon@lindenlab.com
* @brief A stub implementation of LLConvexDecomposition * @brief A stub implementation of LLConvexDecomposition
* *
@@ -28,7 +28,7 @@
#include <string.h> #include <string.h>
#include <memory> #include <memory>
#include "LLConvexDecompositionStubImpl.h" #include "llconvexdecompositionstubimpl.h"
LLConvexDecomposition* LLConvexDecompositionImpl::getInstance() LLConvexDecomposition* LLConvexDecompositionImpl::getInstance()
{ {

4
indra/libndhacd/LLConvexDecompositionStubImpl.h → indra/libndhacd/llconvexdecompositionstubimpl.h
View File

@@ -1,5 +1,5 @@
/** /**
* @file LLConvexDecompositionStubImpl.h * @file llconvexdecompositionstubimpl.h
* @author falcon@lindenlab.com * @author falcon@lindenlab.com
* @brief A stub implementation of LLConvexDecomposition * @brief A stub implementation of LLConvexDecomposition
* *
@@ -29,7 +29,7 @@
#ifndef LL_CONVEX_DECOMP_UTIL_H #ifndef LL_CONVEX_DECOMP_UTIL_H
#define LL_CONVEX_DECOMP_UTIL_H #define LL_CONVEX_DECOMP_UTIL_H
#include "LLConvexDecomposition.h" #include "llconvexdecomposition.h"
class LLConvexDecompositionImpl : public LLConvexDecomposition class LLConvexDecompositionImpl : public LLConvexDecomposition
{ {

2
indra/libndhacd/nd_StructTracer.h
View File

@@ -21,7 +21,7 @@
#include "ndConvexDecomposition.h" #include "ndConvexDecomposition.h"
#include "LLConvexDecomposition.h" #include "llconvexdecomposition.h"
#include "nd_hacdStructs.h" #include "nd_hacdStructs.h"
namespace ndStructTracer namespace ndStructTracer

2
indra/libndhacd/nd_hacdConvexDecomposition.h
View File

@@ -19,7 +19,7 @@
#ifndef ND_HACD_CONVEXDECOMP_H #ifndef ND_HACD_CONVEXDECOMP_H
#define ND_HACD_CONVEXDECOMP_H #define ND_HACD_CONVEXDECOMP_H
#include "LLConvexDecomposition.h" #include "llconvexdecomposition.h"
#include <map> #include <map>
#include <vector> #include <vector>

1
indra/libndhacd/nd_hacdStructs.cpp
View File

@@ -17,7 +17,6 @@
*/ */
#include "nd_hacdStructs.h" #include "nd_hacdStructs.h"
#include "LLConvexDecomposition.h"
void DecompHull::clear() void DecompHull::clear()
{ {

2
indra/libndhacd/nd_hacdStructs.h
View File

@@ -21,7 +21,7 @@
#include "nd_hacdDefines.h" #include "nd_hacdDefines.h"
#include "hacdHACD.h" #include "hacdHACD.h"
#include "LLConvexDecomposition.h" #include "llconvexdecomposition.h"
#include <vector> #include <vector>
struct LLCDHull; struct LLCDHull;

1
indra/libndhacd/nd_hacdUtils.h
View File

@@ -20,7 +20,6 @@
#define ND_HACD_UTILS_H #define ND_HACD_UTILS_H
#include "nd_hacdStructs.h" #include "nd_hacdStructs.h"
#include "LLConvexDecomposition.h"
tHACD* init( int nConcavity, int nClusters, int nMaxVerticesPerHull, double dMaxConnectDist, HACDDecoder *aData ); tHACD* init( int nConcavity, int nClusters, int nMaxVerticesPerHull, double dMaxConnectDist, HACDDecoder *aData );
DecompData decompose( tHACD *aHACD ); DecompData decompose( tHACD *aHACD );

2
indra/newview/llmeshrepository.h
View File

@@ -36,7 +36,7 @@
#define LLCONVEXDECOMPINTER_STATIC 1 #define LLCONVEXDECOMPINTER_STATIC 1
#include "LLConvexDecomposition.h" #include "llconvexdecomposition.h"
#include "lluploadfloaterobservers.h" #include "lluploadfloaterobservers.h"
#include "aistatemachinethread.h" #include "aistatemachinethread.h"