5400 Commits

Author SHA1 Message Date
Markus Mohrhard
f3c47df816 adapt code to the text mapping fix
Change-Id: I8fd22529a0749f9bf1bff75534dca61f2f65312b
2014-05-24 10:48:43 +02:00
Markus Mohrhard
2c75e66968 map strings correctly to 3d objects
Change-Id: I21b62a869b89c23ddba75eb8c33c30a73160098b
2014-05-24 10:48:43 +02:00
Markus Mohrhard
609d16263f GetTexBoundRect does not really return teh bounding rectangle
Change-Id: I66c996dadab51debc39a50c5e93e8c6a76842ceb
2014-05-24 10:48:43 +02:00
Markus Mohrhard
53fb2cd453 improve text rendering
Change-Id: Idf2b0129f9d72739e934c65ccf40acf0b3000a5a
2014-05-24 10:48:43 +02:00
Markus Mohrhard
d9b9f50242 avoid the creation of empty text
Change-Id: If1be3f50ed4ceac40b513b341f411fc2d2533f7f
2014-05-24 10:48:43 +02:00
Caolán McNamara
eaa3f8e160 drop unused template
Change-Id: I3668d9b5cff71aae1598f87f09ab82bf66ace71e
2014-05-23 20:38:14 +01:00
Markus Mohrhard
c2ce981dfb don't enable debug renderingto png
Change-Id: Ib15c3fb2f2dd61a9bbab9b6c47866e15c8a7659a
2014-05-23 17:36:40 +02:00
Caolán McNamara
9de3fd2da6 coverity#1215398 Uninitialized scalar field
Change-Id: I5e18b4d824931e489af3d8625e06974f2b488e75
2014-05-23 14:15:57 +01:00
Caolán McNamara
5030424290 coverity#1215399 Uninitialized scalar field
Change-Id: If043310b3a4ac8dcc0ed63aeeeaffdfc9af8b46f
2014-05-23 14:15:57 +01:00
Takeshi Abe
87e81e4e52 boost::checked_deleter serves the purpose
Change-Id: I22b4ea752e32b449dcc07b70cc5dc0ba52ad7c45
2014-05-23 19:52:22 +09:00
Markus Mohrhard
5b37884d57 Lsan: fix memory leaks
Change-Id: I010c7c194bf0680a499077b6b364498a09542764
2014-05-23 02:50:42 +02:00
Markus Mohrhard
68c1977ce0 remove unused variable
Change-Id: Ib79f0c525608d279eebe820bfc82e84dd3518c29
2014-05-23 02:50:41 +02:00
Markus Mohrhard
3bb9a29081 Lsan: fix memory leaks
Change-Id: I35adb022f12c6833f4f29b2e8dad44394a2c4be5
2014-05-23 02:50:41 +02:00
Markus Mohrhard
2b2fc70d26 Lsan: fix invalid memory access
The chart object can be destroyed after the context.

Change-Id: I5ae370638f296ea314ee11680e0a8d81a8fdbe69
2014-05-23 02:50:41 +02:00
Julien Nabet
b09b5f8f7c Prefer cppu::UnoType<T>::get() to ::getCppuType((T*)0) part19
Change-Id: Iab50c52a132c90389992ef68c2d31df95a193ab9
2014-05-22 23:21:18 +02:00
Markus Mohrhard
1159ab6149 change the bar size a bit
Change-Id: I09df4a7104a4df1603a7d64bfa49c103be4f4ade
2014-05-22 13:18:45 +02:00
Stephan Bergmann
67444a92e4 -Werror,-Wunused-variable
Change-Id: Ie7919740e7e95eb53f7a719e3dc2b114c6fd3862
2014-05-21 16:21:26 +02:00
Markus Mohrhard
08bc9faedb remove second part of the debug output
Change-Id: Ie691746b4621a90d2b7abbfbc75367780574032f
2014-05-21 16:11:31 +02:00
Markus Mohrhard
31e32d3624 remove debug output
Change-Id: Ib77911177ec4d2f5b1f7c7ff75db30b6104f0682
2014-05-21 16:05:14 +02:00
Markus Mohrhard
6fd54c8e34 improve the text rendering a little bit more
Change-Id: I7662b77df94c439678d17fe31e611272d1802981
2014-05-21 16:05:14 +02:00
Markus Mohrhard
1225fc1047 improve the text rendering a bit
Less scaling means more beautiful text

Change-Id: I787244a5f7a472a14f463729f8f434a4969a6285
2014-05-21 14:50:53 +02:00
Markus Mohrhard
addc7e821f we need to set text size in woorld coordinates
Change-Id: If77133080851a3b2d700ac54c9722f560e71f26e
2014-05-21 14:50:52 +02:00
Markus Mohrhard
2bbcf97eb3 fix my issues with the offscreen rendering
Change-Id: I4a2ed8a20890119220d63a6768f13365a7b5f97d
2014-05-21 14:24:09 +02:00
Markus Mohrhard
19979ae270 forgot to release the OpenGL resources
Change-Id: I2baefbe611f9ed28defc46ca3af332d13b32c561
2014-05-21 02:09:11 +02:00
Markus Mohrhard
61b2ae31c6 use FBO for the picking
Change-Id: Ibab6daa1f76300d159ccd4cfbca061c8d8c1951f
2014-05-21 01:50:44 +02:00
Markus Mohrhard
e634b0dcdd set the color for the picking
Change-Id: If7b902b16626384440241d88937161cf327e14d5
2014-05-21 01:50:44 +02:00
Markus Mohrhard
1b8cfd5d14 remove unnecessary whitespaces
Change-Id: I4d93c0149aaf90e2477c1382aa51f8f08c967626
2014-05-21 01:50:44 +02:00
Markus Mohrhard
5500a4fedc avoid division by zero that happens to me in some cases
Change-Id: Ifc80462e7826e7d717dc553f50dd00f2b771bf15
2014-05-21 01:50:44 +02:00
Markus Mohrhard
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
Julien Nabet
227af32d8c Prefer cppu::UnoType<T>::get() to ::getCppuType((T*)0) part18
Change-Id: Ibf958dbfbf7cdbe6ad31d390138be8d4d468c225
2014-05-20 23:29:53 +02:00
Bisal Singh Nayal
ee0bb265c9 fdo#78290 : The File gets corrupted when saved in LO
Problem Description: Docx file containing a chart (line chart / scatter chart)which has used a builtin
marker'x' gets corrupted when we save it in LO.The reason was that while exporting LO was writing the
marker information 'x' as 'X' which MS Word doesn't recognize.‒<c:marker><c:symbol val="X" />. Also
the size of the marker was coming 1 less than the actual value. Ex: if size is 7 then it was being
written as  6.

Solution: During export I have made changes so that now LO writes 'x' in the tag information
‒<c:marker> <c:symbol val="x" />. Now the size of the marker is also being correctly exported.

Change-Id: I26b747f9576625bf3acb941322ae418a0bbc6b64
Reviewed-on: https://gerrit.libreoffice.org/9273
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2014-05-20 05:12:08 -05:00
Thomas Arnhold
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
weigao
43716387ee add reverse bars code
Change-Id: I2db9edd9015bb10cffe58a44c379db0ab87e7d72
2014-05-19 12:34:12 +02:00
Julien Nabet
0d8908b359 Prefer cppu::UnoType<T>::get() to ::getCppuType((T*)0) part16
Change-Id: I78b3a0151397d4e69521e6b2451e93ea6e463376
2014-05-18 00:36:10 +02:00
Markus Mohrhard
f5376d87d7 prevent access to uninitialized variables
Change-Id: I1a12e2453ec935dc642135c30a36e1a97fc3d0f9
2014-05-17 09:12:00 +02:00
Markus Mohrhard
ca52e5ff2c support property mapping in new 3D charts
Change-Id: I3da71e354ed2595c1f5b2eaeb5fb565205d24de0
2014-05-16 12:44:15 +02:00
Markus Mohrhard
2c7a4e8aff set the MVP matrix in picking mode
Change-Id: I11d4838a320ada1d454870436e540b2c56fa18fd
2014-05-16 12:42:44 +02:00
Markus Mohrhard
5a9399a628 small hickup 2014-05-16 08:40:11 +02:00
Stephan Bergmann
a994503f23 -Werror,-Wunused-private-field
Change-Id: Iede16b58830e9605943b87528b3f5569035b8449
2014-05-15 15:44:31 +02:00
Thomas Arnhold
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
weigao
1528820450 modify the coordinate system to world coordinate system
Change-Id: Ib496f33bcd94cac77aef02ddae2c91bb48150252
2014-05-15 14:01:11 +02:00
Markus Mohrhard
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
Markus Mohrhard
859cbb9092 no reason that this is a member variable
Change-Id: I125c85418bc19cc6bcf2d106ebd22f94d9ecd390
2014-05-15 14:01:11 +02:00
Markus Mohrhard
dfefcc2b89 one more step to picking based rendering
Change-Id: Ibf77c0b7b9cdc4f5b47deee3f9b50a61e8c0dc22
2014-05-15 14:01:10 +02:00
Markus Mohrhard
34e137f3a9 don"t execute code in a loop
Change-Id: I758d8ddb8b877638a5a36e56636e97fded790efc
2014-05-15 14:01:10 +02:00
Markus Mohrhard
42edee1ee1 implement new struct and shaders for picking
Change-Id: Ib3e08d69c031aa3130b10c0745119cf5935d86db
2014-05-15 14:01:10 +02:00
Markus Mohrhard
88b17ce132 try a better idea
Change-Id: Ibf218c2e99013aeeeb1d8962b0eff1cbd602c6c3
2014-05-15 14:01:10 +02:00
Markus Mohrhard
7c2acb873d remove some misleading comments
Change-Id: I939c676ffd71357dcf73f24c56c5fd70a3a67a28
2014-05-15 14:01:10 +02:00
Markus Mohrhard
2941d38cb1 these resources should be GLints
Change-Id: Ib1075fb7dba8ea85e76c7cdf59635e0cec9aaf19
2014-05-15 14:01:09 +02:00
Markus Mohrhard
759573b37f introduce picking mode in 3D code
Change-Id: Ifbe35a9b311bf79fa15bbad6b9fdfc5a472f516f
2014-05-15 14:01:09 +02:00