Kaydet (Commit) 8f46d309 authored tarafından xukai's avatar xukai Kaydeden (comit) Markus Mohrhard

add code to call the bar api

Change-Id: Icee44999c175b5d964ebd51c56e9a1585506e036
üst 3176300b
...@@ -97,12 +97,13 @@ typedef struct Extrude3DInfo ...@@ -97,12 +97,13 @@ typedef struct Extrude3DInfo
bool twoSidesLighting; bool twoSidesLighting;
glm::vec4 extrudeColor; glm::vec4 extrudeColor;
long fillStyle; long fillStyle;
float xRange[2]; float xScale;
float yRange[2]; float yScale;
float zRange[2]; float zScale;
float xTransform; float xTransform;
float yTransform; float yTransform;
float zTransform; float zTransform;
glm::mat4 rotation;
Material material; Material material;
int startIndex[5]; int startIndex[5];
int size[5]; int size[5];
...@@ -180,11 +181,8 @@ public: ...@@ -180,11 +181,8 @@ public:
void EndAddPolygon3DObjectNormalPoint(); void EndAddPolygon3DObjectNormalPoint();
void AddPolygon3DObjectPoint(float x, float y, float z); void AddPolygon3DObjectPoint(float x, float y, float z);
void EndAddPolygon3DObjectPoint(); void EndAddPolygon3DObjectPoint();
void AddShape3DExtrudeObject(sal_Int32 color, sal_Int32 specular, float xTransform, void AddShape3DExtrudeObject(bool roundedCorner, sal_Int32 color, sal_Int32 specular, glm::mat4 modelMatrix);
float yTransform, float zTransform);
void EndAddShape3DExtrudeObject(); void EndAddShape3DExtrudeObject();
void AddExtrude3DObjectPoint(float x, float y, float z);
void EndAddExtrude3DObjectPoint();
double GetTime(); double GetTime();
void SetFPS(float fps); void SetFPS(float fps);
void SetClickPos(Point aMPos); void SetClickPos(Point aMPos);
......
...@@ -33,7 +33,8 @@ Bar::Bar(OpenGL3DRenderer* pRenderer, const glm::mat4& rPosition, sal_uInt32 nId ...@@ -33,7 +33,8 @@ Bar::Bar(OpenGL3DRenderer* pRenderer, const glm::mat4& rPosition, sal_uInt32 nId
void Bar::render() void Bar::render()
{ {
(void) mbRoundedCorners; mpRenderer->AddShape3DExtrudeObject(mbRoundedCorners, (sal_Int32)maColor.GetColor(), 0xFFFFFF, maPos);
mpRenderer->EndAddShape3DExtrudeObject();
} }
Line::Line(OpenGL3DRenderer* pRenderer, sal_uInt32 nId): Line::Line(OpenGL3DRenderer* pRenderer, sal_uInt32 nId):
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment