Skip to content

Commit

Permalink
Cleanup
Browse files Browse the repository at this point in the history
- move Network.md and logo.png to docs folder
- delete .gitattributes and nlohmann_json.natvis
- cleanup .gitignore
- update license year
  • Loading branch information
moritz-h committed Jun 8, 2021
1 parent ce56761 commit 3ad89f1
Show file tree
Hide file tree
Showing 8 changed files with 47 additions and 93 deletions.
15 changes: 0 additions & 15 deletions .gitattributes

This file was deleted.

62 changes: 32 additions & 30 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,38 +1,40 @@
build/**/*
build-*/**/*
build_*/**/*
out/**/*
cmake-build-*/**/*
bin/**/*
include/**/*
external/**/*
share/**/*
stage/**/*
lib/**/*
issues/**/*
mmprjs/**/*
configurator/.vs/
configurator/bin/
configurator/MegaMolConf/obj/
configurator/packages/
configurator/MegaMolConf/Properties/AssemblyInfo\.cs
configurator/MegaMolConf/Resources/mmconfig\.res
.vscode/**/*
.idea/**/*
.gitmodules
*.orig
# IDE/CMake settings
.vs/
.vscode/
.idea/
CMakeSettings.json
CMakeUserPresets.json

# Common build dir names
build/
build-*/
build_*/
cmake-build-*/

# In-source-build artifacts
CMakeFiles/
CMakeCache.txt

# Install artifacts
/bin/
/examples/
/lib/
/share/

# Utils
utils/MMPLD/mmpld.bat
utils/MMPLD/mmpld.reg
utils/MMPLD/test*.mmpld
utils/MMPLD/test*.lua
utils/MMPLD/test*.png
utils/MMPLD/SphereTest.bat
examples/

# Outdated? Can this be removed here?
out/**/*
external/**/*
stage/**/*
issues/**/*
mmprjs/**/*
*.orig
solution/**/*
deploy/**/*

CMakeSettings.json

.vs/

CMakeUserPresets.json
4 changes: 2 additions & 2 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
BSD 3-Clause License

Copyright (c) 2007-2020, MegaMol Dev Team
Copyright (c) 2007-2020, Visualization Research Center (VISUS), University of Stuttgart
Copyright (c) 2007-2021, MegaMol Dev Team
Copyright (c) 2007-2021, Visualization Research Center (VISUS), University of Stuttgart
All rights reserved.

Redistribution and use in source and binary forms, with or without
Expand Down
26 changes: 13 additions & 13 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@

![](logo.png)
![](docs/logo.png)
[![Build Status Travis](https://travis-ci.com/UniStuttgart-VISUS/megamol.svg?branch=master)](https://travis-ci.com/UniStuttgart-VISUS/megamol)
[![Build status](https://ci.appveyor.com/api/projects/status/jrtnh313libyy3vj/branch/master?svg=true)](https://ci.appveyor.com/project/megamolservice/megamol/branch/master)


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/en) of the University of Stuttgart and at the ​Computer Graphics and Visualization Group of the TU Dresden.
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/en) of the University of Stuttgart and at the ​Computer Graphics and Visualization Group of the TU Dresden.

MegaMol succeeds MolCloud, 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 64-bit version. In large parts, MegaMol is based on VISlib, a C++-class library for scientific visualization, which has also been developed at the University of Stuttgart.

Expand All @@ -27,9 +27,9 @@ See the [license](LICENSE) file.

Please use one of the following methods to reference the MegaMol project.

**MegaMol – A Comprehensive Prototyping Framework for Visualizations**
P. Gralka, M. Becher, M. Braun, F. Frieß, C. Müller, T. Rau, K. Schatz, C. Schulz, M. Krone, G. Reina, T. Ertl
The European Physical Journal Special Topics, vol. 227, no. 14, pp. 1817--1829, 2019
**MegaMol – A Comprehensive Prototyping Framework for Visualizations**
P. Gralka, M. Becher, M. Braun, F. Frieß, C. Müller, T. Rau, K. Schatz, C. Schulz, M. Krone, G. Reina, T. Ertl
The European Physical Journal Special Topics, vol. 227, no. 14, pp. 1817--1829, 2019
doi: 10.1140/epjst/e2019-800167-5

@article{gralka2019megamol,
Expand All @@ -56,9 +56,9 @@ doi: 10.1140/epjst/e2019-800167-5
url={https://doi.org/10.1140/epjst/e2019-800167-5}
}
#
**MegaMol – A Prototyping Framework for Particle-based Visualization**
S. Grottel, M. Krone, C. Müller, G. Reina, T. Ertl
Visualization and Computer Graphics, IEEE Transactions on, vol.21, no.2, pp. 201--214, Feb. 2015
**MegaMol – A Prototyping Framework for Particle-based Visualization**
S. Grottel, M. Krone, C. Müller, G. Reina, T. Ertl
Visualization and Computer Graphics, IEEE Transactions on, vol.21, no.2, pp. 201--214, Feb. 2015
doi: 10.1109/TVCG.2014.2350479

@article{grottel2015megamol,
Expand All @@ -75,8 +75,8 @@ doi: 10.1109/TVCG.2014.2350479
ISSN={1077-2626}
}
#
**Coherent Culling and Shading for Large Molecular Dynamics Visualization**
S. Grottel, G. Reina, C. Dachsbacher, T. Ertl
**Coherent Culling and Shading for Large Molecular Dynamics Visualization**
S. Grottel, G. Reina, C. Dachsbacher, T. Ertl
Computer Graphics Forum (Proceedings of EUROVIS 2010), 29(3):953 - 962, 2010

@article{eurovis10-grottel,
Expand All @@ -90,8 +90,8 @@ Computer Graphics Forum (Proceedings of EUROVIS 2010), 29(3):953 - 962, 2010
number = {{3}}
}
#
**Optimized Data Transfer for Time-dependent, GPU-based Glyphs**
S. Grottel, G. Reina, T. Ertl
**Optimized Data Transfer for Time-dependent, GPU-based Glyphs**
S. Grottel, G. Reina, T. Ertl
In Proceedings of IEEE Pacific Visualization Symposium 2009: 65 - 72, 2009

@InProceedings{pvis09-grottel,
Expand All @@ -104,7 +104,7 @@ In Proceedings of IEEE Pacific Visualization Symposium 2009: 65 - 72, 2009
}

#
**MegaMol project website**
**MegaMol project website**
[https://megamol.org](https://megamol.org)

@misc{megamol,
Expand Down
File renamed without changes.
File renamed without changes
32 changes: 0 additions & 32 deletions nlohmann_json.natvis

This file was deleted.

1 change: 0 additions & 1 deletion plugins/gui/.gitignore

This file was deleted.

0 comments on commit 3ad89f1

Please sign in to comment.