administrator/pascalabcnet
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

#570

Browse source
This commit is contained in:
Бондарев Иван 2017-11-26 18:40:20 +01:00
parent 8737281295
commit 0f0bf1df4b
9 changed files with 56 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
Compiler/Compiler.cs
View file

@ -2857,6 +2857,17 @@ namespace PascalABCCompiler
directives.Add(new TreeRealization.compiler_directive("reference", "%GAC%\\System.Numerics.dll", null));
directives.Add(new TreeRealization.compiler_directive("reference", "%GAC%\\System.Windows.Forms.dll", null));
directives.Add(new TreeRealization.compiler_directive("reference", "%GAC%\\System.Drawing.dll", null));
if (Unit.SyntaxTree is SyntaxTree.program_module && (Unit.SyntaxTree as SyntaxTree.program_module).used_units != null)
foreach (SyntaxTree.unit_or_namespace uui in (Unit.SyntaxTree as SyntaxTree.program_module).used_units.units)
{
if (uui.name.ToString() == "Graph3D")
{
directives.Add(new TreeRealization.compiler_directive("reference", "%GAC%\\PresentationFramework.dll", null));
directives.Add(new TreeRealization.compiler_directive("reference", "%GAC%\\WindowsBase.dll", null));
directives.Add(new TreeRealization.compiler_directive("reference", "%GAC%\\PresentationCore.dll", null));
directives.Add(new TreeRealization.compiler_directive("reference", "%GAC%\\HelixToolkit.Wpf.dll", null));
}
}
}
foreach (TreeRealization.compiler_directive cd in directives)
{

12
InstallerSamples/Graph3D/Часы.pas
View file

@ -1,10 +1,10 @@
uses Graph3D;
uses Graph3D;
begin
View3D.ShowGridLines := False;
var Öèôåðáëàò := Cylinder(0,0,-0.4,0.2,6,Colors.DeepPink);
var Ñåê := Arrow(0,0,0,0,-5.5,0,0.2,Colors.Yellow);
var Ìèí := Arrow(0,0,0,0,-6.0,0,0.3,Colors.Red);
var Циферблат := Cylinder(0,0,-0.4,0.2,6,Colors.DeepPink);
var Сек := Arrow(0,0,0,0,-5.5,0,0.2,Colors.Yellow);
var Мин := Arrow(0,0,0,0,-6.0,0,0.3,Colors.Red);
var a := 0;
var r := 5.8;
@ -17,7 +17,7 @@ begin
while True do
begin
Sleep(10);
Ñåê.Rotate(v3D(0,0,1),-6);
Ìèí.Rotate(v3D(0,0,1),-6/60);
Сек.Rotate(v3D(0,0,1),-6);
Мин.Rotate(v3D(0,0,1),-6/60);
end;
end.

4
ReleaseGenerators/PABCRtl/PABCRtl.pas
View file

@ -2,10 +2,10 @@ library PABCRtl;
uses
PABCSystem, PABCExtensions, ABCButtons, ABCHouse, ABCObjects,
ABCSprites, Colors, CRT, DMCollect, DMTaskMaker, DMZadan, Drawman,
ABCSprites, CRT, DMCollect, DMTaskMaker, DMZadan, Drawman,
DrawManField, Events, FilesOperations, GraphABC,
GraphABCHelper, IniFile, PointerTools, PointRect, Robot, RobotField,
RobotTaskMaker, RobotZadan, Sockets, Utils, VCL, Timers, PT4TaskMakerNET, RBDMUtils,
FormsABC, Collections, Arrays, ClientServer, __RedirectIOMode, __RunMode, __RtlUtils;
FormsABC, Collections, Arrays, ClientServer, Graph3D, __RedirectIOMode, __RunMode, __RtlUtils;
end.

4
ReleaseGenerators/PABCRtl/PABCRtl32.pas
View file

@ -2,10 +2,10 @@ library PABCRtl32;
uses
PABCSystem, PABCExtensions, ABCButtons, ABCHouse, ABCObjects,
ABCSprites, Colors, CRT, DMCollect, DMTaskMaker, DMZadan, Drawman,
ABCSprites, CRT, DMCollect, DMTaskMaker, DMZadan, Drawman,
DrawManField, Events, FilesOperations, GraphABC,
GraphABCHelper, IniFile, PointerTools, PointRect, Robot, RobotField,
RobotTaskMaker, RobotZadan, Sockets, Utils, VCL, Timers, PT4, PT4TaskMakerNET, RBDMUtils,
FormsABC, Collections, Arrays, ClientServer, __RedirectIOMode, __RunMode, __RtlUtils;
FormsABC, Collections, Arrays, ClientServer, Graph3D, __RedirectIOMode, __RunMode, __RtlUtils;
end.

2
ReleaseGenerators/RebuildStandartModules.pas
View file

@ -1,6 +1,6 @@
uses
PABCSystem, PABCExtensions, __RedirectIOMode, __RunMode, ABCButtons, ABCHouse, ABCObjects,
ABCSprites, Colors, CRT, DMCollect, DMTaskMaker, DMZadan, Drawman,
ABCSprites, CRT, DMCollect, DMTaskMaker, DMZadan, Drawman,
DrawManField, Events, FilesOperations, GraphABC,
GraphABCHelper,
Graph3D,

5
TestSuite/CompilationSamples/Colors.pas
View file

@ -1,5 +0,0 @@
// Copyright (c) Ivan Bondarev, Stanislav Mihalkovich (for details please see \doc\copyright.txt)
// This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
//Для совместимости с Pascal ABC
unit Colors;
end.

2
TestSuite/CompilationSamples/RebuildStandartModules.pas
View file

@ -1,6 +1,6 @@
uses
PABCSystem, __RedirectIOMode, __RunMode, ABCButtons, ABCHouse, ABCObjects,
ABCSprites, BFSystem, Colors, CRT, DMCollect, DMTaskMaker, DMZadan, Drawman,
ABCSprites, BFSystem, CRT, DMCollect, DMTaskMaker, DMZadan, Drawman,
DrawManField, Events, FilesOperations, GOLDParserEngine, GraphABC,
GraphABCHelper, IniFile, PointerTools, PointRect, PT4, Robot, RobotField,
RobotTaskMaker, RobotZadan, Sockets, Utils, VCL, Timers, PT4Exam, PT4TaskMakerNET, RBDMUtils,

5
bin/Lib/Colors.pas
View file

@ -1,5 +0,0 @@
// Copyright (c) Ivan Bondarev, Stanislav Mihalkovich (for details please see \doc\copyright.txt)
// This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
//Для совместимости с Pascal ABC
unit Colors;
end.

34
bin/Lib/Graph3D.pas
View file

@ -1819,12 +1819,44 @@ begin
app.Run(MainWindow);
end;
initialization
var
///--
__initialized := false;
var
///--
__finalized := false;
procedure __InitModule;
begin
MainFormThread := new System.Threading.Thread(InitWPF0);
MainFormThread.SetApartmentState(ApartmentState.STA);
MainFormThread.Start;
mre.WaitOne; // Îñíîâíàÿ ïðîãðàììà íå íà÷íåòñÿ ïîêà íå áóäóò èíèöèàëèçèðîâàíû âñå êîìïîíåíòû ïðèëîæåíèÿ
end;
///--
procedure __InitModule__;
begin
if not __initialized then
begin
__initialized := true;
__InitModule;
end;
end;
///--
procedure __FinalizeModule__;
begin
if not __finalized then
begin
__finalized := true;
end;
end;
initialization
__InitModule;
finalization
end.