Remove libusb from scripts and fix some name references.
This commit is contained in:
Jeremy Bullock
parent
dfed2a033d
commit
62c6b25b84
2
.github/ISSUE_TEMPLATE/config.yml
vendored
2
.github/ISSUE_TEMPLATE/config.yml
vendored
|
|
@ -2,7 +2,7 @@ blank_issues_enabled: true
|
|||
contact_links:
|
||||
- name: Manual
|
||||
url: https://tahoma2d.readthedocs.io/
|
||||
about: The official, extensive manual for OpenToonz
|
||||
about: The official, extensive manual for Tahoma2D
|
||||
- name: User forum
|
||||
url: https://groups.google.com/g/tahoma2d
|
||||
about: You can ask and answer general questions here, and connect with other users
|
||||
|
|
|
|||
1
.gitignore
vendored
1
.gitignore
vendored
|
|
@ -17,7 +17,6 @@ Thumbs.db
|
|||
/thirdparty/tiff-4.0.3
|
||||
/thirdparty/LibJPEG/jpeg-9
|
||||
/thirdparty/Lz4/Lz4_131
|
||||
/thirdparty/libusb/libusb-1.0.9
|
||||
/thirdparty/glew/glew-1.9.0
|
||||
lzo-2.09
|
||||
|
||||
|
|
|
|||
|
|
@ -49,7 +49,7 @@ If you cannot implement the feature, please make a request here.
|
|||
|
||||
## Translations
|
||||
|
||||
Translation source (`.ts`) files for OpenToonz GUI are located in `toonz/sources/translations`.
|
||||
Translation source (`.ts`) files for Tahoma2D GUI are located in `toonz/sources/translations`.
|
||||
If you create new `.ts` files for your language or update an existing one,
|
||||
please send us those modifications as pull-requests.
|
||||
[Qt Linguist](http://doc.qt.io/qt-5.6/linguist-translators.html) is useful for translating them.
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@ Can't develop but still want to help? Help us test individual Pull Requests befo
|
|||
|
||||
## Community
|
||||
|
||||
- To share tips or to troubleshoot, join the [Google OpenToonz Users forum](hhttps://groups.google.com/g/tahoma2d)
|
||||
- To share tips or to troubleshoot, join the [Google Tahoma2D Users forum](hhttps://groups.google.com/g/tahoma2d)
|
||||
- If you found a bug with the software after troubleshooting, or are a developer, search the [Github issues](https://github.com/turtletooth/tahoma2d/issues) and post there.
|
||||
|
||||
## Licensing
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
sudo add-apt-repository --yes ppa:beineri/opt-qt597-xenial
|
||||
sudo add-apt-repository --yes ppa:achadwick/mypaint-testing
|
||||
sudo apt-get update
|
||||
sudo apt-get install -y cmake liblzo2-dev liblz4-dev libfreetype6-dev libpng-dev libegl1-mesa-dev libgles2-mesa-dev libglew-dev freeglut3-dev qt59script libsuperlu-dev qt59svg qt59tools qt59multimedia wget libusb-1.0-0-dev libboost-all-dev liblzma-dev libjson-c-dev libmypaint-dev libjpeg-turbo8-dev libglib2.0-dev qt59serialport
|
||||
sudo apt-get install -y cmake liblzo2-dev liblz4-dev libfreetype6-dev libpng-dev libegl1-mesa-dev libgles2-mesa-dev libglew-dev freeglut3-dev qt59script libsuperlu-dev qt59svg qt59tools qt59multimedia wget libboost-all-dev liblzma-dev libjson-c-dev libmypaint-dev libjpeg-turbo8-dev libglib2.0-dev qt59serialport
|
||||
sudo apt-get install -y nasm yasm libgnutls-dev libass-dev libbluray-dev libmp3lame-dev libopus-dev libsnappy-dev libtheora-dev libvorbis-dev libvpx-dev libwebp-dev libxml2-dev libfontconfig1-dev libfreetype6-dev libopencore-amrnb-dev libopencore-amrwb-dev libopenjpeg-dev libspeex-dev libsoxr-dev libopenjp2-7-dev
|
||||
sudo apt-get install -y python3-pip
|
||||
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ sudo add-apt-repository --yes ppa:beineri/opt-qt597-xenial
|
|||
sudo add-apt-repository --yes ppa:achadwick/mypaint-testing
|
||||
sudo add-apt-repository --yes ppa:litenstein/opencv3-xenial
|
||||
sudo apt-get update
|
||||
sudo apt-get install -y cmake liblzo2-dev liblz4-dev libfreetype6-dev libpng-dev libegl1-mesa-dev libgles2-mesa-dev libglew-dev freeglut3-dev qt59script libsuperlu-dev qt59svg qt59tools qt59multimedia wget libusb-1.0-0-dev libboost-all-dev liblzma-dev libjson-c-dev libmypaint-dev libjpeg-turbo8-dev libopencv-dev libglib2.0-dev qt59serialport
|
||||
sudo apt-get install -y cmake liblzo2-dev liblz4-dev libfreetype6-dev libpng-dev libegl1-mesa-dev libgles2-mesa-dev libglew-dev freeglut3-dev qt59script libsuperlu-dev qt59svg qt59tools qt59multimedia wget libboost-all-dev liblzma-dev libjson-c-dev libmypaint-dev libjpeg-turbo8-dev libopencv-dev libglib2.0-dev qt59serialport
|
||||
|
||||
# someone forgot to include liblz4.pc with the package, use the version from xenial, as it only depends on libc
|
||||
wget http://mirrors.kernel.org/ubuntu/pool/main/l/lz4/liblz4-1_0.0~r131-2ubuntu2_amd64.deb -O liblz4.deb
|
||||
|
|
|
|||
|
|
@ -1,37 +0,0 @@
|
|||
# OpenToonz
|
||||
|
||||
[English](../README.md)
|
||||
|
||||
[](https://ci.appveyor.com/project/opentoonz/opentoonz)
|
||||
[](https://travis-ci.org/opentoonz/opentoonz)
|
||||
|
||||
## これは何？
|
||||
|
||||
2D アニメーション制作ソフトウェアです。
|
||||
イタリアの Digital Video 社が開発し、株式会社スタジオジブリのカスタマイズを経て、ジブリ作品の制作に長年使われてきたソフトウェア `Toonz` が基になっています。
|
||||
|
||||
## 動作条件
|
||||
|
||||
<https://opentoonz.github.io/> を参照してください。
|
||||
|
||||
## インストール
|
||||
|
||||
<https://opentoonz.github.io/> から最新安定版のインストーラーをダウンロードしてインストールしてください。
|
||||
|
||||
過去のバージョンと不安定な最新版も <https://github.com/opentoonz/opentoonz/releases> から利用することができます。
|
||||
|
||||
## ビルド方法
|
||||
|
||||
- [Windows](./how_to_build_win_ja.md)
|
||||
- [OS X](./how_to_build_macosx_ja.md)
|
||||
|
||||
### ライセンス
|
||||
|
||||
- thirdparty ディレクトリ以外のファイル
|
||||
- [修正 BSD ライセンス](../LICENSE.txt)
|
||||
- ライセンスに基づき、商用・非商用問わず、自由にソフトウェアの利用やソースコードの改変ができます
|
||||
- thirdparty ディレクトリ内のファイル
|
||||
- 各ディレクトリ内の README やソースコードに記載されたライセンスに従ってください
|
||||
|
||||
### Special Thanks
|
||||
This Open Source Program is developed from Toonz, a software originally created by Digital Video, S.p.A., Rome Italy
|
||||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
## Required software
|
||||
|
||||
Building OpenToonz from source requires the following dependencies:
|
||||
Building Tahoma2D from source requires the following dependencies:
|
||||
- Git
|
||||
- GCC or Clang
|
||||
- CMake (3.4.1 or newer).
|
||||
|
|
@ -19,7 +19,7 @@ Building OpenToonz from source requires the following dependencies:
|
|||
### Installing Dependencies on Debian / Ubuntu 16.04 (Xenial)
|
||||
|
||||
```
|
||||
$ sudo apt-get install build-essential git cmake freeglut3-dev libboost-all-dev libegl1-mesa-dev libfreetype6-dev libgles2-mesa-dev libglew-dev libglib2.0-dev libjpeg-dev libjpeg-turbo8-dev libjson-c-dev liblz4-dev liblzma-dev liblzo2-dev libpng-dev libsuperlu-dev libusb-1.0-0-dev pkg-config qt5-default qtbase5-dev libqt5svg5-dev qtscript5-dev qttools5-dev qttools5-dev-tools libqt5opengl5-dev qtmultimedia5-dev qtwayland5 libqt5multimedia5-plugins
|
||||
$ sudo apt-get install build-essential git cmake freeglut3-dev libboost-all-dev libegl1-mesa-dev libfreetype6-dev libgles2-mesa-dev libglew-dev libglib2.0-dev libjpeg-dev libjpeg-turbo8-dev libjson-c-dev liblz4-dev liblzma-dev liblzo2-dev libpng-dev libsuperlu-dev pkg-config qt5-default qtbase5-dev libqt5svg5-dev qtscript5-dev qttools5-dev qttools5-dev-tools libqt5opengl5-dev qtmultimedia5-dev qtwayland5 libqt5multimedia5-plugins
|
||||
```
|
||||
|
||||
Find a PPA respository for Qt 5.9 or later and install the following:
|
||||
|
|
@ -45,7 +45,7 @@ Notes:
|
|||
(it may include some useless packages)
|
||||
|
||||
```
|
||||
$ 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 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 qt5-qtmultimedia
|
||||
$ sudo dnf install gcc gcc-c++ automake git cmake boost boost-devel SuperLU SuperLU-devel lz4-devel lzma lzo-devel libjpeg-turbo-devel libGLEW glew-devel freeglut-devel freeglut 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 qt5-qtmultimedia
|
||||
```
|
||||
|
||||
For newest versions of OS you may install libmypaint from repository and don't need to build it from source:
|
||||
|
|
@ -58,7 +58,7 @@ $ sudo dnf install libmypaint-devel
|
|||
### Installing Dependencies on ArchLinux
|
||||
|
||||
```
|
||||
$ sudo pacman -S base-devel git cmake boost boost-libs qt5-base qt5-svg qt5-script qt5-tools qt5-multimedia lz4 libusb lzo libjpeg-turbo glew freeglut freetype2
|
||||
$ sudo pacman -S base-devel git cmake boost boost-libs qt5-base qt5-svg qt5-script qt5-tools qt5-multimedia lz4 lzo libjpeg-turbo glew freeglut freetype2
|
||||
$ sudo pacman -S blas cblas
|
||||
```
|
||||
From AUR, using eg. yaourt:
|
||||
|
|
@ -72,7 +72,7 @@ Notes:
|
|||
### Installing Dependencies on openSUSE
|
||||
|
||||
```
|
||||
$ zypper in boost-devel cmake freeglut-devel freetype2-devel gcc-c++ glew-devel libQt5OpenGL-devel libjpeg-devel liblz4-devel libpng16-compat-devel libqt5-linguist-devel libqt5-qtbase-devel libqt5-qtmultimedia-devel libqt5-qtscript-devel libqt5-qtsvg-devel libtiff-devel libusb-devel lzo-devel openblas-devel pkgconfig sed superlu-devel zlib-devel json-c-devel libqt5-qtmultimedia
|
||||
$ zypper in boost-devel cmake freeglut-devel freetype2-devel gcc-c++ glew-devel libQt5OpenGL-devel libjpeg-devel liblz4-devel libpng16-compat-devel libqt5-linguist-devel libqt5-qtbase-devel libqt5-qtmultimedia-devel libqt5-qtscript-devel libqt5-qtsvg-devel libtiff-devel lzo-devel openblas-devel pkgconfig sed superlu-devel zlib-devel json-c-devel libqt5-qtmultimedia
|
||||
```
|
||||
|
||||
For newest versions of OS you may install libmypaint from repository and don't need to build it from source:
|
||||
|
|
@ -101,7 +101,7 @@ $ cd ..
|
|||
### Cloning the GIT Tree
|
||||
|
||||
```
|
||||
$ git clone https://github.com/opentoonz/opentoonz
|
||||
$ git clone https://github.com/turtletooth/tahoma2d
|
||||
```
|
||||
|
||||
### Copying the 'stuff' Directory
|
||||
|
|
@ -110,16 +110,16 @@ TODO: some parts should really be installed in $prefix/ instead... and some othe
|
|||
cf. https://specifications.freedesktop.org/basedir-spec/basedir-spec-latest.html
|
||||
Until then we just follow the Win32/OSX layout.
|
||||
|
||||
The `~/.config/OpenToonz/` directory contains your settings, work and other files.
|
||||
The `~/.config/tahoma2d/` directory contains your settings, work and other files.
|
||||
|
||||
Initialize this path with the folling commands:
|
||||
|
||||
```
|
||||
$ mkdir -p $HOME/.config/OpenToonz
|
||||
$ cp -r opentoonz/stuff $HOME/.config/OpenToonz/
|
||||
$ mkdir -p $HOME/.config/Tahoma2D
|
||||
$ cp -r tahoma2d/stuff $HOME/.config/tahoma2d/
|
||||
```
|
||||
|
||||
*Currently this is required to run OpenToonz.*
|
||||
*Currently this is required to run Tahoma2D.*
|
||||
|
||||
### Creating SystemVar.ini
|
||||
|
||||
|
|
@ -128,7 +128,7 @@ TODO: fix the code to discover it automatically
|
|||
```
|
||||
$ cat << EOF > $HOME/.config/OpenToonz/SystemVar.ini
|
||||
[General]
|
||||
OPENTOONZROOT="$HOME/.config/OpenToonz/stuff"
|
||||
TAHOMA2DROOT="$HOME/.config/OpenToonz/stuff"
|
||||
OpenToonzPROFILES="$HOME/.config/OpenToonz/stuff/profiles"
|
||||
TOONZCACHEROOT="$HOME/.config/OpenToonz/stuff/cache"
|
||||
TOONZCONFIG="$HOME/.config/OpenToonz/stuff/config"
|
||||
|
|
@ -148,13 +148,13 @@ TODO: make sure we can use the system libtiff instead and remove this section.
|
|||
Features from the modified libtiff are needed currently, so this isn't a simple switch.
|
||||
|
||||
```
|
||||
$ cd opentoonz/thirdparty/tiff-4.0.3
|
||||
$ cd tahoma2d/thirdparty/tiff-4.0.3
|
||||
$ ./configure --with-pic --disable-jbig
|
||||
$ make -j$(nproc)
|
||||
$ cd ../../
|
||||
```
|
||||
|
||||
### Building OpenToonz
|
||||
### Building Tahoma2D
|
||||
|
||||
```
|
||||
$ cd toonz
|
||||
|
|
@ -184,7 +184,7 @@ $ LANG=C make VERBOSE=1
|
|||
If you need to debug the application, you should be able to use `cmake -DCMAKE_BUILD_TYPE=Debug`.
|
||||
|
||||
|
||||
### Running OpenToonz
|
||||
### Running Tahoma2D
|
||||
|
||||
You can now run the application:
|
||||
|
||||
|
|
@ -195,16 +195,16 @@ $ ./bin/OpenToonz
|
|||
|
||||
### Performing a System Installation
|
||||
|
||||
The steps above show how to run OpenToonz from the build directory,
|
||||
however you may wish to install OpenToonz onto your system.
|
||||
The steps above show how to run Tahoma2Dfrom the build directory,
|
||||
however you may wish to install Tahoma2Donto your system.
|
||||
|
||||
OpenToonz will install to `/opt/opentoonz` by default, to do this run:
|
||||
Tahoma2D will install to `/opt/opentoonz` by default, to do this run:
|
||||
|
||||
```
|
||||
$ sudo make install
|
||||
```
|
||||
|
||||
Then you can launch OpenToonz by running `/opt/opentoonz/bin/opentoonz`.
|
||||
Then you can launch Tahoma2Dby running `/opt/opentoonz/bin/opentoonz`.
|
||||
|
||||
You can change the installation path by modifying the `CMAKE_INSTALL_PREFIX` CMake variable.
|
||||
|
||||
|
|
|
|||
|
|
@ -42,7 +42,7 @@ $ /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/
|
|||
|
||||
In a Terminal window, execute the following statements:
|
||||
```
|
||||
$ brew install glew lz4 libjpeg libpng lzo pkg-config libusb cmake git-lfs libmypaint qt opencv jpeg-turbo
|
||||
$ brew install glew lz4 libjpeg libpng lzo pkg-config cmake git-lfs libmypaint qt opencv jpeg-turbo
|
||||
$ git lfs install
|
||||
```
|
||||
|
||||
|
|
|
|||
|
|
@ -1,71 +0,0 @@
|
|||
# MacOSX での開発環境構築
|
||||
|
||||
## 必要なソフトウェア
|
||||
|
||||
- git
|
||||
- brew
|
||||
- Xcode
|
||||
- cmake
|
||||
- バージョン 3.2.2 で動作確認済みです。
|
||||
- Qt
|
||||
- http://download.qt.io/official_releases/qt/5.9/5.9.2/
|
||||
- qt-opensource-mac-x64-5.9.2.dmg
|
||||
- boost
|
||||
- http://www.boost.org/users/history/version_1_55_0.html
|
||||
|
||||
## ビルド手順
|
||||
|
||||
### brew で必要なパッケージをインストール
|
||||
|
||||
```
|
||||
$ brew install glew lz4 libjpeg libpng lzo pkg-config
|
||||
```
|
||||
|
||||
### リポジトリを clone
|
||||
|
||||
```
|
||||
$ git clone https://github.com/opentoonz/opentoonz
|
||||
```
|
||||
|
||||
### stuff ディレクトリの設置 (任意)
|
||||
|
||||
`/Applications/OpenToonz/OpenToonz_stuff` というディレクトリが存在していない場合は以下のコマンド等でリポジトリのひな形を設置する必要があります。
|
||||
|
||||
```
|
||||
$ sudo cp -r opentoonz/stuff /Applications/OpenToonz/OpenToonz_stuff
|
||||
```
|
||||
|
||||
### thirdparty 下の tiff をビルド
|
||||
|
||||
```
|
||||
$ cd opentoonz/thirdparty/tiff-4.0.3
|
||||
$ ./configure && make
|
||||
```
|
||||
|
||||
### thirdpaty 下に boost を設置
|
||||
|
||||
以下のコマンドは `~/Downsloads` に `boost_1_55_0.tar.bz2` がダウンロードされていることを想定しています。
|
||||
|
||||
```
|
||||
$ cd ../boost
|
||||
$ mv ~/Downloads/boost_1_55_0.tar.bz2 .
|
||||
$ tar xjvf boost_1_55_0.tar.bz2
|
||||
```
|
||||
|
||||
### 本体のビルド
|
||||
|
||||
```
|
||||
$ cd ../../toonz
|
||||
$ mkdir build
|
||||
$ cd build
|
||||
$ cmake ../sources
|
||||
$ make
|
||||
```
|
||||
|
||||
ビルドが長いので気長に待ちます。
|
||||
|
||||
### 完成
|
||||
|
||||
```
|
||||
$ open ./toonz/OpenToonz.app
|
||||
```
|
||||
|
|
@ -23,14 +23,14 @@ This software can be built using Visual Studio 2015 or above and Qt 5.9 (later Q
|
|||
### boost
|
||||
- Boost 1.55.0 or later is required (tested up to 1.61.0).
|
||||
- http://www.boost.org/users/history/version_1_61_0.html
|
||||
- Download boost_1_73_0.zip from the above link. Extract all contents to the - '$opentoonz/thirdparty/boost' directory.
|
||||
- Download boost_1_73_0.zip from the above link. Extract all contents to the - '$tahoma2d/thirdparty/boost' directory.
|
||||
- Install the following patch (Make the changes listed in the patch file), if you use Boost 1.55.0 with Visual Studio 2013.
|
||||
- https://svn.boost.org/trac/boost/attachment/ticket/9369/vc12_fix_has_member_function_callable_with.patch
|
||||
|
||||
## Acquiring the Source Code
|
||||
- Note: You can also perform these next commands with Github for Desktop client.
|
||||
- Clone the base repository.
|
||||
- Throughout the explanation `$opentoonz` will represent the root for the base repository.
|
||||
- Throughout the explanation `$tahoma2d` will represent the root for the base repository.
|
||||
|
||||
### lib and dll
|
||||
|
||||
|
|
@ -43,8 +43,8 @@ This software can be built using Visual Studio 2015 or above and Qt 5.9 (later Q
|
|||
|
||||
### Using CMake to Create a Visual Studio Project
|
||||
- Launch CMake
|
||||
- In `Where is the source code`, navigate to `$opentoonz/toonz/sources`
|
||||
- In `Where to build the binaries`, navigate to `$opentoonz/toonz/build`
|
||||
- In `Where is the source code`, navigate to `$tahoma2d/toonz/sources`
|
||||
- In `Where to build the binaries`, navigate to `$tahoma2d/toonz/build`
|
||||
- Or to wherever you usually build to.
|
||||
- If the build directory is in the git repository, be sure to add the directory to .gitignore
|
||||
- If the build directory is different from the one above, be sure to change to the specified directory where appropriate below.
|
||||
|
|
@ -56,16 +56,16 @@ This software can be built using Visual Studio 2015 or above and Qt 5.9 (later Q
|
|||
|
||||
## Setting Up Libraries
|
||||
Rename the following files:
|
||||
- `$opentoonz/thirdparty/LibJPEG/jpeg-9/jconfig.vc` to `$opentoonz/thirdparty/LibJPEG/jpeg-9/jconfig.h`
|
||||
- `$opentoonz/thirdparty/tiff-4.0.3/libtiff/tif_config.vc.h` to `$opentoonz/thirdparty/tiff-4.0.3/libtiff/tif_config.h`
|
||||
- `$opentoonz/thirdparty/tiff-4.0.3/libtiff/tiffconf.vc.h to $opentoonz/thirdparty/tiff-4.0.3/libtiff/tiffconf.h`
|
||||
- `$opentoonz/thirdparty/libpng-1.6.21/scripts/pnglibconf.h.prebuilt to $opentoonz/thirdparty/libpng-1.6.21/pnglibconf.h`
|
||||
- `$tahoma2d/thirdparty/LibJPEG/jpeg-9/jconfig.vc` to `$tahoma2d/thirdparty/LibJPEG/jpeg-9/jconfig.h`
|
||||
- `$tahoma2d/thirdparty/tiff-4.0.3/libtiff/tif_config.vc.h` to `$tahoma2d/thirdparty/tiff-4.0.3/libtiff/tif_config.h`
|
||||
- `$tahoma2d/thirdparty/tiff-4.0.3/libtiff/tiffconf.vc.h to $tahoma2d/thirdparty/tiff-4.0.3/libtiff/tiffconf.h`
|
||||
- `$tahoma2d/thirdparty/libpng-1.6.21/scripts/pnglibconf.h.prebuilt to $tahoma2d/thirdparty/libpng-1.6.21/pnglibconf.h`
|
||||
- Note that the destination is a different folder for the last file.
|
||||
|
||||
## Building
|
||||
- Open `$opentoonz/toonz/build/OpenToonz.sln` and change to `Debug` or `Release` in the top bar.
|
||||
- Open `$tahoma2d/toonz/build/Tahoma2D.sln` and change to `Debug` or `Release` in the top bar.
|
||||
- Compile the build.
|
||||
- The output will be in the corresponding folder in `$opentoonz/toonz/build/`
|
||||
- The output will be in the corresponding folder in `$tahoma2d/toonz/build/`
|
||||
|
||||
## Building with extended stop motion support for webcams and Canon DSLR cameras.
|
||||
You will need three additional libraries.
|
||||
|
|
@ -73,10 +73,10 @@ Rename the following files:
|
|||
- [libjpeg-turbo](https://www.libjpeg-turbo.org/)
|
||||
- The Canon SDK. This requires applying for the Canon developer program and downloading the SDK.
|
||||
|
||||
Copy the following folders into the `$opentoonz/thirdparty` folder.
|
||||
- Copy the Header and library folders from the Canon SDK to `$opentoonz/thirdparty/canon`
|
||||
Copy the following folders into the `$tahoma2d/thirdparty` folder.
|
||||
- Copy the Header and library folders from the Canon SDK to `$tahoma2d/thirdparty/canon`
|
||||
- Make sure that the library is the one from the EDSDK_64 folder.
|
||||
- Copy the lib and include folders from libjpeg-turbo64 into `$opentoonz/thirdparty/libjpeg-turbo64`.
|
||||
- Copy the lib and include folders from libjpeg-turbo64 into `$tahoma2d/thirdparty/libjpeg-turbo64`.
|
||||
|
||||
Check the checkbox in CMake to build with stop motion support.
|
||||
On configuring with CMake or in the environmental variables, specify `OpenCV_DIR` to the `build` folder in the install folder of OpenCV (like `C:/opencv/build`).
|
||||
|
|
@ -85,10 +85,10 @@ To run the program with stop motion support, you will need to copy the .dll file
|
|||
|
||||
## Running the Program
|
||||
### Setting Up the Program's Path
|
||||
1. Copy the entire contents of $opentoonz/toonz/build/Release to an appropriate folder.
|
||||
1. Copy the entire contents of $tahoma2d/toonz/build/Release to an appropriate folder.
|
||||
|
||||
2. Open a Command Prompt and navigate to `QT_DIR/msvc2015_64/bin`. Run the Qt program `windeployqt.exe` with the path for `OpenToonz.exe` as an argument. (Another way to do this is navigate to the exe that was created in your Release folder and drag and drop the Opentoonz.exe on top of the windeployqt.exe This will automatically generate the QT files and folders you will need.)
|
||||
- The necessary Qt library files should be in the same folder as `OpenToonz.exe`
|
||||
2. Open a Command Prompt and navigate to `QT_DIR/msvc2015_64/bin`. Run the Qt program `windeployqt.exe` with the path for `Tahoma2D.exe` as an argument. (Another way to do this is navigate to the exe that was created in your Release folder and drag and drop the Tahoma2D.exe on top of the windeployqt.exe This will automatically generate the QT files and folders you will need.)
|
||||
- The necessary Qt library files should be in the same folder as `Tahoma2D.exe`
|
||||
- These include:
|
||||
- `Qt5Core.dll`
|
||||
- `Qt5Gui.dll`
|
||||
|
|
@ -99,7 +99,7 @@ To run the program with stop motion support, you will need to copy the .dll file
|
|||
- `Qt5Svg.dll`
|
||||
- `Qt5Widgets.dll`
|
||||
- `Qt5Multimedia.dll`
|
||||
- These files should be in the corresponding folders in the same folder `OpenToonz.exe`
|
||||
- These files should be in the corresponding folders in the same folder `Tahoma2D.exe`
|
||||
- `/bearer/qgenericbearer.dll`
|
||||
- `/bearer/qnativewifibearer.dll`
|
||||
- `/iconengines/qsvgicon.dll`
|
||||
|
|
@ -115,52 +115,21 @@ To run the program with stop motion support, you will need to copy the .dll file
|
|||
- `/imageformats/qwebp.dll`
|
||||
- `/platforms/qwindows.dll`
|
||||
|
||||
3. Copy the following files to the same folder as `OpenToonz.exe`
|
||||
- `$opentoonz/thirdparty/glut/3.7.6/lib/glut64.dll`
|
||||
- `$opentoonz/thirdparty/glew/glew-1.9.0/bin/64bit/glew32.dll`
|
||||
|
||||
4. Copy the `srv` folder from the previous OpenToonz installation to the same folder as `OpenToonz.exe`
|
||||
- If there is no `srv` folder, OpenToonz can still be used. However, various file formats such as `mov` cannot be used.
|
||||
- Creating the files for `srv` is discussed later.
|
||||
3. Copy the following files to the same folder as `Tahoma2D.exe`
|
||||
- `$tahoma2d/thirdparty/freeglut/bin/x64/freeglut.dll`
|
||||
- `$tahoma2d/thirdparty/glew/glew-1.9.0/bin/64bit/glew32.dll`
|
||||
|
||||
### Creating the stuff Folder
|
||||
If a previous binary of OpenToonz was already installed, this step and the following about creating a registry key has already been dealt with. So feel free to skip these parts.
|
||||
If a previous binary of Tahoma2D was already installed, this step and the following about creating a registry key has already been dealt with. So feel free to skip these parts.
|
||||
|
||||
1. Copy the files from `$opentoonz/stuff` to an appropriate folder.
|
||||
|
||||
### Creating Registry Keys
|
||||
1. Using the registry editor, create the following key and copy the path of the `$opentoonz/stuff` folder from above to it.
|
||||
- HKEY_LOCAL_MACHINE\SOFTWARE\OpenToonz\OpenToonz\TOONZROOT
|
||||
1. Copy the files from `$tahoma2d/stuff` to an appropriate folder.
|
||||
|
||||
### Running
|
||||
`OpenToonz.exe` can now be run. Congratulations!
|
||||
`Tahoma2D.exe` can now be run. Congratulations!
|
||||
|
||||
## Debugging
|
||||
1. In the Solution Explorer, select the OpenToonz project within the OpenToonz solution.
|
||||
1. In the Solution Explorer, select the Tahoma2D project within the Tahoma2D solution.
|
||||
2. In the Project menu, choose Set as StartUp Project.
|
||||
|
||||
### Qt
|
||||
- https://www.qt.io/download-open-source/
|
||||
- Install Qt 5.9 (32-bit version) by the by [Qt Online Installer for Windows](http://download.qt.io/official_releases/online_installers/qt-unified-windows-x86-online.exe).
|
||||
|
||||
### Using CMake to Create a Visual Studio 32-bit Project
|
||||
- Follow the same instructions as for the 64-bit version, but change the following:
|
||||
- `$opentoonz/toonz/build` to `$opentoonz/toonz/build32`
|
||||
- `Visual Studio 14 2015 Win64` to `Visual Studio 14 2015`
|
||||
- Change `QT_PATH` to the path of your 32-bit version of Qt
|
||||
|
||||
### Building the 32-bit Version
|
||||
1. Open `$opentoonz/toonz/build32/OpenToonz.sln`
|
||||
|
||||
### Layout of the `srv` Folder
|
||||
- For the 64-bit version, copy the following files to the `srv` folder:
|
||||
- From `$opentoonz/toonz/build32/Release`
|
||||
- image.dll
|
||||
- tnzcore.dll
|
||||
- From the 32-bit version of Qt
|
||||
- Qt5Core.dll
|
||||
- Qt5Network.dll
|
||||
- `$opentoonz/thirdparty/glut/3.7.6/lib/glut32.dll`
|
||||
|
||||
## Creating Translation Files
|
||||
Qt translation files are generated first from the source code to .ts files, then from .ts files to a .qm file. These files can be created in Visual Studio if the `translation_` project and `Build translation_??? only` (`translation_???`のみをビルド」) is used. These files are not created in the default `Build Project Solution`.
|
||||
|
|
|
|||
|
|
@ -1,123 +0,0 @@
|
|||
# ビルド手順（Windows）
|
||||
|
||||
Visual Studio 2015 と Qt 5.9 でビルドできることを確認しています。
|
||||
|
||||
## 必要なソフトウェアの導入
|
||||
|
||||
### Visual Studio Express 2015 for Windows Desktop
|
||||
- https://www.visualstudio.com/ja-jp/products/visual-studio-express-vs.aspx
|
||||
- Express 版はターゲットプラットフォームごとにバージョンが分かれています。 `for Windows` ではなく `for Windows Desktop` を使用します
|
||||
- Community 版や Professional 版などでも構いません
|
||||
|
||||
### CMake
|
||||
- https://cmake.org/download/
|
||||
- Visual Studio 用のプロジェクトファイルの生成に使用します
|
||||
|
||||
## ソースコードの取得
|
||||
- 本リポジトリを `git clone` します
|
||||
- 以下の説明中の `$opentoonz` は、本リポジトリの root を表します
|
||||
- Visual Studio は BOM の無い UTF-8 のソースコードを正しく認識できず、改行コードが LF で、1行コメントの末尾が日本語の場合に、改行が無視されて次の行もコメントとして扱われる問題があるため、Git に下記の設定をして改行コードを CRLF に変換すると良いでしょう
|
||||
- `git config core.safecrlf true`
|
||||
|
||||
## 必要なライブラリのインストール
|
||||
サイズの大きいライブラリはこのリポジトリには含めていないので、別途インストールする必要があります。
|
||||
|
||||
### `lib` と `dll`
|
||||
- `lib` と `dll` ファイルは [Git Large File Storage](https://git-lfs.github.com/) で管理しています。
|
||||
- `lfs` のクライアントを導入して、上記 `git clone` のあとに `git lfs pull` を実行してください。
|
||||
|
||||
### Qt
|
||||
- https://www.qt.io/download-open-source/
|
||||
- クロスプラットフォームの GUI フレームワークです
|
||||
- 上記の URL から以下のファイルをダウンロードして Qt 5.9 (64 ビット版) を適当なフォルダにインストールします
|
||||
- [Qt Online Installer for Windows](http://download.qt.io/official_releases/online_installers/qt-unified-windows-x86-online.exe)
|
||||
|
||||
### boost
|
||||
- http://www.boost.org/users/history/version_1_61_0.html
|
||||
- 上記の URL から boost_1_61_0.zip をダウンロードして解凍し、 boost_1_61_0 を `$opentoonz/thirdparty/boost` にコピーします
|
||||
|
||||
## ビルド
|
||||
|
||||
### CMake で Visual Studio のプロジェクトを生成する
|
||||
1. CMake を立ち上げる
|
||||
2. Where is the source code に `$opentoonz/toonz/sources` を指定する
|
||||
3. Where to build the binaries に `$opentoonz/toonz/build` を指定する
|
||||
- 他の場所でも構いません
|
||||
- チェックアウトしたフォルダ内に作成する場合は、buildから開始するフォルダ名にするとgitから無視されます
|
||||
- ビルド先を変更した場合は、以下の説明を適宜読み替えてください
|
||||
4. Configure をクリックして、 Visual Studio 14 2015 Win64 を選択します
|
||||
5. Qt のインストール先がデフォルトではない場合、 `Specify QT_PATH properly` というエラーが表示されるので、 `QT_PATH` に Qt5 をインストールしたパスを指定します
|
||||
6. Generate をクリック
|
||||
- CMakeLists.txt に変更があった場合は、ビルド時に自動的に処理が走るので、以降は CMake を直接使用する必要はありません
|
||||
|
||||
## ライブラリの設定
|
||||
下記のファイルをコピーします
|
||||
- `$opentoonz/thirdparty/LibJPEG/jpeg-9/jconfig.vc` → `$opentoonz/thirdparty/LibJPEG/jpeg-9/jconfig.h`
|
||||
- `$opentoonz/thirdparty/tiff-4.0.3/libtiff/tif_config.vc.h` → `$opentoonz/thirdparty/tiff-4.0.3/libtiff/tif_config.h`
|
||||
- `$opentoonz/thirdparty/tiff-4.0.3/libtiff/tiffconf.vc.h` → `$opentoonz/thirdparty/tiff-4.0.3/libtiff/tiffconf.h`
|
||||
- `$opentoonz/thirdparty/libpng-1.6.21/scripts/pnglibconf.h.prebuilt` → `$opentoonz/thirdparty/libpng-1.6.21/pnglibconf.h`
|
||||
|
||||
## ビルド
|
||||
1. `$opentoonz/toonz/build/OpenToonz.sln` を開いて Release 構成を選択してビルドします
|
||||
2. `$opentoonz/toonz/build/Release` にファイルが生成されます
|
||||
|
||||
## ストップモーション機能とキヤノン製デジタルカメラのサポートを有効にするには
|
||||
|
||||
以下の３つのライブラリが追加で必要です。
|
||||
- [OpenCV](https://opencv.org/) (v4.1.0以上)
|
||||
- [libjpeg-turbo](https://www.libjpeg-turbo.org/)
|
||||
- Canon EOS Digital SDK (EDSDK)：入手方法の詳細は[キヤノンマーケティングジャパン株式会社Webサイト](https://cweb.canon.jp/eos/info/api-package/)をご参照下さい。
|
||||
|
||||
CMake上で、`WITH_STOPMOTION` オプションをONにします。CMake上、または環境変数で`OpenCV_DIR` の値をOpenCVのインストールフォルダ内の`build`フォルダの場所に設定します。（例： `C:/opencv/build`）
|
||||
|
||||
実行時にはOpenCV、libjpeg-turboならびにCanon EDSDKの.dllファイルを`OpenToonz.exe` と同じフォルダにコピーします。
|
||||
|
||||
## 実行
|
||||
### 実行可能ファイルなどの配置
|
||||
1. `$oepntoonz/toonz/build/Release` の中身を適当なフォルダにコピーします
|
||||
2. `OpenToonz.exe` のパスを引数にして Qt に付属の `windeployqt.exe` を実行します
|
||||
- 必要な Qt のライブラリなどが `OpenToonz.exe` と同じフォルダに集められます
|
||||
3. 下記のファイルを `OpenToonz.exe` と同じフォルダにコピーします
|
||||
- `$opentoonz/thirdparty/glut/3.7.6/lib/glut64.dll`
|
||||
- `$opentoonz/thirdparty/glew/glew-1.9.0/bin/64bit/glew32.dll`
|
||||
4. バイナリ版の OpenToonz のインストール先にある `srv` フォルダを `OpenToonz.exe` と同じフォルダにコピーします
|
||||
- `srv` が無くても OpenToonz は動作しますが、 mov 形式などに対応できません
|
||||
- `srv` 内のファイルの生成方法は後述します
|
||||
|
||||
### Stuffフォルダの作成
|
||||
既にバイナリ版の OpenToonz をインストールしている場合、この手順とレジストリキーの作成と同様の処理が行われているため、これらの手順は不要です。
|
||||
|
||||
1. `$opentoonz/stuff` を適当なフォルダにコピーします
|
||||
|
||||
### レジストリキーの作成
|
||||
1. レジストリエディタで下記のキーを作成し、 Stuff フォルダの作成でコピーした stuff フォルダのパスを記載します
|
||||
- HKEY_LOCAL_MACHINE\SOFTWARE\OpenToonz\OpenToonz\TOONZROOT
|
||||
|
||||
### 実行
|
||||
OpenToonz.exe を実行して動作すれば成功です。おめでとうございます。
|
||||
|
||||
### Qt
|
||||
- https://www.qt.io/download-open-source/
|
||||
- 64 ビット版と同じインストーラーで Qt 5.9 (32 ビット版) を適当なフォルダにインストールします
|
||||
|
||||
### CMake で Visual Studio の 32 ビット版のプロジェクトを生成する
|
||||
- 64 ビット版と同様の手順で、次のようにフォルダ名とターゲットを読み替えます
|
||||
- `$opentoonz/toonz/build` → `$opentoonz/toonz/build32`
|
||||
- Visual Studio 14 2015 Win64 → Visual Studio 14 2015
|
||||
- `QT_PATH` には 32 ビット版の Qt のパスを指定します
|
||||
|
||||
### 32 ビット版のビルド
|
||||
1. `$opentoonz/toonz/build32/OpenToonz.sln`を開いてビルドします
|
||||
|
||||
### `srv` フォルダの配置
|
||||
- 64 ビット版の `srv` フォルダの中に下記のファイルをコピーします
|
||||
- `$opentoonz/toonz/build32/Release` から
|
||||
- image.dll
|
||||
- tnzcore.dll
|
||||
- Qt の 32ビット版のインストール先から
|
||||
- Qt5Core.dll
|
||||
- Qt5Network.dll
|
||||
- `$opentoonz/thirdparty/glut/3.7.6/lib/glut32.dll`
|
||||
|
||||
## 翻訳ファイルの生成
|
||||
Qt の翻訳ファイルは、ソースコードから `.ts` ファイルを生成して、 `.ts` ファイルに対して翻訳作業を行い、 `.ts` ファイルから `.qm` ファイルを生成します。Visual Studioソリューション中の`translation_`から始まるプロジェクトに対して「 `translation_???` のみをビルド」を実行すると、 `.ts` ファイルと `.qm` ファイルの生成が行われます。これらのプロジェクトはソリューションのビルドではビルドされないようになっています。
|
||||
|
|
@ -10,7 +10,7 @@ Although any LESS compiler will work fine, here is a recommended setup.
|
|||
|
||||
- Install [Visual Studio Code](https://code.visualstudio.com/) by Microsoft.
|
||||
- Add the [Easy LESS](https://marketplace.visualstudio.com/items?itemName=mrcrowl.easy-less) extension from the marketplace which will be used as the compiler.
|
||||
- In VSCode, navigate to your OpenToonz stuff folder and open `config/qss/Default/less`.
|
||||
- In VSCode, navigate to your Tahoma2D stuff folder and open `config/qss/Default/less`.
|
||||
|
||||
A `settings.json` file is already included to ensure developers work to the same standards located in `.vscode`. If the file must be created manually then the following should apply.
|
||||
|
||||
|
|
@ -53,7 +53,7 @@ themes/Light.less
|
|||
```
|
||||
|
||||
### Linux
|
||||
From opentoonz source directory root execute the following commands:
|
||||
From Tahoma2D source directory root execute the following commands:
|
||||
```
|
||||
$ lessc -x stuff/config/qss/Default/less/Default.less stuff/config/qss/Default/Default.qss
|
||||
$ lessc -x stuff/config/qss/Default/less/themes/Blue.less stuff/config/qss/Blue/Blue.qss
|
||||
|
|
@ -126,7 +126,7 @@ To call components, use the LESS extend function.
|
|||
It's possible to create custom themes.
|
||||
|
||||
## How To
|
||||
- Navigate to your OpenToonz stuff directory, and create a new folder in `config/qss`.
|
||||
- Navigate to your Tahoma2D stuff directory, and create a new folder in `config/qss`.
|
||||
- Create a new text file in the new folder, give it the same name as the folder and save it with the `.less` extension.
|
||||
- Open the LESS file and add the following line at the top.
|
||||
- `// out: filename.qss`
|
||||
|
|
@ -151,7 +151,7 @@ It's possible to create custom themes.
|
|||
# Notes
|
||||
⚠️ When developing, always develop with the Default theme, then decide later if any changes need porting to alternate themes, in most cases it won't be necessary.
|
||||
|
||||
⚠️ Layout files must never have hard-coded color values, color values **must always** be variable. Each function area of OpenToonz is split into a separate file.
|
||||
⚠️ Layout files must never have hard-coded color values, color values **must always** be variable. Each function area of Tahoma2D is split into a separate file.
|
||||
|
||||
### Directory Information
|
||||
**Base:** Contains generic color palettes, legacy code, mixins and functions. It's fine to place junk code here.
|
||||
|
|
|
|||
|
|
@ -1,14 +1,9 @@
|
|||
# Testing Pull Requests (PRs)
|
||||
|
||||
When a PR is submitted, it is compiled automatically by AppVeyor and Travis CI. The AppVeyor build creates an artifact which contains the OpenToonz executable and supporting DLLs needed to run. You can easily download this artifact and run it to test out the PR before it is merged.
|
||||
When a PR is submitted, it is compiled automatically by AppVeyor and Travis CI. The AppVeyor build creates an artifact which contains the Tahoma2D executable and supporting DLLs needed to run. You can easily download this artifact and run it to test out the PR before it is merged.
|
||||
|
||||
## Pre-Testing Notes
|
||||
- This can only be tested on Windows. There is no OSX or Linux build that can be tested.
|
||||
- You need to have OpenToonz already installed. Do not uninstall.
|
||||
- Your current personal preferences and settings will be used.
|
||||
- Personal settings can change if you change them while testing.
|
||||
- It is recommended that you backup your `C:\OpenToonz #.# stuff` folder before testing a PR.
|
||||
- The AppVeyor build does not contain an updated `C:\OpenToonz #.# stuff` folder so any PR changes to default configurations (i.e. stylesheets, FXs, brushes, etc) are not automatically included.
|
||||
- It is recommended when testing to use new scenes that you can throw away.
|
||||
- If you decide to test on an existing scene, back it up first!
|
||||
|
||||
|
|
@ -32,15 +27,15 @@ When a PR is submitted, it is compiled automatically by AppVeyor and Travis CI.
|
|||
|
||||
|
||||
|
||||
- Click on the OpenToonz `.zip` file to begin the download.
|
||||
- Click on the Tahoma2D `.zip` file to begin the download.
|
||||
|
||||
|
||||
|
||||
- Once download is complete, go to your Downloads folder and extract the contents of the .zip file anywhere on your computer.
|
||||
- You should extract into a separate folder.
|
||||
- ⚠️ **Do not overwrite your current OpenToonz installation!**
|
||||
- ⚠️ **Do not overwrite your current Tahoma2D installation!**
|
||||
|
||||
- Enter the folder you extracted everything into and double-click the OpenToonz executable to start.
|
||||
- Enter the folder you extracted everything into and double-click the Tahoma2D executable to start.
|
||||
|
||||
- Test away! Report any suggestions or issues related to the change in the PR comments.
|
||||
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
|
||||
<h4>● Overview</h4>
|
||||
This effect arranges the Source image in tiles.<br>
|
||||
The existing "Tile" effect of OpenToonz has been enhanced in the following ways:
|
||||
The existing "Tile" effect of Tahoma2D has been enhanced in the following ways:
|
||||
<UL>
|
||||
<LI>Now it is possible to specify the repeat range with respect to the Camera Box, in addition to the<br>
|
||||
object Bounding Box.</LI>
|
||||
|
|
|
|||
|
|
@ -346,7 +346,7 @@ rt
|
|||
15168;width:356pt'>
|
||||
<col class=xl7529647 width=103 style='mso-width-source:userset;mso-width-alt:
|
||||
3296;width:77pt'>
|
||||
<h4>Por favor ver la sección <a href="https://opentoonz.readthedocs.io/es/latest/using_the_particles_effect.html">Uso del efecto Particles</a> en el Manual de OpenToonz, para obtener información más detallada.</h4>
|
||||
<h4>Por favor ver la sección <a href="https://tahoma2d.readthedocs.io/es/latest/using_the_particles_effect.html">Uso del efecto Particles</a> en el Manual de Tahoma2D, para obtener información más detallada.</h4>
|
||||
<tr height=23 style='height:17.25pt'>
|
||||
<td colspan=5 height=23 class=xl7829647 width=910 style='height:17.25pt;
|
||||
width:683pt'>Efecto Particles - Lista de opciones</td>
|
||||
|
|
|
|||
|
|
@ -344,7 +344,7 @@ rt
|
|||
15168;width:356pt'>
|
||||
<col class=xl7529647 width=103 style='mso-width-source:userset;mso-width-alt:
|
||||
3296;width:77pt'>
|
||||
<h4>Please see <a href="https://opentoonz.readthedocs.io/en/latest/using_the_particles_effect.html">Using the Particles Effect</a> section in the OpenToonz Manual to obtain detailed information.</h4>
|
||||
<h4>Please see <a href="https://tahoma2d.readthedocs.io/en/latest/using_the_particles_effect.html">Using the Particles Effect</a> section in the Tahoma2D Manual to obtain detailed information.</h4>
|
||||
<tr height=23 style='height:17.25pt'>
|
||||
<td colspan=5 height=23 class=xl7829647 width=910 style='height:17.25pt;
|
||||
width:683pt'>Particles Effect List of Parameters</td>
|
||||
|
|
|
|||
|
|
@ -599,7 +599,7 @@ public:
|
|||
|
||||
void writeLine(char *buffer) override;
|
||||
|
||||
// for now opentoonz does not support bmp format with alpha channel
|
||||
// for now Tahoma2D does not support bmp format with alpha channel
|
||||
bool writeAlphaSupported() const override { return false; }
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -45,7 +45,7 @@ bool FfmpegAudio::checkFfmpeg() {
|
|||
#endif
|
||||
if (TSystem::doesExistFileOrLevel(TFilePath(path))) return true;
|
||||
|
||||
// check the OpenToonz root directory next
|
||||
// check the Tahoma2D root directory next
|
||||
path = QDir::currentPath() + "/ffmpeg";
|
||||
#if defined(_WIN32)
|
||||
path = path + ".exe";
|
||||
|
|
|
|||
|
|
@ -1173,12 +1173,12 @@ void Canon::calculateZoomPoint() {
|
|||
m_finalZoomPoint.x = m_calculatedZoomPoint.x - (m_zoomRectDimensions.x / 2);
|
||||
m_finalZoomPoint.y = m_calculatedZoomPoint.y - (m_zoomRectDimensions.y / 2);
|
||||
} else {
|
||||
// get the image size in OpenToonz dimensions
|
||||
// get the image size in Tahoma2D dimensions
|
||||
double maxFullWidth =
|
||||
(double)m_fullImageDimensions.lx / fullImageDpi.x * Stage::inch;
|
||||
double maxFullHeight =
|
||||
(double)m_fullImageDimensions.ly / fullImageDpi.y * Stage::inch;
|
||||
// OpenToonz coordinates are based on center at 0, 0
|
||||
// Tahoma2D coordinates are based on center at 0, 0
|
||||
// convert that to top left based coordinates
|
||||
double newX = m_liveViewZoomPickPoint.x + maxFullWidth / 2.0;
|
||||
double newY = -m_liveViewZoomPickPoint.y + maxFullHeight / 2.0;
|
||||
|
|
@ -1214,7 +1214,7 @@ void Canon::calculateZoomPoint() {
|
|||
// recenter the point in the rect
|
||||
tempCalculated.x = m_finalZoomPoint.x + (m_zoomRectDimensions.x / 2);
|
||||
tempCalculated.y = m_finalZoomPoint.y + (m_zoomRectDimensions.y / 2);
|
||||
// convert to OpenToonz Dimensions
|
||||
// convert to Tahoma2D Dimensions
|
||||
newX = tempCalculated.x / fullImageDpi.x * Stage::inch;
|
||||
newY = tempCalculated.y / fullImageDpi.y * Stage::inch;
|
||||
// get center based coordinates
|
||||
|
|
@ -1225,7 +1225,7 @@ void Canon::calculateZoomPoint() {
|
|||
|
||||
// calculate the zoom rectangle position on screen
|
||||
|
||||
// get the image size in OpenToonz dimensions
|
||||
// get the image size in Tahoma2D dimensions
|
||||
double maxFullWidth =
|
||||
(double)m_fullImageDimensions.lx / fullImageDpi.x * Stage::inch;
|
||||
double maxFullHeight =
|
||||
|
|
@ -1235,7 +1235,7 @@ void Canon::calculateZoomPoint() {
|
|||
m_finalZoomPoint.x + m_zoomRectDimensions.x, m_finalZoomPoint.y);
|
||||
TRect tempCalculated;
|
||||
|
||||
// convert to OpenToonz Dimensions
|
||||
// convert to Tahoma2D Dimensions
|
||||
tempCalculated.x0 = m_zoomRect.x0 / fullImageDpi.x * Stage::inch;
|
||||
tempCalculated.y0 = m_zoomRect.y0 / fullImageDpi.y * Stage::inch;
|
||||
tempCalculated.x1 = m_zoomRect.x1 / fullImageDpi.x * Stage::inch;
|
||||
|
|
|
|||
|
|
@ -1330,7 +1330,7 @@ void MainWindow::onUpdateCheckerDone(bool error) {
|
|||
dialog->deleteLater();
|
||||
if (ret == 1) {
|
||||
// Write the new last date to file
|
||||
QDesktopServices::openUrl(QObject::tr("https://opentoonz.github.io/e/"));
|
||||
QDesktopServices::openUrl("https://github.com/turtletooth/tahoma2d/releases/latest");
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue