Name files in kebab case rather than camel case
This commit is contained in:
Daniel Wolf
parent
9d3782a08b
commit
00e4996cd6
|
|
@ -1,6 +1,6 @@
|
|||
cmake_minimum_required(VERSION 3.2)
|
||||
|
||||
include(appInfo.cmake)
|
||||
include(app-info.cmake)
|
||||
|
||||
project(${appName})
|
||||
|
||||
|
|
@ -8,9 +8,9 @@ project(${appName})
|
|||
add_subdirectory(rhubarb)
|
||||
|
||||
# Build and install extras
|
||||
add_subdirectory("extras/AdobeAfterEffects")
|
||||
add_subdirectory("extras/MagixVegas")
|
||||
add_subdirectory("extras/EsotericSoftwareSpine")
|
||||
add_subdirectory("extras/adobe-after-effects")
|
||||
add_subdirectory("extras/magix-vegas")
|
||||
add_subdirectory("extras/esoteric-software-spine")
|
||||
|
||||
# Install misc. files
|
||||
install(FILES README.adoc LICENSE.md CHANGELOG.md DESTINATION .)
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@ https://www.youtube.com/watch?v=zzdPSFJRlEo[image:http://img.youtube.com/vi/zzdP
|
|||
[[afterEffects]]
|
||||
=== Adobe After Effects
|
||||
|
||||
You can use Rhubarb Lip Sync to animate dialog right from Adobe After Effects. For more information, <<extras/AdobeAfterEffects/README.adoc#,follow this link>> or see the directory `extras/AdobeAfterEffects`.
|
||||
You can use Rhubarb Lip Sync to animate dialog right from Adobe After Effects. For more information, <<extras/adobe-after-effects/README.adoc#,follow this link>> or see the directory `extras/adobe-after-effects`.
|
||||
|
||||
image:img/after-effects.png[]
|
||||
|
||||
|
|
@ -54,14 +54,14 @@ image:img/moho.png[]
|
|||
[[spine]]
|
||||
=== Spine by Esoteric Software
|
||||
|
||||
Rhubarb Lip Sync for Spine is a graphical tool that allows you to import a Spine project, perform automatic lip sync, then re-import the result into Spine. For more information, <<extras/EsotericSoftwareSpine/README.adoc#,follow this link>> or see the directory `extras/EsotericSoftwareSpine` of the download.
|
||||
Rhubarb Lip Sync for Spine is a graphical tool that allows you to import a Spine project, perform automatic lip sync, then re-import the result into Spine. For more information, <<extras/esoteric-software-spine/README.adoc#,follow this link>> or see the directory `extras/esoteric-software-spine` of the download.
|
||||
|
||||
image:img/spine.png[]
|
||||
|
||||
[[vegas]]
|
||||
=== Vegas Pro by Magix
|
||||
|
||||
Rhubarb Lip Sync also comes with two plugin scripts for Vegas Pro (previously Sony Vegas). For more information, <<extras/MagixVegas/README.adoc#,follow this link>> or see the directory `extras/MagixVegas` of the download.
|
||||
Rhubarb Lip Sync also comes with two plugin scripts for Vegas Pro (previously Sony Vegas). For more information, <<extras/magix-vegas/README.adoc#,follow this link>> or see the directory `extras/magix-vegas` of the download.
|
||||
|
||||
image:img/vegas.png[]
|
||||
|
||||
|
|
|
|||
|
|
@ -2,4 +2,4 @@ cmake_minimum_required(VERSION 3.2)
|
|||
|
||||
set(afterEffectsFiles "Rhubarb Lip Sync.jsx" "README.adoc")
|
||||
|
||||
install(FILES ${afterEffectsFiles} DESTINATION "extras/AdobeAfterEffects")
|
||||
install(FILES ${afterEffectsFiles} DESTINATION "extras/adobe-after-effects")
|
||||
|
|
@ -8,6 +8,6 @@ add_custom_target(
|
|||
COMMENT "Building Rhubarb for Spine through Gradle."
|
||||
)
|
||||
|
||||
install(DIRECTORY "build/libs/" DESTINATION "extras/EsotericSoftwareSpine")
|
||||
install(DIRECTORY "build/libs/" DESTINATION "extras/esoteric-software-spine")
|
||||
|
||||
install(FILES README.adoc DESTINATION "extras/EsotericSoftwareSpine")
|
||||
install(FILES README.adoc DESTINATION "extras/esoteric-software-spine")
|
||||
|
|
@ -6,7 +6,7 @@ image:../../img/spine.png[image]
|
|||
|
||||
== Installation
|
||||
|
||||
https://github.com/DanielSWolf/rhubarb-lip-sync/releases[Download Rhubarb Lip Sync] for your platform, then extract the archive file in a directory on your computer. You’ll find Rhubarb Lip Sync for Spine in the directory `extras/EsotericSoftwareSpine`.
|
||||
https://github.com/DanielSWolf/rhubarb-lip-sync/releases[Download Rhubarb Lip Sync] for your platform, then extract the archive file in a directory on your computer. You’ll find Rhubarb Lip Sync for Spine in the directory `extras/esoteric-software-spine`.
|
||||
|
||||
To create lip sync animation, you’ll need Spine 3.7 or better.
|
||||
|
||||
|
|
@ -8,7 +8,7 @@ plugins {
|
|||
|
||||
fun getVersion(): String {
|
||||
// Dynamically read version from CMake file
|
||||
val file = File(rootDir.parentFile.parentFile, "appInfo.cmake")
|
||||
val file = File(rootDir.parentFile.parentFile, "app-info.cmake")
|
||||
val text = file.readText()
|
||||
val major = Regex("""appVersionMajor\s+(\d+)""").find(text)!!.groupValues[1]
|
||||
val minor = Regex("""appVersionMinor\s+(\d+)""").find(text)!!.groupValues[1]
|
||||
|
Before Width: | Height: | Size: 386 B After Width: | Height: | Size: 386 B |
|
Before Width: | Height: | Size: 6.9 KiB After Width: | Height: | Size: 6.9 KiB |
|
Before Width: | Height: | Size: 942 B After Width: | Height: | Size: 942 B |
|
Before Width: | Height: | Size: 1.4 KiB After Width: | Height: | Size: 1.4 KiB |
|
|
@ -8,4 +8,4 @@ set(vegasFiles
|
|||
"README.adoc"
|
||||
)
|
||||
|
||||
install(FILES ${vegasFiles} DESTINATION "extras/MagixVegas")
|
||||
install(FILES ${vegasFiles} DESTINATION "extras/magix-vegas")
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
cmake_minimum_required(VERSION 3.10)
|
||||
|
||||
include("../appInfo.cmake")
|
||||
include("../app-info.cmake")
|
||||
|
||||
# Support legacy OS X versions
|
||||
set(CMAKE_OSX_DEPLOYMENT_TARGET "10.10" CACHE STRING "Minimum OS X deployment version")
|
||||
|
|
@ -268,23 +268,23 @@ include_directories("src")
|
|||
# ... rhubarb-animation
|
||||
add_library(
|
||||
rhubarb-animation
|
||||
src/animation/animationRules.cpp
|
||||
src/animation/animationRules.h
|
||||
src/animation/mouthAnimation.cpp
|
||||
src/animation/mouthAnimation.h
|
||||
src/animation/pauseAnimation.cpp
|
||||
src/animation/pauseAnimation.h
|
||||
src/animation/roughAnimation.cpp
|
||||
src/animation/roughAnimation.h
|
||||
src/animation/ShapeRule.cpp
|
||||
src/animation/ShapeRule.h
|
||||
src/animation/shapeShorthands.h
|
||||
src/animation/staticSegments.cpp
|
||||
src/animation/staticSegments.h
|
||||
src/animation/targetShapeSet.cpp
|
||||
src/animation/targetShapeSet.h
|
||||
src/animation/timingOptimization.cpp
|
||||
src/animation/timingOptimization.h
|
||||
src/animation/animation-rules.cpp
|
||||
src/animation/animation-rules.h
|
||||
src/animation/mouth-animation.cpp
|
||||
src/animation/mouth-animation.h
|
||||
src/animation/pause-animation.cpp
|
||||
src/animation/pause-animation.h
|
||||
src/animation/rough-animation.cpp
|
||||
src/animation/rough-animation.h
|
||||
src/animation/shape-rule.cpp
|
||||
src/animation/shape-rule.h
|
||||
src/animation/shape-shorthands.h
|
||||
src/animation/static-segments.cpp
|
||||
src/animation/static-segments.h
|
||||
src/animation/target-shape-set.cpp
|
||||
src/animation/target-shape-set.h
|
||||
src/animation/timing-optimization.cpp
|
||||
src/animation/timing-optimization.h
|
||||
src/animation/tweening.cpp
|
||||
src/animation/tweening.h
|
||||
)
|
||||
|
|
@ -294,27 +294,27 @@ target_link_libraries(rhubarb-animation rhubarb-core rhubarb-logging rhubarb-tim
|
|||
# ... rhubarb-audio
|
||||
add_library(
|
||||
rhubarb-audio
|
||||
src/audio/AudioClip.cpp
|
||||
src/audio/AudioClip.h
|
||||
src/audio/audioFileReading.cpp
|
||||
src/audio/audioFileReading.h
|
||||
src/audio/AudioSegment.cpp
|
||||
src/audio/AudioSegment.h
|
||||
src/audio/DcOffset.cpp
|
||||
src/audio/DcOffset.h
|
||||
src/audio/ioTools.h
|
||||
src/audio/OggVorbisFileReader.cpp
|
||||
src/audio/OggVorbisFileReader.h
|
||||
src/audio/audio-clip.cpp
|
||||
src/audio/audio-clip.h
|
||||
src/audio/audio-file-reading.cpp
|
||||
src/audio/audio-file-reading.h
|
||||
src/audio/audio-segment.cpp
|
||||
src/audio/audio-segment.h
|
||||
src/audio/dc-offset.cpp
|
||||
src/audio/dc-offset.h
|
||||
src/audio/io-tools.h
|
||||
src/audio/ogg-vorbis-file-reader.cpp
|
||||
src/audio/ogg-vorbis-file-reader.h
|
||||
src/audio/processing.cpp
|
||||
src/audio/processing.h
|
||||
src/audio/SampleRateConverter.cpp
|
||||
src/audio/SampleRateConverter.h
|
||||
src/audio/voiceActivityDetection.cpp
|
||||
src/audio/voiceActivityDetection.h
|
||||
src/audio/WaveFileReader.cpp
|
||||
src/audio/WaveFileReader.h
|
||||
src/audio/waveFileWriting.cpp
|
||||
src/audio/waveFileWriting.h
|
||||
src/audio/sample-rate-converter.cpp
|
||||
src/audio/sample-rate-converter.h
|
||||
src/audio/voice-activity-detection.cpp
|
||||
src/audio/voice-activity-detection.h
|
||||
src/audio/wave-file-reader.cpp
|
||||
src/audio/wave-file-reader.h
|
||||
src/audio/wave-file-writing.cpp
|
||||
src/audio/wave-file-writing.h
|
||||
)
|
||||
target_include_directories(rhubarb-audio PRIVATE "src/audio")
|
||||
target_link_libraries(
|
||||
|
|
@ -327,15 +327,15 @@ target_link_libraries(
|
|||
)
|
||||
|
||||
# ... rhubarb-core
|
||||
configure_file(src/core/appInfo.cpp.in appInfo.cpp ESCAPE_QUOTES)
|
||||
configure_file(src/core/app-info.cpp.in app-info.cpp ESCAPE_QUOTES)
|
||||
add_library(
|
||||
rhubarb-core
|
||||
${CMAKE_CURRENT_BINARY_DIR}/appInfo.cpp
|
||||
src/core/appInfo.h
|
||||
src/core/Phone.cpp
|
||||
src/core/Phone.h
|
||||
src/core/Shape.cpp
|
||||
src/core/Shape.h
|
||||
${CMAKE_CURRENT_BINARY_DIR}/app-info.cpp
|
||||
src/core/app-info.h
|
||||
src/core/phone.cpp
|
||||
src/core/phone.h
|
||||
src/core/shape.cpp
|
||||
src/core/shape.h
|
||||
)
|
||||
target_include_directories(rhubarb-core PRIVATE "src/core")
|
||||
target_link_libraries(rhubarb-core rhubarb-tools)
|
||||
|
|
@ -343,23 +343,23 @@ target_link_libraries(rhubarb-core rhubarb-tools)
|
|||
# ... rhubarb-exporters
|
||||
add_library(
|
||||
rhubarb-exporters
|
||||
src/exporters/DatExporter.cpp
|
||||
src/exporters/DatExporter.h
|
||||
src/exporters/Exporter.h
|
||||
src/exporters/exporterTools.cpp
|
||||
src/exporters/exporterTools.h
|
||||
src/exporters/JsonExporter.cpp
|
||||
src/exporters/JsonExporter.h
|
||||
src/exporters/TsvExporter.cpp
|
||||
src/exporters/TsvExporter.h
|
||||
src/exporters/XmlExporter.cpp
|
||||
src/exporters/XmlExporter.h
|
||||
src/exporters/dat-exporter.cpp
|
||||
src/exporters/dat-exporter.h
|
||||
src/exporters/exporter.h
|
||||
src/exporters/exporter-tools.cpp
|
||||
src/exporters/exporter-tools.h
|
||||
src/exporters/json-exporter.cpp
|
||||
src/exporters/json-exporter.h
|
||||
src/exporters/tsv-exporter.cpp
|
||||
src/exporters/tsv-exporter.h
|
||||
src/exporters/xml-exporter.cpp
|
||||
src/exporters/xml-exporter.h
|
||||
)
|
||||
target_include_directories(rhubarb-exporters PRIVATE "src/exporters")
|
||||
target_link_libraries(rhubarb-exporters rhubarb-animation rhubarb-core rhubarb-time)
|
||||
|
||||
# ... rhubarb-lib
|
||||
add_library(rhubarb-lib src/lib/rhubarbLib.cpp src/lib/rhubarbLib.h)
|
||||
add_library(rhubarb-lib src/lib/rhubarb-lib.cpp src/lib/rhubarb-lib.h)
|
||||
target_include_directories(rhubarb-lib PRIVATE "src/lib")
|
||||
target_link_libraries(
|
||||
rhubarb-lib
|
||||
|
|
@ -374,16 +374,16 @@ target_link_libraries(
|
|||
# ... rhubarb-logging
|
||||
add_library(
|
||||
rhubarb-logging
|
||||
src/logging/Entry.cpp
|
||||
src/logging/Entry.h
|
||||
src/logging/Formatter.h
|
||||
src/logging/entry.cpp
|
||||
src/logging/entry.h
|
||||
src/logging/formatter.h
|
||||
src/logging/formatters.cpp
|
||||
src/logging/formatters.h
|
||||
src/logging/Level.cpp
|
||||
src/logging/Level.h
|
||||
src/logging/level.cpp
|
||||
src/logging/level.h
|
||||
src/logging/logging.cpp
|
||||
src/logging/logging.h
|
||||
src/logging/Sink.h
|
||||
src/logging/sink.h
|
||||
src/logging/sinks.cpp
|
||||
src/logging/sinks.h
|
||||
)
|
||||
|
|
@ -395,15 +395,15 @@ add_library(
|
|||
rhubarb-recognition
|
||||
src/recognition/g2p.cpp
|
||||
src/recognition/g2p.h
|
||||
src/recognition/languageModels.cpp
|
||||
src/recognition/languageModels.h
|
||||
src/recognition/PhoneticRecognizer.cpp
|
||||
src/recognition/PhoneticRecognizer.h
|
||||
src/recognition/PocketSphinxRecognizer.cpp
|
||||
src/recognition/PocketSphinxRecognizer.h
|
||||
src/recognition/pocketSphinxTools.cpp
|
||||
src/recognition/pocketSphinxTools.h
|
||||
src/recognition/Recognizer.h
|
||||
src/recognition/language-models.cpp
|
||||
src/recognition/language-models.h
|
||||
src/recognition/phonetic-recognizer.cpp
|
||||
src/recognition/phonetic-recognizer.h
|
||||
src/recognition/pocket-sphinx-recognizer.cpp
|
||||
src/recognition/pocket-sphinx-recognizer.h
|
||||
src/recognition/pocket-sphinx-tools.cpp
|
||||
src/recognition/pocket-sphinx-tools.h
|
||||
src/recognition/recognizer.h
|
||||
src/recognition/tokenization.cpp
|
||||
src/recognition/tokenization.h
|
||||
)
|
||||
|
|
@ -420,15 +420,15 @@ target_link_libraries(
|
|||
# ... rhubarb-time
|
||||
add_library(
|
||||
rhubarb-time
|
||||
src/time/BoundedTimeline.h
|
||||
src/time/bounded-timeline.h
|
||||
src/time/centiseconds.cpp
|
||||
src/time/centiseconds.h
|
||||
src/time/ContinuousTimeline.h
|
||||
src/time/Timed.h
|
||||
src/time/timedLogging.h
|
||||
src/time/Timeline.h
|
||||
src/time/TimeRange.cpp
|
||||
src/time/TimeRange.h
|
||||
src/time/continuous-timeline.h
|
||||
src/time/timed.h
|
||||
src/time/timed-logging.h
|
||||
src/time/timeline.h
|
||||
src/time/time-range.cpp
|
||||
src/time/time-range.h
|
||||
)
|
||||
target_include_directories(rhubarb-time PRIVATE "src/time")
|
||||
target_link_libraries(rhubarb-time cppFormat rhubarb-logging)
|
||||
|
|
@ -437,33 +437,33 @@ target_link_libraries(rhubarb-time cppFormat rhubarb-logging)
|
|||
add_library(
|
||||
rhubarb-tools
|
||||
src/tools/array.h
|
||||
src/tools/EnumConverter.h
|
||||
src/tools/enum-converter.h
|
||||
src/tools/exceptions.cpp
|
||||
src/tools/exceptions.h
|
||||
src/tools/fileTools.cpp
|
||||
src/tools/fileTools.h
|
||||
src/tools/Lazy.h
|
||||
src/tools/nextCombination.h
|
||||
src/tools/NiceCmdLineOutput.cpp
|
||||
src/tools/NiceCmdLineOutput.h
|
||||
src/tools/ObjectPool.h
|
||||
src/tools/file-tools.cpp
|
||||
src/tools/file-tools.h
|
||||
src/tools/lazy.h
|
||||
src/tools/next-combination.h
|
||||
src/tools/nice-cmd-line-output.cpp
|
||||
src/tools/nice-cmd-line-output.h
|
||||
src/tools/object-pool.h
|
||||
src/tools/pairs.h
|
||||
src/tools/parallel.h
|
||||
src/tools/platformTools.cpp
|
||||
src/tools/platformTools.h
|
||||
src/tools/platform-tools.cpp
|
||||
src/tools/platform-tools.h
|
||||
src/tools/progress.cpp
|
||||
src/tools/progress.h
|
||||
src/tools/ProgressBar.cpp
|
||||
src/tools/ProgressBar.h
|
||||
src/tools/stringTools.cpp
|
||||
src/tools/stringTools.h
|
||||
src/tools/TablePrinter.cpp
|
||||
src/tools/TablePrinter.h
|
||||
src/tools/textFiles.cpp
|
||||
src/tools/textFiles.h
|
||||
src/tools/progress-bar.cpp
|
||||
src/tools/progress-bar.h
|
||||
src/tools/string-tools.cpp
|
||||
src/tools/string-tools.h
|
||||
src/tools/table-printer.cpp
|
||||
src/tools/table-printer.h
|
||||
src/tools/text-files.cpp
|
||||
src/tools/text-files.h
|
||||
src/tools/tools.cpp
|
||||
src/tools/tools.h
|
||||
src/tools/tupleHash.h
|
||||
src/tools/tuple-hash.h
|
||||
)
|
||||
target_include_directories(rhubarb-tools PRIVATE "src/tools")
|
||||
target_link_libraries(rhubarb-tools cppFormat whereami utfcpp utf8proc)
|
||||
|
|
@ -472,12 +472,12 @@ target_link_libraries(rhubarb-tools cppFormat whereami utfcpp utf8proc)
|
|||
add_executable(
|
||||
rhubarb
|
||||
src/rhubarb/main.cpp
|
||||
src/rhubarb/ExportFormat.cpp
|
||||
src/rhubarb/ExportFormat.h
|
||||
src/rhubarb/RecognizerType.cpp
|
||||
src/rhubarb/RecognizerType.h
|
||||
src/rhubarb/semanticEntries.cpp
|
||||
src/rhubarb/semanticEntries.h
|
||||
src/rhubarb/export-format.cpp
|
||||
src/rhubarb/export-format.h
|
||||
src/rhubarb/recognizer-type.cpp
|
||||
src/rhubarb/recognizer-type.h
|
||||
src/rhubarb/semantic-entries.cpp
|
||||
src/rhubarb/semantic-entries.h
|
||||
src/rhubarb/sinks.cpp
|
||||
src/rhubarb/sinks.h
|
||||
)
|
||||
|
|
@ -488,15 +488,15 @@ target_compile_options(rhubarb PUBLIC ${enableWarningsFlags})
|
|||
# Define test project
|
||||
#include_directories("${gtest_SOURCE_DIR}/include")
|
||||
set(TEST_FILES
|
||||
tests/stringToolsTests.cpp
|
||||
tests/TimelineTests.cpp
|
||||
tests/BoundedTimelineTests.cpp
|
||||
tests/ContinuousTimelineTests.cpp
|
||||
tests/pairsTests.cpp
|
||||
tests/tokenizationTests.cpp
|
||||
tests/g2pTests.cpp
|
||||
tests/LazyTests.cpp
|
||||
tests/WaveFileReaderTests.cpp
|
||||
tests/string-tools-tests.cpp
|
||||
tests/timeline-tests.cpp
|
||||
tests/bounded-timeline-tests.cpp
|
||||
tests/continuous-timeline-tests.cpp
|
||||
tests/pairs-tests.cpp
|
||||
tests/tokenization-tests.cpp
|
||||
tests/g2p-tests.cpp
|
||||
tests/lazy-tests.cpp
|
||||
tests/wave-file-reader-tests.cpp
|
||||
)
|
||||
add_executable(runTests ${TEST_FILES})
|
||||
target_link_libraries(
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
#include "animationRules.h"
|
||||
#include "animation-rules.h"
|
||||
|
||||
#include <boost/algorithm/clamp.hpp>
|
||||
|
||||
#include "shapeShorthands.h"
|
||||
#include "time/ContinuousTimeline.h"
|
||||
#include "shape-shorthands.h"
|
||||
#include "time/continuous-timeline.h"
|
||||
#include "tools/array.h"
|
||||
|
||||
using boost::optional;
|
||||
|
|
@ -2,9 +2,9 @@
|
|||
|
||||
#include <set>
|
||||
|
||||
#include "core/Phone.h"
|
||||
#include "core/Shape.h"
|
||||
#include "time/Timeline.h"
|
||||
#include "core/phone.h"
|
||||
#include "core/shape.h"
|
||||
#include "time/timeline.h"
|
||||
|
||||
// Returns the basic shape (A-F) that most closely resembles the specified shape.
|
||||
Shape getBasicShape(Shape shape);
|
||||
|
|
@ -1,12 +1,12 @@
|
|||
#include "mouthAnimation.h"
|
||||
#include "mouth-animation.h"
|
||||
|
||||
#include "pauseAnimation.h"
|
||||
#include "roughAnimation.h"
|
||||
#include "ShapeRule.h"
|
||||
#include "staticSegments.h"
|
||||
#include "targetShapeSet.h"
|
||||
#include "time/timedLogging.h"
|
||||
#include "timingOptimization.h"
|
||||
#include "pause-animation.h"
|
||||
#include "rough-animation.h"
|
||||
#include "shape-rule.h"
|
||||
#include "static-segments.h"
|
||||
#include "target-shape-set.h"
|
||||
#include "time/timed-logging.h"
|
||||
#include "timing-optimization.h"
|
||||
#include "tweening.h"
|
||||
|
||||
JoiningContinuousTimeline<Shape> animate(
|
||||
|
|
@ -1,9 +1,9 @@
|
|||
#pragma once
|
||||
|
||||
#include "core/Phone.h"
|
||||
#include "core/Shape.h"
|
||||
#include "targetShapeSet.h"
|
||||
#include "time/ContinuousTimeline.h"
|
||||
#include "core/phone.h"
|
||||
#include "core/shape.h"
|
||||
#include "target-shape-set.h"
|
||||
#include "time/continuous-timeline.h"
|
||||
|
||||
JoiningContinuousTimeline<Shape> animate(
|
||||
const BoundedTimeline<Phone>& phones, const ShapeSet& targetShapeSet
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
#include "pauseAnimation.h"
|
||||
#include "pause-animation.h"
|
||||
|
||||
#include "animationRules.h"
|
||||
#include "animation-rules.h"
|
||||
|
||||
Shape getPauseShape(Shape previous, Shape next, centiseconds duration) {
|
||||
// For very short pauses: Just hold the previous shape
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
#pragma once
|
||||
|
||||
#include "core/Shape.h"
|
||||
#include "time/ContinuousTimeline.h"
|
||||
#include "core/shape.h"
|
||||
#include "time/continuous-timeline.h"
|
||||
|
||||
// Takes an existing animation and modifies the pauses (X shapes) to look better.
|
||||
JoiningContinuousTimeline<Shape> animatePauses(const JoiningContinuousTimeline<Shape>& animation);
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
#include "roughAnimation.h"
|
||||
#include "rough-animation.h"
|
||||
|
||||
#include <boost/optional.hpp>
|
||||
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
#pragma once
|
||||
|
||||
#include "ShapeRule.h"
|
||||
#include "shape-rule.h"
|
||||
|
||||
// Does a rough animation (no tweening, special pause animation, etc.) using a bidirectional
|
||||
// algorithm.
|
||||
|
|
@ -1,9 +1,9 @@
|
|||
#include "ShapeRule.h"
|
||||
#include "shape-rule.h"
|
||||
|
||||
#include <boost/range/adaptor/transformed.hpp>
|
||||
#include <utility>
|
||||
|
||||
#include "time/ContinuousTimeline.h"
|
||||
#include "time/continuous-timeline.h"
|
||||
|
||||
using boost::optional;
|
||||
using boost::adaptors::transformed;
|
||||
|
|
@ -1,10 +1,10 @@
|
|||
#pragma once
|
||||
|
||||
#include "animationRules.h"
|
||||
#include "core/Phone.h"
|
||||
#include "time/BoundedTimeline.h"
|
||||
#include "time/ContinuousTimeline.h"
|
||||
#include "time/TimeRange.h"
|
||||
#include "animation-rules.h"
|
||||
#include "core/phone.h"
|
||||
#include "time/bounded-timeline.h"
|
||||
#include "time/continuous-timeline.h"
|
||||
#include "time/time-range.h"
|
||||
|
||||
struct ShapeRule {
|
||||
ShapeSet shapeSet;
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
#pragma once
|
||||
|
||||
#include "core/Shape.h"
|
||||
#include "core/shape.h"
|
||||
|
||||
constexpr Shape A = Shape::A;
|
||||
constexpr Shape B = Shape::B;
|
||||
|
|
@ -1,9 +1,9 @@
|
|||
#include "staticSegments.h"
|
||||
#include "static-segments.h"
|
||||
|
||||
#include <numeric>
|
||||
#include <vector>
|
||||
|
||||
#include "tools/nextCombination.h"
|
||||
#include "tools/next-combination.h"
|
||||
|
||||
using std::vector;
|
||||
|
||||
|
|
@ -2,9 +2,9 @@
|
|||
|
||||
#include <functional>
|
||||
|
||||
#include "core/Shape.h"
|
||||
#include "ShapeRule.h"
|
||||
#include "time/ContinuousTimeline.h"
|
||||
#include "core/shape.h"
|
||||
#include "shape-rule.h"
|
||||
#include "time/continuous-timeline.h"
|
||||
|
||||
using AnimationFunction =
|
||||
std::function<JoiningContinuousTimeline<Shape>(const ContinuousTimeline<ShapeRule>&)>;
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
#include "targetShapeSet.h"
|
||||
#include "target-shape-set.h"
|
||||
|
||||
Shape convertToTargetShapeSet(Shape shape, const ShapeSet& targetShapeSet) {
|
||||
if (targetShapeSet.find(shape) != targetShapeSet.end()) {
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
#pragma once
|
||||
|
||||
#include "core/Shape.h"
|
||||
#include "ShapeRule.h"
|
||||
#include "core/shape.h"
|
||||
#include "shape-rule.h"
|
||||
|
||||
// Returns the closest shape to the specified one that occurs in the target shape set.
|
||||
Shape convertToTargetShapeSet(Shape shape, const ShapeSet& targetShapeSet);
|
||||
|
|
@ -1,11 +1,11 @@
|
|||
#include "timingOptimization.h"
|
||||
#include "timing-optimization.h"
|
||||
|
||||
#include <algorithm>
|
||||
#include <boost/lexical_cast.hpp>
|
||||
#include <map>
|
||||
|
||||
#include "ShapeRule.h"
|
||||
#include "time/timedLogging.h"
|
||||
#include "shape-rule.h"
|
||||
#include "time/timed-logging.h"
|
||||
|
||||
using std::map;
|
||||
using std::string;
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
#pragma once
|
||||
|
||||
#include "core/Shape.h"
|
||||
#include "time/ContinuousTimeline.h"
|
||||
#include "core/shape.h"
|
||||
#include "time/continuous-timeline.h"
|
||||
|
||||
// Changes the timing of an existing animation to reduce jitter and to make sure all shapes register
|
||||
// visually.
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
#include "tweening.h"
|
||||
|
||||
#include "animationRules.h"
|
||||
#include "animation-rules.h"
|
||||
|
||||
JoiningContinuousTimeline<Shape> insertTweens(const JoiningContinuousTimeline<Shape>& animation) {
|
||||
const centiseconds minTweenDuration = 4_cs;
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
#pragma once
|
||||
|
||||
#include "core/Shape.h"
|
||||
#include "time/ContinuousTimeline.h"
|
||||
#include "core/shape.h"
|
||||
#include "time/continuous-timeline.h"
|
||||
|
||||
// Takes an existing animation and inserts inbetween shapes for smoother results.
|
||||
JoiningContinuousTimeline<Shape> insertTweens(const JoiningContinuousTimeline<Shape>& animation);
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
#include "AudioClip.h"
|
||||
#include "audio-clip.h"
|
||||
|
||||
#include <format.h>
|
||||
|
||||
|
|
@ -3,8 +3,8 @@
|
|||
#include <functional>
|
||||
#include <memory>
|
||||
|
||||
#include "time/TimeRange.h"
|
||||
#include "tools/Lazy.h"
|
||||
#include "time/time-range.h"
|
||||
#include "tools/lazy.h"
|
||||
|
||||
class AudioClip;
|
||||
class SampleIterator;
|
||||
|
|
@ -1,11 +1,11 @@
|
|||
#include "audioFileReading.h"
|
||||
#include "audio-file-reading.h"
|
||||
|
||||
#include <format.h>
|
||||
|
||||
#include <boost/algorithm/string.hpp>
|
||||
|
||||
#include "OggVorbisFileReader.h"
|
||||
#include "WaveFileReader.h"
|
||||
#include "ogg-vorbis-file-reader.h"
|
||||
#include "wave-file-reader.h"
|
||||
|
||||
using fmt::format;
|
||||
using std::runtime_error;
|
||||
|
|
@ -3,6 +3,6 @@
|
|||
#include <filesystem>
|
||||
#include <memory>
|
||||
|
||||
#include "AudioClip.h"
|
||||
#include "audio-clip.h"
|
||||
|
||||
std::unique_ptr<AudioClip> createAudioFileClip(std::filesystem::path filePath);
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
#include "AudioSegment.h"
|
||||
#include "audio-segment.h"
|
||||
|
||||
using std::make_unique;
|
||||
using std::unique_ptr;
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
#pragma once
|
||||
|
||||
#include "AudioClip.h"
|
||||
#include "audio-clip.h"
|
||||
|
||||
class AudioSegment : public AudioClip {
|
||||
public:
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
#include "DcOffset.h"
|
||||
#include "dc-offset.h"
|
||||
|
||||
#include <cmath>
|
||||
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
#pragma once
|
||||
|
||||
#include "AudioClip.h"
|
||||
#include "audio-clip.h"
|
||||
|
||||
// Applies a constant DC offset to an audio clip and reduces its amplitude
|
||||
// to prevent clipping
|
||||
|
|
@ -1,8 +1,8 @@
|
|||
#include "OggVorbisFileReader.h"
|
||||
#include "ogg-vorbis-file-reader.h"
|
||||
|
||||
#include <format.h>
|
||||
|
||||
#include "tools/fileTools.h"
|
||||
#include "tools/file-tools.h"
|
||||
#include "tools/tools.h"
|
||||
#include "vorbis/codec.h"
|
||||
#include "vorbis/vorbisfile.h"
|
||||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
#include <filesystem>
|
||||
|
||||
#include "AudioClip.h"
|
||||
#include "audio-clip.h"
|
||||
|
||||
class OggVorbisFileReader : public AudioClip {
|
||||
public:
|
||||
|
|
@ -3,7 +3,7 @@
|
|||
#include <functional>
|
||||
#include <vector>
|
||||
|
||||
#include "AudioClip.h"
|
||||
#include "audio-clip.h"
|
||||
#include "tools/progress.h"
|
||||
|
||||
void process16bitAudioClip(
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
#include "SampleRateConverter.h"
|
||||
#include "sample-rate-converter.h"
|
||||
|
||||
#include <format.h>
|
||||
|
||||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
#include <memory>
|
||||
|
||||
#include "AudioClip.h"
|
||||
#include "audio-clip.h"
|
||||
|
||||
class SampleRateConverter : public AudioClip {
|
||||
public:
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
#include "voiceActivityDetection.h"
|
||||
#include "voice-activity-detection.h"
|
||||
|
||||
#include <gsl_util.h>
|
||||
#include <webrtc/common_audio/vad/include/webrtc_vad.h>
|
||||
|
|
@ -6,10 +6,10 @@
|
|||
|
||||
#include <boost/range/adaptor/transformed.hpp>
|
||||
|
||||
#include "DcOffset.h"
|
||||
#include "dc-offset.h"
|
||||
#include "logging/logging.h"
|
||||
#include "processing.h"
|
||||
#include "SampleRateConverter.h"
|
||||
#include "sample-rate-converter.h"
|
||||
#include "tools/pairs.h"
|
||||
#include "tools/parallel.h"
|
||||
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
#pragma once
|
||||
#include "AudioClip.h"
|
||||
#include "time/BoundedTimeline.h"
|
||||
#include "audio-clip.h"
|
||||
#include "time/bounded-timeline.h"
|
||||
#include "tools/progress.h"
|
||||
|
||||
JoiningBoundedTimeline<void> detectVoiceActivity(
|
||||
|
|
@ -1,12 +1,12 @@
|
|||
#include "WaveFileReader.h"
|
||||
#include "wave-file-reader.h"
|
||||
|
||||
#include <format.h>
|
||||
|
||||
#include <iostream>
|
||||
|
||||
#include "ioTools.h"
|
||||
#include "tools/fileTools.h"
|
||||
#include "tools/platformTools.h"
|
||||
#include "io-tools.h"
|
||||
#include "tools/file-tools.h"
|
||||
#include "tools/platform-tools.h"
|
||||
|
||||
using fmt::format;
|
||||
using std::runtime_error;
|
||||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
#include <filesystem>
|
||||
|
||||
#include "AudioClip.h"
|
||||
#include "audio-clip.h"
|
||||
|
||||
enum class SampleFormat { UInt8, Int16, Int24, Int32, Float32, Float64 };
|
||||
|
||||
|
|
@ -1,8 +1,8 @@
|
|||
#include "waveFileWriting.h"
|
||||
#include "wave-file-writing.h"
|
||||
|
||||
#include <fstream>
|
||||
|
||||
#include "ioTools.h"
|
||||
#include "io-tools.h"
|
||||
|
||||
using namespace little_endian;
|
||||
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
#pragma once
|
||||
|
||||
#include "AudioClip.h"
|
||||
#include "audio-clip.h"
|
||||
|
||||
void createWaveFile(const AudioClip& audioClip, std::string fileName);
|
||||
|
|
@ -0,0 +1,4 @@
|
|||
#include "app-info.h"
|
||||
|
||||
const std::string appName = "@appName@";
|
||||
const std::string appVersion = "@appVersion@";
|
||||
|
|
@ -1,4 +0,0 @@
|
|||
#include "appInfo.h"
|
||||
|
||||
const std::string appName = "@appName@";
|
||||
const std::string appVersion = "@appVersion@";
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
#include "Phone.h"
|
||||
#include "phone.h"
|
||||
|
||||
using boost::optional;
|
||||
using std::string;
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
#pragma once
|
||||
|
||||
#include "tools/EnumConverter.h"
|
||||
#include "tools/enum-converter.h"
|
||||
|
||||
// Defines a subset of the Arpabet
|
||||
enum class Phone {
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
#include "Shape.h"
|
||||
#include "shape.h"
|
||||
|
||||
using std::set;
|
||||
using std::string;
|
||||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
#include <set>
|
||||
|
||||
#include "tools/EnumConverter.h"
|
||||
#include "tools/enum-converter.h"
|
||||
|
||||
// The classic Hanna-Barbera mouth shapes A-F plus the common supplements G-H
|
||||
// For reference, see http://sunewatts.dk/lipsync/lipsync/article_02.php
|
||||
|
|
@ -1,8 +1,8 @@
|
|||
#include "DatExporter.h"
|
||||
#include "dat-exporter.h"
|
||||
|
||||
#include <boost/lexical_cast.hpp>
|
||||
|
||||
#include "animation/targetShapeSet.h"
|
||||
#include "animation/target-shape-set.h"
|
||||
|
||||
using std::string;
|
||||
using std::chrono::duration;
|
||||
|
|
@ -3,8 +3,8 @@
|
|||
#include <map>
|
||||
#include <string>
|
||||
|
||||
#include "core/Shape.h"
|
||||
#include "Exporter.h"
|
||||
#include "core/shape.h"
|
||||
#include "exporter.h"
|
||||
|
||||
// Exporter for Moho's switch data file format
|
||||
class DatExporter : public Exporter {
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
#include "exporterTools.h"
|
||||
#include "exporter-tools.h"
|
||||
|
||||
#include "animation/targetShapeSet.h"
|
||||
#include "animation/target-shape-set.h"
|
||||
|
||||
// Makes sure there is at least one mouth shape
|
||||
std::vector<Timed<Shape>> dummyShapeIfEmpty(
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
#pragma once
|
||||
|
||||
#include "core/Shape.h"
|
||||
#include "time/Timeline.h"
|
||||
#include "core/shape.h"
|
||||
#include "time/timeline.h"
|
||||
|
||||
// Makes sure there is at least one mouth shape
|
||||
std::vector<Timed<Shape>> dummyShapeIfEmpty(
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue