[LLMeshRepo sync] Change camelcase LLConvexDecomp to lowercase, so mergetool is happy~
This commit is contained in:
@@ -7,7 +7,7 @@ include(00-Common)
|
||||
include_directories(${LIBS_OPEN_DIR}/libhacd)
|
||||
|
||||
set (libndhacd_SOURCE_FILES
|
||||
LLConvexDecomposition.cpp
|
||||
llconvexdecomposition.cpp
|
||||
nd_hacdConvexDecomposition.cpp
|
||||
nd_hacdStructs.cpp
|
||||
nd_hacdUtils.cpp
|
||||
@@ -16,12 +16,12 @@ set (libndhacd_SOURCE_FILES
|
||||
)
|
||||
|
||||
set (libndhacd_HEADER_FILES
|
||||
LLConvexDecomposition.h
|
||||
llconvexdecomposition.h
|
||||
ndConvexDecomposition.h
|
||||
nd_hacdConvexDecomposition.h
|
||||
nd_hacdStructs.h
|
||||
nd_StructTracer.h
|
||||
LLConvexDecompositionStubImpl.h
|
||||
llconvexdecompositionstubimpl.h
|
||||
nd_EnterExitTracer.h
|
||||
nd_hacdDefines.h
|
||||
nd_hacdUtils.h
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
/**
|
||||
* @file LLConvexDecomposition.cpp
|
||||
* @file llconvexdecomposition.cpp
|
||||
* @author falcon@lindenlab.com
|
||||
* @brief A stub implementation of LLConvexDecomposition interface
|
||||
*
|
||||
@@ -35,7 +35,7 @@
|
||||
|
||||
#include "nd_hacdConvexDecomposition.h"
|
||||
|
||||
#include "LLConvexDecomposition.h"
|
||||
#include "llconvexdecomposition.h"
|
||||
|
||||
|
||||
/*static */bool LLConvexDecomposition::s_isInitialized = false;
|
||||
@@ -1,5 +1,5 @@
|
||||
/**
|
||||
* @file LLConvexDecomposition.cpp
|
||||
* @file llconvexdecomposition.cpp
|
||||
* @brief LLConvexDecomposition interface definition
|
||||
*
|
||||
* $LicenseInfo:firstyear=2011&license=viewerlgpl$
|
||||
@@ -1,5 +1,5 @@
|
||||
/**
|
||||
* @file LLConvexDecompositionStubImpl.cpp
|
||||
* @file llconvexdecompositionstubimpl.cpp
|
||||
* @author falcon@lindenlab.com
|
||||
* @brief A stub implementation of LLConvexDecomposition
|
||||
*
|
||||
@@ -28,7 +28,7 @@
|
||||
|
||||
#include <string.h>
|
||||
#include <memory>
|
||||
#include "LLConvexDecompositionStubImpl.h"
|
||||
#include "llconvexdecompositionstubimpl.h"
|
||||
|
||||
LLConvexDecomposition* LLConvexDecompositionImpl::getInstance()
|
||||
{
|
||||
@@ -1,5 +1,5 @@
|
||||
/**
|
||||
* @file LLConvexDecompositionStubImpl.h
|
||||
* @file llconvexdecompositionstubimpl.h
|
||||
* @author falcon@lindenlab.com
|
||||
* @brief A stub implementation of LLConvexDecomposition
|
||||
*
|
||||
@@ -29,7 +29,7 @@
|
||||
#ifndef LL_CONVEX_DECOMP_UTIL_H
|
||||
#define LL_CONVEX_DECOMP_UTIL_H
|
||||
|
||||
#include "LLConvexDecomposition.h"
|
||||
#include "llconvexdecomposition.h"
|
||||
|
||||
class LLConvexDecompositionImpl : public LLConvexDecomposition
|
||||
{
|
||||
@@ -21,7 +21,7 @@
|
||||
|
||||
|
||||
#include "ndConvexDecomposition.h"
|
||||
#include "LLConvexDecomposition.h"
|
||||
#include "llconvexdecomposition.h"
|
||||
#include "nd_hacdStructs.h"
|
||||
|
||||
namespace ndStructTracer
|
||||
|
||||
@@ -19,7 +19,7 @@
|
||||
#ifndef ND_HACD_CONVEXDECOMP_H
|
||||
#define ND_HACD_CONVEXDECOMP_H
|
||||
|
||||
#include "LLConvexDecomposition.h"
|
||||
#include "llconvexdecomposition.h"
|
||||
|
||||
#include <map>
|
||||
#include <vector>
|
||||
|
||||
@@ -17,7 +17,6 @@
|
||||
*/
|
||||
|
||||
#include "nd_hacdStructs.h"
|
||||
#include "LLConvexDecomposition.h"
|
||||
|
||||
void DecompHull::clear()
|
||||
{
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
|
||||
#include "nd_hacdDefines.h"
|
||||
#include "hacdHACD.h"
|
||||
#include "LLConvexDecomposition.h"
|
||||
#include "llconvexdecomposition.h"
|
||||
#include <vector>
|
||||
|
||||
struct LLCDHull;
|
||||
|
||||
@@ -20,7 +20,6 @@
|
||||
#define ND_HACD_UTILS_H
|
||||
|
||||
#include "nd_hacdStructs.h"
|
||||
#include "LLConvexDecomposition.h"
|
||||
|
||||
tHACD* init( int nConcavity, int nClusters, int nMaxVerticesPerHull, double dMaxConnectDist, HACDDecoder *aData );
|
||||
DecompData decompose( tHACD *aHACD );
|
||||
|
||||
@@ -36,7 +36,7 @@
|
||||
|
||||
#define LLCONVEXDECOMPINTER_STATIC 1
|
||||
|
||||
#include "LLConvexDecomposition.h"
|
||||
#include "llconvexdecomposition.h"
|
||||
#include "lluploadfloaterobservers.h"
|
||||
#include "aistatemachinethread.h"
|
||||
|
||||
|
||||
Reference in New Issue
Block a user