kiss-lang/hollywoo
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

interruptedSpeech

Browse Source
This commit is contained in:
Nat Quayle Nelson
2024-06-25 19:51:16 -06:00
parent 835fd00907
commit 43478ac60a
1 changed files with 56 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
src/hollywoo/Movie.kiss
View File

@@ -127,7 +127,7 @@
(prop &mut :Void->Void _hideCustomDialog null) (prop &mut :Void->Void _hideCustomDialog null)
(var DELAY_BETWEEN_VOICE_TRACKS 0.1) (var DELAY_BETWEEN_VOICE_TRACKS 0.1)
(method :Void showDialog [:Bool skipping actorName dialogType wryly text cc] (method :Void showDialog [:Bool skipping actorName dialogType wryly text cc &opt :Float voCutoffPercent]
// Hide custom dialog when the next dialog appears unless HIDECUSTOMDIALOG is called manually: // Hide custom dialog when the next dialog appears unless HIDECUSTOMDIALOG is called manually:
(when _hideCustomDialog (when _hideCustomDialog
(_hideCustomDialog) (_hideCustomDialog)
@@ -136,6 +136,7 @@
(when skipping (when skipping
(cc) (cc)
(return)) (return))
(localVar &mut :kiss_tools.TimerWithPause.WrappedTimer cutoffTimer null)
(processIntercut skipping actorName (processIntercut skipping actorName
(makeCC (makeCC
(let [inputDelayKey (inputKey) (let [inputDelayKey (inputKey)
@@ -144,11 +145,32 @@
(_silentCustomDialogTypes.exists type)) (_silentCustomDialogTypes.exists type))
cc ->:Void cc ->:Void
{(stopWaitForInput inputDelayKey) {(stopWaitForInput inputDelayKey)
(delay skipping DELAY_BETWEEN_VOICE_TRACKS ->:Void { (if cutoffTimer
(director._hideDialog) (cc) // Don't delay between lines if it's an interruption :)
})} {
(TimerWithPause.stop cutoffTimer)
(director._hideDialog) (cc)
}
(delay skipping DELAY_BETWEEN_VOICE_TRACKS ->:Void {
(director._hideDialog) (cc)
}))
}
&mut customCC cc &mut customCC cc
&mut skipCC cc] &mut skipCC cc]
// Return cc if there is no vo cutoff,
// don't if there is (because the end of the track doesn't matter
// if it's been interrupted by the next thing already)
(localFunction setVoCutoff [start end]
(if voCutoffPercent
{
(set cutoffTimer
(TimerWithPause.delay
(makeCC
(director._hideDialog) (cc))
(* voCutoffPercent (- end start))))
(makeCC null)
}
cc))
// TODO when "VO for silent dialogue" is enabled play supertext vo // TODO when "VO for silent dialogue" is enabled play supertext vo
// When an actorName is given, check for a voiced line to play. // When an actorName is given, check for a voiced line to play.
// Otherwise, assume it is un-voiced super text // Otherwise, assume it is un-voiced super text
@@ -167,28 +189,31 @@
null)) null))
((objectWith trackKey start end alts) ((objectWith trackKey start end alts)
(case (dictGet altIdx "$actorName $text") (case (dictGet altIdx "$actorName $text")
// First time playing, use first alt: // First time playing, use primary track:
(null (null
(dictSet altIdx "$actorName $text" 0) (dictSet altIdx "$actorName $text" 0)
(set customCC ->:Void {}) (set customCC ->:Void {})
(director.playVoiceTrack (dictGet voiceTracks trackKey) 1 start end cc))
// All alts played, loop back to first alt: (director.playVoiceTrack (dictGet voiceTracks trackKey) 1 start end (setVoCutoff start end)))
// All alts played, loop back to primary track:
((when (>= idx alts.length) idx) ((when (>= idx alts.length) idx)
(dictSet altIdx "$actorName $text" 0) (dictSet altIdx "$actorName $text" 0)
(set customCC ->:Void {}) (set customCC ->:Void {})
(director.playVoiceTrack (dictGet voiceTracks trackKey) 1 start end cc)) (setVoCutoff start end)
// Play next alt (director.playVoiceTrack (dictGet voiceTracks trackKey) 1 start end (setVoCutoff start end)))
// Play an alt
(idx (idx
(let [alt (nth alts idx) (let [alt (nth alts idx)
start alt.start start alt.start
end alt.end] end alt.end]
(+= (dictGet altIdx "$actorName $text") 1) (+= (dictGet altIdx "$actorName $text") 1)
(set customCC ->:Void {}) (set customCC ->:Void {})
(director.playVoiceTrack (dictGet voiceTracks trackKey) 1 start end cc)))) (setVoCutoff start end)
(director.playVoiceTrack (dictGet voiceTracks trackKey) 1 start end (setVoCutoff start end)))))
(set skipCC ->:Void {(director.stopVoiceTrack (dictGet voiceTracks trackKey)) (cc)})) (set skipCC ->:Void {(director.stopVoiceTrack (dictGet voiceTracks trackKey)) (cc)}))
((objectWith trackKey start end) ((objectWith trackKey start end)
(director.playVoiceTrack (dictGet voiceTracks trackKey) 1 start end cc) (director.playVoiceTrack (dictGet voiceTracks trackKey) 1 start end (setVoCutoff start end))
(set skipCC ->:Void {(director.stopVoiceTrack (dictGet voiceTracks trackKey)) (cc)})) (set skipCC ->:Void {(director.stopVoiceTrack (dictGet voiceTracks trackKey)) (cc)}))
(otherwise))) (otherwise)))
@@ -1342,6 +1367,26 @@
(director.showExpression actor wryly) (director.showExpression actor wryly)
(showDialog skipping actorName (OnScreen character) wryly text cc))))) (showDialog skipping actorName (OnScreen character) wryly text cc)))))
(hollywooMethod interruptedSpeech [:Bool skipping actorName wryly :String text :Continuation cc]
(overridePlayMode Watch (makeCC null))
// naively guess that the interruption should happen X% of the way through the spoken
// line, where X = the position of the last / in the text
(let [wrappedCC (makeCC (restorePlayMode cc))
slashIndex (text.lastIndexOf "/")]
(when (= -1 slashIndex) (throw "interruptedSpeech requires a / in the text to indicate the cutoff point!"))
(let [slashPercent (/ slashIndex text.length)
// Remove the /
text "$(text.substr 0 slashIndex)$(text.substr (+ 1 slashIndex))"
// Remove possible double-space left by the /
text (StringTools.replace text " " " ")
text (StringTools.replace text " " " ")]
(processIntercut skipping actorName
(makeCC
(let [character (dictGet .characters (_currentScene) actorName)
actor character.actor]
(director.showExpression actor wryly)
(showDialog skipping actorName (OnScreen character) wryly text wrappedCC slashPercent)))))))
(hollywooMethod offScreenSpeech [:Bool skipping actorName wryly text :Continuation cc] (hollywooMethod offScreenSpeech [:Bool skipping actorName wryly text :Continuation cc]
(let [actor (dictGet actors actorName)] (let [actor (dictGet actors actorName)]
(director.showExpression actor wryly) (director.showExpression actor wryly)