Change File to Video to better describe both paths and urls

This commit is contained in:
Ylva Selling
2023-02-16 11:41:06 -05:00
parent bb15f0efe0
commit 871733be1e
8 changed files with 18 additions and 18 deletions
+1 -1
View File
@@ -2,7 +2,7 @@ local spec = {
Type = "ScreenSpaceVideo",
Identifier = "ScreenSpaceVideoExample",
Name = "Screen Space Browser Example",
File = "C:/Users/ylvaselling/Documents/Work/Testmovies/chlorophyll_model_2048.mp4",
Video = "C:/Users/ylvaselling/Documents/Work/Testmovies/chlorophyll_model_2048.mp4",
};
asset.onInitialize(function()
+11 -11
View File
@@ -35,11 +35,11 @@
namespace {
constexpr std::string_view _loggerCat = "VideoPlayer";
constexpr openspace::properties::Property::PropertyInfo FileInfo = {
"File",
"File",
"The file path that is used for this video provider. The file must point to a "
"video that is then loaded and used for all tiles"
constexpr openspace::properties::Property::PropertyInfo VideoInfo = {
"Video",
"Video",
"This should point to the video that should be played. It can "
"be either a file path or a url to a youtube video."
};
constexpr openspace::properties::Property::PropertyInfo PlayInfo = {
@@ -61,9 +61,9 @@ namespace {
};
constexpr openspace::properties::Property::PropertyInfo ResetInfo = {
"Reset",
"Reset",
"Reset video"
"Reset",
"Reset",
"Reset video"
};
constexpr openspace::properties::Property::PropertyInfo AudioInfo = {
@@ -73,8 +73,8 @@ namespace {
};
struct [[codegen::Dictionary(VideoPlayer)]] Parameters {
// [[codegen::verbatim(FileInfo.description)]]
std::string file;
// [[codegen::verbatim(VideoInfo.description)]]
std::string video;
// [[codegen::verbatim(AudioInfo.description)]]
std::optional<bool> playAudio;
@@ -165,7 +165,7 @@ VideoPlayer::VideoPlayer(const ghoul::Dictionary& dictionary)
const Parameters p = codegen::bake<Parameters>(dictionary);
_videoFile = p.file;
_videoFile = p.video;
// Video interaction. Only valid for real time looping
_play.onChange([this]() { play(); });
+1 -1
View File
@@ -1,6 +1,6 @@
local layer = {
Identifier = "TestVideo",
File = "C:/Users/ylvaselling/Documents/Work/Testmovies/result.mp4",
Video = "C:/Users/ylvaselling/Documents/Work/Testmovies/result.mp4",
StartTime = '2023 01 29 20:00:00',
EndTime = '2023 01 29 21:00:00',
Name = "Test Video",
+1 -1
View File
@@ -1,6 +1,6 @@
local layer = {
Identifier = "TestVideoLoop",
File = "C:/Users/ylvaselling/Documents/Work/Testmovies/black_carbon_sulfate.mp4",
Video = "C:/Users/ylvaselling/Documents/Work/Testmovies/black_carbon_sulfate.mp4",
Name = "Test Video Loop",
Enabled = asset.enabled,
Type = "VideoTileLayer",
@@ -1,6 +1,6 @@
local layer = {
Identifier = "SosLoop3",
File = "C:/Users/ylvaselling/Documents/Work/Testmovies/air_traffic_2048.mp4",
Video = "C:/Users/ylvaselling/Documents/Work/Testmovies/air_traffic_2048.mp4",
Name = "Science On A Sphere Loop Video",
Enabled = asset.enabled,
Type = "VideoTileLayer",
+1 -1
View File
@@ -1,6 +1,6 @@
local layer = {
Identifier = "SosLoop2",
File = "C:/Users/ylvaselling/Documents/Work/Testmovies/2048_jpg-2048x1024.mp4",
Video = "C:/Users/ylvaselling/Documents/Work/Testmovies/2048_jpg-2048x1024.mp4",
Name = "Science On A Sphere Loop Video",
Enabled = asset.enabled,
Type = "VideoTileLayer",
+1 -1
View File
@@ -1,6 +1,6 @@
local layer = {
Identifier = "ScienceOnASphere",
File = "C:/Users/ylvaselling/Documents/Work/Testmovies/4096-4.mp4",
Video = "C:/Users/ylvaselling/Documents/Work/Testmovies/4096-4.mp4",
StartTime = '2004 01 01 00:00:00',
EndTime = '2004 06 05 20:00:00',
Name = "Science On A Sphere Video",
+1 -1
View File
@@ -1,6 +1,6 @@
local layer = {
Identifier = "Capitals",
FilePath = "C:/Users/ylvaselling/Documents/Work/Testmovies/capitals/4096.png",
Video = "C:/Users/ylvaselling/Documents/Work/Testmovies/capitals/4096.png",
Name = "Capitals",
Enabled = asset.enabled,
Description = [[Testing video]]