...
 
Commits (2)
......@@ -230,10 +230,6 @@ SET(CMAKE_AUTOMOC ON)
# As moc files are generated in the binary dir, tell CMake to always look for includes there.
SET(CMAKE_INCLUDE_CURRENT_DIR ON)
MESSAGE("CMAKE_MODULE_PATH=${CMAKE_MODULE_PATH}")
MESSAGE("CMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH}")
# Find and set up Qt5 libraries.
FOREACH(component IN ITEMS Core Concurrent Network Gui)
FIND_PACKAGE(Qt5${component} REQUIRED)
......
......@@ -10,6 +10,16 @@ sudo port install -s fftw-3 libssh
Install Qt libraries, version 5.9.5
**************************************************************************
# This is a workaround to let VS Code Intellisense find the Qt headers:
cd $HOME/progs/Qt/5.9.5/clang_64/
mkdir headers
cd headers
ln -s $HOME/progs/Qt/5.9.5/clang_64/lib/QtConcurrent.framework/Versions/5/Headers/ QtCore
ln -s $HOME/progs/Qt/5.9.5/clang_64/lib/QtGui.framework/Versions/5/Headers/ QtGui
ln -s $HOME/progs/Qt/5.9.5/clang_64/lib/QtWidgets.framework/Versions/5/Headers/ QtWidgets
ln -s $HOME/progs/Qt/5.9.5/clang_64/lib/QtConcurrent.framework/Versions/5/Headers/ QtConcurrent
ln -s $HOME/progs/Qt/5.9.5/clang_64/lib/QtNetwork.framework/Versions/5/Headers/ QtNetwork
**************************************************************************
Download and build SIP
**************************************************************************
......
......@@ -19,14 +19,6 @@
//
///////////////////////////////////////////////////////////////////////////////
/******************************************************************************
*
******************************************************************************/
/**
* \file
* \brief Defines several macros for debugging purposes.
*/
#pragma once
......
......@@ -109,8 +109,7 @@ namespace ospray {
materialList ? ispcMaterialPtrs.data() : nullptr,
texcoordData ? (ispc::vec2f *)texcoordData->data : nullptr,
colorData ? colorData->data : nullptr,
colorOffset, colorStride,
colorData && colorData->type == OSP_FLOAT4,
colorOffset, colorStride, colorFormat,
numDiscs, bytesPerDisc,
radius, materialID,
offset_center, offset_normal, offset_radius,
......
......@@ -107,8 +107,7 @@ namespace ospray {
materialList ? ispcMaterialPtrs.data() : nullptr,
texcoordData ? (ispc::vec2f *)texcoordData->data : nullptr,
colorData ? colorData->data : nullptr,
colorOffset, colorStride,
colorData && colorData->type == OSP_FLOAT4,
colorOffset, colorStride, colorData,
numQuadrics, bytesPerQuadric,
materialID,
offset_center, offset_coeff, offset_radius,
......
......@@ -32,8 +32,8 @@
#include <ospray/ospray_cpp.h>
#include <ospray/version.h>
#if QT_VERSION_CHECK(OSPRAY_VERSION_MAJOR, OSPRAY_VERSION_MINOR, OSPRAY_VERSION_PATCH) < QT_VERSION_CHECK(1,5,0)
#error "OVITO requires OSPRay version 1.5.0 or newer."
#if QT_VERSION_CHECK(OSPRAY_VERSION_MAJOR, OSPRAY_VERSION_MINOR, OSPRAY_VERSION_PATCH) < QT_VERSION_CHECK(1,6,0)
#error "OVITO requires OSPRay version 1.6.0 or newer."
#endif
#include <render/LoadBalancer.h>
#include <ospcommon/tasking/parallel_for.h>
......
......@@ -129,7 +129,7 @@ def import_file(location, **params):
try:
# Block execution until file is loaded.
state = pipeline.evaluate_pipeline(pipeline.dataset.anim.time)
state = pipeline.evaluate_pipeline(0) # Requesting frame 0 here, because full list of frames is not loaded yet at this point.
# Raise exception if error occurs during loading.
if state.status.type == PipelineStatus.Type.Error:
......