mirror-github-bspeice/apophysis
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed (probably) render-all-flames not rendering problem

Browse Source
This commit is contained in:
zueuk 2008-08-27 17:17:37 +00:00
parent f891cf8c0f
commit b80cee39a4
1 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
2.10/Source/FormRender.pas
View File

@ -439,6 +439,15 @@ begin
begin begin
path := ExtractFilePath(FileName); path := ExtractFilePath(FileName);
ext := ExtractFileExt(FileName); ext := ExtractFileExt(FileName);
if Assigned(Renderer) then begin
Output.Lines.Add(TimeToStr(Now) + 'Shutting down previous render...');
Renderer.Terminate;
Renderer.WaitFor;
Renderer.Free;
Renderer := nil;
end;
for iCurrFlame := 0 to MainForm.ListView.Items.Count-1 do for iCurrFlame := 0 to MainForm.ListView.Items.Count-1 do
begin begin
MainForm.ListView.ItemIndex := iCurrFlame; MainForm.ListView.ItemIndex := iCurrFlame;
@ -465,12 +474,6 @@ begin
Output.Lines.Add('To avoid slowdown (and possible memory problems) use BMP file format instead.'); Output.Lines.Add('To avoid slowdown (and possible memory problems) use BMP file format instead.');
end; end;
if Assigned(Renderer) then begin
//Output.Lines.Add(TimeToStr(Now) + 'Shutting down previous render'); // hmm...?
//Renderer.Terminate;
Renderer.WaitFor;
Renderer.Free;
end;
if not Assigned(Renderer) then if not Assigned(Renderer) then
begin begin
// disable screensaver // disable screensaver
@ -494,8 +497,10 @@ begin
if not bRenderAll then exit; if not bRenderAll then exit;
if iCurrFlame = MainForm.ListView.Items.Count-1 then bRenderAll := false; if iCurrFlame = MainForm.ListView.Items.Count-1 then bRenderAll := false;
Renderer := TRenderThread.Create; Renderer := TRenderThread.Create;
assert(Renderer <> nil); assert(Renderer <> nil);
Renderer.BitsPerSample := BitsPerSample; Renderer.BitsPerSample := BitsPerSample;
if chkLimitMem.checked then if chkLimitMem.checked then
Renderer.MaxMem := MaxMemory;//StrToInt(cbMaxMemory.text); Renderer.MaxMem := MaxMemory;//StrToInt(cbMaxMemory.text);
@ -507,9 +512,11 @@ begin
Renderer.Output := Output.Lines; Renderer.Output := Output.Lines;
Renderer.Resume; Renderer.Resume;
if bRenderAll then Renderer.WaitFor; if bRenderAll then Renderer.WaitFor;
while Renderer <> nil do Application.ProcessMessages; // wait for HandleThreadCompletion
except except
Output.Lines.Add(TimeToStr(Now) + ' : Rendering failed!'); Output.Lines.Add(TimeToStr(Now) + ' : Rendering failed!');
Application.MessageBox('Error while rendering!', 'Apophysis', 48) //Application.MessageBox('Error while rendering!', 'Apophysis', 48);
end; end;
end; end;
end; end;
@ -531,11 +538,13 @@ begin
end; end;
if Assigned(Renderer) then begin if Assigned(Renderer) then begin
Output.Lines.Add(TimeToStr(Now) + 'Shutting down previous render'); // hmm...? Output.Lines.Add(TimeToStr(Now) + 'Shutting down previous render...');
Renderer.Terminate; Renderer.Terminate;
Renderer.WaitFor; Renderer.WaitFor;
Renderer.Free; Renderer.Free;
Renderer := nil;
end; end;
if not Assigned(Renderer) then if not Assigned(Renderer) then
begin begin
// disable screensaver // disable screensaver
@ -572,9 +581,10 @@ begin
Renderer.Output := Output.Lines; Renderer.Output := Output.Lines;
Renderer.Resume; Renderer.Resume;
except except
Output.Lines.Add(TimeToStr(Now) + ' : Rendering failed!'); Output.Lines.Add(TimeToStr(Now) + ' : Rendering failed!');
Application.MessageBox('Error while rendering!', 'Apophysis', 48) Application.MessageBox('Error while rendering!', 'Apophysis', 48);
end; end;
end; end;
end; end;