12014-10-01 Zolnai Tamás <tamas.zolnai@collabora.com> [6b078a49432090e16e14ac3a266447dd2153b8c7] 2 3 Bump version to 0.0.2 4 5 Change-Id: Ic699f84faceea64ce0e59401c6f46aa0f723b61d 6 72014-10-01 Zolnai Tamás <tamas.zolnai@collabora.com> [2314d48fc8123f9a49ce45969da5f67ba1a05eb7] 8 9 Update AUTHORS for 0.0.2 release 10 11 Add all contributors to the list. 12 13 Change-Id: Ifc35f9e957ee8b4368893260832a5ed673983525 14 (cherry picked from commit e6a678ab6e4a2b4d11e507066c2e2358e7dd56aa) 15 162014-10-01 Zolnai Tamás <tamas.zolnai@collabora.com> [4de3a3b500e798b95d010be4a9cc659127e2a1db] 17 18 Update NEWS for 0.0.2 release 19 20 Change-Id: I98aabe1c50dafb3efdb4c00a33c65e1aae8fb04b 21 (cherry picked from commit 4c754a9b1e5f627b2dc6eebe5825ae9fc999cd73) 22 232014-10-01 Zolnai Tamás <tamas.zolnai@collabora.com> [1820beb49ba91acc5ead9044e357c4037de8015d] 24 25 Since these values are used at once don't need to use macros 26 27 Change-Id: I92aba35a2ac5fe81704a1eb64ab2bbaa3871fd7b 28 (cherry picked from commit 5a6de2f2b3c4cc8e00221a4fbb6807fb3dc3759d) 29 30 Conflicts: 31 src/RenderScene.h 32 332014-10-01 Zolnai Tamás <tamas.zolnai@collabora.com> [88561d8b010dad40d7f5ed1e1bc6e8400baf0471] 34 35 Add methods for finding the max vertex and min vertex of model 36 37 Change-Id: I773712b2ab2f042618256139677099341f0813d7 38 Reviewed-on: https://gerrit.libreoffice.org/11389 39 Reviewed-by: Zolnai Tamás <tamas.zolnai@collabora.com> 40 Tested-by: Zolnai Tamás <tamas.zolnai@collabora.com> 41 (cherry picked from commit 4fb03d3aa9b0edf8da93fc098409c9f9e3dfe543) 42 43 Conflicts: 44 src/RenderScene.cpp 45 462014-10-01 David Tardon <dtardon@redhat.com> [10c38455602a6880be009fdb71c4191358f41762] 47 48 always include tests in the tarball 49 50 Depending on the current configuration of the person who is preparing 51 the tarballs is just broken. 52 53 (cherry picked from commit 53eebdd6bd5ddc357350ffd7658a41539114d477) 54 552014-10-01 David Tardon <dtardon@redhat.com> [8117eff865fcd223a986305d0313bb82ce6f6883] 56 57 generate makefiles correctly 58 59 (cherry picked from commit 3fd03d32af75180231a3fb1119faff6dc8ffbec8) 60 612014-10-01 Yang Zhang <yangzhang@multicorewareinc.com> [5ef179b594e079b4afbef1c0602f3e1d51dd1eb7] 62 63 Add more check before bind buffer 64 65 Change-Id: I32a13c6c91e670d26f17091f08ff1dd5e0760f1b 66 Reviewed-on: https://gerrit.libreoffice.org/11527 67 Reviewed-by: Zolnai Tamás <tamas.zolnai@collabora.com> 68 Tested-by: Zolnai Tamás <tamas.zolnai@collabora.com> 69 (cherry picked from commit 40af1cd3df16601a2d73b7e4772ca775d1c607d9) 70 712014-09-15 Zolnai Tamás <tamas.zolnai@collabora.com> [06f8f22822fc72f215c42923251f99e624323123] 72 73 Adapt test to recent changes of center position calculation 74 75 Change-Id: I04f2e04f453f6c7f4ecfdd71c24c4b9c999d7e2f 76 (cherry picked from commit d9f3e4ef3f8b5ac25683007183cb8793ae0a6dd4) 77 782014-09-15 Yang Zhang <yangzhang@multicorewareinc.com> [ed00311d31b10bcfc3bb0f50b5424b0bbdf5d78e] 79 80 Compute the max vertex and min vertex 81 82 Because the max vertex and min vertex aren't correct all the time in the 83 JSON file, so we need to compute it by ourselves. 84 85 Change-Id: I3d478c6b9347dc89264152c093472bcda923702f 86 Reviewed-on: https://gerrit.libreoffice.org/11391 87 Reviewed-by: Zolnai Tamás <tamas.zolnai@collabora.com> 88 Tested-by: Zolnai Tamás <tamas.zolnai@collabora.com> 89 (cherry picked from commit 04ca9f66a4ef30566e4c176b6c9ee332b916bbdd) 90 912014-09-15 Yang Zhang <yangzhang@multicorewareinc.com> [528b88390923f09e91c961733b7ce79f6e26347a] 92 93 Add methods for finding the max vertex and min vertex of model 94 95 Change-Id: I773712b2ab2f042618256139677099341f0813d7 96 Reviewed-on: https://gerrit.libreoffice.org/11389 97 Reviewed-by: Zolnai Tamás <tamas.zolnai@collabora.com> 98 Tested-by: Zolnai Tamás <tamas.zolnai@collabora.com> 99 (cherry picked from commit 4fb03d3aa9b0edf8da93fc098409c9f9e3dfe543) 100 101 Conflicts: 102 src/RenderScene.cpp 103 1042014-09-15 Zolnai Tamás <tamas.zolnai@collabora.com> [0980c5c2286130499ceeb3dd5499fdff42342d91] 105 106 coverity#54248: resource leak in case of error 107 108 Change-Id: I4660cb5d9325f0feee9f865f691ce14a074b4c6a 109 (cherry picked from commit 79ec94132ed0fbf57918980c39bc5f028b6ef4a0) 110 1112014-09-15 Zolnai Tamás <tamas.zolnai@collabora.com> [94f927497ecb3df0c04d0568784f68ffaab96142] 112 113 coverity#54247: uninitialized scalar variable 114 115 Change-Id: Icbfa39841a6ae9e124abc7ebab4c360183515c70 116 (cherry picked from commit 9f8903dd1c1cce1d75133dc8ce6ccdc9abd3c2d8) 117 1182014-09-15 Zolnai Tamás <tamas.zolnai@collabora.com> [048c2759c293a92ac22d3d5e2ef48d4d2717ec55] 119 120 coverity#54246: uninitialized scalar variable 121 122 Change-Id: Id7752403a25cfc1d7bc4ecb04319bca6aa2d55d7 123 (cherry picked from commit 42846dc74b775c21fee79a47835b3c57d755bada) 124 1252014-09-15 Zolnai Tamás <tamas.zolnai@collabora.com> [d64c848cc3336417fe9da60eb75446775fc573d3] 126 127 coverity#54245: resource leak in case of error 128 129 Change-Id: I8f707e7b384a3082c0f56f9ffc4cb4b930f9dab8 130 (cherry picked from commit e7e70da2b664d9e1a768f2bb31a9e5de68b6e94a) 131 132 Conflicts: 133 src/libgltf.cpp 134 1352014-09-15 Zolnai Tamás <tamas.zolnai@collabora.com> [55f3c7a4c2bc612e04bfae1454bf95551b8a98e2] 136 137 coverity#54244: resource leak in case of error 138 139 Change-Id: I60bf13bb2a802fc6c82540c08d16a37a9d1a7130 140 (cherry picked from commit f80fad6513dd9a4b67bd4e08d2c3a5ddd29e73ab) 141 1422014-09-15 Zolnai Tamás <tamas.zolnai@collabora.com> [c7f6b67eedbaf11bd63f21eca4d17fa535167c4e] 143 144 coverity#54242: resource leak in case of error 145 146 Change-Id: I4139cd24bd85e97d0b5b11ac9f891f85eedf8a2e 147 (cherry picked from commit c9296453c61f0f41dc577850c72dc3bfaf1ba201) 148 1492014-09-15 Zolnai Tamás <tamas.zolnai@collabora.com> [661ea2116a6f3b51c848f8553a412033d648d6bc] 150 151 coverity#54241: resource leak in case of error 152 153 Change-Id: I916c1272b3cc554164b31aad79c39e5248787140 154 (cherry picked from commit 0d77b461ddfec397bc3aafebcfd4129ab8f3b218) 155 1562014-09-15 Zolnai Tamás <tamas.zolnai@collabora.com> [559035d2c474530873955bb7db79504fd600a42c] 157 158 Don't need to find C compiler and preprocessor 159 160 Change-Id: I3fee5defe6e2d7ea1e20e74bf6d03a6d4b356bb4 161 (cherry picked from commit 54970788497d631c4769c2517485173c2e2e878d) 162 1632014-09-15 Zolnai Tamás <tamas.zolnai@collabora.com> [a51e97fb1b7d10fb34b496e1f7c14e16989b8a3b] 164 165 AM_CONFIG_HEADER is obsolete, use AC_CONFIG_HEADERS instead 166 167 Change-Id: I38fda7b71e05bb5f3aba764ab97313c805d70418 168 (cherry picked from commit acdbcfdb99a1bd0ee24649c493eea911528a99f4) 169 1702014-09-15 Zolnai Tamás <tamas.zolnai@collabora.com> [a2913ae20d94edb289fc2266ba1918e4796cc38d] 171 172 Check whether the used time header and method exists on the system 173 174 Found by autoscan 175 176 Change-Id: Icd7298ae77452ac5bb7f10391aaa62edfca31d66 177 (cherry picked from commit 7e6ff6c9e739b274a9e7f3c842c89e3611f63afa) 178 1792014-09-15 Zolnai Tamás <tamas.zolnai@collabora.com> [865fedfed31461c8ffcbc4b073372f35cf8964e9] 180 181 Don't need to be so precise 182 183 If we use so precise checks, they can fail easily without 184 code change. 185 186 Change-Id: I0635a15c7d2dc36ce3e4a28ce6f2bc8b0c734051 187 (cherry picked from commit fdae9371034811dc9e1c430e32b8460097797cb9) 188 189 Conflicts: 190 qa/test/APITest.cpp 191 1922014-08-29 Zolnai Tamás <tamas.zolnai@collabora.com> [eb7ee8dba069e24f93c7fdeeda2c3941f9cede9c] 193 194 Bump version to 0.0.1 195 196 Change-Id: I009717abfd0842594a36e6a97b06597fcff1ea19 197 1982014-08-29 Zolnai Tamás <tamas.zolnai@collabora.com> [b80e940e16eb6212f23739f543f099fda407dbe5] 199 200 AM_CONDITIONAL must be called on other platforms to. 201 202 Otherwise TESTS will undefined in the Makefile. 203 204 Change-Id: I9c262b5013fee8776b0f1877efb4b504869b9e6e 205 (cherry picked from commit 20ea2b77f01d36f9ee45ca783f971b3c60fae745) 206 207 Conflicts: 208 configure.ac 209 2102014-08-29 Zolnai Tamás <tamas.zolnai@collabora.com> [817f225c2658be16c7798fad69978d9afa8964d3] 211 212 Allow to move/rotate camera during camera animation 213 214 Change-Id: I1d4b09a3fd6ae97e8d6f4e81500c2bec31ce5ef0 215 (cherry picked from commit 18d0d25d0b337ad72307724a73b559ff44ee5b85) 216 217 Conflicts: 218 src/RenderScene.cpp 219 2202014-08-28 Zolnai Tamás <tamas.zolnai@collabora.com> [5781ea291144c20005559af44c5afc662383c2f9] 221 222 Don't package test suite by default (only with--enable-tests flag). 223 224 Change-Id: I0157861345a1b60d3c16931173b8478bbd4ffd14 225 (cherry picked from commit 44c5663cf9fa863cecf566026e356d0027f49cbd) 226 2272014-08-28 Zolnai Tamás <tamas.zolnai@collabora.com> [e04e1382a28cb84018d1260debedf4a0838f5075] 228 229 AC_PROG_LIBTOOL is deprecated 230 231 Change-Id: I093e7b453fe5ea8118162105ca1f1a9a343c19a3 232 (cherry picked from commit 9ea0c46be968f34cfa63a16b55e71ce6a262bbfe) 233 2342014-08-28 Zolnai Tamás <tamas.zolnai@collabora.com> [7d806b18f23589fc2192888de45c161c1e576cd0] 235 236 Bring back camera animation 237 238 It was lost because of recent refactoring. 239 240 Change-Id: Ie01502762d55457e61cfda33496ff91cd32da829 241 (cherry picked from commit ca4ab0b9e10ab42b19dc4727771bf66424ab69ed) 242 2432014-08-28 Zolnai Tamás <tamas.zolnai@collabora.com> [9e025f5de3de3c555ab9f4d1556b15d14d7c9432] 244 245 Update news for the 0.0.1 release. 246 247 Change-Id: I22e41aa0f97f56e17db4e035f4b94690e2e67781 248 (cherry picked from commit 37b0e4c2df5ba24bb8048ebf1a17b28bb6afe3e2) 249 2502014-08-28 Zolnai Tamás <tamas.zolnai@collabora.com> [ac6bcc31305bbc0f635a5998a7da49ef8e0f9c9b] 251 252 Always return with a normalized up vector. 253 254 Change-Id: I1e5e7c9c7d9d54eeecb973825be0a8f173981bff 255 (cherry picked from commit 2097b1e000e99f08cce66e3fd9368f36edd917a2) 256 257 Conflicts: 258 qa/test/APITest.cpp 259 2602014-08-28 Zolnai Tamás <tamas.zolnai@collabora.com> [a00ce81507d7da36f8c4ba0038e51d5e8478ad3b] 261 262 Avoid crash when glGetUniformLocation return with -1 263 264 Change-Id: If5a22f3557abc81ed8c556c6f30222699724dd00 265 (cherry picked from commit f212a84b199148ba56d3463a09dc640b60472db0) 266 267 Conflicts: 268 src/RenderScene.cpp 269 2702014-08-25 Zolnai Tamás <tamas.zolnai@collabora.com> [3588acc58ef5c3349f2ab17f8deedf564e3f83ee] 271 272 Add some more test related to invalid handle 273 274 Change-Id: I265e352981f13f277cc80e90298328f0d532bd3f 275 (cherry picked from commit 965041ac7ca9f305e02c30d3db46a1bf239f3eef) 276 2772014-08-25 Zolnai Tamás <tamas.zolnai@collabora.com> [4a40132a9059e53974c4851b5eb3664e02384b40] 278 279 Test and document gltf_get_model_size() 280 281 Change-Id: I9b9c81968dea5a2950eac6ad5a2bc4b5925bf1ca 282 (cherry picked from commit c4236b2aa082becfbc30b4cbc6a3ed46e1e19905) 283 2842014-08-25 Zolnai Tamás <tamas.zolnai@collabora.com> [3f55284d8efc2b78bda0f7f606c38e7700bb8a50] 285 286 Return null vectors when view was not set yet. 287 288 Change-Id: I0f196228dfa99a91504d1029ef7f27c664e571f9 289 (cherry picked from commit c2f58104c529b9415e0f0f3309531a24cd5c68aa) 290 2912014-08-25 Zolnai Tamás <tamas.zolnai@collabora.com> [a8a58a353e37df53028253ae34b871b7b1767b0e] 292 293 Test and document gltf_get_model_center_pos() 294 295 Change-Id: Ie67bf4c1c449d3d67ca81d4b5438952a0369b875 296 (cherry picked from commit 0c5c79b16a9ffc3afc3f236e855a1ac7ef913d9a) 297 2982014-08-25 Zolnai Tamás <tamas.zolnai@collabora.com> [f230f0e51d6ea2b2941c6c5747a383f30ccc8567] 299 300 Test and document gltf_{enable/disable}_rotation() 301 302 Since they did nothing, I added a functionality to them. 303 When rotation is disabled all rotation method looses 304 it's ability to change the view. 305 306 Change-Id: Iab49b1ea59dd9f47de4eecb633e6c47af797b840 307 (cherry picked from commit c37b3d831b7793ef460a632270e7adbe79f3bb65) 308 309 Conflicts: 310 src/RenderScene.cpp 311 src/libgltf.cpp 312 313 Some fixup to gltf_{enable/disable}_rotation test and documentation 314 315 Change-Id: I893fee281dbe8c23d5df317daa0aa6b8c4b59ddb 316 (cherry picked from commit 05f936c56aeeb081ad0a85b52df6b375c0e6ca6b) 317 3182014-08-25 Zolnai Tamás <tamas.zolnai@collabora.com> [c9b27d655011ed32c410fe23af9e89e3ec987d9a] 319 320 curquat and mTrackBall variables only used in orbit mode 321 322 So no need to init them here. 323 324 Change-Id: I85311ce8a9deb9bbecf9dbb8ceb13709cac4ea1b 325 (cherry picked from commit f0094e4163b17aa6e5a0dd33cc1cb54ba03f8b4c) 326 3272014-08-25 Zolnai Tamás <tamas.zolnai@collabora.com> [e07755109c51e02684855dad8845a46703bf212d] 328 329 gltf_renderer_set_content() needs an OpenGL context 330 331 Change-Id: Ie5f58f3f2fd587f1bcc3dd3e5bb39f7cabc72671 332 (cherry picked from commit 72179ec2dc40a50c9f0c8de44375ccc781b40890) 333 3342014-08-25 Zolnai Tamás <tamas.zolnai@collabora.com> [b1bbf9ae8b1c5dba4bf4f8a15f60c4c160c1fb6b] 335 336 We can avoid using a pointer for camera. 337 338 To avoid any crash related to unchecked 339 dereference. 340 341 Change-Id: Iea5b4ee53632c58a5c369adca6c0b8ae80725708 342 (cherry picked from commit c1429488e42f4c9fc8da49d7ffcf3cba37349bef) 343 344 Conflicts: 345 src/RenderScene.cpp 346 src/libgltf.cpp 347 3482014-08-25 Zolnai Tamás <tamas.zolnai@collabora.com> [26cead4d9ca3137744666a9402d07325a00ef988] 349 350 Update API test of gltf_get_camera_pos() method 351 352 Now all assert can be enabled since camera handling 353 was refactord which means the returned camera position 354 shows the real values in all cases. 355 356 Change-Id: Ic0beeee5d57d4c9b4b29194768d5051ea7e96b5d 357 (cherry picked from commit d81e9b7f64bec1cc49f92fcc700a165ec7c41bc2) 358 3592014-08-25 Zolnai Tamás <tamas.zolnai@collabora.com> [a9bce10d0feae9b5cf71caeec80e49c4f393d35c] 360 361 AerialViewY actually used only in orbit mode 362 363 Change-Id: I0c0410b50ba651356445d043ae87b3fbde6bd343 364 (cherry picked from commit cd8751f344e01cd698a9abec9550864819b9c127) 365 366 Conflicts: 367 src/RenderScene.cpp 368 3692014-08-25 Zolnai Tamás <tamas.zolnai@collabora.com> [8ef1227f9cb329571fd272e515f04141c67a5391] 370 371 Don't use AERIALVIEWLIMIT in walkthrough mode 372 373 After the recent rework of camera handling it is 374 a helpless limitation. (Before it caused problems 375 if we skip it). 376 377 Change-Id: Ib789b409e2b9ea893aaadc612ae74f1ff1f95fa8 378 (cherry picked from commit 1b06ee1f1c84c44791278e302048048b98f1113b) 379 3802014-08-25 Zolnai Tamás <tamas.zolnai@collabora.com> [2bf24752ff9a740967bbdae25a0c7b570946ce84] 381 382 It's enough to init this variables when orbit mode starts 383 384 Change-Id: I0acaf948cf27df56b7228be65e23423303ae29d9 385 (cherry picked from commit 3450aafdee2e576ca5f7dbb7ae1fd0ecdb7596b5) 386 3872014-08-25 Zolnai Tamás <tamas.zolnai@collabora.com> [818838a1c8bda7fab1da74ed2379b25a112342ff] 388 389 Store different initial view matrix for the two different mode 390 391 Change-Id: Ifc85ad302fd786691e50146f12d19110f9520fe4 392 (cherry picked from commit 3f095363d93af48a8bbd1c1593a9440dd0012a03) 393 394 Conflicts: 395 src/RenderScene.cpp 396 src/RenderScene.h 397 3982014-08-25 Zolnai Tamás <tamas.zolnai@collabora.com> [b912399b6929b3b8f7e2d571c751acb062d7ff89] 399 400 Don't need to store eye, view and up vector explicitly 401 402 They can be generated from the view matrix easily. 403 404 Change-Id: I2ab846dc2fcf0052566c590d91039cf35a373a31 405 (cherry picked from commit 3f830e9b2f6e839e79c8fe1ee8cef9657223ba16) 406 407 Conflicts: 408 src/Camera.cpp 409 src/Camera.h 410 4112014-08-25 Zolnai Tamás <tamas.zolnai@collabora.com> [2a63bc97a7fc4e6bb2d7c5f8c6c2897e890d2c93] 412 413 Move camera eye, view and up vector calculation under Camera class 414 415 Change-Id: I00258da792c68aa9caadcd320a21f01668069c05 416 (cherry picked from commit 66523cbc026750ebb1c8c19ab8e8265cb7801875) 417 418 Conflicts: 419 src/Camera.cpp 420 src/Camera.h 421 4222014-08-25 Zolnai Tamás <tamas.zolnai@collabora.com> [ddbef6959bb93c1085055950c15a48a5d11d2b14] 423 424 Apply camera movement directly on the view matrix in this case too 425 426 Change-Id: If67a97236b059703cc23c1220f12b62a77b5a375 427 (cherry picked from commit 8d8c7be99f9daecbe1b25d5be2c7e691492e76c0) 428 4292014-08-25 Zolnai Tamás <tamas.zolnai@collabora.com> [0a649768cd617e87f9c08b1159c2b7ee60c5d0f4] 430 431 Store init camera postion in view matrix instead 432 433 It is converted to view matrix anyway. 434 435 Change-Id: I627d7270597b6f82a2aa2c3963aef22f61509ea0 436 (cherry picked from commit 94f4714a81938c535844948939fbf4ae37757b99) 437 438 Conflicts: 439 src/RenderScene.cpp 440 src/RenderScene.h 441 4422014-08-25 Zolnai Tamás <tamas.zolnai@collabora.com> [47cacd9afe21cd8b236f2e324be0495d86815f1c] 443 444 Now CPhysicalCamera::mLook is the same as CPhysicalCamera::viewMatrix 445 446 UpdateViewMatrix() method became unneded because all 447 changes in the view matrix is done inmediatelly. 448 449 Change-Id: Ibb0534faf1f6e2c865c2332620011bef142e4da8 450 (cherry picked from commit e0882b5c2a16101aa44c53cbc14123547a87a7b9) 451 452 Conflicts: 453 src/Camera.cpp 454 src/Camera.h 455 src/RenderScene.cpp 456 4572014-08-25 Zolnai Tamás <tamas.zolnai@collabora.com> [fc1ec719e5b5b30484f5d33fa0c44b992e58bb7f] 458 459 Calculate eye, view and up vector for orbit mode too 460 461 Do it in RenderScene::getCameraPos method where 462 it is actually necessary. 463 464 Change-Id: I13183b0893f2eda7322d9e76b0269903aa617872 465 (cherry picked from commit 6102e0e8e73d1e015632fc8b88dda457bb150f33) 466 4672014-08-25 Zolnai Tamás <tamas.zolnai@collabora.com> [f4676d3240c0aa70865ab89484ace39a5c113776] 468 469 Apply moving directly on the view matrix 470 471 Change-Id: Ied4e9e67e63dfe6e6efd84087b8cb3be4a1234a3 472 (cherry picked from commit 7835edbf28a6d955859e1943e2c534648cf0f00d) 473 474 Conflicts: 475 src/Camera.cpp 476 src/Camera.h 477 4782014-08-25 Zolnai Tamás <tamas.zolnai@collabora.com> [e2906863634b30b53aed20a7b552de3b91b204aa] 479 480 Apply the default view defined by *.json on the view matrix 481 482 So we can get camera eye, view and up vector 483 from the current view matrix. 484 Plus don't need to change the defined camera local 485 and global matrix. 486 487 Change-Id: I2aaedf93318390c8346ea4c977494e425e7aca10 488 (cherry picked from commit d1b707eb98374d0d562287acebd82ccd0bae0ee3) 489 4902014-08-25 Zolnai Tamás <tamas.zolnai@collabora.com> [c98791a0f0121da2469198bae79d166c5b7efad3] 491 492 Apply camera rotation on view matrix permanently 493 494 Applying rotation in all frames on the default 495 view matrix is bugous and is not effective. 496 This kind of rotation can be done locally with 497 the current rotation value, no need for accumulated 498 variables. 499 500 Change-Id: I9a2fe6eee62d4f4fd984db44d2104aa7e8bacef5 501 (cherry picked from commit a316dba13e3bdfaee775efad5db5ca627c138483) 502 503 Conflicts: 504 src/Camera.cpp 505 src/Camera.h 506 src/RenderScene.cpp 507 5082014-08-25 Zolnai Tamás <tamas.zolnai@collabora.com> [4f2955552c8aab4a3133ec2bcd50aac830c9064a] 509 510 Apply object rotation on view matrix permanently 511 512 As part of refactoring the camera handling. 513 This kind of rotation only works with the accumulated 514 values that's why last rotation is reverted and the accumulated 515 rotation is applied on the view matrix. 516 517 Change-Id: I7c662b6e282c34d17243854def6c0f98560971d0 518 (cherry picked from commit 2fe235bead564bff1aeefc66970b360b9687ae06) 519 5202014-08-25 Zolnai Tamás <tamas.zolnai@collabora.com> [1dd8f10d2121389e2e40d76c43cec297a0222f17] 521 522 Build rotation matrix inside Camera class 523 524 It makes the code simpler and make bRotateCameraModel 525 member unnecessary. 526 527 Change-Id: I08c8153f717bd5e955b6908b9a3883de6f1713a3 528 (cherry picked from commit a0ae145ce0976c6875d378fbc7bcaf76e4ba8b0b) 529 530 Conflicts: 531 src/RenderScene.cpp 532 src/RenderScene.h 533 5342014-08-25 Zolnai Tamás <tamas.zolnai@collabora.com> [a0658be4d792c35ba1060059d2ba1596b2fbff49] 535 536 lastquat and RotateLastquat can be local variables 537 538 Change-Id: I5ca2efda4a8b660f7881f86639ad971d072edde2 539 (cherry picked from commit 25cde0064b4e3a73c7625112208c87dc08f200ad) 540 5412014-08-25 Zolnai Tamás <tamas.zolnai@collabora.com> [b480976a547b15a3e4be51ed76992360ecc7e76d] 542 543 Always check that the given handle is not a null pointer 544 545 Change-Id: I9f27ec5fb2723fcc65662e7f8b7d7cd3b3ea9086 546 (cherry picked from commit 037627aea06684539ca432320d01cd0a35de6954) 547 548 Conflicts: 549 src/libgltf.cpp 550 5512014-08-25 Zolnai Tamás <tamas.zolnai@collabora.com> [7405aec759dc156c57639e40dc2a37aa3166d1c3] 552 553 Use CPPUNIT_ASSERT_DOUBLES_EQUAL 554 555 Change-Id: Id0fb0c91ab574b24876f04d1b8fcaa9a2d3c0ed9 556 (cherry picked from commit 08eb4fa3240c66fc140d3569a1077655c75ff16e) 557 5582014-08-21 Zolnai Tamás <tamas.zolnai@collabora.com> [236b72b81014a050936dd30db039040b8fbca058] 559 560 Always check that the given handle is not a null pointer 561 562 Change-Id: I9f27ec5fb2723fcc65662e7f8b7d7cd3b3ea9086 563 (cherry picked from commit 037627aea06684539ca432320d01cd0a35de6954) 564 565 Conflicts: 566 src/libgltf.cpp 567 5682014-08-21 Zolnai Tamás <tamas.zolnai@collabora.com> [3a8c4c17d527280c39f45b0df8169a6637b14d21] 569 570 Testing and documenting gltf_get_camera_pos() method 571 572 Avoid crashes caused by obvious missuse. 573 In some case camera position does not change 574 when it should be: 575 - Move camera in walkthrough mode 576 - Rotation in orbit mode 577 - Using default camera postion defined by *.json file 578 579 Change-Id: I8f95e051c566a0f51c50c395fcd34f586654dd0c 580 (cherry picked from commit 8adeed189b6d1ffe98afeadfb3fb9776a90d8e6a) 581 582 Conflicts: 583 src/libgltf.cpp 584 5852014-08-20 Zolnai Tamás <tamas.zolnai@collabora.com> [b5b5f00ccc89db92e37111cd2cecdfc55aaa37b9] 586 587 No authors, only contributors and maintainers 588 589 Change-Id: I9e99986360f846715034c7c88dbb7b6c4a6aa910 590 (cherry picked from commit 88840dacbfa63e3b8be3fdffd26535c255cac3f8) 591 5922014-08-20 Zolnai Tamás <tamas.zolnai@collabora.com> [3d1eaf5d3b0900e874c11166acf36f78e63a6aac] 593 594 Remove COPYING duplicate 595 596 Change-Id: I8a3b17bdd8416790dc0b582954ae81ecae360e4f 597 (cherry picked from commit 668400a156074e0b73e4b14bc721939731c04af0) 598 5992014-08-20 Yang Zhang <yangzhang@multicorewareinc.com> [efeac49c9cf394b1e270c144f47c20f93fe4c134] 600 601 Add contributors to AUTHORS 602 603 Change-Id: I8369c6b19b5c9060966e8bfd08a9aec673b0ebeb 604 Reviewed-on: https://gerrit.libreoffice.org/11030 605 Reviewed-by: Zolnai Tamás <tamas.zolnai@collabora.com> 606 Tested-by: Zolnai Tamás <tamas.zolnai@collabora.com> 607 (cherry picked from commit d73ddb474a97573a324d859325c708e9e62f792c) 608 6092014-08-18 Zolnai Tamás <tamas.zolnai@collabora.com> [3b313487b5deb4671b37c6bf4196bd9334496f50] 610 611 Test whether the required OpenGL version is available. 612 613 Don't bequeath to the caller code this check. 614 615 Change-Id: Iec53f3801195daf85e6a2638726fd77c206d8a93 616 (cherry picked from commit 497e19d7c0740654d3e2f7355bde2c0f0e640175) 617 6182014-08-18 Zolnai Tamás <tamas.zolnai@collabora.com> [aa7ee68b6073e92c6c38f0ba4a0354122133303e] 619 620 Check for #version string in the shader before add an own one 621 622 Change-Id: I23e9054e8bb6bf75d5b68a17059c100990e7d563 623 (cherry picked from commit 85a7c04057909795d6894ad8c06a54c2f43dfdbb) 624 625 Conflicts: 626 src/Shaders.cpp 627 6282014-08-17 Zolnai Tamás <tamas.zolnai@collabora.com> [c93bb9af2aab56cd4b28631d99b6a234625df4c8] 629 630 Add better documentation to gltf_renderer_{init\set_content}() methods 631 632 Change-Id: Ia1c0c9040c6f4d887f985cb7be7320e7dca6c1c9 633 (cherry picked from commit 5016673094d73aad3a265c53bbfc4b639409051e) 634 6352014-08-17 Zolnai Tamás <tamas.zolnai@collabora.com> [830c88577acfdaca268c8dd8c6ec7bb82368bb11] 636 637 Remove version strings from test shader files 638 639 They cause error since the code append an other 640 version string to the shader files. 641 642 Change-Id: I7c6af070e32448982dd42aa3585b438d4507837c 643 (cherry picked from commit 1abab25b608d5ed9a00d03ec70c58a7e1e604baa) 644 6452014-08-17 Zolnai Tamás <tamas.zolnai@collabora.com> [29d96f985569c2ef2198196d3b1d2d709bf10069] 646 647 Append #version 130 to the shader code 648 649 It seems shader files in the glTF does not 650 contain such things and it seems better to do 651 that so the parser code can choose the version. 652 libglTF uses GLSL 1.3. 653 654 Change-Id: I05567a07993770484aaaa0ab11b18611eaf436d7 655 (cherry picked from commit e4544a8b5ca8470a96bf28c6ccdb7461e78ca293) 656 657 Conflicts: 658 README 659 6602014-08-16 Zolnai Tamás <tamas.zolnai@collabora.com> [a95d4ee2c1f802a98e5ead1cc87268e2d104f98a] 661 662 Adding size for images files is optional 663 664 imagewidth and imageheight is enough, so 665 don't return an error when size is 0. 666 667 Change-Id: I5d66fea186a009846d1e85da74f62ed5672214b6 668 (cherry picked from commit 7957b28975d38fa1ac181a74749bafaff271e461) 669 6702014-08-16 Zolnai Tamás <tamas.zolnai@collabora.com> [293546a7aa4db7e131bd0b4c5c4b062b0d5e58c9] 671 672 Fix make distcheck with --enable-tests flag 673 674 Change-Id: Icf11035fea17aec7c7e1e09932649ba3c25302e4 675 (cherry picked from commit f1a522cb12326205ec24c2ef0f75f4c6d46b991f) 676 6772014-08-16 Zolnai Tamás <tamas.zolnai@collabora.com> [4969eb25c277a33407585a945799d71222a8cf66] 678 679 Add more unit tests for gltf_renderer_set_content() 680 681 Change-Id: I9a6f720f75041bc005a2e4c999ca813eb9f12177 682 (cherry picked from commit 05b4ac01dc913cd84088a44f0b2bd4ed4ff64060) 683 6842014-08-16 Zolnai Tamás <tamas.zolnai@collabora.com> [e9e8e2c0613be9fe2c75e6e469297553858c10c3] 685 686 Handle that case when one of the shader files were not loaded well. 687 688 Return LIBGLTF_FILE_NOT_LOAD error. 689 690 Change-Id: Ie12bb1c83316677ae5746243d3950fed7b476f17 691 (cherry picked from commit 3ac2c050409581c59cf686d38cf7030ca52ba55d) 692 6932014-08-16 Zolnai Tamás <tamas.zolnai@collabora.com> [a9cddf3aaeb085230a744c37c2e2593e42847f4c] 694 695 Size check for *.bin files. 696 697 Check whether the given *.bin file in the include vector 698 has the same size as it is specified in the *.json file. 699 700 Change-Id: Id21bb99c19e01eac103d56b598df501ea34c63e5 701 (cherry picked from commit 0cbce1db5ecddaf91391049196d339f06e4234e6) 702 7032014-08-16 Zolnai Tamás <tamas.zolnai@collabora.com> [bcd727e64435dfe7070eadd21fddf6a8cf521cc8] 704 705 Always check the size of the input files 706 707 If the size is 0 we can expect that the file 708 was not loaded. 709 710 Change-Id: Id343ac5877046386b68ae121b771880db79442b8 711 (cherry picked from commit 10de54f56e0e3bcd71a9632f01df2916515ed207) 712 7132014-08-16 Zolnai Tamás <tamas.zolnai@collabora.com> [05ceb23acaad8b20d43ba1a43eea0b0d7b66226c] 714 715 Test the case when size of a texture is invalid (0) 716 717 Change-Id: I47df3c57ab1805a03b161fc9fe36694c4f87a57d 718 (cherry picked from commit 766b76a8ee54a2f17a0d21404b88447f8d74f918) 719 7202014-08-16 Zolnai Tamás <tamas.zolnai@collabora.com> [023041934404dc6e7708a91b5aa09402d6e3e639] 721 722 Avoid crash when texture file is missing from the input vector 723 724 ... and return LIBGLTF_FILE_NOT_LOAD. 725 726 Change-Id: Ia25f1d76d172942580a22cd4a07c550a9510ccf5 727 (cherry picked from commit f7dc862a5c6f5262f6ecfc02eed66bf00e1a3e68) 728 7292014-08-16 Zolnai Tamás <tamas.zolnai@collabora.com> [8cd0de58346991cab05021183fe3142c7084e862] 730 731 Test gltf_renderer_init() when input files are in seperate folders. 732 733 Change-Id: I9a8d78283c6d21da0851c39b4adbe2d9354a8b85 734 (cherry picked from commit d33066a25c59efffa832403cee958f9added4abb) 735 7362014-08-15 Zolnai Tamás <tamas.zolnai@collabora.com> [cd6c5041126d699d5db790a042a2feba23fd4eff] 737 738 Add druck_boken.json to make file 739 740 Change-Id: Idf470304e3647744bdb10390b34d64879551fb82 741 (cherry picked from commit 556cc6c1a1dbf52a4c779b25730594f9d78b0b3c) 742 7432014-08-15 Zolnai Tamás <tamas.zolnai@collabora.com> [d17ba5465f67910ad4047a6d4ce190b9db27a0e2] 744 745 Do not leak in test 746 747 Change-Id: I08fdfb992d23b8226e68bf57df922497bee1fd79 748 (cherry picked from commit 790b9c56dbeb722093e1509a9fa752aaa4b8d1fe) 749 7502014-08-15 Zolnai Tamás <tamas.zolnai@collabora.com> [0f746d86c66e704ea5ddb2fdd8dd7013970a7c7c] 751 752 Avoid crash when gltf_renderer_release() is called before MSAA fbo is created 753 754 For example in case of parser error. 755 756 Change-Id: I7bd01958feed3bf21193ead8a41569fb8d94979e 757 (cherry picked from commit 999662b2bb611c1999ccf47bb3b02688784498a6) 758 7592014-08-15 Zolnai Tamás <tamas.zolnai@collabora.com> [2780e08e5b68a4de59d37083e13ef5b4534dca18] 760 761 Assert when one of the libgltf method is called with an invalid handle 762 763 The caller responsible for making sure not to call libgltf 764 methods with a null pointer. 765 766 Change-Id: I789d0f3e79e11ac51e1943246c4d90ae71f2d3c0 767 (cherry picked from commit 2ab068d7a55982f151109fc70da6522f82c59667) 768 769 Conflicts: 770 src/libgltf.cpp 771 7722014-08-15 Zolnai Tamás <tamas.zolnai@collabora.com> [4103a722c3888df7df9d614e3a505884084d0ae3] 773 774 Add more test case for gltf_renderer_init() 775 776 Change-Id: I2aefd0f2337a8258e7b71540363e7e2afce44fe8 777 (cherry picked from commit a7da98e5656204efbbb130f6746e5089d8cd2256) 778 7792014-08-15 Zolnai Tamás <tamas.zolnai@collabora.com> [3117edd68f71b74c824ae1ca96daf879720c29fc] 780 781 Avoid crash in case of RenderScene::initScene returns with 0 782 783 e.g. empty file name or parsing error 784 785 Change-Id: If2edb770048ecba76ec9a2f1230ee4a85d52e7d4 786 (cherry picked from commit e6cca6683a36d0055e31b773481a9fa6b5e3f89b) 787 7882014-08-14 Zolnai Tamás <tamas.zolnai@collabora.com> [32144432a6f60d4e0a34b580fc925fab6334bfdb] 789 790 Enable multisampling 791 792 For libgltf-0.0.1 we enable multi sampling unconditionally, 793 but in the next minor version (libgltf-0.1.0) there will be 794 two API methods for enabling\disabling multi sampling in runtime. 795 796 Change-Id: Id1d3fc6dd82c3527927736dbd346de2a69104838 797 7982014-08-14 Zolnai Tamás <tamas.zolnai@collabora.com> [06870a663b6553b0d6d65d088684f477f318a3f3] 799 800 WaE: -Wunused-macros: TRACKBALLSIZE 801 802 Thanks Miklós Vajna for the hint. 803 804 Change-Id: I3123b6883fd8798df3aa56bb894a6051e5a50a40 805 (cherry picked from commit ca6701a89645b31f70796d4d6f54e2ef032d5a01) 806 8072014-08-14 Miklos Vajna <vmiklos@collabora.co.uk> [31a51a735f790e9a5be89bd8d887a029d91323e5] 808 809 Fix -Werror=undef 810 811 (cherry picked from commit 23b037d4de1bda488a45476f05c20eafd4d07d9c) 812 8132014-08-14 Yang Zhang <yangzhang@multicorewareinc.com> [7e95c7c0a00b56ee986a1002208b99894f6cf5fd] 814 815 Both save initial up vector and view vector for shift mode 816 817 Change-Id: I2f5e9f73959b7d3f6c7761ab104e1c1b0ce0b198 818 Reviewed-on: https://gerrit.libreoffice.org/10903 819 Reviewed-by: Zolnai Tamás <tamas.zolnai@collabora.com> 820 Tested-by: Zolnai Tamás <tamas.zolnai@collabora.com> 821 (cherry picked from commit 1626f7384d7a385198edc2c11838f949a17a0a6c) 822 823 Conflicts: 824 src/RenderScene.cpp 825 src/RenderScene.h 826 8272014-08-14 Yang Zhang <yangzhang@multicorewareinc.com> [a045195ab0cedce8e44e480353e36eafb3ce4c46] 828 829 Update the up vector when camera rotate. 830 831 This can fix the bug of move up in walkthrough mode 832 833 Change-Id: Ib9aad152dfaf77d8f3ff1124c4803869dc564772 834 Reviewed-on: https://gerrit.libreoffice.org/10902 835 Reviewed-by: Zolnai Tamás <tamas.zolnai@collabora.com> 836 Tested-by: Zolnai Tamás <tamas.zolnai@collabora.com> 837 (cherry picked from commit 1c4d7d7ddbccfb23e60c02167e72f4906661b3a5) 838 8392014-08-14 Zolnai Tamás <tamas.zolnai@collabora.com> [7a28d19eaebd8c1c7d77085232865be380f1b8f5] 840 841 Add unit test suit 842 843 With some initial API test. 844 Limitations: 845 - Only under Linux 846 - Able to handle only png image files 847 848 Change-Id: I094a762e436749fab1d5a29b26a3c62759d6f7b6 849 (cherry picked from commit c5b9c2395e0c72cc0d96917ccf36252a42ebb318) 850 8512014-08-11 Zolnai Tamás <tamas.zolnai@collabora.com> [85574978af3259c99229f913cbc3ddc410709f74] 852 853 GL_ARB_texture_multisample is not needed anymore 854 855 Change-Id: Ib3c5138f9c824b7df3aceab6cd94aba5aa2595cd 856 (cherry picked from commit a5498e80a280b1a90efff318ce209f1ab655db92) 857 8582014-08-11 Zolnai Tamás <tamas.zolnai@collabora.com> [4980037adf33f254bf7f2c711db378bbedbf11c1] 859 860 WaE: -Wreorder: in RenderWithFBO class 861 862 Change-Id: Ia2f70a6a44811267a20eab234b2f594834eec310 863 (cherry picked from commit 1c3bcfdaacdca151bd88860171e29162e294f8a1) 864 8652014-08-11 Yang Zhang <yangzhang@multicorewareinc.com> [b3a5024304ae1a4bb590707f5e40862f9bdf52e1] 866 867 Refactor RenderSence.h and RenderSence.cpp for compatibility OpenGL3.0 868 869 Change-Id: I725d322d3c896addf3e34f36e8d9476711830666 870 Reviewed-on: https://gerrit.libreoffice.org/10589 871 Reviewed-by: Zolnai Tamás <tamas.zolnai@collabora.com> 872 Tested-by: Zolnai Tamás <tamas.zolnai@collabora.com> 873 (cherry picked from commit 1ab2c60a3f63369a116fb715ebbd3b6e960a1824) 874 875 Conflicts: 876 src/RenderScene.cpp 877 8782014-08-06 Zolnai Tamás <tamas.zolnai@collabora.com> [fde9563eceb15b2f16c53f99f0c0656fb298a3a4] 879 880 Set default branch to libgltf-0.0 881 882 Change-Id: Ib12f83d78e29a3caa4f4224180e30671fbdfc6e7 883 8842014-08-06 Zolnai Tamás <tamas.zolnai@collabora.com> [747a75f9a76ec61b62e5bed32bb599e6bee70551] 885 886 Clean up configure 887 888 Don't need to set CPPFLAGS, CXXFLAGS is enough. 889 890 Change-Id: I56182c3b2dbb88f4d3d89470b430783fefb12ff5 891 (cherry picked from commit 5c14ec343f113c78fb54341d2d6e742f3daef2b6) 892 8932014-08-06 Jan-Marek Glogowski <glogow@fbihome.de> [5076c922425cfb469d55b1d1307b8575757fa713] 894 895 Don't change user autotools flags 896 897 The configure.ac script changes the autotools user variables 898 CFLAGS and CXXFLAGS, which is not allowed and can overwrite user 899 settings. 900 901 So this moves the special compile settings to seperate variables and 902 passes them to AM_CXXFLAGS and AM_CPPFLAGS. 903 904 Change-Id: I49ff151e064a608e8fecb9a9fe34a24bd835aa95 905 Reviewed-on: https://gerrit.libreoffice.org/10791 906 Reviewed-by: Zolnai Tamás <tamas.zolnai@collabora.com> 907 Tested-by: Zolnai Tamás <tamas.zolnai@collabora.com> 908 (cherry picked from commit 925e8033159e6aeba0d7ce001276ee8b1b702bf4) 909 9102014-08-06 Zolnai Tamás <tamas.zolnai@collabora.com> [1ac640e96bbd65290ce0de554f99d3bd72d8da74] 911 912 Add a better description to the library. 913 914 Change-Id: I8e268bfbcc91cfed2e3630fdd9a18d545c899470 915 (cherry picked from commit 102b0395c45e067587b2b0c33a38a4ab34369cf2) 916 9172014-08-06 Zolnai Tamás <tamas.zolnai@collabora.com> [b554e8f73bdfcdf1afac6af8308b2a101df014e4] 918 919 Add build dependancies to the README file 920 921 Change-Id: I40fb9294888e8373c1625b642b411d054d3c810f 922 (cherry picked from commit 234331de3a7ff74e123d0e7efc2a6cd2660a8b99) 923 9242014-08-06 Zolnai Tamás <tamas.zolnai@collabora.com> [24d1c2556b5deb295b02c05d9f11725974ae8706] 925 926 Check all used glm headers 927 928 Change-Id: Ice2ed7301eb6810f0fa0fdfd7d95def6c01cbce5 929 (cherry picked from commit bf9b09523fe4902cc6394435ee07e5484a00afd0) 930 9312014-08-06 Zolnai Tamás <tamas.zolnai@collabora.com> [55f7193e0c6a68021a541e125d9a5341021b5ce1] 932 933 Check all used boost headers 934 935 Change-Id: Ic94fe1328c87c17ac606dbff3eacd2efbb8d460e 936 (cherry picked from commit 469526e13e6a69dc280fca6c428d8f0dea6e84e1) 937 9382014-08-06 Zolnai Tamás <tamas.zolnai@collabora.com> [8eef9a1c8543f352b7467c69b0acbb038b5e85d6] 939 940 Simplify the library's include dir. 941 942 Change-Id: Ia0ea4027302fb432f436374fbe89f2f9b4c28383 943 (cherry picked from commit 0376b6a1c0f932e71101fc285fdc05faef449a14) 944 9452014-08-06 Zolnai Tamás <tamas.zolnai@collabora.com> [a297be077241ef8e116ae25c7902f36d566c5e79] 946 947 WaE: -Wfloat-equal: in updatePolygonSorting() method 948 949 Change-Id: I785a898ea3b9288fc9ce2b4b9fd0154aa916e50c 950 (cherry picked from commit 4c97fd485aeef4d3cffde7d8ae8e6e4d47b9f40c) 951 9522014-08-06 Zolnai Tamás <tamas.zolnai@collabora.com> [3f02f6d9a83af7e282bd2c800dc6dd98ad46fc49] 953 954 WaE: -Wfloat-equal: in renderFlyCamera() method 955 956 Plus reduce scope. 957 958 Change-Id: If55744e281e5e631a11c48afc6a669a6afb0bff8 959 (cherry picked from commit 670eff1cbc4c5283e807b7947e64df5067b223f5) 960 961 Fix regression in camera fly 962 963 flyinfo must be set when time is greater than 0. 964 965 Regression from: 966 670eff1cbc4c5283e807b7947e64df5067b223f5 967 968 Change-Id: Iedf8cd4f40ed97b95fe41be14c90bbc93b016494 969 (cherry picked from commit 3a44bc184e193d525e98120bcd2e11924c813f5d) 970 9712014-08-06 Zolnai Tamás <tamas.zolnai@collabora.com> [96dd777c0822d32801e0eac0aa283631af943a42] 972 973 WaE: -Wfloat-equal: Comparing floating point values in Camera.cpp 974 975 Change-Id: Ibe469a925222862cb6b2a1b99f2e27ba040429e0 976 (cherry picked from commit fffe42f914cdcdb895010e39620b13dcae5763e7) 977 9782014-08-06 Zolnai Tamás <tamas.zolnai@collabora.com> [a328d277753e99e5356c998d5201d97ffccdc5c9] 979 980 Write out std namespace explicitly for math functions. 981 982 Change-Id: I782988a3271b6d48fc60fda7ea7f369568707c22 983 (cherry picked from commit fd778c9bda8b9fe730dc8c9851e4732ccf63c46c) 984 9852014-08-05 Zolnai Tamás <tamas.zolnai@collabora.com> [426e96d8e7ecb0c0a5c0594b8c47193eeb3c4137] 986 987 Add missing <cstdio> include 988 989 Change-Id: I1030e602cf173f49b751ba62e43b1f1ea9af5e7e 990 (cherry picked from commit 54d5d8f0183f9db629eca4f3ac3519d69d9c717a) 991 9922014-08-05 Zolnai Tamás <tamas.zolnai@collabora.com> [4e5fb3e03ad05d1160f250b72fc7d7c24c093a2e] 993 994 Update comment. 995 996 Change-Id: I536b335b50e6b7103f15a967c80888adbe54ab4b 997 9982014-08-05 Yang Zhang <yangzhang@multicorewareinc.com> [7e8aa313f62dcb3f518a2601efc3765e995d1f48] 999 1000 Remove useless code in RenderScene.h and RenderScene.cpp 1001 1002 Change-Id: I7e98f4792b5de802cea3cb77d6156c89359cc961 1003 Reviewed-on: https://gerrit.libreoffice.org/10590 1004 Reviewed-by: Zolnai Tamás <zolnaitamas2000@gmail.com> 1005 Tested-by: Zolnai Tamás <zolnaitamas2000@gmail.com> 1006 10072014-08-04 Markus Mohrhard <markus.mohrhard@googlemail.com> [ad75af6302831befb095b1acc8a9c307aa420d67] 1008 1009 prevent generated copy c'tors 1010 1011 Change-Id: I6d3a8b7ad94cb241c38d906bd135169ae85bd499 1012 Reviewed-on: https://gerrit.libreoffice.org/10732 1013 Reviewed-by: Zolnai Tamás <zolnaitamas2000@gmail.com> 1014 Tested-by: Zolnai Tamás <zolnaitamas2000@gmail.com> 1015 10162014-08-04 Markus Mohrhard <markus.mohrhard@googlemail.com> [21e5a12009e8bc2020f5192b5e940c2953134a2d] 1017 1018 prefer prefix operator++ 1019 1020 Change-Id: Iee04f3f3ef2d42be40c69768d83f3b0702b77c7e 1021 Reviewed-on: https://gerrit.libreoffice.org/10731 1022 Reviewed-by: Zolnai Tamás <zolnaitamas2000@gmail.com> 1023 Tested-by: Zolnai Tamás <zolnaitamas2000@gmail.com> 1024 10252014-08-04 Zolnai Tamás <tamas.zolnai@collabora.com> [ccb68cd2f14240a24a4780a386399b60b2eeea23] 1026 1027 Add trackball files to the *.filters VS file 1028 1029 Change-Id: I735017a691878a485963268a78319e991e415471 1030 10312014-08-04 Zolnai Tamás <tamas.zolnai@collabora.com> [8e6dbe5a217227dc4dc25d4aa11d7fef58b23d71] 1032 1033 WaE: -Weffc++: fix warnings related to glTFFile 1034 1035 Change-Id: I98bead501a664ad7eefa4ab5f618898baa2c7d00 1036 10372014-08-04 Yang Zhang <yangzhang@multicorewareinc.com> [e1807311b6eb7dc75becebbc39df0684f42d1fc3] 1038 1039 remove useless code in libgltf.h and libgltf.cpp 1040 1041 Change-Id: I52d28d9556bbc0f6e65e45443bf54addefca3819 1042 Reviewed-on: https://gerrit.libreoffice.org/10723 1043 Reviewed-by: Zolnai Tamás <zolnaitamas2000@gmail.com> 1044 Tested-by: Zolnai Tamás <zolnaitamas2000@gmail.com> 1045 10462014-08-04 Yang Zhang <yangzhang@multicorewareinc.com> [2d8db4ecb7627034c77d706b6a5973ff010b6ce4] 1047 1048 Let the camera move up and down. 1049 1050 The original design doesn't support camera move up and down, so we set 1051 the Y as 0 all the time 1052 1053 Change-Id: Icd61dafc3d51723592b96f867b5de6cd999568f1 1054 Reviewed-on: https://gerrit.libreoffice.org/10720 1055 Reviewed-by: Zolnai Tamás <zolnaitamas2000@gmail.com> 1056 Tested-by: Zolnai Tamás <zolnaitamas2000@gmail.com> 1057 10582014-08-02 Zolnai Tamás <tamas.zolnai@collabora.com> [25f5ab7b0efc4bd5c646aff7546bd5d67e5766a1] 1059 1060 Save one copy of *.bin file 1061 1062 The pBuffer member is used only during gltf_renderer_set_content() 1063 call which means the original buffer (in inputFiles vector) is 1064 alive, so don't actually need to copy the buffer. 1065 1066 Add removeBuffer() to set pBuffer to 0 before return from 1067 gltf_renderer_set_content() to avoid invalid memory access. 1068 1069 Change-Id: Ia766d37b794ad79587e698f0b5d8a210efbf5ed7 1070 10712014-08-01 Zolnai Tamás <tamas.zolnai@collabora.com> [cd073f7c5bd583aa7606a1f3cd062067b869215d] 1072 1073 releaseFileName() lost it's meaning, rename it to releaseScene() 1074 1075 Plus move deallocation of glTFHandle to RenderScene.cpp, since 1076 allocation was also moved there. 1077 1078 Change-Id: Ibbd8b41ec2925aabc1a076af40bef98383f2cd70 1079 10802014-08-01 Zolnai Tamás <tamas.zolnai@collabora.com> [3f2838b5a1c73d18c4c4dc74dfe770da4fc66ddc] 1081 1082 Comment out an API method: it's not ready for the next release. 1083 1084 Change-Id: I6799d210fb018f3da263359ed001e8ba84200dfe 1085 10862014-08-01 Yang Zhang <yangzhang@multicorewareinc.com> [eccc894219d52197d7d7178cb6553c5a49a8b6cf] 1087 1088 Remove unused member of RenderPrimitive 1089 1090 Extracted from patch: 1091 https://gerrit.libreoffice.org/#/c/10548/ 1092 1093 Change-Id: I5a7e4e329f1407e32f9cf39a6d4d1cb5cb35974d 1094 10952014-08-01 Zolnai Tamás <tamas.zolnai@collabora.com> [4d2d148c0768270d00ef18406e582367e8175762] 1096 1097 Remove useless gltf_renderer_stop_rotate_model() 1098 1099 This method does nothing. It's not necessary to 1100 set lastquat to 0. 1101 gltf_renderer_rotate_model() does the job. 1102 1103 Change-Id: I23047297751b22682cfeae26c4f1e5a4b3a56bbe 1104 11052014-08-01 Zolnai Tamás <tamas.zolnai@collabora.com> [b1c22246c766e023e8044d3f76f690b59c9ab68f] 1106 1107 Useless null check before delete 1108 1109 Change-Id: I6b4ff1af47cfcdad877312213169e03fba7e23a8 1110 11112014-08-01 Yang Zhang <yangzhang@multicorewareinc.com> [77a5f6992c265e54d5e8597226a7bd3181a2c2f4] 1112 1113 Use new/delete instead 1114 1115 Extracted from: 1116 https://gerrit.libreoffice.org/#/c/10548/ 1117 1118 Change-Id: I85d83771aa2669a376b5c622066094c01495ac7d 1119 11202014-08-01 Zolnai Tamás <tamas.zolnai@collabora.com> [e6998a844e8a3518b882b86d55580face4107e68] 1121 1122 Remove useless 'this->' 1123 1124 Change-Id: I1fb06bd854ac4576ffa74f7177c046ae0705042d 1125 11262014-08-01 Zolnai Tamás <tamas.zolnai@collabora.com> [144b75345b55f1703f871bd2083146c2d7e07d18] 1127 1128 Add libgltf namespace to the source code 1129 1130 Change-Id: I1eb2388b44a8733c20f4c1f48cd785dd9a93e01d 1131 11322014-08-01 Yang Zhang <yangzhang@multicorewareinc.com> [3019fea9647f537a8f8c290a0eaf7c699fb9ecbe] 1133 1134 Little cleanup in API 1135 1136 Extracted from: 1137 https://gerrit.libreoffice.org/#/c/10548/ 1138 1139 Change-Id: I304b73d7d36e4e66f524bbc73672c3deb97dbd91 1140 11412014-08-01 Zolnai Tamás <tamas.zolnai@collabora.com> [afc9355ffc87c07721d9c56e56c7d669265d3e4b] 1142 1143 refactor the API of libgltf for reduce memory usage 1144 1145 Based on: https://gerrit.libreoffice.org/#/c/10548/ 1146 Use C++ containers 1147 1148 Change-Id: I491fa98b97dcce9fa4e763169ad10090aaaff5f8 1149 11502014-08-01 Zolnai Tamás <tamas.zolnai@collabora.com> [757a4054c6b06fdbbcf08ca559b00eac79744664] 1151 1152 It is useless to add json file name to glTFHandle.files 1153 1154 Plus use plural naming: getFileName{->s}InJson(). 1155 1156 Change-Id: I9e5d314aae128968bfd955fbae8c8d97f4c0c12c 1157 11582014-08-01 Zolnai Tamás <tamas.zolnai@collabora.com> [4ee49d1f0901073d344a35ec8b54150c3b5a6091] 1159 1160 Pass json file as a filename instead of a buffer 1161 1162 Before this change there were two instances of the json file 1163 in the memory (char buffer and stringstream). 1164 After that change only part of the json file will be stored 1165 in memory all at once. 1166 1167 Change-Id: Id70c4f1935ac143b7b04160da00a011aaf2aaa42 1168 11692014-08-01 Zolnai Tamás <tamas.zolnai@collabora.com> [9be1a2022c615507f35c2b511c765074aeae904c] 1170 1171 Do not copy json buffer to an other json buffer 1172 1173 It saves a copy of the json file. 1174 1175 Change-Id: Ia7a99cc1fba7862d585f27fd4cb3a9fa09a15153 1176 11772014-08-01 Zolnai Tamás <tamas.zolnai@collabora.com> [8371c092a43226bc0c8d5c3eeb67481b872317cd] 1178 1179 Remove unused code related to reading json from file 1180 1181 Change-Id: I04306434d02a37eb44fedcb96643d47aea90aa22 1182 11832014-08-01 Zolnai Tamás <tamas.zolnai@collabora.com> [8770460f2cc0e257728ca7b3579f7ac8ea246848] 1184 1185 Add GL_ARB_texture_multisample to runtime requirements 1186 1187 Change-Id: I7c184f032898cc344d0088fd307327121f196cc4 1188 11892014-08-01 Zolnai Tamás <tamas.zolnai@collabora.com> [bd96ea36f04a730610ae5bd1eccef19d68fbd03e] 1190 1191 WaE: converting to non-pointer type from NULL 1192 1193 Actually NULL is converted to GL_FALSE which leads to 1194 LIBGLTF_CREATE_FBO_ERROR. Using GL_TRUE solve this problem. 1195 1196 Change-Id: Id0bc73ee487fb51a4084d01e4b8f061abad8880d 1197 11982014-08-01 Yang Zhang <yangzhang@multicorewareinc.com> [77b2d68695cb013ea83f5098ebba058f14ac5db0] 1199 1200 Add MSAA Support 1201 1202 Change-Id: I716ac17b4c31506ecd3065af700273584f85c12f 1203 Reviewed-on: https://gerrit.libreoffice.org/10539 1204 Reviewed-by: Zolnai Tamás <zolnaitamas2000@gmail.com> 1205 Tested-by: Zolnai Tamás <zolnaitamas2000@gmail.com> 1206 12072014-07-31 Zolnai Tamás <tamas.zolnai@collabora.com> [a98e42f845e55284bf5aa45cd4f6d1b00280c62b] 1208 1209 The difference between gltf_animation_start()/gltf_animation_resume() 1210 1211 Change-Id: I43774215167b29c486def1bca7f8cea6a818b69d 1212 12132014-07-31 Zolnai Tamás <tamas.zolnai@collabora.com> [435208e077ba16e8e020830241829a405b21fe74] 1214 1215 Cleanup includes in FPSCounter.h/FPSCounter.cpp 1216 1217 Change-Id: I49f96c18b721079335e4d5876cd7304521103cc8 1218 12192014-07-31 Zolnai Tamás <tamas.zolnai@collabora.com> [3d2638b4e29a089a69f1e8f2eb7c8e9630c310b7] 1220 1221 Remove remaining usage of a removed variable: timeRecorder 1222 1223 Change-Id: I22ae56a6211d4bde5259a26c8afd5822392cffbc 1224 12252014-07-31 Zolnai Tamás <tamas.zolnai@collabora.com> [d01b75487815e05f25dfd218e3b862b9935c939c] 1226 1227 Cleanup includes in LoadScene.h/LoadScene.cpp 1228 1229 Change-Id: I3e3e1690ef78c7f8e6417fd6f37af26396c86ec3 1230 12312014-07-31 Zolnai Tamás <tamas.zolnai@collabora.com> [2bd40c2251ce8dace3a7adaf4218c1a66275801f] 1232 1233 Include cleanup in Camera.h/Camera.cpp 1234 1235 Change-Id: I537d18659aa71b964b6c8286d24f54e8570a4a1e 1236 12372014-07-31 Zolnai Tamás <tamas.zolnai@collabora.com> [a196bc3f7f65c4f75581f98e9933c5e2d9b3f83c] 1238 1239 Remove unused headers from Texture.h 1240 1241 Move them there where it is used 1242 1243 Change-Id: If181d95cc5ca16b14c140d8583be20ed0dd4e998 1244 12452014-07-31 Zolnai Tamás <tamas.zolnai@collabora.com> [f1efbd3284197b9cd712c99889eb7721cf1eb4af] 1246 1247 Remove some unused include from Shader code 1248 1249 Change-Id: Idca192cdbfa703bb09812befed81f1b1a61a3944 1250 12512014-07-31 Zolnai Tamás <tamas.zolnai@collabora.com> [33d2ca08bbea4c5684e2874fa3b261280791eca8] 1252 1253 Don't introduce a namespace in a header file. 1254 1255 Change-Id: I52048d0225d56dc5b31f3c7baa3c5b863ff0306e 1256 12572014-07-31 Zolnai Tamás <tamas.zolnai@collabora.com> [16255e04e05dd8f049dcfad1e2ed64335f3c5bd4] 1258 1259 Remove obsolete cameraInfo struct 1260 1261 Change-Id: I5266849753b46df2053e5c6a2771d013d6c89b4a 1262 12632014-07-31 Zolnai Tamás <tamas.zolnai@collabora.com> [e2015e9e26e5b5c969bf762879f1cc273f2c564b] 1264 1265 Remove obsolete API method: gltf_get_camera_info() 1266 1267 Change-Id: I3a8efb98ecff396fdec1f6505cddbed2dd137a79 1268 12692014-07-31 Zolnai Tamás <tamas.zolnai@collabora.com> [515e3d22affe6be1635d33a99f8173ef2745a33b] 1270 1271 Add Yang Zhang to the list of current maintainers and authors 1272 1273 Change-Id: I51ac7c50dfe2142c2d8e2b11398bef16af27427b 1274 12752014-07-31 Zolnai Tamás <tamas.zolnai@collabora.com> [ca2ad5714ef9d787b7ea89c9a601341e2bf097a9] 1276 1277 Consistent naming: orbit mode 1278 1279 Change-Id: I43d239dd1bbae3b4a69ff61fe947d5056d17863d 1280 12812014-07-31 Zolnai Tamás <tamas.zolnai@collabora.com> [069613ee8d552e5bea8e5ec3122b331b49754f11] 1282 1283 Update API method descriptions 1284 1285 Plus use 'eye' instead of 'pos' to name camera 1286 position. 1287 1288 Change-Id: Iadbf2c05d7ae1e4846ac6a23853a8723a0db0270 1289 12902014-07-31 Zolnai Tamás <tamas.zolnai@collabora.com> [178223a4b01e9156daa2abbdc5e995ccc1477725] 1291 1292 It's a C++ library 1293 1294 Change-Id: I1c52d55ff3528fedc21c24dc913c7f263cacf01e 1295 12962014-07-30 Zolnai Tamás <tamas.zolnai@collabora.com> [fa3b01dedd266ae39b06dcddb766a79260965394] 1297 1298 Remove useless typedef keyword from enum declaration 1299 1300 Change-Id: I4e08dae80c00c275ca3647d1cc654e7982b4414f 1301 13022014-07-30 Zolnai Tamás <tamas.zolnai@collabora.com> [bb27a1012d701b5888adad35d187a256f9e1279a] 1303 1304 Remove useless typedef keyword from struct declaration 1305 1306 Change-Id: Id84f7dd8840c980cf36155a6805e0a58e16d27d1 1307 13082014-07-30 Zolnai Tamás <tamas.zolnai@collabora.com> [a2d9e2c0ce70affc163451977ed8dfec2ef6ce9e] 1309 1310 Remove unused member of Font class 1311 1312 Change-Id: Ia1c44f7c3f047de4cdfe9a901559c2418204e8c6 1313 13142014-07-30 Zolnai Tamás <tamas.zolnai@collabora.com> [002b3b4009f54826b0a97333b748924313f0db26] 1315 1316 Remove some unused method from Shader class 1317 1318 Change-Id: I1a8a60271996291ff02c3d4a78b35ceb54a381de 1319 13202014-07-30 Zolnai Tamás <tamas.zolnai@collabora.com> [662d2dec946c06537c95bac729a481d1c72645e2] 1321 1322 Remove some 'set but not used' member of Texture 1323 1324 Change-Id: I96b98149c831b0328800c06449792e5475523a02 1325 13262014-07-30 Zolnai Tamás <tamas.zolnai@collabora.com> [f44b5ae53f569530a61668df4f0d0d3ccfd6ca4e] 1327 1328 FPSRecoder is used only when WRITEFPS2FILE is enabled 1329 1330 Change-Id: Ide441bca6cf6cdbd05e33254d3398f612d02ff46 1331 13322014-07-30 Zolnai Tamás <tamas.zolnai@collabora.com> [d077e565dd56b1df8e3d03cf00ac199fb22caef9] 1333 1334 WaE: -Wshadow in RenderScene.cpp 1335 1336 Change-Id: I06cf58f44e2f52bfe6da168657ac22d2513c8397 1337 13382014-07-30 Zolnai Tamás <tamas.zolnai@collabora.com> [a4739f5bc979b81fef84ec211c462f0eea78a760] 1339 1340 WaE: -Wshadow in LoadScene.cpp 1341 1342 Change-Id: I38a2a2ecf7235681ca01464ad521c08945f9e1c9 1343 13442014-07-30 Zolnai Tamás <tamas.zolnai@collabora.com> [7633821d5c2a94f15441c5171a8e5537e59c6332] 1345 1346 WaE: -Wshadow in Font.cpp 1347 1348 Change-Id: I3d5f585dad3514b064089b512c6cc73526fca257 1349 13502014-07-30 Zolnai Tamás <tamas.zolnai@collabora.com> [2b14d66c469710cf035374383649e9c04fc86807] 1351 1352 WaE: -Wshadow in Common.cpp 1353 1354 Change-Id: I45ef177a379a02b06e074873ef63a60261c534cd 1355 13562014-07-30 Zolnai Tamás <tamas.zolnai@collabora.com> [e90a19d3dd2f4173618863cb8e86db58e96dca45] 1357 1358 Add -Wshadow flag to get more warnings 1359 1360 Change-Id: I93673078538e23da3ed29c5993a7ec7f988e2fd5 1361 13622014-07-30 Zolnai Tamás <tamas.zolnai@collabora.com> [5c137f2533bab86e6546c338b0dea841c8f4c000] 1363 1364 Use proper parameter type 1365 1366 Change-Id: I69179d4a1a029abc86d054f22c3b353789ab0476 1367 13682014-07-30 Zolnai Tamás <tamas.zolnai@collabora.com> [8d26e3ba4bf6c64a46805256e98416a12e9dc02c] 1369 1370 ENABLE_FPS is useless 1371 1372 Change-Id: I197b1b9ab99ee43b8cc30b6db63175a651877d36 1373 13742014-07-30 Zolnai Tamás <tamas.zolnai@collabora.com> [4b32e7100435f913702413530b03ec6d77a1e5fe] 1375 1376 There is no such initFPS() method 1377 1378 Change-Id: Idec12b14629559e29b83701b229c0228d330b8a6 1379 13802014-07-30 Zolnai Tamás <tamas.zolnai@collabora.com> [ee9719396073e01e2d972cdd883d6a449c3895fc] 1381 1382 Remove explicit empty return from the end of void functions 1383 1384 Change-Id: I8092a91b3709baad85e1316d095390b0fbc47d5e 1385 13862014-07-30 Zolnai Tamás <tamas.zolnai@collabora.com> [f8502f1301dc994321afae2aec49348811218991] 1387 1388 Make API more C++ like: use bool values 1389 1390 Change-Id: I52118f79c6b14896cd03f0638efbc5b9c557e7fe 1391 Reviewed-on: https://gerrit.libreoffice.org/10648 1392 Reviewed-by: Zolnai Tamás <zolnaitamas2000@gmail.com> 1393 Tested-by: Zolnai Tamás <zolnaitamas2000@gmail.com> 1394 13952014-07-30 Yang Zhang <yangzhang@multicorewareinc.com> [d1dc17422345173fbdb224253802c0248fb688a5] 1396 1397 Format code in Common.cpp and Common.h 1398 1399 Change-Id: I376be17036ae723614b833b23bd1ed4de1b6e2d7 1400 Reviewed-on: https://gerrit.libreoffice.org/10591 1401 Reviewed-by: Zolnai Tamás <zolnaitamas2000@gmail.com> 1402 Tested-by: Zolnai Tamás <zolnaitamas2000@gmail.com> 1403 14042014-07-30 Yang Zhang <yangzhang@multicorewareinc.com> [2d519af46ac60235c5ff4d2c061866c0286af865] 1405 1406 Modify the function name which invoke in libgltf.cpp 1407 1408 Change-Id: I29cb51e4f2447e1ed9aace77b6026c21db9461df 1409 Reviewed-on: https://gerrit.libreoffice.org/10538 1410 Reviewed-by: Zolnai Tamás <zolnaitamas2000@gmail.com> 1411 Tested-by: Zolnai Tamás <zolnaitamas2000@gmail.com> 1412 14132014-07-30 Zolnai Tamás <tamas.zolnai@collabora.com> [1431a242ba4f416a8f915e1180d6c0c46ecc7af7] 1414 1415 Remove remaining OpenMP related code 1416 1417 OpenMP is obsolete 1418 1419 Change-Id: Iad0b5cc7864b307f38c530646fa8acc7492dea4f 1420 14212014-07-30 Yang Zhang <yangzhang@multicorewareinc.com> [0c30034f177f94ee5f7f9bcc2beb28a41219351b] 1422 1423 Format code in RenderScene.h and RenderScene.cpp 1424 1425 Change-Id: I2a9228583d2df24f98bfbc26a1585a197288e3a7 1426 Reviewed-on: https://gerrit.libreoffice.org/10537 1427 Reviewed-by: Zolnai Tamás <zolnaitamas2000@gmail.com> 1428 Tested-by: Zolnai Tamás <zolnaitamas2000@gmail.com> 1429 14302014-07-30 Yang Zhang <yangzhang@multicorewareinc.com> [12e0396ba37a7f8203e1e21f069fc335b09b624f] 1431 1432 Move error code define from Common.h to types.h 1433 1434 Change-Id: I7679c2f0566b791a3a73293c214387aceb35a743 1435 Reviewed-on: https://gerrit.libreoffice.org/10535 1436 Reviewed-by: Zolnai Tamás <zolnaitamas2000@gmail.com> 1437 Tested-by: Zolnai Tamás <zolnaitamas2000@gmail.com> 1438 14392014-07-30 Zolnai Tamás <tamas.zolnai@collabora.com> [1b2f1f7b4c9cd74a5df98eb6ebb84a4f83b0a0a3] 1440 1441 Fix QA_TEST build. 1442 1443 Change-Id: I28b57df17841006a9f670e2cb8aaf46bbf197871 1444 14452014-07-30 Yang Zhang <yangzhang@multicorewareinc.com> [f768746b7f057ce16dcd037f32673732848ef41f] 1446 1447 Update FPS logic 1448 1449 Change-Id: Ic6d4d5569fcc55fc89de99ccc1727d5286bbad7f 1450 Reviewed-on: https://gerrit.libreoffice.org/10534 1451 Reviewed-by: Zolnai Tamás <zolnaitamas2000@gmail.com> 1452 Tested-by: Zolnai Tamás <zolnaitamas2000@gmail.com> 1453 14542014-07-30 Zolnai Tamás <tamas.zolnai@collabora.com> [5450660641b221049543ba92278903b55b46a9a4] 1455 1456 GL_ARB_sampler_objects are not used any more 1457 1458 Change-Id: I7f3633a08fa3755c482e0de880bacec80d9cb548 1459 14602014-07-30 Yang Zhang <yangzhang@multicorewareinc.com> [3c8400f31454f4c015277ca06c96ed23aed57fe5] 1461 1462 Instead of glSamplerParameteri with glTexParameteri 1463 1464 Change-Id: I36fa11deb93d48b1b120cde87ba68c5454dbff12 1465 Reviewed-on: https://gerrit.libreoffice.org/10528 1466 Reviewed-by: Zolnai Tamás <zolnaitamas2000@gmail.com> 1467 Tested-by: Zolnai Tamás <zolnaitamas2000@gmail.com> 1468 14692014-07-30 Zolnai Tamás <tamas.zolnai@collabora.com> [5f6c1687093da5eabfd3e7b66893f0cd715a4871] 1470 1471 Add a modified version of logerrit from LibreOffice repo 1472 1473 ...to make reviewing process easier. 1474 1475 Change-Id: Ibb931adc491fbde6e2c228867d3a7d7b6fd5f8f4 1476 Reviewed-on: https://gerrit.libreoffice.org/10639 1477 Tested-by: Zolnai Tamás <zolnaitamas2000@gmail.com> 1478 Reviewed-by: Zolnai Tamás <zolnaitamas2000@gmail.com> 1479 14802014-07-22 Zolnai Tamás <tamas.zolnai@collabora.com> [58b54e07e1aca13c7e92466e44d1223e4e094f8f] 1481 1482 Add OpenGL requirements to the README file 1483 1484 14852014-07-17 Zolnai Tamás <tamas.zolnai@collabora.com> [4f9c70d59b9fa0515136bd957a3bd2be015a5bf9] 1486 1487 More consistent naming, get the name from MCW repo 1488 1489 Cherry-picked commit: 1490 changeset: 1140:eff0e0707bda 1491 branch: improvement 1492 user: YangZh@MCW-yZhang.MCW-CC.CN 1493 date: Mon Jul 14 15:42:14 2014 +0800 1494 summary: In order to avoid the same file. 1495 14962014-07-17 Markus Mohrhard <markus.mohrhard@googlemail.com> [8f934d97963721b3890c69a7b1934fea92af486c] 1497 1498 fix the Windows project files 1499 1500 15012014-07-17 Markus Mohrhard <markus.mohrhard@googlemail.com> [2733098d289684410fdcbf6876759dcc25c48848] 1502 1503 Time.h conflicts with time.h on OSX 1504 1505 15062014-07-16 Zolnai Tamás <tamas.zolnai@collabora.com> [9da32925e0c4b8c73384c1a811d64384af262290] 1507 1508 Wrong size of the scene after resizing 1509 1510 When viewport changed it is necessary to resize the whole scene. 1511 Calling releasFbo removes size dependent objects and triggers 1512 creating the new ones with the new size. 1513 15142014-07-14 Zolnai Tamás <tamas.zolnai@collabora.com> [f3a1c19ee8b79c3a05d819d8d46e1d0f385c4219] 1515 1516 Do not clear GLM_CFLAGS 1517 1518 15192014-07-14 Zolnai Tamás <tamas.zolnai@collabora.com> [7a5011a52daf9989f59bb5e25176903b0471ec73] 1520 1521 Add windows build files to the package 1522 1523 15242014-07-14 Zolnai Tamás <tamas.zolnai@collabora.com> [ec5ee9f30071e6eb8f61f3591c5097379156f100] 1525 1526 get_glpos_info() has no definition so it should not be part of libgltf's API 1527 1528 15292014-07-14 Zolnai Tamás <tamas.zolnai@collabora.com> [edd9b4f91fcce10a35998f9e389ef30e7f3154aa] 1530 1531 Remove remaining windows line endings 1532 1533 15342014-07-14 Zolnai Tamás <tamas.zolnai@collabora.com> [3b27fd9da9091291f39db0fa917dbc4154b979f2] 1535 1536 Wrong return value of gltf_prepare_renderer() 1537 1538 15392014-07-12 Zolnai Tamás <tamas.zolnai@collabora.com> [f8260382291c928945aeb7f7a09a50ad73e70475] 1540 1541 Add LICENSE to the package files 1542 1543 15442014-07-12 Zolnai Tamás <tamas.zolnai@collabora.com> [6477e3748106c130f25f2dc2f9d38049755be729] 1545 1546 Extern is not necessary here 1547 1548 15492014-07-12 Markus Mohrhard <markus.mohrhard@googlemail.com> [9be3aec104a96841ff4cedc34d16598b30700dd3] 1550 1551 the option is -pendantic and not -Wpedantic 1552 1553 15542014-07-12 Markus Mohrhard <markus.mohrhard@googlemail.com> [d7be4be8c44c8f7436dc895169744c69d13cc74a] 1555 1556 fix make distcheck 1557 1558 15592014-07-12 Markus Mohrhard <markus.mohrhard@googlemail.com> [e9973ef9f2b36dac4a6465bb81e856c9bcf93a6b] 1560 1561 glew 1.9.0 is enough for gltf 1562 1563 15642014-07-11 Zolnai Tamás <tamas.zolnai@collabora.com> [b9d284a9a35fc895a45dc79c5ed6ab52b41cfb84] 1565 1566 Be more precise about the precision 1567 1568 15692014-07-11 Zolnai Tamás <tamas.zolnai@collabora.com> [660210212413ffe6a263e755698cc32aee34ca35] 1570 1571 Use libgltf time stamps for camera fly too 1572 1573 15742014-07-11 Zolnai Tamás <tamas.zolnai@collabora.com> [76a8760b8ede73f35edb0bcc8a0c764b1a098ba4] 1575 1576 Use libgltf time stamps for FPSCounter 1577 1578 15792014-07-11 Zolnai Tamás <tamas.zolnai@collabora.com> [e498d4bf10db0bed4744bbbf7d1409942fa3fa02] 1580 1581 Fix time-lag in animation 1582 1583 clock()/CLOCKS_PER_SEC does not work and 1584 time() and difftime() not precise enough. 1585 So use platfrom specific time stamps. 1586 15872014-07-11 Zolnai Tamás <tamas.zolnai@collabora.com> [928b49dac5625f560af00d74bda2426f361cb283] 1588 1589 Walkthrough mode is not updated as frequently as it should 1590 1591 This FRAM_ELAPSE means an unwanted time-lag. 1592 15932014-07-10 Zolnai Tamás <tamas.zolnai@collabora.com> [f7ec21bec737d83d1449391647ec7c0fa66240c7] 1594 1595 Avoid crash in case of gltf_renderer_set_content() failes. 1596 1597 Problems 1598 - pScene was not set to 0 after deletion so calling 1599 gltf_renderer_release() leads to crash. 1600 - It was not checked whether pScene is pointing anywhere 1601 inside gltf_renderer_release(). 1602 - pScene should not be deleted before gltf_renderer_release() 1603 is called, because pScene point to the glTFHandle containing 1604 buffers which must be released. 1605 16062014-07-10 Zolnai Tamás <tamas.zolnai@collabora.com> [59d16e9b8ea274cd1fa78730f50f8b9ca37e5646] 1607 1608 Remove conflict leftover 1609 1610 16112014-07-10 Zolnai Tamás <tamas.zolnai@collabora.com> [66bb75b968e998b1ad905229054c397fb1fb737d] 1612 1613 Do not write fps into a file 1614 1615 16162014-07-10 Zolnai Tamás <tamas.zolnai@collabora.com> [4cc2c3e2f626020ff9eb9e5e1b6c470ea3221634] 1617 1618 Cherry-pick a memory optimization commit (1129) 1619 1620 Original commit: 1621 changeset: 1129:216477d7e79c 1622 branch: improvement 1623 tag: tip 1624 user: YangZh@MCW-yZhang.MCW-CC.CN 1625 date: Wed Jul 09 18:18:37 2014 +0800 1626 summary: Release unused memory 1627 16282014-07-10 Zolnai Tamás <tamas.zolnai@collabora.com> [e746e738c331171edae313b0006c5a9a90cf021f] 1629 1630 Cherry-pick a memory optimization commit (1115) 1631 1632 Original commit: 1633 changeset: 1115:51e5770cc937 1634 branch: Develop 1635 parent: 1106:a876516c9a0a 1636 user: LeiQu 1637 date: Tue Jul 08 15:12:09 2014 +0800 1638 summary: release unused memory 1639 16402014-07-10 Zolnai Tamás <tamas.zolnai@collabora.com> [dfedb2519911d4a64f1f6c99a1f04988757e9761] 1641 1642 Make FPSCounter work on linux. 1643 1644 It seems clock() and CLOCKS_PER_SEC don't work 1645 so use time() instead. 1646 Since time.h is a cross platform header it is 1647 better to use that for Windows too. 1648 16492014-07-10 Zolnai Tamás <tamas.zolnai@collabora.com> [39defa993cbf144cd0c701f812858e76804c0bae] 1650 1651 Fix regression in model position 1652 1653 Model hangs out the screen which is a problem in orbit mode 1654 where positon is constant. 1655 16562014-07-10 Zolnai Tamás <tamas.zolnai@collabora.com> [1eca1665770b11da72921cbd1c99a8cd130dadda] 1657 1658 Do not remember where was the camera two switches before 1659 1660 16612014-07-10 Zolnai Tamás <tamas.zolnai@collabora.com> [7ed948ed8b731f27c32eebc2e95f66654d8134d0] 1662 1663 Orbit mode affects walkthrough mode unexpectedly 1664 1665 16662014-07-10 Zolnai Tamás <tamas.zolnai@collabora.com> [4ed5d7d4be6fe4d65948f9ad4cb7a07616fc3b37] 1667 1668 Remove obsolete API method 1669 1670 16712014-07-10 Zolnai Tamás <tamas.zolnai@collabora.com> [5fc9dc9fc5c298873255ee0e43042f29ec999246] 1672 1673 Small cosmetics in configure.ac 1674 1675 16762014-07-10 Zolnai Tamás <tamas.zolnai@collabora.com> [ee2f49ffe5240d6078f5bf9822012430a973a3fc] 1677 1678 libgltf is a C++ library so don't use extern "C" 1679 1680 16812014-07-10 Zolnai Tamás <tamas.zolnai@collabora.com> [c58370aef15307d77a46b7ee640361ba567dcc6c] 1682 1683 WaE: comparison is always false [-Wtype-limits] 1684 1685 16862014-07-10 Zolnai Tamás <tamas.zolnai@collabora.com> [e7a6dfadbe9d92c5879c5650a93488e4f67a10e8] 1687 1688 WaE: type qualifiers ignored on function return type [-Wignored-qualifiers] 1689 1690 16912014-07-10 Zolnai Tamás <tamas.zolnai@collabora.com> [9ced74c7adaa9fb93c296be242a4b90d7869ec7a] 1692 1693 Add -Wextra to CFLAGS/CPPFLAGS for more warnings 1694 1695 16962014-07-10 Zolnai Tamás <tamas.zolnai@collabora.com> [7487f4c0d7e6c3d39c82f6e3081aceebba9c1bf5] 1697 1698 Remove duplicated call of realRender() 1699 1700 17012014-07-10 Zolnai Tamás <tamas.zolnai@collabora.com> [ab65afb8681b5f0e153d5a950a6daeddecd210e3] 1702 1703 Problems of bitmap rendering with GL_BGRA/GL_RGBA format 1704 1705 Problems: 1706 Calling guassianFilter() and using 1707 '(width * bufferDepth + bufferDepth) / 4 * 4' 1708 cause crash when bitmap rendering is called with 1709 GL_BGRA format. 1710 Defining DEFAULT_VIEW leads to that model is not 1711 displayed. 1712 1713 So revert this changes. 1714 17152014-07-10 Zolnai Tamás <tamas.zolnai@collabora.com> [7b8889959b4b3e7f312160589e56b9c98aaeded8] 1716 1717 Do not use methods from glu library 1718 1719 The glu library was removed from libgltf's dependancy 1720 so it would be good to use glm::unProject instead of gluUnProjet 1721 but until that comment out this method (it is unused by now). 1722 17232014-07-10 Zolnai Tamás <tamas.zolnai@collabora.com> [cea127ae0d80d590af330aedc57939d8a226f136] 1724 1725 WaE: -Wunused-variable 1726 1727 Use extern declaration in header and declare buffers 1728 in a seperate source file. 1729 17302014-07-10 Zolnai Tamás <tamas.zolnai@collabora.com> [3db2107e9ba637a7125103fabd8ffb9c76ee5820] 1731 1732 WaE: Weffc++: enumeration values not handled in switch [-Wswitch] 1733 1734 17352014-07-10 Zolnai Tamás <tamas.zolnai@collabora.com> [298ebc8b47721f36a1c32b24488f8ca83445d47c] 1736 1737 WaE: Weffc++: initialize members in initialization list: Texture 1738 1739 17402014-07-10 Zolnai Tamás <tamas.zolnai@collabora.com> [0ee3d5432e37537bb04950f3dda37644fd3fdd52] 1741 1742 WaE: Weffc++: initialize members in initialization list: RenderScene 1743 1744 17452014-07-10 Zolnai Tamás <tamas.zolnai@collabora.com> [1023d0cc781898669794cf0b2761017264d02c30] 1746 1747 WaE: Weffc++: initialize members in initialization list: RenderShader 1748 1749 17502014-07-10 Zolnai Tamás <tamas.zolnai@collabora.com> [fd92d6604b99109f73f21c60770bfbc28bfb2842] 1751 1752 WaE: Weffc++: initialize members in initialization list: RenderPrimitive 1753 1754 17552014-07-10 Zolnai Tamás <tamas.zolnai@collabora.com> [0c18acc8d1b31e1002a43decb4446df9e3781587] 1756 1757 WaE: Weffc++: initialize members in initialization list: RenderWithFBO 1758 1759 17602014-07-10 Zolnai Tamás <tamas.zolnai@collabora.com> [b5d2869e38c0ede498d23ce4d57fdeba80f28193] 1761 1762 WaE: Weffc++: initialize members in initialization list: techLight 1763 1764 17652014-07-10 Zolnai Tamás <tamas.zolnai@collabora.com> [5f3fb79e8a3a3ec3f5fa70d991d76bbba07b3b9c] 1766 1767 WaE: Weffc++: initialize members in initialization list: Parser 1768 1769 17702014-07-10 Zolnai Tamás <tamas.zolnai@collabora.com> [e6272fcab891416f7963554ad77104827ca10998] 1771 1772 WaE: Weffc++: initialize members in initialization list: TraceTime 1773 1774 17752014-07-10 Zolnai Tamás <tamas.zolnai@collabora.com> [84dd436209c731a40ff67f1fd47b32b3e2abaa33] 1776 1777 WaE: Weffc++: initialize members in initialization list: FPSCounter 1778 1779 17802014-07-10 Zolnai Tamás <tamas.zolnai@collabora.com> [e5e6751133e027f0e99f620abe00c7d1c83a73f0] 1781 1782 WaE: Weffc++: initialize members in initialization list: Font 1783 1784 17852014-07-10 Zolnai Tamás <tamas.zolnai@collabora.com> [ac7ef9e27cb41dc470beae51de8e3b124d22a6ad] 1786 1787 WaE: Weffc++: initialize members in initialization list: Scene 1788 1789 17902014-07-10 Zolnai Tamás <tamas.zolnai@collabora.com> [ad8d8674341bfd5ba2015093b3462c846e4fed9a] 1791 1792 WaE: Weffc++: initialize members in initialization list: Skin 1793 1794 17952014-07-10 Zolnai Tamás <tamas.zolnai@collabora.com> [f7fafa9052e8b571f5ebae15a775183d75adfcb1] 1796 1797 WaE: Weffc++: initialize members in initialization list: Animation 1798 1799 18002014-07-10 Zolnai Tamás <tamas.zolnai@collabora.com> [11bbec9d061064c1fb55ce3774e769763ba06246] 1801 1802 WaE: Weffc++: initialize members in initialization list: Node 1803 1804 18052014-07-10 Zolnai Tamás <tamas.zolnai@collabora.com> [8ae3f6ef0623162f9ae748d49300c94b0c3d426c] 1806 1807 WaE: Weffc++: initialize members in initialization list: Mesh 1808 1809 18102014-07-10 Zolnai Tamás <tamas.zolnai@collabora.com> [84f7ef642137f1b60a13b5c13191e9aa8b4af38f] 1811 1812 WaE: Weffc++: initialize members in initialization list: Primitives 1813 1814 18152014-07-10 Zolnai Tamás <tamas.zolnai@collabora.com> [91e3117f44f10e03beece5ec49ed4e6529437095] 1816 1817 WaE: Weffc++: initialize members in initialization list: Material 1818 1819 18202014-07-10 Zolnai Tamás <tamas.zolnai@collabora.com> [1224ad3baba6e5da263ad39895b5314f476d7332] 1821 1822 WaE: Weffc++: initialize members in initialization list: MaterialProperty 1823 1824 18252014-07-10 Zolnai Tamás <tamas.zolnai@collabora.com> [2505a2bf926f9ada5c437eb151ac39fb799a5d78] 1826 1827 WaE: Weffc++: initialize members in initialization list: Technique 1828 1829 18302014-07-10 Zolnai Tamás <tamas.zolnai@collabora.com> [4bbf71c11482c75411dbedb686c3174aa3f7affe] 1831 1832 WaE: Weffc++: initialize members in initialization list: TechUniform 1833 1834 18352014-07-10 Zolnai Tamás <tamas.zolnai@collabora.com> [ee339d4e0885a4bffa14651f9e189ddf1f6ca9e9] 1836 1837 WaE: Weffc++: initialize members in initialization list: TechAttribute 1838 1839 18402014-07-10 Zolnai Tamás <tamas.zolnai@collabora.com> [f06f33e3f0ee1fb3c564e970f60cbea5335f7b56] 1841 1842 WaE: Weffc++: initialize members in initialization list: ParseCamera 1843 1844 18452014-07-10 Zolnai Tamás <tamas.zolnai@collabora.com> [c31ddbef0598abaf85f51705a7aa81b30221bc0b] 1846 1847 WaE: Weffc++: initialize members in initialization list: Light 1848 1849 18502014-07-10 Zolnai Tamás <tamas.zolnai@collabora.com> [f40069aa18efbec3b5a5fc9c0b9569269a3244ad] 1851 1852 WaE: Weffc++: Make objects noncopyable to avoid shallow copy. 1853 1854 18552014-07-10 Zolnai Tamás <tamas.zolnai@collabora.com> [df13eee63ad4e4b9c29d6e42313bbe1dc7ab594b] 1856 1857 WaE: deprecated conversion from string constant to 'char*' 1858 1859 18602014-07-10 Zolnai Tamás <tamas.zolnai@collabora.com> [aeaafad61c1f46d60f3937a1d055e8ce208fb4b5] 1861 1862 WaE: -Wreorder in RenderScene.cpp 1863 1864 18652014-07-10 Zolnai Tamás <tamas.zolnai@collabora.com> [690d7dcd61b32b778a33cce80181a8b8bf6f3125] 1866 1867 WaE: -Wreorder in FPSCounter.cpp 1868 1869 18702014-07-10 Zolnai Tamás <tamas.zolnai@collabora.com> [c8190aa768060c8112a0185294e02e34cdc54d78] 1871 1872 WaE: -Wreorder in Common.cpp 1873 1874 18752014-07-10 Zolnai Tamás <tamas.zolnai@collabora.com> [557e7b6828a999a27fdd0fa9531e82cffb44add4] 1876 1877 WaE: extra semicolon 1878 1879 18802014-07-10 Zolnai Tamás <tamas.zolnai@collabora.com> [25b6a47667f94a0f4b7d1837a9519b8429fe7fe0] 1881 1882 WaE: comma at end of enumerator list 1883 1884 18852014-07-10 Zolnai Tamás <tamas.zolnai@collabora.com> [296fbfd2739e90eddd6c3393bbf1a583d55fb63c] 1886 1887 WaE: -Wunused-function in Camera.cpp 1888 1889 18902014-07-10 Zolnai Tamás <tamas.zolnai@collabora.com> [46c494f097841aeb84532d1461df0e28a83a6d5b] 1891 1892 WaE: -Wreorder in Camera.cpp 1893 1894 18952014-07-10 Zolnai Tamás <tamas.zolnai@collabora.com> [f46f8601cfa4ee5c8e6a773d888e8ae843764f1a] 1896 1897 WaE: -Wunknown-pragmas 1898 1899 19002014-07-10 Zolnai Tamás <tamas.zolnai@collabora.com> [e3075918088743f1dd8b12ce08122d258b36c671] 1901 1902 Add mode lines 1903 1904 19052014-07-10 Zolnai Tamás <tamas.zolnai@collabora.com> [34a4c9a5fbf3857ac390ce2186db9c9e6d30c146] 1906 1907 Wrong deallocation method 1908 1909 19102014-07-10 Zolnai Tamás <tamas.zolnai@collabora.com> [1fdbed579f5562bbc195d9289470f01616ade1f9] 1911 1912 Initial import 1913 1914 Source code and visual studio files are created by MulticoreWare Inc. 1915 I added make files, config files, change includes where it was needed 1916 and so on to make it like a library. 1917 1918 Change-Id: I15317655755d98206aae6c440f953cc1d3079895 1919 19202014-03-24 Norbert Thiebaud <nthiebaud@gmail.com> [85d6b8352fe8efeccf1ab0ab464514dd27e700df] 1921 1922 Initial commit 1923 1924