From b88410d30fde7f4b7c9bfce7a88e692645845a34 Mon Sep 17 00:00:00 2001 From: Erika Date: Wed, 4 Sep 2024 11:52:47 +0200 Subject: [PATCH] fixed relight-merge range parameter in json --- relight-merge/relight-merge.pro | 22 ++++++++++++++-------- src/rti.cpp | 3 ++- 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/relight-merge/relight-merge.pro b/relight-merge/relight-merge.pro index dfafde4d..0c5356ec 100644 --- a/relight-merge/relight-merge.pro +++ b/relight-merge/relight-merge.pro @@ -18,18 +18,24 @@ win32:INCLUDEPATH += ../libjpeg/include win32:LIBS += ../libjpeg/lib/jpeg.lib unix:INCLUDEPATH += /usr/include/eigen3 /usr/include/python3.6m -unix:LIBS += -ljpeg -liomp5 +#unix:LIBS += -ljpeg -liomp5 #unix:QMAKE_CXXFLAGS += -fopenmp -mac:INCLUDEPATH += /usr/local/Cellar/jpeg-turbo/2.0.6/include \ +mac:INCLUDEPATH += /opt/homebrew/opt/jpeg-turbo/include \ /usr/local/include \ - /usr/local/include/eigen3 -mac:LIBS += -L/usr/local/Cellar/jpeg-turbo/2.0.6/lib/ -ljpeg + /usr/local/include/eigen3 \ + /opt/homebrew/opt/jpeg/include \ + /opt/homebrew/Cellar/eigen/3.4.0_1/include/eigen3 + # /usr/local/include/eigen3 +mac:LIBS += -L/opt/homebrew/opt/jpeg-turbo/lib/ -ljpeg mac:LIBS += -framework Accelerate -mac:QMAKE_CXXFLAGS += -fopenmp -mac:QMAKE_CXXFLAGS += -Xpreprocessor -fopenmp -lomp -I/usr/local/include -mac:QMAKE_LFLAGS += -lomp -mac:LIBS += -L /usr/local/lib /usr/local/lib/libomp.dylib +#mac:QMAKE_CXXFLAGS += -fopenmp +#mac:QMAKE_CXXFLAGS += -Xpreprocessor -fopenmp -lomp -I/usr/local/include +#mac:QMAKE_LFLAGS += -lomp +#mac:LIBS += -L /usr/local/lib /usr/local/lib/libomp.dylib +mac:QMAKE_CXXFLAGS += -Xpreprocessor +#mac:QMAKE_LFLAGS += -lomp +mac:LIBS += -L/opt/homebrew/opt/jpeg/lib SOURCES += main.cpp \ ../src/getopt.cpp \ diff --git a/src/rti.cpp b/src/rti.cpp index 39794fc4..231cf740 100644 --- a/src/rti.cpp +++ b/src/rti.cpp @@ -108,7 +108,8 @@ bool Rti::load(const char *filename, bool loadPlanes) { material.planes.resize(nplanes); for(size_t p = 0; p < nplanes; p++) { Material::Plane &plane = material.planes[p]; - plane.range = range[p].toDouble(); + if(range.size()) + plane.range = range[p].toDouble(); plane.scale = scale[p].toDouble(); plane.bias = offset[p].toDouble(); }