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

HelixViewport.DLL

Browse source 
2018
This commit is contained in:
miks1965 2018-01-07 22:58:34 +03:00
parent 2d6dc82dda
commit 6153b0d166
11 changed files with 46 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Compiler/Compiler.cs
View file

@ -2866,6 +2866,7 @@ namespace PascalABCCompiler
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));
directives.Add(new TreeRealization.compiler_directive("reference", "%GAC%\\HelixToolkit.dll", null));
}
}
}

4
Configuration/GlobalAssemblyInfo.cs
View file

@ -5,7 +5,7 @@ using System.Runtime.CompilerServices;
[assembly: AssemblyDelaySign(false)]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("PascalABC.NET Compiler")]
[assembly: AssemblyCopyright("Copyright © 2005-2017 by Ivan Bondarev, Stanislav Mihalkovich")]
[assembly: AssemblyCopyright("Copyright © 2005-2018 by Ivan Bondarev, Stanislav Mihalkovich")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
[assembly: AssemblyVersion(RevisionClass.FullVersion)]
@ -15,7 +15,7 @@ internal static class RevisionClass
public const string Major = "3";
public const string Minor = "3";
public const string Build = "0";
public const string Revision = "1611";
public const string Revision = "1612";
public const string MainVersion = Major + "." + Minor;
public const string FullVersion = Major + "." + Minor + "." + Build + "." + Revision;

2
Configuration/GlobalAssemblyInfo.cs.tmpl
View file

@ -5,7 +5,7 @@ using System.Runtime.CompilerServices;
[assembly: AssemblyDelaySign(false)]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("PascalABC.NET Compiler")]
[assembly: AssemblyCopyright("Copyright © 2005-2017 by Ivan Bondarev, Stanislav Mihalkovich")]
[assembly: AssemblyCopyright("Copyright © 2005-2018 by Ivan Bondarev, Stanislav Mihalkovich")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
[assembly: AssemblyVersion(RevisionClass.FullVersion)]

4
Configuration/Version.defs
View file

@ -1,4 +1,4 @@
%COREVERSION%=0
%REVISION%=1611
%MINOR%=3
%REVISION%=1612
%COREVERSION%=0
%MAJOR%=3

3
ReleaseGenerators/PascalABCNET_end.nsh
View file

@ -8,6 +8,9 @@
ExecWait '"$INSTDIR\ExecHide.exe" "$INSTDIR\gacutil.exe" /u "HelixToolkit.Wpf"'
ExecWait '"$INSTDIR\ExecHide.exe" "$INSTDIR\gacutil.exe" /i "$INSTDIR\Lib\HelixToolkit.Wpf.dll"'
ExecWait '"$INSTDIR\ExecHide.exe" "$INSTDIR\gacutil.exe" /u "HelixToolkit"'
ExecWait '"$INSTDIR\ExecHide.exe" "$INSTDIR\gacutil.exe" /i "$INSTDIR\Lib\HelixToolkit.dll"'
;\MikhailoMMX
Delete "$INSTDIR\gacutil.exe"
Delete "$INSTDIR\gacutil.exe.config"

2
ReleaseGenerators/PascalABCNET_version.nsh
View file

@ -1 +1 @@
!define VERSION '3.3.0.1611'
!define VERSION '3.3.0.1612'

4
ReleaseGenerators/sect_Core.nsh
View file

@ -111,6 +111,7 @@
File ..\bin\Lib\PABCRtl.dll
File ..\bin\Lib\PABCRtl32.dll
File ..\bin\Lib\HelixToolkit.Wpf.dll
File ..\bin\Lib\HelixToolkit.dll
${AddFile} "__RedirectIOMode.pcu"
${AddFile} "__RunMode.pcu"
@ -162,6 +163,7 @@
${AddFile} "Speech.pcu"
${AddFile} "PABCRtl.dll"
${AddFile} "HelixToolkit.Wpf.dll"
${AddFile} "HelixToolkit.dll"
${AddFile} "PABCRtl.pdb"
SetOutPath "$INSTDIR\Doc"
@ -173,6 +175,8 @@
Call NGEN
Push "Lib\HelixToolkit.Wpf.dll"
Call NGEN
Push "Lib\HelixToolkit.dll"
Call NGEN
SetOutPath "$INSTDIR\LibSource"
File ..\bin\Lib\__RedirectIOMode.pas

15
TestSuite/CompilationSamples/graph3d.pas
View file

@ -1620,9 +1620,9 @@ type
FileModelT = class(ObjectWithChildren3D)
private
fn: string;
procedure SetMP(mat: GMaterial) := (model as MeshVisual3D).FaceMaterial := mat;
procedure SetMP(mat: GMaterial) := (model as FileModelVisual3D).DefaultMaterial := mat;
procedure SetMaterial(mat: GMaterial) := Invoke(SetMP, mat);
function GetMaterial: GMaterial := Invoke&<GMaterial>(()->(model as MeshVisual3D).FaceMaterial);
function GetMaterial: GMaterial := Invoke&<GMaterial>(()->(model as FileModelVisual3D).DefaultMaterial);
public
//property Color: GColor write SetColor;
property Material: GMaterial read GetMaterial write SetMaterial; // не работает почему-то на запись
@ -1635,7 +1635,7 @@ type
public
constructor(x, y, z: real; fname: string; mat: GMaterial);
begin
model := new MeshVisual3D();
{model := new MeshVisual3D();
var fs := System.IO.File.OpenRead(fname);
fn := fname;
@ -1671,11 +1671,12 @@ type
(model as MeshVisual3D).Content := md;
end;
fs.Close;
fs.Close;}
{var a := new FileModelVisual3D;
a.Source := fname;}
CreateBase0(model, x, y, z);
var a := new FileModelVisual3D;
a.DefaultMaterial := mat;
a.Source := fname;
CreateBase0(a, x, y, z);
end;
function Clone := (inherited Clone) as FileModelT;

4
_RegisterHelix.bat
View file

@ -1,2 +1,4 @@
ReleaseGenerators\gacutil.exe /u HelixToolkit.Wpf
ReleaseGenerators\gacutil.exe /i bin\Lib\HelixToolkit.Wpf.dll
ReleaseGenerators\gacutil.exe /i bin\Lib\HelixToolkit.Wpf.dll
ReleaseGenerators\gacutil.exe /u HelixToolkit
ReleaseGenerators\gacutil.exe /i bin\Lib\HelixToolkit.dll

28
bin/Lib/Graph3D.pas
View file

@ -610,6 +610,13 @@ type
property Items[i: integer]: Object3D read GetObj; default;
function Count: integer := Invoke&<integer>(CountT);
procedure DestroyP;
begin
hvp.Children.Remove(model);
model := nil;
end;
procedure Destroy := Invoke(DestroyP);
end;
ObjectWithMaterial3D = class(ObjectWithChildren3D) // model is MeshElement3D
@ -1549,6 +1556,10 @@ type
procedure SetFS(r: real) := Invoke(SetFS, r);
function GetFS: real := Invoke&<real>(()->(model as TextVisual3D).Height);
procedure SetUP(v: Vector3D) := (model as TextVisual3D).UpDirection := v;
procedure SetU(v: Vector3D) := Invoke(SetUP, v);
function GetU: Vector3D := Invoke&<Vector3D>(()->(model as TextVisual3D).UpDirection);
procedure SetNP(fontname: string) := (model as TextVisual3D).FontFamily := new FontFamily(fontname);
procedure SetN(fontname: string) := Invoke(SetTP, fontname);
function GetN: string := Invoke&<string>(()->fontname);
@ -1562,6 +1573,7 @@ type
constructor(x, y, z: real; text: string; height: real; fontname: string; c: Color);
begin
var a := new TextVisual3D;
//a.UpDirection := V3D(0,-1,0);
a.Position := p3D(0, 0, 0);
a.Text := text;
a.Height := height;
@ -1575,6 +1587,7 @@ type
property Text: string read GetT write SetT;
property Height: real read GetFS write SetFS;
property Name: string read GetN write SetN;
property UpDirection: Vector3D read GetU write SetU;
property Color: GColor read GetColor write SetColor;
function Clone := (inherited Clone) as TextT;
end;
@ -1620,9 +1633,9 @@ type
FileModelT = class(ObjectWithChildren3D)
private
fn: string;
procedure SetMP(mat: GMaterial) := (model as MeshVisual3D).FaceMaterial := mat;
procedure SetMP(mat: GMaterial) := (model as FileModelVisual3D).DefaultMaterial := mat;
procedure SetMaterial(mat: GMaterial) := Invoke(SetMP, mat);
function GetMaterial: GMaterial := Invoke&<GMaterial>(()->(model as MeshVisual3D).FaceMaterial);
function GetMaterial: GMaterial := Invoke&<GMaterial>(()->(model as FileModelVisual3D).DefaultMaterial);
public
//property Color: GColor write SetColor;
property Material: GMaterial read GetMaterial write SetMaterial; // не работает почему-то на запись
@ -1635,7 +1648,7 @@ type
public
constructor(x, y, z: real; fname: string; mat: GMaterial);
begin
model := new MeshVisual3D();
{model := new MeshVisual3D();
var fs := System.IO.File.OpenRead(fname);
fn := fname;
@ -1671,11 +1684,12 @@ type
(model as MeshVisual3D).Content := md;
end;
fs.Close;
fs.Close;}
{var a := new FileModelVisual3D;
a.Source := fname;}
CreateBase0(model, x, y, z);
var a := new FileModelVisual3D;
a.DefaultMaterial := mat;
a.Source := fname;
CreateBase0(a, x, y, z);
end;
function Clone := (inherited Clone) as FileModelT;

BIN
bin/Lib/HelixToolkit.dll Normal file
View file

Binary file not shown.