Skip to content

Commit 71eb7cd

Browse files
committed
V4.1 alpha build updates and bug fixes
1 parent bfb9ad8 commit 71eb7cd

File tree

655 files changed

+2648
-2321
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

655 files changed

+2648
-2321
lines changed

applications/_libs/cmakelists.txt

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11

22
set(FOLDER_NAME _Libs)
33

4-
add_subdirectory(CMP_Common)
5-
add_subdirectory(CMP_FileIO)
6-
add_subdirectory(CMP_GUI)
7-
add_subdirectory(CMP_Math)
8-
add_subdirectory(CMP_Mesh)
9-
add_subdirectory(CMP_MeshCompressor)
10-
add_subdirectory(CMP_MeshOptimizer)
11-
add_subdirectory(GPU_Decode)
4+
add_subdirectory(cmp_common)
5+
add_subdirectory(cmp_fileio)
6+
add_subdirectory(cmp_gui)
7+
add_subdirectory(cmp_math)
8+
add_subdirectory(cmp_mesh)
9+
add_subdirectory(cmp_meshcompressor)
10+
add_subdirectory(cmp_meshoptimizer)
11+
add_subdirectory(gpu_decode)

applications/_libs/cmp_common/cmakelists.txt

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,26 +2,26 @@
22
add_library(CMP_Common INTERFACE)
33

44
# This is the current location of these files. They should be moved here
5-
set(LEGACY_LOCATION ../../../CMP_Framework)
5+
set(LEGACY_LOCATION ../../../cmp_framework)
66

77
target_sources(CMP_Common INTERFACE
88

9-
${LEGACY_LOCATION}/Compute_Base.cpp
10-
${LEGACY_LOCATION}/Compute_Base.h
11-
${LEGACY_LOCATION}/Common/CMP_BoxFilter.cpp
12-
${LEGACY_LOCATION}/Common/CMP_BoxFilter.h
13-
${LEGACY_LOCATION}/Common/CMP_MIPS.cpp
14-
${LEGACY_LOCATION}/Common/CMP_MIPS.h
15-
${LEGACY_LOCATION}/Common/HDR_Encode.cpp
16-
${LEGACY_LOCATION}/Common/HDR_Encode.h
9+
${LEGACY_LOCATION}/compute_base.cpp
10+
${LEGACY_LOCATION}/compute_base.h
11+
${LEGACY_LOCATION}/common/cmp_boxfilter.cpp
12+
${LEGACY_LOCATION}/common/cmp_boxfilter.h
13+
${LEGACY_LOCATION}/common/cmp_mips.cpp
14+
${LEGACY_LOCATION}/common/cmp_mips.h
15+
${LEGACY_LOCATION}/common/hdr_encode.cpp
16+
${LEGACY_LOCATION}/common/hdr_encode.h
1717
)
1818

1919
target_include_directories(CMP_Common INTERFACE
2020

21-
./Common
21+
./common
2222
./
2323
${LEGACY_LOCATION}
24-
${LEGACY_LOCATION}/Common
24+
${LEGACY_LOCATION}/common
2525
)
2626

2727
target_link_libraries(CMP_Common INTERFACE

applications/_libs/cmp_fileio/cmakelists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
add_library(CMP_FileIO)
33

44
# This is the current location of these files. They should be moved here
5-
set(LEGACY_LOCATION ../../_Plugins/Common)
5+
set(LEGACY_LOCATION ../../_plugins/common)
66

77
target_sources(CMP_FileIO PRIVATE
88

9-
${LEGACY_LOCATION}/CMP_FileIO.cpp
10-
${LEGACY_LOCATION}/CMP_FileIO.h
9+
${LEGACY_LOCATION}/cmp_fileio.cpp
10+
${LEGACY_LOCATION}/cmp_fileio.h
1111
)
1212

1313
target_include_directories(CMP_FileIO PUBLIC

applications/_libs/cmp_gui/cmakelists.txt

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,23 +2,23 @@
22
add_library(CMP_GUI INTERFACE)
33

44
# This is the current location of these files. They should be moved here
5-
set(LEGACY_LOCATION ../../CompressonatorGUI)
5+
set(LEGACY_LOCATION ../../compressonatorgui)
66

77
target_sources(CMP_GUI
88
INTERFACE
9-
${LEGACY_LOCATION}/Common/cvmatandqimage.cpp
10-
${LEGACY_LOCATION}/Common/cvmatandqimage.h
11-
${LEGACY_LOCATION}/Components/cpImageLoader.h
12-
${LEGACY_LOCATION}/Components/cpImageLoader.cpp
9+
${LEGACY_LOCATION}/common/cvmatandqimage.cpp
10+
${LEGACY_LOCATION}/common/cvmatandqimage.h
11+
${LEGACY_LOCATION}/components/cpimageloader.h
12+
${LEGACY_LOCATION}/components/cpimageloader.cpp
1313
)
1414

1515
target_include_directories(CMP_GUI
1616
INTERFACE
17-
./Common
18-
./Components
17+
./common
18+
./components
1919
./
20-
${LEGACY_LOCATION}/Common
21-
${LEGACY_LOCATION}/Components
20+
${LEGACY_LOCATION}/common
21+
${LEGACY_LOCATION}/components
2222
${LEGACY_LOCATION}
2323
)
2424

applications/_libs/cmp_math/cmakelists.txt

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,25 +2,25 @@
22
add_library(CMP_Math)
33

44
# This is the current location of these files. They should be moved here
5-
set(LEGACY_LOCATION ../../../CMP_Framework/Common)
5+
set(LEGACY_LOCATION ../../../cmp_framework/common)
66

77
target_sources(CMP_Math PRIVATE
88

99
cmp_math_common.cpp
1010
cmp_math_common.h
1111
cmp_math_cpuid.cpp
1212
cmp_math_cpuid.h
13-
JML.h
14-
JMLFuncs.cpp
15-
JMLFuncs.h
16-
JMLMatrix.h
17-
JMLScalar.h
18-
JMLSSEVec.h
19-
JMLVec2.h
20-
JMLVec3.h
21-
JRTCommon.h
22-
${LEGACY_LOCATION}/MathMacros.h
23-
TootlePCH.h
13+
jml.h
14+
jmlfuncs.cpp
15+
jmlfuncs.h
16+
jmlmatrix.h
17+
jmlscalar.h
18+
jmlssevec.h
19+
jmlvec2.h
20+
jmlvec3.h
21+
jrtcommon.h
22+
${LEGACY_LOCATION}/mathmacros.h
23+
tootlepch.h
2424
)
2525

2626
target_include_directories(CMP_Math PUBLIC

applications/_libs/cmp_math/cmp_math_common.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
#ifndef CMP_MATH_COMMON_H
2626
#define CMP_MATH_COMMON_H
2727

28-
#include "Common_Def.h"
28+
#include "common_def.h"
2929

3030
#ifndef ASPM_GPU
3131

applications/_libs/cmp_math/jml.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,10 @@
3131
#define ALIGN16 __declspec(align(16))
3232
#endif
3333

34-
#include "JMLVec2.h"
35-
#include "JMLVec3.h"
36-
#include "JMLMatrix.h"
37-
#include "JMLFuncs.h"
34+
#include "jmlvec2.h"
35+
#include "jmlvec3.h"
36+
#include "jmlmatrix.h"
37+
#include "jmlfuncs.h"
3838

3939

4040

applications/_libs/cmp_math/jmlfuncs.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@
2121
//
2222
//=====================================================================
2323

24-
#include "TootlePCH.h"
25-
#include "JRTCommon.h"
26-
#include "JMLFuncs.h"
24+
#include "tootlepch.h"
25+
#include "jrtcommon.h"
26+
#include "jmlfuncs.h"
2727

2828
#include <assert.h>
2929

applications/_libs/cmp_math/jmlfuncs.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@
2727
#include <stdlib.h>
2828
#include <math.h>
2929

30-
#include "JMLVec2.h"
31-
#include "JMLVec3.h"
32-
#include "JMLMatrix.h"
33-
#include "JMLSSEVec.h"
30+
#include "jmlvec2.h"
31+
#include "jmlvec3.h"
32+
#include "jmlmatrix.h"
33+
#include "jmlssevec.h"
3434

3535
const float PI = 3.1415926f;
3636
const float E = 2.718281828f;

applications/_libs/cmp_math/jrtcommon.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
/// epsilon value used in intersection computations.
1010
#define JRTEPSILON 0.00001f
1111

12-
#include "TootlePCH.h"
12+
#include "tootlepch.h"
1313

1414
#include <iostream>
1515

@@ -22,7 +22,7 @@ typedef unsigned int UINT;
2222
typedef unsigned short USHORT;
2323
typedef unsigned char UBYTE;
2424

25-
#include "JML.h"
25+
#include "jml.h"
2626
using namespace JML;
2727

2828
#define JRT_ASSERT(x) assert(x)

0 commit comments

Comments
 (0)