Commit graph

92 commits

Author SHA1 Message Date
Campbell Barton
a9c3dad75a CMake: differentiate system includes (#604) 2016-07-09 00:47:11 +09:00
Shinya Kitaoka
7abdb2380a Merge pull request #547 from ideasman42/warn-undefined-pr
Quiet -Wundef warning
2016-07-06 20:42:14 +09:00
Shinya Kitaoka
c08330d1ae Merge pull request #567 from opentoonz/cmake-cleanup-defines-pr
CMake: use multi-line defines
2016-07-06 13:56:49 +09:00
shun_iwasawa
fd6c3c05ac revert behavior on dblclking style, and more 2016-07-05 16:15:29 +09:00
Shinya Kitaoka
fd19c4eedf Support Visual Studio 2015 (#544)
* Small changes, for some reason VS 2015 can't link cprintf and they added a second function std::map::count and bind couldn't resolve the function. Substituted with a lambda-expression.

* Created all 64bit version of the 3rd party libs.

* Cleanup popup opens CleanupSettings instead of CleanupSettingsPane. Not finished, panel is wrong now (also uses CleanupSettings).

* Tried to get Twain working, failed.

* When there are more then 3 peg holes create additional holes.

* When a hole touches the boundary it should still be considered a hole.

* Do not compare dot size against fixed size. Will not work in some scan resolutions. Used the same value (PERCENT * max dot size) as later in the code in compare_dots.

* When there are more than three peg holes the code looked for the best fit and used that. The problem was, that the middle hole was used as center for auto center. For three peg holes that is correct, but does not work for more than three. Now the best fit is calculated and from there the offset of the middle of the three best fit holes is calculated and applied.

* One of the last changes broke VS2015 compatibility, it chocked on a missing include.

* fix for msvs2013

* revert autopos.cpp

* apply clang-format

* use GIT-LFS
2016-07-04 17:50:30 +09:00
Campbell Barton
f2d492861f CMake: use multi-line defines
Easier to read and avoids merge conflicts
2016-07-02 22:23:18 +10:00
Campbell Barton
d89022ce19 Fix checking the left-node before operating on the right 2016-07-01 09:38:27 +10:00
Campbell Barton
d869b5f8e6 Quiet -Wundef warning
Exposes accidental typos when checking exact values of a define.
2016-06-30 12:28:26 +10:00
Campbell Barton
f493896cc0 Cleanup: typo (sensibility) 2016-06-29 20:49:17 +10:00
Shinya Kitaoka
d1f6c4e95b REFACTORING: Add final specifiers (#537)
* add final specifiers

* apply clang-format

* fix for macOS
2016-06-29 15:17:12 +09:00
Michał Janiszewski
a6309b14b7 Use std::max_element 2016-06-24 10:35:50 +02:00
tomosu
965183e43c Merge pull request #475 from skitaoka/refactoring/add-override
REFACTORING: add override specifiers
2016-06-23 17:03:53 +09:00
shun-iwasawa
76270a4b64 Merge pull request #395 from turtletooth/palettes
Toonz Palettes folder now working and has 3 starter palettes
2016-06-20 15:55:47 +09:00
Shinya Kitaoka
38fd868138 apply clang-format 2016-06-20 11:34:17 +09:00
Shinya Kitaoka
473e70432a add override specifier 2016-06-20 11:34:15 +09:00
turtletooth
2382549b47 Onion Skin default color changed (#396) 2016-06-16 16:04:38 +09:00
Jeremy Bullock
946edbcf47 Fixed for 1.0.3 2016-06-15 23:15:05 -06:00
Campbell Barton
22fd3b0447 CMake: changes needed to build on Linux (#452)
Note that these are the main changes from the linux port.
Not a fully working linux port.
2016-06-16 13:52:02 +09:00
Shinya Kitaoka
120a6e041c apply clang-format 2016-06-15 15:43:10 +09:00
JosefMeixner
e932c2e9b3 Handle more then 3 peg holes (#314)
* When there are more then 3 peg holes create additional holes.

* When a hole touches the boundary it should still be considered a hole.

* Do not compare dot size against fixed size. Will not work in some scan resolutions. Used the same value (PERCENT * max dot size) as later in the code in compare_dots.

* When there are more than three peg holes the code looked for the best fit and used that. The problem was, that the middle hole was used as center for auto center. For three peg holes that is correct, but does not work for more than three. Now the best fit is calculated and from there the offset of the middle of the three best fit holes is calculated and applied.

* Changed the type of a variable, missed that when I changed the usage of the variable.
2016-06-14 16:18:10 +09:00
tomosu
eea0acf6fa Use stringstream instead of strstream (#431)
* replace strstream with string stream

* all change

Signed-off-by: tomosu <tomosu@users.noreply.github.com>

* small changes
2016-06-13 21:50:05 +09:00
Shinya Kitaoka
ee259ffaf7 remove duplicated constants (#296) 2016-06-13 21:37:09 +09:00
shun-iwasawa
99b9e225b0 enable debug build (#421) 2016-06-08 17:51:40 +09:00
shun-iwasawa
6b7c9c5724 New option to retain original styles when loading color model's palette (#407)
* make "append default palette" to be optional

* new option for loading raster img to color model

* remove unused sources

* add japanese translations
2016-06-07 18:43:49 +09:00
turtletooth
1526ec939f Changed default resolution to 1920 x 1080 (#385)
* Changed default resolution

* Resizes view to fit the window on the first time it is shown only.  Otherwise new resolution may seem too big.
2016-06-07 17:46:11 +09:00
Banbury
09a48e32a3 Fix: Allow negative frame id in scene.setCell (scripting). (#345)
This fix is necessary for creating animations in Javascript from raster images
with only one frame. For this Opentoonz expects a frame id of -2.
A frame id of -1 is an empty frame.
The original implementation onyl allows positive numbers.
2016-06-07 17:19:18 +09:00
Shinya Kitaoka
9eb50de5fe Use std functions (#297)
* use std functions

* replace toInt        to std::stoi
* replace toDouble     to std::stod
* replace toString     to std::to_string
* replace toWideString to std::to_wstring

* fix for MacOS

* cosmetic change
2016-06-07 16:06:00 +09:00
Jeremy Bullock
b37830bb62 Toonz Palettes folder now working and has 3 starter palettes 2016-06-02 20:51:51 -06:00
tomosu
e5f7d89527 Keep the consistency of mesh image addr, after save operation (#380)
* change MESH_XSHLEVEL to be isImageCompatible true

* add comment and split comparison operator return into true and false
2016-06-02 20:37:45 +09:00
turtletooth
8d9ba3307e Rooms Selection (#378)
* Start of room choice in preferences

* Menu almost working

* Rooms Selection Working

* Removed unneeded preferences file

* Default Name for Rooms

* Rename Default room folder

* Fixed Reset to Default Rooms to reset current Roomset
2016-06-02 20:36:29 +09:00
Shinya Kitaoka
822411ba0e Support German translation (#363)
German translations

* Added files via upload

First translation draft. Corrections need to be made with actual in hand program

* Added files via upload

* Japanese characters

正方ピクセルを保持 -> Force Squared Pixel translated as "Quadratische Pixel erzwingen"

* Small spelling error

Blur value ->Weichheitsgrad

* add loc/german/*.qm

* modify loc dir names to their local script

* fixup! update loc/*/*.qm

* fix "Sensitivity"
2016-05-27 14:27:54 +09:00
Shinya Kitaoka
210a8af034 Use QGLWidget instead of QOpenGLWidget (#337)
* use QGLWidget instead of QOpenGLWidget for PlaneView

* fix ImageViewer and HexagonalColorWhell
2016-05-25 18:19:38 +09:00
Keisuke Ogaki
5ff9a72ca5 get layer name encoding from preference 2016-05-24 16:26:30 +09:00
Keisuke Ogaki
8b06ffc4e3 💄 force encoding in SJIS for psd layer name 2016-05-24 15:11:55 +09:00
Shinya Kitaoka
3fa3e1e9b8 Use "range-based for" instead of iterators (#339)
* use "range-based for" instead of iterators

* fix assertions
2016-05-23 17:40:49 +09:00
Campbell Barton
5ea53c8c6b Quiet GCC -Wparentheses warning with assignment (#310) 2016-05-20 17:37:59 +09:00
Shinya Kitaoka
12c444ee0d use std::min and std::max (#318) 2016-05-18 13:03:37 +09:00
Keisuke Ogaki
b592dbfa79 Fix creating empty level fails (#317)
* 🐛 Don't forget break after case
2016-05-18 00:51:00 +09:00
Shinya Kitaoka
8105532604 add #pragma once (#303) 2016-05-17 00:04:11 +09:00
Shinya Kitaoka
d4642c34e8 Remove macros: CASE, __OR, and DEFAULT (#286)
* remove syntax macros: CASE, __OR, and DEFAULT

* define VC_EXTRALEAN

* remove meaningless comments
2016-05-13 19:49:17 +09:00
shun-iwasawa
0c0a0a798f revert onionskin on xsheet (#280) 2016-05-11 17:43:59 +09:00
Campbell Barton
f08982dd33 CMake: cleanup indentation, remove redundant endif args 2016-04-27 21:48:12 +10:00
Shinya Kitaoka
a1c5b0a22d remove hasOpenGLFramebufferObjects 2016-04-27 18:37:16 +09:00
Shinya Kitaoka
911b7e916a Merge pull request #247 from ideasman42/cleanup-gcc-Wwrite-strings
Cleanup: gcc's -Wwrite-strings warning
2016-04-27 17:24:52 +09:00
tomosu
b3369f897d Merge pull request #256 from skitaoka/fix/issue/253-254
Fix issue 253-254
2016-04-27 17:19:32 +09:00
Shinya Kitaoka
6526c73583 Fix t32bitsrv build conflicts (#211)
add #include <memory>, fix QT_PATH

* add #include <memory>

* fix QT_PATH
2016-04-27 15:04:18 +09:00
Shinya Kitaoka
108c32fcab create a context 2016-04-27 14:25:50 +09:00
Shinya Kitaoka
dc288075e4 Merge pull request #232 from shun-iwasawa/fix_library_and_fxs_folder_locations
Fix "library" and "fxs" folder locations
2016-04-27 13:50:45 +09:00
Shinya Kitaoka
43167d966f Merge pull request #230 from shun-iwasawa/add_save_all_command
"Save All" menu which saves current scene and all the levels. (modified from pr#153)
2016-04-27 13:50:24 +09:00
Campbell Barton
4aa85c3899 Cleanup: -Wwrite-strings warning 2016-04-27 10:55:26 +10:00