Commit graph

90 commits

Author SHA1 Message Date
shun-iwasawa
5a2ff6d279 Add add_dependencies Command to CMake for OSX (#1587)
* fix cmake for osx

* try using make -j 2 for osx travis

* obtain qt5.9.2 from the previous homebrew
2017-11-24 13:10:45 +09:00
Ivan Mahonin
bf1d82af08 MyPaint brushes for OpenToonz raster levels (#1124)
close #417
2017-08-04 12:31:50 +09:00
Jeremy Bullock
59344b6422 Fix vertical padding on spritesheets (#1259) 2017-07-25 20:41:38 +09:00
shun_iwasawa
0cae242b72 clang format all 2017-07-20 19:46:27 +09:00
shun-iwasawa
2fb6b9308a fix show mov on render (#1254) 2017-06-06 20:38:11 +09:00
Jeremy Bullock
63a3d74aea Fix for ffmpeg render same frames (#1234)
* Fix for ffmpeg/spritesheet render same frames
2017-06-01 19:50:43 +09:00
Jeremy Bullock
55b5dba26f FFmpeg timeout error fix (#1030) 2017-05-31 18:29:20 +09:00
Peter-Levine
ae91dbad8c Don't allow throw() in destructors (#1182) 2017-05-31 17:49:36 +09:00
Ivan Mahonin
429ee8c8e4 Allow to cross compile for Windows with Linux/Mingw (part 3 of 3, cmake) (#1150)
* #mingw #cmake: rules for native and cross compilation

* #mingw #cmake: fix CMakeLists.txt for using with MinGW under Windows

* #mingw #cmake: fix typo (BUILD_ENV_WIN -> BUILD_ENV_MSVC)
2017-05-26 15:00:05 +09:00
Ivan Mahonin
2fc36cb841 Allow to cross compile for Windows with Linux/Mingw (part 2 of 3, bugfixes) (#1149)
* #mingw #bug: place explicit instantiations on templates before first use

* #mingw #bug: remove API attributes from inline functions

* #mingw #bug: add 'static' attribute for local functions

* #mingw #bug: fix API attributes for splitSpeedInOutSegment

* #mingw #bug: replace strstream to stringstream

* #mingw #bug: remove cross references to plasticskeleton from tnzcore

* #mingw #bug: fix bug with order of initializaition of static variables

* #mingw #bug: fix glutInit
2017-05-19 19:20:33 +09:00
Ivan Mahonin
e280ae86d6 Allow to cross compile for Windows with Linux/Mingw (part 1 of 3, preprocessor) (#1148)
* split _WIN32 and _MSC_VER, lowercase includes
2017-05-08 21:13:29 +09:00
shun_iwasawa
597034da8d fix vector fill 2017-03-03 17:38:46 +09:00
Jeremy Bullock
6f319437dd allow no trim on spritesheet (#1022) 2017-03-01 12:27:45 +09:00
Jeremy Bullock
686e82ae08 Fixed gif import (#924)
* fixed gif import
2016-11-24 11:11:57 +09:00
Jeremy Bullock
764038cd1a Spritesheet Export (#752)
Added 'spritesheet' for the output format options, supporting as follows:
- Crops transparent area from images
- Set output format (Grid, Vertical, Horizontal)
- Scale output
- Set padding
- Export text file along with spritesheet with info about image sizes, padding etc. . .
The result is compatible with Game Maker Studio.
2016-11-24 11:08:30 +09:00
Jeremy Bullock
edaab7f46d moved ffmpeg temp files to cache folder (#921)
Now the ffmpeg temporary export files will be saved in the cache folder.
close #918
2016-11-21 19:37:55 +09:00
Jeremy Bullock
3bb5efc4ee Quick Export Feature (#725)
* Added Fast Render to MP4 command which does not need to set anything in output settings.
2016-11-09 11:46:03 +09:00
Jeremy Bullock
3837a14436 fix for ffmpeg export range error (#828)
* This allows the export range to be specified and correctly exported in ffmpeg formats

close #779
2016-10-07 19:02:02 +09:00
Jeremy Bullock
2b9d8f3cc8 Show info for ffmpeg levels (#824)
* Show info of ffmpeg level in level settings
* added frame count to filebrowser

close #811
close #812
2016-10-07 18:59:06 +09:00
Jeremy Bullock
3b0af2f782 Fix for Multiple FFmpeg files with same name #813 (#827)
* Use full path for temp ffmpeg cache names. Which allows importing multiple ffmpeg type files with the same name but different locations.

close #813
2016-10-06 17:22:00 +09:00
Jeremy Bullock
779cdf5542 fix gif reader not getting all frames (#770)
changed frame counting method for GIF format in order to get frame duration properly
2016-09-28 15:52:57 +09:00
boombatower
0dbe175381 Replace else() with elseif(APPLE) to ensure quicktime not built on unix. 2016-09-09 22:28:19 -05:00
MCCCS
a0ce326e1b 🐛 Fix spelling mistakes 2016-09-07 16:28:50 +03: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
Campbell Barton
5cfa877449 Quiet warnings
- duplicate headers in C source & header
- use const char arg
- invalid typedef
2016-07-23 05:23:17 +10:00
Campbell Barton
9ece9c0c92 Cleanup: CMake style
Use parens on newline, avoids diff-noise when adding values.
2016-07-23 04:59:47 +10: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
Campbell Barton
4e9ecfd38b Fix crash reading level (TLZ) file (#637)
- double fclose call
  (readVersion closed the file, however this is already closed when the class is freed)

- buffer overrun reading a char pointer which isn't NULL terminated.
  use memcmp instead.
2016-07-14 20:52:12 +09:00
Campbell Barton
87094dbf7a Correct delete[] use (#629) 2016-07-14 15:56:52 +09:00
Campbell Barton
a9c3dad75a CMake: differentiate system includes (#604) 2016-07-09 00:47:11 +09:00
Campbell Barton
a9208f5aad Correct delete array usage (#599) 2016-07-08 13:43:56 +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
47895a0d7b Merge pull request #578 from opentoonz/warning-cleanup-pr
Quiet warnings
2016-07-06 19:24:49 +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
Shinya Kitaoka
8240663cb9 Merge pull request #554 from janisozaur/libpng
Add support for libpng<1.5
2016-07-06 13:26:51 +09:00
Campbell Barton
e05b0bbe1c Quiet warnings 2016-07-05 14:54:52 +10: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
Michał Janiszewski
01e73f88e4 Add support for libpng<1.5 2016-06-30 15:21:57 +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
b130eca2da Workaround using C's abs on Linux
math.h is indirectly included, making abs return double on Linux.
2016-06-30 10:41:38 +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
Campbell Barton
89a491484a Misc minor changes needed for building on Linux 2016-06-24 22:01:09 +10: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
Campbell Barton
deffae3359 Linux ifdef and defines (#454) 2016-06-17 17:48:03 +09: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