*** empty log message ***

This commit is contained in:
ronaldhordijk 2005-02-06 09:27:22 +00:00
parent e4b303a414
commit 5432137e68
4 changed files with 8 additions and 17 deletions

View File

@ -54,8 +54,6 @@ object RenderForm: TRenderForm
Top = 330 Top = 330
Width = 409 Width = 409
Height = 13 Height = 13
Min = 0
Max = 100
TabOrder = 0 TabOrder = 0
end end
object btnRender: TButton object btnRender: TButton
@ -280,7 +278,6 @@ object RenderForm: TRenderForm
Max = 4 Max = 4
Position = 2 Position = 2
TabOrder = 3 TabOrder = 3
Wrap = False
end end
end end
object GroupBox4: TGroupBox object GroupBox4: TGroupBox
@ -324,7 +321,9 @@ object RenderForm: TRenderForm
'64' '64'
'128' '128'
'256' '256'
'512') '512'
'1024'
'1536')
end end
object chkLimitMem: TCheckBox object chkLimitMem: TCheckBox
Left = 8 Left = 8
@ -402,7 +401,7 @@ object RenderForm: TRenderForm
Width = 327 Width = 327
Height = 21 Height = 21
Style = csDropDownList Style = csDropDownList
ItemHeight = 13 ItemHeight = 0
TabOrder = 0 TabOrder = 0
OnChange = cmbPresetChange OnChange = cmbPresetChange
end end
@ -422,7 +421,6 @@ object RenderForm: TRenderForm
item item
Width = 50 Width = 50
end> end>
SimplePanel = False
end end
object SaveDialog: TSaveDialog object SaveDialog: TSaveDialog
Left = 368 Left = 368

View File

@ -243,11 +243,11 @@ begin
if (not chkLimitMem.checked) and (ApproxMemory > PhysicalMemory) then if (not chkLimitMem.checked) and (ApproxMemory > PhysicalMemory) then
begin begin
Application.MessageBox('You do not have enough memory for this render. Please use memory limiting.', 'Apophysis', 48); Application.MessageBox('You do not have enough memory for this render. Please use memory limiting.', 'Apophysis', 48);
exit; // exit;
end; end;
if chkLimitMem.checked and (PhysicalMemory < StrToInt(cbMaxMemory.text)) and (Approxmemory > PhysicalMemory) then begin if chkLimitMem.checked and (PhysicalMemory < StrToInt(cbMaxMemory.text)) and (Approxmemory > PhysicalMemory) then begin
Application.MessageBox('You do not have enough memory for this render. Please use a lower Maximum memory setting.', 'Apophysis', 48); Application.MessageBox('You do not have enough memory for this render. Please use a lower Maximum memory setting.', 'Apophysis', 48);
exit; // exit;
end; end;
t := txtFilename.Text; t := txtFilename.Text;
if t = '' then if t = '' then
@ -320,13 +320,6 @@ begin
MainForm.SaveXMLFlame(cp, ExtractFileName(FileName), renderPath + 'renders.flame'); MainForm.SaveXMLFlame(cp, ExtractFileName(FileName), renderPath + 'renders.flame');
Renderer := TRenderThread.Create; Renderer := TRenderThread.Create;
if chkLimitMem.checked then if chkLimitMem.checked then
(*
if cbMaxMemory.ItemIndex = 0 then Renderer.MaxMem := 32
else if cbMaxMemory.ItemIndex = 1 then Renderer.MaxMem := 64
else if cbMaxMemory.ItemIndex = 2 then Renderer.MaxMem := 128
else if cbMaxMemory.ItemIndex = 3 then Renderer.MaxMem := 256
else if cbMaxMemory.ItemIndex = 4 then Renderer.MaxMem := 512;
*)
Renderer.MaxMem := StrToInt(cbMaxMemory.text); Renderer.MaxMem := StrToInt(cbMaxMemory.text);
Renderer.OnProgress := OnProgress; Renderer.OnProgress := OnProgress;
Renderer.TargetHandle := RenderForm.Handle; Renderer.TargetHandle := RenderForm.Handle;

View File

@ -165,7 +165,7 @@ object ScriptEditor: TScriptEditor
'end;') 'end;')
MarkerList.UseDefaultMarkerImageIndex = False MarkerList.UseDefaultMarkerImageIndex = False
MarkerList.DefaultMarkerImageIndex = -1 MarkerList.DefaultMarkerImageIndex = -1
MarkerList.ImageTransparentColor = -1 MarkerList.ImageTransparentColor = 33554432
PrintOptions.MarginLeft = 0 PrintOptions.MarginLeft = 0
PrintOptions.MarginRight = 0 PrintOptions.MarginRight = 0
PrintOptions.MarginTop = 0 PrintOptions.MarginTop = 0

View File

@ -2709,7 +2709,7 @@ begin
Scripter.AddVariable('LimitVibrancy', LimitVibrancy); Scripter.AddVariable('LimitVibrancy', LimitVibrancy);
Scripter.AddLibrary(TMathLibrary); Scripter.AddLibrary(TMathLibrary);
Scripter.AddLibrary(TatMathLibrary); Scripter.AddLibrary(TatMathLibrary);
Scripter.AddLibrary(TatWindowsLibrary); // Scripter.AddLibrary(TatWindowsLibrary);
Scripter.AddLibrary(TatSysUtilsLibrary); Scripter.AddLibrary(TatSysUtilsLibrary);
Scripter.AddLibrary(TatFileCtrlLibrary); Scripter.AddLibrary(TatFileCtrlLibrary);
{ Nonsense - it's the only way to get the last real { Nonsense - it's the only way to get the last real