Commit Graph

4911 Commits

Author SHA1 Message Date
92edd9b39c WaE: warning C4305: 'argument' : truncation from 'double' to 'GLfloat'
Change-Id: I8afe523cfe1be28bc5427c5e5852bea0be2aaea3
2014-06-04 08:30:26 +02:00
389d8e9f52 fix refresh problem with 2D OpenGL chart and OpenGLWindow
Change-Id: I32f23967a826262051495d57a4dd529ca3694548
2014-06-04 07:49:12 +02:00
cec90913e8 coverity#1219805 Uninitialized scalar field
Change-Id: I1b4343f06118b352df8ceac0404b9ffff39e8b67
2014-06-02 16:59:56 +01:00
d9f93ced82 extract the rendering code in ChartView
We need it for the IOpenGLRenderer interface.

Change-Id: Ic9f425b44c0efdd30956eba13ef03ba7179d35a4
2014-06-01 17:38:39 +02:00
e7da55b6ed make the OpenglShapeFactory work with the new OpenGLWindow impl
Change-Id: Id97a61c67b55d6ef85b9752f7f4ac2c93aa5bf32
2014-06-01 17:21:14 +02:00
df48d00ffb remove the framebuffer rendering
Change-Id: I2510a00b24a6a3c045a6ee2ccb21c022d3404000
2014-06-01 03:47:22 +02:00
8822b255e5 move to OpenGLWindow step one
Change-Id: I9f019a397f8b0daf27f0969b1f23539438eb6422
2014-06-01 03:47:21 +02:00
adde053786 no need for that include
Change-Id: Ifd3438224a824c190b87ea011e6c02668ad0a3e2
2014-06-01 03:47:21 +02:00
b179ed7f59 we don't support the simple backgriund anymore
Change-Id: I4a0238f5a2729f8b7ace3988c3fe890fba2a4341
2014-06-01 03:47:21 +02:00
e7aa417021 pass more parameters by const reference
Change-Id: I46be96d6ba9f3fecb590c4be62775824194c380a
2014-05-30 22:45:35 +02:00
54b85bf51e fdo#68849: Add header guards to all include files
Added header guards to files in directories avmedia/, basegfx/, chart2/, and
connectivity/

Change-Id: I94ec438ec918ccef1c518edfd9ab4944e9e2961b
Reviewed-on: https://gerrit.libreoffice.org/9555
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
2014-05-30 01:43:33 -05:00
3d549ff9b4 improve the algorithm for the zoom into a bar
Change-Id: Id045cbeaa057fd264a50f83fb58bbee60df71299
2014-05-28 23:05:37 +02:00
585f615c2d show the screen text after the performance improvements
Change-Id: I09d0bfe06e3fbb93f65587a847133fb1b3a3f2b2
2014-05-28 23:05:37 +02:00
939519560c show the whole demo
Change-Id: I8e3adae6ef23c7750de0bcb5934d5743e24fde58
2014-05-28 23:05:36 +02:00
db3c6265cf chart2: fix namespacing
Change-Id: Ib9ef14b4ce38f93f590473913a308a967343c75d
2014-05-28 21:04:06 +02:00
2e2d7d8b6f Add a grey gradient background to the 3D chartm and tweak text color.
Conflicts:
	chart2/source/view/main/GL3DRenderer.cxx

Change-Id: I8b74a1e7f32c30b6a908c0870bbeacc00cdea444
2014-05-28 19:48:37 +02:00
5695cdfdc0 change the bar direction for the demo
Change-Id: I24e45810cb154310d8e35982e2ef100cf5746e2b
2014-05-28 19:31:46 +02:00
a8b7fcf349 prevent generating repeated information in rendering
Change-Id: I1cc5453af6cabe7736cc43e13aad280aaf2c62f6
2014-05-28 19:17:54 +02:00
a45b16602f avoid transferring the textures for each frame
Change-Id: I79466e66dc18dbbf72f192fe44d05fb6d657fa34
2014-05-28 19:17:53 +02:00
8287ee51e9 fix picking mode for the batch rendering
Change-Id: I9bfe64d56f9217561bb059eacde1fa3ece5f2cc1
2014-05-28 19:17:53 +02:00
3827c50294 remove unnecessary glFinish
Change-Id: I368e045a7635410a94f2f3a794e1c75a39418520
2014-05-28 19:17:53 +02:00
6d1598c30e Modify the bar generate function
Conflicts:
	chart2/source/view/main/GL3DRenderer.cxx

Change-Id: Ia323c54b9113be15f01bff2a2f1e66da8ebfc39c
2014-05-28 19:16:18 +02:00
4cde86a6e4 add batch render function 2014-05-28 19:16:18 +02:00
3b3f92be9c add get and release batch render info function 2014-05-28 19:16:18 +02:00
0e332ba4e6 add use and update uno function
Change-Id: I79d7d7ab77fff9a5e60a392e94fe2dd839803b64
2014-05-28 19:16:17 +02:00
47a417d93a add batch render variables
Change-Id: Idfd6f5ce5f711631d6115fe9227724891ccd95ef
2014-05-28 19:16:17 +02:00
57517bbf45 coverity#706267 Uncaught exception
Change-Id: I3a63546d0797c98c1720f0987293404ec760aeac
2014-05-28 13:49:51 +01:00
f730b62e26 coverity#706265 Uncaught exception
Change-Id: I85c77236cd0a3cd791902a3978ea4e13606cea6c
2014-05-28 13:49:51 +01:00
008998decc coverity#706264 Uncaught exception
Change-Id: Ia197a0de24a282bbfcbfc80ee283f530ac12c287
2014-05-28 13:49:51 +01:00
f282994626 coverity#706261 Uncaught exception
Change-Id: Ife4d1e828cc2b52c54e425ec7af533ebdacd0f1e
2014-05-28 13:49:50 +01:00
c4415f16fb coverity#706260 Uncaught exception
Change-Id: Ieef198f6aab05928bf3b77097466eb7ac728481f
2014-05-28 13:49:50 +01:00
f9f8d930a1 enable picking again
Right now with an ugly work-around. The image is vertically flipped so
we just adapt our access to it.

Change-Id: I0128f54d4a0fbe697dc8726f6e255111ecb8412f
2014-05-28 02:09:18 +02:00
16642b7feb Revert "loplugin:unreffun"
This reverts commit 7686f93f58ae3eed7ed2ee2bead362d034e24c02.
2014-05-28 02:09:18 +02:00
05ff915779 use a step width of 10 for the picking color
Change-Id: Icdf7653e9dc5a33d78381b9ea5f3fd4652b1be5a
2014-05-28 02:09:18 +02:00
5419a2a863 disable MSAA for the picking
MSAA can and will result in mixed colors which is a problem if we use
the color for the selection.

Change-Id: Ifbd6d37902069b26e714d2e3e5576fb767f9fbbf
2014-05-28 02:09:17 +02:00
f656fdeeea remove one more magic number that is used in several places
Change-Id: I83949b592d75899d28d9792508685e58d103ae16
2014-05-27 22:26:06 +02:00
35078f372d let us look from the top onto the chart
Change-Id: I700c5f6799ba59eb858d1a12807dc7e37c4a3900
2014-05-27 22:26:05 +02:00
ed24ae433b prevent that early return prevents further user interaction
Change-Id: I24f814a402d2b8af3ddf888719b78d3158c2a38f
2014-05-27 16:56:03 +02:00
8c9b3cdcce cache the bitmap converted to flat RGBA pixels.
Conflicts:
	chart2/source/view/inc/3DChartObjects.hxx
	chart2/source/view/main/3DChartObjects.cxx

Change-Id: Ied38d4457fbc04ded42fe4fb55a8ec654cefa259
2014-05-27 16:56:03 +02:00
209eea5457 chart2: Fix using the last shape
Clicking a shape button works only for the default shape,
not for the last used one.

Steps to reproduce:
1) Click on the drop-down arrow of one of the shape buttons,
   and select a shape. Notice that the button icon updates
   with the last selected shape.
2) Click on another button.
3) Click on the first button, and try to draw something.
   The button doesn't work anymore. Only opening the sub
   toolbar and selecting the shape there will work.

The problem is in ToolboxController::execute that requires
the command to be in the listener map, but we didn't
register sub commands (like .uno:SymbolShapes.sun).
Instead of doing that, we'll try some generic solution.
(Note that calling the corresponding method from
SvxTbxCtlCustomShapes like we do in other methods here
won't work, because ChartController::queryDispatch checks
for the "_self" target, but SfxToolBoxControl::Dispatch
doesn't provide it.)

Change-Id: I5be3dfd3ee3ca9ab9d8080929173dbe5984f61a0
2014-05-27 17:23:35 +03:00
92b447876d css already means ::com::sun::star
Change-Id: I48d7b746d7cc49246743c62480b0d225d2519342
2014-05-27 14:00:28 +02:00
3b24dcc8a8 Remove unnecessary semicolons
A simplified version of the semantic match that finds this problem is
follows: (http://coccinelle.lip6.fr/)

// <smpl>
@r1@
statement S;
position p,p1;
@@
S@p1;@p

@script:python r2@
p << r1.p;
p1 << r1.p1;
@@
if p[0].line != p1[0].line_end:
    cocci.include_match(False)
@@
position r1.p;
@@
-;@p
// </smpl>

Change-Id: Ib9708d37fbb4c6060f88d5dae3814a2d37b2091e
Reviewed-on: https://gerrit.libreoffice.org/9493
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
2014-05-27 01:19:00 -05:00
7da3ce7cdb Allow building with more recent glm versions
Use glm::scale(glm::vec3(x, y, z)) instead of glm::scale(x, y, z)

Change-Id: Id307b830c0ee6cf69514e117ee1e3811a65f8bfd
2014-05-26 23:25:47 +02:00
25cea66f6a remove unused variables
Change-Id: Ia94a501fa2571752286df0451a0a8a2b303a10c8
2014-05-26 22:50:36 +02:00
e69e429d8f hardcode default camera height
instead of having the magic number in 5 places

Change-Id: I2550671572dcc36d9a710e56d9d9c1e99f732843
2014-05-26 22:50:35 +02:00
3c5392997d switch the direction of the series labels
Change-Id: I718ee4782a8b1e265131f6e4e02093a59c17cb15
2014-05-26 22:50:35 +02:00
3bc86e1c92 use the center of the chart as camera direction
Change-Id: I943273817a26235afd9f17e55d2ee14c5f94c409
2014-05-26 22:50:35 +02:00
727ea1e4dd fix spelling of "indices"
Change-Id: I6dc8960d776b809aa701bf8e554e96131b6440c9
2014-05-26 14:47:32 +02:00
7a0069b2e2 cid#1213562 Uninitialized scalar field
Change-Id: Ieec390aa1af1af53f375d707b920382f7a994fc1
2014-05-26 14:47:32 +02:00
7686f93f58 loplugin:unreffun
Change-Id: I43133e272fc915363b178d5f13377c9210eb628e
2014-05-26 07:47:17 +02:00