Skip to content
Projeler
Gruplar
Parçacıklar
Yardım
Yükleniyor...
Oturum aç / Kaydol
Gezinmeyi değiştir
C
core
Proje
Proje
Ayrıntılar
Etkinlik
Cycle Analytics
Depo (repository)
Depo (repository)
Dosyalar
Kayıtlar (commit)
Dallar (branch)
Etiketler
Katkıda bulunanlar
Grafik
Karşılaştır
Grafikler
Konular (issue)
0
Konular (issue)
0
Liste
Pano
Etiketler
Kilometre Taşları
Birleştirme (merge) Talepleri
0
Birleştirme (merge) Talepleri
0
CI / CD
CI / CD
İş akışları (pipeline)
İşler
Zamanlamalar
Grafikler
Paketler
Paketler
Wiki
Wiki
Parçacıklar
Parçacıklar
Üyeler
Üyeler
Collapse sidebar
Close sidebar
Etkinlik
Grafik
Grafikler
Yeni bir konu (issue) oluştur
İşler
Kayıtlar (commit)
Konu (issue) Panoları
Kenar çubuğunu aç
LibreOffice
core
Commits
9ab9d22f
Kaydet (Commit)
9ab9d22f
authored
Tem 21, 2014
tarafından
Caolán McNamara
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
split helper and fix build
Change-Id: Ie479d363152d3c6a109d6e924b09c155c79511c8
üst
a8a3ad1e
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
26 additions
and
7 deletions
+26
-7
3DChartObjects.cxx
chart2/source/view/main/3DChartObjects.cxx
+1
-0
GLMHelper.hxx
include/vcl/opengl/GLMHelper.hxx
+24
-0
OpenGLHelper.hxx
include/vcl/opengl/OpenGLHelper.hxx
+0
-7
OpenGLHelper.cxx
vcl/source/opengl/OpenGLHelper.cxx
+1
-0
No files found.
chart2/source/view/main/3DChartObjects.cxx
Dosyayı görüntüle @
9ab9d22f
...
@@ -11,6 +11,7 @@
...
@@ -11,6 +11,7 @@
#include <vcl/virdev.hxx>
#include <vcl/virdev.hxx>
#include <vcl/svapp.hxx>
#include <vcl/svapp.hxx>
#include <vcl/opengl/GLMHelper.hxx>
#include <vcl/opengl/OpenGLHelper.hxx>
#include <vcl/opengl/OpenGLHelper.hxx>
#include <vcl/bmpacc.hxx>
#include <vcl/bmpacc.hxx>
...
...
include/vcl/opengl/GLMHelper.hxx
0 → 100644
Dosyayı görüntüle @
9ab9d22f
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* This file is part of the LibreOffice project.
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
#ifndef INCLUDED_VCL_GLM_GLMHELPER_HXX
#define INCLUDED_VCL_GLM_GLMHELPER_HXX
#include "glm/glm.hpp"
#include <vcl/vclopengl_dllapi.hxx>
#include <ostream>
VCLOPENGL_DLLPUBLIC
std
::
ostream
&
operator
<<
(
std
::
ostream
&
rStrm
,
const
glm
::
mat4
&
rMatrix
);
VCLOPENGL_DLLPUBLIC
std
::
ostream
&
operator
<<
(
std
::
ostream
&
rStrm
,
const
glm
::
vec4
&
rPos
);
VCLOPENGL_DLLPUBLIC
std
::
ostream
&
operator
<<
(
std
::
ostream
&
rStrm
,
const
glm
::
vec3
&
rPos
);
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
include/vcl/opengl/OpenGLHelper.hxx
Dosyayı görüntüle @
9ab9d22f
...
@@ -11,14 +11,11 @@
...
@@ -11,14 +11,11 @@
#define INCLUDED_VCL_OPENGL_OPENGLHELPER_HXX
#define INCLUDED_VCL_OPENGL_OPENGLHELPER_HXX
#include <GL/glew.h>
#include <GL/glew.h>
#include "glm/glm.hpp"
#include <vcl/vclopengl_dllapi.hxx>
#include <vcl/vclopengl_dllapi.hxx>
#include <vcl/bitmapex.hxx>
#include <vcl/bitmapex.hxx>
#include <rtl/ustring.hxx>
#include <rtl/ustring.hxx>
#include <ostream>
class
VCLOPENGL_DLLPUBLIC
OpenGLHelper
class
VCLOPENGL_DLLPUBLIC
OpenGLHelper
{
{
public
:
public
:
...
@@ -41,10 +38,6 @@ public:
...
@@ -41,10 +38,6 @@ public:
static
float
getGLVersion
();
static
float
getGLVersion
();
};
};
VCLOPENGL_DLLPUBLIC
std
::
ostream
&
operator
<<
(
std
::
ostream
&
rStrm
,
const
glm
::
mat4
&
rMatrix
);
VCLOPENGL_DLLPUBLIC
std
::
ostream
&
operator
<<
(
std
::
ostream
&
rStrm
,
const
glm
::
vec4
&
rPos
);
VCLOPENGL_DLLPUBLIC
std
::
ostream
&
operator
<<
(
std
::
ostream
&
rStrm
,
const
glm
::
vec3
&
rPos
);
#endif
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
vcl/source/opengl/OpenGLHelper.cxx
Dosyayı görüntüle @
9ab9d22f
...
@@ -7,6 +7,7 @@
...
@@ -7,6 +7,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
*/
#include <vcl/opengl/GLMHelper.hxx>
#include <vcl/opengl/OpenGLHelper.hxx>
#include <vcl/opengl/OpenGLHelper.hxx>
#include <osl/file.hxx>
#include <osl/file.hxx>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment