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
cf728ae8
Kaydet (Commit)
cf728ae8
authored
Şub 03, 2014
tarafından
Markus Mohrhard
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
the msaa checks are only needed on windows
Change-Id: Ib5a4012b7365259e08e8d2fd0c1f3b239b46517c
üst
27c1d4f2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
7 deletions
+9
-7
OpenGLRender.cxx
chart2/source/view/main/OpenGLRender.cxx
+4
-5
OpenGLRender.hxx
chart2/source/view/main/OpenGLRender.hxx
+5
-2
No files found.
chart2/source/view/main/OpenGLRender.cxx
Dosyayı görüntüle @
cf728ae8
...
...
@@ -761,16 +761,17 @@ OpenGLRender::OpenGLRender(uno::Reference< drawing::XShape > xTarget):
m_iHeight
(
0
),
mxRenderTarget
(
xTarget
),
mbArbMultisampleSupported
(
false
),
#if defined( _WIN32 )
m_iArbMultisampleFormat
(
0
),
#endif
m_2DColor
(
glm
::
vec4
(
1.0
,
0.0
,
0.0
,
1.0
)),
m_frameBufferMS
(
0
),
m_TextVertexID
(
0
),
m_TextTexCoordID
(
1
)
,
m_TextTexCoordID
(
1
)
{
//TODO: moggi: use STL
memset
(
&
m_Bubble2DCircle
,
0
,
sizeof
(
m_Bubble2DCircle
));
m_iArbMultisampleFormat
=
0
;
//TODO: moggi: use STL
for
(
size_t
i
=
0
;
i
<
sizeof
(
m_BackgroundColor
)
/
sizeof
(
float
);
i
++
)
{
...
...
@@ -950,7 +951,6 @@ bool OpenGLRender::InitMultisample(PIXELFORMATDESCRIPTOR pfd)
DestroyWindow
(
hWnd
);
return
mbArbMultisampleSupported
;
}
#endif
bool
OpenGLRender
::
GetMSAASupport
()
{
...
...
@@ -962,7 +962,6 @@ int OpenGLRender::GetMSAAFormat()
return
m_iArbMultisampleFormat
;
}
#if defined( _WIN32 )
//TODO: moggi: why the hell do we need another implementation here?
int
OpenGLRender
::
InitTempWindow
(
HWND
*
hwnd
,
int
width
,
int
height
,
PIXELFORMATDESCRIPTOR
inPfd
)
{
...
...
chart2/source/view/main/OpenGLRender.hxx
Dosyayı görüntüle @
cf728ae8
...
...
@@ -151,9 +151,9 @@ public:
BitmapEx
GetAsBitmap
();
#if defined( _WIN32 )
bool
InitMultisample
(
PIXELFORMATDESCRIPTOR
pfd
);
#endif
bool
GetMSAASupport
();
int
GetMSAAFormat
();
#endif
void
SetColor
(
sal_uInt32
color
);
int
Bubble2DShapePoint
(
float
x
,
float
y
,
float
directionX
,
float
directionY
);
int
RenderBubble2FBO
(
int
wholeFlag
);
...
...
@@ -204,7 +204,7 @@ private:
glm
::
mat4
m_Projection
;
// Camera matrix
glm
::
mat4
m_View
;
// Model matrix : an identity matrix (model will be at the origin
#elif defined( UNX )
// Model matrix : an identity matrix (model will be at the origin
glm
::
mat4
m_Model
;
// Our ModelViewProjection : multiplication of our 3 matrices
glm
::
mat4
m_MVP
;
...
...
@@ -247,8 +247,11 @@ private:
std
::
list
<
Line2DPointList
>
m_Line2DShapePointList
;
com
::
sun
::
star
::
uno
::
Reference
<
com
::
sun
::
star
::
drawing
::
XShape
>
mxRenderTarget
;
bool
mbArbMultisampleSupported
;
#if defined( _WIN32 )
int
m_iArbMultisampleFormat
;
#endif
glm
::
vec4
m_2DColor
;
GLuint
m_frameBufferMS
;
...
...
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