Skip to content
Snippets Groups Projects
Commit c1ba7144 authored by Joseph Boudreau's avatar Joseph Boudreau
Browse files

Merge branch 'master' of ssh://gitlab.cern.ch:7999/GeoModelDev/GeoModelVisualization

parents fc4c0eb3 66bd575e
Branches
Tags
No related merge requests found
Pipeline #1614044 passed
Stage: deps-A
Stage: deps-B
Stage: build
Expand all Hide whitespace changes
Inline Side-by-side
VP1GeometrySystems/CMakeLists.txt
+ 11
− 0
View file @ c1ba7144
......@@ -23,6 +23,7 @@ find_package( SoQt REQUIRED )
find_package( GeoModelCore REQUIRED )
find_package( GeoModelIO REQUIRED )
find_package( Eigen3 REQUIRED )
find_package(nlohmann_json QUIET)
if( APPLE )
find_package(OpenGL REQUIRED)
endif()
......@@ -60,6 +61,14 @@ include_directories(${Coin_INCLUDE_DIR} )
include_directories(${SoQt_INCLUDE_DIRS} )
include_directories(${VP1HEPVis_INCLUDE_DIRS} )
# we link to nlohmann_json only if we use a version of nlohmann_json installed through CMake;
# this is not needed if the single-header library is installed in a regular
# system include folder (e.g., '/usr/local/include')
if( nlohmann_json_FOUND OR GEOMODEL_USE_BUILTIN_JSON )
target_link_libraries( GXGeometrySystems nlohmann_json::nlohmann_json )
endif()
if ( APPLE )
target_link_directories (GXGeometrySystems PUBLIC ${Coin_LIB_DIR} )
target_link_libraries (GXGeometrySystems SoQt::SoQt Coin::Coin GeoModelCore::GeoModelKernel ${Qt5Core_LIBRARIES} GXGui GXBase GXHEPVis GeoModelIO::GeoModelRead GeoModelIO::GeoModelWrite ${SoQt_LIBRARIES} ${Qt5Gui_LIBRARIES} ${Qt5Widgets_LIBRARIES} ${Qt5PrintSupport_LIBRARIES} )
......@@ -69,6 +78,8 @@ endif()
add_definitions (${Qt5Core_DEFINITIONS})
install(TARGETS GXGeometrySystems
......
VP1GeometrySystems/share/gmexDetVisAttributes.json
+ 11
− 193
View file @ c1ba7144
......@@ -17,61 +17,9 @@
"R": 0.0
},
"name": [
"BarrelInner"
],
"shininess": 0.20000000298023224,
"specular": {
"B": 0.0,
"G": 0.0,
"R": 0.0
},
"transparency": 0.0
},
{
"ambient": {
"B": 0.20000000298023224,
"G": 0.20000000298023224,
"R": 0.20000000298023224
},
"diffuse": {
"B": 1.0,
"G": 0.666700005531311,
"R": 0.0
},
"emissive": {
"B": 0.0,
"G": 0.0,
"R": 0.0
},
"name": [
"BarrelMiddle"
],
"shininess": 0.20000000298023224,
"specular": {
"B": 0.0,
"G": 0.0,
"R": 0.0
},
"transparency": 0.0
},
{
"ambient": {
"B": 0.20000000298023224,
"G": 0.20000000298023224,
"R": 0.20000000298023224
},
"diffuse": {
"B": 1.0,
"G": 0.666700005531311,
"R": 0.0
},
"emissive": {
"B": 0.0,
"G": 0.0,
"R": 0.0
},
"name": [
"BarrelOuter"
"BarrelInner",
"BarrelMiddle",
"BarrelOuter"
],
"shininess": 0.20000000298023224,
"specular": {
......@@ -98,7 +46,8 @@
"R": 0.0
},
"name": [
"BarrelToroid"
"BarrelToroid",
"EndcapToroid"
],
"shininess": 0.20000000298023224,
"specular": {
......@@ -216,33 +165,6 @@
},
"transparency": 0.0
},
{
"ambient": {
"B": 0.1870039999485016,
"G": 0.1578110009431839,
"R": 0.0
},
"diffuse": {
"B": 0.5,
"G": 0.5,
"R": 1.0
},
"emissive": {
"B": 0.0,
"G": 0.0,
"R": 0.0
},
"name": [
"EndcapToroid"
],
"shininess": 0.20000000298023224,
"specular": {
"B": 0.9151520133018494,
"G": 0.9151520133018494,
"R": 0.9151520133018494
},
"transparency": 0.0
},
{
"ambient": {
"B": 0.1870039999485016,
......@@ -314,61 +236,10 @@
"R": 0.0
},
"name": [
"LAr"
],
"shininess": 0.20000000298023224,
"specular": {
"B": 0.0,
"G": 0.0,
"R": 0.0
},
"transparency": 0.0
},
{
"ambient": {
"B": 0.20000000298023224,
"G": 0.20000000298023224,
"R": 0.20000000298023224
},
"diffuse": {
"B": 0.800000011920929,
"G": 0.800000011920929,
"R": 0.800000011920929
},
"emissive": {
"B": 0.0,
"G": 0.0,
"R": 0.0
},
"name": [
"LArBarrel"
],
"shininess": 0.20000000298023224,
"specular": {
"B": 0.0,
"G": 0.0,
"R": 0.0
},
"transparency": 0.0
},
{
"ambient": {
"B": 0.20000000298023224,
"G": 0.20000000298023224,
"R": 0.20000000298023224
},
"diffuse": {
"B": 0.800000011920929,
"G": 0.800000011920929,
"R": 0.800000011920929
},
"emissive": {
"B": 0.0,
"G": 0.0,
"R": 0.0
},
"name": [
"LArEndcapNeg"
"LAr",
"LArBarrel",
"LArEndcapPos",
"LArEndcapNeg"
],
"shininess": 0.20000000298023224,
"specular": {
......@@ -378,60 +249,6 @@
},
"transparency": 0.0
},
{
"ambient": {
"B": 0.20000000298023224,
"G": 0.20000000298023224,
"R": 0.20000000298023224
},
"diffuse": {
"B": 0.800000011920929,
"G": 0.800000011920929,
"R": 0.800000011920929
},
"emissive": {
"B": 0.0,
"G": 0.0,
"R": 0.0
},
"name": [
"LArEndcapPos"
],
"shininess": 0.20000000298023224,
"specular": {
"B": 0.0,
"G": 0.0,
"R": 0.0
},
"transparency": 0.0
},
{
"ambient": {
"B": 0.20000000298023224,
"G": 0.20000000298023224,
"R": 0.20000000298023224
},
"diffuse": {
"B": 0.30000001192092896,
"G": 0.10999999940395355,
"R": 0.6000000238418579
},
"emissive": {
"B": 0.0,
"G": 0.0,
"R": 0.0
},
"name": [
"LucidSideA"
],
"shininess": 1.0,
"specular": {
"B": 0.0,
"G": 0.0,
"R": 0.0
},
"transparency": 0.0
},
{
"ambient": {
"B": 0.20000000298023224,
......@@ -449,7 +266,8 @@
"R": 0.0
},
"name": [
"LucidSideC"
"LucidSideA",
"LucidSideC"
],
"shininess": 1.0,
"specular": {
......
VP1GeometrySystems/share/gmexMatVisAttributes.json
+ 319
− 3960
View file @ c1ba7144
This diff is collapsed.
VP1GeometrySystems/share/gmexVolVisAttributes.json
+ 17
− 327
View file @ c1ba7144
This diff is collapsed.
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment