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
4e938c46
Kaydet (Commit)
4e938c46
authored
Ock 10, 2014
tarafından
Markus Mohrhard
Kaydeden (comit)
Markus Mohrhard
Ock 29, 2014
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
first round int to bool
Change-Id: I01126ea293c6880bbf53cbc912d54fe8a9842e31
üst
ba150bcd
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
15 additions
and
15 deletions
+15
-15
OpenGLRender.cxx
chart2/source/view/main/OpenGLRender.cxx
+8
-8
OpenGLRender.hxx
chart2/source/view/main/OpenGLRender.hxx
+7
-7
No files found.
chart2/source/view/main/OpenGLRender.cxx
Dosyayı görüntüle @
4e938c46
...
...
@@ -906,6 +906,7 @@ OpenGLRender::OpenGLRender(uno::Reference< drawing::XShape > xTarget):
m_iFboIdx
(
0
),
m_fLineAlpha
(
1.0
),
mxRenderTarget
(
xTarget
),
m_iArbMultisampleSupported
(
false
),
m_TextVertexID
(
0
),
m_TextTexCoordID
(
1
),
m_ClearColor
(
glm
::
vec4
(
1.0
f
,
1.0
f
,
1.0
f
,
1.0
f
))
...
...
@@ -925,7 +926,6 @@ OpenGLRender::OpenGLRender(uno::Reference< drawing::XShape > xTarget):
m_TextureObj
[
1
]
=
0
;
m_RboID
[
0
]
=
0
;
m_RboID
[
1
]
=
0
;
m_iArbMultisampleSupported
=
0
;
m_iArbMultisampleFormat
=
0
;
//TODO: moggi: use STL
...
...
@@ -1031,7 +1031,7 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM l
}
}
int
OpenGLRender
::
InitMultisample
(
PIXELFORMATDESCRIPTOR
pfd
)
bool
OpenGLRender
::
InitMultisample
(
PIXELFORMATDESCRIPTOR
pfd
)
{
HWND
hWnd
=
NULL
;
//create a temp windwo to check whether support multi-sample, if support, get the format
...
...
@@ -1044,7 +1044,7 @@ int OpenGLRender::InitMultisample(PIXELFORMATDESCRIPTOR pfd)
// See If The String Exists In WGL!
if
(
!
WGLisExtensionSupported
(
"WGL_ARB_multisample"
))
{
m_iArbMultisampleSupported
=
0
;
m_iArbMultisampleSupported
=
false
;
SAL_WARN
(
"chart2.opengl"
,
"Device doesn't support multi sample
\n
"
);
return
false
;
}
...
...
@@ -1052,7 +1052,7 @@ int OpenGLRender::InitMultisample(PIXELFORMATDESCRIPTOR pfd)
PFNWGLCHOOSEPIXELFORMATARBPROC
wglChoosePixelFormatARB
=
(
PFNWGLCHOOSEPIXELFORMATARBPROC
)
wglGetProcAddress
(
"wglChoosePixelFormatARB"
);
if
(
!
wglChoosePixelFormatARB
)
{
m_iArbMultisampleSupported
=
0
;
m_iArbMultisampleSupported
=
false
;
return
false
;
}
// Get Our Current Device Context
...
...
@@ -1086,7 +1086,7 @@ int OpenGLRender::InitMultisample(PIXELFORMATDESCRIPTOR pfd)
// If We Returned True, And Our Format Count Is Greater Than 1
if
(
valid
&&
numFormats
>=
1
)
{
m_iArbMultisampleSupported
=
1
;
m_iArbMultisampleSupported
=
true
;
m_iArbMultisampleFormat
=
pixelFormat
;
wglMakeCurrent
(
NULL
,
NULL
);
wglDeleteContext
(
glWin
.
hRC
);
...
...
@@ -1099,7 +1099,7 @@ int OpenGLRender::InitMultisample(PIXELFORMATDESCRIPTOR pfd)
valid
=
wglChoosePixelFormatARB
(
hDC
,
iAttributes
,
fAttributes
,
1
,
&
pixelFormat
,
&
numFormats
);
if
(
valid
&&
numFormats
>=
1
)
{
m_iArbMultisampleSupported
=
1
;
m_iArbMultisampleSupported
=
true
;
m_iArbMultisampleFormat
=
pixelFormat
;
wglMakeCurrent
(
NULL
,
NULL
);
wglDeleteContext
(
glWin
.
hRC
);
...
...
@@ -1116,7 +1116,7 @@ int OpenGLRender::InitMultisample(PIXELFORMATDESCRIPTOR pfd)
}
#endif
int
OpenGLRender
::
GetMSAASupport
()
bool
OpenGLRender
::
GetMSAASupport
()
{
return
m_iArbMultisampleSupported
;
}
...
...
@@ -1169,7 +1169,7 @@ int OpenGLRender::InitTempWindow(HWND *hwnd, int width, int height, PIXELFORMATD
return
0
;
}
int
OpenGLRender
::
WGLisExtensionSupported
(
const
char
*
extension
)
bool
OpenGLRender
::
WGLisExtensionSupported
(
const
char
*
extension
)
{
const
size_t
extlen
=
strlen
(
extension
);
const
char
*
supported
=
NULL
;
...
...
chart2/source/view/main/OpenGLRender.hxx
Dosyayı görüntüle @
4e938c46
...
...
@@ -159,9 +159,9 @@ public:
void
SetLine2DWidth
(
int
width
);
BitmapEx
GetAsBitmap
();
#if defined( _WIN32 )
int
InitMultisample
(
PIXELFORMATDESCRIPTOR
pfd
);
bool
InitMultisample
(
PIXELFORMATDESCRIPTOR
pfd
);
#endif
int
GetMSAASupport
();
bool
GetMSAASupport
();
int
GetMSAAFormat
();
void
SetColor
(
sal_uInt32
color
);
int
Bubble2DShapePoint
(
float
x
,
float
y
,
float
directionX
,
float
directionY
);
...
...
@@ -192,8 +192,8 @@ private:
int
RenderTexture2FBO
(
GLuint
TexID
);
#if defined( _WIN32 )
int
InitTempWindow
(
HWND
*
hwnd
,
int
width
,
int
height
,
PIXELFORMATDESCRIPTOR
inPfd
);
bool
WGLisExtensionSupported
(
const
char
*
extension
);
#endif
int
WGLisExtensionSupported
(
const
char
*
extension
);
int
CreateMultiSampleFrameBufObj
();
int
Create2DCircle
(
int
detail
);
void
SetBackGroundColor
(
sal_uInt32
color1
,
sal_uInt32
color2
);
...
...
@@ -277,10 +277,10 @@ private:
std
::
list
<
Line2DPointList
>
m_Line2DShapePointList
;
com
::
sun
::
star
::
uno
::
Reference
<
com
::
sun
::
star
::
drawing
::
XShape
>
mxRenderTarget
;
int
m_iArbMultisampleSupported
;
int
m_iArbMultisampleFormat
;
GLint
m_iSampleBufs
;
GLint
m_iSamples
;
bool
m_iArbMultisampleSupported
;
int
m_iArbMultisampleFormat
;
GLint
m_iSampleBufs
;
GLint
m_iSamples
;
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