diff --git a/modules/base/basemodule.h b/modules/base/basemodule.h index f9838dbe31..ab115abb1a 100644 --- a/modules/base/basemodule.h +++ b/modules/base/basemodule.h @@ -22,8 +22,8 @@ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * ****************************************************************************************/ -#ifndef __BASEMODULE_H__ -#define __BASEMODULE_H__ +#ifndef __OPENSPACE_MODULE_BASE___BASEMODULE___H__ +#define __OPENSPACE_MODULE_BASE___BASEMODULE___H__ #include @@ -41,4 +41,4 @@ protected: } // namespace openspace -#endif // __BASEMODULE_H__ +#endif // __OPENSPACE_MODULE_BASE___BASEMODULE___H__ diff --git a/modules/base/rendering/modelgeometry.h b/modules/base/rendering/modelgeometry.h index f01989799a..8cd5a9abba 100644 --- a/modules/base/rendering/modelgeometry.h +++ b/modules/base/rendering/modelgeometry.h @@ -22,8 +22,8 @@ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * ****************************************************************************************/ -#ifndef __MODELGEOMETRY_H__ -#define __MODELGEOMETRY_H__ +#ifndef __OPENSPACE_MODULE_BASE___MODELGEOMETRY___H__ +#define __OPENSPACE_MODULE_BASE___MODELGEOMETRY___H__ #include @@ -81,4 +81,4 @@ protected: } // namespace modelgeometry } // namespace openspace -#endif // __MODELGEOMETRY_H__ +#endif // __OPENSPACE_MODULE_BASE___MODELGEOMETRY___H__ diff --git a/modules/base/rendering/multimodelgeometry.cpp b/modules/base/rendering/multimodelgeometry.cpp index 7d427edf46..27bf69034b 100644 --- a/modules/base/rendering/multimodelgeometry.cpp +++ b/modules/base/rendering/multimodelgeometry.cpp @@ -1,26 +1,26 @@ /***************************************************************************************** -* * -* OpenSpace * -* * -* Copyright (c) 2014-2016 * -* * -* Permission is hereby granted, free of charge, to any person obtaining a copy of this * -* software and associated documentation files (the "Software"), to deal in the Software * -* without restriction, including without limitation the rights to use, copy, modify, * -* merge, publish, distribute, sublicense, and/or sell copies of the Software, and to * -* permit persons to whom the Software is furnished to do so, subject to the following * -* conditions: * -* * -* The above copyright notice and this permission notice shall be included in all copies * -* or substantial portions of the Software. * -* * -* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, * -* INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A * -* PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT * -* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF * -* CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE * -* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * -****************************************************************************************/ + * * + * OpenSpace * + * * + * Copyright (c) 2014-2016 * + * * + * Permission is hereby granted, free of charge, to any person obtaining a copy of this * + * software and associated documentation files (the "Software"), to deal in the Software * + * without restriction, including without limitation the rights to use, copy, modify, * + * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to * + * permit persons to whom the Software is furnished to do so, subject to the following * + * conditions: * + * * + * The above copyright notice and this permission notice shall be included in all copies * + * or substantial portions of the Software. * + * * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, * + * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A * + * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT * + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF * + * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE * + * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * + ****************************************************************************************/ #include diff --git a/modules/base/rendering/multimodelgeometry.h b/modules/base/rendering/multimodelgeometry.h index e343a30be9..ce4d8436e7 100644 --- a/modules/base/rendering/multimodelgeometry.h +++ b/modules/base/rendering/multimodelgeometry.h @@ -1,51 +1,51 @@ /***************************************************************************************** -* * -* OpenSpace * -* * -* Copyright (c) 2014-2016 * -* * -* Permission is hereby granted, free of charge, to any person obtaining a copy of this * -* software and associated documentation files (the "Software"), to deal in the Software * -* without restriction, including without limitation the rights to use, copy, modify, * -* merge, publish, distribute, sublicense, and/or sell copies of the Software, and to * -* permit persons to whom the Software is furnished to do so, subject to the following * -* conditions: * -* * -* The above copyright notice and this permission notice shall be included in all copies * -* or substantial portions of the Software. * -* * -* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, * -* INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A * -* PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT * -* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF * -* CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE * -* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * -****************************************************************************************/ + * * + * OpenSpace * + * * + * Copyright (c) 2014-2016 * + * * + * Permission is hereby granted, free of charge, to any person obtaining a copy of this * + * software and associated documentation files (the "Software"), to deal in the Software * + * without restriction, including without limitation the rights to use, copy, modify, * + * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to * + * permit persons to whom the Software is furnished to do so, subject to the following * + * conditions: * + * * + * The above copyright notice and this permission notice shall be included in all copies * + * or substantial portions of the Software. * + * * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, * + * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A * + * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT * + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF * + * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE * + * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * + ****************************************************************************************/ -#ifndef __MULTIMODELGEOMETRY_H__ -#define __MULTIMODELGEOMETRY_H__ +#ifndef __OPENSPACE_MODULE_BASE___MULTIMODELGEOMETRY___H__ +#define __OPENSPACE_MODULE_BASE___MULTIMODELGEOMETRY___H__ #include namespace openspace { - class RenderableModel; - class RenderableModelProjection; +class RenderableModel; +class RenderableModelProjection; - namespace modelgeometry { +namespace modelgeometry { - class MultiModelGeometry : public ModelGeometry { - public: - MultiModelGeometry(const ghoul::Dictionary& dictionary); +class MultiModelGeometry : public ModelGeometry { +public: + MultiModelGeometry(const ghoul::Dictionary& dictionary); - bool initialize(Renderable* parent) override; - void deinitialize() override; + bool initialize(Renderable* parent) override; + void deinitialize() override; - private: - bool loadModel(const std::string& filename); - }; +private: + bool loadModel(const std::string& filename); +}; - } // namespace modelgeometry +} // namespace modelgeometry } // namespace openspace -#endif // __MULTIMODELOBJECT_H__ +#endif // __OPENSPACE_MODULE_BASE___MULTIMODELGEOMETRY___H__ diff --git a/modules/base/rendering/planetgeometry.h b/modules/base/rendering/planetgeometry.h index 2442fa11d5..d9a44a7d7c 100644 --- a/modules/base/rendering/planetgeometry.h +++ b/modules/base/rendering/planetgeometry.h @@ -22,8 +22,8 @@ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * ****************************************************************************************/ -#ifndef __PLANETGEOMETRY_H__ -#define __PLANETGEOMETRY_H__ +#ifndef __OPENSPACE_MODULE_BASE___PLANETGEOMETRY___H__ +#define __OPENSPACE_MODULE_BASE___PLANETGEOMETRY___H__ #include @@ -53,4 +53,4 @@ protected: } // namespace planetgeometry } // namespace openspace -#endif // __PLANETGEOMETRY_H__ +#endif // __OPENSPACE_MODULE_BASE___PLANETGEOMETRY___H__ diff --git a/modules/base/rendering/renderableconstellationbounds.h b/modules/base/rendering/renderableconstellationbounds.h index 2a6ab74a04..9b93a669f0 100644 --- a/modules/base/rendering/renderableconstellationbounds.h +++ b/modules/base/rendering/renderableconstellationbounds.h @@ -22,8 +22,8 @@ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * ****************************************************************************************/ -#ifndef __RENDERABLECONSTELLATIONBOUNDS_H__ -#define __RENDERABLECONSTELLATIONBOUNDS_H__ +#ifndef __OPENSPACE_MODULE_BASE___RENDERABLECONSTELLATIONBOUNDS___H__ +#define __OPENSPACE_MODULE_BASE___RENDERABLECONSTELLATIONBOUNDS___H__ #include @@ -126,4 +126,4 @@ private: } // namespace openspace -#endif // __RENDERABLECONSTELLATIONBOUNDS_H__ +#endif // __OPENSPACE_MODULE_BASE___RENDERABLECONSTELLATIONBOUNDS___H__ diff --git a/modules/base/rendering/renderablemodel.h b/modules/base/rendering/renderablemodel.h index a476562be9..2921b47ee4 100644 --- a/modules/base/rendering/renderablemodel.h +++ b/modules/base/rendering/renderablemodel.h @@ -22,8 +22,8 @@ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * ****************************************************************************************/ -#ifndef __RENDERABLEMODEL_H__ -#define __RENDERABLEMODEL_H__ +#ifndef __OPENSPACE_MODULE_BASE___RENDERABLEMODEL___H__ +#define __OPENSPACE_MODULE_BASE___RENDERABLEMODEL___H__ #include @@ -87,4 +87,4 @@ private: } // namespace openspace -#endif // __RENDERABLEMODEL_H__ +#endif // __OPENSPACE_MODULE_BASE___RENDERABLEMODEL___H__ diff --git a/modules/base/rendering/renderablepath.h b/modules/base/rendering/renderablepath.h index 5627363162..e83fc305da 100644 --- a/modules/base/rendering/renderablepath.h +++ b/modules/base/rendering/renderablepath.h @@ -22,8 +22,8 @@ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * ****************************************************************************************/ -#ifndef __RENDERABLEPATH_H__ -#define __RENDERABLEPATH_H__ +#ifndef __OPENSPACE_MODULE_BASE___RENDERABLEPATH___H__ +#define __OPENSPACE_MODULE_BASE___RENDERABLEPATH___H__ #include #include @@ -91,4 +91,4 @@ private: } // namespace openspace -#endif // __RENDERABLEPATH_H__ +#endif // __OPENSPACE_MODULE_BASE___RENDERABLEPATH___H__ diff --git a/modules/base/rendering/renderableplane.h b/modules/base/rendering/renderableplane.h index 8057895d52..3b8ce519dd 100644 --- a/modules/base/rendering/renderableplane.h +++ b/modules/base/rendering/renderableplane.h @@ -22,8 +22,8 @@ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * ****************************************************************************************/ -#ifndef RENDERABLEPLANE_H_ -#define RENDERABLEPLANE_H_ +#ifndef __OPENSPACE_MODULE_BASE___RENDERABLEPLANE___H__ +#define __OPENSPACE_MODULE_BASE___RENDERABLEPLANE___H__ #include @@ -92,4 +92,5 @@ private: }; } // namespace openspace -#endif // RENDERABLEFIELDLINES_H_ + +#endif // __OPENSPACE_MODULE_BASE___RENDERABLEPLANE___H__ diff --git a/modules/base/rendering/renderableplanet.h b/modules/base/rendering/renderableplanet.h index 47f26ea491..ea066e1b3e 100644 --- a/modules/base/rendering/renderableplanet.h +++ b/modules/base/rendering/renderableplanet.h @@ -22,10 +22,9 @@ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * ****************************************************************************************/ -#ifndef __RENDERABLEPLANET_H__ -#define __RENDERABLEPLANET_H__ +#ifndef __OPENSPACE_MODULE_BASE___RENDERABLEPLANET___H__ +#define __OPENSPACE_MODULE_BASE___RENDERABLEPLANET___H__ -// open space includes #include #include @@ -39,7 +38,6 @@ #include #include -// ghoul includes namespace ghoul { namespace opengl { class ProgramObject; @@ -111,9 +109,8 @@ private: double _time; bool tempPic; - }; } // namespace openspace -#endif // __RENDERABLEPLANET_H__ +#endif // __OPENSPACE_MODULE_BASE___RENDERABLEPLANET___H__ diff --git a/modules/base/rendering/renderablerings.h b/modules/base/rendering/renderablerings.h index f6319ceece..4cc0b13da2 100644 --- a/modules/base/rendering/renderablerings.h +++ b/modules/base/rendering/renderablerings.h @@ -22,8 +22,8 @@ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * ****************************************************************************************/ -#ifndef __RENDERABLERINGS_H__ -#define __RENDERABLERINGS_H__ +#ifndef __OPENSPACE_MODULE_BASE___RENDERABLERINGS___H__ +#define __OPENSPACE_MODULE_BASE___RENDERABLERINGS___H__ #include @@ -82,4 +82,4 @@ private: } // namespace openspace -#endif // __RENDERABLERINGS_H__ +#endif // __OPENSPACE_MODULE_BASE___RENDERABLERINGS___H__ diff --git a/modules/base/rendering/renderablesphere.h b/modules/base/rendering/renderablesphere.h index 8b82e0f8b0..b423a864a7 100644 --- a/modules/base/rendering/renderablesphere.h +++ b/modules/base/rendering/renderablesphere.h @@ -22,8 +22,8 @@ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * ****************************************************************************************/ -#ifndef __RENDERABLESPHERE_H__ -#define __RENDERABLESPHERE_H__ +#ifndef __OPENSPACE_MODULE_BASE___RENDERABLESPHERE___H__ +#define __OPENSPACE_MODULE_BASE___RENDERABLESPHERE___H__ #include #include @@ -72,4 +72,5 @@ private: }; } // namespace openspace -#endif // __RENDERABLESPHERE_H__ + +#endif // __OPENSPACE_MODULE_BASE___RENDERABLESPHERE___H__ diff --git a/modules/base/rendering/renderablesphericalgrid.h b/modules/base/rendering/renderablesphericalgrid.h index 6c7cf37da2..47bfabc849 100644 --- a/modules/base/rendering/renderablesphericalgrid.h +++ b/modules/base/rendering/renderablesphericalgrid.h @@ -22,16 +22,12 @@ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * ****************************************************************************************/ -#ifndef __RENDERABLESPHERICALGRID_H__ -#define __RENDERABLESPHERICALGRID_H__ +#ifndef __OPENSPACE_MODULE_BASE___RENDERABLESPHERICALGRID___H__ +#define __OPENSPACE_MODULE_BASE___RENDERABLESPHERICALGRID___H__ -// more or less a brutal adaptation of powerscaledsphere class - -// open space includes #include #include -// ghoul includes #include #include @@ -48,7 +44,7 @@ public: void render(const RenderData& data) override; void update(const UpdateData& data) override; -private: + protected: typedef struct { GLfloat location[4]; @@ -57,7 +53,6 @@ protected: GLubyte padding[28]; // Pads the struct out to 64 bytes for performance increase } Vertex; - ghoul::opengl::ProgramObject* _gridProgram; std::string _gridType; glm::vec4 _gridColor; @@ -79,5 +74,7 @@ protected: Vertex* _varray; int* _iarray; }; + }// namespace openspace -#endif \ No newline at end of file + +#endif // __OPENSPACE_MODULE_BASE___RENDERABLESPHERICALGRID___H__ diff --git a/modules/base/rendering/renderablestars.h b/modules/base/rendering/renderablestars.h index b1c309d3c4..c2c583396e 100644 --- a/modules/base/rendering/renderablestars.h +++ b/modules/base/rendering/renderablestars.h @@ -22,8 +22,8 @@ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * ****************************************************************************************/ -#ifndef __RENDERABLESTARS_H__ -#define __RENDERABLESTARS_H__ +#ifndef __OPENSPACE_MODULE_BASE___RENDERABLESTARS___H__ +#define __OPENSPACE_MODULE_BASE___RENDERABLESTARS___H__ #include @@ -105,4 +105,4 @@ private: } // namespace openspace -#endif // __RENDERABLESTARS_H__ \ No newline at end of file +#endif // __OPENSPACE_MODULE_BASE___RENDERABLESTARS___H__ diff --git a/modules/base/rendering/renderabletrail.h b/modules/base/rendering/renderabletrail.h index fac2259f49..4b421cf88a 100644 --- a/modules/base/rendering/renderabletrail.h +++ b/modules/base/rendering/renderabletrail.h @@ -22,8 +22,8 @@ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * ****************************************************************************************/ -#ifndef __RENDERABLETRAIL_H__ -#define __RENDERABLETRAIL_H__ +#ifndef __OPENSPACE_MODULE_BASE___RENDERABLETRAIL___H__ +#define __OPENSPACE_MODULE_BASE___RENDERABLETRAIL___H__ #include @@ -161,4 +161,4 @@ private: } // namespace openspace -#endif // __RENDERABLETRAIL_H__ +#endif // __OPENSPACE_MODULE_BASE___RENDERABLETRAIL___H__ diff --git a/modules/base/rendering/renderabletrailorbit.h b/modules/base/rendering/renderabletrailorbit.h index 2b8f5a4712..79371ce5d9 100644 --- a/modules/base/rendering/renderabletrailorbit.h +++ b/modules/base/rendering/renderabletrailorbit.h @@ -22,8 +22,8 @@ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * ****************************************************************************************/ -#ifndef __RENDERABLETRAILORBIT_H__ -#define __RENDERABLETRAILORBIT_H__ +#ifndef __OPENSPACE_MODULE_BASE___RENDERABLETRAILORBIT___H__ +#define __OPENSPACE_MODULE_BASE___RENDERABLETRAILORBIT___H__ #include @@ -102,4 +102,4 @@ private: } // namespace openspace -#endif // __RENDERABLETRAILORBIT_H__ +#endif // __OPENSPACE_MODULE_BASE___RENDERABLETRAILORBIT___H__ diff --git a/modules/base/rendering/renderabletrailtrajectory.h b/modules/base/rendering/renderabletrailtrajectory.h index bba77cfa68..519b505c6c 100644 --- a/modules/base/rendering/renderabletrailtrajectory.h +++ b/modules/base/rendering/renderabletrailtrajectory.h @@ -22,8 +22,8 @@ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * ****************************************************************************************/ -#ifndef __RENDERABLETRAILTRAJECTORY_H__ -#define __RENDERABLETRAILTRAJECTORY_H__ +#ifndef __OPENSPACE_MODULE_BASE___RENDERABLETRAILTRAJECTORY___H__ +#define __OPENSPACE_MODULE_BASE___RENDERABLETRAILTRAJECTORY___H__ #include @@ -86,4 +86,4 @@ private: } // namespace openspace -#endif // __RENDERABLETRAILTRAJECTORY_H__ +#endif // __OPENSPACE_MODULE_BASE___RENDERABLETRAILTRAJECTORY___H__ diff --git a/modules/base/rendering/screenspaceframebuffer.cpp b/modules/base/rendering/screenspaceframebuffer.cpp index 812a1831a4..1e9502a9f1 100644 --- a/modules/base/rendering/screenspaceframebuffer.cpp +++ b/modules/base/rendering/screenspaceframebuffer.cpp @@ -1,26 +1,26 @@ /***************************************************************************************** -* * -* OpenSpace * -* * -* Copyright (c) 2014-2016 * -* * -* Permission is hereby granted, free of charge, to any person obtaining a copy of this * -* software and associated documentation files (the "Software"), to deal in the Software * -* without restriction, including without limitation the rights to use, copy, modify, * -* merge, publish, distribute, sublicense, and/or sell copies of the Software, and to * -* permit persons to whom the Software is furnished to do so, subject to the following * -* conditions: * -* * -* The above copyright notice and this permission notice shall be included in all copies * -* or substantial portions of the Software. * -* * -* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, * -* INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A * -* PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT * -* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF * -* CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE * -* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * -****************************************************************************************/ + * * + * OpenSpace * + * * + * Copyright (c) 2014-2016 * + * * + * Permission is hereby granted, free of charge, to any person obtaining a copy of this * + * software and associated documentation files (the "Software"), to deal in the Software * + * without restriction, including without limitation the rights to use, copy, modify, * + * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to * + * permit persons to whom the Software is furnished to do so, subject to the following * + * conditions: * + * * + * The above copyright notice and this permission notice shall be included in all copies * + * or substantial portions of the Software. * + * * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, * + * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A * + * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT * + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF * + * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE * + * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * + ****************************************************************************************/ #include #include diff --git a/modules/base/rendering/screenspaceframebuffer.h b/modules/base/rendering/screenspaceframebuffer.h index 6bce0a9ab5..ab408e77ba 100644 --- a/modules/base/rendering/screenspaceframebuffer.h +++ b/modules/base/rendering/screenspaceframebuffer.h @@ -1,29 +1,29 @@ /***************************************************************************************** -* * -* OpenSpace * -* * -* Copyright (c) 2014-2016 * -* * -* Permission is hereby granted, free of charge, to any person obtaining a copy of this * -* software and associated documentation files (the "Software"), to deal in the Software * -* without restriction, including without limitation the rights to use, copy, modify, * -* merge, publish, distribute, sublicense, and/or sell copies of the Software, and to * -* permit persons to whom the Software is furnished to do so, subject to the following * -* conditions: * -* * -* The above copyright notice and this permission notice shall be included in all copies * -* or substantial portions of the Software. * -* * -* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, * -* INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A * -* PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT * -* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF * -* CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE * -* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * -****************************************************************************************/ + * * + * OpenSpace * + * * + * Copyright (c) 2014-2016 * + * * + * Permission is hereby granted, free of charge, to any person obtaining a copy of this * + * software and associated documentation files (the "Software"), to deal in the Software * + * without restriction, including without limitation the rights to use, copy, modify, * + * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to * + * permit persons to whom the Software is furnished to do so, subject to the following * + * conditions: * + * * + * The above copyright notice and this permission notice shall be included in all copies * + * or substantial portions of the Software. * + * * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, * + * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A * + * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT * + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF * + * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE * + * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * + ****************************************************************************************/ -#ifndef __SCREENSPACEFRAMEBUFFER_H__ -#define __SCREENSPACEFRAMEBUFFER_H__ +#ifndef __OPENSPACE_MODULE_BASE___SCREENSPACEFRAMEBUFFER___H__ +#define __OPENSPACE_MODULE_BASE___SCREENSPACEFRAMEBUFFER___H__ #include @@ -67,4 +67,5 @@ private: }; } //namespace openspace -#endif //__SCREENSPACEFRAMEBUFFER_H__ \ No newline at end of file + +#endif //__OPENSPACE_MODULE_BASE___SCREENSPACEFRAMEBUFFER___H__ diff --git a/modules/base/rendering/screenspaceimage.h b/modules/base/rendering/screenspaceimage.h index df66d02db7..190598b430 100644 --- a/modules/base/rendering/screenspaceimage.h +++ b/modules/base/rendering/screenspaceimage.h @@ -22,8 +22,8 @@ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * ****************************************************************************************/ -#ifndef __SCREENSPACEIMAGE_H__ -#define __SCREENSPACEIMAGE_H__ +#ifndef __OPENSPACE_MODULE_BASE___SCREENSPACEIMAGE___H__ +#define __OPENSPACE_MODULE_BASE___SCREENSPACEIMAGE___H__ #include @@ -63,4 +63,4 @@ private: } //namespace openspace -#endif //__SCREENSPACEIMAGE_H__ +#endif //__OPENSPACE_MODULE_BASE___SCREENSPACEIMAGE___H__ diff --git a/modules/base/rendering/simplespheregeometry.h b/modules/base/rendering/simplespheregeometry.h index 0d7fa3de9a..9997a76f90 100644 --- a/modules/base/rendering/simplespheregeometry.h +++ b/modules/base/rendering/simplespheregeometry.h @@ -22,8 +22,8 @@ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * ****************************************************************************************/ -#ifndef __SIMPLESPHEREGEOMETRY_H__ -#define __SIMPLESPHEREGEOMETRY_H__ +#ifndef __OPENSPACE_MODULE_BASE___SIMPLESPHEREGEOMETRY___H__ +#define __OPENSPACE_MODULE_BASE___SIMPLESPHEREGEOMETRY___H__ #include @@ -62,4 +62,4 @@ private: } // namespace planetgeometry } // namespace openspace -#endif // __SIMPLESPHEREGEOMETRY_H__ +#endif // __OPENSPACE_MODULE_BASE___SIMPLESPHEREGEOMETRY___H__ diff --git a/modules/base/rotation/spicerotation.h b/modules/base/rotation/spicerotation.h index 4c3cecf729..05110afd77 100644 --- a/modules/base/rotation/spicerotation.h +++ b/modules/base/rotation/spicerotation.h @@ -22,8 +22,8 @@ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * ****************************************************************************************/ -#ifndef __SPICEROTATION_H__ -#define __SPICEROTATION_H__ +#ifndef __OPENSPACE_MODULE_BASE___SPICEROTATION___H__ +#define __OPENSPACE_MODULE_BASE___SPICEROTATION___H__ #include #include @@ -46,4 +46,4 @@ private: } // namespace openspace -#endif // __SPICEROTATION_H__ +#endif // __OPENSPACE_MODULE_BASE___SPICEROTATION___H__ diff --git a/modules/base/rotation/staticrotation.h b/modules/base/rotation/staticrotation.h index 95490dd186..c2439edde1 100644 --- a/modules/base/rotation/staticrotation.h +++ b/modules/base/rotation/staticrotation.h @@ -22,8 +22,8 @@ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * ****************************************************************************************/ -#ifndef __STATICROTATION_H__ -#define __STATICROTATION_H__ +#ifndef __OPENSPACE_MODULE_BASE___STATICROTATION___H__ +#define __OPENSPACE_MODULE_BASE___STATICROTATION___H__ #include @@ -45,4 +45,4 @@ private: } // namespace openspace -#endif // __STATICROTATION_H__ +#endif // __OPENSPACE_MODULE_BASE___STATICROTATION___H__ diff --git a/modules/base/scale/staticscale.h b/modules/base/scale/staticscale.h index 29db57acd3..8ab3e36c3e 100644 --- a/modules/base/scale/staticscale.h +++ b/modules/base/scale/staticscale.h @@ -22,8 +22,8 @@ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * ****************************************************************************************/ -#ifndef __STATICSCALE_H__ -#define __STATICSCALE_H__ +#ifndef __OPENSPACE_MODULE_BASE___STATICSCALE___H__ +#define __OPENSPACE_MODULE_BASE___STATICSCALE___H__ #include @@ -46,4 +46,4 @@ private: } // namespace openspace -#endif // __STATICSCALE_H__ +#endif // __OPENSPACE_MODULE_BASE___STATICSCALE___H__ diff --git a/modules/base/translation/keplertranslation.h b/modules/base/translation/keplertranslation.h index 09c84c8dae..169e8f3d89 100644 --- a/modules/base/translation/keplertranslation.h +++ b/modules/base/translation/keplertranslation.h @@ -22,8 +22,8 @@ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * ****************************************************************************************/ -#ifndef __KEPLERTRANSLATION_H__ -#define __KEPLERTRANSLATION_H__ +#ifndef __OPENSPACE_MODULE_BASE___KEPLERTRANSLATION___H__ +#define __OPENSPACE_MODULE_BASE___KEPLERTRANSLATION___H__ #include @@ -174,4 +174,4 @@ private: } // namespace openspace -#endif // __KEPLERTRANSLATION_H__ +#endif // __OPENSPACE_MODULE_BASE___KEPLERTRANSLATION___H__ diff --git a/modules/base/translation/spicetranslation.h b/modules/base/translation/spicetranslation.h index 74bb507fb0..4a95b5b122 100644 --- a/modules/base/translation/spicetranslation.h +++ b/modules/base/translation/spicetranslation.h @@ -22,8 +22,8 @@ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * ****************************************************************************************/ -#ifndef __SPICETRANSLATION_H__ -#define __SPICETRANSLATION_H__ +#ifndef __OPENSPACE_MODULE_BASE___SPICETRANSLATION___H__ +#define __OPENSPACE_MODULE_BASE___SPICETRANSLATION___H__ #include @@ -51,4 +51,4 @@ private: } // namespace openspace -#endif // __SPICETRANSLATION_H__ +#endif // __OPENSPACE_MODULE_BASE___SPICETRANSLATION___H__ diff --git a/modules/base/translation/statictranslation.h b/modules/base/translation/statictranslation.h index f753e92202..a699497888 100644 --- a/modules/base/translation/statictranslation.h +++ b/modules/base/translation/statictranslation.h @@ -22,8 +22,8 @@ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * ****************************************************************************************/ -#ifndef __STATICTRANSLATION_H__ -#define __STATICTRANSLATION_H__ +#ifndef __OPENSPACE_MODULE_BASE___STATICTRANSLATION___H__ +#define __OPENSPACE_MODULE_BASE___STATICTRANSLATION___H__ #include @@ -48,4 +48,4 @@ private: } // namespace openspace -#endif // __STATICTRANSLATION_H__ +#endif // __OPENSPACE_MODULE_BASE___STATICTRANSLATION___H__ diff --git a/modules/base/translation/tletranslation.h b/modules/base/translation/tletranslation.h index e7df9bb721..20de6a8ca5 100644 --- a/modules/base/translation/tletranslation.h +++ b/modules/base/translation/tletranslation.h @@ -22,8 +22,8 @@ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * ****************************************************************************************/ -#ifndef __TLETRANSLATION_H__ -#define __TLETRANSLATION_H__ +#ifndef __OPENSPACE_MODULE_BASE___TLETRANSLATION___H__ +#define __OPENSPACE_MODULE_BASE___TLETRANSLATION___H__ #include @@ -72,4 +72,4 @@ private: } // namespace openspace -#endif // __TLETRANSLATION_H__ +#endif // __OPENSPACE_MODULE_BASE___TLETRANSLATION___H__ diff --git a/modules/debugging/debuggingmodule.h b/modules/debugging/debuggingmodule.h index 8a33551351..8ea478a4d0 100644 --- a/modules/debugging/debuggingmodule.h +++ b/modules/debugging/debuggingmodule.h @@ -22,8 +22,8 @@ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * ****************************************************************************************/ -#ifndef __DEBUGGINGMODULE_H__ -#define __DEBUGGINGMODULE_H__ +#ifndef __OPENSPACE_MODULE_BASE___DEBUGGINGMODULE___H__ +#define __OPENSPACE_MODULE_BASE___DEBUGGINGMODULE___H__ #include @@ -39,4 +39,4 @@ protected: } // namespace openspace -#endif // __DEBUGGINGMODULE_H__ +#endif // __OPENSPACE_MODULE_BASE___DEBUGGINGMODULE___H__ diff --git a/modules/debugging/rendering/debugrenderer.cpp b/modules/debugging/rendering/debugrenderer.cpp index 907d1e0ffd..de3305a842 100644 --- a/modules/debugging/rendering/debugrenderer.cpp +++ b/modules/debugging/rendering/debugrenderer.cpp @@ -41,220 +41,233 @@ namespace { namespace openspace { - DebugRenderer* DebugRenderer::_reference = nullptr; +DebugRenderer* DebugRenderer::_reference = nullptr; - DebugRenderer::DebugRenderer() { - _programObject = OsEng.renderEngine().buildRenderProgram( - "BasicDebugShader", - "${MODULE_DEBUGGING}/rendering/debugshader_vs.glsl", - "${MODULE_DEBUGGING}/rendering/debugshader_fs.glsl" - ); - } +DebugRenderer::DebugRenderer() { + _programObject = OsEng.renderEngine().buildRenderProgram( + "BasicDebugShader", + "${MODULE_DEBUGGING}/rendering/debugshader_vs.glsl", + "${MODULE_DEBUGGING}/rendering/debugshader_fs.glsl" + ); +} - DebugRenderer::DebugRenderer(std::unique_ptr programObject) - : _programObject(std::move(programObject)) - { - // nothing to do - } +DebugRenderer::DebugRenderer(std::unique_ptr programObject) + : _programObject(std::move(programObject)) +{ + // nothing to do +} - DebugRenderer::~DebugRenderer() - { - // nothing to do - } +DebugRenderer::~DebugRenderer() +{ + // nothing to do +} - const DebugRenderer& DebugRenderer::ref() { - if (_reference == nullptr) { - try { - _reference = new DebugRenderer(); - } - catch (const ShaderObject::ShaderCompileError& e) { - LERROR(e.what()); - } +const DebugRenderer& DebugRenderer::ref() { + if (_reference == nullptr) { + try { + _reference = new DebugRenderer(); } - return *_reference; + catch (const ghoul::opengl::ShaderObject::ShaderCompileError& e) { + LERROR(e.what()); + } + } + return *_reference; +} + +void DebugRenderer::renderVertices(const Vertices& clippingSpacePoints, GLenum mode, + RGBA rgba) const +{ + if (clippingSpacePoints.size() == 0) { + // nothing to render + return; } - void DebugRenderer::renderVertices(const Vertices& clippingSpacePoints, GLenum mode, RGBA rgba) const { - if (clippingSpacePoints.size() == 0) { - // nothing to render - return; - } + // Generate a vao, vertex array object (keeping track of pointers to vbo) + GLuint _vaoID; + glGenVertexArrays(1, &_vaoID); + ghoul_assert(_vaoID != 0, "Could not generate vertex arrays"); - // Generate a vao, vertex array object (keeping track of pointers to vbo) - GLuint _vaoID; - glGenVertexArrays(1, &_vaoID); - ghoul_assert(_vaoID != 0, "Could not generate vertex arrays"); + // Generate a vbo, vertex buffer object (storeing actual data) + GLuint _vertexBufferID; + glGenBuffers(1, &_vertexBufferID); + ghoul_assert(_vertexBufferID != 0, "Could not create vertex buffer"); - // Generate a vbo, vertex buffer object (storeing actual data) - GLuint _vertexBufferID; - glGenBuffers(1, &_vertexBufferID); - ghoul_assert(_vertexBufferID != 0, "Could not create vertex buffer"); + // Activate the shader program and set the uniform color within the shader + _programObject->activate(); + _programObject->setUniform("color", rgba); - // Activate the shader program and set the uniform color within the shader - _programObject->activate(); - _programObject->setUniform("color", rgba); - - glBindVertexArray(_vaoID); - glBindBuffer(GL_ARRAY_BUFFER, _vertexBufferID); - glBufferData( - GL_ARRAY_BUFFER, - clippingSpacePoints.size() * sizeof(clippingSpacePoints[0]), - &clippingSpacePoints[0], - GL_STATIC_DRAW); + glBindVertexArray(_vaoID); + glBindBuffer(GL_ARRAY_BUFFER, _vertexBufferID); + glBufferData( + GL_ARRAY_BUFFER, + clippingSpacePoints.size() * sizeof(clippingSpacePoints[0]), + &clippingSpacePoints[0], + GL_STATIC_DRAW); - glEnableVertexAttribArray(0); - glVertexAttribPointer(0, 4, GL_FLOAT, GL_FALSE, sizeof(clippingSpacePoints[0]), 0); + glEnableVertexAttribArray(0); + glVertexAttribPointer(0, 4, GL_FLOAT, GL_FALSE, sizeof(clippingSpacePoints[0]), 0); - // Draw the vertices - glDrawArrays(mode, 0, clippingSpacePoints.size()); + // Draw the vertices + glDrawArrays(mode, 0, clippingSpacePoints.size()); - // Check for errors - GLenum error = glGetError(); - if (error != GL_NO_ERROR) { - // Commenting this line. It causes errors to be printed. However - // the errors are not caused by DebugRenderer!! - //LERROR(error); - } + // Check for errors + GLenum error = glGetError(); + if (error != GL_NO_ERROR) { + // Commenting this line. It causes errors to be printed. However + // the errors are not caused by DebugRenderer!! + //LERROR(error); + } - // Clean up after the draw call was made - glBindVertexArray(0); - glDeleteVertexArrays(1, &_vaoID); - glDeleteBuffers(1, &_vertexBufferID); - _programObject->deactivate(); - } + // Clean up after the draw call was made + glBindVertexArray(0); + glDeleteVertexArrays(1, &_vaoID); + glDeleteBuffers(1, &_vertexBufferID); + _programObject->deactivate(); +} - void DebugRenderer::renderBoxFaces(const Vertices& clippingSpaceBoxCorners, RGBA rgba) const { - ghoul_assert(clippingSpaceBoxCorners.size() == 8, "Box must have 8 vertices"); - const Vertices& V = clippingSpaceBoxCorners; +void DebugRenderer::renderBoxFaces(const Vertices& clippingSpaceBoxCorners, + RGBA rgba) const +{ + ghoul_assert(clippingSpaceBoxCorners.size() == 8, "Box must have 8 vertices"); + const Vertices& V = clippingSpaceBoxCorners; - std::vector T; + std::vector T; - // add "sides" - T.push_back(V[1]); T.push_back(V[0]); T.push_back(V[4]); - T.push_back(V[4]); T.push_back(V[5]); T.push_back(V[1]); + // add "sides" + T.push_back(V[1]); T.push_back(V[0]); T.push_back(V[4]); + T.push_back(V[4]); T.push_back(V[5]); T.push_back(V[1]); - T.push_back(V[3]); T.push_back(V[1]); T.push_back(V[5]); - T.push_back(V[5]); T.push_back(V[7]); T.push_back(V[3]); + T.push_back(V[3]); T.push_back(V[1]); T.push_back(V[5]); + T.push_back(V[5]); T.push_back(V[7]); T.push_back(V[3]); - T.push_back(V[6]); T.push_back(V[3]); T.push_back(V[7]); - T.push_back(V[3]); T.push_back(V[6]); T.push_back(V[2]); + T.push_back(V[6]); T.push_back(V[3]); T.push_back(V[7]); + T.push_back(V[3]); T.push_back(V[6]); T.push_back(V[2]); - T.push_back(V[4]); T.push_back(V[2]); T.push_back(V[6]); - T.push_back(V[2]); T.push_back(V[4]); T.push_back(V[0]); + T.push_back(V[4]); T.push_back(V[2]); T.push_back(V[6]); + T.push_back(V[2]); T.push_back(V[4]); T.push_back(V[0]); - // add "top" - T.push_back(V[5]); T.push_back(V[6]); T.push_back(V[7]); - T.push_back(V[6]); T.push_back(V[5]); T.push_back(V[4]); + // add "top" + T.push_back(V[5]); T.push_back(V[6]); T.push_back(V[7]); + T.push_back(V[6]); T.push_back(V[5]); T.push_back(V[4]); - // add bottom - T.push_back(V[0]); T.push_back(V[1]); T.push_back(V[2]); - T.push_back(V[3]); T.push_back(V[2]); T.push_back(V[1]); + // add bottom + T.push_back(V[0]); T.push_back(V[1]); T.push_back(V[2]); + T.push_back(V[3]); T.push_back(V[2]); T.push_back(V[1]); - renderVertices(T, GL_TRIANGLES, rgba); - } + renderVertices(T, GL_TRIANGLES, rgba); +} - void DebugRenderer::renderBoxEdges(const Vertices& clippingSpaceBoxCorners, RGBA rgba) const { - ghoul_assert(clippingSpaceBoxCorners.size() == 8, "Box must have 8 vertices"); - const Vertices& V = clippingSpaceBoxCorners; +void DebugRenderer::renderBoxEdges(const Vertices& clippingSpaceBoxCorners, + RGBA rgba) const +{ + ghoul_assert(clippingSpaceBoxCorners.size() == 8, "Box must have 8 vertices"); + const Vertices& V = clippingSpaceBoxCorners; - std::vector lineVertices; + std::vector lineVertices; - for (size_t i = 0; i < 4; i++) { - lineVertices.push_back(V[2 * i]); - lineVertices.push_back(V[2 * i + 1]); - lineVertices.push_back(V[i]); - lineVertices.push_back(V[i + 4]); + for (size_t i = 0; i < 4; i++) { + lineVertices.push_back(V[2 * i]); + lineVertices.push_back(V[2 * i + 1]); + lineVertices.push_back(V[i]); + lineVertices.push_back(V[i + 4]); + } + lineVertices.push_back(V[0]); lineVertices.push_back(V[2]); + lineVertices.push_back(V[1]); lineVertices.push_back(V[3]); + lineVertices.push_back(V[4]); lineVertices.push_back(V[6]); + lineVertices.push_back(V[5]); lineVertices.push_back(V[7]); + + DebugRenderer::ref().renderVertices(lineVertices, GL_LINES, rgba); +} + +void DebugRenderer::renderNiceBox(const Vertices& clippingSpaceBoxCorners, + RGBA rgba) const +{ + renderBoxFaces(clippingSpaceBoxCorners, rgba); + + glLineWidth(4.0f); + DebugRenderer::ref().renderBoxEdges(clippingSpaceBoxCorners, rgba); + + glPointSize(10.0f); + DebugRenderer::ref().renderVertices(clippingSpaceBoxCorners, GL_POINTS, rgba); +} + +void DebugRenderer::renderCameraFrustum(const RenderData& data, const Camera& otherCamera, + RGBA rgba) const +{ + using namespace glm; + dmat4 modelTransform = translate(dmat4(1), data.position.dvec3()); + dmat4 viewTransform = dmat4(data.camera.combinedViewMatrix()); + dmat4 vp = dmat4(data.camera.projectionMatrix()) * viewTransform; + + dmat4 inverseSavedV = glm::inverse(otherCamera.combinedViewMatrix()); + dmat4 inverseSavedP = glm::inverse(otherCamera.projectionMatrix()); + Vertices clippingSpaceFrustumCorners(8); + // loop through the corners of the saved camera frustum + for (size_t i = 0; i < 8; i++) { + bool cornerIsRight = i % 2 == 0; + bool cornerIsUp = i > 3; + bool cornerIsFar = (i / 2) % 2 == 1; + + double x = cornerIsRight ? 1 : -1; + double y = cornerIsUp ? 1 : -1; + double z = cornerIsFar ? 1 : 0; + + // p represents a corner in the frustum of the saved camera + dvec4 pSavedClippingSpace(x, y, z, 1); + dvec4 pSavedCameraSpace = inverseSavedP * pSavedClippingSpace; + if (cornerIsFar) { + pSavedCameraSpace.w *= 1e-7; } - lineVertices.push_back(V[0]); lineVertices.push_back(V[2]); - lineVertices.push_back(V[1]); lineVertices.push_back(V[3]); - lineVertices.push_back(V[4]); lineVertices.push_back(V[6]); - lineVertices.push_back(V[5]); lineVertices.push_back(V[7]); + pSavedCameraSpace = glm::abs(1.0 / pSavedCameraSpace.w) * pSavedCameraSpace; - DebugRenderer::ref().renderVertices(lineVertices, GL_LINES, rgba); + dvec4 pWorldSpace = inverseSavedV * pSavedCameraSpace; + dvec4 pCurrentClippingSpace = vp * pWorldSpace; + clippingSpaceFrustumCorners[i] = pCurrentClippingSpace; } - void DebugRenderer::renderNiceBox(const Vertices& clippingSpaceBoxCorners, RGBA rgba) const { - renderBoxFaces(clippingSpaceBoxCorners, rgba); - glLineWidth(4.0f); - DebugRenderer::ref().renderBoxEdges(clippingSpaceBoxCorners, rgba); - - glPointSize(10.0f); - DebugRenderer::ref().renderVertices(clippingSpaceBoxCorners, GL_POINTS, rgba); - } - - void DebugRenderer::renderCameraFrustum(const RenderData& data, const Camera& otherCamera, RGBA rgba) const { - using namespace glm; - dmat4 modelTransform = translate(dmat4(1), data.position.dvec3()); - dmat4 viewTransform = dmat4(data.camera.combinedViewMatrix()); - dmat4 vp = dmat4(data.camera.projectionMatrix()) * viewTransform; - - dmat4 inverseSavedV = glm::inverse(otherCamera.combinedViewMatrix()); - dmat4 inverseSavedP = glm::inverse(otherCamera.projectionMatrix()); - Vertices clippingSpaceFrustumCorners(8); - // loop through the corners of the saved camera frustum - for (size_t i = 0; i < 8; i++) { - bool cornerIsRight = i % 2 == 0; - bool cornerIsUp = i > 3; - bool cornerIsFar = (i / 2) % 2 == 1; - - double x = cornerIsRight ? 1 : -1; - double y = cornerIsUp ? 1 : -1; - double z = cornerIsFar ? 1 : 0; - - // p represents a corner in the frustum of the saved camera - dvec4 pSavedClippingSpace(x, y, z, 1); - dvec4 pSavedCameraSpace = inverseSavedP * pSavedClippingSpace; - if (cornerIsFar) { - pSavedCameraSpace.w *= 1e-7; - } - pSavedCameraSpace = glm::abs(1.0 / pSavedCameraSpace.w) * pSavedCameraSpace; - - dvec4 pWorldSpace = inverseSavedV * pSavedCameraSpace; - dvec4 pCurrentClippingSpace = vp * pWorldSpace; - clippingSpaceFrustumCorners[i] = pCurrentClippingSpace; - } - - - glDisable(GL_CULL_FACE); - renderNiceBox(clippingSpaceFrustumCorners, rgba); - glEnable(GL_CULL_FACE); - } + glDisable(GL_CULL_FACE); + renderNiceBox(clippingSpaceFrustumCorners, rgba); + glEnable(GL_CULL_FACE); +} #ifdef OPENSPACE_MODULE_GLOBEBROWSING_ENABLED - void DebugRenderer::renderAABB2(const globebrowsing::AABB2& screenSpaceAABB, RGBA rgba) const { - Vertices vertices(4); - vertices[0] = glm::vec4(screenSpaceAABB.min.x, screenSpaceAABB.min.y, 1, 1); - vertices[1] = glm::vec4(screenSpaceAABB.min.x, screenSpaceAABB.max.y, 1, 1); - vertices[2] = glm::vec4(screenSpaceAABB.max.x, screenSpaceAABB.min.y, 1, 1); - vertices[3] = glm::vec4(screenSpaceAABB.max.x, screenSpaceAABB.max.y, 1, 1); +void DebugRenderer::renderAABB2(const globebrowsing::AABB2& screenSpaceAABB, + RGBA rgba) const +{ + Vertices vertices(4); + vertices[0] = glm::vec4(screenSpaceAABB.min.x, screenSpaceAABB.min.y, 1, 1); + vertices[1] = glm::vec4(screenSpaceAABB.min.x, screenSpaceAABB.max.y, 1, 1); + vertices[2] = glm::vec4(screenSpaceAABB.max.x, screenSpaceAABB.min.y, 1, 1); + vertices[3] = glm::vec4(screenSpaceAABB.max.x, screenSpaceAABB.max.y, 1, 1); - renderVertices(vertices, GL_LINES, rgba); - } + renderVertices(vertices, GL_LINES, rgba); +} #endif // OPENSPACE_MODULE_GLOBEBROWSING_ENABLED #ifdef OPENSPACE_MODULE_GLOBEBROWSING_ENABLED - const DebugRenderer::Vertices DebugRenderer::verticesFor(const globebrowsing::AABB3& screenSpaceAABB) const { - Vertices vertices(8); - for (size_t i = 0; i < 8; i++) { - bool cornerIsRight = i % 2 == 0; - bool cornerIsUp = i > 3; - bool cornerIsFar = (i / 2) % 2 == 1; +const DebugRenderer::Vertices DebugRenderer::verticesFor( + const globebrowsing::AABB3& screenSpaceAABB) const +{ + Vertices vertices(8); + for (size_t i = 0; i < 8; i++) { + bool cornerIsRight = i % 2 == 0; + bool cornerIsUp = i > 3; + bool cornerIsFar = (i / 2) % 2 == 1; - double x = cornerIsRight ? screenSpaceAABB.max.x : screenSpaceAABB.min.x; - double y = cornerIsUp ? screenSpaceAABB.max.y : screenSpaceAABB.min.y; - double z = cornerIsFar ? screenSpaceAABB.max.z : screenSpaceAABB.min.z; + double x = cornerIsRight ? screenSpaceAABB.max.x : screenSpaceAABB.min.x; + double y = cornerIsUp ? screenSpaceAABB.max.y : screenSpaceAABB.min.y; + double z = cornerIsFar ? screenSpaceAABB.max.z : screenSpaceAABB.min.z; - vertices[i] = glm::vec4(x, y, z, 1); - } - return std::move(vertices); + vertices[i] = glm::vec4(x, y, z, 1); } + return std::move(vertices); +} #endif // OPENSPACE_MODULE_GLOBEBROWSING_ENABLED } // namespace openspace - diff --git a/modules/debugging/rendering/debugrenderer.h b/modules/debugging/rendering/debugrenderer.h index ba07609d3e..95e143e87c 100644 --- a/modules/debugging/rendering/debugrenderer.h +++ b/modules/debugging/rendering/debugrenderer.h @@ -22,8 +22,8 @@ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * ****************************************************************************************/ -#ifndef __DEBUG_RENDERER_H__ -#define __DEBUG_RENDERER_H__ +#ifndef __OPENSPACE_MODULE_BASE___DEBUGRENDERER___H__ +#define __OPENSPACE_MODULE_BASE___DEBUGRENDERER___H__ #include #include @@ -36,126 +36,130 @@ #include #include - - #include namespace openspace { - using namespace ghoul::opengl; + +/** + * A helper class for quick rendering of vertices IN clipping space. + * The class is practically stateless. It only stores a ghoul::opengl::ProgramObject + * which can be reused despite the fact that rendering calls are invoked from different + * callers. Therefore a static reference is provided for convenience which is accessed + * through ref(). Note: That constructors are still public and the class is not a strict + * singleton. + */ +class DebugRenderer { +public: + typedef std::vector Vertices; + typedef glm::vec4 RGBA; /** - A helper class for quick rendering of vertices IN clipping space. + * Consider using ref() before creating a new default instance! + */ + DebugRenderer(); - The class is practically stateless. It only stores a ghoul::opengl::ProgramObject - which can be reused despite the fact that rendering calls are invoked from different callers. - Therefor a static reference is provided for convenience which is accessed through ref(). Note: - That constructors are still public and the class is not a strict singleton. - */ - class DebugRenderer { - public: - typedef std::vector Vertices; - typedef glm::vec4 RGBA; + /** + * Instantiate a new DebugRenderer with a custom shader program + */ + DebugRenderer(std::unique_ptr programObject); + ~DebugRenderer(); - /** - * Consider using ref() before creating a new default instance! - */ - DebugRenderer(); + /** + * Access the static reference + */ + static const DebugRenderer& ref(); - /** - * Instantiate a new DebugRenderer with a custom shader program - */ - DebugRenderer(std::unique_ptr programObject); - ~DebugRenderer(); + /** + * Render the vector of clipping space points in the specified mode and color. + */ + void renderVertices(const Vertices& clippingSpacePoints, GLenum mode, + RGBA color = {1, 0, 0, 1}) const; - /** - * Access the static reference - */ - static const DebugRenderer& ref(); - - /** - * Render the vector of clipping space points in the specified mode and color. - */ - void renderVertices(const Vertices& clippingSpacePoints, GLenum mode, RGBA = {1, 0, 0, 1}) const; - - /** - * Takes a vector of exactly 8 vertices, i.e. corner points in a box. - * The box corners should be ordered from smaller to larger, - * first by x, the, y and finally z. - * - * 6-------7 - * |\ |\ - * | 2-------3 - * 4 | - - 5 | - * \| \| - * 0-------1 - * - */ - void renderBoxFaces(const Vertices& clippingSpaceBoxCorners, RGBA rgba = { 1, 0, 0, 1 }) const; + /** + * Takes a vector of exactly 8 vertices, i.e. corner points in a box. + * The box corners should be ordered from smaller to larger, + * first by x, the, y and finally z. + * + * 6-------7 + * |\ |\ + * | 2-------3 + * 4 | - - 5 | + * \| \| + * 0-------1 + * + */ + void renderBoxFaces(const Vertices& clippingSpaceBoxCorners, + RGBA rgba = { 1, 0, 0, 1 }) const; - /** - * Takes a vector of exactly 8 vertices, i.e. corner points in a box. - * The box corners should be ordered from smaller to larger, - * first by x, the, y and finally z. - * - * 6-------7 - * |\ |\ - * | 2-------3 - * 4 | - - 5 | - * \| \| - * 0-------1 - * - */ - void renderBoxEdges(const Vertices& clippingSpaceBoxCorners, RGBA rgba = { 1, 0, 0, 1 }) const; + /** + * Takes a vector of exactly 8 vertices, i.e. corner points in a box. + * The box corners should be ordered from smaller to larger, + * first by x, the, y and finally z. + * + * 6-------7 + * |\ |\ + * | 2-------3 + * 4 | - - 5 | + * \| \| + * 0-------1 + * + */ + void renderBoxEdges(const Vertices& clippingSpaceBoxCorners, + RGBA rgba = { 1, 0, 0, 1 }) const; - /** - * Takes a vector of exactly 8 vertices, i.e. corner points in a box. - * The box corners should be ordered from smaller to larger, - * first by x, the, y and finally z. - * - * 6-------7 - * |\ |\ - * | 2-------3 - * 4 | - - 5 | - * \| \| - * 0-------1 - * - */ - void renderNiceBox(const Vertices& clippingSpaceBoxCorners, RGBA rgba = { 1, 0, 0, 0.3 }) const; + /** + * Takes a vector of exactly 8 vertices, i.e. corner points in a box. + * The box corners should be ordered from smaller to larger, + * first by x, the, y and finally z. + * + * 6-------7 + * |\ |\ + * | 2-------3 + * 4 | - - 5 | + * \| \| + * 0-------1 + * + */ + void renderNiceBox(const Vertices& clippingSpaceBoxCorners, + RGBA rgba = { 1, 0, 0, 0.3 }) const; - /** - * Input arguments: - * 1. const RenderData& data: defines position and camera that we will see the - * other cameras view frustum from - * 2. const Camera& otherCamera: The camera who's view frustum is to be rendered - * 3. RGBA rgba Color to draw the view frustum with - */ - void renderCameraFrustum(const RenderData& data, const Camera& otherCamera, RGBA rgba = { 1, 1, 1, 0.3 }) const; + /** + * Input arguments: + * 1. const RenderData& data: defines position and camera that we will see the + * other cameras view frustum from + * 2. const Camera& otherCamera: The camera who's view frustum is to be rendered + * 3. RGBA rgba Color to draw the view frustum with + */ + void renderCameraFrustum(const RenderData& data, const Camera& otherCamera, + RGBA rgba = { 1, 1, 1, 0.3 }) const; #ifdef OPENSPACE_MODULE_GLOBEBROWSING_ENABLED - /** - * Renders a screen space AABB2 to the screen with the provided color - */ - void renderAABB2(const globebrowsing::AABB2& screenSpaceAABB, RGBA rgba = { 1, 1, 1, 0.3 }) const; + /** + * Renders a screen space AABB2 to the screen with the provided color + */ + void renderAABB2(const globebrowsing::AABB2& screenSpaceAABB, + RGBA rgba = { 1, 1, 1, 0.3 }) const; #endif // OPENSPACE_MODULE_GLOBEBROWSING_ENABLED #ifdef OPENSPACE_MODULE_GLOBEBROWSING_ENABLED - /** - * Takes a AABB3 in screen space and returns vertices representing the corner points - * of the AABB. The ordering of the corner points is compatible with the box rendering - * methods in this class. - */ - const Vertices verticesFor(const globebrowsing::AABB3& screenSpaceAABB) const; + /** + * Takes a AABB3 in screen space and returns vertices representing the corner points + * of the AABB. The ordering of the corner points is compatible with the box + * rendering methods in this class. + */ + const Vertices verticesFor(const globebrowsing::AABB3& screenSpaceAABB) const; #endif // OPENSPACE_MODULE_GLOBEBROWSING_ENABLED - protected: - std::unique_ptr _programObject; +protected: + std::unique_ptr _programObject; - // A raw pointer for the reason that it should not be deleted by the static - // destructor and the normal destructor. This class has ownership - static DebugRenderer* _reference; - }; + // A raw pointer for the reason that it should not be deleted by the static + // destructor and the normal destructor. This class has ownership + static DebugRenderer* _reference; +}; + } // namespace openspace -#endif // __DEBUG_RENDERER_H__ +#endif // __OPENSPACE_MODULE_BASE___DEBUGRENDERER___H__ diff --git a/modules/debugging/rendering/renderabledebugplane.h b/modules/debugging/rendering/renderabledebugplane.h index 2afeadab05..ffa476d0e9 100644 --- a/modules/debugging/rendering/renderabledebugplane.h +++ b/modules/debugging/rendering/renderabledebugplane.h @@ -22,8 +22,8 @@ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * ****************************************************************************************/ -#ifndef __RENDERABLEDEBUGPLANE_H__ -#define __RENDERABLEDEBUGPLANE_H__ +#ifndef __OPENSPACE_MODULE_BASE___RENDERABLEDEBUGPLANE___H__ +#define __OPENSPACE_MODULE_BASE___RENDERABLEDEBUGPLANE___H__ #include @@ -82,4 +82,4 @@ private: } // namespace openspace -#endif // __RENDERABLEDEBUGPLANE_H__ +#endif // __OPENSPACE_MODULE_BASE___RENDERABLEDEBUGPLANE___H__ diff --git a/modules/fieldlines/fieldlinesmodule.cpp b/modules/fieldlines/fieldlinesmodule.cpp index 23928afba8..734ede9741 100644 --- a/modules/fieldlines/fieldlinesmodule.cpp +++ b/modules/fieldlines/fieldlinesmodule.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2015 * + * Copyright (c) 2014-2016 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * diff --git a/modules/fieldlines/fieldlinesmodule.h b/modules/fieldlines/fieldlinesmodule.h index 782b8ff9fa..4d6731383c 100644 --- a/modules/fieldlines/fieldlinesmodule.h +++ b/modules/fieldlines/fieldlinesmodule.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2015 * + * Copyright (c) 2014-2016 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * @@ -22,8 +22,8 @@ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * ****************************************************************************************/ -#ifndef __FIELDLINESMODULE_H__ -#define __FIELDLINESMODULE_H__ +#ifndef __OPENSPACE_MODULE_FIELDLINES___FIELDLINESMODULE___H__ +#define __OPENSPACE_MODULE_FIELDLINES___FIELDLINESMODULE___H__ #include @@ -39,4 +39,4 @@ protected: } // namespace openspace -#endif // __FIELDLINESMODULE_H__ +#endif // __OPENSPACE_MODULE_FIELDLINES___FIELDLINESMODULE___H__ diff --git a/modules/fieldlines/rendering/renderablefieldlines.cpp b/modules/fieldlines/rendering/renderablefieldlines.cpp index 5be1822c83..c9ed83c96e 100644 --- a/modules/fieldlines/rendering/renderablefieldlines.cpp +++ b/modules/fieldlines/rendering/renderablefieldlines.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2015 * + * Copyright (c) 2014-2016 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * @@ -41,30 +41,30 @@ namespace { const float defaultFieldlineStepSize = 0.5f;; const glm::vec4 defaultFieldlineColor = glm::vec4(1.f, 0.f, 0.f, 1.f); - const std::string keyVectorField = "VectorField"; - const std::string keyVectorFieldType = "Type"; - const std::string keyVectorFieldFile = "File"; - const std::string keyVectorFieldVolumeModel = "Model"; - const std::string keyVectorFieldVolumeVariable = "Variables"; + const char* keyVectorField = "VectorField"; + const char* keyVectorFieldType = "Type"; + const char* keyVectorFieldFile = "File"; + const char* keyVectorFieldVolumeModel = "Model"; + const char* keyVectorFieldVolumeVariable = "Variables"; - const std::string keyFieldlines = "Fieldlines"; - const std::string keyFieldlinesStepSize = "Stepsize"; - const std::string keyFieldlinesClassification = "Classification"; - const std::string keyFieldlinesColor = "Color"; + const char* keyFieldlines = "Fieldlines"; + const char* keyFieldlinesStepSize = "Stepsize"; + const char* keyFieldlinesClassification = "Classification"; + const char* keyFieldlinesColor = "Color"; - const std::string keySeedPoints = "SeedPoints"; - const std::string keySeedPointsType = "Type"; - const std::string keySeedPointsFile = "File"; - const std::string keySeedPointsTable = "SeedPoints"; + const char* keySeedPoints = "SeedPoints"; + const char* keySeedPointsType = "Type"; + const char* keySeedPointsFile = "File"; + const char* keySeedPointsTable = "SeedPoints"; - const std::string seedPointsSourceFile = "File"; - const std::string seedPointsSourceTable = "Table"; + const char* seedPointsSourceFile = "File"; + const char* seedPointsSourceTable = "Table"; - const std::string vectorFieldTypeVolumeKameleon = "VolumeKameleon"; + const char* vectorFieldTypeVolumeKameleon = "VolumeKameleon"; - const std::string vectorFieldKameleonModelBATSRUS = "BATSRUS"; + const char* vectorFieldKameleonModelBATSRUS = "BATSRUS"; - const std::string vectorFieldKameleonVariableLorentz = "Lorentz"; + const char* vectorFieldKameleonVariableLorentz = "Lorentz"; const int SeedPointSourceFile = 0; const int SeedPointSourceTable = 1; @@ -353,7 +353,7 @@ void RenderableFieldlines::loadSeedPointsFromTable() { _seedPointsInfo.getValue(keySeedPointsTable, seedpointsDictionary); glm::vec3 seedPos; for (const std::string& index : seedpointsDictionary.keys()) { - _fieldlineInfo.getValue(keySeedPointsTable + "." + index, seedPos); + _fieldlineInfo.getValue(std::string(keySeedPointsTable) + "." + index, seedPos); _seedPoints.push_back(seedPos); } } @@ -403,9 +403,9 @@ RenderableFieldlines::generateFieldlinesVolumeKameleon() return {}; } - std::string v1 = keyVectorFieldVolumeVariable + ".1"; - std::string v2 = keyVectorFieldVolumeVariable + ".2"; - std::string v3 = keyVectorFieldVolumeVariable + ".3"; + std::string v1 = std::string(keyVectorFieldVolumeVariable) + ".1"; + std::string v2 = std::string(keyVectorFieldVolumeVariable) + ".2"; + std::string v3 = std::string(keyVectorFieldVolumeVariable) + ".3"; bool threeVariables = _vectorFieldInfo.hasKeyAndValue(v1) && diff --git a/modules/fieldlines/rendering/renderablefieldlines.h b/modules/fieldlines/rendering/renderablefieldlines.h index 14b9162a07..6ffbf0ed09 100644 --- a/modules/fieldlines/rendering/renderablefieldlines.h +++ b/modules/fieldlines/rendering/renderablefieldlines.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2015 * + * Copyright (c) 2014-2016 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * @@ -22,8 +22,8 @@ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * ****************************************************************************************/ -#ifndef __RENDERABLEFIELDLINES_H__ -#define __RENDERABLEFIELDLINES_H__ +#ifndef __OPENSPACE_MODULE_FIELDLINES___RENDERABLEFIELDLINES___H__ +#define __OPENSPACE_MODULE_FIELDLINES___RENDERABLEFIELDLINES___H__ #include @@ -95,4 +95,4 @@ private: } // namespace openspace -#endif // __RENDERABLEFIELDLINES_H__ +#endif // __OPENSPACE_MODULE_FIELDLINES___RENDERABLEFIELDLINES___H__ diff --git a/modules/galaxy/galaxymodule.cpp b/modules/galaxy/galaxymodule.cpp index 714818604e..193cf9f5bb 100644 --- a/modules/galaxy/galaxymodule.cpp +++ b/modules/galaxy/galaxymodule.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2015 * + * Copyright (c) 2014-2016 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * diff --git a/modules/galaxy/galaxymodule.h b/modules/galaxy/galaxymodule.h index 26b4341b30..0171435b68 100644 --- a/modules/galaxy/galaxymodule.h +++ b/modules/galaxy/galaxymodule.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2015 * + * Copyright (c) 2014-2016 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * @@ -22,8 +22,8 @@ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * ****************************************************************************************/ -#ifndef __GALAXYMODULE_H__ -#define __GALAXYMODULE_H__ +#ifndef __OPENSPACE_MODULE_GALAXY___GALAXYMODULE___H__ +#define __OPENSPACE_MODULE_GALAXY___GALAXYMODULE___H__ #include @@ -37,4 +37,4 @@ public: } // namespace openspace -#endif // __GALAXYMODULE_H__ +#endif // __OPENSPACE_MODULE_GALAXY___GALAXYMODULE___H__ diff --git a/modules/galaxy/rendering/galaxyraycaster.h b/modules/galaxy/rendering/galaxyraycaster.h index f3f9641160..fce9370fb5 100644 --- a/modules/galaxy/rendering/galaxyraycaster.h +++ b/modules/galaxy/rendering/galaxyraycaster.h @@ -22,8 +22,8 @@ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * ****************************************************************************************/ -#ifndef __GALAXYRAYCASTER_H__ -#define __GALAXYRAYCASTER_H__ +#ifndef __OPENSPACE_MODULE_GALAXY___GALAXYRAYCASTER___H__ +#define __OPENSPACE_MODULE_GALAXY___GALAXYRAYCASTER___H__ #include @@ -49,7 +49,6 @@ class RaycastData; class GalaxyRaycaster : public VolumeRaycaster { public: - GalaxyRaycaster(ghoul::opengl::Texture& texture); virtual ~GalaxyRaycaster(); @@ -84,6 +83,6 @@ private: }; // GalaxyRaycaster -} // openspace +} // namespace openspace -#endif // __GALAXYRRAYCASTER_H__ +#endif // __OPENSPACE_MODULE_GALAXY___GALAXYRAYCASTER___H__ diff --git a/modules/galaxy/rendering/renderablegalaxy.h b/modules/galaxy/rendering/renderablegalaxy.h index 69b395a2dd..1281c158e9 100644 --- a/modules/galaxy/rendering/renderablegalaxy.h +++ b/modules/galaxy/rendering/renderablegalaxy.h @@ -22,14 +22,15 @@ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * ****************************************************************************************/ -#ifndef __RENDERABLEGALAXY_H__ -#define __RENDERABLEGALAXY_H__ +#ifndef __OPENSPACE_MODULE_GALAXY___RENDERABLEGALAXY___H__ +#define __OPENSPACE_MODULE_GALAXY___RENDERABLEGALAXY___H__ #include #include #include #include #include +#include namespace openspace { @@ -75,6 +76,7 @@ private: GLuint _positionVbo; GLuint _colorVbo; }; -} -#endif // __RENDERABLEGALAXY_H__ +} // namespace openspace + +#endif // __OPENSPACE_MODULE_GALAXY___RENDERABLEGALAXY___H__ diff --git a/modules/iswa/iswamodule.cpp b/modules/iswa/iswamodule.cpp index 4a13c225a7..98d0094eef 100644 --- a/modules/iswa/iswamodule.cpp +++ b/modules/iswa/iswamodule.cpp @@ -1,26 +1,26 @@ /***************************************************************************************** -* * -* OpenSpace * -* * -* Copyright (c) 2014-2016 * -* * -* Permission is hereby granted, free of charge, to any person obtaining a copy of this * -* software and associated documentation files (the "Software"), to deal in the Software * -* without restriction, including without limitation the rights to use, copy, modify, * -* merge, publish, distribute, sublicense, and/or sell copies of the Software, and to * -* permit persons to whom the Software is furnished to do so, subject to the following * -* conditions: * -* * -* The above copyright notice and this permission notice shall be included in all copies * -* or substantial portions of the Software. * -* * -* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, * -* INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A * -* PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT * -* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF * -* CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE * -* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * -****************************************************************************************/ + * * + * OpenSpace * + * * + * Copyright (c) 2014-2016 * + * * + * Permission is hereby granted, free of charge, to any person obtaining a copy of this * + * software and associated documentation files (the "Software"), to deal in the Software * + * without restriction, including without limitation the rights to use, copy, modify, * + * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to * + * permit persons to whom the Software is furnished to do so, subject to the following * + * conditions: * + * * + * The above copyright notice and this permission notice shall be included in all copies * + * or substantial portions of the Software. * + * * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, * + * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A * + * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT * + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF * + * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE * + * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * + ****************************************************************************************/ #include @@ -38,22 +38,23 @@ namespace openspace { - IswaModule::IswaModule() - : OpenSpaceModule("ISWA") - {} +IswaModule::IswaModule() + : OpenSpaceModule("ISWA") +{} - void IswaModule::internalInitialize(){ - auto fRenderable = FactoryManager::ref().factory(); - ghoul_assert(fRenderable, "No renderable factory existed"); +void IswaModule::internalInitialize(){ + auto fRenderable = FactoryManager::ref().factory(); + ghoul_assert(fRenderable, "No renderable factory existed"); - fRenderable->registerClass("TexturePlane"); - fRenderable->registerClass("DataPlane"); - fRenderable->registerClass("KameleonPlane"); - fRenderable->registerClass("DataSphere"); + fRenderable->registerClass("TexturePlane"); + fRenderable->registerClass("DataPlane"); + fRenderable->registerClass("KameleonPlane"); + fRenderable->registerClass("DataSphere"); - auto fScreenSpaceRenderable = FactoryManager::ref().factory(); - ghoul_assert(fScreenSpaceRenderable, "No fScreenSpaceRenderable factory existed"); + auto fScreenSpaceRenderable = FactoryManager::ref().factory(); + ghoul_assert(fScreenSpaceRenderable, "No fScreenSpaceRenderable factory existed"); - fScreenSpaceRenderable->registerClass("ScreenSpaceCygnet"); - } -} \ No newline at end of file + fScreenSpaceRenderable->registerClass("ScreenSpaceCygnet"); +} + +} // namespace openspace diff --git a/modules/iswa/iswamodule.h b/modules/iswa/iswamodule.h index 91a213de15..5d1bbb19a9 100644 --- a/modules/iswa/iswamodule.h +++ b/modules/iswa/iswamodule.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2015 * + * Copyright (c) 2014-2016 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * @@ -22,12 +22,12 @@ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * ****************************************************************************************/ - #ifndef __ISWAMODULE_H__ - #define __ISWAMODULE_H__ + #ifndef __OPENSPACE_MODULE_ISWA___ISWAMODULE___H__ + #define __OPENSPACE_MODULE_ISWA___ISWAMODULE___H__ #include - namespace openspace{ + namespace openspace { class IswaModule : public OpenSpaceModule { public: @@ -39,4 +39,4 @@ protected: } // namespace openspace -#endif // __ISWAMODULE_H__ \ No newline at end of file +#endif // __OPENSPACE_MODULE_ISWA___ISWAMODULE___H__ diff --git a/modules/iswa/rendering/datacygnet.h b/modules/iswa/rendering/datacygnet.h index f24f15c7e3..2fd73b17e1 100644 --- a/modules/iswa/rendering/datacygnet.h +++ b/modules/iswa/rendering/datacygnet.h @@ -22,8 +22,8 @@ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * ****************************************************************************************/ -#ifndef __DATACYGNET_H__ -#define __DATACYGNET_H__ +#ifndef __OPENSPACE_MODULE_ISWA___DATACYGNET___H__ +#define __OPENSPACE_MODULE_ISWA___DATACYGNET___H__ #include #include @@ -32,7 +32,7 @@ namespace { const int MAX_TEXTURES = 6; } -namespace openspace{ +namespace openspace { /** * This class abstracts away the the loading of data and creation of @@ -110,6 +110,7 @@ private: bool readyToRender() const override; bool downloadTextureResource(double timestamp = Time::ref().j2000Seconds()) override; }; + } //namespace openspace -#endif //__DATACYGNET_H__ \ No newline at end of file +#endif //__OPENSPACE_MODULE_ISWA___DATACYGNET___H__ diff --git a/modules/iswa/rendering/dataplane.cpp b/modules/iswa/rendering/dataplane.cpp index 2ac68f7b7e..c53bdc6381 100644 --- a/modules/iswa/rendering/dataplane.cpp +++ b/modules/iswa/rendering/dataplane.cpp @@ -21,6 +21,7 @@ * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE * * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * ****************************************************************************************/ + #include #include @@ -55,10 +56,12 @@ bool DataPlane::initialize(){ // and unregister backgroundvalues property. if(_autoFilter.value()){ _backgroundValues.setValue(_dataProcessor->filterValues()); - _backgroundValues.setVisible(false); + _backgroundValues.setVisibility(properties::Property::Visibility::None); + //_backgroundValues.setVisible(false); // else if autofilter is turned off, register backgroundValues } else { - _backgroundValues.setVisible(true); + _backgroundValues.setVisibility(properties::Property::Visibility::All); + //_backgroundValues.setVisible(true); } }); } diff --git a/modules/iswa/rendering/dataplane.h b/modules/iswa/rendering/dataplane.h index 2efa100e6f..fcd609c6dd 100644 --- a/modules/iswa/rendering/dataplane.h +++ b/modules/iswa/rendering/dataplane.h @@ -1,33 +1,34 @@ /***************************************************************************************** -* * -* OpenSpace * -* * -* Copyright (c) 2014-2016 * -* * -* Permission is hereby granted, free of charge, to any person obtaining a copy of this * -* software and associated documentation files (the "Software"), to deal in the Software * -* without restriction, including without limitation the rights to use, copy, modify, * -* merge, publish, distribute, sublicense, and/or sell copies of the Software, and to * -* permit persons to whom the Software is furnished to do so, subject to the following * -* conditions: * -* * -* The above copyright notice and this permission notice shall be included in all copies * -* or substantial portions of the Software. * -* * -* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, * -* INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A * -* PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT * -* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF * -* CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE * -* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * -****************************************************************************************/ + * * + * OpenSpace * + * * + * Copyright (c) 2014-2016 * + * * + * Permission is hereby granted, free of charge, to any person obtaining a copy of this * + * software and associated documentation files (the "Software"), to deal in the Software * + * without restriction, including without limitation the rights to use, copy, modify, * + * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to * + * permit persons to whom the Software is furnished to do so, subject to the following * + * conditions: * + * * + * The above copyright notice and this permission notice shall be included in all copies * + * or substantial portions of the Software. * + * * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, * + * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A * + * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT * + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF * + * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE * + * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * + ****************************************************************************************/ -#ifndef __DATAPLANE_H__ -#define __DATAPLANE_H__ +#ifndef __OPENSPACE_MODULE_ISWA___DATAPLANE___H__ +#define __OPENSPACE_MODULE_ISWA___DATAPLANE___H__ #include -namespace openspace{ +namespace openspace { + /** * DataPlane is a concrete IswaCygnet with data files as its input source. * The class handles creation, destruction and rendering of a plane geometry. @@ -58,4 +59,4 @@ private: } // namespace openspace -#endif //__DATAPLANE_H__ \ No newline at end of file +#endif //__OPENSPACE_MODULE_ISWA___DATAPLANE___H__ diff --git a/modules/iswa/rendering/datasphere.cpp b/modules/iswa/rendering/datasphere.cpp index 9e3da7d657..fde4d90932 100644 --- a/modules/iswa/rendering/datasphere.cpp +++ b/modules/iswa/rendering/datasphere.cpp @@ -1,26 +1,26 @@ /***************************************************************************************** -* * -* OpenSpace * -* * -* Copyright (c) 2014-2016 * -* * -* Permission is hereby granted, free of charge, to any person obtaining a copy of this * -* software and associated documentation files (the "Software"), to deal in the Software * -* without restriction, including without limitation the rights to use, copy, modify, * -* merge, publish, distribute, sublicense, and/or sell copies of the Software, and to * -* permit persons to whom the Software is furnished to do so, subject to the following * -* conditions: * -* * -* The above copyright notice and this permission notice shall be included in all copies * -* or substantial portions of the Software. * -* * -* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, * -* INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A * -* PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT * -* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF * -* CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE * -* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * -****************************************************************************************/ + * * + * OpenSpace * + * * + * Copyright (c) 2014-2016 * + * * + * Permission is hereby granted, free of charge, to any person obtaining a copy of this * + * software and associated documentation files (the "Software"), to deal in the Software * + * without restriction, including without limitation the rights to use, copy, modify, * + * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to * + * permit persons to whom the Software is furnished to do so, subject to the following * + * conditions: * + * * + * The above copyright notice and this permission notice shall be included in all copies * + * or substantial portions of the Software. * + * * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, * + * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A * + * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT * + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF * + * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE * + * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * + ****************************************************************************************/ #include #include @@ -38,8 +38,8 @@ namespace { namespace openspace { DataSphere::DataSphere(const ghoul::Dictionary& dictionary) - :DataCygnet(dictionary) - ,_sphere(nullptr) + : DataCygnet(dictionary) + , _sphere(nullptr) { float radius; dictionary.getValue("Radius", radius); @@ -69,10 +69,12 @@ bool DataSphere::initialize(){ // and unregister backgroundvalues property. if(_autoFilter.value()){ _backgroundValues.setValue(_dataProcessor->filterValues()); - _backgroundValues.setVisible(false); + _backgroundValues.setVisibility(properties::Property::Visibility::None); + //_backgroundValues.setVisible(false); // else if autofilter is turned off, register backgroundValues } else { - _backgroundValues.setVisible(true); + _backgroundValues.setVisibility(properties::Property::Visibility::All); + //_backgroundValues.setVisible(true); } }); } diff --git a/modules/iswa/rendering/datasphere.h b/modules/iswa/rendering/datasphere.h index 47206615a1..c50ea616d8 100644 --- a/modules/iswa/rendering/datasphere.h +++ b/modules/iswa/rendering/datasphere.h @@ -1,33 +1,33 @@ /***************************************************************************************** -* * -* OpenSpace * -* * -* Copyright (c) 2014-2015 * -* * -* Permission is hereby granted, free of charge, to any person obtaining a copy of this * -* software and associated documentation files (the "Software"), to deal in the Software * -* without restriction, including without limitation the rights to use, copy, modify, * -* merge, publish, distribute, sublicense, and/or sell copies of the Software, and to * -* permit persons to whom the Software is furnished to do so, subject to the following * -* conditions: * -* * -* The above copyright notice and this permission notice shall be included in all copies * -* or substantial portions of the Software. * -* * -* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, * -* INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A * -* PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT * -* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF * -* CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE * -* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * -****************************************************************************************/ + * * + * OpenSpace * + * * + * Copyright (c) 2014-2016 * + * * + * Permission is hereby granted, free of charge, to any person obtaining a copy of this * + * software and associated documentation files (the "Software"), to deal in the Software * + * without restriction, including without limitation the rights to use, copy, modify, * + * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to * + * permit persons to whom the Software is furnished to do so, subject to the following * + * conditions: * + * * + * The above copyright notice and this permission notice shall be included in all copies * + * or substantial portions of the Software. * + * * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, * + * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A * + * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT * + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF * + * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE * + * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * + ****************************************************************************************/ -#ifndef __DATASPHERE_H__ -#define __DATASPHERE_H__ +#ifndef __OPENSPACE_MODULE_ISWA___DATASPHERE___H__ +#define __OPENSPACE_MODULE_ISWA___DATASPHERE___H__ #include -namespace openspace{ +namespace openspace { class PowerScaledSphere; /** @@ -41,8 +41,8 @@ public: ~DataSphere(); bool initialize() override; -protected: +protected: /** * Creates a sphere geometry */ @@ -56,7 +56,6 @@ protected: float _radius; }; +} // namespace openspace -} //namespace openspace - -#endif //__DATASPHERE_H__ +#endif //__OPENSPACE_MODULE_ISWA___DATASPHERE___H__ diff --git a/modules/iswa/rendering/iswabasegroup.cpp b/modules/iswa/rendering/iswabasegroup.cpp index 2e3e56cc83..6050cd7e87 100644 --- a/modules/iswa/rendering/iswabasegroup.cpp +++ b/modules/iswa/rendering/iswabasegroup.cpp @@ -1,27 +1,28 @@ /***************************************************************************************** -* * -* OpenSpace * -* * -* Copyright (c) 2014-2015 * -* * -* Permission is hereby granted, free of charge, to any person obtaining a copy of this * -* software and associated documentation files (the "Software"), to deal in the Software * -* without restriction, including without limitation the rights to use, copy, modify, * -* merge, publish, distribute, sublicense, and/or sell copies of the Software, and to * -* permit persons to whom the Software is furnished to do so, subject to the following * -* conditions: * -* * -* The above copyright notice and this permission notice shall be included in all copies * -* or substantial portions of the Software. * -* * -* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, * -* INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A * -* PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT * -* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF * -* CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE * -* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * -****************************************************************************************/ -#include + * * + * OpenSpace * + * * + * Copyright (c) 2014-2016 * + * * + * Permission is hereby granted, free of charge, to any person obtaining a copy of this * + * software and associated documentation files (the "Software"), to deal in the Software * + * without restriction, including without limitation the rights to use, copy, modify, * + * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to * + * permit persons to whom the Software is furnished to do so, subject to the following * + * conditions: * + * * + * The above copyright notice and this permission notice shall be included in all copies * + * or substantial portions of the Software. * + * * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, * + * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A * + * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT * + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF * + * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE * + * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * + ****************************************************************************************/ + +#include #include #include diff --git a/modules/iswa/rendering/iswabasegroup.h b/modules/iswa/rendering/iswabasegroup.h index 5df21788db..0a97234dff 100644 --- a/modules/iswa/rendering/iswabasegroup.h +++ b/modules/iswa/rendering/iswabasegroup.h @@ -1,34 +1,35 @@ /***************************************************************************************** -* * -* OpenSpace * -* * -* Copyright (c) 2014-2015 * -* * -* Permission is hereby granted, free of charge, to any person obtaining a copy of this * -* software and associated documentation files (the "Software"), to deal in the Software * -* without restriction, including without limitation the rights to use, copy, modify, * -* merge, publish, distribute, sublicense, and/or sell copies of the Software, and to * -* permit persons to whom the Software is furnished to do so, subject to the following * -* conditions: * -* * -* The above copyright notice and this permission notice shall be included in all copies * -* or substantial portions of the Software. * -* * -* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, * -* INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A * -* PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT * -* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF * -* CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE * -* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * -****************************************************************************************/ + * * + * OpenSpace * + * * + * Copyright (c) 2014-2016 * + * * + * Permission is hereby granted, free of charge, to any person obtaining a copy of this * + * software and associated documentation files (the "Software"), to deal in the Software * + * without restriction, including without limitation the rights to use, copy, modify, * + * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to * + * permit persons to whom the Software is furnished to do so, subject to the following * + * conditions: * + * * + * The above copyright notice and this permission notice shall be included in all copies * + * or substantial portions of the Software. * + * * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, * + * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A * + * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT * + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF * + * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE * + * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * + ****************************************************************************************/ -#ifndef __ISWAGROUP_H__ -#define __ISWAGROUP_H__ +#ifndef __OPENSPACE_MODULE_ISWA___ISWABASEGROUP___H__ +#define __OPENSPACE_MODULE_ISWA___ISWABASEGROUP___H__ #include #include #include #include +#include #include #include // #include @@ -37,7 +38,7 @@ #include -namespace openspace{ +namespace openspace { class IswaCygnet; class IswaBaseGroup : public properties::PropertyOwner{ @@ -68,4 +69,5 @@ protected: }; } //namespace openspace -#endif \ No newline at end of file + +#endif // __OPENSPACE_MODULE_ISWA___ISWABASEGROUP___H__ diff --git a/modules/iswa/rendering/iswacygnet.cpp b/modules/iswa/rendering/iswacygnet.cpp index 005062a21a..3f2e844672 100644 --- a/modules/iswa/rendering/iswacygnet.cpp +++ b/modules/iswa/rendering/iswacygnet.cpp @@ -1,26 +1,27 @@ /***************************************************************************************** -* * -* OpenSpace * -* * -* Copyright (c) 2014-2015 * -* * -* Permission is hereby granted, free of charge, to any person obtaining a copy of this * -* software and associated documentation files (the "Software"), to deal in the Software * -* without restriction, including without limitation the rights to use, copy, modify, * -* merge, publish, distribute, sublicense, and/or sell copies of the Software, and to * -* permit persons to whom the Software is furnished to do so, subject to the following * -* conditions: * -* * -* The above copyright notice and this permission notice shall be included in all copies * -* or substantial portions of the Software. * -* * -* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, * -* INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A * -* PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT * -* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF * -* CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE * -* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * -****************************************************************************************/ + * * + * OpenSpace * + * * + * Copyright (c) 2014-2016 * + * * + * Permission is hereby granted, free of charge, to any person obtaining a copy of this * + * software and associated documentation files (the "Software"), to deal in the Software * + * without restriction, including without limitation the rights to use, copy, modify, * + * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to * + * permit persons to whom the Software is furnished to do so, subject to the following * + * conditions: * + * * + * The above copyright notice and this permission notice shall be included in all copies * + * or substantial portions of the Software. * + * * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, * + * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A * + * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT * + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF * + * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE * + * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * + ****************************************************************************************/ + #include #include #include @@ -32,7 +33,7 @@ namespace { const std::string _loggerCat = "IswaCygnet"; } -namespace openspace{ +namespace openspace { IswaCygnet::IswaCygnet(const ghoul::Dictionary& dictionary) : Renderable(dictionary) @@ -270,4 +271,4 @@ void IswaCygnet::initializeGroup(){ }); } -}//namespace openspac \ No newline at end of file +} //namespace openspace diff --git a/modules/iswa/rendering/iswacygnet.h b/modules/iswa/rendering/iswacygnet.h index 5f140af97f..11172e28bd 100644 --- a/modules/iswa/rendering/iswacygnet.h +++ b/modules/iswa/rendering/iswacygnet.h @@ -1,29 +1,29 @@ /***************************************************************************************** -* * -* OpenSpace * -* * -* Copyright (c) 2014-2015 * -* * -* Permission is hereby granted, free of charge, to any person obtaining a copy of this * -* software and associated documentation files (the "Software"), to deal in the Software * -* without restriction, including without limitation the rights to use, copy, modify, * -* merge, publish, distribute, sublicense, and/or sell copies of the Software, and to * -* permit persons to whom the Software is furnished to do so, subject to the following * -* conditions: * -* * -* The above copyright notice and this permission notice shall be included in all copies * -* or substantial portions of the Software. * -* * -* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, * -* INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A * -* PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT * -* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF * -* CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE * -* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * -****************************************************************************************/ + * * + * OpenSpace * + * * + * Copyright (c) 2014-2016 * + * * + * Permission is hereby granted, free of charge, to any person obtaining a copy of this * + * software and associated documentation files (the "Software"), to deal in the Software * + * without restriction, including without limitation the rights to use, copy, modify, * + * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to * + * permit persons to whom the Software is furnished to do so, subject to the following * + * conditions: * + * * + * The above copyright notice and this permission notice shall be included in all copies * + * or substantial portions of the Software. * + * * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, * + * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A * + * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT * + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF * + * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE * + * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * + ****************************************************************************************/ -#ifndef __ISWACYGNET_H__ -#define __ISWACYGNET_H__ +#ifndef __OPENSPACE_MODULE_ISWA___ISWACYGNET___H__ +#define __OPENSPACE_MODULE_ISWA___ISWACYGNET___H__ #include #include @@ -40,7 +40,7 @@ #include #include -namespace openspace{ +namespace openspace { class IswaBaseGroup; struct Metadata { @@ -156,5 +156,6 @@ private: }; -}//namespace openspace -#endif \ No newline at end of file +} //namespace openspace + +#endif // __OPENSPACE_MODULE_ISWA___ISWACYGNET___H__ diff --git a/modules/iswa/rendering/iswadatagroup.cpp b/modules/iswa/rendering/iswadatagroup.cpp index 6fbff8e972..eaa26b2362 100644 --- a/modules/iswa/rendering/iswadatagroup.cpp +++ b/modules/iswa/rendering/iswadatagroup.cpp @@ -1,26 +1,27 @@ /***************************************************************************************** -* * -* OpenSpace * -* * -* Copyright (c) 2014-2015 * -* * -* Permission is hereby granted, free of charge, to any person obtaining a copy of this * -* software and associated documentation files (the "Software"), to deal in the Software * -* without restriction, including without limitation the rights to use, copy, modify, * -* merge, publish, distribute, sublicense, and/or sell copies of the Software, and to * -* permit persons to whom the Software is furnished to do so, subject to the following * -* conditions: * -* * -* The above copyright notice and this permission notice shall be included in all copies * -* or substantial portions of the Software. * -* * -* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, * -* INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A * -* PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT * -* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF * -* CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE * -* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * -****************************************************************************************/ + * * + * OpenSpace * + * * + * Copyright (c) 2014-2016 * + * * + * Permission is hereby granted, free of charge, to any person obtaining a copy of this * + * software and associated documentation files (the "Software"), to deal in the Software * + * without restriction, including without limitation the rights to use, copy, modify, * + * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to * + * permit persons to whom the Software is furnished to do so, subject to the following * + * conditions: * + * * + * The above copyright notice and this permission notice shall be included in all copies * + * or substantial portions of the Software. * + * * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, * + * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A * + * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT * + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF * + * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE * + * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * + ****************************************************************************************/ + #include #include @@ -41,15 +42,14 @@ namespace { namespace openspace{ IswaDataGroup::IswaDataGroup(std::string name, std::string type) - :IswaBaseGroup(name, type) - ,_useLog("useLog","Use Logarithm", false) - - ,_useHistogram("useHistogram", "Auto Contrast", false) - ,_autoFilter("autoFilter", "Auto Filter", true) - ,_normValues("normValues", "Normalize Values", glm::vec2(1.0,1.0), glm::vec2(0), glm::vec2(5.0)) - ,_backgroundValues("backgroundValues", "Background Values", glm::vec2(0.0), glm::vec2(0), glm::vec2(1.0)) - ,_transferFunctionsFile("transferfunctions", "Transfer Functions", "${SCENE}/iswa/tfs/default.tf") - ,_dataOptions("dataOptions", "Data Options") + : IswaBaseGroup(name, type) + , _useLog("useLog","Use Logarithm", false) + , _useHistogram("useHistogram", "Auto Contrast", false) + , _autoFilter("autoFilter", "Auto Filter", true) + , _normValues("normValues", "Normalize Values", glm::vec2(1.0,1.0), glm::vec2(0), glm::vec2(5.0)) + , _backgroundValues("backgroundValues", "Background Values", glm::vec2(0.0), glm::vec2(0), glm::vec2(1.0)) + , _transferFunctionsFile("transferfunctions", "Transfer Functions", "${SCENE}/iswa/tfs/default.tf") + , _dataOptions("dataOptions", "Data Options") { addProperty(_useLog); addProperty(_useHistogram); @@ -94,10 +94,12 @@ void IswaDataGroup::registerProperties(){ // and unregister backgroundvalues property. if(_autoFilter.value()){ _backgroundValues.setValue(_dataProcessor->filterValues()); - _backgroundValues.setVisible(false); + _backgroundValues.setVisibility(properties::Property::Visibility::None); + //_backgroundValues.setVisible(false); // else if autofilter is turned off, register backgroundValues } else { - _backgroundValues.setVisible(true); + _backgroundValues.setVisibility(properties::Property::Visibility::All); + //_backgroundValues.setVisible(true); } _groupEvent->publish("autoFilterChanged", ghoul::Dictionary({{"autoFilter", _autoFilter.value()}})); }); diff --git a/modules/iswa/rendering/iswadatagroup.h b/modules/iswa/rendering/iswadatagroup.h index 83d259a562..07f37e05ec 100644 --- a/modules/iswa/rendering/iswadatagroup.h +++ b/modules/iswa/rendering/iswadatagroup.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2015 * + * Copyright (c) 2014-2016 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * @@ -22,10 +22,10 @@ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * ****************************************************************************************/ -#ifndef __ISWADATAGROUP_H__ -#define __ISWADATAGROUP_H__ +#ifndef __OPENSPACE_MODULE_ISWA___ISWADATAGROUP___H__ +#define __OPENSPACE_MODULE_ISWA___ISWADATAGROUP___H__ -#include +#include #include @@ -58,4 +58,5 @@ protected: }; } //namespace openspace -#endif // __ISWADATAGROUP_H__ \ No newline at end of file + +#endif // __OPENSPACE_MODULE_ISWA___ISWADATAGROUP___H__ diff --git a/modules/iswa/rendering/iswagroup.cpp b/modules/iswa/rendering/iswagroup.cpp deleted file mode 100644 index 44fe7c20a9..0000000000 --- a/modules/iswa/rendering/iswagroup.cpp +++ /dev/null @@ -1,116 +0,0 @@ -/***************************************************************************************** -* * -* OpenSpace * -* * -* Copyright (c) 2014-2015 * -* * -* Permission is hereby granted, free of charge, to any person obtaining a copy of this * -* software and associated documentation files (the "Software"), to deal in the Software * -* without restriction, including without limitation the rights to use, copy, modify, * -* merge, publish, distribute, sublicense, and/or sell copies of the Software, and to * -* permit persons to whom the Software is furnished to do so, subject to the following * -* conditions: * -* * -* The above copyright notice and this permission notice shall be included in all copies * -* or substantial portions of the Software. * -* * -* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, * -* INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A * -* PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT * -* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF * -* CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE * -* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * -****************************************************************************************/ -#include - -#include -#include - -#include -#include -#include - -#include -#include -#include - - -namespace { - const std::string _loggerCat = "IswaBaseGroup"; - using json = nlohmann::json; -} - -namespace openspace { -IswaBaseGroup::IswaBaseGroup(std::string name, std::string type) - :_enabled("enabled", "Enabled", true) - ,_alpha("alpha", "Alpha", 0.9f, 0.0f, 1.0f) - ,_delete("delete", "Delete") - ,_registered(false) - ,_type(type) - ,_dataProcessor(nullptr) -{ - setName(name); - - addProperty(_enabled); - addProperty(_alpha); - addProperty(_delete); - - _groupEvent = std::make_shared >(); - registerProperties(); - - _autoFilter.setValue(true); -} - -IswaBaseGroup::~IswaBaseGroup(){} - -bool IswaBaseGroup::isType(std::string type){ - return (_type == type); -} - -void IswaBaseGroup::updateGroup(){ - _groupEvent->publish("updateGroup", ghoul::Dictionary()); -} - -void IswaBaseGroup::clearGroup(){ - _groupEvent->publish("clearGroup", ghoul::Dictionary()); - LDEBUG("Group " + name() + " published clearGroup"); - unregisterProperties(); -} - -std::shared_ptr IswaBaseGroup::dataProcessor(){ - return _dataProcessor; -} - -std::shared_ptr > IswaBaseGroup::groupEvent(){ - return _groupEvent; -}; - - -void IswaBaseGroup::registerProperties(){ - OsEng.gui()._iswa.registerProperty(&_enabled); - OsEng.gui()._iswa.registerProperty(&_alpha); - - _enabled.onChange([this]{ - LDEBUG("Group " + name() + " published enabledChanged"); - _groupEvent->publish("enabledChanged", ghoul::Dictionary({{"enabled", _enabled.value()}})); - }); - - _alpha.onChange([this]{ - LDEBUG("Group " + name() + " published alphaChanged"); - _groupEvent->publish("alphaChanged", ghoul::Dictionary({{"alpha", _alpha.value()}})); - }); - - OsEng.gui()._iswa.registerProperty(&_delete); - _delete.onChange([this]{ - clearGroup(); - }); - - _registered = true; -} - -void IswaBaseGroup::unregisterProperties(){ - OsEng.gui()._iswa.unregisterProperties(name()); - _registered = false; -} - -} //namespace openspace \ No newline at end of file diff --git a/modules/iswa/rendering/iswagroup.h b/modules/iswa/rendering/iswagroup.h deleted file mode 100644 index 5df21788db..0000000000 --- a/modules/iswa/rendering/iswagroup.h +++ /dev/null @@ -1,71 +0,0 @@ -/***************************************************************************************** -* * -* OpenSpace * -* * -* Copyright (c) 2014-2015 * -* * -* Permission is hereby granted, free of charge, to any person obtaining a copy of this * -* software and associated documentation files (the "Software"), to deal in the Software * -* without restriction, including without limitation the rights to use, copy, modify, * -* merge, publish, distribute, sublicense, and/or sell copies of the Software, and to * -* permit persons to whom the Software is furnished to do so, subject to the following * -* conditions: * -* * -* The above copyright notice and this permission notice shall be included in all copies * -* or substantial portions of the Software. * -* * -* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, * -* INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A * -* PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT * -* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF * -* CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE * -* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * -****************************************************************************************/ - -#ifndef __ISWAGROUP_H__ -#define __ISWAGROUP_H__ - -#include -#include -#include -#include -#include -#include -// #include -#include -#include -#include - - -namespace openspace{ -class IswaCygnet; - -class IswaBaseGroup : public properties::PropertyOwner{ -public: - IswaBaseGroup(std::string name, std::string type); - ~IswaBaseGroup(); - bool isType(std::string type); - - void updateGroup(); - virtual void clearGroup(); - - std::shared_ptr dataProcessor(); - std::shared_ptr > groupEvent(); - -protected: - void registerProperties(); - void unregisterProperties(); - - properties::BoolProperty _enabled; - properties::FloatProperty _alpha; - properties::TriggerProperty _delete; - - std::shared_ptr > _groupEvent; - std::shared_ptr _dataProcessor; - - bool _registered; - std::string _type; -}; - -} //namespace openspace -#endif \ No newline at end of file diff --git a/modules/iswa/rendering/iswakameleongroup.cpp b/modules/iswa/rendering/iswakameleongroup.cpp index c48b5a36b7..9f57bbb6ab 100644 --- a/modules/iswa/rendering/iswakameleongroup.cpp +++ b/modules/iswa/rendering/iswakameleongroup.cpp @@ -1,26 +1,27 @@ /***************************************************************************************** -* * -* OpenSpace * -* * -* Copyright (c) 2014-2015 * -* * -* Permission is hereby granted, free of charge, to any person obtaining a copy of this * -* software and associated documentation files (the "Software"), to deal in the Software * -* without restriction, including without limitation the rights to use, copy, modify, * -* merge, publish, distribute, sublicense, and/or sell copies of the Software, and to * -* permit persons to whom the Software is furnished to do so, subject to the following * -* conditions: * -* * -* The above copyright notice and this permission notice shall be included in all copies * -* or substantial portions of the Software. * -* * -* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, * -* INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A * -* PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT * -* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF * -* CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE * -* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * -****************************************************************************************/ + * * + * OpenSpace * + * * + * Copyright (c) 2014-2016 * + * * + * Permission is hereby granted, free of charge, to any person obtaining a copy of this * + * software and associated documentation files (the "Software"), to deal in the Software * + * without restriction, including without limitation the rights to use, copy, modify, * + * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to * + * permit persons to whom the Software is furnished to do so, subject to the following * + * conditions: * + * * + * The above copyright notice and this permission notice shall be included in all copies * + * or substantial portions of the Software. * + * * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, * + * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A * + * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT * + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF * + * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE * + * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * + ****************************************************************************************/ + #include #include @@ -166,4 +167,4 @@ void IswaKameleonGroup::changeCdf(std::string path){ _groupEvent->publish("cdfChanged", ghoul::Dictionary({{"path", path}})); } -}//namespace openspace \ No newline at end of file +} //namespace openspace diff --git a/modules/iswa/rendering/iswakameleongroup.h b/modules/iswa/rendering/iswakameleongroup.h index ce5a7cd9c2..26e7c921b1 100644 --- a/modules/iswa/rendering/iswakameleongroup.h +++ b/modules/iswa/rendering/iswakameleongroup.h @@ -1,31 +1,33 @@ /***************************************************************************************** -* * -* OpenSpace * -* * -* Copyright (c) 2014-2015 * -* * -* Permission is hereby granted, free of charge, to any person obtaining a copy of this * -* software and associated documentation files (the "Software"), to deal in the Software * -* without restriction, including without limitation the rights to use, copy, modify, * -* merge, publish, distribute, sublicense, and/or sell copies of the Software, and to * -* permit persons to whom the Software is furnished to do so, subject to the following * -* conditions: * -* * -* The above copyright notice and this permission notice shall be included in all copies * -* or substantial portions of the Software. * -* * -* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, * -* INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A * -* PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT * -* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF * -* CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE * -* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * -****************************************************************************************/ -#ifndef __ISWAKAMELEONGROUP_H__ -#define __ISWAKAMELEONGROUP_H__ + * * + * OpenSpace * + * * + * Copyright (c) 2014-2016 * + * * + * Permission is hereby granted, free of charge, to any person obtaining a copy of this * + * software and associated documentation files (the "Software"), to deal in the Software * + * without restriction, including without limitation the rights to use, copy, modify, * + * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to * + * permit persons to whom the Software is furnished to do so, subject to the following * + * conditions: * + * * + * The above copyright notice and this permission notice shall be included in all copies * + * or substantial portions of the Software. * + * * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, * + * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A * + * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT * + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF * + * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE * + * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * + ****************************************************************************************/ + +#ifndef __OPENSPACE_MODULE_ISWA___ISWAKAMELEONGROUP___H__ +#define __OPENSPACE_MODULE_ISWA___ISWAKAMELEONGROUP___H__ + #include -namespace openspace{ +namespace openspace { class IswaKameleonGroup : public IswaDataGroup{ public: IswaKameleonGroup(std::string name, std::string type); @@ -52,5 +54,6 @@ protected: std::map > _fieldlineState; }; -}//namespace openspace -#endif \ No newline at end of file +} //namespace openspace + +#endif // __OPENSPACE_MODULE_ISWA___ISWAKAMELEONGROUP___H__ diff --git a/modules/iswa/rendering/kameleonplane.cpp b/modules/iswa/rendering/kameleonplane.cpp index b316147738..55fce2c729 100644 --- a/modules/iswa/rendering/kameleonplane.cpp +++ b/modules/iswa/rendering/kameleonplane.cpp @@ -107,10 +107,12 @@ bool KameleonPlane::initialize(){ // and unregister backgroundvalues property. if(_autoFilter.value()){ _backgroundValues.setValue(_dataProcessor->filterValues()); - _backgroundValues.setVisible(false); + _backgroundValues.setVisibility(properties::Property::Visibility::None); + //_backgroundValues.setVisible(false); // else if autofilter is turned off, register backgroundValues } else { - _backgroundValues.setVisible(true); + _backgroundValues.setVisibility(properties::Property::Visibility::All); + //_backgroundValues.setVisible(true); } }); } diff --git a/modules/iswa/rendering/kameleonplane.h b/modules/iswa/rendering/kameleonplane.h index 9b1ab3a933..702a7f5aa7 100644 --- a/modules/iswa/rendering/kameleonplane.h +++ b/modules/iswa/rendering/kameleonplane.h @@ -1,34 +1,34 @@ -/**************************************************************************************** -* * -* OpenSpace * -* * -* Copyright (c) 2014-2016 * -* * -* Permission is hereby granted, free of charge, to any person obtaining a copy of this * -* software and associated documentation files (the "Software"), to deal in the Software * -* without restriction, including without limitation the rights to use, copy, modify, * -* merge, publish, distribute, sublicense, and/or sell copies of the Software, and to * -* permit persons to whom the Software is furnished to do so, subject to the following * -* conditions: * -* * -* The above copyright notice and this permission notice shall be included in all copies * -* or substantial portions of the Software. * -* * -* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, * -* INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A * -* PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT * -* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF * -* CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE * -* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * -****************************************************************************************/ +/***************************************************************************************** + * * + * OpenSpace * + * * + * Copyright (c) 2014-2016 * + * * + * Permission is hereby granted, free of charge, to any person obtaining a copy of this * + * software and associated documentation files (the "Software"), to deal in the Software * + * without restriction, including without limitation the rights to use, copy, modify, * + * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to * + * permit persons to whom the Software is furnished to do so, subject to the following * + * conditions: * + * * + * The above copyright notice and this permission notice shall be included in all copies * + * or substantial portions of the Software. * + * * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, * + * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A * + * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT * + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF * + * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE * + * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * + ****************************************************************************************/ -#ifndef __KAMELEONPLANE_H__ -#define __KAMELEONPLANE_H__ +#ifndef __OPENSPACE_MODULE_ISWA___KAMELEONPLANE___H__ +#define __OPENSPACE_MODULE_ISWA___KAMELEONPLANE___H__ #include #include -namespace openspace{ +namespace openspace { /** * KameleonPlane is a concrete IswaCygnet with volume data files from @@ -106,4 +106,4 @@ private: } // namespace openspace -#endif //__KAMELEONPLANE_H__ \ No newline at end of file +#endif //__OPENSPACE_MODULE_ISWA___KAMELEONPLANE___H__ diff --git a/modules/iswa/rendering/screenspacecygnet.h b/modules/iswa/rendering/screenspacecygnet.h index bdf021da34..a34e51dd50 100644 --- a/modules/iswa/rendering/screenspacecygnet.h +++ b/modules/iswa/rendering/screenspacecygnet.h @@ -1,29 +1,29 @@ /***************************************************************************************** -* * -* OpenSpace * -* * -* Copyright (c) 2014-2015 * -* * -* Permission is hereby granted, free of charge, to any person obtaining a copy of this * -* software and associated documentation files (the "Software"), to deal in the Software * -* without restriction, including without limitation the rights to use, copy, modify, * -* merge, publish, distribute, sublicense, and/or sell copies of the Software, and to * -* permit persons to whom the Software is furnished to do so, subject to the following * -* conditions: * -* * -* The above copyright notice and this permission notice shall be included in all copies * -* or substantial portions of the Software. * -* * -* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, * -* INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A * -* PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT * -* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF * -* CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE * -* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * -****************************************************************************************/ + * * + * OpenSpace * + * * + * Copyright (c) 2014-2016 * + * * + * Permission is hereby granted, free of charge, to any person obtaining a copy of this * + * software and associated documentation files (the "Software"), to deal in the Software * + * without restriction, including without limitation the rights to use, copy, modify, * + * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to * + * permit persons to whom the Software is furnished to do so, subject to the following * + * conditions: * + * * + * The above copyright notice and this permission notice shall be included in all copies * + * or substantial portions of the Software. * + * * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, * + * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A * + * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT * + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF * + * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE * + * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * + ****************************************************************************************/ -#ifndef __SCREENSPACECYGNET_H__ -#define __SCREENSPACECYGNET_H__ +#ifndef __OPENSPACE_MODULE_ISWA___SCREENSPACECYGNET___H__ +#define __OPENSPACE_MODULE_ISWA___SCREENSPACECYGNET___H__ #include #include @@ -54,6 +54,6 @@ private: int _minRealTimeUpdateInterval; }; - } // namespace openspace +} // namespace openspace -#endif //__SCREENSPACECYGNET_H__ \ No newline at end of file +#endif //__OPENSPACE_MODULE_ISWA___SCREENSPACECYGNET___H__ diff --git a/modules/iswa/rendering/texturecygnet.h b/modules/iswa/rendering/texturecygnet.h index c451c6c60f..c432ae3abb 100644 --- a/modules/iswa/rendering/texturecygnet.h +++ b/modules/iswa/rendering/texturecygnet.h @@ -22,12 +22,12 @@ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * ****************************************************************************************/ -#ifndef __TEXTURECYGNET_H__ -#define __TEXTURECYGNET_H__ +#ifndef __OPENSPACE_MODULE_ISWA___TEXTURECYGNET___H__ +#define __OPENSPACE_MODULE_ISWA___TEXTURECYGNET___H__ #include -namespace openspace{ +namespace openspace { /** * This class exist to abstract away the loading of images @@ -58,4 +58,4 @@ private: }; } //namespace openspace -#endif //__TEXTURECYGNET_H__ \ No newline at end of file +#endif //__OPENSPACE_MODULE_ISWA___TEXTURECYGNET___H__ diff --git a/modules/iswa/rendering/textureplane.cpp b/modules/iswa/rendering/textureplane.cpp index 2f032f1062..5704a1bae5 100644 --- a/modules/iswa/rendering/textureplane.cpp +++ b/modules/iswa/rendering/textureplane.cpp @@ -34,9 +34,9 @@ namespace { namespace openspace { TexturePlane::TexturePlane(const ghoul::Dictionary& dictionary) - :TextureCygnet(dictionary) - ,_quad(0) - ,_vertexPositionBuffer(0) + : TextureCygnet(dictionary) + , _quad(0) + , _vertexPositionBuffer(0) { _programName = "PlaneProgram"; _vsPath = "${MODULE_ISWA}/shaders/textureplane_vs.glsl"; @@ -104,4 +104,4 @@ void TexturePlane::renderGeometry() const { glDrawArrays(GL_TRIANGLES, 0, 6); } -}// namespace openspace \ No newline at end of file +} // namespace openspace diff --git a/modules/iswa/rendering/textureplane.h b/modules/iswa/rendering/textureplane.h index 4803ec0176..3f812e1847 100644 --- a/modules/iswa/rendering/textureplane.h +++ b/modules/iswa/rendering/textureplane.h @@ -1,33 +1,33 @@ /***************************************************************************************** -* * -* OpenSpace * -* * -* Copyright (c) 2014-2016 * -* * -* Permission is hereby granted, free of charge, to any person obtaining a copy of this * -* software and associated documentation files (the "Software"), to deal in the Software * -* without restriction, including without limitation the rights to use, copy, modify, * -* merge, publish, distribute, sublicense, and/or sell copies of the Software, and to * -* permit persons to whom the Software is furnished to do so, subject to the following * -* conditions: * -* * -* The above copyright notice and this permission notice shall be included in all copies * -* or substantial portions of the Software. * -* * -* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, * -* INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A * -* PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT * -* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF * -* CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE * -* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * -****************************************************************************************/ + * * + * OpenSpace * + * * + * Copyright (c) 2014-2016 * + * * + * Permission is hereby granted, free of charge, to any person obtaining a copy of this * + * software and associated documentation files (the "Software"), to deal in the Software * + * without restriction, including without limitation the rights to use, copy, modify, * + * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to * + * permit persons to whom the Software is furnished to do so, subject to the following * + * conditions: * + * * + * The above copyright notice and this permission notice shall be included in all copies * + * or substantial portions of the Software. * + * * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, * + * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A * + * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT * + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF * + * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE * + * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * + ****************************************************************************************/ -#ifndef __TEXTUREPLANE_H__ -#define __TEXTUREPLANE_H__ +#ifndef __OPENSPACE_MODULE_ISWA___TEXTUREPLANE___H__ +#define __OPENSPACE_MODULE_ISWA___TEXTUREPLANE___H__ #include -namespace openspace{ +namespace openspace { /** * TexturePlane is a "concrete" IswaCygnet with texture as its input source. @@ -51,4 +51,4 @@ private: } // namespace openspace -#endif \ No newline at end of file +#endif // __OPENSPACE_MODULE_ISWA___TEXTUREPLANE___H__ diff --git a/modules/iswa/util/dataprocessor.cpp b/modules/iswa/util/dataprocessor.cpp index 3639899a94..b61fa59315 100644 --- a/modules/iswa/util/dataprocessor.cpp +++ b/modules/iswa/util/dataprocessor.cpp @@ -1,26 +1,27 @@ /***************************************************************************************** -* * -* OpenSpace * -* * -* Copyright (c) 2014-2015 * -* * -* Permission is hereby granted, free of charge, to any person obtaining a copy of this * -* software and associated documentation files (the "Software"), to deal in the Software * -* without restriction, including without limitation the rights to use, copy, modify, * -* merge, publish, distribute, sublicense, and/or sell copies of the Software, and to * -* permit persons to whom the Software is furnished to do so, subject to the following * -* conditions: * -* * -* The above copyright notice and this permission notice shall be included in all copies * -* or substantial portions of the Software. * -* * -* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, * -* INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A * -* PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT * -* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF * -* CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE * -* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * -****************************************************************************************/ + * * + * OpenSpace * + * * + * Copyright (c) 2014-2016 * + * * + * Permission is hereby granted, free of charge, to any person obtaining a copy of this * + * software and associated documentation files (the "Software"), to deal in the Software * + * without restriction, including without limitation the rights to use, copy, modify, * + * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to * + * permit persons to whom the Software is furnished to do so, subject to the following * + * conditions: * + * * + * The above copyright notice and this permission notice shall be included in all copies * + * or substantial portions of the Software. * + * * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, * + * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A * + * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT * + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF * + * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE * + * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * + ****************************************************************************************/ + #include #include @@ -31,6 +32,7 @@ namespace { } namespace openspace { + DataProcessor::DataProcessor() :_useLog(false) ,_useHistogram(false) diff --git a/modules/iswa/util/dataprocessor.h b/modules/iswa/util/dataprocessor.h index 767c75d80b..8a84fcd8f3 100644 --- a/modules/iswa/util/dataprocessor.h +++ b/modules/iswa/util/dataprocessor.h @@ -1,29 +1,29 @@ /***************************************************************************************** -* * -* OpenSpace * -* * -* Copyright (c) 2014-2015 * -* * -* Permission is hereby granted, free of charge, to any person obtaining a copy of this * -* software and associated documentation files (the "Software"), to deal in the Software * -* without restriction, including without limitation the rights to use, copy, modify, * -* merge, publish, distribute, sublicense, and/or sell copies of the Software, and to * -* permit persons to whom the Software is furnished to do so, subject to the following * -* conditions: * -* * -* The above copyright notice and this permission notice shall be included in all copies * -* or substantial portions of the Software. * -* * -* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, * -* INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A * -* PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT * -* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF * -* CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE * -* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * -****************************************************************************************/ + * * + * OpenSpace * + * * + * Copyright (c) 2014-2016 * + * * + * Permission is hereby granted, free of charge, to any person obtaining a copy of this * + * software and associated documentation files (the "Software"), to deal in the Software * + * without restriction, including without limitation the rights to use, copy, modify, * + * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to * + * permit persons to whom the Software is furnished to do so, subject to the following * + * conditions: * + * * + * The above copyright notice and this permission notice shall be included in all copies * + * or substantial portions of the Software. * + * * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, * + * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A * + * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT * + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF * + * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE * + * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * + ****************************************************************************************/ -#ifndef __DATAPROCESSOR_H__ -#define __DATAPROCESSOR_H__ +#ifndef __OPENSPACE_MODULE_ISWA___DATAPROCESSOR___H__ +#define __OPENSPACE_MODULE_ISWA___DATAPROCESSOR___H__ #include #include @@ -31,7 +31,8 @@ #include #include -namespace openspace{ +namespace openspace { + class DataProcessor{ friend class IswaBaseGroup; public: @@ -77,4 +78,4 @@ protected: } // namespace openspace -#endif //__DATAPROCESSOR_H__ +#endif //__OPENSPACE_MODULE_ISWA___DATAPROCESSOR___H__ diff --git a/modules/iswa/util/dataprocessorjson.cpp b/modules/iswa/util/dataprocessorjson.cpp index 151f8e6a13..b966fefe09 100644 --- a/modules/iswa/util/dataprocessorjson.cpp +++ b/modules/iswa/util/dataprocessorjson.cpp @@ -1,27 +1,29 @@ /***************************************************************************************** -* * -* OpenSpace * -* * -* Copyright (c) 2014-2015 * -* * -* Permission is hereby granted, free of charge, to any person obtaining a copy of this * -* software and associated documentation files (the "Software"), to deal in the Software * -* without restriction, including without limitation the rights to use, copy, modify, * -* merge, publish, distribute, sublicense, and/or sell copies of the Software, and to * -* permit persons to whom the Software is furnished to do so, subject to the following * -* conditions: * -* * -* The above copyright notice and this permission notice shall be included in all copies * -* or substantial portions of the Software. * -* * -* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, * -* INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A * -* PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT * -* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF * -* CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE * -* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * -****************************************************************************************/ + * * + * OpenSpace * + * * + * Copyright (c) 2014-2016 * + * * + * Permission is hereby granted, free of charge, to any person obtaining a copy of this * + * software and associated documentation files (the "Software"), to deal in the Software * + * without restriction, including without limitation the rights to use, copy, modify, * + * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to * + * permit persons to whom the Software is furnished to do so, subject to the following * + * conditions: * + * * + * The above copyright notice and this permission notice shall be included in all copies * + * or substantial portions of the Software. * + * * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, * + * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A * + * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT * + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF * + * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE * + * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * + ****************************************************************************************/ + #include + #include #include #include @@ -31,13 +33,13 @@ namespace { using json = nlohmann::json; } -namespace openspace{ +namespace openspace { DataProcessorJson::DataProcessorJson() - :DataProcessor() + : DataProcessor() {} -DataProcessorJson::~DataProcessorJson(){} +DataProcessorJson::~DataProcessorJson() {} std::vector DataProcessorJson::readMetadata(std::string data, glm::size3_t& dimensions){ std::vector options = std::vector(); @@ -139,4 +141,4 @@ std::vector DataProcessorJson::processData(std::string data, properties: return std::vector(); } -}//namespace openspace +} //namespace openspace diff --git a/modules/iswa/util/dataprocessorjson.h b/modules/iswa/util/dataprocessorjson.h index 2516bea159..98f29aae4c 100644 --- a/modules/iswa/util/dataprocessorjson.h +++ b/modules/iswa/util/dataprocessorjson.h @@ -1,30 +1,31 @@ /***************************************************************************************** -* * -* OpenSpace * -* * -* Copyright (c) 2014-2015 * -* * -* Permission is hereby granted, free of charge, to any person obtaining a copy of this * -* software and associated documentation files (the "Software"), to deal in the Software * -* without restriction, including without limitation the rights to use, copy, modify, * -* merge, publish, distribute, sublicense, and/or sell copies of the Software, and to * -* permit persons to whom the Software is furnished to do so, subject to the following * -* conditions: * -* * -* The above copyright notice and this permission notice shall be included in all copies * -* or substantial portions of the Software. * -* * -* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, * -* INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A * -* PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT * -* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF * -* CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE * -* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * -****************************************************************************************/ -#include + * * + * OpenSpace * + * * + * Copyright (c) 2014-2016 * + * * + * Permission is hereby granted, free of charge, to any person obtaining a copy of this * + * software and associated documentation files (the "Software"), to deal in the Software * + * without restriction, including without limitation the rights to use, copy, modify, * + * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to * + * permit persons to whom the Software is furnished to do so, subject to the following * + * conditions: * + * * + * The above copyright notice and this permission notice shall be included in all copies * + * or substantial portions of the Software. * + * * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, * + * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A * + * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT * + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF * + * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE * + * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * + ****************************************************************************************/ -#ifndef __DATAPROCESSORJSON_H__ -#define __DATAPROCESSORJSON_H__ +#ifndef __OPENSPACE_MODULE_ISWA___DATAPROCESSORJSON___H__ +#define __OPENSPACE_MODULE_ISWA___DATAPROCESSORJSON___H__ + +#include namespace openspace { @@ -38,5 +39,6 @@ public: virtual std::vector processData(std::string data, properties::SelectionProperty& dataOptions, glm::size3_t& dimensions) override; }; -}// namespace -#endif __DATAPROCESSORJSON_H__ \ No newline at end of file +}// namespace openspace + +#endif __OPENSPACE_MODULE_ISWA___DATAPROCESSORJSON___H__ diff --git a/modules/iswa/util/dataprocessorkameleon.cpp b/modules/iswa/util/dataprocessorkameleon.cpp index 5abba4833b..b1078cab58 100644 --- a/modules/iswa/util/dataprocessorkameleon.cpp +++ b/modules/iswa/util/dataprocessorkameleon.cpp @@ -1,26 +1,27 @@ /***************************************************************************************** -* * -* OpenSpace * -* * -* Copyright (c) 2014-2015 * -* * -* Permission is hereby granted, free of charge, to any person obtaining a copy of this * -* software and associated documentation files (the "Software"), to deal in the Software * -* without restriction, including without limitation the rights to use, copy, modify, * -* merge, publish, distribute, sublicense, and/or sell copies of the Software, and to * -* permit persons to whom the Software is furnished to do so, subject to the following * -* conditions: * -* * -* The above copyright notice and this permission notice shall be included in all copies * -* or substantial portions of the Software. * -* * -* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, * -* INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A * -* PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT * -* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF * -* CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE * -* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * -****************************************************************************************/ + * * + * OpenSpace * + * * + * Copyright (c) 2014-2016 * + * * + * Permission is hereby granted, free of charge, to any person obtaining a copy of this * + * software and associated documentation files (the "Software"), to deal in the Software * + * without restriction, including without limitation the rights to use, copy, modify, * + * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to * + * permit persons to whom the Software is furnished to do so, subject to the following * + * conditions: * + * * + * The above copyright notice and this permission notice shall be included in all copies * + * or substantial portions of the Software. * + * * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, * + * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A * + * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT * + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF * + * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE * + * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * + ****************************************************************************************/ + #include //#include #include @@ -29,19 +30,18 @@ namespace { const std::string _loggerCat = "DataProcessorKameleon"; } -namespace openspace{ +namespace openspace { DataProcessorKameleon::DataProcessorKameleon() - :DataProcessor() - ,_kwPath("") - ,_kw(nullptr) - ,_initialized(false) - ,_slice(0.5) + : DataProcessor() + , _kwPath("") + , _kw(nullptr) + , _initialized(false) + , _slice(0.5) {} DataProcessorKameleon::~DataProcessorKameleon(){} - std::vector DataProcessorKameleon::readMetadata(std::string path, glm::size3_t& dimensions){ if(!path.empty()){ @@ -147,4 +147,4 @@ void DataProcessorKameleon::initializeKameleonWrapper(std::string path){ } } -}//namespace openspace \ No newline at end of file +} //namespace openspace diff --git a/modules/iswa/util/dataprocessorkameleon.h b/modules/iswa/util/dataprocessorkameleon.h index 482242f7e2..aa29aa0dc9 100644 --- a/modules/iswa/util/dataprocessorkameleon.h +++ b/modules/iswa/util/dataprocessorkameleon.h @@ -1,32 +1,33 @@ /***************************************************************************************** -* * -* OpenSpace * -* * -* Copyright (c) 2014-2015 * -* * -* Permission is hereby granted, free of charge, to any person obtaining a copy of this * -* software and associated documentation files (the "Software"), to deal in the Software * -* without restriction, including without limitation the rights to use, copy, modify, * -* merge, publish, distribute, sublicense, and/or sell copies of the Software, and to * -* permit persons to whom the Software is furnished to do so, subject to the following * -* conditions: * -* * -* The above copyright notice and this permission notice shall be included in all copies * -* or substantial portions of the Software. * -* * -* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, * -* INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A * -* PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT * -* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF * -* CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE * -* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * -****************************************************************************************/ + * * + * OpenSpace * + * * + * Copyright (c) 2014-2016 * + * * + * Permission is hereby granted, free of charge, to any person obtaining a copy of this * + * software and associated documentation files (the "Software"), to deal in the Software * + * without restriction, including without limitation the rights to use, copy, modify, * + * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to * + * permit persons to whom the Software is furnished to do so, subject to the following * + * conditions: * + * * + * The above copyright notice and this permission notice shall be included in all copies * + * or substantial portions of the Software. * + * * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, * + * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A * + * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT * + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF * + * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE * + * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * + ****************************************************************************************/ + +#ifndef __OPENSPACE_MODULE_ISWA___DATAPROCESSORKAMELEON___H__ +#define __OPENSPACE_MODULE_ISWA___DATAPROCESSORKAMELEON___H__ + #include #include -#ifndef __DATAPROCESSORKAMELEON_H__ -#define __DATAPROCESSORKAMELEON_H__ - namespace openspace { class DataProcessorKameleon : public DataProcessor { @@ -51,5 +52,6 @@ private: // std::vector _data; }; -}// namespace -#endif __DATAPROCESSORKAMELEON_H__ \ No newline at end of file +} // namespace openspace + +#endif __OPENSPACE_MODULE_ISWA___DATAPROCESSORKAMELEON___H__ diff --git a/modules/iswa/util/dataprocessortext.cpp b/modules/iswa/util/dataprocessortext.cpp index ecdb1ac4d0..8e8e724844 100644 --- a/modules/iswa/util/dataprocessortext.cpp +++ b/modules/iswa/util/dataprocessortext.cpp @@ -1,26 +1,27 @@ /***************************************************************************************** -* * -* OpenSpace * -* * -* Copyright (c) 2014-2016 * -* * -* Permission is hereby granted, free of charge, to any person obtaining a copy of this * -* software and associated documentation files (the "Software"), to deal in the Software * -* without restriction, including without limitation the rights to use, copy, modify, * -* merge, publish, distribute, sublicense, and/or sell copies of the Software, and to * -* permit persons to whom the Software is furnished to do so, subject to the following * -* conditions: * -* * -* The above copyright notice and this permission notice shall be included in all copies * -* or substantial portions of the Software. * -* * -* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, * -* INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A * -* PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT * -* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF * -* CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE * -* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * -****************************************************************************************/ + * * + * OpenSpace * + * * + * Copyright (c) 2014-2016 * + * * + * Permission is hereby granted, free of charge, to any person obtaining a copy of this * + * software and associated documentation files (the "Software"), to deal in the Software * + * without restriction, including without limitation the rights to use, copy, modify, * + * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to * + * permit persons to whom the Software is furnished to do so, subject to the following * + * conditions: * + * * + * The above copyright notice and this permission notice shall be included in all copies * + * or substantial portions of the Software. * + * * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, * + * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A * + * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT * + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF * + * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE * + * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * + ****************************************************************************************/ + #include //#include //#include @@ -38,7 +39,7 @@ namespace { namespace openspace{ DataProcessorText::DataProcessorText() - :DataProcessor() + : DataProcessor() {} DataProcessorText::~DataProcessorText(){} @@ -224,4 +225,4 @@ std::vector DataProcessorText::processData(std::string data, properties: return std::vector(); } -}//namespace openspace \ No newline at end of file +} //namespace openspace diff --git a/modules/iswa/util/dataprocessortext.h b/modules/iswa/util/dataprocessortext.h index b3fb53323c..d4648d5018 100644 --- a/modules/iswa/util/dataprocessortext.h +++ b/modules/iswa/util/dataprocessortext.h @@ -1,30 +1,31 @@ /***************************************************************************************** -* * -* OpenSpace * -* * -* Copyright (c) 2014-2015 * -* * -* Permission is hereby granted, free of charge, to any person obtaining a copy of this * -* software and associated documentation files (the "Software"), to deal in the Software * -* without restriction, including without limitation the rights to use, copy, modify, * -* merge, publish, distribute, sublicense, and/or sell copies of the Software, and to * -* permit persons to whom the Software is furnished to do so, subject to the following * -* conditions: * -* * -* The above copyright notice and this permission notice shall be included in all copies * -* or substantial portions of the Software. * -* * -* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, * -* INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A * -* PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT * -* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF * -* CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE * -* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * -****************************************************************************************/ -#include + * * + * OpenSpace * + * * + * Copyright (c) 2014-2016 * + * * + * Permission is hereby granted, free of charge, to any person obtaining a copy of this * + * software and associated documentation files (the "Software"), to deal in the Software * + * without restriction, including without limitation the rights to use, copy, modify, * + * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to * + * permit persons to whom the Software is furnished to do so, subject to the following * + * conditions: * + * * + * The above copyright notice and this permission notice shall be included in all copies * + * or substantial portions of the Software. * + * * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, * + * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A * + * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT * + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF * + * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE * + * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * + ****************************************************************************************/ -#ifndef __DATAPROCESSORTEXT_H__ -#define __DATAPROCESSORTEXT_H__ +#ifndef __OPENSPACE_MODULE_ISWA___DATAPROCESSORTEXT___H__ +#define __OPENSPACE_MODULE_ISWA___DATAPROCESSORTEXT___H__ + +#include namespace openspace { @@ -43,5 +44,6 @@ private: // void calculateFilterValues(std::vector selectedOptions); }; -}// namespace -#endif __DATAPROCESSORTEXT_H__ +} // namespace openspace + +#endif __OPENSPACE_MODULE_ISWA___DATAPROCESSORTEXT___H__ diff --git a/modules/iswa/util/iswamanager.cpp b/modules/iswa/util/iswamanager.cpp index 63976748ca..7e243fea85 100644 --- a/modules/iswa/util/iswamanager.cpp +++ b/modules/iswa/util/iswamanager.cpp @@ -1,26 +1,27 @@ /***************************************************************************************** -* * -* OpenSpace * -* * -* Copyright (c) 2014-2015 * -* * -* Permission is hereby granted, free of charge, to any person obtaining a copy of this * -* software and associated documentation files (the "Software"), to deal in the Software * -* without restriction, including without limitation the rights to use, copy, modify, * -* merge, publish, distribute, sublicense, and/or sell copies of the Software, and to * -* permit persons to whom the Software is furnished to do so, subject to the following * -* conditions: * -* * -* The above copyright notice and this permission notice shall be included in all copies * -* or substantial portions of the Software. * -* * -* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, * -* INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A * -* PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT * -* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF * -* CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE * -* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * -****************************************************************************************/ + * * + * OpenSpace * + * * + * Copyright (c) 2014-2016 * + * * + * Permission is hereby granted, free of charge, to any person obtaining a copy of this * + * software and associated documentation files (the "Software"), to deal in the Software * + * without restriction, including without limitation the rights to use, copy, modify, * + * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to * + * permit persons to whom the Software is furnished to do so, subject to the following * + * conditions: * + * * + * The above copyright notice and this permission notice shall be included in all copies * + * or substantial portions of the Software. * + * * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, * + * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A * + * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT * + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF * + * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE * + * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * + ****************************************************************************************/ + #include #include @@ -730,4 +731,4 @@ scripting::LuaLibrary IswaManager::luaLibrary() { }; } -}// namsepace openspace \ No newline at end of file +} // namsepace openspace diff --git a/modules/iswa/util/iswamanager.h b/modules/iswa/util/iswamanager.h index b96e69dc19..24d926c05f 100644 --- a/modules/iswa/util/iswamanager.h +++ b/modules/iswa/util/iswamanager.h @@ -1,28 +1,29 @@ /***************************************************************************************** -* * -* OpenSpace * -* * -* Copyright (c) 2014-2015 * -* * -* Permission is hereby granted, free of charge, to any person obtaining a copy of this * -* software and associated documentation files (the "Software"), to deal in the Software * -* without restriction, including without limitation the rights to use, copy, modify, * -* merge, publish, distribute, sublicense, and/or sell copies of the Software, and to * -* permit persons to whom the Software is furnished to do so, subject to the following * -* conditions: * -* * -* The above copyright notice and this permission notice shall be included in all copies * -* or substantial portions of the Software. * -* * -* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, * -* INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A * -* PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT * -* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF * -* CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE * -* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * -****************************************************************************************/ -#ifndef __ISWAMANAGER_H__ -#define __ISWAMANAGER_H__ + * * + * OpenSpace * + * * + * Copyright (c) 2014-2016 * + * * + * Permission is hereby granted, free of charge, to any person obtaining a copy of this * + * software and associated documentation files (the "Software"), to deal in the Software * + * without restriction, including without limitation the rights to use, copy, modify, * + * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to * + * permit persons to whom the Software is furnished to do so, subject to the following * + * conditions: * + * * + * The above copyright notice and this permission notice shall be included in all copies * + * or substantial portions of the Software. * + * * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, * + * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A * + * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT * + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF * + * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE * + * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * + ****************************************************************************************/ + +#ifndef __OPENSPACE_MODULE_ISWA___ISWAMANAGER___H__ +#define __OPENSPACE_MODULE_ISWA___ISWAMANAGER___H__ #include #include @@ -137,4 +138,5 @@ private: }; } //namespace openspace -#endif //__ISWAMANAGER_H__ \ No newline at end of file + +#endif //__OPENSPACE_MODULE_ISWA___ISWAMANAGER___H__ diff --git a/modules/kameleon/include/kameleonwrapper.h b/modules/kameleon/include/kameleonwrapper.h index fafa688bfb..08f717c8e1 100644 --- a/modules/kameleon/include/kameleonwrapper.h +++ b/modules/kameleon/include/kameleonwrapper.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2015 * + * Copyright (c) 2014-2016 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * @@ -22,8 +22,8 @@ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * ****************************************************************************************/ -#ifndef KAMELEONWRAPPER_H_ -#define KAMELEONWRAPPER_H_ +#ifndef __OPENSPACE_MODULE_ISWA___KAMELEONWRAPPER___H__ +#define __OPENSPACE_MODULE_ISWA___KAMELEONWRAPPER___H__ #include @@ -179,4 +179,4 @@ private: } // namespace openspace -#endif // KAMELEONWRAPPER_H_ +#endif // __OPENSPACE_MODULE_ISWA___KAMELEONWRAPPER___H__ diff --git a/modules/kameleon/kameleonmodule.cpp b/modules/kameleon/kameleonmodule.cpp index 244d86e513..735d08248d 100644 --- a/modules/kameleon/kameleonmodule.cpp +++ b/modules/kameleon/kameleonmodule.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2015 * + * Copyright (c) 2014-2016 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * diff --git a/modules/kameleon/kameleonmodule.h b/modules/kameleon/kameleonmodule.h index 979aba5dd9..458157ef79 100644 --- a/modules/kameleon/kameleonmodule.h +++ b/modules/kameleon/kameleonmodule.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2015 * + * Copyright (c) 2014-2016 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * @@ -22,8 +22,8 @@ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * ****************************************************************************************/ -#ifndef __KAMELEONMODULE_H__ -#define __KAMELEONMODULE_H__ +#ifndef __OPENSPACE_MODULE_ISWA___KAMELEONMODULE___H__ +#define __OPENSPACE_MODULE_ISWA___KAMELEONMODULE___H__ #include @@ -36,4 +36,4 @@ public: } // namespace openspace -#endif // __KAMELEONMODULE_H__ +#endif // __OPENSPACE_MODULE_ISWA___KAMELEONMODULE___H__ diff --git a/modules/multiresvolume/multiresvolumemodule.cpp b/modules/multiresvolume/multiresvolumemodule.cpp index 7d9baab170..13f988638c 100644 --- a/modules/multiresvolume/multiresvolumemodule.cpp +++ b/modules/multiresvolume/multiresvolumemodule.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2015 * + * Copyright (c) 2014-2016 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * diff --git a/modules/multiresvolume/multiresvolumemodule.h b/modules/multiresvolume/multiresvolumemodule.h index 48d14100ec..5f12395790 100644 --- a/modules/multiresvolume/multiresvolumemodule.h +++ b/modules/multiresvolume/multiresvolumemodule.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2015 * + * Copyright (c) 2014-2016 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * @@ -22,8 +22,8 @@ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * ****************************************************************************************/ -#ifndef __MULTIRESVOLUMEMODULE_H__ -#define __MULTIRESVOLUMEMODULE_H__ +#ifndef __OPENSPACE_MODULE_MULTIRESVOLUME___MULTIRESVOLUMEMODULE___H__ +#define __OPENSPACE_MODULE_MULTIRESVOLUME___MULTIRESVOLUMEMODULE___H__ #include @@ -37,4 +37,4 @@ public: } // namespace openspace -#endif // __MULTIRESVOLUMEMODULE_H__ +#endif // __OPENSPACE_MODULE_MULTIRESVOLUME___MULTIRESVOLUMEMODULE___H__ diff --git a/modules/multiresvolume/rendering/atlasmanager.cpp b/modules/multiresvolume/rendering/atlasmanager.cpp index 65bfbaa4e3..ad54463c76 100644 --- a/modules/multiresvolume/rendering/atlasmanager.cpp +++ b/modules/multiresvolume/rendering/atlasmanager.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2015 * + * Copyright (c) 2014-2016 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * diff --git a/modules/multiresvolume/rendering/atlasmanager.h b/modules/multiresvolume/rendering/atlasmanager.h index b042c57827..5da58ae0c0 100644 --- a/modules/multiresvolume/rendering/atlasmanager.h +++ b/modules/multiresvolume/rendering/atlasmanager.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2015 * + * Copyright (c) 2014-2016 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * @@ -22,8 +22,8 @@ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * ****************************************************************************************/ -#ifndef __ATLASMANAGER_H__ -#define __ATLASMANAGER_H__ +#ifndef __OPENSPACE_MODULE_MULTIRESVOLUME___ATLASMANAGER___H__ +#define __OPENSPACE_MODULE_MULTIRESVOLUME___ATLASMANAGER___H__ #include #include @@ -100,4 +100,4 @@ private: } // namespace openspace -#endif +#endif // __OPENSPACE_MODULE_MULTIRESVOLUME___ATLASMANAGER___H__ diff --git a/modules/multiresvolume/rendering/brickcover.h b/modules/multiresvolume/rendering/brickcover.h index 150f8a2cba..463712e169 100644 --- a/modules/multiresvolume/rendering/brickcover.h +++ b/modules/multiresvolume/rendering/brickcover.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2015 * + * Copyright (c) 2014-2016 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * @@ -22,8 +22,8 @@ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * ****************************************************************************************/ -#ifndef __BRICKCOVER_H__ -#define __BRICKCOVER_H__ +#ifndef __OPENSPACE_MODULE_MULTIRESVOLUME___BRICKCOVER___H__ +#define __OPENSPACE_MODULE_MULTIRESVOLUME___BRICKCOVER___H__ namespace openspace { @@ -63,6 +63,7 @@ struct BrickCover { return child; } }; -} -#endif // __BRICKCOVER_H__ +} // namespace openspace + +#endif // __OPENSPACE_MODULE_MULTIRESVOLUME___BRICKCOVER___H__ diff --git a/modules/multiresvolume/rendering/brickmanager.cpp b/modules/multiresvolume/rendering/brickmanager.cpp index 229e97f62e..7d4d284c07 100644 --- a/modules/multiresvolume/rendering/brickmanager.cpp +++ b/modules/multiresvolume/rendering/brickmanager.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014 * + * Copyright (c) 2014-2016 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * diff --git a/modules/multiresvolume/rendering/brickmanager.h b/modules/multiresvolume/rendering/brickmanager.h index ddc72c49a1..e0be43600f 100644 --- a/modules/multiresvolume/rendering/brickmanager.h +++ b/modules/multiresvolume/rendering/brickmanager.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014 * + * Copyright (c) 2014-2016 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * @@ -22,8 +22,8 @@ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * ****************************************************************************************/ -#ifndef __BRICKMANAGER_H__ -#define __BRICKMANAGER_H__ +#ifndef __OPENSPACE_MODULE_MULTIRESVOLUME___BRICKMANAGER___H__ +#define __OPENSPACE_MODULE_MULTIRESVOLUME___BRICKMANAGER___H__ #include @@ -108,4 +108,4 @@ private: } // namespace openspace -#endif \ No newline at end of file +#endif // __OPENSPACE_MODULE_MULTIRESVOLUME___BRICKMANAGER___H__ diff --git a/modules/multiresvolume/rendering/brickselection.h b/modules/multiresvolume/rendering/brickselection.h index c329523994..27d899e3ba 100644 --- a/modules/multiresvolume/rendering/brickselection.h +++ b/modules/multiresvolume/rendering/brickselection.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2015 * + * Copyright (c) 2014-2016 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * @@ -22,12 +22,11 @@ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * ****************************************************************************************/ -#ifndef __BRICKSELECTION_H__ -#define __BRICKSELECTION_H__ +#ifndef __OPENSPACE_MODULE_MULTIRESVOLUME___BRICKSELECTION___H__ +#define __OPENSPACE_MODULE_MULTIRESVOLUME___BRICKSELECTION___H__ #include - namespace openspace { struct BrickSelection { @@ -103,6 +102,7 @@ struct BrickSelection { return a.splitPoints < b.splitPoints; } }; -} -#endif // __BRICKSELECTION_H__ +} // namespace openspace + +#endif // __OPENSPACE_MODULE_MULTIRESVOLUME___BRICKSELECTION___H__ diff --git a/modules/multiresvolume/rendering/brickselector.h b/modules/multiresvolume/rendering/brickselector.h index 8d99fe5b5e..80e5978060 100644 --- a/modules/multiresvolume/rendering/brickselector.h +++ b/modules/multiresvolume/rendering/brickselector.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2015 * + * Copyright (c) 2014-2016 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * @@ -22,8 +22,8 @@ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * ****************************************************************************************/ -#ifndef __BRICKSELECTOR_H__ -#define __BRICKSELECTOR_H__ +#ifndef __OPENSPACE_MODULE_MULTIRESVOLUME___BRICKSELECTOR___H__ +#define __OPENSPACE_MODULE_MULTIRESVOLUME___BRICKSELECTOR___H__ #include @@ -39,4 +39,4 @@ public: } // namespace openspace -#endif // __BRICKSELECTOR_H__ +#endif // __OPENSPACE_MODULE_MULTIRESVOLUME___BRICKSELECTOR___H__ diff --git a/modules/multiresvolume/rendering/errorhistogrammanager.cpp b/modules/multiresvolume/rendering/errorhistogrammanager.cpp index 73f559b9fb..9db36064b4 100644 --- a/modules/multiresvolume/rendering/errorhistogrammanager.cpp +++ b/modules/multiresvolume/rendering/errorhistogrammanager.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2015 * + * Copyright (c) 2014-2016 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * diff --git a/modules/multiresvolume/rendering/errorhistogrammanager.h b/modules/multiresvolume/rendering/errorhistogrammanager.h index 99e793670d..4237335a3a 100644 --- a/modules/multiresvolume/rendering/errorhistogrammanager.h +++ b/modules/multiresvolume/rendering/errorhistogrammanager.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2015 * + * Copyright (c) 2014-2016 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * @@ -22,8 +22,8 @@ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * ****************************************************************************************/ -#ifndef __ERRORHISTOGRAMMANAGER_H__ -#define __ERRORHISTOGRAMMANAGER_H__ +#ifndef __OPENSPACE_MODULE_MULTIRESVOLUME___ERRORHISTOGRAMMANAGER___H__ +#define __OPENSPACE_MODULE_MULTIRESVOLUME___ERRORHISTOGRAMMANAGER___H__ #include #include @@ -73,4 +73,4 @@ private: } // namespace openspace -#endif // __ERRORHISTOGRAMMANAGER_H__ +#endif // __OPENSPACE_MODULE_MULTIRESVOLUME___ERRORHISTOGRAMMANAGER___H__ diff --git a/modules/multiresvolume/rendering/histogrammanager.cpp b/modules/multiresvolume/rendering/histogrammanager.cpp index da0c1b1a8c..d0ad52c000 100644 --- a/modules/multiresvolume/rendering/histogrammanager.cpp +++ b/modules/multiresvolume/rendering/histogrammanager.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2015 * + * Copyright (c) 2014-2016 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * diff --git a/modules/multiresvolume/rendering/histogrammanager.h b/modules/multiresvolume/rendering/histogrammanager.h index 6ddefd14c2..fbdafaee11 100644 --- a/modules/multiresvolume/rendering/histogrammanager.h +++ b/modules/multiresvolume/rendering/histogrammanager.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2015 * + * Copyright (c) 2014-2016 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * @@ -22,8 +22,8 @@ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * ****************************************************************************************/ -#ifndef __HISTOGRAMMANAGER_H__ -#define __HISTOGRAMMANAGER_H__ +#ifndef __OPENSPACE_MODULE_MULTIRESVOLUME___HISTOGRAMMANAGER___H__ +#define __OPENSPACE_MODULE_MULTIRESVOLUME___HISTOGRAMMANAGER___H__ #include #include @@ -51,4 +51,4 @@ private: } // namespace openspace -#endif // __HISTOGRAMMANAGER_H__ +#endif // __OPENSPACE_MODULE_MULTIRESVOLUME___HISTOGRAMMANAGER___H__ diff --git a/modules/multiresvolume/rendering/localerrorhistogrammanager.cpp b/modules/multiresvolume/rendering/localerrorhistogrammanager.cpp index e90de1d97a..1b3926457b 100644 --- a/modules/multiresvolume/rendering/localerrorhistogrammanager.cpp +++ b/modules/multiresvolume/rendering/localerrorhistogrammanager.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2015 * + * Copyright (c) 2014-2016 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * diff --git a/modules/multiresvolume/rendering/localerrorhistogrammanager.h b/modules/multiresvolume/rendering/localerrorhistogrammanager.h index 4184696e02..c76b859aea 100644 --- a/modules/multiresvolume/rendering/localerrorhistogrammanager.h +++ b/modules/multiresvolume/rendering/localerrorhistogrammanager.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2015 * + * Copyright (c) 2014-2016 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * @@ -22,8 +22,8 @@ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * ****************************************************************************************/ -#ifndef __LOCALERRORHISTOGRAMMANAGER_H__ -#define __LOCALERRORHISTOGRAMMANAGER_H__ +#ifndef __OPENSPACE_MODULE_MULTIRESVOLUME___LOCALERRORHISTOGRAMMANAGER___H__ +#define __OPENSPACE_MODULE_MULTIRESVOLUME___LOCALERRORHISTOGRAMMANAGER___H__ #include #include @@ -77,4 +77,4 @@ private: } // namespace openspace -#endif // __LOCALERRORHISTOGRAMMANAGER_H__ +#endif // __OPENSPACE_MODULE_MULTIRESVOLUME___LOCALERRORHISTOGRAMMANAGER___H__ diff --git a/modules/multiresvolume/rendering/localtfbrickselector.cpp b/modules/multiresvolume/rendering/localtfbrickselector.cpp index 009ef735e2..dcfa208c41 100644 --- a/modules/multiresvolume/rendering/localtfbrickselector.cpp +++ b/modules/multiresvolume/rendering/localtfbrickselector.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2015 * + * Copyright (c) 2014-2016 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * diff --git a/modules/multiresvolume/rendering/localtfbrickselector.h b/modules/multiresvolume/rendering/localtfbrickselector.h index cac58a9d7e..62990e10f9 100644 --- a/modules/multiresvolume/rendering/localtfbrickselector.h +++ b/modules/multiresvolume/rendering/localtfbrickselector.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2015 * + * Copyright (c) 2014-2016 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * @@ -22,8 +22,8 @@ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * ****************************************************************************************/ -#ifndef __LOCALTFBRICKSELECTOR_H__ -#define __LOCALTFBRICKSELECTOR_H__ +#ifndef __OPENSPACE_MODULE_MULTIRESVOLUME___LOCALTFBRICKSELECTOR___H__ +#define __OPENSPACE_MODULE_MULTIRESVOLUME___LOCALTFBRICKSELECTOR___H__ #include #include @@ -74,5 +74,4 @@ public: } // namespace openspace -#endif // __LOCALTFBRICKSELECTOR_H__ - +#endif // __OPENSPACE_MODULE_MULTIRESVOLUME___LOCALTFBRICKSELECTOR___H__ diff --git a/modules/multiresvolume/rendering/multiresvolumeraycaster.h b/modules/multiresvolume/rendering/multiresvolumeraycaster.h index 1c48cc1828..bd8784d00b 100644 --- a/modules/multiresvolume/rendering/multiresvolumeraycaster.h +++ b/modules/multiresvolume/rendering/multiresvolumeraycaster.h @@ -22,8 +22,8 @@ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * ****************************************************************************************/ -#ifndef __MULTIRESVOLUMERAYCASTER_H__ -#define __MULTIRESVOLUMERAYCASTER_H__ +#ifndef __OPENSPACE_MODULE_MULTIRESVOLUME___MULTIRESVOLUMERAYCASTER___H__ +#define __OPENSPACE_MODULE_MULTIRESVOLUME___MULTIRESVOLUMERAYCASTER___H__ #include #include @@ -93,6 +93,6 @@ private: }; // MultiresVolumeRaycaster -} // openspace +} // namespace openspace -#endif // __MULTIRESVOLUMERAYCASTER_H__ +#endif // __OPENSPACE_MODULE_MULTIRESVOLUME___MULTIRESVOLUMERAYCASTER___H__ diff --git a/modules/multiresvolume/rendering/renderablemultiresvolume.cpp b/modules/multiresvolume/rendering/renderablemultiresvolume.cpp index 0db6385d55..2da28a3a05 100644 --- a/modules/multiresvolume/rendering/renderablemultiresvolume.cpp +++ b/modules/multiresvolume/rendering/renderablemultiresvolume.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2015 * + * Copyright (c) 2014-2016 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * diff --git a/modules/multiresvolume/rendering/renderablemultiresvolume.h b/modules/multiresvolume/rendering/renderablemultiresvolume.h index 1f040edfe1..a24315d8de 100644 --- a/modules/multiresvolume/rendering/renderablemultiresvolume.h +++ b/modules/multiresvolume/rendering/renderablemultiresvolume.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2015 * + * Copyright (c) 2014-2016 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * @@ -22,8 +22,8 @@ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * ****************************************************************************************/ -#ifndef __RENDERABLEMULTIRESVOLUME_H__ -#define __RENDERABLEMULTIRESVOLUME_H__ +#ifndef __OPENSPACE_MODULE_MULTIRESVOLUME___RENDERABLEMULTIRESVOLUME___H__ +#define __OPENSPACE_MODULE_MULTIRESVOLUME___RENDERABLEMULTIRESVOLUME___H__ #include #include @@ -160,4 +160,4 @@ private: } // namespace openspace -#endif // __RENDERABLEMULTIRESVOLUME_H__ +#endif // __OPENSPACE_MODULE_MULTIRESVOLUME___RENDERABLEMULTIRESVOLUME___H__ diff --git a/modules/multiresvolume/rendering/shenbrickselector.cpp b/modules/multiresvolume/rendering/shenbrickselector.cpp index 8f6e726887..e0549b4859 100644 --- a/modules/multiresvolume/rendering/shenbrickselector.cpp +++ b/modules/multiresvolume/rendering/shenbrickselector.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2015 * + * Copyright (c) 2014-2016 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * diff --git a/modules/multiresvolume/rendering/shenbrickselector.h b/modules/multiresvolume/rendering/shenbrickselector.h index 99bcb252f7..3001b94b56 100644 --- a/modules/multiresvolume/rendering/shenbrickselector.h +++ b/modules/multiresvolume/rendering/shenbrickselector.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2015 * + * Copyright (c) 2014-2016 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * @@ -22,8 +22,8 @@ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * ****************************************************************************************/ -#ifndef __SHENBRICKSELECTOR_H__ -#define __SHENBRICKSELECTOR_H__ +#ifndef __OPENSPACE_MODULE_MULTIRESVOLUME___SHENBRICKSELECTOR___H__ +#define __OPENSPACE_MODULE_MULTIRESVOLUME___SHENBRICKSELECTOR___H__ #include #include @@ -74,4 +74,4 @@ private: } // namespace openspace -#endif // __SHENBRICKSELECTOR_H__ +#endif // __OPENSPACE_MODULE_MULTIRESVOLUME___SHENBRICKSELECTOR___H__ diff --git a/modules/multiresvolume/rendering/simpletfbrickselector.cpp b/modules/multiresvolume/rendering/simpletfbrickselector.cpp index 5b874b924d..c409e23666 100644 --- a/modules/multiresvolume/rendering/simpletfbrickselector.cpp +++ b/modules/multiresvolume/rendering/simpletfbrickselector.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2015 * + * Copyright (c) 2014-2016 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * diff --git a/modules/multiresvolume/rendering/simpletfbrickselector.h b/modules/multiresvolume/rendering/simpletfbrickselector.h index 0dadfa90d6..11bbae032d 100644 --- a/modules/multiresvolume/rendering/simpletfbrickselector.h +++ b/modules/multiresvolume/rendering/simpletfbrickselector.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2015 * + * Copyright (c) 2014-2016 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * @@ -22,8 +22,8 @@ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * ****************************************************************************************/ -#ifndef __SIMPLETFBRICKSELECTOR_H__ -#define __SIMPLETFBRICKSELECTOR_H__ +#ifndef __OPENSPACE_MODULE_MULTIRESVOLUME___SIMPLETFBRICKSELECTOR___H__ +#define __OPENSPACE_MODULE_MULTIRESVOLUME___SIMPLETFBRICKSELECTOR___H__ #include #include @@ -67,5 +67,4 @@ public: } // namespace openspace -#endif // __SIMPLETFBRICKSELECTOR_H__ - +#endif // __OPENSPACE_MODULE_MULTIRESVOLUME___SIMPLETFBRICKSELECTOR___H__ diff --git a/modules/multiresvolume/rendering/tfbrickselector.cpp b/modules/multiresvolume/rendering/tfbrickselector.cpp index f976b714c6..b0d889bb20 100644 --- a/modules/multiresvolume/rendering/tfbrickselector.cpp +++ b/modules/multiresvolume/rendering/tfbrickselector.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2015 * + * Copyright (c) 2014-2016 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * diff --git a/modules/multiresvolume/rendering/tfbrickselector.h b/modules/multiresvolume/rendering/tfbrickselector.h index 2a48004406..e411b453c6 100644 --- a/modules/multiresvolume/rendering/tfbrickselector.h +++ b/modules/multiresvolume/rendering/tfbrickselector.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2015 * + * Copyright (c) 2014-2016 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * @@ -22,15 +22,14 @@ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * ****************************************************************************************/ -#ifndef __TFBRICKSELECTOR_H__ -#define __TFBRICKSELECTOR_H__ +#ifndef __OPENSPACE_MODULE_MULTIRESVOLUME___TFBRICKSELECTOR___H__ +#define __OPENSPACE_MODULE_MULTIRESVOLUME___TFBRICKSELECTOR___H__ #include #include #include #include - namespace openspace { class TSP; @@ -69,5 +68,4 @@ public: } // namespace openspace -#endif // __TFBRICKSELECTOR_H__ - +#endif // __OPENSPACE_MODULE_MULTIRESVOLUME___TFBRICKSELECTOR___H__ diff --git a/modules/multiresvolume/rendering/tsp.cpp b/modules/multiresvolume/rendering/tsp.cpp index 49b39f4782..74c1cf0400 100644 --- a/modules/multiresvolume/rendering/tsp.cpp +++ b/modules/multiresvolume/rendering/tsp.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014 * + * Copyright (c) 2014-2016 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * diff --git a/modules/multiresvolume/rendering/tsp.h b/modules/multiresvolume/rendering/tsp.h index 6addb710ba..d182238284 100644 --- a/modules/multiresvolume/rendering/tsp.h +++ b/modules/multiresvolume/rendering/tsp.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014 * + * Copyright (c) 2014-2016 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * @@ -22,17 +22,15 @@ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * ****************************************************************************************/ -#ifndef __TSP_H__ -#define __TSP_H__ +#ifndef __OPENSPACE_MODULE_MULTIRESVOLUME___TSP___H__ +#define __OPENSPACE_MODULE_MULTIRESVOLUME___TSP___H__ -// std includes #include #include #include #include #include -// ghoul includes #include namespace openspace { @@ -143,6 +141,7 @@ private: float medianTemporalError_; }; // class TSP + } // namespace openspace -#endif +#endif // __OPENSPACE_MODULE_MULTIRESVOLUME___TSP___H__ diff --git a/modules/onscreengui/include/gui.h b/modules/onscreengui/include/gui.h index 83822d00cf..dcbffff069 100644 --- a/modules/onscreengui/include/gui.h +++ b/modules/onscreengui/include/gui.h @@ -22,8 +22,8 @@ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * ****************************************************************************************/ -#ifndef __GUI_H__ -#define __GUI_H__ +#ifndef __OPENSPACE_MODULE_ONSCREENGUI___GUI___H__ +#define __OPENSPACE_MODULE_ONSCREENGUI___GUI___H__ #include #include @@ -57,7 +57,8 @@ public: bool keyCallback(Key key, KeyModifier modifier, KeyAction action); bool charCallback(unsigned int character, KeyModifier modifier); - void startFrame(float deltaTime, const glm::vec2& windowSize, const glm::vec2& dpiScaling, const glm::vec2& mousePos, uint32_t mouseButtons); + void startFrame(float deltaTime, const glm::vec2& windowSize, + const glm::vec2& dpiScaling, const glm::vec2& mousePos, uint32_t mouseButtons); void endFrame(); void render(); @@ -82,4 +83,4 @@ private: } // namespace gui } // namespace openspace -#endif // __GUI_H__ +#endif // __OPENSPACE_MODULE_ONSCREENGUI___GUI___H__ diff --git a/modules/onscreengui/include/guicomponent.h b/modules/onscreengui/include/guicomponent.h index 585870ba4d..7aed19c3d6 100644 --- a/modules/onscreengui/include/guicomponent.h +++ b/modules/onscreengui/include/guicomponent.h @@ -22,8 +22,8 @@ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * ****************************************************************************************/ -#ifndef __GUICOMPONENT_H__ -#define __GUICOMPONENT_H__ +#ifndef __OPENSPACE_MODULE_ONSCREENGUI___GUICOMPONENT___H__ +#define __OPENSPACE_MODULE_ONSCREENGUI___GUICOMPONENT___H__ #include #include @@ -78,4 +78,4 @@ protected: } // namespace gui } // namespace openspace -#endif // __GUICOMPONENT_H__ +#endif // __OPENSPACE_MODULE_ONSCREENGUI___GUICOMPONENT___H__ diff --git a/modules/onscreengui/include/guihelpcomponent.h b/modules/onscreengui/include/guihelpcomponent.h index 6740166d75..3f046405e6 100644 --- a/modules/onscreengui/include/guihelpcomponent.h +++ b/modules/onscreengui/include/guihelpcomponent.h @@ -22,8 +22,8 @@ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * ****************************************************************************************/ -#ifndef __GUIHELPCOMPONENT_H__ -#define __GUIHELPCOMPONENT_H__ +#ifndef __OPENSPACE_MODULE_ONSCREENGUI___GUIHELPCOMPONENT___H__ +#define __OPENSPACE_MODULE_ONSCREENGUI___GUIHELPCOMPONENT___H__ #include @@ -40,4 +40,4 @@ public: } // namespace gui } // namespace openspace -#endif // __GUIHELPCOMPONENT_H__ +#endif // __OPENSPACE_MODULE_ONSCREENGUI___GUIHELPCOMPONENT___H__ diff --git a/modules/onscreengui/include/guiiswacomponent.h b/modules/onscreengui/include/guiiswacomponent.h index a6d831f788..6f27fbf6de 100644 --- a/modules/onscreengui/include/guiiswacomponent.h +++ b/modules/onscreengui/include/guiiswacomponent.h @@ -22,8 +22,8 @@ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * ****************************************************************************************/ -#ifndef __GUIISWACOMPONENT_H__ -#define __GUIISWACOMPONENT_H__ +#ifndef __OPENSPACE_MODULE_ONSCREENGUI___GUIISWACOMPONENT___H__ +#define __OPENSPACE_MODULE_ONSCREENGUI___GUIISWACOMPONENT___H__ #include @@ -49,4 +49,4 @@ private: } // namespace gui } // namespace openspace -#endif // __GUIISWACOMPONENT_H__ +#endif // __OPENSPACE_MODULE_ONSCREENGUI___GUIISWACOMPONENT___H__ diff --git a/modules/onscreengui/include/guiorigincomponent.h b/modules/onscreengui/include/guiorigincomponent.h index 159331a752..79ec27f278 100644 --- a/modules/onscreengui/include/guiorigincomponent.h +++ b/modules/onscreengui/include/guiorigincomponent.h @@ -22,8 +22,8 @@ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * ****************************************************************************************/ -#ifndef __GUIORIGINCOMPONENT_H__ -#define __GUIORIGINCOMPONENT_H__ +#ifndef __OPENSPACE_MODULE_ONSCREENGUI___GUIORIGINCOMPONENT___H__ +#define __OPENSPACE_MODULE_ONSCREENGUI___GUIORIGINCOMPONENT___H__ #include @@ -40,4 +40,4 @@ public: } // namespace gui } // namespace openspace -#endif // __GUIORIGINCOMPONENT_H__ +#endif // __OPENSPACE_MODULE_ONSCREENGUI___GUIORIGINCOMPONENT___H__ diff --git a/modules/onscreengui/include/guiperformancecomponent.h b/modules/onscreengui/include/guiperformancecomponent.h index 33a7ac5667..241613c614 100644 --- a/modules/onscreengui/include/guiperformancecomponent.h +++ b/modules/onscreengui/include/guiperformancecomponent.h @@ -22,8 +22,8 @@ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * ****************************************************************************************/ -#ifndef __GUIPERFORMANCECOMPONENT_H__ -#define __GUIPERFORMANCECOMPONENT_H__ +#ifndef __OPENSPACE_MODULE_ONSCREENGUI___GUIPERFORMANCECOMPONENT___H__ +#define __OPENSPACE_MODULE_ONSCREENGUI___GUIPERFORMANCECOMPONENT___H__ #include @@ -59,4 +59,4 @@ protected: } // namespace gui } // namespace openspace -#endif // __GUIPERFORMANCECOMPONENT_H__ +#endif // __OPENSPACE_MODULE_ONSCREENGUI___GUIPERFORMANCECOMPONENT___H__ diff --git a/modules/onscreengui/include/guipropertycomponent.h b/modules/onscreengui/include/guipropertycomponent.h index c6dd289482..a97fe0e154 100644 --- a/modules/onscreengui/include/guipropertycomponent.h +++ b/modules/onscreengui/include/guipropertycomponent.h @@ -22,8 +22,8 @@ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * ****************************************************************************************/ -#ifndef __GUIPROPERTYCOMPONENT_H__ -#define __GUIPROPERTYCOMPONENT_H__ +#ifndef __OPENSPACE_MODULE_ONSCREENGUI___GUIPROPERTYCOMPONENT___H__ +#define __OPENSPACE_MODULE_ONSCREENGUI___GUIPROPERTYCOMPONENT___H__ #include @@ -68,4 +68,4 @@ protected: } // namespace gui } // namespace openspace -#endif // __GUIPROPERTYCOMPONENT_H__ +#endif // __OPENSPACE_MODULE_ONSCREENGUI___GUIPROPERTYCOMPONENT___H__ diff --git a/modules/onscreengui/include/guitimecomponent.h b/modules/onscreengui/include/guitimecomponent.h index 32c5e7a3de..4598eee0d1 100644 --- a/modules/onscreengui/include/guitimecomponent.h +++ b/modules/onscreengui/include/guitimecomponent.h @@ -22,8 +22,8 @@ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * ****************************************************************************************/ -#ifndef __GUITIMECOMPONENT_H__ -#define __GUITIMECOMPONENT_H__ +#ifndef __OPENSPACE_MODULE_ONSCREENGUI___GUITIMECOMPONENT___H__ +#define __OPENSPACE_MODULE_ONSCREENGUI___GUITIMECOMPONENT___H__ #include @@ -40,4 +40,4 @@ public: } // namespace gui } // namespace openspace -#endif // __GUITIMECOMPONENT_H__ +#endif // __OPENSPACE_MODULE_ONSCREENGUI___GUITIMECOMPONENT___H__ diff --git a/modules/onscreengui/include/renderproperties.h b/modules/onscreengui/include/renderproperties.h index 289048ad82..acbf461a8f 100644 --- a/modules/onscreengui/include/renderproperties.h +++ b/modules/onscreengui/include/renderproperties.h @@ -22,8 +22,8 @@ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * ****************************************************************************************/ -#ifndef __RENDERPROPERTIES_H__ -#define __RENDERPROPERTIES_H__ +#ifndef __OPENSPACE_MODULE_ONSCREENGUI___RENDERPROPERTIES___H__ +#define __OPENSPACE_MODULE_ONSCREENGUI___RENDERPROPERTIES___H__ #include @@ -54,4 +54,4 @@ void renderTriggerProperty(properties::Property* prop, const std::string& ownerN } // namespace openspace -#endif __RENDERPROPERTIES_H__ +#endif __OPENSPACE_MODULE_ONSCREENGUI___RENDERPROPERTIES___H__ diff --git a/modules/onscreengui/onscreenguimodule.h b/modules/onscreengui/onscreenguimodule.h index 224cc980e0..ca6c59c18e 100644 --- a/modules/onscreengui/onscreenguimodule.h +++ b/modules/onscreengui/onscreenguimodule.h @@ -22,8 +22,8 @@ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * ****************************************************************************************/ -#ifndef __ONSCREENGUIMODULE_H__ -#define __ONSCREENGUIMODULE_H__ +#ifndef __OPENSPACE_MODULE_ONSCREENGUI___ONSCREENGUIMODULE___H__ +#define __OPENSPACE_MODULE_ONSCREENGUI___ONSCREENGUIMODULE___H__ #include @@ -36,4 +36,4 @@ public: } // namespace openspace -#endif // __ONSCREENGUIMODULE_H__ +#endif // __OPENSPACE_MODULE_ONSCREENGUI___ONSCREENGUIMODULE___H__ diff --git a/modules/onscreengui/src/guiiswacomponent.cpp b/modules/onscreengui/src/guiiswacomponent.cpp index 458400acae..61d5b4548d 100644 --- a/modules/onscreengui/src/guiiswacomponent.cpp +++ b/modules/onscreengui/src/guiiswacomponent.cpp @@ -58,7 +58,11 @@ void GuiIswaComponent::render() { bool oldGmImageValue = _gmImage; bool oldIonDataValue = _ionData; - ImGui::Begin("ISWA", &_isEnabled, size, 0.5f); + bool e = _isEnabled; + + ImGui::Begin("ISWA", &e, size, 0.5f); + + _isEnabled = e; ImGui::Text("Global Magnetosphere"); ImGui::Checkbox("Gm From Data", &_gmData); ImGui::SameLine(); diff --git a/modules/toyvolume/rendering/renderabletoyvolume.cpp b/modules/toyvolume/rendering/renderabletoyvolume.cpp index 73ac923689..45e23a47af 100644 --- a/modules/toyvolume/rendering/renderabletoyvolume.cpp +++ b/modules/toyvolume/rendering/renderabletoyvolume.cpp @@ -35,8 +35,8 @@ namespace openspace { - RenderableToyVolume::RenderableToyVolume(const ghoul::Dictionary& dictionary) - : Renderable(dictionary) +RenderableToyVolume::RenderableToyVolume(const ghoul::Dictionary& dictionary) + : Renderable(dictionary) , _scalingExponent("scalingExponent", "Scaling Exponent", 1, -10, 20) , _stepSize("stepSize", "Step Size", 0.02, 0.01, 1) , _scaling("scaling", "Scaling", glm::vec3(1.0, 1.0, 1.0), glm::vec3(0.0), glm::vec3(10.0)) @@ -130,4 +130,4 @@ void RenderableToyVolume::render(const RenderData& data, RendererTasks& tasks) { tasks.raycasterTasks.push_back(task); } -} +} // namespace openspace diff --git a/modules/toyvolume/rendering/renderabletoyvolume.h b/modules/toyvolume/rendering/renderabletoyvolume.h index 59f4dacf65..68f39da10a 100644 --- a/modules/toyvolume/rendering/renderabletoyvolume.h +++ b/modules/toyvolume/rendering/renderabletoyvolume.h @@ -22,8 +22,8 @@ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * ****************************************************************************************/ -#ifndef __RENDERABLETOYVOLUME_H__ -#define __RENDERABLETOYVOLUME_H__ +#ifndef __OPENSPACE_MODULE_TOYVOLUME___RENDERABLETOYVOLUME___H__ +#define __OPENSPACE_MODULE_TOYVOLUME___RENDERABLETOYVOLUME___H__ #include @@ -60,6 +60,7 @@ private: std::unique_ptr _raycaster; }; -} -#endif // __RENDERABLETOYVOLUME_H__ +} // namespace openspace + +#endif // __OPENSPACE_MODULE_TOYVOLUME___RENDERABLETOYVOLUME___H__ diff --git a/modules/toyvolume/rendering/toyvolumeraycaster.h b/modules/toyvolume/rendering/toyvolumeraycaster.h index 4924276a20..b6159b0baf 100644 --- a/modules/toyvolume/rendering/toyvolumeraycaster.h +++ b/modules/toyvolume/rendering/toyvolumeraycaster.h @@ -22,8 +22,8 @@ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * ****************************************************************************************/ -#ifndef __TOYVOLUMERAYCASTER_H__ -#define __TOYVOLUMERAYCASTER_H__ +#ifndef __OPENSPACE_MODULE_TOYVOLUME___TOYVOLUMERAYCASTER___H__ +#define __OPENSPACE_MODULE_TOYVOLUME___TOYVOLUMERAYCASTER___H__ #include #include @@ -77,4 +77,4 @@ private: } // openspace -#endif // __TOYVOLUMERAYCASTER_H__ +#endif // __OPENSPACE_MODULE_TOYVOLUME___TOYVOLUMERAYCASTER___H__ diff --git a/modules/toyvolume/toyvolumemodule.h b/modules/toyvolume/toyvolumemodule.h index 510156fef2..f4fb27661e 100644 --- a/modules/toyvolume/toyvolumemodule.h +++ b/modules/toyvolume/toyvolumemodule.h @@ -22,8 +22,8 @@ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * ****************************************************************************************/ -#ifndef __TOYVOLUMEMODULE_H__ -#define __TOYVOLUMEMODULE_H__ +#ifndef __OPENSPACE_MODULE_TOYVOLUME___TOYVOLUMEMODULE___H__ +#define __OPENSPACE_MODULE_TOYVOLUME___TOYVOLUMEMODULE___H__ #include @@ -37,4 +37,4 @@ public: } // namespace openspace -#endif // __TOYVOLUMEMODULE_H__ +#endif // __OPENSPACE_MODULE_TOYVOLUME___TOYVOLUMEMODULE___H__ diff --git a/modules/volume/CMakeLists.txt b/modules/volume/CMakeLists.txt index b6538d01b5..95cb375fb8 100644 --- a/modules/volume/CMakeLists.txt +++ b/modules/volume/CMakeLists.txt @@ -25,22 +25,27 @@ include(${OPENSPACE_CMAKE_EXT_DIR}/module_definition.cmake) set(HEADER_FILES - ${CMAKE_CURRENT_SOURCE_DIR}/rawvolume.h + ${CMAKE_CURRENT_SOURCE_DIR}/rawvolume.h + ${CMAKE_CURRENT_SOURCE_DIR}/rawvolume.inl ${CMAKE_CURRENT_SOURCE_DIR}/rawvolumereader.h - ${CMAKE_CURRENT_SOURCE_DIR}/rawvolumewriter.h + ${CMAKE_CURRENT_SOURCE_DIR}/rawvolumereader.inl + ${CMAKE_CURRENT_SOURCE_DIR}/rawvolumewriter.h + ${CMAKE_CURRENT_SOURCE_DIR}/rawvolumewriter.inl ${CMAKE_CURRENT_SOURCE_DIR}/textureslicevolumereader.h + ${CMAKE_CURRENT_SOURCE_DIR}/textureslicevolumereader.inl ${CMAKE_CURRENT_SOURCE_DIR}/lrucache.h - ${CMAKE_CURRENT_SOURCE_DIR}/linearlrucache.h + ${CMAKE_CURRENT_SOURCE_DIR}/linearlrucache.h ${CMAKE_CURRENT_SOURCE_DIR}/volumesampler.h - ${CMAKE_CURRENT_SOURCE_DIR}/volumeutils.h + ${CMAKE_CURRENT_SOURCE_DIR}/volumesampler.inl + ${CMAKE_CURRENT_SOURCE_DIR}/volumeutils.h ) source_group("Header Files" FILES ${HEADER_FILES}) set(SOURCE_FILES - ${CMAKE_CURRENT_SOURCE_DIR}/rawvolume.inl + ${CMAKE_CURRENT_SOURCE_DIR}/rawvolume.inl ${CMAKE_CURRENT_SOURCE_DIR}/rawvolumereader.inl ${CMAKE_CURRENT_SOURCE_DIR}/rawvolumewriter.inl - ${CMAKE_CURRENT_SOURCE_DIR}/textureslicevolumereader.inl + ${CMAKE_CURRENT_SOURCE_DIR}/textureslicevolumereader.inl ${CMAKE_CURRENT_SOURCE_DIR}/volumesampler.inl ${CMAKE_CURRENT_SOURCE_DIR}/volumeutils.cpp ) diff --git a/modules/volume/linearlrucache.h b/modules/volume/linearlrucache.h index 437afa99e4..b3f7e4083b 100644 --- a/modules/volume/linearlrucache.h +++ b/modules/volume/linearlrucache.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014 - 2016 * + * Copyright (c) 2014-2016 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * @@ -22,8 +22,8 @@ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * ****************************************************************************************/ -#ifndef __LRUCACHE_H__ -#define __LRUCACHE_H__ +#ifndef __OPENSPACE_MODULE_VOLUME___LINEARLRUCACHE___H__ +#define __OPENSPACE_MODULE_VOLUME___LINEARLRUCACHE___H__ #include #include @@ -86,6 +86,6 @@ private: size_t _capacity; }; -} +} // namespace openspace -#endif +#endif // __OPENSPACE_MODULE_VOLUME___LINEARLRUCACHE___H__ diff --git a/modules/volume/lrucache.h b/modules/volume/lrucache.h index c8a3fee41e..94d5a0deed 100644 --- a/modules/volume/lrucache.h +++ b/modules/volume/lrucache.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014 - 2016 * + * Copyright (c) 2014-2016 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * @@ -22,8 +22,8 @@ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * ****************************************************************************************/ -#ifndef __LRUCACHE_H__ -#define __LRUCACHE_H__ +#ifndef __OPENSPACE_MODULE_VOLUME___LRUCACHE___H__ +#define __OPENSPACE_MODULE_VOLUME___LRUCACHE___H__ #include #include @@ -86,6 +86,6 @@ private: size_t _capacity; }; -} +} // namespace openspace -#endif +#endif // __OPENSPACE_MODULE_VOLUME___LRUCACHE___H__ diff --git a/modules/volume/rawvolume.h b/modules/volume/rawvolume.h index df5e3b9037..7cce0ae066 100644 --- a/modules/volume/rawvolume.h +++ b/modules/volume/rawvolume.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014 - 2016 * + * Copyright (c) 2014-2016 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * @@ -22,8 +22,8 @@ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * ****************************************************************************************/ -#ifndef __RAWVOLUME_H__ -#define __RAWVOLUME_H__ +#ifndef __OPENSPACE_MODULE_VOLUME___RAWVOLUME___H__ +#define __OPENSPACE_MODULE_VOLUME___RAWVOLUME___H__ namespace openspace { @@ -47,8 +47,8 @@ private: std::vector _data; }; -} +} // namespace openspace #include "rawvolume.inl" -#endif // __RAWVOLUME_H__ +#endif // __OPENSPACE_MODULE_VOLUME___RAWVOLUME___H__ diff --git a/modules/volume/rawvolume.inl b/modules/volume/rawvolume.inl index 5f8edbc50a..ba913e84bb 100644 --- a/modules/volume/rawvolume.inl +++ b/modules/volume/rawvolume.inl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014 - 2016 * + * Copyright (c) 2014-2016 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * diff --git a/modules/volume/rawvolumereader.h b/modules/volume/rawvolumereader.h index fb394d7717..75ecb0b694 100644 --- a/modules/volume/rawvolumereader.h +++ b/modules/volume/rawvolumereader.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014 - 2016 * + * Copyright (c) 2014-2016 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * @@ -22,8 +22,8 @@ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * ****************************************************************************************/ -#ifndef __RAWVOLUMEREADER_H__ -#define __RAWVOLUMEREADER_H__ +#ifndef __OPENSPACE_MODULE_VOLUME___RAWVOLUMEREADER___H__ +#define __OPENSPACE_MODULE_VOLUME___RAWVOLUMEREADER___H__ #include #include @@ -49,8 +49,8 @@ private: std::string _path; }; -} +} // namespace openspace #include "rawvolumereader.inl" -#endif // __RAWVOLUMEREADER_H__ +#endif // __OPENSPACE_MODULE_VOLUME___RAWVOLUMEREADER___H__ diff --git a/modules/volume/rawvolumereader.inl b/modules/volume/rawvolumereader.inl index fe16c09789..135a046c8a 100644 --- a/modules/volume/rawvolumereader.inl +++ b/modules/volume/rawvolumereader.inl @@ -1,3 +1,27 @@ +/***************************************************************************************** + * * + * OpenSpace * + * * + * Copyright (c) 2014-2016 * + * * + * Permission is hereby granted, free of charge, to any person obtaining a copy of this * + * software and associated documentation files (the "Software"), to deal in the Software * + * without restriction, including without limitation the rights to use, copy, modify, * + * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to * + * permit persons to whom the Software is furnished to do so, subject to the following * + * conditions: * + * * + * The above copyright notice and this permission notice shall be included in all copies * + * or substantial portions of the Software. * + * * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, * + * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A * + * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT * + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF * + * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE * + * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * + ****************************************************************************************/ + #include namespace openspace { @@ -6,7 +30,8 @@ template RawVolumeReader::RawVolumeReader(const std::string& path, const glm::ivec3& dimensions) : _path(path) - , _dimensions(dimensions) {} + , _dimensions(dimensions) +{} template glm::ivec3 RawVolumeReader::dimensions() const { @@ -70,4 +95,4 @@ std::unique_ptr> RawVolumeReader::read() { return volume; } -} +} // namespace openspace diff --git a/modules/volume/rawvolumewriter.h b/modules/volume/rawvolumewriter.h index 48bd3cae04..a173f53d9b 100644 --- a/modules/volume/rawvolumewriter.h +++ b/modules/volume/rawvolumewriter.h @@ -1,5 +1,29 @@ -#ifndef __RAWVOLUMEWRITER_H__ -#define __RAWVOLUMEWRITER_H__ +/***************************************************************************************** + * * + * OpenSpace * + * * + * Copyright (c) 2014-2016 * + * * + * Permission is hereby granted, free of charge, to any person obtaining a copy of this * + * software and associated documentation files (the "Software"), to deal in the Software * + * without restriction, including without limitation the rights to use, copy, modify, * + * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to * + * permit persons to whom the Software is furnished to do so, subject to the following * + * conditions: * + * * + * The above copyright notice and this permission notice shall be included in all copies * + * or substantial portions of the Software. * + * * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, * + * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A * + * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT * + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF * + * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE * + * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * + ****************************************************************************************/ + +#ifndef __OPENSPACE_MODULE_VOLUME___RAWVOLUMEWRITER___H__ +#define __OPENSPACE_MODULE_VOLUME___RAWVOLUMEWRITER___H__ #include #include @@ -26,8 +50,8 @@ private: size_t _bufferSize; }; -} +} // namespace openspace #include "rawvolumewriter.inl"; -#endif +#endif // __OPENSPACE_MODULE_VOLUME___RAWVOLUMEWRITER___H__ diff --git a/modules/volume/rawvolumewriter.inl b/modules/volume/rawvolumewriter.inl index b3285ad176..1e1fc8294d 100644 --- a/modules/volume/rawvolumewriter.inl +++ b/modules/volume/rawvolumewriter.inl @@ -1,3 +1,27 @@ +/***************************************************************************************** + * * + * OpenSpace * + * * + * Copyright (c) 2014-2016 * + * * + * Permission is hereby granted, free of charge, to any person obtaining a copy of this * + * software and associated documentation files (the "Software"), to deal in the Software * + * without restriction, including without limitation the rights to use, copy, modify, * + * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to * + * permit persons to whom the Software is furnished to do so, subject to the following * + * conditions: * + * * + * The above copyright notice and this permission notice shall be included in all copies * + * or substantial portions of the Software. * + * * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, * + * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A * + * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT * + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF * + * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE * + * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * + ****************************************************************************************/ + #include #include @@ -76,5 +100,4 @@ void RawVolumeWriter::write(const RawVolume& volume) { file.close(); } - -} +} // namespace openspace diff --git a/modules/volume/textureslicevolumereader.h b/modules/volume/textureslicevolumereader.h index f5d1da2f18..c8a96a1e6d 100644 --- a/modules/volume/textureslicevolumereader.h +++ b/modules/volume/textureslicevolumereader.h @@ -1,5 +1,29 @@ -#ifndef __TEXTURESLICEVOLUMEREADER_H__ -#define __TEXTURESLICEVOLUMEREADER_H__ +/***************************************************************************************** + * * + * OpenSpace * + * * + * Copyright (c) 2014-2016 * + * * + * Permission is hereby granted, free of charge, to any person obtaining a copy of this * + * software and associated documentation files (the "Software"), to deal in the Software * + * without restriction, including without limitation the rights to use, copy, modify, * + * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to * + * permit persons to whom the Software is furnished to do so, subject to the following * + * conditions: * + * * + * The above copyright notice and this permission notice shall be included in all copies * + * or substantial portions of the Software. * + * * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, * + * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A * + * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT * + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF * + * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE * + * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * + ****************************************************************************************/ + +#ifndef __OPENSPACE_MODULE_VOLUME___TEXTURESLICEVOLUMEREADER___H__ +#define __OPENSPACE_MODULE_VOLUME___TEXTURESLICEVOLUMEREADER___H__ #include #include @@ -27,8 +51,8 @@ private: bool _initialized; }; -} +} // namespace openspace #include "textureslicevolumereader.inl" -#endif // __TEXTURESLICEVOLUME_H__ +#endif // __OPENSPACE_MODULE_VOLUME___TEXTURESLICEVOLUMEREADER___H__ diff --git a/modules/volume/textureslicevolumereader.inl b/modules/volume/textureslicevolumereader.inl index 8f55678cb8..9c859905cf 100644 --- a/modules/volume/textureslicevolumereader.inl +++ b/modules/volume/textureslicevolumereader.inl @@ -1,3 +1,27 @@ +/***************************************************************************************** + * * + * OpenSpace * + * * + * Copyright (c) 2014-2016 * + * * + * Permission is hereby granted, free of charge, to any person obtaining a copy of this * + * software and associated documentation files (the "Software"), to deal in the Software * + * without restriction, including without limitation the rights to use, copy, modify, * + * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to * + * permit persons to whom the Software is furnished to do so, subject to the following * + * conditions: * + * * + * The above copyright notice and this permission notice shall be included in all copies * + * or substantial portions of the Software. * + * * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, * + * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A * + * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT * + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF * + * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE * + * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * + ****************************************************************************************/ + #include namespace openspace { @@ -55,4 +79,4 @@ ghoul::opengl::Texture& TextureSliceVolumeReader::getSlice(int sliceI return *_cache.get(sliceIndex).get(); } -} +} // namespace openspace diff --git a/modules/volume/volumemodule.cpp b/modules/volume/volumemodule.cpp index 42a04bdcde..10098fe698 100644 --- a/modules/volume/volumemodule.cpp +++ b/modules/volume/volumemodule.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2015 * + * Copyright (c) 2014-2016 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * diff --git a/modules/volume/volumemodule.h b/modules/volume/volumemodule.h index 3319dadb3a..f21de012d3 100644 --- a/modules/volume/volumemodule.h +++ b/modules/volume/volumemodule.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2015 * + * Copyright (c) 2014-2016 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * @@ -22,8 +22,8 @@ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * ****************************************************************************************/ -#ifndef __VOLUMEMODULE_H__ -#define __VOLUMEMODULE_H__ +#ifndef __OPENSPACE_MODULE_VOLUME___VOLUMEMODULE___H__ +#define __OPENSPACE_MODULE_VOLUME___VOLUMEMODULE___H__ #include @@ -39,4 +39,4 @@ protected: } // namespace openspace -#endif // __VOLUMEMODULE_H__ +#endif // __OPENSPACE_MODULE_VOLUME___VOLUMEMODULE___H__ diff --git a/modules/volume/volumesampler.h b/modules/volume/volumesampler.h index 1f394385c6..cc6bff50d5 100644 --- a/modules/volume/volumesampler.h +++ b/modules/volume/volumesampler.h @@ -1,5 +1,29 @@ -#ifndef __VOLUMESAMPLER_H__ -#define __VOLUMESAMPLER_H__ +/***************************************************************************************** + * * + * OpenSpace * + * * + * Copyright (c) 2014-2016 * + * * + * Permission is hereby granted, free of charge, to any person obtaining a copy of this * + * software and associated documentation files (the "Software"), to deal in the Software * + * without restriction, including without limitation the rights to use, copy, modify, * + * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to * + * permit persons to whom the Software is furnished to do so, subject to the following * + * conditions: * + * * + * The above copyright notice and this permission notice shall be included in all copies * + * or substantial portions of the Software. * + * * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, * + * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A * + * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT * + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF * + * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE * + * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * + ****************************************************************************************/ + +#ifndef __OPENSPACE_MODULE_VOLUME___VOLUMESAMPLER___H__ +#define __OPENSPACE_MODULE_VOLUME___VOLUMESAMPLER___H__ namespace openspace { @@ -13,8 +37,8 @@ private: const VolumeType* _volume; }; -} +} // namespace openspace #include "volumesampler.inl" -#endif +#endif // __OPENSPACE_MODULE_VOLUME___VOLUMESAMPLER___H__ diff --git a/modules/volume/volumesampler.inl b/modules/volume/volumesampler.inl index 85fdde61f8..a214dbd82b 100644 --- a/modules/volume/volumesampler.inl +++ b/modules/volume/volumesampler.inl @@ -1,3 +1,27 @@ +/***************************************************************************************** + * * + * OpenSpace * + * * + * Copyright (c) 2014-2016 * + * * + * Permission is hereby granted, free of charge, to any person obtaining a copy of this * + * software and associated documentation files (the "Software"), to deal in the Software * + * without restriction, including without limitation the rights to use, copy, modify, * + * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to * + * permit persons to whom the Software is furnished to do so, subject to the following * + * conditions: * + * * + * The above copyright notice and this permission notice shall be included in all copies * + * or substantial portions of the Software. * + * * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, * + * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A * + * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT * + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF * + * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE * + * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * + ****************************************************************************************/ + namespace openspace { template @@ -54,4 +78,4 @@ typename VolumeType::VoxelType VolumeSampler::sample(const glm::vec3 return value; } -} +} // namespace openspace diff --git a/modules/volume/volumeutils.cpp b/modules/volume/volumeutils.cpp index 42eddf10c5..ab9ef9c500 100644 --- a/modules/volume/volumeutils.cpp +++ b/modules/volume/volumeutils.cpp @@ -1,3 +1,27 @@ +/***************************************************************************************** + * * + * OpenSpace * + * * + * Copyright (c) 2014-2016 * + * * + * Permission is hereby granted, free of charge, to any person obtaining a copy of this * + * software and associated documentation files (the "Software"), to deal in the Software * + * without restriction, including without limitation the rights to use, copy, modify, * + * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to * + * permit persons to whom the Software is furnished to do so, subject to the following * + * conditions: * + * * + * The above copyright notice and this permission notice shall be included in all copies * + * or substantial portions of the Software. * + * * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, * + * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A * + * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT * + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF * + * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE * + * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * + ****************************************************************************************/ + #include "volumeutils.h" namespace openspace { @@ -27,5 +51,6 @@ glm::vec3 indexToCoords(size_t index, const glm::ivec3& dims) { return glm::ivec3(x, y, z); } -} -} +} // namespace volumeutils + +} // namespace openspace diff --git a/modules/volume/volumeutils.h b/modules/volume/volumeutils.h index bcb16b4d23..6d7b3fce26 100644 --- a/modules/volume/volumeutils.h +++ b/modules/volume/volumeutils.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014 - 2016 * + * Copyright (c) 2014-2016 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * @@ -22,8 +22,8 @@ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * ****************************************************************************************/ -#ifndef __VOLUMEUTILS_H__ -#define __VOLUMEUTILS_H__ +#ifndef __OPENSPACE_MODULE_VOLUME___VOLUMEUTILS___H__ +#define __OPENSPACE_MODULE_VOLUME___VOLUMEUTILS___H__ #include @@ -33,7 +33,8 @@ namespace volumeutils { size_t coordsToIndex(const glm::vec3& coords, const glm::ivec3& dimensions); glm::vec3 indexToCoords(size_t index, const glm::ivec3& dimensions); -} -} +} // namespace volumeutils -#endif // __VOLUMEUTILS__ +} // namespace openspace + +#endif // __OPENSPACE_MODULE_VOLUME___VOLUMEUTILS___H__