Skip to content

Commit eff652f

Browse files
committed
Resolve OT master conflicts
2 parents 77dd6e0 + 8b393cd commit eff652f

File tree

742 files changed

+53212
-15699
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

742 files changed

+53212
-15699
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,4 @@ matrix:
1919
- os: linux
2020
compiler: clang
2121
- os: osx
22-
osx_image: xcode8.3
22+
osx_image: xcode10.1

appveyor.yml

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,19 +33,28 @@ build:
3333
verbosity: minimal
3434
after_build:
3535
- cmd: >-
36-
C:\Qt\5.9\msvc2015_64\bin\windeployqt.exe %CONFIGURATION%\OpenToonz.exe
36+
mkdir %CONFIGURATION%\OpenToonz
3737
38-
copy /Y ..\..\thirdparty\glut\3.7.6\lib\glut64.dll %CONFIGURATION%
38+
move %CONFIGURATION%\*.* %CONFIGURATION%\OpenToonz
3939
40-
copy /Y ..\..\thirdparty\glew\glew-1.9.0\bin\64bit\glew32.dll %CONFIGURATION%
40+
C:\Qt\5.9\msvc2015_64\bin\windeployqt.exe %CONFIGURATION%\OpenToonz\OpenToonz.exe
4141
42-
copy /Y ..\..\thirdparty\libmypaint\dist\64\libiconv-2.dll %CONFIGURATION%
42+
copy /Y ..\..\thirdparty\glut\3.7.6\lib\glut64.dll %CONFIGURATION%\OpenToonz
4343
44-
copy /Y ..\..\thirdparty\libmypaint\dist\64\libintl-8.dll %CONFIGURATION%
44+
copy /Y ..\..\thirdparty\glew\glew-1.9.0\bin\64bit\glew32.dll %CONFIGURATION%\OpenToonz
4545
46-
copy /Y ..\..\thirdparty\libmypaint\dist\64\libjson-c-2.dll %CONFIGURATION%
46+
copy /Y ..\..\thirdparty\libmypaint\dist\64\libiconv-2.dll %CONFIGURATION%\OpenToonz
47+
48+
copy /Y ..\..\thirdparty\libmypaint\dist\64\libintl-8.dll %CONFIGURATION%\OpenToonz
49+
50+
copy /Y ..\..\thirdparty\libmypaint\dist\64\libjson-c-2.dll %CONFIGURATION%\OpenToonz
51+
52+
copy /Y ..\..\thirdparty\libmypaint\dist\64\libmypaint-1-4-0.dll %CONFIGURATION%\OpenToonz
53+
54+
mkdir "%CONFIGURATION%\OpenToonz stuff"
55+
56+
xcopy /Y /E ..\..\stuff "%CONFIGURATION%\OpenToonz stuff"
4757
48-
copy /Y ..\..\thirdparty\libmypaint\dist\64\libmypaint-1-4-0.dll %CONFIGURATION%
4958
artifacts:
5059
- path: toonz\$(PLATFORM)\$(CONFIGURATION)
5160
name: OpenToonz

ci-scripts/osx/travis-build.sh

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
#!/bin/bash
22
pushd thirdparty/tiff-4.0.3
3-
./configure && make
3+
./configure --disable-lzma && make
44
popd
55
cd toonz && mkdir build && cd build
6+
QTVERSION=`ls /usr/local/Cellar/qt`
7+
echo "QT Version detected: $QTVERSION"
68
cmake ../sources \
7-
-DQT_PATH=/usr/local/Cellar/qt/5.12.1/lib/ \
9+
-DQT_PATH=/usr/local/Cellar/qt/$QTVERSION/lib/ \
810
-DTIFF_INCLUDE_DIR=../../thirdparty/tiff-4.0.3/libtiff/ \
911
-DSUPERLU_INCLUDE_DIR=../../thirdparty/superlu/SuperLU_4.1/include/
1012
make -j 2

doc/how_to_build_linux.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Building OpenToonz from source requires the following dependencies:
1818
### Installing Dependencies on Debian / Ubuntu
1919

2020
```
21-
$ sudo apt-get install build-essential git cmake pkg-config libboost-all-dev qt5-default qtbase5-dev libqt5svg5-dev qtscript5-dev qttools5-dev qttools5-dev-tools libqt5opengl5-dev qtmultimedia5-dev libsuperlu-dev liblz4-dev libusb-1.0-0-dev liblzo2-dev libpng-dev libjpeg-dev libglew-dev freeglut3-dev libsdl2-dev libfreetype6-dev libjson-c-dev
21+
$ sudo apt-get install build-essential git cmake pkg-config libboost-all-dev qt5-default qtbase5-dev libqt5svg5-dev qtscript5-dev qttools5-dev qttools5-dev-tools libqt5opengl5-dev qtmultimedia5-dev libsuperlu-dev liblz4-dev libusb-1.0-0-dev liblzo2-dev libpng-dev libjpeg-dev libglew-dev freeglut3-dev libsdl2-dev libfreetype6-dev libjson-c-dev qtwayland5
2222
```
2323

2424
For newest versions of OS you may install libmypaint from repository and don't need to build it from source:
@@ -34,7 +34,7 @@ Notes:
3434
(it may include some useless packages)
3535

3636
```
37-
$ sudo dnf install gcc gcc-c++ automake git cmake boost boost-devel SuperLU SuperLU-devel lz4-devel lzma libusb-devel lzo-devel libjpeg-turbo-devel libGLEW glew-devel freeglut-devel freeglut SDL2 SDL2-devel freetype-devel libpng-devel qt5-qtbase-devel qt5-qtsvg qt5-qtsvg-devel qt5-qtscript qt5-qtscript-devel qt5-qttools qt5-qttools-devel qt5-qtmultimedia-devel blas blas-devel json-c-devel
37+
$ sudo dnf install gcc gcc-c++ automake git cmake boost boost-devel SuperLU SuperLU-devel lz4-devel lzma libusb-devel lzo-devel libjpeg-turbo-devel libGLEW glew-devel freeglut-devel freeglut SDL2 SDL2-devel freetype-devel libpng-devel qt5-qtbase-devel qt5-qtsvg qt5-qtsvg-devel qt5-qtscript qt5-qtscript-devel qt5-qttools qt5-qttools-devel qt5-qtmultimedia-devel blas blas-devel json-c-devel libtool intltool make
3838
```
3939

4040
For newest versions of OS you may install libmypaint from repository and don't need to build it from source:
@@ -171,7 +171,8 @@ If you need to debug the application, you should be able to use `cmake -DCMAKE_B
171171
You can now run the application:
172172

173173
```
174-
$ LD_LIBRARY_PATH=./lib/opentoonz:$LD_LIBRARY_PATH ./bin/OpenToonz
174+
$ LD_LIBRARY_PATH=./lib/opentoonz:$LD_LIBRARY_PATH
175+
$ ./bin/OpenToonz
175176
```
176177

177178
### Performing a System Installation

doc/how_to_build_macosx.md

Lines changed: 86 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -6,85 +6,129 @@
66
- git
77
- brew
88
- Xcode
9-
- cmake
10-
- Version 3.2.2 confirmed to work.
11-
- Qt
12-
- http://download.qt.io/official_releases/qt/5.9/5.9.2/
13-
- qt-opensource-mac-x64-5.9.2.dmg
14-
- boost
15-
- http://www.boost.org/users/history/version_1_55_0.html (or later, though only 1.55.0 is supported)
9+
- cmake (3.2.2 or later)
10+
- Qt (5.9.2 or later)
11+
- boost (1.55.0 or later)
1612

1713
## Building on MacOSX
14+
### Download boost from https://boost.org
1815

19-
### 0. Install Qt 5.9 (Most recent is 5.9.2)
16+
Download the .bz2 mac (unix if mac not specified) version 1_55_0 or later (last tested with 1_69_0)
2017

21-
### 1. Install Dependent Packages
18+
Save for later step.
2219

23-
With homebrew, you can install them with following command.
20+
### Download and install Xcode from Apple
2421

22+
When downloading Xcode, you should use the appropriate version for your OS version. You can refer to the Version Comparison Table on https://en.wikipedia.org/wiki/Xcode to find out which version you should use.
23+
24+
Apple store usually provides for the most recent macOS version. For older versions, you will need to go to the Apple Developer site.
25+
26+
After installing the application, you will need to start it in order to complete the installation.
27+
28+
### Install Homebrew from https://brew.sh
29+
30+
Check site for any changes in installation instructions, but they will probably just be this:
31+
32+
1. Open a Terminal window
33+
2. Execute the following statement:
34+
```
35+
$ /usr/bin/ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"
36+
```
37+
38+
### Install required software using brew
39+
40+
In a Terminal window, execute the following statements:
2541
```
26-
$ brew install glew lz4 libjpeg libpng lzo pkg-config libusb cmake git-lfs libmypaint
42+
$ brew install glew lz4 libjpeg libpng lzo pkg-config libusb cmake git-lfs libmypaint qt
43+
$ git lfs install
2744
```
2845

29-
Or, you should build and install them manually.
46+
NOTE: This will install the latest version of QT which may not be compatible with older OS versions.
3047

48+
If you cannot use the most recent version, download the online installer from https://www.qt.io/download and install the appropriate `macOS` version (min 5.9.2). If installing via this method, be sure to install the `Qt Script (Deprecated)` libraries.
3149

32-
### 2. Clone the Repository
50+
### Set up OpenToonz repository
3351

52+
These steps will put the OpenToonz repository under /Users/yourlogin/Documents.
3453
```
54+
$ cd ~/Documents #or where you want to store the repository#
3555
$ git clone https://github.com/opentoonz/opentoonz
36-
cd opentoonz
37-
git lfs pull
56+
$ cd opentoonz
57+
$ git lfs pull
58+
$ cd thirdparty/boost
59+
$ mv ~/Downloads/boost_1_69_0.tar.bz2 . #or whatever the boost filename you downloaded is#
60+
$ tar xvjf boost_1_69_0.tar.bz2
61+
$ cd ../lzo
62+
$ cp -r 2.03/include/lzo driver
63+
$ cd ../tiff-4.0.3
64+
$ ./configure && make
3865
```
3966

40-
### (Optional) Create the stuff Directory
67+
### Configure build for QT version
4168

42-
If the directory `/Applications/OpenToonz/OpenToonz_stuff` does not exist, enter the following command:
69+
Edit the `/Users/yourlogin/Documents/opentoonz/toonz/sources/CMakeLists.txt` file at line 160 (64bit OS) or 172 (32bit OS) and modify the root path for the QT lib directory
4370

71+
If you installed QT using `brew` , you can get the version and path to use with: `$ brew info qt`. The lib path will look something like this: `/usr/local/Cellar/qt/5.12.2/lib`
72+
If you downloaded the QT installer and installed to `/Users/yourlogin/Qt`, your lib path may look something like this: `~/Qt/5.12.2/clang_64/lib` or `~/Qt/5.12.2/clang_32/lib`
73+
74+
### Configure environment and Build OpenToonz
75+
76+
1. Create the build directory with the following:
4477
```
45-
$ sudo cp -r stuff /Applications/OpenToonz/OpenToonz_stuff
78+
$ cd ~/Documents/opentoonz/toonz
79+
$ mkdir build
80+
$ cd build
4681
```
4782

48-
### 3. Build tiff in thirdparty
83+
2. Set up build environment
4984

85+
To build from command line, do the following:
5086
```
51-
$ cd thirdparty/tiff-4.0.3
52-
$ ./configure && make
87+
$ CMAKE_PREFIX_PATH=/usr/local/Cellar/qt/5.12.2 cmake ../sources #replace QT path with your installed QT version#
88+
$ make
5389
```
5490

55-
### 4. Put Boost library into thirdpaty directory
56-
The following assumes `boost_1_55_0.tar.bz2` was downloaded to `~/Downloads`.
57-
91+
To build using Xcode, do the following:
5892
```
59-
$ cd ../boost
60-
$ mv ~/Downloads/boost_1_55_0.tar.bz2 .
61-
$ tar xjvf boost_1_55_0.tar.bz2
93+
$ sudo xcode-select -s /Applications/Xcode.app/Contents/Developer
94+
$ CMAKE_PREFIX_PATH=/usr/local/Cellar/qt/5.12.2 cmake -G Xcode ../sources -B. #replace QT path with your installed QT version#
6295
```
6396

64-
### 5. Update the path to your Qt 5.9 install in opentoonz/toonz/sources/CMakeLists.txt line 160 or 172
65-
If using Qt 5.9.2, this is unnecessary.
97+
- Open Xcode app and open project /Users/yourlogin/Documents/opentoonz/toonz/build/OpenToonz.xcodeproj
98+
- Change `ALL_BUILD` to `OpenToonz`
99+
- Start build with: Product -> Build
66100

67-
### 6. Copy the lzo header folder to the lzo driver directory
101+
- NOTE about rebuilding in Xcode: The initial build should succeed without any errors. There after, the build will succeed but the following 3 errors can be ignored:
68102

69103
```
70-
$ cd ../lzo
71-
$ cp -r 2.03/include/lzo driver
104+
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/install_name_tool: for: /Users/yourlogin/Documents/opentoonz/toonz/build/toonz/Debug/OpenToonz.app/Contents/MacOS/OpenToonz (for architecture x86_64) option "-add_rpath @executable_path/." would duplicate path, file already has LC_RPATH for: @executable_path/.
105+
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/install_name_tool: for: /Users/yourlogin/Documents/opentoonz/toonz/build/toonz/Debug/OpenToonz.app/Contents/MacOS/OpenToonz (for architecture x86_64) option "-add_rpath /usr/local/Cellar/qt/5.12.2/lib/" would duplicate path, file already has LC_RPATH for: /usr/local/Cellar/qt/5.12.2/lib/
106+
Command /bin/sh emitted errors but did not return a nonzero exit code to indicate failure
72107
```
73108

74-
### 6. Build Everything Together
109+
Side note: If you want the option to build by command line and Xcode, create a separate build directory for each.
75110

111+
### Create the stuff Directory
112+
113+
If you have installed OpenToonz on the machine already, you can skip this. Otherwise, you need to create the stuff folder with the following:
76114
```
77-
$ cd ../../toonz
78-
$ mkdir build
79-
$ cd build
80-
CMAKE_PREFIX_PATH=~/Qt5.9.2/5.9.2/clang_64 cmake ../sources
81-
$ make
115+
$ cd ~/Documents/opentoonz
116+
$ sudo mkdir /Applications/OpenToonz
117+
$ sudo cp -r stuff /Applications/OpenToonz/OpenToonz_stuff
118+
$ sudo chmod -R 777 /Applications/OpenToonz
82119
```
83120

84-
Please be patient as the install will take a while.
85-
86-
### After Building
121+
### Running the build
87122

123+
- If built using command line, run the following:
88124
```
89-
$ open ./toonz/OpenToonz.app
125+
$ open ~/Documents/opentoonz/build/toonz/OpenToonz.app
90126
```
127+
128+
- If built using Xcode, do the following:
129+
130+
- Open Scheme editor for OpenToonz: Product -> Scheme -> Edit Scheme
131+
- Uncheck: Run -> Options -> Document Versions
132+
- Run in Debug mode: Product -> Run
133+
134+
- To open with command line or from Finder window, the application is found in `/Users/yourlogin/Documents/opentoonz/toonz/build/Debug/OpenToonz.app`

stuff/config/current.txt

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -240,6 +240,7 @@
240240
<item>"STD_linearGradientFx.wave_phase" "Phase" </item>
241241
<item>"STD_linearGradientFx.color1" "Color 1" </item>
242242
<item>"STD_linearGradientFx.color2" "Color 2" </item>
243+
<item>"STD_linearGradientFx.curveType" "Type" </item>
243244

244245
<item>"STD_linearWaveFx" "Linear Wave" </item>
245246
<item>"STD_linearWaveFx.period" "Period" </item>
@@ -267,6 +268,7 @@
267268
<item>"STD_multiLinearGradientFx.wave_frequency" "Frequency" </item>
268269
<item>"STD_multiLinearGradientFx.wave_phase" "Phase" </item>
269270
<item>"STD_multiLinearGradientFx.colors" "Colors" </item>
271+
<item>"STD_multiLinearGradientFx.curveType" "Type" </item>
270272

271273
<item>"STD_localBlurFx" "Local Blur" </item>
272274
<item>"STD_localBlurFx.value" "Intensity" </item>
@@ -324,6 +326,7 @@
324326
<item>"STD_radialGradientFx.innerperiod" "Inner Size" </item>
325327
<item>"STD_radialGradientFx.color1" "Color 1" </item>
326328
<item>"STD_radialGradientFx.color2" "Color 2" </item>
329+
<item>"STD_radialGradientFx.curveType" "Type" </item>
327330

328331

329332
<item>"STD_randomWaveFx" "Random Wave" </item>
@@ -358,6 +361,7 @@
358361
<item>"STD_multiRadialGradientFx.count" "Quantity" </item>
359362
<item>"STD_multiRadialGradientFx.cycle" "Cycle" </item>
360363
<item>"STD_multiRadialGradientFx.colors" "Colors" </item>
364+
<item>"STD_multiRadialGradientFx.curveType" "Type" </item>
361365

362366
<item>"STD_raylitFx" "Raylit" </item>
363367
<item>"STD_raylitFx.p" "Center X" </item>
@@ -1268,6 +1272,20 @@
12681272
<item>"STD_iwa_TextFx.boxColor" "Box Color"</item>
12691273
<item>"STD_iwa_TextFx.showBorder" "Show Border"</item>
12701274

1275+
<item>"STD_iwa_CorridorGradientFx" "Corridor Gradient Iwa" </item>
1276+
<item>"STD_iwa_CorridorGradientFx.shape" "Shape" </item>
1277+
<item>"STD_iwa_CorridorGradientFx.curveType" "Type" </item>
1278+
<item>"STD_iwa_CorridorGradientFx.bottom_left_in" "Bottom Left In" </item>
1279+
<item>"STD_iwa_CorridorGradientFx.bottom_left_out" "Bottom Left Out" </item>
1280+
<item>"STD_iwa_CorridorGradientFx.bottom_right_in" "Bottom Right In" </item>
1281+
<item>"STD_iwa_CorridorGradientFx.bottom_right_out" "Bottom Right Out" </item>
1282+
<item>"STD_iwa_CorridorGradientFx.top_right_in" "Top Right In" </item>
1283+
<item>"STD_iwa_CorridorGradientFx.top_right_out" "Top Right Out" </item>
1284+
<item>"STD_iwa_CorridorGradientFx.top_left_in" "Top Left In" </item>
1285+
<item>"STD_iwa_CorridorGradientFx.top_left_out" "Top Left Out" </item>
1286+
<item>"STD_iwa_CorridorGradientFx.inner_color" "Inner Color" </item>
1287+
<item>"STD_iwa_CorridorGradientFx.outer_color" "Outer Color" </item>
1288+
12711289
<!------------------------------ Tiled Particles Iwa ------------------------------------------->
12721290

12731291
<item>STD_iwa_TiledParticlesFx "Tiled Particles Iwa" </item>
10.7 KB
Binary file not shown.
5.34 KB
Binary file not shown.
1.24 KB
Binary file not shown.
27.2 KB
Binary file not shown.

0 commit comments

Comments
 (0)