Commit graph

106 commits

Author SHA1 Message Date
shun_iwasawa
64e800caf5 Merge branch 'pixels2' of https://github.com/turtletooth/opentoonz into turtletooth-pixels2 2016-08-05 15:28:35 +09:00
shun-iwasawa
27b0cfd38c clang formatting (#703) 2016-08-04 16:23:36 +09:00
turtletooth
04d8fdc45c FFmpeg Integration - mp4, webm, gif (#624)
* Webm and Gif Export

* added intermediate jpg conversion to save hard drive space

* Started preferences ffmpegPath selection

* grouped ffmpeg files together

* Working with intermediate format

* Fixed running multiple CPU cores for export

* audio works

* all working, need refactoring and error checking

* Changed Qt includes

* revisited Qt includes

* Clean up code, refactor file cleanup, clean up includes

* started gif import

* import working

* Removed import again, fixed export settings being remembered

* import working, bypassed precompute, back to single core export

* clang formatting applied

* added beta warnings in Preferences Popup

* fixed frame flipping and made looping gif default

* added toonzlibs

* added format checks

* added check to help t32bitsrv crash

* sliders for settings are back

* added customizable timeout for ffmpeg

* fixed gif fps and scale for no palette
2016-07-29 14:35:10 +09:00
Jeremy Bullock
2322767e25 Fixed preset dropdown, dpi lock, labels, decimals 2016-07-23 23:11:49 -06:00
Campbell Barton
8c6c57f1b4 Enable missing-declarations warning (#643)
Finish ensuring symbols use headers correctly
2016-07-22 13:38:33 +09:00
Shinya Kitaoka
2a7129aa92 use std::unique_ptr<> instead of std::auto_ptr<> (#601) 2016-07-20 21:49:32 +09:00
shun-iwasawa
535d3f26d8 Merge pull request #400 from turtletooth/pixels
Add pixels - Finished.
2016-07-14 12:40:30 +09:00
Michał Janiszewski
d5a8e51d74 Fix TNZ_MACHINE_CHANNEL_ORDER_MRGB check (#602) 2016-07-14 12:04:33 +09:00
Campbell Barton
b3bd842e04 Make functions static, ensure declarations match headers (#610)
This patch used -Wmissing-declarations warning
to show functions and symbols that had no declarations, and either:

- Make static
- Add to header

This helps avoid possability that declarations and functions get out of sync.
And ensures all source files reference headers correctly.

It also makes sure functions defined with extern "C",
have this defined in the header. An error found in calligraph.h while writing this patch.

This has been applied to toonzlib, to avoid making very large global changes.
If accepted, -Wmissing-declarations warning could be added to CMake.
2016-07-13 21:05:06 +09:00
Jeremy Bullock
59dbbf498a Clang formatting applied 2016-07-12 21:09:46 -06:00
turtletooth
f8ebe3b803 Merge pull request #575 from shun-iwasawa/pencil_test_viewer
Pencil test feature
2016-07-08 09:00:24 -06:00
Campbell Barton
a0c6e1562d CMake: Test for endian instead of guessing based on the platform (#600) 2016-07-08 20:22:25 +09:00
Campbell Barton
83caeb2eb5 Fix #593 inverted colors in raster level Linux 2016-07-08 11:46:31 +10:00
Shinya Kitaoka
7abdb2380a Merge pull request #547 from ideasman42/warn-undefined-pr
Quiet -Wundef warning
2016-07-06 20:42:14 +09:00
shun_iwasawa
21a6b6ba06 pencil test popup 2016-07-06 20:06:20 +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
Jeremy Bullock
f44848c78d reverted stage::inch change, should be its own PR 2016-07-03 00:15:54 -06:00
Jeremy Bullock
733ddbef67 hid gui elements if pixels selected 2016-07-02 23:30:00 -06:00
Jeremy Bullock
20a966a908 set stage::inch to 120 2016-06-30 23:46:29 -06:00
Jeremy Bullock
5e3b5e8cc3 Merge branch 'master' into pixels 2016-06-30 20:57:15 -06:00
Michał Janiszewski
dfbb44814b Mark TTileSet destructor as virtual
This class gets inherited, yet the destructor is not marked as virtual.
2016-06-30 17:17:40 +02: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
00c547d5c1 Merge pull request #521 from janisozaur/aligner-type
Rename aligner_type redefinitions
2016-06-29 18:55:30 +09: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
5387bee4bd Rename aligner_type redefinitions 2016-06-27 08:33:20 +02:00
shun-iwasawa
c86c5d6189 Organizing the Tool option bar layout (#443)
* edit tool, selection tool, brush tool

* other tools

* include cmath
2016-06-27 15:22:54 +09:00
tomosu
f0ee5d1373 Merge pull request #506 from skitaoka/fix/use-atomic
Use std::atomic instead of native implementations
2016-06-24 16:25:55 +09:00
Michał Janiszewski
d37dbb57f2 Add missing override specifier 2016-06-23 13:41:27 +02:00
Shinya Kitaoka
0d7879fb9b Merge pull request #495 from shun-iwasawa/revert_planeviewer
(incompletely) Fix crash on using Shader Fx
2016-06-23 17:06:54 +09:00
Shinya Kitaoka
652c93c8f8 fix build for windows 2016-06-23 15:19:53 +09:00
shun_iwasawa
2bdc044b89 revert planeviewer to inherit qglwidget 2016-06-22 20:46:24 +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
Jeremy Bullock
7c096e2b82 starter interface options 2016-06-18 21:47:11 -06:00
Michał Janiszewski
d8b454fc1b Change atomic_t to be of std::atomic<long> type 2016-06-17 12:42:25 +02:00
Michał Janiszewski
163bdb9319 Simplify atomic code to rely on C++11-provided std::atomic 2016-06-17 12:20:41 +02:00
turtletooth
0bae6721d5 Level Create Popup now sets default name and updates paths correctly (#437)
* Starter level name working.  Double check folder paths.

* New Level Dialog now works as expected added focus on save dialog also
2016-06-17 17:58:06 +09:00
Campbell Barton
deffae3359 Linux ifdef and defines (#454) 2016-06-17 17:48:03 +09:00
Shinya Kitaoka
120a6e041c apply clang-format 2016-06-15 15:43:10 +09:00
Shinya Kitaoka
ee259ffaf7 remove duplicated constants (#296) 2016-06-13 21:37:09 +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
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
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
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
Banbury
d26accb4e8 Added checkbox 'Global Key' to edit tool. (#300) (#308)
* Added checkbox 'Global Key' to edit tool. (#300)

The code for the global key option was still in place. The only thing missing
was the checkbox in the tool options.
2016-05-24 20:29:28 +09:00
Keisuke Ogaki
5ff9a72ca5 get layer name encoding from preference 2016-05-24 16:26:30 +09:00
Keisuke Ogaki
0c8292e173 Revert "Use QOpenGLWidget instead of QGLWidget" (#350) 2016-05-23 16:19:32 +09:00
Shinya Kitaoka
dd27936d94 Use QOpenGLWidget instead of QGLWidget (#315)
* use QOpenGLWidget instead of QGLWidget for ImageViewer

* use update() instead of updateGL()

* fix doSwapBuffers

* fix HexagonalColorWheel

* fix Viewer

* support AA_ShareOpenGLContexts & AA_EnableHighDpiScaling

* check Qt version
2016-05-19 19:44:34 +09:00