mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Initial size of OpenGL3DRenderer

Browse Source 
Change-Id: Ibfed531e48848ea711be429d6e5c08094473f781
This commit is contained in:
xukai
2014-05-05 11:54:26 +08:00
committed by Markus Mohrhard
parent 4b6ba1eae6
commit 0714c0aba7
4 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
chart2/source/view/inc/3DChartObjects.hxx
View File

@@ -30,7 +30,7 @@ public:
virtual void render(); virtual void render();
void getRender(); OpenGL3DRenderer* getRender();
protected: protected:
sal_uInt32 mnUniqueId; sal_uInt32 mnUniqueId;
@@ -94,7 +94,7 @@ private:
namespace temporary { namespace temporary {
class TemporaryContext class TemporaryContext: public opengl3D::Renderable3DObject
{ {
public: public:
TemporaryContext(); TemporaryContext();

1
chart2/source/view/inc/GL3DRenderer.hxx
View File

@@ -178,6 +178,7 @@ public:
void SetFPS(float fps); void SetFPS(float fps);
void SetClickPos(Point aMPos); void SetClickPos(Point aMPos);
void RenderClickPos(Point aMPos); void RenderClickPos(Point aMPos);
void SetSize(const Size& rSize);
private: private:
void MoveModelf(PosVecf3& trans,PosVecf3& angle,PosVecf3& scale); void MoveModelf(PosVecf3& trans,PosVecf3& angle,PosVecf3& scale);

8
chart2/source/view/main/3DChartObjects.cxx
View File

@@ -25,7 +25,7 @@ void Renderable3DObject::render()
(void) mnUniqueId; (void) mnUniqueId;
} }
void Renderable3DObject::getRender() OpenGL3DRenderer* Renderable3DObject::getRender()
{ {
if(mPrender==NULL) if(mPrender==NULL)
{ {
@@ -33,6 +33,7 @@ void Renderable3DObject::getRender()
mPrender->init(); mPrender->init();
mPrender->Set3DSenceInfo(); mPrender->Set3DSenceInfo();
} }
return mPrender;
} }
@@ -73,6 +74,7 @@ Camera::Camera():
namespace temporary { namespace temporary {
TemporaryContext::TemporaryContext(): TemporaryContext::TemporaryContext():
Renderable3DObject(-1),
miWidth(200), miWidth(200),
miHeight(200) miHeight(200)
{ {
@@ -81,7 +83,9 @@ TemporaryContext::TemporaryContext():
void TemporaryContext::init() void TemporaryContext::init()
{ {
maContext.init(); maContext.init();
maContext.setWinSize(Size(miWidth, miHeight)); Size winSize(miWidth, miHeight);
maContext.setWinSize(winSize);
getRender()->SetSize(winSize);
} }
void TemporaryContext::render() void TemporaryContext::render()

6
chart2/source/view/main/GL3DRenderer.cxx
View File

@@ -144,6 +144,12 @@ void OpenGL3DRenderer::init()
m_IsOpenglInit = true; m_IsOpenglInit = true;
} }
void OpenGL3DRenderer::SetSize(const Size& rSize)
{
m_iWidth = rSize.Width();
m_iHeight = rSize.Height();
}
bool OpenGL3DRenderer::isOpenGLInitialized() bool OpenGL3DRenderer::isOpenGLInitialized()
{ {
return m_IsOpenglInit; return m_IsOpenglInit;