Permalink
Browse files

Merge branch 'master' into master-dev

  • Loading branch information...
reinago committed Oct 9, 2018
2 parents ab8f031 + 5f97af7 commit 76080a82b952a4d849841d6987113a84babec68b
View
@@ -1,5 +1,67 @@
language: generic
git:
depth: 1
matrix:
include:
- os: linux
addons:
apt:
sources:
- ubuntu-toolchain-r-test
packages:
- g++-5
env:
- CC=gcc-5
- CXX=g++-5
- os: linux
addons:
apt:
sources:
- ubuntu-toolchain-r-test
packages:
- g++-6
env:
- CC=gcc-6
- CXX=g++-6
- os: linux
addons:
apt:
sources:
- ubuntu-toolchain-r-test
packages:
- g++-7
env:
- CC=gcc-7
- CXX=g++-7
- os: linux
addons:
apt:
sources:
- llvm-toolchain-trusty-5.0
- ubuntu-toolchain-r-test
packages:
- clang-5.0
env:
- CC=clang-5.0
- CXX=clang++-5.0
- os: linux
addons:
apt:
sources:
- llvm-toolchain-trusty-6.0
- ubuntu-toolchain-r-test
packages:
- clang-6.0
env:
- CC=clang-6.0
- CXX=clang++-6.0
before_install:
- sudo apt-get -qq update
- sudo apt-get install -y uuid-dev
@@ -8,7 +70,10 @@ before_install:
- sudo apt-get install -y libxinerama-dev
- sudo apt-get install -y libxcursor-dev
- sudo apt-get install -y libxi-dev
- mkdir build
- cd build
- cmake ..
script:
- ci/build.sh
install:
- make install
View
@@ -1,8 +1,8 @@
![](logo.png)
[![Build Status Travis](https://travis-ci.org/UniStuttgart-VISUS/megamol.svg?branch=master)](https://travis-ci.org/UniStuttgart-VISUS/megamol)
[![Build Status AppVeyor](https://ci.appveyor.com/api/projects/status/github/UniStuttgart-VISUS/megamol?branch=master&svg=true)](https://ci.appveyor.com/api/projects/status/github/UniStuttgart-VISUS/megamol)
MegaMol is a visualization middleware used to visualize point-based molecular data sets. This software is developed within the ​Collaborative Research Center 716, project ​D.3 at the ​[Visualization Research Center (VISUS)](https://www.visus.uni-stuttgart.de/institut.html) of the University of Stuttgart and at the ​Computer Graphics and Visualization Group of the TU Dresden.
[![Build Status AppVeyor](https://ci.appveyor.com/api/projects/status/github/UniStuttgart-VISUS/megamol?branch=master&svg=true)](https://ci.appveyor.com/project/megamolservice/megamol)
MegaMol is a visualization middleware used to visualize point-based molecular data sets. This software is developed within the ​Collaborative Research Center 716, subproject ​D.3 at the ​[Visualization Research Center (VISUS)](https://www.visus.uni-stuttgart.de/institut.html) of the University of Stuttgart and at the ​Computer Graphics and Visualization Group of the TU Dresden.
MegaMol succeeds [​MolCloud](http://www.visus.uni-stuttgart.de/institut/personen/wissenschaftliche-mitarbeiter/sebastian-grottel/molcloud.html), which has been developed at the University of Stuttgart in order to visualize point-based data sets. MegaMol is written in C++, and uses an OpenGL as Rendering-API and GLSL-Shader. It supports the operating systems Microsoft Windows and Linux, each in 32-bit and 64-bit versions. In large parts, MegaMol is based on [VISlib](https://svn.vis.uni-stuttgart.de/trac/vislib), a C++-class library for scientific visualization, which has also been developed at the University of Stuttgart.
View

This file was deleted.

Oops, something went wrong.
View

This file was deleted.

Oops, something went wrong.
View
Binary file not shown.
Binary file not shown.

0 comments on commit 76080a8

Please sign in to comment.