Commit Graph

4801 Commits

Author SHA1 Message Date
19979ae270 forgot to release the OpenGL resources
Change-Id: I2baefbe611f9ed28defc46ca3af332d13b32c561
2014-05-21 02:09:11 +02:00
61b2ae31c6 use FBO for the picking
Change-Id: Ibab6daa1f76300d159ccd4cfbca061c8d8c1951f
2014-05-21 01:50:44 +02:00
e634b0dcdd set the color for the picking
Change-Id: If7b902b16626384440241d88937161cf327e14d5
2014-05-21 01:50:44 +02:00
1b8cfd5d14 remove unnecessary whitespaces
Change-Id: I4d93c0149aaf90e2477c1382aa51f8f08c967626
2014-05-21 01:50:44 +02:00
5500a4fedc avoid division by zero that happens to me in some cases
Change-Id: Ifc80462e7826e7d717dc553f50dd00f2b771bf15
2014-05-21 01:50:44 +02:00
08bed8aa8a we need to create the buffer
Somehow this only crashes when I use gdb.

Change-Id: Ic18ffa3af931b80a7241e8fe711753db03da166e
2014-05-21 01:50:44 +02:00
227af32d8c Prefer cppu::UnoType<T>::get() to ::getCppuType((T*)0) part18
Change-Id: Ibf958dbfbf7cdbe6ad31d390138be8d4d468c225
2014-05-20 23:29:53 +02:00
3db8d606d5 hrc and src files: squeeze multiple newlines
for i in `find . -name *.src -or -name *.hrc`; do FILE=$(cat -s "$i"); echo "$FILE" > "$i"; done

Change-Id: I2bac5ad3e1eb3c566e5c867ccf45893a19e1561e
2014-05-19 20:04:22 +02:00
43716387ee add reverse bars code
Change-Id: I2db9edd9015bb10cffe58a44c379db0ab87e7d72
2014-05-19 12:34:12 +02:00
0d8908b359 Prefer cppu::UnoType<T>::get() to ::getCppuType((T*)0) part16
Change-Id: I78b3a0151397d4e69521e6b2451e93ea6e463376
2014-05-18 00:36:10 +02:00
f5376d87d7 prevent access to uninitialized variables
Change-Id: I1a12e2453ec935dc642135c30a36e1a97fc3d0f9
2014-05-17 09:12:00 +02:00
ca52e5ff2c support property mapping in new 3D charts
Change-Id: I3da71e354ed2595c1f5b2eaeb5fb565205d24de0
2014-05-16 12:44:15 +02:00
2c7a4e8aff set the MVP matrix in picking mode
Change-Id: I11d4838a320ada1d454870436e540b2c56fa18fd
2014-05-16 12:42:44 +02:00
5a9399a628 small hickup 2014-05-16 08:40:11 +02:00
a994503f23 -Werror,-Wunused-private-field
Change-Id: Iede16b58830e9605943b87528b3f5569035b8449
2014-05-15 15:44:31 +02:00
2bd7767d01 Resolves fdo#70681: fixincludeguards.pl: all that's left
Change-Id: I3e51a62710bb46c8255fd228d41d9300c90a1fb5
Reviewed-on: https://gerrit.libreoffice.org/9360
Reviewed-by: Thomas Arnhold <thomas@arnhold.org>
Tested-by: Thomas Arnhold <thomas@arnhold.org>
2014-05-15 12:50:46 +00:00
1528820450 modify the coordinate system to world coordinate system
Change-Id: Ib496f33bcd94cac77aef02ddae2c91bb48150252
2014-05-15 14:01:11 +02:00
ec4169a56e hopefully all places are now correct for the picking
Only the handling of the color and the matrix is still missing

Change-Id: I5603e966e6a62106f38d2cb7cfe196629714f793
2014-05-15 14:01:11 +02:00
859cbb9092 no reason that this is a member variable
Change-Id: I125c85418bc19cc6bcf2d106ebd22f94d9ecd390
2014-05-15 14:01:11 +02:00
dfefcc2b89 one more step to picking based rendering
Change-Id: Ibf77c0b7b9cdc4f5b47deee3f9b50a61e8c0dc22
2014-05-15 14:01:10 +02:00
34e137f3a9 don"t execute code in a loop
Change-Id: I758d8ddb8b877638a5a36e56636e97fded790efc
2014-05-15 14:01:10 +02:00
42edee1ee1 implement new struct and shaders for picking
Change-Id: Ib3e08d69c031aa3130b10c0745119cf5935d86db
2014-05-15 14:01:10 +02:00
88b17ce132 try a better idea
Change-Id: Ibf218c2e99013aeeeb1d8962b0eff1cbd602c6c3
2014-05-15 14:01:10 +02:00
7c2acb873d remove some misleading comments
Change-Id: I939c676ffd71357dcf73f24c56c5fd70a3a67a28
2014-05-15 14:01:10 +02:00
2941d38cb1 these resources should be GLints
Change-Id: Ib1075fb7dba8ea85e76c7cdf59635e0cec9aaf19
2014-05-15 14:01:09 +02:00
759573b37f introduce picking mode in 3D code
Change-Id: Ifbe35a9b311bf79fa15bbad6b9fdfc5a472f516f
2014-05-15 14:01:09 +02:00
6f019bea96 coverity#1213254 Out-of-bounds read
surely this was the intent

Change-Id: I78002adebf78674259e6c63e0e3449882accdb5d
2014-05-15 10:21:26 +01:00
2cd7cbd9e3 no matching function for call to 'scale(const float&, const float&, int)'
Change-Id: Ia748133cb3bda9d81db8850b7c76ad1a43a5c42e
2014-05-15 08:06:00 +02:00
fd37d07576 change transformation matrix 2014-05-15 07:33:49 +02:00
9a73719c39 Try to zoom into a bar when clicked. For now we hardcode the object ID of 1.
Just for testing.

Change-Id: Ifec15ae0beb0a3c863085e9d43bdebd7bcce4027
2014-05-14 09:37:08 -04:00
248145f99e Find places where uno::Sequence is passed by value.
Implement a clang plugin to find them, and clean up existing code
to pass them by reference.

Change-Id: If642d87407c73346d9c0164b9fc77c5c3c4354b8
Reviewed-on: https://gerrit.libreoffice.org/9351
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
2014-05-14 08:10:22 +00:00
876a54067c a better place to show the window
Now the first repaint will already draw on the window and we never see
the grey background.

Change-Id: Ibf44a77b5768979f9081b4f80f6f0a73e5023437
2014-05-13 05:39:09 +02:00
15e2c82acb restore correct repaint after changed value in 3D chart
Change-Id: Ied1904a56b8d526288a89fd8df0bed639cd317d0
2014-05-13 05:29:23 +02:00
9fbafe9fe8 rerender after redrawing of the window
Change-Id: Ia967ba08a9bd0499ae5fb0865492783834204963
2014-05-13 05:29:23 +02:00
36122c2753 Replace auto_ptr with boost::scoped_ptr.
Change-Id: Ibc6d532eff59146d8fbe7dcc7f9155ce6119f474
2014-05-12 19:59:57 -04:00
21162eab55 some fixes for positioning problems
Change-Id: I4e970837ebe6867458e4a75c7cc323f8f6b3ecc8
2014-05-12 22:43:04 +02:00
ef69c15bb9 Have ChartView keep the instance of GL3D chart object between rendering.
Change-Id: I49419d20bf283fba1c31d8516972b0ca7fddcb5b
2014-05-12 13:47:32 -04:00
d1516d488c WaE: private field 'm_bOwnershipIsWellKnown' is not used
Change-Id: Ic4b784cb26f9127fe549f3866cbe53f0d0be0a78
2014-05-12 12:14:03 +03:00
4cbfbf4597 m_bOwnershipIsWellKnown is unused
Change-Id: I4dee9c4ce674249fca590e1c6d86685ed86da885
2014-05-12 09:46:36 +01:00
1ddc1744c5 use black as text color
Change-Id: I109ef0217f3dbe13691e6be60a0a5e2c89280e45
2014-05-12 05:23:49 +02:00
a0842e53b9 more sal_Int32 to sal_uInt32 and simplification
Change-Id: I061fdc9e0743715d1b358a16d72486cfb62a35aa
2014-05-12 05:22:52 +02:00
da3da4628a usa sal_uInt32 instead of sal_Int32
Change-Id: I54db41f48d1f181d1c78c1051f094887a0bc7a8a
2014-05-12 05:05:15 +02:00
46351c13e9 Revert "separate rounded corner bar and normal bar rendering"
This reverts commit 51d5062642189ff5a4330903253c012e83e5ef1f.

Conflicts:
	chart2/source/view/main/GL3DRenderer.cxx

Change-Id: Id21e59d2cc605f0d7d637fb889725f0e91fa6cb3
2014-05-12 03:00:10 +02:00
2124f55b53 Revert "fix alpha calculation"
This reverts commit 204efb6a1723f98ff53a61ed249dbff8cb391bb3.

Change-Id: I1756c399adbf0dd3371e8aab1d8021931203c49e
2014-05-12 03:00:10 +02:00
5b7dfb07e3 move glm operator<< for debugging to OpenGLHelper
Change-Id: Ia529badffe08507d593f494230d2e504b68ff477
2014-05-12 03:00:10 +02:00
ca4c75ae7c fix alpha calculation
Change-Id: Ic0734ef9a079196d9a0a523dac7726937ed2155f
2014-05-12 03:00:10 +02:00
5cad8bbc99 a few debug statements and cosmetic clean-up
Change-Id: I78cc73cc792f1182abcac0b81e97b948206a11d8
2014-05-12 03:00:10 +02:00
bc9d2f80c3 a few changes to camera position and bar positioning
Change-Id: I256e6855735bea050507c894f91ed895da0e13ba
2014-05-12 03:00:09 +02:00
5c799db571 separate rounded corner bar and normal bar rendering
This makes it much easier to debug problems.

Change-Id: I0ba10f6d24cca54be724639074bfd3fac59d37e5
2014-05-12 03:00:09 +02:00
906672eb43 this does not need to be a member variable
Change-Id: I9be286f8e10d43c8c5ce89bb6b52ebddce48bb6b
2014-05-12 03:00:09 +02:00