dd1976c5d8
* add multi arc mockup * implement mutli arc * add join and smooth option * reset multiarc and arc when deactivated * create self loop if the last point is the same as the first * make join option in multiarc consistent with tape tool * fix a bug where thickness don't affect mutliarc in vector level * remove join option in geometric tool * stop mutliarc after closing shape * double click can also end multi arc * fix a bug where multiArc will produce buggy stroke * fix a bug where geometric tools is not deactivated * add multiArc shortcut * rewrite multiArc * revert changes to tvectorimage * add undo data for multiArc * Paste as Copy Command for XSheet * Remove unneeded code * Bug fix * prevent guide lines from jumping around in MultiArc * make stroke color consistent in MultiArc * remove color in MultiArc's undo data * make color consistent in MultiArc with previous version * Fix single image raster levels * fix compilation error * fix a bug where multiArc might generate bugged stroke * Remove ICONV dep (#3304) * fix crash on saving studio palette * Move to Paste Special Menu * Don't Set Fixed Width if Docking a Floating Panel * Update how_to_build_win.md New draft of pr for requested changes to windows build instructions. * fix geometric tool multiarc smooth option * fix level saving failure * fix wrong warning after saving palette * fix a bug where moving a control point while holding alt has unintended result * fix travis-install (#3389) * Fix assert debug crash in flipconsole.cpp Fix crash when using the viewer controls in the console (debug) * Redraw Audio Waveform Fills the waveform rather than outlines it. * fix undo data when drawing arc and mutliarc * fix overwriting raster drawing palette (#3387) * mode sensitive fx settings * Create New Style Command Button (#3394) * Create New Style Command Button This PR creates a new button in the pallette editor that creates a new style. Button is large and easy access for a faster and easier workflow. Original code developed by Turtletooth for Tahoma. Given permission to develop within Openoonz. Co-Authored-By: Jeremy Bullock <turtletooth@users.noreply.github.com> * Update paletteviewergui.cpp Made changes to the PR per request by Shun. * Fixed a space within the code that wasn't suppose to be there. Co-authored-by: Jeremy Bullock <turtletooth@users.noreply.github.com> * tahoma license (#3396) * new style button optional * fix loading pegbars (removing updateKeyframes) * periodic random expression * add fx in linear color space this commit is based on source for the ComposeAdd plugin fx by DWANGO Co., Ltd. in dwango_opentoonz_plugins and opentoonz_plugin_utility repositories. * fractal noise iwa fx * skip unnecessary icon invalidation * fix frame range fill with tablet * stop function editor to open by dbl clicking key * Expanding the radius of the rotation handle. This just changes when the cursor transforms into the rotation tool. (cherry picked from commit 7722ae989bbdc6aa5cb48df7a4c08bae1fe6ea39) Co-authored-by: pojienie <pojienie@gmail.com> Co-authored-by: rim <11380091+rozhuk-im@users.noreply.github.com> Co-authored-by: shun-iwasawa <shun.iwasawa@ghibli.jp> Co-authored-by: Rodney <rodney.baker@gmail.com> Co-authored-by: DoctorRyan <65507211+DoctorRyan@users.noreply.github.com> Co-authored-by: shun-iwasawa <shun-iwasawa@users.noreply.github.com> Co-authored-by: Kite <konero@users.noreply.github.com> Co-authored-by: Jeremy Bullock <turtletooth@users.noreply.github.com> Co-authored-by: DoctorRyan <doctorryan1969.gmail.com>
308 lines
6.9 KiB
CMake
308 lines
6.9 KiB
CMake
set(HEADERS
|
|
../include/stdfx/shaderfx.h
|
|
../include/stdfx/shaderinterface.h
|
|
../include/stdfx/shadingcontext.h
|
|
gradients.h
|
|
hsvutil.h
|
|
offscreengl.h
|
|
particles.h
|
|
particlesengine.h
|
|
particlesfx.h
|
|
particlesmanager.h
|
|
perlinnoise.h
|
|
pins.h
|
|
stdfx.h
|
|
texturefxP.h
|
|
warp.h
|
|
motionawarebasefx.h
|
|
igs_color_blend.h
|
|
igs_color_rgb_hls.h
|
|
igs_color_rgb_hsv.h
|
|
igs_density.h
|
|
igs_fog.h
|
|
igs_gaussian_blur.h
|
|
igs_hls_add.h
|
|
igs_hls_adjust.h
|
|
igs_hls_noise.h
|
|
igs_hls_noise_in_camera.h
|
|
igs_hsv_add.h
|
|
igs_hsv_adjust.h
|
|
igs_hsv_noise.h
|
|
igs_hsv_noise_in_camera.h
|
|
igs_ifx_common.h
|
|
igs_level_auto.h
|
|
igs_level_auto_in_camera.h
|
|
igs_levels.h
|
|
igs_line_blur.h
|
|
igs_math_random.h
|
|
igs_maxmin.h
|
|
igs_maxmin_getput.h
|
|
igs_maxmin_lens_matrix.h
|
|
igs_maxmin_multithread.h
|
|
igs_maxmin_slrender.h
|
|
igs_median_filter.h
|
|
igs_median_filter_smooth.h
|
|
igs_motion_blur.h
|
|
igs_motion_wind.h
|
|
igs_motion_wind_pixel.h
|
|
igs_motion_wind_table.h
|
|
igs_negate.h
|
|
igs_os_type.h
|
|
igs_perlin_noise.h
|
|
igs_radial_blur.h
|
|
igs_resource_msg_from_err.h
|
|
igs_resource_multithread.h
|
|
igs_resource_sleep.h
|
|
igs_resource_thread.h
|
|
igs_rotate_blur.h
|
|
igs_warp.h
|
|
ino_common.h
|
|
iwa_adjustexposurefx.h
|
|
iwa_directionalblurfx.h
|
|
iwa_gradientwarpfx.h
|
|
iwa_motionblurfx.h
|
|
iwa_particles.h
|
|
iwa_particlesengine.h
|
|
iwa_particlesfx.h
|
|
iwa_particlesmanager.h
|
|
iwa_perspectivedistortfx.h
|
|
iwa_spectrumfx.h
|
|
iwa_simplexnoise.h
|
|
iwa_noise1234.h
|
|
iwa_fresnel.h
|
|
iwa_pnperspectivefx.h
|
|
iwa_soapbubblefx.h
|
|
iwa_bokehfx.h
|
|
iwa_timecodefx.h
|
|
iwa_bokehreffx.h
|
|
iwa_textfx.h
|
|
iwa_corridorgradientfx.h
|
|
iwa_spingradientfx.h
|
|
iwa_lineargradientfx.h
|
|
iwa_glarefx.h
|
|
iwa_fractalnoisefx.h
|
|
)
|
|
|
|
set(SOURCES
|
|
adjustlevelsfx.cpp
|
|
artcontourfx.cpp
|
|
backlitfx.cpp
|
|
blendtzfx.cpp
|
|
blurfx.cpp
|
|
bodyhighlightfx.cpp
|
|
bright_contfx.cpp
|
|
calligraphicfx.cpp
|
|
changecolorfx.cpp
|
|
channelmixerfx.cpp
|
|
cloudsfx.cpp
|
|
colorembossfx.cpp
|
|
cornerpinfx.cpp
|
|
despecklefx.cpp
|
|
diamondgradientfx.cpp
|
|
dissolvefx.cpp
|
|
embossfx.cpp
|
|
erodilatefx.cpp
|
|
externalpalettefx.cpp
|
|
fourpointsgradientfx.cpp
|
|
freedistortfx.cpp
|
|
gammafx.cpp
|
|
glowfx.cpp
|
|
gradients.cpp
|
|
hsvkeyfx.cpp
|
|
hsvscalefx.cpp
|
|
hsvutil.cpp
|
|
kaleido.cpp
|
|
linearwavefx.cpp
|
|
localblurfx.cpp
|
|
localtransparencyfx.cpp
|
|
mosaicfx.cpp
|
|
motionblurfx.cpp
|
|
multitonefx.cpp
|
|
noisefx.cpp
|
|
nothingfx.cpp
|
|
palettefilterfx.cpp
|
|
particles.cpp
|
|
particlesengine.cpp
|
|
particlesfx.cpp
|
|
particlesmanager.cpp
|
|
perlinnoise.cpp
|
|
perlinnoisefx.cpp
|
|
pins.cpp
|
|
posterizefx.cpp
|
|
premultiplyfx.cpp
|
|
radialblurfx.cpp
|
|
randomwavefx.cpp
|
|
raylitfx.cpp
|
|
rgbkeyfx.cpp
|
|
rgbmcutfx.cpp
|
|
rgbmfadefx.cpp
|
|
rgbmscalefx.cpp
|
|
ripplefx.cpp
|
|
rotationalblurfx.cpp
|
|
saltpeppernoisefx.cpp
|
|
shaderfx.cpp
|
|
shaderinterface.cpp
|
|
shadingcontext.cpp
|
|
sharpenfx.cpp
|
|
solarizefx.cpp
|
|
squaregradientfx.cpp
|
|
stdfx.cpp
|
|
targetspotfx.cpp
|
|
texturefx.cpp
|
|
tilefx.cpp
|
|
tonecurvefx.cpp
|
|
unmultiplyfx.cpp
|
|
warp.cpp
|
|
warpfx.cpp
|
|
igs_attenuation_distribution.cpp
|
|
igs_color_blend.cpp
|
|
igs_color_rgb_hls.cpp
|
|
igs_color_rgb_hsv.cpp
|
|
igs_density.cpp
|
|
igs_fog.cpp
|
|
igs_gauss_distribution.cpp
|
|
igs_gaussian_blur.cpp
|
|
igs_hls_add.cpp
|
|
igs_hls_adjust.cpp
|
|
igs_hls_noise.cpp
|
|
igs_hls_noise_in_camera.cpp
|
|
igs_hsv_add.cpp
|
|
igs_hsv_adjust.cpp
|
|
igs_hsv_noise.cpp
|
|
igs_hsv_noise_in_camera.cpp
|
|
igs_level_auto.cpp
|
|
igs_level_auto_in_camera.cpp
|
|
igs_levels.cpp
|
|
igs_line_blur.cpp
|
|
igs_math_random.cpp
|
|
igs_maxmin.cpp
|
|
igs_maxmin_lens_matrix.cpp
|
|
igs_maxmin_slrender.cpp
|
|
igs_median_filter.cpp
|
|
igs_median_filter_smooth.cpp
|
|
igs_motion_blur.cpp
|
|
igs_motion_wind.cpp
|
|
igs_motion_wind_pixel.cpp
|
|
igs_motion_wind_table.cpp
|
|
igs_negate.cpp
|
|
igs_perlin_noise.cpp
|
|
igs_radial_blur.cpp
|
|
igs_resource_msg_from_err.cpp
|
|
igs_resource_multithread.cpp
|
|
igs_resource_sleep.cpp
|
|
igs_resource_thread.cpp
|
|
igs_rotate_blur.cpp
|
|
igs_warp_hori.cpp
|
|
igs_warp_vert.cpp
|
|
ino_blend_add.cpp
|
|
ino_blend_color_burn.cpp
|
|
ino_blend_color_dodge.cpp
|
|
ino_blend_cross_dissolve.cpp
|
|
ino_blend_darken.cpp
|
|
ino_blend_darker_color.cpp
|
|
ino_blend_divide.cpp
|
|
ino_blend_hard_light.cpp
|
|
ino_blend_hard_mix.cpp
|
|
ino_blend_lighten.cpp
|
|
ino_blend_lighter_color.cpp
|
|
ino_blend_linear_burn.cpp
|
|
ino_blend_linear_dodge.cpp
|
|
ino_blend_linear_light.cpp
|
|
ino_blend_multiply.cpp
|
|
ino_blend_over.cpp
|
|
ino_blend_overlay.cpp
|
|
ino_blend_pin_light.cpp
|
|
ino_blend_screen.cpp
|
|
ino_blend_soft_light.cpp
|
|
ino_blend_subtract.cpp
|
|
ino_blend_vivid_light.cpp
|
|
ino_blur.cpp
|
|
ino_channel_selector.cpp
|
|
ino_common.cpp
|
|
ino_density.cpp
|
|
ino_fog.cpp
|
|
ino_hls_add.cpp
|
|
ino_hls_adjust.cpp
|
|
ino_hls_noise.cpp
|
|
ino_hsv_add.cpp
|
|
ino_hsv_adjust.cpp
|
|
ino_hsv_noise.cpp
|
|
ino_level_auto.cpp
|
|
ino_level_master.cpp
|
|
ino_level_rgba.cpp
|
|
ino_line_blur.cpp
|
|
ino_maxmin.cpp
|
|
ino_median.cpp
|
|
ino_median_filter.cpp
|
|
ino_motion_blur.cpp
|
|
ino_motion_wind.cpp
|
|
ino_negate.cpp
|
|
ino_pn_clouds.cpp
|
|
ino_radial_blur.cpp
|
|
ino_spin_blur.cpp
|
|
ino_warp_hv.cpp
|
|
iwa_adjustexposurefx.cpp
|
|
iwa_directionalblurfx.cpp
|
|
iwa_gradientwarpfx.cpp
|
|
iwa_motionblurfx.cpp
|
|
iwa_particles.cpp
|
|
iwa_particlesengine.cpp
|
|
iwa_particlesfx.cpp
|
|
iwa_particlesmanager.cpp
|
|
iwa_perspectivedistortfx.cpp
|
|
iwa_spectrumfx.cpp
|
|
iwa_tilefx.cpp
|
|
iwa_simplexnoise.cpp
|
|
iwa_noise1234.cpp
|
|
iwa_pnperspectivefx.cpp
|
|
iwa_soapbubblefx.cpp
|
|
${SDKROOT}/kiss_fft130/kiss_fft.c
|
|
${SDKROOT}/kiss_fft130/tools/kiss_fftnd.c
|
|
iwa_bokehfx.cpp
|
|
iwa_timecodefx.cpp
|
|
iwa_bokehreffx.cpp
|
|
iwa_barreldistortfx.cpp
|
|
iwa_textfx.cpp
|
|
iwa_corridorgradientfx.cpp
|
|
iwa_spingradientfx.cpp
|
|
iwa_lineargradientfx.cpp
|
|
iwa_glarefx.cpp
|
|
iwa_fractalnoisefx.cpp
|
|
)
|
|
|
|
set(OBJCSOURCES
|
|
)
|
|
|
|
add_library(tnzstdfx SHARED ${HEADERS} ${SOURCES} ${OBJCSOURCES})
|
|
add_definitions(
|
|
-D_USRDLL
|
|
-DTNZSTDFX_EXPORTS
|
|
)
|
|
|
|
if(BUILD_ENV_APPLE)
|
|
set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-install_name,@executable_path/libtnzstdfx.dylib")
|
|
add_dependencies(tnzstdfx tnzcore tnzbase toonzlib)
|
|
endif()
|
|
|
|
message("subdir: tnzstdfx")
|
|
message("Bin: " ${CMAKE_CURRENT_BINARY_DIR})
|
|
|
|
if(GLEW_FOUND)
|
|
include_directories(
|
|
SYSTEM
|
|
${GLEW_INCLUDE_DIRS}
|
|
)
|
|
else()
|
|
include_directories(
|
|
SYSTEM
|
|
${SDKROOT}/glew/glew-1.9.0/include
|
|
)
|
|
endif()
|
|
|
|
include_directories(
|
|
${SDKROOT}/kiss_fft130
|
|
)
|
|
|
|
_find_toonz_library(TNZLIBS "tnzcore;tnzbase;toonzlib")
|
|
|
|
target_link_libraries(tnzstdfx Qt5::Core Qt5::Gui Qt5::OpenGL ${GL_LIB} ${GLEW_LIB} ${TNZLIBS} ${PTHREAD_LIBRARY})
|