Skip to content

Commit

Permalink
V4.1 alpha build updates and bug fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
NavNTCMP committed Oct 9, 2020
1 parent bfb9ad8 commit 71eb7cd
Show file tree
Hide file tree
Showing 655 changed files with 2,648 additions and 2,321 deletions.
16 changes: 8 additions & 8 deletions applications/_libs/cmakelists.txt
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@

set(FOLDER_NAME _Libs)

add_subdirectory(CMP_Common)
add_subdirectory(CMP_FileIO)
add_subdirectory(CMP_GUI)
add_subdirectory(CMP_Math)
add_subdirectory(CMP_Mesh)
add_subdirectory(CMP_MeshCompressor)
add_subdirectory(CMP_MeshOptimizer)
add_subdirectory(GPU_Decode)
add_subdirectory(cmp_common)
add_subdirectory(cmp_fileio)
add_subdirectory(cmp_gui)
add_subdirectory(cmp_math)
add_subdirectory(cmp_mesh)
add_subdirectory(cmp_meshcompressor)
add_subdirectory(cmp_meshoptimizer)
add_subdirectory(gpu_decode)
22 changes: 11 additions & 11 deletions applications/_libs/cmp_common/cmakelists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,26 +2,26 @@
add_library(CMP_Common INTERFACE)

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

target_sources(CMP_Common INTERFACE

${LEGACY_LOCATION}/Compute_Base.cpp
${LEGACY_LOCATION}/Compute_Base.h
${LEGACY_LOCATION}/Common/CMP_BoxFilter.cpp
${LEGACY_LOCATION}/Common/CMP_BoxFilter.h
${LEGACY_LOCATION}/Common/CMP_MIPS.cpp
${LEGACY_LOCATION}/Common/CMP_MIPS.h
${LEGACY_LOCATION}/Common/HDR_Encode.cpp
${LEGACY_LOCATION}/Common/HDR_Encode.h
${LEGACY_LOCATION}/compute_base.cpp
${LEGACY_LOCATION}/compute_base.h
${LEGACY_LOCATION}/common/cmp_boxfilter.cpp
${LEGACY_LOCATION}/common/cmp_boxfilter.h
${LEGACY_LOCATION}/common/cmp_mips.cpp
${LEGACY_LOCATION}/common/cmp_mips.h
${LEGACY_LOCATION}/common/hdr_encode.cpp
${LEGACY_LOCATION}/common/hdr_encode.h
)

target_include_directories(CMP_Common INTERFACE

./Common
./common
./
${LEGACY_LOCATION}
${LEGACY_LOCATION}/Common
${LEGACY_LOCATION}/common
)

target_link_libraries(CMP_Common INTERFACE
Expand Down
6 changes: 3 additions & 3 deletions applications/_libs/cmp_fileio/cmakelists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
add_library(CMP_FileIO)

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

target_sources(CMP_FileIO PRIVATE

${LEGACY_LOCATION}/CMP_FileIO.cpp
${LEGACY_LOCATION}/CMP_FileIO.h
${LEGACY_LOCATION}/cmp_fileio.cpp
${LEGACY_LOCATION}/cmp_fileio.h
)

target_include_directories(CMP_FileIO PUBLIC
Expand Down
18 changes: 9 additions & 9 deletions applications/_libs/cmp_gui/cmakelists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,23 @@
add_library(CMP_GUI INTERFACE)

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

target_sources(CMP_GUI
INTERFACE
${LEGACY_LOCATION}/Common/cvmatandqimage.cpp
${LEGACY_LOCATION}/Common/cvmatandqimage.h
${LEGACY_LOCATION}/Components/cpImageLoader.h
${LEGACY_LOCATION}/Components/cpImageLoader.cpp
${LEGACY_LOCATION}/common/cvmatandqimage.cpp
${LEGACY_LOCATION}/common/cvmatandqimage.h
${LEGACY_LOCATION}/components/cpimageloader.h
${LEGACY_LOCATION}/components/cpimageloader.cpp
)

target_include_directories(CMP_GUI
INTERFACE
./Common
./Components
./common
./components
./
${LEGACY_LOCATION}/Common
${LEGACY_LOCATION}/Components
${LEGACY_LOCATION}/common
${LEGACY_LOCATION}/components
${LEGACY_LOCATION}
)

Expand Down
24 changes: 12 additions & 12 deletions applications/_libs/cmp_math/cmakelists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,25 +2,25 @@
add_library(CMP_Math)

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

target_sources(CMP_Math PRIVATE

cmp_math_common.cpp
cmp_math_common.h
cmp_math_cpuid.cpp
cmp_math_cpuid.h
JML.h
JMLFuncs.cpp
JMLFuncs.h
JMLMatrix.h
JMLScalar.h
JMLSSEVec.h
JMLVec2.h
JMLVec3.h
JRTCommon.h
${LEGACY_LOCATION}/MathMacros.h
TootlePCH.h
jml.h
jmlfuncs.cpp
jmlfuncs.h
jmlmatrix.h
jmlscalar.h
jmlssevec.h
jmlvec2.h
jmlvec3.h
jrtcommon.h
${LEGACY_LOCATION}/mathmacros.h
tootlepch.h
)

target_include_directories(CMP_Math PUBLIC
Expand Down
2 changes: 1 addition & 1 deletion applications/_libs/cmp_math/cmp_math_common.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
#ifndef CMP_MATH_COMMON_H
#define CMP_MATH_COMMON_H

#include "Common_Def.h"
#include "common_def.h"

#ifndef ASPM_GPU

Expand Down
8 changes: 4 additions & 4 deletions applications/_libs/cmp_math/jml.h
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,10 @@
#define ALIGN16 __declspec(align(16))
#endif

#include "JMLVec2.h"
#include "JMLVec3.h"
#include "JMLMatrix.h"
#include "JMLFuncs.h"
#include "jmlvec2.h"
#include "jmlvec3.h"
#include "jmlmatrix.h"
#include "jmlfuncs.h"



Expand Down
6 changes: 3 additions & 3 deletions applications/_libs/cmp_math/jmlfuncs.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@
//
//=====================================================================

#include "TootlePCH.h"
#include "JRTCommon.h"
#include "JMLFuncs.h"
#include "tootlepch.h"
#include "jrtcommon.h"
#include "jmlfuncs.h"

#include <assert.h>

Expand Down
8 changes: 4 additions & 4 deletions applications/_libs/cmp_math/jmlfuncs.h
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,10 @@
#include <stdlib.h>
#include <math.h>

#include "JMLVec2.h"
#include "JMLVec3.h"
#include "JMLMatrix.h"
#include "JMLSSEVec.h"
#include "jmlvec2.h"
#include "jmlvec3.h"
#include "jmlmatrix.h"
#include "jmlssevec.h"

const float PI = 3.1415926f;
const float E = 2.718281828f;
Expand Down
4 changes: 2 additions & 2 deletions applications/_libs/cmp_math/jrtcommon.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
/// epsilon value used in intersection computations.
#define JRTEPSILON 0.00001f

#include "TootlePCH.h"
#include "tootlepch.h"

#include <iostream>

Expand All @@ -22,7 +22,7 @@ typedef unsigned int UINT;
typedef unsigned short USHORT;
typedef unsigned char UBYTE;

#include "JML.h"
#include "jml.h"
using namespace JML;

#define JRT_ASSERT(x) assert(x)
Expand Down
2 changes: 1 addition & 1 deletion applications/_libs/cmp_mesh/clustering.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
/// \author AMD Developer Tools Team
/// \file
****************************************************************************************/
#include "TootlePCH.h"
#include "tootlepch.h"


#include "soup.h"
Expand Down
19 changes: 9 additions & 10 deletions applications/_libs/cmp_mesh/cmakelists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -31,26 +31,26 @@ target_sources(CMP_Mesh
soup.h
souptomesh.cpp
souptomesh.h
Stripifier.cpp
Stripifier.h
Timer.cpp
Timer.h
TootlePCH.h
TootleRaytracer.cpp
TootleRaytracer.h
stripifier.cpp
stripifier.h
timer.cpp
timer.h
tootlepch.h
tootleraytracer.cpp
tootleraytracer.h
triorder.cpp
triorder.h
vector.h
viewpoints.h
window.h
)

add_subdirectory(JRT)
add_subdirectory(jrt)

target_include_directories(CMP_Mesh PUBLIC

./
./JRT/
./jrt/
)

target_link_libraries(CMP_Mesh PRIVATE
Expand Down Expand Up @@ -82,7 +82,6 @@ if (OPTION_CMP_DIRECTX)
endif()

target_link_libraries(CMP_Mesh PRIVATE

ExtDirectX
)
endif()
Expand Down
2 changes: 1 addition & 1 deletion applications/_libs/cmp_mesh/error.c
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
/// \author AMD Developer Tools Team
/// \file
****************************************************************************************/
#include "TootlePCH.h"
#include "tootlepch.h"

void error_output(const char *fmt, ...)
{
Expand Down
2 changes: 1 addition & 1 deletion applications/_libs/cmp_mesh/feedback.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
****************************************************************************************/
#include "feedback.h"

#include "TootlePCH.h"
#include "tootlepch.h"

#include "error.h"
#include "heap.h"
Expand Down
2 changes: 1 addition & 1 deletion applications/_libs/cmp_mesh/fit.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
/// \author AMD Developer Tools Team
/// \file
****************************************************************************************/
#include "TootlePCH.h"
#include "tootlepch.h"
#include <algorithm>

#include "bbox.h"
Expand Down
2 changes: 1 addition & 1 deletion applications/_libs/cmp_mesh/gdiwm.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
/// \author AMD Developer Tools Team
/// \file
****************************************************************************************/
#include "TootlePCH.h"
#include "tootlepch.h"
#include <cstdio>
#ifdef _WIN32
#include "gdiwm.h"
Expand Down
2 changes: 1 addition & 1 deletion applications/_libs/cmp_mesh/heap.c
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
/// \author AMD Developer Tools Team
/// \file
****************************************************************************************/
#include "TootlePCH.h"
#include "tootlepch.h"
#include "heap.h"

typedef struct _t_heap_node {
Expand Down
50 changes: 25 additions & 25 deletions applications/_libs/cmp_mesh/jrt/cmakelists.txt
Original file line number Diff line number Diff line change
@@ -1,29 +1,29 @@

target_sources(CMP_Mesh PRIVATE

JRTBoundingBox.cpp
JRTBoundingBox.h
JRTCamera.cpp
JRTCamera.h
JRTCommon.h
JRTCore.cpp
JRTCore.h
JRTCoreUtils.cpp
JRTCoreUtils.h
JRTH2KDTreeBuilder.cpp
JRTH2KDTreeBuilder.h
JRTHeuristicKDTreeBuilder.cpp
JRTHeuristicKDTreeBuilder.h
JRTKDTree.cpp
JRTKDTree.h
JRTKDTreeBuilder.cpp
JRTKDTreeBuilder.h
JRTMesh.cpp
JRTMesh.h
JRTOrthoCamera.cpp
JRTOrthoCamera.h
JRTPPMImage.cpp
JRTPPMImage.h
JRTTriangleIntersection.cpp
JRTTriangleIntersection.h
jrtboundingbox.cpp
jrtboundingbox.h
jrtcamera.cpp
jrtcamera.h
jrtcommon.h
jrtcore.cpp
jrtcore.h
jrtcoreutils.cpp
jrtcoreutils.h
jrth2kdtreebuilder.cpp
jrth2kdtreebuilder.h
jrtheuristickdtreebuilder.cpp
jrtheuristickdtreebuilder.h
jrtkdtree.cpp
jrtkdtree.h
jrtkdtreebuilder.cpp
jrtkdtreebuilder.h
jrtmesh.cpp
jrtmesh.h
jrtorthocamera.cpp
jrtorthocamera.h
jrtppmimage.cpp
jrtppmimage.h
jrttriangleintersection.cpp
jrttriangleintersection.h
)
6 changes: 3 additions & 3 deletions applications/_libs/cmp_mesh/jrt/jrtboundingbox.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
/// \author AMD Developer Tools Team
/// \file
****************************************************************************************/
#include "TootlePCH.h"
#include "JRTCommon.h"
#include "JRTBoundingBox.h"
#include "tootlepch.h"
#include "jrtcommon.h"
#include "jrtboundingbox.h"
#include <float.h>

JRTBoundingBox::JRTBoundingBox(const float* positions, unsigned int num_points) {
Expand Down
2 changes: 1 addition & 1 deletion applications/_libs/cmp_mesh/jrt/jrtboundingbox.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#ifndef _FRT_BOUNDING_BOX_H_
#define _FRT_BOUNDING_BOX_H_

#include "JMLSSEVec.h"
#include "jmlssevec.h"

typedef SSEVec4 SSEVector;

Expand Down

0 comments on commit 71eb7cd

Please sign in to comment.