zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-02-07 15:31:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

- screenjob start.

Browse source
This commit is contained in:
Christoph Oelckers 2020-06-27 11:48:55 +02:00
parent 8a06a09d05
commit 4f6ab45e35
2 changed files with 104 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

78
source/core/screenjob.cpp
View file

@ -1,10 +1,85 @@
/*
** screenjob.cpp
**
** Generic asynchronous screen display
**
**---------------------------------------------------------------------------
** Copyright 2020 Christoph Oelckers
** All rights reserved.
**
** Redistribution and use in source and binary forms, with or without
** modification, are permitted provided that the following conditions
** are met:
**
** 1. Redistributions of source code must retain the above copyright
** notice, this list of conditions and the following disclaimer.
** 2. Redistributions in binary form must reproduce the above copyright
** notice, this list of conditions and the following disclaimer in the
** documentation and/or other materials provided with the distribution.
** 3. The name of the author may not be used to endorse or promote products
** derived from this software without specific prior written permission.
**
** THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
** IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
** OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
** IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
** INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
** NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
** THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
**---------------------------------------------------------------------------
**
*/
#include "types.h" #include "types.h"
#include "build.h" #include "build.h"
#include "screenjob.h" #include "screenjob.h"
#include "dobject.h" #include "i_time.h"
#include "v_2ddrawer.h"
IMPLEMENT_CLASS(DScreenJob, true, false)
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
void RunScreenJob(DScreenJob *job, std::function<void(bool skipped)> completion, bool clearbefore)
{
if (clearbefore)
{
twod->ClearScreen();
videoNextPage();
}
auto startTime = I_nsTime();
// Input later needs to be event based so that these screens can do more than be skipped.
inputState.ClearAllInput();
while(true)
{
auto now = I_nsTime();
int frame = int((now - startTime) * 120 / 1'000'000'000);
bool skiprequest = inputState.CheckAllInput();
twod->ClearScreen();
int state = job->Frame(frame, skiprequest);
videoNextPage();
if (state < 1)
{
completion(state < 0);
return;
}
}
}
void PlayVideo(const char *filename, AnimSound *ans, int frameticks, std::function<void(bool skipped)> completion);
#if 0
void RunScreen(const char *classname, VMValue *params, int numparams, std::function<void(bool aborted)> completion) void RunScreen(const char *classname, VMValue *params, int numparams, std::function<void(bool aborted)> completion)
{ {
int ticker = 0; int ticker = 0;
@ -92,3 +167,4 @@ void RunScreen(const char *classname, VMValue *params, int numparams, std::funct
} }
completion(true); completion(true);
} }
#endif

29
source/core/screenjob.h
View file

@ -1,5 +1,30 @@
#pragma once #pragma once
#include <functional> #include <functional>
#include "vm.h" #include "dobject.h"
void RunScreen(const char *classname, VMValue *params, int numparams, std::function<void(bool aborted)> completion);
class DScreenJob : public DObject
{
DECLARE_CLASS(DScreenJob, DObject)
//std::function<void(bool skipped)> completion;
public:
virtual int Frame(int clock, bool skiprequest) = 0;
};
void RunScreenJob(DScreenJob *job, std::function<void(bool skipped)> completion, bool clearbefore = true);
struct AnimSound
{
int framenum;
int soundnum;
};
void PlayVideo(const char *filename, AnimSound *ans, int frameticks, std::function<void(bool skipped)> completion);
// This one is not suitable for ANM and SMK unless a descriptor file format is implemented.
inline void PlayVideo(const char *filename, std::function<void(bool skipped)> completion)
{
PlayVideo(filename, nullptr, -1, completion);
}