From d8f61e736ab0ca5414c02c8fb4a227e147d4dfb9 Mon Sep 17 00:00:00 2001 From: Alexander Bock Date: Mon, 19 Sep 2016 14:02:04 +0200 Subject: [PATCH] Clean up gitignore file --- .gitignore | 167 +++++++++++++++++++++++------------------------------ ext/ghoul | 2 +- 2 files changed, 74 insertions(+), 95 deletions(-) diff --git a/.gitignore b/.gitignore index 82afb83024..0980cb3856 100644 --- a/.gitignore +++ b/.gitignore @@ -1,21 +1,21 @@ -bin/ -build/ -cache/ -tmp/ -ext/SGCT -.DS_Store -*.swp -.vscode - -# Windows system files: -Thumbs.db - -# Emacs backup files: *~ +*.swp +.DS_Store +.vscode +/bin/ +/build/ +/cache/ +Thumbs.db +tmp/ + +/documentation +/doc +/ext/SGCT -# generated glsl files *.gglsl *.GhoulGenerated.glsl +*.OpenSpaceGenerated.glsl + shaders/generated/* # CMake stuff @@ -29,88 +29,67 @@ install_manifest.txt .cproject .project -# Doxygen stuff shaders/ABuffer/constants.hglsl -*.OpenSpaceGenerated.glsl log.html -data/scene/rosetta/67P/obj/67P_rotated_5_130.obj -data/spice/NewHorizonsKernels/ -data/scene/newhorizons/pluto/pluto/textures/ -data/scene/newhorizons/pluto/pluto/utcEvents.txt -data/scene/rosetta/rosetta/textures/* -data/scene/saturn/textures/saturn.jpg -data/scene/stars/colorbv.cmap -data/scene/stars/speck/stars.speck -data/scene/stars/textures/glare.png -data/scene/stars/textures/halo.png -data/scene/sun/textures/ -data/scene/uranus/textures/uranus.jpg -data/scene/venus/textures/venus.jpg -data/scene/dawn/vestaprojection/VestaComet/VestaComet_5000.obj -data/spice/DawnKernels/ -data/scene/newhorizons/jupiter/jupiter/ProjectionsOfInterest/ -data/scene/rosetta/67P/textures -data/scene/newhorizons/jupiter/callisto/textures/callisto.jpg -data/scene/dawn/ceres/textures/gray.png -data/scene/newhorizons/pluto/charon/textures/ -data/scene/dawn/dawn/obj/ -data/scene/dawn/dawn/textures/ -data/scene/earth/textures/ -data/scene/moon/textures/Moon16k.dds -data/scene/newhorizons/jupiter/europa/textures/europa.jpg -data/scene/newhorizons/jupiter/ganymede/textures/ganymede.jpg -data/scene/newhorizons/jupiter/io/textures/io.jpg -data/scene/jupiter/jupiter/textures/jupiter.jpg -data/scene/mars/textures/mars.jpg -data/scene/mercury/textures/mercury.jpg -data/scene/milkyway/textures/DarkUniverse_mellinger_8k.jpg -data/scene/neptune/textures/neptune.jpg -data/scene/newhorizons/newhorizons/models/ -data/scene/newhorizons/newhorizons/textures/ -data/scene/pluto/textures/ -data/scene/pluto/textures/Shenk_180.jpg -data/scene/pluto/textures/pluto_highres_180.jpg -data/scene/newhorizons/pluto/pluto/assets/core_v9h_obs_getmets_v8_time_fix_nofrcd_mld.txt -data/scene/newhorizons/pluto/pluto/textures/3.jpg -data/scene/newhorizons/pluto/pluto/textures/Pluto-Text.png -data/scene/dawn/vestaprojection/VestaComet/VestaComet.mtl -data/scene/dawn/vestaprojection/textures/ -data/spice/MAR063.BSP -data/spice/de430_1850-2150.bsp -data/spice/jup260.bsp -data/BATSRUS.cdf -data/ENLIL.cdf -data/scene/newhorizons/pluto/pluto/images -data/spice/nh_kernels/ -data/scene/jupiter/jupiter/textures/Jupiter-text.png -data/scene/jupiter/callisto/textures/callisto.jpg -data/scene/jupiter/europa/textures/europa.jpg -data/scene/jupiter/ganymede/textures/ganymede.jpg -data/scene/jupiter/io/textures/io.jpg -data/scene/milkyway-eso/textures/eso0932a_blend.png -data/scene/stars-denver/denver_colorbv.cmap -data/scene/stars-denver/speck/stars.speck -data/scene/stars-denver/textures/halo.png -data/scene/newhorizons/pluto/pluto/full_images/ -data/scene/rosetta/67P/rosettaimages/ -data/scene/newhorizons/pluto/charon/utcEvents.txt -data/scene/rosetta/67P/obj/67P_HD_2015-05-09.obj -data/scene/rosetta/67P/obj/may9_map.jpg -data/scene/rosetta/67P/textures/may9_map.jpg -data/scene/newhorizons/pluto/charon/textures/cpdem-Mcolor2-MLorriCA-lr-5_ZMfs-cyl.jpg -data/scene/newhorizons/pluto/charon/textures/cpmap_cyl_HR_0e.jpg -data/scene/volumetricmilkyway/milkyway/ ScriptLog.txt -data/scene/atmosphereearth/textures/ -data/scene/juno/juno/textures -data/scene/juno/juno/spice + +data/scene/atmosphereearth/textures +data/scene/dawn/ceres/textures +data/scene/dawn/dawn/obj +data/scene/dawn/dawn/textures +data/scene/dawn/vestaprojection/textures +data/scene/dawn/vestaprojection/VestaComet +data/scene/debugglobe/textures +data/scene/earth/textures data/scene/juno/juno/Juno.mtl data/scene/juno/juno/Juno.obj -saturn_rings.png -data/scene/debugglobe/textures/ -data/scene/rosetta/rosetta/obj/Rosetta.obj -data/scene/rosetta/rosetta/rosetta/ -data/scene/rosetta/rosetta/textures/ -data/spice/Rosetta/ -documentation/ -doc/ +data/scene/juno/juno/spice +data/scene/juno/juno/textures +data/scene/jupiter/callisto/textures +data/scene/jupiter/europa/textures +data/scene/jupiter/ganymede/textures +data/scene/jupiter/io/textures +data/scene/jupiter/jupiter/textures +data/scene/mars/textures +data/scene/mercury/textures +data/scene/milkyway/textures +data/scene/milkyway-eso/textures +data/scene/moon/textures +data/scene/neptune/textures +data/scene/newhorizons/jupiter/callisto/textures +data/scene/newhorizons/jupiter/europa/textures +data/scene/newhorizons/jupiter/ganymede/textures +data/scene/newhorizons/jupiter/io/textures +data/scene/newhorizons/jupiter/jupiter/ProjectionsOfInterest +data/scene/newhorizons/newhorizons/models +data/scene/newhorizons/newhorizons/textures +data/scene/newhorizons/pluto/charon/textures +data/scene/newhorizons/pluto/pluto/assets +data/scene/newhorizons/pluto/pluto/full_images +data/scene/newhorizons/pluto/pluto/images +data/scene/newhorizons/pluto/pluto/textures +data/scene/pluto/textures +data/scene/saturn/textures +data/scene/rosetta/67P/obj +data/scene/rosetta/67P/rosettaimages +data/scene/rosetta/67P/textures +data/scene/rosetta/rosetta/rosetta +data/scene/rosetta/rosetta/textures +data/scene/stars/colorbv.cmap +data/scene/stars/speck +data/scene/stars/textures +data/scene/stars-denver/denver_colorbv.cmap +data/scene/stars-denver/speck +data/scene/stars-denver/textures +data/scene/sun/textures +data/scene/uranus/textures +data/scene/venus/textures +data/scene/volumetricmilkyway/milkyway +data/spice/DawnKernels +data/spice/jup260.bsp +data/spice/de430_1850-2150.bsp +data/spice/MAR063.BSP +data/spice/NewHorizonsKernels +data/spice/nh_kernels +data/spice/Rosetta + diff --git a/ext/ghoul b/ext/ghoul index e10dc7cc5f..db86a30fd0 160000 --- a/ext/ghoul +++ b/ext/ghoul @@ -1 +1 @@ -Subproject commit e10dc7cc5fbfd5c4d74b525f55ade7bc339e5bc6 +Subproject commit db86a30fd0f0aa1be9f3723a53acd7e85319e2a9