oak-team/oak-editor
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

minor fixes and debug output

Browse Source
This commit is contained in:
itsmattkc
2019-09-11 17:35:45 +10:00
parent 5fbd90d9f5
commit 1879dac247
5 changed files with 28 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/main.cpp
+2
View File
@@ -52,6 +52,8 @@ int main(int argc, char *argv[]) {
app_version.append(GITHASH);
#endif
qInfo() << "Using Qt version:" << qVersion();
QCoreApplication::setApplicationVersion(app_version);
#if (QT_VERSION >= QT_VERSION_CHECK(5, 7, 0))
app/node/block/block.cpp
+2 -2
View File
@@ -38,8 +38,8 @@ Block::Block() :
texture_output_->set_data_type(NodeParam::kTexture);
AddParameter(texture_output_);
connect(this, SIGNAL(EdgeAdded(NodeEdgePtr)), this, SLOT(EdgeAddedSlot(NodeEdgePtr)));
connect(this, SIGNAL(EdgeRemoved(NodeEdgePtr)), this, SLOT(EdgeRemovedSlot(NodeEdgePtr)));
connect(this, SIGNAL(EdgeAdded(NodeEdgePtr)), this, SLOT(EdgeAddedSlot(NodeEdgePtr)), Qt::DirectConnection);
connect(this, SIGNAL(EdgeRemoved(NodeEdgePtr)), this, SLOT(EdgeRemovedSlot(NodeEdgePtr)), Qt::DirectConnection);
}
QString Block::Category()
app/node/output.cpp
+2 -1
View File
@@ -23,7 +23,8 @@
#include "node/node.h"
NodeOutput::NodeOutput(const QString &id) :
NodeParam(id)
NodeParam(id),
data_type_(kNone)
{
}
app/node/output/track/track.cpp
+4 -1
View File
@@ -153,7 +153,10 @@ NodeOutput* TrackOutput::track_output()
void TrackOutput::InvalidateCache(const rational &start_range, const rational &end_range, NodeInput *from)
{
// We intercept IC signals from Blocks since we may be performing several options and they may over-signal
if (!block_invalidate_cache_stack_) {
if (block_invalidate_cache_stack_ == 0) {
qDebug() << "Received IC Signal:" << start_range.toDouble() << "to" << end_range.toDouble();
qDebug() << "Limiting IC Signal To:" << qMax(start_range, rational(0)).toDouble() << "to" << qMin(end_range, in()).toDouble();
Node::InvalidateCache(qMax(start_range, rational(0)), qMin(end_range, in()), from);
}
}
appveyor-build.bat
+18 -11
View File
@@ -3,28 +3,35 @@ call "C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.cmd" /x64
call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86_amd64
REM Install FFmpeg
curl -L -o ffmpeg-shared.zip https://ffmpeg.zeranoe.com/builds/win64/shared/ffmpeg-4.2-win64-shared.zip
curl -L -o ffmpeg-dev.zip https://ffmpeg.zeranoe.com/builds/win64/shared/ffmpeg-4.2-win64-dev.zip
7z x ffmpeg-shared.zip
7z x ffmpeg-dev.zip
curl -L -o ffmpeg-4.2-win64-shared.zip https://ffmpeg.zeranoe.com/builds/win64/shared/ffmpeg-4.2-win64-shared.zip
curl -L -o ffmpeg-4.2-win64-dev.zip https://ffmpeg.zeranoe.com/builds/win64/shared/ffmpeg-4.2-win64-dev.zip
7z x ffmpeg-4.2-win64-shared.zip
7z x ffmpeg-4.2-win64-dev.zip
REM Install OpenColorIO
curl -L -o ocio-v1.1.1-win64-shared.zip https://github.com/olive-editor/OpenColorIO-Win32/releases/download/v1.1.1/ocio-v1.1.1-win64-shared.zip
7z x ocio-v1.1.1-win64-shared.zip
set OPENCOLORIO_ROOT_DIR=ocio-v1.1.1-win64-shared
REM Install OpenImageIO
REM vcpkg install openimageio
curl -L -o oiio-v2.3.0-win64-shared.zip https://github.com/olive-editor/OpenImageIO-Win32/releases/download/v2.3.0/oiio-v2.3.0-win64-shared.zip
7z x oiio-v2.3.0-win64-shared.zip
REM Run cmake
cmake . -G "NMake Makefiles"
cmake . -G "NMake Makefiles" -DOPENCOLORIO_ROOT_DIR=ocio-v1.1.1-win64-shared -DFFMPEG_ROOT=ffmpeg-4.2-win64-dev -DOIIO_BASE_DIR=oiio-v2.3.0-win64-shared
REM Run nmake
REM Build Olive
nmake
REM Dependencies are installed, time to set up packages
REM For temporary testing, open remote connection
powershell $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
REM Dependencies are installed, time to set up packages
mkdir olive
copy app/olive-editor.exe olive
cd olive
windeployqt olive-editor.exe
cd ..
REM Store the Git hash as a variable
git rev-parse --short=7 HEAD > shorthash.txt
set /p HASH= < shorthash.txt
@@ -33,12 +40,12 @@ set /p TRAVIS_COMMIT= < longhash.txt
REM First, we create the installer
copy packaging\windows\nsis\* .
"C:\Program Files (x86)\NSIS\makensis.exe" /V4 /DX64 "/XOutFile Olive-%HASH%-Windows-%ARCH%.exe" olive.nsi
"C:\Program Files (x86)\NSIS\makensis.exe" /V4 /DX64 "/XOutFile Olive-%HASH%-Win64.exe" olive.nsi
REM Next we create the portable version, which we'll need a "portable" file for
copy /b NUL olive\portable
REM Package the portable version into a zip
"C:\Program Files\7-Zip\7z.exe" a "Olive-%HASH%-Windows-%ARCH%.zip" "olive"
"C:\Program Files\7-Zip\7z.exe" a "Olive-%HASH%-Win64.zip" "olive"
REM We're done!