summaryrefslogtreecommitdiff
path: root/main.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'main.cpp')
-rw-r--r--main.cpp14
1 files changed, 10 insertions, 4 deletions
diff --git a/main.cpp b/main.cpp
index 4d513c4..a575ef4 100644
--- a/main.cpp
+++ b/main.cpp
@@ -108,6 +108,7 @@ SDL_sem *Semaphore;
#include "effects.cpp"
#include "keyframes.cpp"
#include "layer.cpp"
+#include "strings.cpp"
#if THREADED
#include "threading.cpp"
#else
@@ -293,7 +294,7 @@ int main(int argc, char *argv[]) {
InitMemoryTable(&GlobalMemory, &Memory, 10 * 1024 * 1024, F_Effects, "Effects");
InitMemoryTable(&GlobalMemory, &Memory, 10 * 1024 * 1024, F_Keyframes, "Keyframe blocks");
InitMemoryTable(&GlobalMemory, &Memory, 10 * 1024 * 1024, F_Strings, "Strings");
- InitMemoryTable(&GlobalMemory, &Memory, 1024 * 1024 * 1024, B_Scratch, "Scratch buffer");
+ InitMemoryTable(&GlobalMemory, &Memory, (uint64)2 * 1024 * 1024 * 1024, B_Scratch, "Scratch buffer");
project_state State = {};
@@ -305,14 +306,17 @@ int main(int argc, char *argv[]) {
}
project_data File = {};
- File.Width = 1283;
- File.Height = 723;
+ File.Width = 1280;
+ File.Height = 720;
+ // File.Width = 1923;
+ // File.Height = 1083;
File.NumberOfFrames = 65;
File.FPS = 30;
File.CurrentFrame = 1;
File.StartFrame = 0;
File.EndFrame = 65;
+ // CreateLayerFromSource(&File, &State, &Memory, "../asset/b.jpg");
// char String[1024];
// uint16 Size = 1024;
// getcwd(String, Size);
@@ -430,7 +434,7 @@ int main(int argc, char *argv[]) {
// default saves window position to an external .ini file, which can be
// loaded from disk or memory.
io.IniFilename = NULL;
- ImGui::LoadIniSettingsFromMemory(ImGuiPrefs, 1146);
+ ImGui::LoadIniSettingsFromMemory(ImGuiPrefs);
ImGui::StyleColorsDark();
@@ -481,6 +485,8 @@ int main(int argc, char *argv[]) {
ImGui_File(&File, &State, &Memory, &UI, io);
+ ImGui_EffectsPanel(&File, &State, &Memory, &UI, io);
+
ImGui_PropertiesPanel(&File, &State, &UI, &Memory);
ImGui_Timeline(&File, &State, &Memory, &UI, io);