diff options
| author | Yann Herklotz <ymherklotz@gmail.com> | 2017-12-20 17:59:48 +0000 |
|---|---|---|
| committer | Yann Herklotz <ymherklotz@gmail.com> | 2017-12-20 17:59:48 +0000 |
| commit | cc35bb2471c6d3fd695e3f8985ef168cda3fb39c (patch) | |
| tree | 2cf90c623fdb75086e486b368c5d65f35a839c10 /yage/core/camera2d.h | |
| parent | 1fcd6a0fe38a8db2c6d317c2735419aa04e9cd83 (diff) | |
| parent | b885965a6375f98d6bec63a43233461f9f42006d (diff) | |
| download | YAGE-cc35bb2471c6d3fd695e3f8985ef168cda3fb39c.tar.gz YAGE-cc35bb2471c6d3fd695e3f8985ef168cda3fb39c.zip | |
Merge branch 'develop'
Diffstat (limited to 'yage/core/camera2d.h')
| -rw-r--r-- | yage/core/camera2d.h | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/yage/core/camera2d.h b/yage/core/camera2d.h index 333f907d..db941aee 100644 --- a/yage/core/camera2d.h +++ b/yage/core/camera2d.h @@ -1,13 +1,5 @@ -/* ---------------------------------------------------------------------------- - * camera2d.h - * - * Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com> - * MIT License, see LICENSE file for more details. - * ---------------------------------------------------------------------------- - */ - -/* ---------------------------------------------------------------------------- - * camera2d.h +/** --------------------------------------------------------------------------- + * @file: camera2d.h * * Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com> * MIT License, see LICENSE file for more details. @@ -17,14 +9,14 @@ #ifndef YAGE_CAMERA2D_H #define YAGE_CAMERA2D_H -#include "glslprogram.h" - #include <glm/glm.hpp> #include <glm/gtc/matrix_transform.hpp> namespace yage { +class GlslProgram; + class Camera2D { private: |