Commit Graph

5626 Commits

Author SHA1 Message Date
f8843226c3 coverity#1219805 Uninitialized scalar field
Change-Id: I6dde5a126e57f34705c2fe9189a49d7964b3d65f
2014-09-02 12:14:47 +01:00
cba672f2c5 coverity#1215398 Uninitialized scalar field
Change-Id: I190cafda21a9e5969d8a353b272a0e92b5b65903
2014-09-02 12:14:46 +01:00
be7d3df141 remove SAL_DEBUGs introduced earlier
Change-Id: I901188b5b0a3e64e2407d039dd80f89cce8cf6de
2014-09-02 01:31:13 +02:00
0c3a8965b5 simplify code
Change-Id: If0b1c47a1e0f6084795fb5ca4a2acced736d4523
2014-09-02 01:08:49 +02:00
276b3d1f8a extract some shared code
Change-Id: I062ea860f695189ab1d59615f1d2390710a21d44
2014-09-02 01:08:48 +02:00
b3d7fd2a42 add more notes about deprecated OpenGL features
Change-Id: Ic83ec7e99c8b666b755b93f315019754f9d9757f
2014-09-02 01:08:48 +02:00
a72a10a32b WIP debug statements 2014-09-02 01:08:45 +02:00
14cdc08470 add a note about deprecated functionality
Change-Id: Ic980e633f7c9cdcbb3a1b512d66bfd8279d16339
2014-09-02 01:08:45 +02:00
bf24374a91 don't even try to create a shape for non existing values
Change-Id: I0af9285c2fa0371607e9ec750bb07968244c44d8
2014-09-02 01:08:45 +02:00
69fa8cfb2d fixed pipeline functions are not available in core context
Change-Id: I50f5e876da902181f8ab5c9571df61f035630218
2014-09-02 01:08:44 +02:00
9d12559881 GL_LIGHTING is deprecated
Change-Id: I6280af7182f4afefe39ef676024caa9c21f089ff
2014-09-02 01:08:44 +02:00
6a7dd1b385 GL_TEXTURE_WRAP_* is deprecated
Change-Id: I2604a6d647c912a91da156072b9821b2abe52b48
2014-09-02 01:08:44 +02:00
71aa5ff208 GL_POINT_SMOOTH is deprecated
Change-Id: Id81a238ed71c8c2f9297e14f6f37d148f29cfbca
2014-09-02 01:08:43 +02:00
a0fc0d0488 glEnable(GL_TEXTURE_2D) is deprecated
Change-Id: Ic4ee5414fbbea3d73655b52e66cb397220e61566
2014-09-02 01:08:43 +02:00
006844a15f fix my last core shader error
Now all shaders compile cleanly against a core context without
deprecated functions.

Change-Id: I53c1fe04e07247f94ad5e3a17819cebea0a9f535
2014-09-02 01:08:43 +02:00
8d61b3feee texture*D in GLSL is deprecated and not available in core contexts
Change-Id: Ia5da0899d73aea22fe7bae735e57e30dcd37b254
2014-09-02 01:08:43 +02:00
249c5e0f21 replace all attribute and varying in chart shaders
Next step to a pure OpenGL 3.2 core context.

Change-Id: Ifcfccd9ffc8adcc3b7338e10cb25aeb8496909a3
2014-09-02 01:08:42 +02:00
fbddfdeccc we need to switch to OpenGL 3.2 core for OSX
A 3.2 core context only supports GLSL 150 core and above. This at least
removes all vompile errors related to missing or wrong version
requirements. In a next step we need to make use of modern GLSL features
now.

Change-Id: I59f1bc84ab4f64cc6520309b7da25adc3e116997
2014-09-02 01:08:42 +02:00
653ace96c6 make sure that all shaders contain a version string
This is necessary for OSX where we are using a core context that does
not implement any legacy features anymore.

Change-Id: I59536e99761691d910fef62cf82ceb03e57725ae
2014-09-02 01:08:42 +02:00
148aea32a3 Consistency around SvxB3DVectorItem in svx/svx3ditems.hxx
...similar to what has been done for svx/sdtmfitm.hxx in
68969cc61adecac481ae9656978ef952f435b310 "Consistency around SdrMetricItem."

Change-Id: I7f2348d82c76f6f231e34f0dfc4b6ee6fddffe55
2014-09-01 16:46:59 +02:00
e5d6ae0c2e Consistency around SvxColorItem in svx/svx3ditems.hxx
...similar to what has been done for svx/sdtmfitm.hxx in
68969cc61adecac481ae9656978ef952f435b310 "Consistency around SdrMetricItem."

Change-Id: If26ab3229871d2d6a7e4e7e8f79f4cb927b96930
2014-09-01 16:16:49 +02:00
edf7c73d45 Consistency around SfxUInt16Item in svx/svx3ditems.hxx
...similar to what has been done for svx/sdtmfitm.hxx in
68969cc61adecac481ae9656978ef952f435b310 "Consistency around SdrMetricItem."

Change-Id: I2e467df03a34d694214e0560476cb7fd76ef0735
2014-09-01 15:18:17 +02:00
9f6018bb64 Consistency around SfxBoolItem in svx/svx3ditems.hxx
...similar to what has been done for svx/sdtmfitm.hxx in
68969cc61adecac481ae9656978ef952f435b310 "Consistency around SdrMetricItem."

Change-Id: I3253b4cc5657a7d6b960ee892584109d373eed3d
2014-09-01 14:46:50 +02:00
bebe30e917 Consistency around SfxUInt32Item in svx/svx3ditems.hxx
...similar to what has been done for svx/sdtmfitm.hxx in
68969cc61adecac481ae9656978ef952f435b310 "Consistency around SdrMetricItem."

Change-Id: I3193eab34a34c051002adeedd8b368e26f55f7a3
2014-09-01 13:37:27 +02:00
89940633b4 replace sleep with two condition variables
Change-Id: I7611b5be7d462646a19ebfd86b8d6612dccafc71
2014-08-29 17:40:36 +02:00
f61e453f84 the DUMMY_CHART_FACTORY variable is not the only indicator for OpenGl charts
Change-Id: Idab33c8611526dc4749b4dbe4fe84e68138b4f73
2014-08-29 17:40:35 +02:00
0c092af2eb Don't render with mp2DRenderer when we have 3D charts
Change-Id: Icb224f2d3dd55580532b1c4c43781ad444e51a43
2014-08-29 17:40:35 +02:00
fe20f974ca mpRenderer->init() needs a context
Change-Id: I9f6ce17fcc590597f357bf3ded5fe3eb41fb3810
2014-08-29 17:40:34 +02:00
18ccf40359 Oops, static was forgotten.
Change-Id: I0c316581ab8bfb0a49420006a0801d13021bd1ca
2014-08-29 17:40:34 +02:00
aa40e86049 Store env variable in a static variable instead
Change-Id: I5d6067806645722faac3fe90cbec01b6963f7283
2014-08-29 17:40:33 +02:00
72d8f483b3 Revert "Stop flickering in rendering of charts in Writer"
Hide when it's actually a normal chart.

This reverts commit b79b862927d937d695b31df4bdb85d1fc8774f39.

Change-Id: Ib7aee142cea979293864f3916eb0580a82605b2b
2014-08-29 17:40:33 +02:00
1f0a1a308b CHART_DUMMY_FACTORY should not control the OpenGL window
Change-Id: Ic6c640f7d37606b357672f2b73f95d51d1daba67
2014-08-29 17:40:32 +02:00
0bbb6f0812 Call resetCurrent as soon as possible to avoid conflict with other thread
Change-Id: Ie3edc252135301ba5b85b80edcdbe75537d0da16
2014-08-29 17:40:32 +02:00
8e37097d52 Update chart when chart type is changed in edit mode
Regression to master.
In long term it would be better to define ChartWindow as an
OpenGL window and not creating a new window inside the chart
window, becasue otherwise all events which was handled well
by the chart window will be broken (catched by the OpenGL
window so no effect on ChartWindow (defining the behavior of
charts in general) or catched by the ChartWindow and so no
effect on the OpenGLWindow (like invalidating in this case).

Change-Id: I234f469f70914e01f030c8edae9cb5aacea112bf
2014-08-29 17:40:32 +02:00
a933a955c6 Reinitialize GL3D renderer when OpenGL window is changed
Without it when we switch sheets in Calc or slides in Impress
and go back to that page where the GL3DBar chart is then the
renderer does not work.

Change-Id: I9aa6203ed5aa7f94627d886b2f2e5ad34d493843
2014-08-29 17:40:31 +02:00
2414270c39 Don't create an OpenGL window in case of normal charts.
Change-Id: Idb4506712d3902c12aa881a85ddf69a281edff82
2014-08-29 17:40:31 +02:00
19cf361efa Fix rendering of GL3DBarCharts after ODF import
OpenGL window need to have a valid size before
rendering.

Change-Id: I3ce3dbf653f0dc101de3acc4d634d7fe6c3be9ad
2014-08-29 17:40:30 +02:00
ed23d7e6d3 Stop flickering in rendering of charts in Writer
Change-Id: I52efa9cd7851f480ee2abcaa1646735c6f518f3a
2014-08-29 17:40:30 +02:00
4e96f7ffdb Fix regression in rendering of GL3DBarChart
Change-Id: Ibf8f4a57cbc85f77a73054873030fcef321f5518
2014-08-29 17:40:29 +02:00
cde22222cf Mirror vertically the texture bitmaps for OpenGL
In case of glTF models it saves a Mirror() call.
In case of OpenGL charts it avoid flipped texts.

Change-Id: I1ac980e16bcb5ba6a9a025b638aaac3b08b4aab3
2014-08-29 17:40:28 +02:00
f71aae7501 It seems better if the caller allocates the memory for the RGBA buffer.
For example it allows to use std::vector<> and call the method

Change-Id: Id4b8e33838d358dd242d0176e42558505fa8d4a3
2014-08-29 17:40:28 +02:00
7daba09d02 Fix OpenGL chart reinitialiation
Problem after ChartWindow was disabled and enabled
again, OpenGL content was lost.

Two things:
-After setting a new OpenGLWindow the corresponding
IRenderer must be set (x3DWindowProvider->update)
-InitOpenGL() call should not depend on DummyChart, but on
OpenGLWindow (OpenGLContext).

Change-Id: If74e1945de9973d3921ceea1ca6fef39311add7a
2014-08-29 17:40:26 +02:00
43d23a24fd opengl charts: Move the init from sc to chart2, to have the right parent.
Conflicts:
	chart2/source/view/charttypes/GL3DBarChart.cxx

Change-Id: I1e23329345e00e7d8e1f269c832e84d015824c0a
2014-08-29 17:40:25 +02:00
f9857727c6 EE_PARA_WRITINGDIR should presumably use an SvxFrameDirectionItem
...rather than an SfxInt32Item, just as it does everywhere else outside chart2.
At least, running CppunitTest_chart2_export under -fsanitize=undefined
complained about an invalid cast to SvxFrameDirectionItem.

Change-Id: Ia7ea43a00d659de9642f801f390f45b9239d9c32
2014-08-28 15:53:13 +02:00
f96908e1b1 pass by const reference
Change-Id: I1d1fff8b596d75a4cb033679d06b300402dbf212
2014-08-27 12:12:40 +02:00
64c187b862 don't call getenv repeatedly
Change-Id: I90b8e30ffd095cc3fa20938cd15adf4d217bb6e1
2014-08-27 11:45:44 +02:00
ed48265c56 correct the variable name
Change-Id: I053c99c1b544fd64951c42ebe1c232cd1768e79f
2014-08-27 11:45:44 +02:00
155f0b84c1 showing bar info until fly back
Change-Id: Idc13f652d359baf2c91758ee1efd5b908b4b9483
2014-08-27 11:45:44 +02:00
42d5cfcf88 modify history data style
Change-Id: I1a86ff55805e88cc559795139c7f8f84d3fb5109
2014-08-27 11:45:43 +02:00
ca092a929f modify data update fps to data update rate
Change-Id: I9654fb02a1481b679d98359424e272cc4a706464
2014-08-27 11:45:43 +02:00