浏览代码

Fixed GLUtils

GLScene 5 年之前
父节点
当前提交
ecb5b33a26
共有 40 个文件被更改,包括 324 次插入319 次删除
  1. 2 2
      Source/FileGL2.pas
  2. 308 246
      Source/GLSLog.pas
  3. 2 2
      Source/GLScene.pas
  4. 1 1
      Source/GLUtils.pas
  5. 1 1
      Source/GLVectorGeometry.pas
  6. 5 6
      Source/GLVectorTypes.pas
  7. 5 5
      Source/GLVerletClothify.pas
  8. 0 0
      Source/Languages/English/ResStrings.inc
  9. 0 0
      Source/Languages/French/ResStrings.inc
  10. 0 0
      Source/Languages/German/ResStrings.inc
  11. 0 0
      Source/Languages/Italian/ResStrings.inc
  12. 0 0
      Source/Languages/Japanese/ResStrings.inc
  13. 0 0
      Source/Languages/Portuguese/ResStrings.inc
  14. 0 0
      Source/Languages/Russian/ResStrings.inc
  15. 0 0
      Source/Languages/Spanish/ResStrings.inc
  16. 0 1
      external/#external.txt
  17. 二进制
      external/OpenAL32.dll
  18. 二进制
      external/OpenAL64.dll
  19. 二进制
      external/PhysXwrap.dll
  20. 0 55
      external/SetupDLLs.bat
  21. 二进制
      external/bass32.dll
  22. 二进制
      external/bass64.dll
  23. 二进制
      external/cg.dll
  24. 二进制
      external/cgGL.dll
  25. 二进制
      external/cutil32.dll
  26. 二进制
      external/cutil64.dll
  27. 二进制
      external/dJointLibrary.dll
  28. 二进制
      external/dJointLibrary64.dll
  29. 二进制
      external/fmod32.dll
  30. 二进制
      external/fmod64.dll
  31. 二进制
      external/freetype.dll
  32. 二进制
      external/newton32.dll
  33. 二进制
      external/newton64.dll
  34. 二进制
      external/ode32d.dll
  35. 二进制
      external/ode32s.dll
  36. 二进制
      external/ode64d.dll
  37. 二进制
      external/ode64s.dll
  38. 二进制
      external/sdl2_32.dll
  39. 二进制
      external/sdl2_64.dll
  40. 二进制
      external/zlib1.dll

+ 2 - 2
Source/FileGL2.pas

@@ -1,10 +1,10 @@
 //
 // This unit is part of the GLScene Engine, http://glscene.org
 //
-{
+(*
 	Ghoul2 (GLM/GLA) file format loading structures 
 	Note: Also referred to as MDX (MDXM/MDXA) format in C source. 
-}
+*)
 unit FileGL2;
 
 interface

文件差异内容过多而无法显示
+ 308 - 246
Source/GLSLog.pas


+ 2 - 2
Source/GLScene.pas

@@ -55,8 +55,8 @@ type
 
 const
   cDefaultProxyOptions = [pooEffects, pooObjects, pooTransformation];
-  GLSCENE_REVISION = '$Revision: 0106$';
-  GLSCENE_VERSION = '2020 %s';
+  GLSCENE_REVISION = '$Revision: 0506$';
+  GLSCENE_VERSION = '1.9 %s';
 
 type
 

+ 1 - 1
Source/GLUtils.pas

@@ -626,7 +626,7 @@ var
 begin
    path := ParamStr(0);
    path := LowerCase(ExtractFilePath(path));
-   p := Pos('samples', path);
+   p := Pos('demos', path);
    Delete(path, p+7, Length(path));
    path := IncludeTrailingPathDelimiter(path) + 'media';
    SetCurrentDir(path);

+ 1 - 1
Source/GLVectorGeometry.pas

@@ -2,7 +2,7 @@
 // This unit is part of the GLScene Engine, http://glscene.org
 //
 (*
-  Base classes and structures for GLScene.
+  Base classes and structures.
 
   Most common functions/procedures come in various flavours (using overloads),
   the naming convention is :

+ 5 - 6
Source/GLVectorTypes.pas

@@ -1,26 +1,25 @@
 //
 // This unit is part of the GLScene Engine, http://glscene.org
 //
-{
+(*
    Defines base vector types for use in GLVectorGeometry.pas.
    The sole aim of this unit is to limit dependency between the GLVectorGeometry
    and OpenGL units by introducing the base compatibility types
-   (and only the *base* types). 
+   (and only the *base* types).
 
-   Conventions: 
+   Conventions:
         d  is used for Double precision floating points values (64 bits)
         f  is used for Single precision floating points values (32 bits)
         i  is used for 32 bits signed integers (longint)
         s  is uses for 16 bits signed integers (smallint)
-   Note : D3D types untested. 
-}
+   Note : D3D types untested.
+*)
 unit GLVectorTypes;
 
 interface
 
 {$I GLScene.inc}
 
-
 type
   //2
   TVector2d = record

+ 5 - 5
Source/GLVerletClothify.pas

@@ -1,9 +1,9 @@
 //
 // This unit is part of the GLScene Engine, http://glscene.org
 //
-{
+(*
    Methods for turning a TGLBaseMesh into a Verlet cloth / jelly
-}
+*)
 
 unit GLVerletClothify;
 
@@ -269,7 +269,7 @@ begin
 end;
 
 //------------------
-{ TFaceList }
+// TFaceList 
 //------------------
 
 function TFaceList.GetItems(i: integer): TFace;
@@ -283,7 +283,7 @@ begin
 end;
 
 //------------------
-{ TEdgeList }
+// TEdgeList 
 //------------------
 
 function TEdgeList.GetItems(i: integer): TEdge;
@@ -353,7 +353,7 @@ begin
 end;
 
 //--------------------------
-{ TEdgeDetector }
+// TEdgeDetector 
 //--------------------------
 
 procedure TEdgeDetector.Clear;

+ 0 - 0
Source/Languages/English/GxStrings.inc → Source/Languages/English/ResStrings.inc


+ 0 - 0
Source/Languages/French/GxStrings.inc → Source/Languages/French/ResStrings.inc


+ 0 - 0
Source/Languages/German/GxStrings.inc → Source/Languages/German/ResStrings.inc


+ 0 - 0
Source/Languages/Italian/GxStrings.inc → Source/Languages/Italian/ResStrings.inc


+ 0 - 0
Source/Languages/Japanese/GxStrings.inc → Source/Languages/Japanese/ResStrings.inc


+ 0 - 0
Source/Languages/Portuguese/GxStrings.inc → Source/Languages/Portuguese/ResStrings.inc


+ 0 - 0
Source/Languages/Russian/GxStrings.inc → Source/Languages/Russian/ResStrings.inc


+ 0 - 0
Source/Languages/Spanish/GxStrings.inc → Source/Languages/Spanish/ResStrings.inc


+ 0 - 1
external/#external.txt

@@ -1 +0,0 @@
-The directory for external DLL libraries

二进制
external/OpenAL32.dll


二进制
external/OpenAL64.dll


二进制
external/PhysXwrap.dll


+ 0 - 55
external/SetupDLLs.bat

@@ -1,55 +0,0 @@
-@echo off
-echo Copying DLLs to the Windows System32 and SysWOW64 directories
-echo Copying nVidia CG DLLs
-rem win64
-copy cg.dll %SystemRoot%\System32\
-copy cgGL.dll %SystemRoot%\System32\
-rem win32
-copy cg.dll %SystemRoot%\SysWOW64\
-copy cgGL.dll %SystemRoot%\SysWOW64\
-
-echo Copying SDL2 DLLs
-rem win32
-copy sdl2.dll %SystemRoot%\SysWOW64\sdl2.dll
-rem win64
-copy sdl264.dll %SystemRoot%\System32\sdl264.dll
-
-echo Copying Sound DLLs
-rem win32
-copy bass.dll %SystemRoot%\SysWOW64\
-copy fmod.dll %SystemRoot%\SysWOW64\
-copy OpenAL32.dll %SystemRoot%\SysWOW64\
-rem win64
-copy bass64.dll %SystemRoot%\System32\
-copy fmod.dll %SystemRoot%\System32\
-copy OpenAL64.dll %SystemRoot%\System32\
-
-echo Copying ODE DLLs
-rem win32
-copy ode_single.dll %SystemRoot%\SysWOW64\
-copy ode_double.dll %SystemRoot%\SysWOW64\
-rem win64
-copy ode_single64.dll %SystemRoot%\System32\
-copy ode_double64.dll %SystemRoot%\System32\
-
-echo Copying Newton DLLs
-rem win32
-copy newton.dll %SystemRoot%\SysWOW64\
-copy dJointLibrary.dll %SystemRoot%\SysWOW64\
-rem win64
-copy newton64.dll %SystemRoot%\System32\
-copy dJointLibrary64.dll %SystemRoot%\System32\
-
-echo Copying nVidia PhysX DLLs
-rem win32
-copy PhysXwrap.dll %SystemRoot%\SysWOW64\
-rem win64
-copy PhysXwrap.dll %SystemRoot%\System32\
-
-echo Copying CUDA and zlib1 DLLs
-rem win32
-copy cutil32.dll %SystemRoot%\SysWOW64\
-copy zlib1.dll %SystemRoot%\SysWOW64\
-rem win64
-copy cutil64.dll %SystemRoot%\System32\
-copy zlib1.dll %SystemRoot%\System32\

二进制
external/bass32.dll


二进制
external/bass64.dll


二进制
external/cg.dll


二进制
external/cgGL.dll


二进制
external/cutil32.dll


二进制
external/cutil64.dll


二进制
external/dJointLibrary.dll


二进制
external/dJointLibrary64.dll


二进制
external/fmod32.dll


二进制
external/fmod64.dll


二进制
external/freetype.dll


二进制
external/newton32.dll


二进制
external/newton64.dll


二进制
external/ode32d.dll


二进制
external/ode32s.dll


二进制
external/ode64d.dll


二进制
external/ode64s.dll


二进制
external/sdl2_32.dll


二进制
external/sdl2_64.dll


二进制
external/zlib1.dll


部分文件因为文件数量过多而无法显示