Browse Source

Updated v2.5

glscene 8 months ago
parent
commit
c87ac51d44
100 changed files with 177 additions and 815 deletions
  1. BIN
      Assets/Texture/GLX.png
  2. 3 15
      Examples/AdvDemoc.groupproj
  3. 2 2
      Examples/AdvDemos/ActorMS3D/fActorMS3dC.cpp
  4. 3 2
      Examples/AdvDemos/ActorMS3D/fActorMS3dC.h
  5. 7 16
      Examples/AdvDemos/Christmas/fChrismasD.dfm
  6. 6 2
      Examples/AdvDemos/GLSViewer/GLSViewerD.dproj
  7. 2 2
      Examples/AdvDemos/GLSViewer/Source/fGLForm.dfm
  8. 12 9
      Examples/AdvDemos/GLSViewer/Source/fGLSViewer.dfm
  9. 52 98
      Examples/AdvDemos/GLSViewer/Source/fcGLSViewer.dfm
  10. 7 5
      Examples/Demos/behaviours/DCEDemo/fDceDemoD.dfm
  11. 0 26
      Examples/Demox/Joystickplayer/Joystickplayer.dpr
  12. 0 136
      Examples/Demox/Joystickplayer/Joystickplayer.dproj
  13. BIN
      Examples/Demox/Joystickplayer/Joystickplayer.dres
  14. 0 4
      Examples/Demox/Joystickplayer/JoystickplayerResource.rc
  15. 0 354
      Examples/Demox/Joystickplayer/fdJoistickplayer.fmx
  16. 0 144
      Examples/Demox/Joystickplayer/fdJoistickplayer.pas
  17. BIN
      Examples/Demox/Joystickplayer/ileVolcan128b.png
  18. BIN
      Examples/Demox/Joystickplayer/ileVolcan256b.png
  19. BIN
      Examples/Demox/Joystickplayer/ileVolcan32b.png
  20. BIN
      Examples/Demox/Joystickplayer/ileVolcan64b.png
  21. BIN
      Examples/Demox/Joystickplayer/texBras.png
  22. BIN
      Examples/Demox/Joystickplayer/texCorps.png
  23. BIN
      Examples/Demox/Joystickplayer/texJambe.png
  24. BIN
      Examples/Demox/Joystickplayer/texTete.png
  25. 0 0
      Externals/DWS/Packages/GLScene_DWS_DT.dpk
  26. 0 0
      Externals/DWS/Packages/GLScene_DWS_DT.dproj
  27. 0 0
      Externals/DWS/Packages/GLScene_DWS_RT.dpk
  28. 0 0
      Externals/DWS/Packages/GLScene_DWS_RT.dproj
  29. 0 0
      Externals/DWS/Packages/GXScene_Scripts_DT.dpk
  30. 0 0
      Externals/DWS/Packages/GXScene_Scripts_DT.dproj
  31. 0 0
      Externals/DWS/Packages/GXScene_Scripts_RT.dpk
  32. 0 0
      Externals/DWS/Packages/GXScene_Scripts_RT.dproj
  33. 0 0
      Externals/DWS/Source/DWS.Classes.pas
  34. 0 0
      Externals/DWS/Source/DWS.HelperFunc.pas
  35. 0 0
      Externals/DWS/Source/DWS.Objects.pas
  36. 0 0
      Externals/DWS/Source/DWS.OpenGL.pas
  37. 0 0
      Externals/DWS/Source/DWS.Scene.pas
  38. 0 0
      Externals/DWS/Source/DWS.Script.pas
  39. 0 0
      Externals/DWS/Source/DWS.VectorGeometry.pas
  40. 0 0
      Externals/DWS/Source/DWSx.Classes.pas
  41. 0 0
      Externals/DWS/Source/DWSx.HelperFunc.pas
  42. 0 0
      Externals/DWS/Source/DWSx.Objects.pas
  43. 0 0
      Externals/DWS/Source/DWSx.OpenGL.pas
  44. 0 0
      Externals/DWS/Source/DWSx.Scene.pas
  45. 0 0
      Externals/DWS/Source/DWSx.Script.pas
  46. 0 0
      Externals/DWS/Source/DWSx.VectorGeometry.pas
  47. 9 0
      Externals/GR32/Delphinus.Info.json
  48. 74 0
      Externals/GR32/Delphinus.Install.json
  49. 0 0
      Externals/GR32/Examples/Blending/BlendVsMerge/BlendVsMerge.dpr
  50. 0 0
      Externals/GR32/Examples/Blending/BlendVsMerge/BlendVsMerge.dproj
  51. 0 0
      Externals/GR32/Examples/Blending/BlendVsMerge/BlendVsMergeC.cbproj
  52. 0 0
      Externals/GR32/Examples/Blending/BlendVsMerge/BlendVsMergeC.cpp
  53. 0 0
      Externals/GR32/Examples/Blending/BlendVsMerge/Media.rc
  54. 0 0
      Externals/GR32/Examples/Blending/BlendVsMerge/fMainC.cpp
  55. 0 0
      Externals/GR32/Examples/Blending/BlendVsMerge/fMainC.dfm
  56. 0 0
      Externals/GR32/Examples/Blending/BlendVsMerge/fMainC.h
  57. 0 0
      Externals/GR32/Examples/Blending/BlendVsMerge/fMainD.dfm
  58. 0 0
      Externals/GR32/Examples/Blending/BlendVsMerge/fMainD.pas
  59. 0 0
      Externals/GR32/Examples/Blending/Blending.groupproj
  60. 0 0
      Externals/GR32/Examples/Blending/PixelCombine/MainUnit.dfm
  61. 0 0
      Externals/GR32/Examples/Blending/PixelCombine/MainUnit.pas
  62. 0 0
      Externals/GR32/Examples/Blending/PixelCombine/Media.rc
  63. 0 0
      Externals/GR32/Examples/Blending/PixelCombine/PixelCombine.bpr
  64. 0 0
      Externals/GR32/Examples/Blending/PixelCombine/PixelCombine.cpp
  65. 0 0
      Externals/GR32/Examples/Blending/PixelCombine/PixelCombine.dpr
  66. 0 0
      Externals/GR32/Examples/Blending/PixelCombine/PixelCombine.dproj
  67. 0 0
      Externals/GR32/Examples/Blending/TextureBlend/MainUnit.dfm
  68. 0 0
      Externals/GR32/Examples/Blending/TextureBlend/MainUnit.pas
  69. 0 0
      Externals/GR32/Examples/Blending/TextureBlend/Media.rc
  70. 0 0
      Externals/GR32/Examples/Blending/TextureBlend/TextureBlend.dpr
  71. 0 0
      Externals/GR32/Examples/Blending/TextureBlend/TextureBlend.dproj
  72. 0 0
      Externals/GR32/Examples/Drawing/AntiAliasing/AntiAliasing.dpr
  73. 0 0
      Externals/GR32/Examples/Drawing/AntiAliasing/AntiAliasing.dproj
  74. 0 0
      Externals/GR32/Examples/Drawing/AntiAliasing/MainUnit.dfm
  75. 0 0
      Externals/GR32/Examples/Drawing/AntiAliasing/MainUnit.pas
  76. 0 0
      Externals/GR32/Examples/Drawing/AntiAliasing/Media.rc
  77. 0 0
      Externals/GR32/Examples/Drawing/ArrowHead/ArrowHead.dpr
  78. 0 0
      Externals/GR32/Examples/Drawing/ArrowHead/ArrowHead.dproj
  79. 0 0
      Externals/GR32/Examples/Drawing/ArrowHead/MainUnit.dfm
  80. 0 0
      Externals/GR32/Examples/Drawing/ArrowHead/MainUnit.pas
  81. 0 0
      Externals/GR32/Examples/Drawing/ArrowHead/Media.rc
  82. 0 0
      Externals/GR32/Examples/Drawing/Benchmark/Benchmark.dpr
  83. 0 0
      Externals/GR32/Examples/Drawing/Benchmark/Benchmark.dproj
  84. 0 0
      Externals/GR32/Examples/Drawing/Benchmark/MainUnit.dfm
  85. 0 0
      Externals/GR32/Examples/Drawing/Benchmark/MainUnit.pas
  86. 0 0
      Externals/GR32/Examples/Drawing/Benchmark/Media.rc
  87. 0 0
      Externals/GR32/Examples/Drawing/Blurs/Blurs.dpr
  88. 0 0
      Externals/GR32/Examples/Drawing/Blurs/Blurs.dproj
  89. 0 0
      Externals/GR32/Examples/Drawing/Blurs/MainUnit.dfm
  90. 0 0
      Externals/GR32/Examples/Drawing/Blurs/MainUnit.pas
  91. 0 0
      Externals/GR32/Examples/Drawing/Blurs/Media.rc
  92. 0 0
      Externals/GR32/Examples/Drawing/Clipper/Clipper.dpr
  93. 0 0
      Externals/GR32/Examples/Drawing/Clipper/Clipper.dproj
  94. 0 0
      Externals/GR32/Examples/Drawing/Clipper/Media.rc
  95. 0 0
      Externals/GR32/Examples/Drawing/Clipper/fClipper.dfm
  96. 0 0
      Externals/GR32/Examples/Drawing/Clipper/fClipper.pas
  97. 0 0
      Externals/GR32/Examples/Drawing/CubicSpline/CubicSpline.dpr
  98. 0 0
      Externals/GR32/Examples/Drawing/CubicSpline/CubicSpline.dproj
  99. 0 0
      Externals/GR32/Examples/Drawing/CubicSpline/MainUnit.dfm
  100. 0 0
      Externals/GR32/Examples/Drawing/CubicSpline/MainUnit.pas

BIN
Assets/Texture/GLX.png


+ 3 - 15
Examples/AdvDemoc.groupproj

@@ -27,9 +27,6 @@
         <Projects Include="AdvDemos\TexCombine\TexCombineC.cbproj">
             <Dependencies/>
         </Projects>
-        <Projects Include="AdvDemos\Archipelago\Splitter\SplitterC.cbproj">
-            <Dependencies/>
-        </Projects>
     </ItemGroup>
     <ProjectExtensions>
         <Borland.Personality>Default.Personality.12</Borland.Personality>
@@ -110,23 +107,14 @@
     <Target Name="TexCombineC:Make">
         <MSBuild Projects="AdvDemos\TexCombine\TexCombineC.cbproj" Targets="Make"/>
     </Target>
-    <Target Name="SplitterC">
-        <MSBuild Projects="AdvDemos\Archipelago\Splitter\SplitterC.cbproj"/>
-    </Target>
-    <Target Name="SplitterC:Clean">
-        <MSBuild Projects="AdvDemos\Archipelago\Splitter\SplitterC.cbproj" Targets="Clean"/>
-    </Target>
-    <Target Name="SplitterC:Make">
-        <MSBuild Projects="AdvDemos\Archipelago\Splitter\SplitterC.cbproj" Targets="Make"/>
-    </Target>
     <Target Name="Build">
-        <CallTarget Targets="ActorMS3dC;ArchipelagoC;ChristmasC;GLSViewerC;IntensityMeshC;PanoViewerC;QuakeActorC;TexCombineC;SplitterC"/>
+        <CallTarget Targets="ActorMS3dC;ArchipelagoC;ChristmasC;GLSViewerC;IntensityMeshC;PanoViewerC;QuakeActorC;TexCombineC"/>
     </Target>
     <Target Name="Clean">
-        <CallTarget Targets="ActorMS3dC:Clean;ArchipelagoC:Clean;ChristmasC:Clean;GLSViewerC:Clean;IntensityMeshC:Clean;PanoViewerC:Clean;QuakeActorC:Clean;TexCombineC:Clean;SplitterC:Clean"/>
+        <CallTarget Targets="ActorMS3dC:Clean;ArchipelagoC:Clean;ChristmasC:Clean;GLSViewerC:Clean;IntensityMeshC:Clean;PanoViewerC:Clean;QuakeActorC:Clean;TexCombineC:Clean"/>
     </Target>
     <Target Name="Make">
-        <CallTarget Targets="ActorMS3dC:Make;ArchipelagoC:Make;ChristmasC:Make;GLSViewerC:Make;IntensityMeshC:Make;PanoViewerC:Make;QuakeActorC:Make;TexCombineC:Make;SplitterC:Make"/>
+        <CallTarget Targets="ActorMS3dC:Make;ArchipelagoC:Make;ChristmasC:Make;GLSViewerC:Make;IntensityMeshC:Make;PanoViewerC:Make;QuakeActorC:Make;TexCombineC:Make"/>
     </Target>
     <Import Project="$(BDS)\Bin\CodeGear.Group.Targets" Condition="Exists('$(BDS)\Bin\CodeGear.Group.Targets')"/>
 </Project>

+ 2 - 2
Examples/AdvDemos/ActorMS3D/fActorMS3dC.cpp

@@ -15,13 +15,13 @@
 #pragma link "GLS.Material"
 #pragma link "GLS.Objects"
 
+#pragma link "Stage.VectorTypes"
+#pragma link "Stage.VectorGeometry"
 #pragma link "Stage.Utils"
 #pragma link "GLS.GeomObjects"
 #pragma link "GLS.Graphics"
-#pragma link "Stage.VectorTypes"
 #pragma link "GLS.RenderContextInfo"
 #pragma link "GLS.ShadowPlane"
-#pragma link "Stage.VectorGeometry"
 #pragma link "GLS.Mesh"
 #pragma link "GLS.Windows"
 #pragma link "GLS.State"

+ 3 - 2
Examples/AdvDemos/ActorMS3D/fActorMS3dC.h

@@ -11,6 +11,9 @@
 #include <Vcl.StdCtrls.hpp>
 #include <Vcl.Forms.hpp>
 
+#include "Stage.VectorGeometry.hpp"
+#include "Stage.Utils.hpp"
+
 #include "GLS.BaseClasses.hpp"
 #include "GLS.Cadencer.hpp"
 #include "GLS.Coordinates.hpp"
@@ -24,8 +27,6 @@
 
 #include "GLS.Scene.hpp"
 
-#include "Stage.VectorGeometry.hpp"
-
 #include "GLS.SimpleNavigation.hpp"
 #include "GLS.VectorFileObjects.hpp"
 #include "GLS.SceneViewer.hpp"

+ 7 - 16
Examples/AdvDemos/Christmas/fChrismasD.dfm

@@ -1,19 +1,15 @@
 object Main: TMain
   Left = 129
   Top = 63
-  Margins.Left = 5
-  Margins.Top = 5
-  Margins.Right = 5
-  Margins.Bottom = 5
   Align = alCustom
   BorderStyle = bsNone
   Caption = 'Christmas'
-  ClientHeight = 966
-  ClientWidth = 1230
+  ClientHeight = 552
+  ClientWidth = 703
   Color = clBtnFace
   Font.Charset = DEFAULT_CHARSET
   Font.Color = clWindowText
-  Font.Height = -19
+  Font.Height = -11
   Font.Name = 'MS Sans Serif'
   Font.Style = []
   Visible = True
@@ -22,23 +18,18 @@ object Main: TMain
   OnKeyPress = FormKeyPress
   OnMouseWheel = FormMouseWheel
   OnResize = FormResize
-  PixelsPerInch = 168
-  TextHeight = 24
+  TextHeight = 13
   object Viewer: TGLSceneViewer
     Left = 0
     Top = 0
-    Width = 1230
-    Height = 966
-    Margins.Left = 5
-    Margins.Top = 5
-    Margins.Right = 5
-    Margins.Bottom = 5
+    Width = 703
+    Height = 552
     Camera = Camera
     Buffer.BackgroundColor = clBlack
     Buffer.AmbientColor.Color = {0000803F0000803F0000803F0000803F}
     Buffer.ContextOptions = [roDoubleBuffer, roRenderToWindow]
     Buffer.AntiAliasing = aa2x
-    FieldOfView = 168.492782592773400000
+    FieldOfView = 160.000000000000000000
     PenAsTouch = False
     Align = alClient
     OnDblClick = ViewerDblClick

+ 6 - 2
Examples/AdvDemos/GLSViewer/GLSViewerD.dproj

@@ -115,9 +115,11 @@
         <AppDPIAwarenessMode>PerMonitorV2</AppDPIAwarenessMode>
         <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
         <VerInfo_Locale>1033</VerInfo_Locale>
-        <VerInfo_Keys>CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName)</VerInfo_Keys>
+        <VerInfo_Keys>CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=2.5.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName)</VerInfo_Keys>
         <Icon_MainIcon>..\..\..\Assets\Icon\Pyramid.ico</Icon_MainIcon>
         <DCC_UnitSearchPath>..\..\..\Unipas;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
+        <VerInfo_MajorVer>2</VerInfo_MajorVer>
+        <VerInfo_MinorVer>5</VerInfo_MinorVer>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Cfg_2_Win64)'!=''">
         <AppDPIAwarenessMode>PerMonitorV2</AppDPIAwarenessMode>
@@ -174,6 +176,9 @@
                     <Source Name="MainSource">GLSViewerD.dpr</Source>
                 </Source>
                 <Excluded_Packages>
+                    <Excluded_Packages Name="C:\Users\Public\Documents\Embarcadero\Studio\23.0\Bpl\GLXEngine_DTRT.bpl">File C:\Users\Public\Documents\Embarcadero\Studio\23.0\Bpl\GLXEngine_DTRT.bpl not found</Excluded_Packages>
+                    <Excluded_Packages Name="C:\Users\Public\Documents\Embarcadero\Studio\23.0\Bpl\GXScene_GBE.bpl">GXScene GBE</Excluded_Packages>
+                    <Excluded_Packages Name="C:\Users\Public\Documents\Embarcadero\Studio\23.0\Bpl\GBComps.bpl">Geoblock - Components</Excluded_Packages>
                     <Excluded_Packages Name="$(BDSBIN)\bcboffice2k290.bpl">Embarcadero C++Builder Office 2000 Servers Package</Excluded_Packages>
                     <Excluded_Packages Name="$(BDSBIN)\bcbofficexp290.bpl">Embarcadero C++Builder Office XP Servers Package</Excluded_Packages>
                     <Excluded_Packages Name="$(BDSBIN)\dcloffice2k290.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>
@@ -185,7 +190,6 @@
                 <Platform value="Win64">True</Platform>
             </Platforms>
             <Deployment Version="5">
-                <DeployFile LocalName="GLSViewerD.exe" Configuration="Debug" Class="ProjectOutput"/>
                 <DeployFile LocalName="GLSViewerD.exe" Configuration="Debug" Class="ProjectOutput"/>
                 <DeployClass Name="AdditionalDebugSymbols">
                     <Platform Name="iOSSimulator">

+ 2 - 2
Examples/AdvDemos/GLSViewer/Source/fGLForm.dfm

@@ -8,10 +8,10 @@ object GLForm: TGLForm
   Font.Charset = DEFAULT_CHARSET
   Font.Color = clWindowText
   Font.Height = -16
-  Font.Name = 'MS Sans Serif'
+  Font.Name = 'Segoe UI'
   Font.Style = []
   Position = poMainFormCenter
   Scaled = False
   OnCreate = FormCreate
-  TextHeight = 20
+  TextHeight = 21
 end

+ 12 - 9
Examples/AdvDemos/GLSViewer/Source/fGLSViewer.dfm

@@ -157,16 +157,16 @@ object FormGLSViewer: TFormGLSViewer
   end
   object snViewer: TGLSceneViewer
     Left = 273
-    Top = 56
+    Top = 54
     Width = 807
-    Height = 627
+    Height = 629
     Camera = Camera
     BeforeRender = snViewerBeforeRender
     AfterRender = snViewerAfterRender
     Buffer.BackgroundColor = clBlack
     Buffer.ContextOptions = [roDoubleBuffer, roRenderToWindow, roTwoSideLighting]
     Buffer.FaceCulling = False
-    FieldOfView = 161.876480102539100000
+    FieldOfView = 161.933151245117200000
     PenAsTouch = False
     OnMouseLeave = snViewerMouseLeave
     Align = alClient
@@ -176,11 +176,12 @@ object FormGLSViewer: TFormGLSViewer
   end
   object ControlBar: TControlBar
     Left = 0
-    Top = 27
+    Top = 25
     Width = 1080
     Height = 29
     Align = alTop
     TabOrder = 2
+    ExplicitWidth = 1072
     object atbTools: TActionToolBar
       Left = 357
       Top = 2
@@ -248,7 +249,7 @@ object FormGLSViewer: TFormGLSViewer
     Left = 0
     Top = 0
     Width = 1080
-    Height = 27
+    Height = 25
     UseSystemFont = False
     ActionManager = ActionManager
     Caption = 'ActionMainMenuBar'
@@ -263,20 +264,21 @@ object FormGLSViewer: TFormGLSViewer
     Font.Name = 'MS Sans Serif'
     Font.Style = []
     Spacing = 0
+    ExplicitWidth = 1072
   end
   object PanelLeft: TPanel
     Left = 0
-    Top = 56
+    Top = 54
     Width = 273
-    Height = 627
+    Height = 629
     Align = alLeft
     TabOrder = 4
-    ExplicitHeight = 602
+    ExplicitHeight = 604
     object tvScene: TTreeView
       Left = 1
       Top = 1
       Width = 271
-      Height = 625
+      Height = 627
       Align = alClient
       CheckStyles = [csDimmed]
       Images = dmImages.ImageListGLS
@@ -480,6 +482,7 @@ object FormGLSViewer: TFormGLSViewer
         6D0070007500740069006E0067000000410000005E0000005E000000FFFFFFFF
         FFFFFFFF0000000000000000000000000001114300550044004100470065006E
         006500720061007400650064004D00650073006800}
+      ExplicitHeight = 602
     end
   end
   object Scene: TGLScene

+ 52 - 98
Examples/AdvDemos/GLSViewer/Source/fcGLSViewer.dfm

@@ -1,152 +1,121 @@
 object FormViewer: TFormViewer
   Left = 0
   Top = 0
-  Margins.Left = 5
-  Margins.Top = 5
-  Margins.Right = 5
-  Margins.Bottom = 5
   Caption = 'GLSViewer'
-  ClientHeight = 776
-  ClientWidth = 1290
+  ClientHeight = 595
+  ClientWidth = 785
   Color = clBtnFace
   Font.Charset = DEFAULT_CHARSET
   Font.Color = clWindowText
-  Font.Height = -21
+  Font.Height = -12
   Font.Name = 'Segoe UI'
   Font.Style = []
   Position = poScreenCenter
-  PixelsPerInch = 168
-  TextHeight = 30
+  TextHeight = 15
   object StatusBar: TStatusBar
     Left = 0
-    Top = 742
-    Width = 1290
-    Height = 34
-    Margins.Left = 5
-    Margins.Top = 5
-    Margins.Right = 5
-    Margins.Bottom = 5
+    Top = 576
+    Width = 785
+    Height = 19
     Panels = <
       item
         Text = 'X'
-        Width = 88
+        Width = 50
       end
       item
         Text = 'Y'
-        Width = 88
+        Width = 50
       end
       item
         Text = 'Z'
-        Width = 88
+        Width = 50
       end
       item
         Text = 'Model'
-        Width = 70
+        Width = 40
       end>
-    ExplicitLeft = -127
-    ExplicitWidth = 1223
+    ExplicitTop = 424
+    ExplicitWidth = 733
   end
   object snViewer: TGLSceneViewer
-    Left = 267
-    Top = 82
-    Width = 1023
-    Height = 660
-    Margins.Left = 5
-    Margins.Top = 5
-    Margins.Right = 5
-    Margins.Bottom = 5
+    Left = 153
+    Top = 54
+    Width = 632
+    Height = 522
     Camera = Camera
     Buffer.BackgroundColor = clGray
     Buffer.ContextOptions = [roDoubleBuffer, roRenderToWindow, roTwoSideLighting]
     Buffer.FaceCulling = False
-    FieldOfView = 162.768707275390600000
+    FieldOfView = 158.310379028320300000
     PenAsTouch = False
     Align = alClient
     TabOrder = 1
-    ExplicitWidth = 830
+    ExplicitWidth = 581
+    ExplicitHeight = 370
   end
   object ControlBar: TControlBar
     Left = 0
-    Top = 31
-    Width = 1290
-    Height = 51
-    Margins.Left = 5
-    Margins.Top = 5
-    Margins.Right = 5
-    Margins.Bottom = 5
+    Top = 25
+    Width = 785
+    Height = 29
     Align = alTop
-    RowSize = 46
     TabOrder = 2
-    ExplicitLeft = -127
-    ExplicitTop = 43
-    ExplicitWidth = 1223
+    ExplicitWidth = 733
     object atbTools: TActionToolBar
-      Left = 580
+      Left = 333
       Top = 2
-      Width = 113
-      Height = 42
-      Margins.Left = 5
-      Margins.Top = 5
-      Margins.Right = 5
-      Margins.Bottom = 5
+      Width = 65
+      Height = 22
       ActionManager = ActionManager
       Caption = 'Tools'
       Color = clMenuBar
-      ColorMap.DisabledFontColor = 7171437
+      ColorMap.DisabledFontColor = 10461087
       ColorMap.HighlightColor = clWhite
       ColorMap.BtnSelectedFont = clBlack
       ColorMap.UnusedColor = clWhite
       Font.Charset = DEFAULT_CHARSET
       Font.Color = clBlack
-      Font.Height = -23
+      Font.Height = -13
       Font.Name = 'Tahoma'
       Font.Style = []
       ParentFont = False
       Spacing = 0
     end
     object atbView: TActionToolBar
-      Left = 176
+      Left = 102
       Top = 2
-      Width = 383
-      Height = 42
-      Margins.Left = 5
-      Margins.Top = 5
-      Margins.Right = 5
-      Margins.Bottom = 5
+      Width = 218
+      Height = 22
       ActionManager = ActionManager
       Caption = 'View'
       Color = clMenuBar
-      ColorMap.DisabledFontColor = 7171437
+      ColorMap.DisabledFontColor = 10461087
       ColorMap.HighlightColor = clWhite
       ColorMap.BtnSelectedFont = clBlack
       ColorMap.UnusedColor = clWhite
       Font.Charset = DEFAULT_CHARSET
       Font.Color = clBlack
-      Font.Height = -23
+      Font.Height = -13
       Font.Name = 'Tahoma'
       Font.Style = []
       ParentFont = False
       Spacing = 0
     end
     object atbFile: TActionToolBar
-      Left = 19
+      Left = 11
       Top = 2
-      Width = 136
-      Height = 42
-      Margins.Left = 5
-      Margins.Top = 5
-      Margins.Right = 5
-      Margins.Bottom = 5
+      Width = 78
+      Height = 22
       ActionManager = ActionManager
       Caption = 'File'
       Color = clMenuBar
-      ColorMap.DisabledFontColor = 7171437
+      ColorMap.DisabledFontColor = 10461087
       ColorMap.HighlightColor = clWhite
       ColorMap.BtnSelectedFont = clBlack
       ColorMap.UnusedColor = clWhite
       Font.Charset = DEFAULT_CHARSET
       Font.Color = clBlack
-      Font.Height = -23
+      Font.Height = -13
       Font.Name = 'Tahoma'
       Font.Style = []
       ParentFont = False
@@ -158,55 +127,40 @@ object FormViewer: TFormViewer
   object amMenuBar: TActionMainMenuBar
     Left = 0
     Top = 0
-    Width = 1290
-    Height = 31
-    Margins.Left = 5
-    Margins.Top = 5
-    Margins.Right = 5
-    Margins.Bottom = 5
+    Width = 785
+    Height = 25
     UseSystemFont = False
     ActionManager = ActionManager
     Caption = 'ActionMainMenuBar'
     Color = clMenuBar
-    ColorMap.DisabledFontColor = 7171437
+    ColorMap.DisabledFontColor = 10461087
     ColorMap.HighlightColor = clWhite
     ColorMap.BtnSelectedFont = clBlack
     ColorMap.UnusedColor = clWhite
     Font.Charset = DEFAULT_CHARSET
     Font.Color = clBlack
-    Font.Height = -19
+    Font.Height = -11
     Font.Name = 'MS Sans Serif'
     Font.Style = []
     Spacing = 0
-    ExplicitLeft = -127
-    ExplicitWidth = 1223
-    ExplicitHeight = 43
+    ExplicitWidth = 733
   end
   object PanelLeft: TPanel
     Left = 0
-    Top = 82
-    Width = 267
-    Height = 660
-    Margins.Left = 5
-    Margins.Top = 5
-    Margins.Right = 5
-    Margins.Bottom = 5
+    Top = 54
+    Width = 153
+    Height = 522
     Align = alLeft
     TabOrder = 4
-    ExplicitTop = 67
-    ExplicitHeight = 709
+    ExplicitHeight = 370
     object tvScene: TTreeView
       Left = 1
       Top = 1
-      Width = 265
-      Height = 658
-      Margins.Left = 5
-      Margins.Top = 5
-      Margins.Right = 5
-      Margins.Bottom = 5
+      Width = 151
+      Height = 520
       Align = alClient
       Images = ImageListObjects
-      Indent = 33
+      Indent = 19
       ParentShowHint = False
       ShowHint = True
       TabOrder = 0
@@ -405,7 +359,7 @@ object FormViewer: TFormViewer
         6D0070007500740069006E0067000000410000005E0000005E000000FFFFFFFF
         FFFFFFFF0000000000000000000000000001114300550044004100470065006E
         006500720061007400650064004D00650073006800}
-      ExplicitHeight = 707
+      ExplicitHeight = 368
     end
   end
   object Scene: TGLScene

+ 7 - 5
Examples/Demos/behaviours/DCEDemo/fDceDemoD.dfm

@@ -2,8 +2,8 @@ object FormDCE: TFormDCE
   Left = 192
   Top = 114
   Caption = 'GLScene Dynamic Collision Engine'
-  ClientHeight = 606
-  ClientWidth = 890
+  ClientHeight = 640
+  ClientWidth = 926
   Color = clBtnFace
   Font.Charset = DEFAULT_CHARSET
   Font.Color = clWindowText
@@ -18,18 +18,20 @@ object FormDCE: TFormDCE
   object GLSceneViewer1: TGLSceneViewer
     Left = 0
     Top = 0
-    Width = 890
-    Height = 606
+    Width = 926
+    Height = 640
     Camera = GLCamera1
     Buffer.FogEnvironment.FogStart = 50.000000000000000000
     Buffer.FogEnvironment.FogEnd = 250.000000000000000000
     Buffer.BackgroundColor = clBlack
     Buffer.FogEnable = True
-    FieldOfView = 161.259384155273400000
+    FieldOfView = 162.238677978515600000
     PenAsTouch = False
     Align = alClient
     OnMouseMove = GLSceneViewer1MouseMove
     TabOrder = 0
+    ExplicitWidth = 890
+    ExplicitHeight = 606
   end
   object GLScene1: TGLScene
     Left = 24

+ 0 - 26
Examples/Demox/Joystickplayer/Joystickplayer.dpr

@@ -1,26 +0,0 @@
-program Joystickplayer;
-
-
-
-
-
-
-
-
-
-
-
-{$R *.dres}
-
-uses
-  System.StartUpCopy,
-  FMX.Forms,
-  fdJoistickplayer in 'fdJoistickplayer.pas' {FormJoistick};
-
-{$R *.res}
-
-begin
-  Application.Initialize;
-  Application.CreateForm(TFormJoistick, FormJoistick);
-  Application.Run;
-end.

File diff suppressed because it is too large
+ 0 - 136
Examples/Demox/Joystickplayer/Joystickplayer.dproj


BIN
Examples/Demox/Joystickplayer/Joystickplayer.dres


+ 0 - 4
Examples/Demox/Joystickplayer/JoystickplayerResource.rc

@@ -1,4 +0,0 @@
-heightmap256 RCDATA "ileVolcan256b.png"
-heightmap32 RCDATA "ileVolcan32b.png"
-heightmap64 RCDATA "ileVolcan64b.png"
-PngImage_1 RCDATA "ileVolcan128b.png"

+ 0 - 354
Examples/Demox/Joystickplayer/fdJoistickplayer.fmx

@@ -1,354 +0,0 @@
-object FormJoistick: TFormJoistick
-  Left = 0
-  Top = 0
-  Caption = 'Joystick Player'
-  ClientHeight = 480
-  ClientWidth = 640
-  Fill.Kind = Gradient
-  Fill.Gradient.Points = <
-    item
-      Color = xFF9EE1FF
-      Offset = 0.000000000000000000
-    end
-    item
-      Color = xFF0064B6
-      Offset = 1.000000000000000000
-    end>
-  Fill.Gradient.StartPosition.X = 0.500000000000000000
-  Fill.Gradient.StartPosition.Y = 1.000000000000000000
-  Fill.Gradient.StopPosition.X = 0.499999970197677600
-  Fill.Gradient.StopPosition.Y = 0.000000000000000000
-  Position = ScreenCenter
-  FormFactor.Width = 320
-  FormFactor.Height = 480
-  FormFactor.Devices = [Desktop]
-  OnCreate = FormCreate
-  DesignerMasterStyle = 0
-  object GBEViewport: TGBEViewport3D
-    Align = Client
-    Color = claNull
-    HitTest = False
-    Size.Width = 640.000000000000000000
-    Size.Height = 480.000000000000000000
-    Size.PlatformDefault = False
-    ActiveFPS = False
-    object dmyMonde: TDummy
-      Width = 1.000000000000000000
-      Height = 1.000000000000000000
-      Depth = 1.000000000000000000
-      object GBEHeightmap1: TGBEHeightmap
-        RotationAngle.X = 180.000000000000000000
-        Locked = False
-        Width = 50.000000000000000000
-        Height = 6.000000000000000000
-        Depth = 50.000000000000000000
-        HitTest = True
-        TwoSide = False
-        MaterialSource = TextureMaterialSource1
-        Flou = 1
-        ShowLines = True
-        MaterialLines = ColorMaterialSource1
-        UseRamp = True
-        Quanternion = '(1,0,0,-4.37113882867379E-8)'
-        object GBEPlayerPosition1: TGBEPlayerPosition
-          Position.Z = 19.000000000000000000
-          RotationAngle.X = 180.000000000000000000
-          Width = 1.000000000000000000
-          Height = 1.000000000000000000
-          Depth = 1.000000000000000000
-          AngleOfView = 30.000000000000000000
-          TypePosition = thirdPerson
-          Quanternion = '(1,0,0,-4.37113882867379E-8)'
-          object Dummy1: TDummy
-            Width = 1.000000000000000000
-            Height = 1.000000000000000000
-            Depth = 1.000000000000000000
-            object corps: TCube
-              Position.Y = -0.300000011920929000
-              Width = 0.200000002980232200
-              Height = 0.200000002980232200
-              Depth = 0.200000002980232200
-              MaterialSource = texCorps
-              object jambeD: TCube
-                Position.X = 0.070000000298023220
-                Position.Y = 0.200000002980232200
-                Width = 0.070000000298023220
-                Height = 0.200000002980232200
-                Depth = 0.070000000298023220
-                MaterialSource = texJambe
-              end
-              object jambeG: TCube
-                Position.X = -0.070000000298023220
-                Position.Y = 0.200000002980232200
-                Width = 0.070000000298023220
-                Height = 0.200000002980232200
-                Depth = 0.070000000298023220
-                MaterialSource = texJambe
-              end
-              object Sphere1: TSphere
-                Position.Y = -0.200000002980232200
-                Width = 0.200000002980232200
-                Height = 0.200000002980232200
-                Depth = 0.200000002980232200
-                MaterialSource = texTete
-              end
-              object brasD: TCube
-                Position.X = 0.150000005960464500
-                RotationAngle.Z = 315.000000000000000000
-                Width = 0.050000000745058060
-                Height = 0.200000002980232200
-                Depth = 0.050000000745058060
-                MaterialSource = texBras
-                Quanternion = '(0,0,0.382683396339417,-0.923879504203796)'
-              end
-              object brasG: TCube
-                Position.X = -0.150000005960464500
-                RotationAngle.X = 180.000000000000000000
-                RotationAngle.Z = 225.000000000000000000
-                Width = 0.050000000745058060
-                Height = 0.200000002980232200
-                Depth = 0.050000000745058060
-                MaterialSource = texBras
-                Quanternion = 
-                  '(0.382683455944061,-0.923879444599152,4.03840516582932E-8,-1.672' +
-                  '76255069737E-8)'
-              end
-            end
-          end
-        end
-      end
-    end
-    object Layout1: TLayout
-      Align = Left
-      HitTest = True
-      Size.Width = 128.000000000000000000
-      Size.Height = 480.000000000000000000
-      Size.PlatformDefault = False
-      TabOrder = 0
-      object GBEJoystick1: TGBEJoystick
-        Align = Bottom
-        Position.Y = 352.000000000000000000
-        Size.Width = 128.000000000000000000
-        Size.Height = 128.000000000000000000
-        Size.PlatformDefault = False
-        TabOrder = 0
-        PlayerPosition = GBEPlayerPosition1
-        JoystickType = jtOrientation
-        Viewport3D = GBEViewport
-        ShowIntegrateJoystick = True
-        Sensitivity = 180
-        MouseCapture = False
-        object Image1: TImage
-          MultiResBitmap = <
-            item
-              Width = 50
-              Height = 50
-              PNG = {
-                89504E470D0A1A0A0000000D49484452000000320000003208060000001E3F88
-                B10000000473424954080808087C086488000002F2494441546881ED984F681C
-                651C869FDF26ED5A522A42A9861EEC412FA554D40A9E24210D58503C89F55872
-                5890FE39059A6077DE6F1736A92905EB419B833DB646F0E0494C83EBC552DA22
-                5A587A686FBD54C1886E7437EDEEAF87EC8A94DA9D2DBBC954E6397D0CDFFBCD
-                FB3030F3CD0729292929292929587B10421877F713C01EE09975ECB00C5C073E
-                96F4D5E32E320020A908CC03CF035B7A522F3E5B5AF77D6F6464E4A972B9BCF4
-                388B580861CCDD1781BB669677F74F24FDD5D3AA8F606E6E6E68656565023805
-                0C9AD9581445DF75BBCEA0BB4780B9FB09491FF5BC6907262727578033218421
-                772FB97B1E882D2269B399E506819701CC6CBE4F5D63E1EE678112F04A9CF90B
-                0B0B03954A6502C8BBFBCE0CB01540D2EFFDABD91949BFB586DB3ACD0D218C55
-                2A95CBC0596027C0601FBBF59C42A1F052B3D99C75F7375B977E0176C0132252
-                2C165F6C341AA79BCDE65BAD4BCB6616DCFD53A00E091791F41C101A8DC62160
-                13F03770269BCD9E9C9A9A5A6ECD01122A22691B30EDEE87CD6C08B8C7DA77AE
-                28E9F6C3328914016E01DBCDCC812F81BCA41B8F0A2455643B70CDCCA6A2285A
-                8C1348AAC8FB92BE003C6E209122922E749BC9F4A3C846908A248D5424692452
-                44D241FEF51B1E87448A00E7255D09218CC70D2455E426F0AABB7F2BE992A437
-                3A051229323C3CBC1BC8017780D781EF252D4ADAFB5F99448AE472B9BB92E681
-                17CCEC38F027B01FF851D282A45D0F6612B9456923A90A9C2C954A9FAFAEAE7E
-                087C00BC0BBC23E9B36C36AB7ABD0E24F4893CC8F4F4F4AF928E6532997DC037
-                C066E068BD5EFF676BFF4488B4C9E7F33F493A6066FB816BB4FED7614DA40A30
-                3B3BFBF406F503606666A67D4CFB47A7B951142D49DA078C033FC39AC855805A
-                AD76A85F25E350ABD572ADE195B819491781D7CCECA88510DE76F7AF81D58D3A
-                32AD56AB47CCACC0DA59F498A472B7EB1880A412709C2EB7053DC68182DAC722
-                5D3200502E97974647477F007601CFB2BEAFE51A70C9CC26249D5BC7FBA6A4A4
-                A4A4A4FCFFB80F2FC209F63895AD480000000049454E44AE426082}
-              FileName = 'D:\Developpement\Composants\GBE3D\camera50px.png'
-            end>
-          Align = Center
-          HitTest = False
-        end
-      end
-      object texBras: TTextureMaterialSource
-        Texture.PNG = {
-          89504E470D0A1A0A0000000D4948445200000020000000200806000000737A7A
-          F40000000473424954080808087C0864880000003C494441545885EDD4311100
-          201003C13CFE55600B030C0EA84006051B03B7552A7D9E3C5C7B190700000048
-          92DA6B7842000000000000000080BF01174F0206858571CA2B0000000049454E
-          44AE426082}
-        Left = 48
-        Top = 304
-      end
-    end
-    object Layout2: TLayout
-      Align = Right
-      Position.X = 512.000000000000000000
-      Size.Width = 128.000000000000000000
-      Size.Height = 480.000000000000000000
-      Size.PlatformDefault = False
-      TabOrder = 1
-      object GBEJoystick2: TGBEJoystick
-        Align = Bottom
-        Position.Y = 352.000000000000000000
-        Size.Width = 128.000000000000000000
-        Size.Height = 128.000000000000000000
-        Size.PlatformDefault = False
-        TabOrder = 0
-        PlayerPosition = GBEPlayerPosition1
-        JoystickType = jtDeplacement
-        Viewport3D = GBEViewport
-        ShowIntegrateJoystick = True
-        Sensitivity = 180
-        MouseCapture = False
-        object Image2: TImage
-          MultiResBitmap = <
-            item
-              Width = 50
-              Height = 50
-              PNG = {
-                89504E470D0A1A0A0000000D49484452000000320000003208060000001E3F88
-                B10000000473424954080808087C086488000000DC494441546881ED99510AC2
-                30104457F15AEAD5E66642BD96A03F164C8C9A34131CC2BCCFD26C782C21B324
-                C29821EC5885002C11716C5CB6003833F6DF338A3C6995888838B1363FB00AAD
-                00A8EA32803B735F6647FE8A45D4B0881A1651C3226A58448D694492D0B8318A
-                77D1111E931120EF48AFC475D0BF259211A018E36BA3780F0036CF22A52E4E73
-                462CA28645D4B0881A1651E3D3CD4EC93FDF60E7BABC23D4FCF3831E895B445C
-                5E3FE4E9979A7F2AD75172DD3467C4226A58440D8BA86111352CA2C6342223DE
-                D9A9EFE7B5303BD23A02BC4571630479008D182E504A67A6540000000049454E
-                44AE426082}
-              FileName = 'D:\Developpement\Composants\GBE3D\camera50px.png'
-            end>
-          Align = Center
-          HitTest = False
-        end
-      end
-      object Rectangle1: TRectangle
-        Align = Top
-        Opacity = 0.899999976158142100
-        Margins.Top = 5.000000000000000000
-        Margins.Right = 5.000000000000000000
-        Position.Y = 5.000000000000000000
-        Size.Width = 123.000000000000000000
-        Size.Height = 105.000000000000000000
-        Size.PlatformDefault = False
-        Stroke.Thickness = 3.000000000000000000
-        XRadius = 5.000000000000000000
-        YRadius = 5.000000000000000000
-        object ComboBox1: TComboBox
-          Align = Top
-          Items.Strings = (
-            'Third person'
-            'First person')
-          ItemIndex = 0
-          Margins.Left = 10.000000000000000000
-          Margins.Right = 10.000000000000000000
-          Position.X = 10.000000000000000000
-          Position.Y = 71.000000000000000000
-          Size.Width = 103.000000000000000000
-          Size.Height = 22.000000000000000000
-          Size.PlatformDefault = False
-          TabOrder = 0
-          OnChange = ComboBox1Change
-        end
-        object Label1: TLabel
-          Align = Top
-          Margins.Left = 5.000000000000000000
-          Position.X = 5.000000000000000000
-          Size.Width = 118.000000000000000000
-          Size.Height = 17.000000000000000000
-          Size.PlatformDefault = False
-          Text = 'Show lines'
-          TabOrder = 1
-        end
-        object Label2: TLabel
-          Align = Top
-          Margins.Left = 5.000000000000000000
-          Margins.Top = 10.000000000000000000
-          Position.X = 5.000000000000000000
-          Position.Y = 54.000000000000000000
-          Size.Width = 118.000000000000000000
-          Size.Height = 17.000000000000000000
-          Size.PlatformDefault = False
-          Text = 'View'
-          TabOrder = 2
-        end
-        object Switch1: TSwitch
-          Align = Top
-          IsChecked = True
-          Margins.Left = 10.000000000000000000
-          Margins.Right = 10.000000000000000000
-          Position.X = 10.000000000000000000
-          Position.Y = 17.000000000000000000
-          Size.Width = 103.000000000000000000
-          Size.Height = 27.000000000000000000
-          Size.PlatformDefault = False
-          TabOrder = 3
-          OnSwitch = Switch1Switch
-        end
-      end
-    end
-    object texJambe: TTextureMaterialSource
-      Texture.PNG = {
-        89504E470D0A1A0A0000000D4948445200000020000000200806000000737A7A
-        F40000000473424954080808087C08648800000037494441545885EDD7310100
-        201003B13EFE55A00E1720A30C3903CDDAC93E37C556731C0000000000000000
-        000000E00BC02471CD00AA3D6BE503C77B5D833C0000000049454E44AE426082}
-      Left = 48
-      Top = 200
-    end
-  end
-  object TextureMaterialSource1: TTextureMaterialSource
-    Texture.PNG = {
-      89504E470D0A1A0A0000000D49484452000000FF00000002080600000097040A
-      0D0000000473424954080808087C086488000000B349444154388DED51410EC2
-      300CB35D26A49DF8192FE179BC8A37A0ED40B636C92615AED4DAD426A99338E1
-      EDFE58B081C4214EFCD70B314FC43CC94EE2F57E0258B03108C23EF3F17372BF
-      D518E97956DAF100908107EE2DBA9C0CBCDE5E12AFF69679D5CE1A7C4DAFC1D7
-      F41ABCFED84BABFF775E9C47134BBB6935C4DD849CCCB338B25D2CECD3D9719E
-      E4D7B5BAF3A75AB23C0228E3C9FCD10EEFA8435EE2501D397ADF9DF72409A514
-      F70B0303037F89158930074380A1D1BB0000000049454E44AE426082}
-    Left = 56
-    Top = 24
-  end
-  object FloatAnimation1: TFloatAnimation
-    Duration = 0.200000002980232200
-    Loop = True
-    OnProcess = FloatAnimation1Process
-    PropertyName = 'tag'
-    StartValue = 0.000000000000000000
-    StopValue = 1.000000000000000000
-  end
-  object ColorMaterialSource1: TColorMaterialSource
-    Color = claSandybrown
-    Left = 56
-    Top = 80
-  end
-  object texCorps: TTextureMaterialSource
-    Texture.PNG = {
-      89504E470D0A1A0A0000000D4948445200000020000000200806000000737A7A
-      F40000000473424954080808087C0864880000004A494441545885EDD3510D00
-      200C03514AF06F0275A8E8641C1F37037B697269DB05DE269F7F0138B90F05E0
-      0BE08058010DB0021C600538C00A708015E0002BC001568003AC000758C1003D
-      6E1FEE10C713300000000049454E44AE426082}
-    Left = 48
-    Top = 136
-  end
-  object texTete: TTextureMaterialSource
-    Texture.PNG = {
-      89504E470D0A1A0A0000000D4948445200000020000000200806000000737A7A
-      F40000000473424954080808087C0864880000006249444154588563FCFF89E1
-      3FC30002A681B47CD401A30E1875C0A803461D30EA8051078C0C07FCFA711BAF
-      3C23B12D2298416C1CAA54B118EE809FAF6E53D424C3E620622D6760606060A1
-      C472522DC306867F221C75C0A803461D30EA8041EF000004811844A6D69C4800
-      00000049454E44AE426082}
-    Left = 48
-    Top = 256
-  end
-end

+ 0 - 144
Examples/Demox/Joystickplayer/fdJoistickplayer.pas

@@ -1,144 +0,0 @@
-unit fdJoistickplayer;
-
-interface
-
-uses
-  System.SysUtils,
-  System.Types,
-  System.UITypes,
-  System.Classes,
-  System.Variants,
-  System.Math.Vectors,
-  FMX.Types,
-  FMX.Controls,
-  FMX.Forms,
-  FMX.Graphics,
-  FMX.Dialogs,
-  FMX.Controls3D,
-  FMX.Objects3D,
-  FMX.Viewport3D,
-  FMX.MaterialSources,
-  FMX.Ani,
-  FMX.Layouts,
-  FMX.Controls.Presentation,
-  FMX.StdCtrls,
-  FMX.ListBox,
-  FMX.Objects,
-  FMX.Types3D,
-
-  uGBEUtils3D,
-  GBE.Joystick,
-  GBE.PlayerPosition,
-  GBE.Heightmap,
-  GBE.Viewport3D;
-
-type
-  TFormJoistick = class(TForm)
-    GBEViewport: TGBEViewport3D;
-    dmyMonde: TDummy;
-    GBEHeightmap1: TGBEHeightmap;
-    TextureMaterialSource1: TTextureMaterialSource;
-    FloatAnimation1: TFloatAnimation;
-    ColorMaterialSource1: TColorMaterialSource;
-    GBEPlayerPosition1: TGBEPlayerPosition;
-    Layout1: TLayout;
-    GBEJoystick1: TGBEJoystick;
-    Layout2: TLayout;
-    GBEJoystick2: TGBEJoystick;
-    corps: TCube;
-    Label1: TLabel;
-    Switch1: TSwitch;
-    Label2: TLabel;
-    ComboBox1: TComboBox;
-    Rectangle1: TRectangle;
-    Image1: TImage;
-    Image2: TImage;
-    Dummy1: TDummy;
-    jambeD: TCube;
-    jambeG: TCube;
-    Sphere1: TSphere;
-    brasD: TCube;
-    brasG: TCube;
-    texCorps: TTextureMaterialSource;
-    texTete: TTextureMaterialSource;
-    texJambe: TTextureMaterialSource;
-    texBras: TTextureMaterialSource;
-    procedure FormCreate(Sender: TObject);
-    procedure FloatAnimation1Process(Sender: TObject);
-    procedure Switch1Switch(Sender: TObject);
-    procedure ComboBox1Change(Sender: TObject);
-  private
-    { Déclarations privées }
-  public
-    { Déclarations publiques }
-    vitesse : single;
-  end;
-
-const
-  tailleJoueur = 0.7;    // Taille du joueur pour la vue FirstPerson
-  vitesseMax = 0.1;    // Vitesse maxi de déplacement
-
-var
-  FormJoistick: TFormJoistick;
-
-implementation
-
-{$R *.fmx}
-
-procedure TFormJoistick.ComboBox1Change(Sender: TObject);
-begin
-  case ComboBox1.ItemIndex of
-    0: GBEPlayerPosition1.TypePosition := TGBETypePosition.thirdPerson;
-    1: GBEPlayerPosition1.TypePosition := TGBETypePosition.firstPerson;
-  end;
-end;
-
-procedure TFormJoistick.FloatAnimation1Process(Sender: TObject);
-begin
-  if GBEJoystick2.Acceleration = 0 then vitesse := 0
-  else begin
-    if abs(vitesse) <= vitesseMax then vitesse := vitesse + GBEJoystick2.Acceleration/5000;
-
-    GBEPlayerPosition1.NextPosition.Position.point := GBEPlayerPosition1.Position.Point - GBEJoystick2.direction * vitesse;
-    GBEPlayerPosition1.NextPosition.position.Y := GBEHeightmap1.GetHeight(GBEPlayerPosition1.Position.Point);
-
-    if GBEPlayerPosition1.TypePosition = TGBETypePosition.firstPerson then
-       GBEPlayerPosition1.NextPosition.position.Y := GBEPlayerPosition1.NextPosition.position.Y + tailleJoueur;
-
-    // On controle que la prochaine position est dans l'aire de jeu
-    if (GBEPlayerPosition1.NextPosition.position.Point.x < GBEHeightmap1.Depth*0.5) and
-       (GBEPlayerPosition1.NextPosition.position.Point.x > -GBEHeightmap1.Depth*0.5) and
-       (GBEPlayerPosition1.NextPosition.position.Point.z < GBEHeightmap1.width*0.5) and
-       (GBEPlayerPosition1.NextPosition.position.Point.z > -GBEHeightmap1.Depth*0.5) then
-    begin
-      GBEPlayerPosition1.Position.point := GBEPlayerPosition1.NextPosition.position.Point; // Si c'est le cas, on peut affecter la position à la procahine calculée
-    end
-    else vitesse := 0; // sinon on ne déplace pas le joueur et on réinitialise sa vitesse de déplacement
-  end;
-end;
-
-procedure TFormJoistick.FormCreate(Sender: TObject);
-var
-  stream : TResourceStream;
-begin
-  Stream := TResourceStream.Create(HInstance, 'heightmap32', RT_RCDATA);
-  GBEHeightmap1.loadHeightmapFromStream(stream);
-  stream.Free;
-
-  GBEViewport.Camera := GBEPlayerPosition1.getCamera;
-  GBEViewport.UsingDesignCamera := false;
-
-  GBEJoystick1.Width := 0;
-  GBEJoystick2.Width := 0;
-  GBEJoystick2.deplacement := Point3D(-1,0,1);
-
-  vitesse := 0;
-  FloatAnimation1.Start;
-end;
-
-procedure TFormJoistick.Switch1Switch(Sender: TObject);
-begin
-  GBEHeightmap1.ShowLines := Switch1.IsChecked;
-end;
-
-end.

BIN
Examples/Demox/Joystickplayer/ileVolcan128b.png


BIN
Examples/Demox/Joystickplayer/ileVolcan256b.png


BIN
Examples/Demox/Joystickplayer/ileVolcan32b.png


BIN
Examples/Demox/Joystickplayer/ileVolcan64b.png


BIN
Examples/Demox/Joystickplayer/texBras.png


BIN
Examples/Demox/Joystickplayer/texCorps.png


BIN
Examples/Demox/Joystickplayer/texJambe.png


BIN
Examples/Demox/Joystickplayer/texTete.png


+ 0 - 0
external/DWS/Packages/GLScene_DWS_DT.dpk → Externals/DWS/Packages/GLScene_DWS_DT.dpk


+ 0 - 0
external/DWS/Packages/GLScene_DWS_DT.dproj → Externals/DWS/Packages/GLScene_DWS_DT.dproj


+ 0 - 0
external/DWS/Packages/GLScene_DWS_RT.dpk → Externals/DWS/Packages/GLScene_DWS_RT.dpk


+ 0 - 0
external/DWS/Packages/GLScene_DWS_RT.dproj → Externals/DWS/Packages/GLScene_DWS_RT.dproj


+ 0 - 0
external/DWS/Packages/GXScene_Scripts_DT.dpk → Externals/DWS/Packages/GXScene_Scripts_DT.dpk


+ 0 - 0
external/DWS/Packages/GXScene_Scripts_DT.dproj → Externals/DWS/Packages/GXScene_Scripts_DT.dproj


+ 0 - 0
external/DWS/Packages/GXScene_Scripts_RT.dpk → Externals/DWS/Packages/GXScene_Scripts_RT.dpk


+ 0 - 0
external/DWS/Packages/GXScene_Scripts_RT.dproj → Externals/DWS/Packages/GXScene_Scripts_RT.dproj


+ 0 - 0
external/DWS/Source/DWS.Classes.pas → Externals/DWS/Source/DWS.Classes.pas


+ 0 - 0
external/DWS/Source/DWS.HelperFunc.pas → Externals/DWS/Source/DWS.HelperFunc.pas


+ 0 - 0
external/DWS/Source/DWS.Objects.pas → Externals/DWS/Source/DWS.Objects.pas


+ 0 - 0
external/DWS/Source/DWS.OpenGL.pas → Externals/DWS/Source/DWS.OpenGL.pas


+ 0 - 0
external/DWS/Source/DWS.Scene.pas → Externals/DWS/Source/DWS.Scene.pas


+ 0 - 0
external/DWS/Source/DWS.Script.pas → Externals/DWS/Source/DWS.Script.pas


+ 0 - 0
external/DWS/Source/DWS.VectorGeometry.pas → Externals/DWS/Source/DWS.VectorGeometry.pas


+ 0 - 0
external/DWS/Source/DWSx.Classes.pas → Externals/DWS/Source/DWSx.Classes.pas


+ 0 - 0
external/DWS/Source/DWSx.HelperFunc.pas → Externals/DWS/Source/DWSx.HelperFunc.pas


+ 0 - 0
external/DWS/Source/DWSx.Objects.pas → Externals/DWS/Source/DWSx.Objects.pas


+ 0 - 0
external/DWS/Source/DWSx.OpenGL.pas → Externals/DWS/Source/DWSx.OpenGL.pas


+ 0 - 0
external/DWS/Source/DWSx.Scene.pas → Externals/DWS/Source/DWSx.Scene.pas


+ 0 - 0
external/DWS/Source/DWSx.Script.pas → Externals/DWS/Source/DWSx.Script.pas


+ 0 - 0
external/DWS/Source/DWSx.VectorGeometry.pas → Externals/DWS/Source/DWSx.VectorGeometry.pas


+ 9 - 0
Externals/GR32/Delphinus.Info.json

@@ -0,0 +1,9 @@
+{
+	"id": "{D606376C-61F9-4A84-86AA-EB85B4084574}",
+	"picture": "Examples\\Media\\GR32.png",
+	"license_type": "MPL-1.1;LGPL-2.1",
+	"license_file": "Source/License.txt",
+	"platforms": "Win32;Win64",
+	"package_compiler_min": 21,
+	"compiler_min": 21
+}

+ 74 - 0
Externals/GR32/Delphinus.Install.json

@@ -0,0 +1,74 @@
+{
+	"source_folders":
+	[
+		{
+			"folder": ".",
+			"recursive": true,
+			"filter": "*"
+		}
+	],
+	
+	"projects":
+	[
+		{
+			"project": "Source\\Packages\\2010\\GR32.groupproj",
+			"compiler_min": 21,
+			"compiler_max": 21
+		},
+		{
+			"project": "Source\\Packages\\XE\\GR32.groupproj",
+			"compiler_min": 22,
+			"compiler_max": 22
+		},
+		{
+			"project": "Source\\Packages\\XE2\\GR32.groupproj",
+			"compiler_min": 23,
+			"compiler_max": 23
+		},
+		{
+			"project": "Source\\Packages\\XE3\\GR32.groupproj",
+			"compiler_min": 24,
+			"compiler_max": 24
+		},
+		{
+			"project": "Source\\Packages\\XE4\\GR32.groupproj",
+			"compiler_min": 25,
+			"compiler_max": 25
+		},
+		{
+			"project": "Source\\Packages\\XE5\\GR32.groupproj",
+			"compiler_min": 26,
+			"compiler_max": 26
+		},
+		{
+			"project": "Source\\Packages\\XE6\\GR32.groupproj",
+			"compiler_min": 27,
+			"compiler_max": 27
+		},
+		{
+			"project": "Source\\Packages\\XE7\\GR32.groupproj",
+			"compiler_min": 28,
+			"compiler_max": 28
+		},
+		{
+			"project": "Source\\Packages\\XE8\\GR32.groupproj",
+			"compiler_min": 29,
+			"compiler_max": 29
+		},
+		{
+			"project": "Source\\Packages\\RX\\GR32.groupproj",
+			"compiler_min": 30,
+			"compiler_max": 30
+		},
+		{
+			"project": "Source\\Packages\\RX1\\GR32.groupproj",
+			"compiler_min": 31,
+			"compiler_max": 31
+		},
+		{
+			"project": "Source\\Packages\\RX2\\GR32.groupproj",
+			"compiler_min": 32,
+			"compiler_max": 32
+		}
+	]
+}

+ 0 - 0
external/GR32/Examples/Blending/BlendVsMerge/BlendVsMerge.dpr → Externals/GR32/Examples/Blending/BlendVsMerge/BlendVsMerge.dpr


+ 0 - 0
external/GR32/Examples/Blending/BlendVsMerge/BlendVsMerge.dproj → Externals/GR32/Examples/Blending/BlendVsMerge/BlendVsMerge.dproj


+ 0 - 0
external/GR32/Examples/Blending/BlendVsMerge/BlendVsMergeC.cbproj → Externals/GR32/Examples/Blending/BlendVsMerge/BlendVsMergeC.cbproj


+ 0 - 0
external/GR32/Examples/Blending/BlendVsMerge/BlendVsMergeC.cpp → Externals/GR32/Examples/Blending/BlendVsMerge/BlendVsMergeC.cpp


+ 0 - 0
external/GR32/Examples/Blending/BlendVsMerge/Media.rc → Externals/GR32/Examples/Blending/BlendVsMerge/Media.rc


+ 0 - 0
external/GR32/Examples/Blending/BlendVsMerge/fMainC.cpp → Externals/GR32/Examples/Blending/BlendVsMerge/fMainC.cpp


+ 0 - 0
external/GR32/Examples/Blending/BlendVsMerge/fMainC.dfm → Externals/GR32/Examples/Blending/BlendVsMerge/fMainC.dfm


+ 0 - 0
external/GR32/Examples/Blending/BlendVsMerge/fMainC.h → Externals/GR32/Examples/Blending/BlendVsMerge/fMainC.h


+ 0 - 0
external/GR32/Examples/Blending/BlendVsMerge/fMainD.dfm → Externals/GR32/Examples/Blending/BlendVsMerge/fMainD.dfm


+ 0 - 0
external/GR32/Examples/Blending/BlendVsMerge/fMainD.pas → Externals/GR32/Examples/Blending/BlendVsMerge/fMainD.pas


+ 0 - 0
external/GR32/Examples/Blending/Blending.groupproj → Externals/GR32/Examples/Blending/Blending.groupproj


+ 0 - 0
external/GR32/Examples/Blending/PixelCombine/MainUnit.dfm → Externals/GR32/Examples/Blending/PixelCombine/MainUnit.dfm


+ 0 - 0
external/GR32/Examples/Blending/PixelCombine/MainUnit.pas → Externals/GR32/Examples/Blending/PixelCombine/MainUnit.pas


+ 0 - 0
external/GR32/Examples/Blending/PixelCombine/Media.rc → Externals/GR32/Examples/Blending/PixelCombine/Media.rc


+ 0 - 0
external/GR32/Examples/Blending/PixelCombine/PixelCombine.bpr → Externals/GR32/Examples/Blending/PixelCombine/PixelCombine.bpr


+ 0 - 0
external/GR32/Examples/Blending/PixelCombine/PixelCombine.cpp → Externals/GR32/Examples/Blending/PixelCombine/PixelCombine.cpp


+ 0 - 0
external/GR32/Examples/Blending/PixelCombine/PixelCombine.dpr → Externals/GR32/Examples/Blending/PixelCombine/PixelCombine.dpr


+ 0 - 0
external/GR32/Examples/Blending/PixelCombine/PixelCombine.dproj → Externals/GR32/Examples/Blending/PixelCombine/PixelCombine.dproj


+ 0 - 0
external/GR32/Examples/Blending/TextureBlend/MainUnit.dfm → Externals/GR32/Examples/Blending/TextureBlend/MainUnit.dfm


+ 0 - 0
external/GR32/Examples/Blending/TextureBlend/MainUnit.pas → Externals/GR32/Examples/Blending/TextureBlend/MainUnit.pas


+ 0 - 0
external/GR32/Examples/Blending/TextureBlend/Media.rc → Externals/GR32/Examples/Blending/TextureBlend/Media.rc


+ 0 - 0
external/GR32/Examples/Blending/TextureBlend/TextureBlend.dpr → Externals/GR32/Examples/Blending/TextureBlend/TextureBlend.dpr


+ 0 - 0
external/GR32/Examples/Blending/TextureBlend/TextureBlend.dproj → Externals/GR32/Examples/Blending/TextureBlend/TextureBlend.dproj


+ 0 - 0
external/GR32/Examples/Drawing/AntiAliasing/AntiAliasing.dpr → Externals/GR32/Examples/Drawing/AntiAliasing/AntiAliasing.dpr


+ 0 - 0
external/GR32/Examples/Drawing/AntiAliasing/AntiAliasing.dproj → Externals/GR32/Examples/Drawing/AntiAliasing/AntiAliasing.dproj


+ 0 - 0
external/GR32/Examples/Drawing/AntiAliasing/MainUnit.dfm → Externals/GR32/Examples/Drawing/AntiAliasing/MainUnit.dfm


+ 0 - 0
external/GR32/Examples/Drawing/AntiAliasing/MainUnit.pas → Externals/GR32/Examples/Drawing/AntiAliasing/MainUnit.pas


+ 0 - 0
external/GR32/Examples/Drawing/AntiAliasing/Media.rc → Externals/GR32/Examples/Drawing/AntiAliasing/Media.rc


+ 0 - 0
external/GR32/Examples/Drawing/ArrowHead/ArrowHead.dpr → Externals/GR32/Examples/Drawing/ArrowHead/ArrowHead.dpr


+ 0 - 0
external/GR32/Examples/Drawing/ArrowHead/ArrowHead.dproj → Externals/GR32/Examples/Drawing/ArrowHead/ArrowHead.dproj


+ 0 - 0
external/GR32/Examples/Drawing/ArrowHead/MainUnit.dfm → Externals/GR32/Examples/Drawing/ArrowHead/MainUnit.dfm


+ 0 - 0
external/GR32/Examples/Drawing/ArrowHead/MainUnit.pas → Externals/GR32/Examples/Drawing/ArrowHead/MainUnit.pas


+ 0 - 0
external/GR32/Examples/Drawing/ArrowHead/Media.rc → Externals/GR32/Examples/Drawing/ArrowHead/Media.rc


+ 0 - 0
external/GR32/Examples/Drawing/Benchmark/Benchmark.dpr → Externals/GR32/Examples/Drawing/Benchmark/Benchmark.dpr


+ 0 - 0
external/GR32/Examples/Drawing/Benchmark/Benchmark.dproj → Externals/GR32/Examples/Drawing/Benchmark/Benchmark.dproj


+ 0 - 0
external/GR32/Examples/Drawing/Benchmark/MainUnit.dfm → Externals/GR32/Examples/Drawing/Benchmark/MainUnit.dfm


+ 0 - 0
external/GR32/Examples/Drawing/Benchmark/MainUnit.pas → Externals/GR32/Examples/Drawing/Benchmark/MainUnit.pas


+ 0 - 0
external/GR32/Examples/Drawing/Benchmark/Media.rc → Externals/GR32/Examples/Drawing/Benchmark/Media.rc


+ 0 - 0
external/GR32/Examples/Drawing/Blurs/Blurs.dpr → Externals/GR32/Examples/Drawing/Blurs/Blurs.dpr


+ 0 - 0
external/GR32/Examples/Drawing/Blurs/Blurs.dproj → Externals/GR32/Examples/Drawing/Blurs/Blurs.dproj


+ 0 - 0
external/GR32/Examples/Drawing/Blurs/MainUnit.dfm → Externals/GR32/Examples/Drawing/Blurs/MainUnit.dfm


+ 0 - 0
external/GR32/Examples/Drawing/Blurs/MainUnit.pas → Externals/GR32/Examples/Drawing/Blurs/MainUnit.pas


+ 0 - 0
external/GR32/Examples/Drawing/Blurs/Media.rc → Externals/GR32/Examples/Drawing/Blurs/Media.rc


+ 0 - 0
external/GR32/Examples/Drawing/Clipper/Clipper.dpr → Externals/GR32/Examples/Drawing/Clipper/Clipper.dpr


+ 0 - 0
external/GR32/Examples/Drawing/Clipper/Clipper.dproj → Externals/GR32/Examples/Drawing/Clipper/Clipper.dproj


+ 0 - 0
external/GR32/Examples/Drawing/Clipper/Media.rc → Externals/GR32/Examples/Drawing/Clipper/Media.rc


+ 0 - 0
external/GR32/Examples/Drawing/Clipper/fClipper.dfm → Externals/GR32/Examples/Drawing/Clipper/fClipper.dfm


+ 0 - 0
external/GR32/Examples/Drawing/Clipper/fClipper.pas → Externals/GR32/Examples/Drawing/Clipper/fClipper.pas


+ 0 - 0
external/GR32/Examples/Drawing/CubicSpline/CubicSpline.dpr → Externals/GR32/Examples/Drawing/CubicSpline/CubicSpline.dpr


+ 0 - 0
external/GR32/Examples/Drawing/CubicSpline/CubicSpline.dproj → Externals/GR32/Examples/Drawing/CubicSpline/CubicSpline.dproj


+ 0 - 0
external/GR32/Examples/Drawing/CubicSpline/MainUnit.dfm → Externals/GR32/Examples/Drawing/CubicSpline/MainUnit.dfm


+ 0 - 0
external/GR32/Examples/Drawing/CubicSpline/MainUnit.pas → Externals/GR32/Examples/Drawing/CubicSpline/MainUnit.pas


Some files were not shown because too many files changed in this diff