Permalink
Browse files

Merge pull request #18 from tobiasrau/pub_push

Pub push
  • Loading branch information...
tobiasrau committed Jan 26, 2018
2 parents 15b17e2 + 66eacd5 commit aa5a0831924e9c5c2c90569c9542e3ed09605418
Showing with 5,627 additions and 1,236 deletions.
  1. +17 −0 .clang-format
  2. +1 −1 CMakeLists.txt
  3. +17 −3 appveyor.yml
  4. +10 −9 cmake/megamol_options.cmake
  5. +18 −12 configurator/CMakeLists.txt
  6. +2 −2 configurator/MegaMolConf/MegaMolConf.csproj
  7. +0 −323 configurator/MegaMolConf/MegaMolConf.csproj.input
  8. +2 −0 console/CMakeLists.txt
  9. +4 −4 console/extra/megamol.cfg
  10. +1 −1 console/extra/megamol.sh
  11. +9 −0 console/src/gl/ATBUILayer.cpp
  12. +1 −0 console/src/gl/ATBUILayer.h
  13. +24 −0 console/src/gl/ATWinBar.cpp
  14. +4 −0 console/src/gl/ATWinBar.h
  15. +59 −8 console/src/gl/Window.cpp
  16. +12 −1 console/src/gl/Window.h
  17. +174 −0 core/include/mmcore/misc/WatermarkRenderer.h
  18. +60 −0 core/include/mmcore/moldyn/MultiParticleDataCall.h
  19. +93 −0 core/include/mmcore/special/StubModule.h
  20. +2 −1 core/include/mmcore/utility/plugins/Plugin200Instance.h
  21. +2 −2 core/include/mmcore/utility/plugins/Plugin200Utilities.h
  22. +5 −0 core/remoteconsole/CMakeLists.txt
  23. +48 −46 core/remoteconsole/src/ConClient.cpp
  24. +4 −3 core/src/CoreInstance.cpp
  25. +4 −0 core/src/factories/ModuleClassRegistry.cpp
  26. +452 −0 core/src/misc/WatermarkRenderer.cpp
  27. +16 −8 core/src/moldyn/MultiParticleDataCall.cpp
  28. +64 −0 core/src/special/StubModule.cpp
  29. +6 −6 core/src/utility/plugins/PluginManager.cpp
  30. +1 −1 core/src/view/View3D.cpp
  31. +72 −70 docs/manual.md
  32. +2 −2 plugins/OSPRay_plugin/CMakeLists.txt
  33. +1 −0 plugins/OSPRay_plugin/include/OSPRay_plugin/AbstractOSPRayStructure.h
  34. +1 −0 plugins/OSPRay_plugin/include/OSPRay_plugin/CallOSPRayStructure.h
  35. +103 −15 plugins/OSPRay_plugin/src/AbstractOSPRayRenderer.cpp
  36. +2 −0 plugins/OSPRay_plugin/src/AbstractOSPRayRenderer.h
  37. +15 −0 plugins/OSPRay_plugin/src/AbstractOSPRayStructure.cpp
  38. +5 −20 plugins/OSPRay_plugin/src/OSPRayNHSphereGeometry.cpp
  39. +11 −1 plugins/OSPRay_plugin/src/OSPRayRenderer.cpp
  40. +2 −0 plugins/OSPRay_plugin/src/OSPRayRenderer.h
  41. +3 −18 plugins/OSPRay_plugin/src/OSPRaySphereGeometry.cpp
  42. +3 −16 plugins/OSPRay_plugin/src/OSPRayStreamLines.cpp
  43. +3 −16 plugins/OSPRay_plugin/src/OSPRayStructuredVolume.cpp
  44. +3 −19 plugins/OSPRay_plugin/src/OSPRayTriangleMesh.cpp
  45. +6 −6 plugins/cinematiccamera/CMakeLists.txt
  46. +27 −17 plugins/cinematiccamera/README.md
  47. BIN plugins/cinematiccamera/demo.png
  48. +24 −18 plugins/cinematiccamera/example/cinematiccam_simplemol.mmprj
  49. +19 −19 plugins/cinematiccamera/example/keyframes.kf
  50. BIN plugins/cinematiccamera/graph.png
  51. +52 −0 plugins/cinematiccamera/shaders/CinematicRenderer.btf
  52. +2 −1 plugins/cinematiccamera/src/CinematicCamera.cpp
  53. +173 −197 plugins/cinematiccamera/src/CinematicRenderer.cpp
  54. +8 −11 plugins/cinematiccamera/src/CinematicRenderer.h
  55. +112 −30 plugins/cinematiccamera/src/CinematicView.cpp
  56. +17 −0 plugins/cinematiccamera/src/CinematicView.h
  57. +150 −65 plugins/cinematiccamera/src/KeyframeKeeper.cpp
  58. +9 −0 plugins/cinematiccamera/src/KeyframeKeeper.h
  59. +87 −19 plugins/cinematiccamera/src/KeyframeManipulator.cpp
  60. +11 −5 plugins/cinematiccamera/src/KeyframeManipulator.h
  61. +280 −0 plugins/cinematiccamera/src/ReplacementRenderer.cpp
  62. +168 −0 plugins/cinematiccamera/src/ReplacementRenderer.h
  63. +63 −42 plugins/cinematiccamera/src/TimeLineRenderer.cpp
  64. +2 −2 plugins/cinematiccamera/src/TimeLineRenderer.h
  65. +2 −2 plugins/infovis/Shaders/pc_item_draw.btf
  66. +21 −2 plugins/mmstd_datatools/src/OverrideParticleGlobals.cpp
  67. +6 −0 plugins/mmstd_datatools/src/OverrideParticleGlobals.h
  68. +451 −0 plugins/mmstd_datatools/src/ParticleNeighborhood.cpp
  69. +128 −0 plugins/mmstd_datatools/src/ParticleNeighborhood.h
  70. +451 −0 plugins/mmstd_datatools/src/ParticleThermometer.cpp
  71. +126 −0 plugins/mmstd_datatools/src/ParticleThermometer.h
  72. +318 −0 plugins/mmstd_datatools/src/ParticleVelocities.cpp
  73. +119 −0 plugins/mmstd_datatools/src/ParticleVelocities.h
  74. +243 −0 plugins/mmstd_datatools/src/PointcloudHelpers.h
  75. +190 −133 plugins/mmstd_datatools/src/floattable/CSVDataSource.cpp
  76. +6 −4 plugins/mmstd_datatools/src/floattable/CSVDataSource.h
  77. +161 −0 plugins/mmstd_datatools/src/floattable/FloatTableColumnFilter.cpp
  78. +91 −0 plugins/mmstd_datatools/src/floattable/FloatTableColumnFilter.h
  79. +167 −0 plugins/mmstd_datatools/src/floattable/FloatTableJoin.cpp
  80. +128 −0 plugins/mmstd_datatools/src/floattable/FloatTableJoin.h
  81. +10 −0 plugins/mmstd_datatools/src/mmstd_datatools.cpp
  82. +1 −1 plugins/mmstd_moldyn/Shaders/NGsphere.btf
  83. +168 −13 plugins/mmstd_moldyn/src/io/MMSPDDataSource.cpp
  84. +21 −0 plugins/mmstd_moldyn/src/io/MMSPDDataSource.h
  85. +23 −23 plugins/mmstd_moldyn/src/rendering/NGSphereRenderer.h
  86. +26 −0 plugins/protein/include/protein/RMSF.h
  87. +1 −1 plugins/protein/src/GROLoader.h
  88. +83 −9 plugins/protein/src/PDBLoader.cpp
  89. +15 −1 plugins/protein/src/PDBLoader.h
  90. +1 −0 plugins/protein/src/Protein.cpp
  91. +99 −0 plugins/protein/src/RMSF.cpp
  92. +20 −5 plugins/protein_calls/include/protein_calls/MolecularDataCall.h
  93. +2 −1 plugins/protein_calls/src/MolecularDataCall.cpp
  94. +1 −1 vislib/src/graphics/gl/AbstractOpenGLTexture.cpp
View
@@ -0,0 +1,17 @@
---
BasedOnStyle: LLVM
AccessModifierOffset: '-4'
AlignAfterOpenBracket: DontAlign
AllowShortFunctionsOnASingleLine: None
ColumnLimit: '100'
ConstructorInitializerAllOnOneLineOrOnePerLine: 'true'
IndentWidth: '4'
IncludeCategories:
- Regex: '^"(stdafx|PrecompiledHeader)'
Priority: -1
- Regex: '^<'
Priority: 1
- Regex: '^"'
Priority: 2
...
View
@@ -80,4 +80,4 @@ foreach(d ${DEP_LIST})
CHECK_MMDEP(${plugin} "${SINGLE_LIST}")
endforeach()
set(DEP_LIST "" CACHE INTERNAL "")
unset(DEP_LIST CACHE)
View
@@ -6,13 +6,27 @@ environment:
matrix:
- platform: x64
configuration: Release
os: Visual Studio 2015
image: Visual Studio 2017
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
CMAKE_GENERATOR: "Visual Studio 15 2017 Win64"
CMAKE_CONFIG: Release
VSVER: vs141
- platform: x64
configuration: Debug
image: Visual Studio 2017
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
CMAKE_GENERATOR: "Visual Studio 15 2017 Win64"
CMAKE_CONFIG: Debug
VSVER: vs141
- platform: x64
configuration: Release
image: Visual Studio 2015
CMAKE_GENERATOR: "Visual Studio 14 2015 Win64"
CMAKE_CONFIG: Release
VSVER: vs140
- platform: x64
configuration: Debug
os: Visual Studio 2015
image: Visual Studio 2015
CMAKE_GENERATOR: "Visual Studio 14 2015 Win64"
CMAKE_CONFIG: Debug
VSVER: vs140
@@ -35,4 +49,4 @@ build_script:
after_build:
- cd c:\projects\megamol\stage\
- 7z a -y -bd megamol.zip
- ps: Push-AppveyorArtifact "megamol.zip" -Filename "megamol-${env:VSVER}-${env:Platform}-${env:Configuration}.zip"
- ps: Push-AppveyorArtifact "megamol.zip" -Filename "megamol-${env:VSVER}-${env:Platform}-${env:Configuration}.zip"
@@ -1,16 +1,17 @@
# processor word size detection
if(CMAKE_SIZEOF_VOID_P EQUAL 8)
set(BITS 64)
else()
set(BITS 32)
endif()
# compiler options
if(WIN32)
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DDEBUG -D_DEBUG -W3 -DNOMINMAX")
set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -DNDEBUG -D_NDEBUG -O3 -g0 -W3 -DNOMINMAX")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O3 -fPIC -W3 -pedantic -std=c99")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Gm -DNOMINMAX -W3 -openmp")
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DDEBUG -D_DEBUG")
set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -DNDEBUG -D_NDEBUG -Ox -g0")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Ox -Gm -fPIC -W3 -pedantic -std=c99 -openmp")
elseif(UNIX)
# processor word size detection
if(CMAKE_SIZEOF_VOID_P EQUAL 8)
set(BITS 64)
else()
set(BITS 32)
endif()
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DDEBUG -D_DEBUG -Wall -pedantic -fPIC -DUNIX -D_GNU_SOURCE -D_LIN${BITS} -ggdb -ldl")
set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -DNDEBUG -D_NDEBUG -O3 -g0 -Wall -pedantic -fPIC -DUNIX -D_GNU_SOURCE -D_LIN${BITS} -ldl")
set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-Bsymbolic")
@@ -20,25 +20,17 @@ if(BUILD_CONFIGURATOR)
set(CONFIGURATOR_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/MegaMolConf)
string(REGEX REPLACE "/" "\\\\" CONF_SOURCE ${CMAKE_CURRENT_SOURCE_DIR})
string(REGEX REPLACE "/" "\\\\" CONF_BIN ${CMAKE_CURRENT_BINARY_DIR})
string(REGEX REPLACE "/" "\\\\" CONF_INST ${CMAKE_INSTALL_PREFIX})
configure_file(${CONFIGURATOR_SOURCE}/Resources/mmconfig.rc.input mmconfig.rc)
configure_file(${CONFIGURATOR_SOURCE}/Properties/AssemblyInfo.cs.input AssemblyInfo.cs)
# Libs and include dirs
set(LIBS ${ZMQ_LIB})
include_directories("MegaMolConf" ${EXTERNAL_INSTALL_LOCATION}/include)
file(GLOB_RECURSE resource_files RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "MegaMolConf/*.resx")
file(GLOB_RECURSE source_files RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "MegaMolConf/*.cs")
#configure_file(${CONFIGURATOR_SOURCE}/MegaMolConf.csproj.input MegaMolConf.csproj)
add_custom_target(install_configurator_deps
add_custom_target(prebuild_configurator_deps
COMMAND "copy" "${CONF_BIN}\\mmconfig.res" "${CONF_SOURCE}\\MegaMolConf\\Resources\\mmconfig.res"
COMMAND "copy" "${CONF_BIN}\\AssemblyInfo.cs" "${CONF_SOURCE}\\MegaMolConf\\Properties\\AssemblyInfo.cs")
set_target_properties(install_configurator_deps PROPERTIES FOLDER configurator)
set_target_properties(prebuild_configurator_deps PROPERTIES FOLDER configurator)
include_external_msproject(MegaMolConf "${CMAKE_CURRENT_SOURCE_DIR}/MegaMolConf/MegaMolConf.csproj" install_configurator_deps)
include_external_msproject(MegaMolConf "${CMAKE_CURRENT_SOURCE_DIR}/MegaMolConf/MegaMolConf.csproj" prebuild_configurator_deps)
set_target_properties(MegaMolConf PROPERTIES FOLDER configurator)
@@ -63,4 +55,18 @@ if(BUILD_CONFIGURATOR)
endif()
endif()
# Install binaries and libraries
install(CODE "configure_file(${CMAKE_CURRENT_SOURCE_DIR}/bin/MegaMolConf.exe ${CMAKE_INSTALL_PREFIX}/bin/MegaMolConf.exe COPYONLY)")
install(CODE "configure_file(${CMAKE_CURRENT_SOURCE_DIR}/bin/ZeroMQ.dll ${CMAKE_INSTALL_PREFIX}/bin/ZeroMQ.dll COPYONLY)")
if(BITS EQUAL 64)
set(sub_dir "amd64")
else()
set(sub_dir "i386")
endif()
install(CODE "configure_file(${CMAKE_CURRENT_SOURCE_DIR}/bin/${sub_dir}/libsodium.dll ${CMAKE_INSTALL_PREFIX}/bin/${sub_dir}/libsodium.dll COPYONLY)")
install(CODE "configure_file(${CMAKE_CURRENT_SOURCE_DIR}/bin/${sub_dir}/libzmq.dll ${CMAKE_INSTALL_PREFIX}/bin/${sub_dir}/libzmq.dll COPYONLY)")
endif()
@@ -21,7 +21,7 @@
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
<DebugSymbols>true</DebugSymbols>
<OutputPath>..\bin\Debug\</OutputPath>
<OutputPath>..\bin\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<DebugType>full</DebugType>
<PlatformTarget>AnyCPU</PlatformTarget>
@@ -30,7 +30,7 @@
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'">
<OutputPath>..\bin\Release\</OutputPath>
<OutputPath>..\bin\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<Optimize>true</Optimize>
<DebugType>pdbonly</DebugType>
Oops, something went wrong.

0 comments on commit aa5a083

Please sign in to comment.