Index: Packages/GLScene_DesignTime.lpk
===================================================================
--- Packages/GLScene_DesignTime.lpk (revision 7332)
+++ Packages/GLScene_DesignTime.lpk (working copy)
@@ -1,6 +1,6 @@
-
+
@@ -8,7 +8,7 @@
-
+
@@ -27,7 +27,7 @@
-
+
@@ -39,80 +39,81 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
+
@@ -142,7 +143,6 @@
-
Index: Packages/GLScene_RunTime.lpk
===================================================================
--- Packages/GLScene_RunTime.lpk (revision 7332)
+++ Packages/GLScene_RunTime.lpk (working copy)
@@ -1,6 +1,6 @@
-
+
@@ -7,7 +7,7 @@
-
+
@@ -33,17 +33,17 @@
-
+
-
+
-
+
-
+
@@ -55,15 +55,15 @@
-
+
-
+
-
+
@@ -71,7 +71,7 @@
-
+
@@ -111,15 +111,15 @@
-
+
-
+
-
+
@@ -131,7 +131,7 @@
-
+
@@ -139,187 +139,187 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -327,31 +327,31 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -359,31 +359,31 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -399,7 +399,7 @@
-
+
@@ -495,11 +495,11 @@
-
+
-
+
@@ -611,7 +611,7 @@
-
+
@@ -639,7 +639,7 @@
-
+
@@ -723,23 +723,23 @@
-
+
-
+
-
+
-
+
-
+
@@ -747,11 +747,11 @@
-
+
-
+
@@ -759,7 +759,7 @@
-
+
@@ -807,19 +807,19 @@
-
+
-
+
-
+
-
+
@@ -847,7 +847,7 @@
-
+
@@ -859,91 +859,91 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -955,23 +955,23 @@
-
+
-
+
-
+
-
+
-
+
@@ -979,15 +979,24 @@
-
+
-
+
+
+
+
+
+
+
+
+
+
@@ -1007,7 +1016,6 @@
-
Index: Packages/GLScene_RunTime.pas
===================================================================
--- Packages/GLScene_RunTime.pas (revision 7332)
+++ Packages/GLScene_RunTime.pas (working copy)
@@ -1,61 +1,61 @@
-{ This file was automatically created by Lazarus. Do not edit!
- This source is only used to compile and install the package.
- }
-
-unit GLScene_RunTime;
-
-{$warn 5023 off : no warning about unused units}
-interface
-
-uses
- GLApplicationFileIO, GLAsyncTimer, GLBaseClasses, GLBumpMapping,
- GLCurvesAndSurfaces, GLGeometryBB, GLGeometryCoordinates, GLCanvas, GLColor,
- GLCoordinates, GLPipelineTransformation, GLSCrossXML, GLSLog,
- GLTextureCombiners, GLHeightTileFile, GLImageUtils, GLMeshUtils, GLOctree,
- OpenGLAdapter, OpenGLTokens, GLPerlinNoise3D, GLPersistentClasses,
- GLPolynomials, GLSpacePartition, GLSpline, GLVectorGeometry, GLVectorLists,
- GLVectorTypes, GLVerletTypes, GLVerletHairClasses, GLXCollection, XOpenGL,
- Const3DS, DDSImage, DXTC, File3DS, FileB3D, FileGL2, FileMD2, FileMD3,
- FileOCT, FileX, GLFile3DS, GLFile3DSSceneObjects, GLFileASE, GLFileB3D,
- GLFileDDS, GLFileGL2, GLFileGTS, GLFileHDR, GLFileJPEG, GLFileLMTS,
- GLFileLWO, GLFileMD2, GLFileMD3, GLFileMD5, GLFileMDC, GLFileMS3D,
- GLFileNMF, GLFileNurbs, GLFileO3TC, GLFileOBJ, GLFilePAK, GLFilePLY,
- GLFilePNG, GLFileSMD, GLFileSTL, GLFileTIN, GLFileVRML, GLFileZLIB,
- GLStarRecord, GLVfsPAK, HDRImage, LWObjects, O3TCImage, Q3BSP, Q3MD3,
- GLSRGBE, GLFileTGA, Types3DS, Utils3DS, VRMLParser, GLSZLibEx, GLSZLibExApi,
- GLAnimatedSprite, GLAsyncHDS, GLAtmosphere, GLBaseMeshSilhouette,
- GLBehaviours, GLBitmapFont, GLBlur, GLBSP, GLBumpmapHDS, GLCadencer,
- GLCameraController, GLCollision, GLCompositeImage, GLConsole, GLContext,
- GLDCE, GLDCEMisc, GLDynamicTexture, GLEllipseCollision,
- GLEParticleMasksManager, GLExplosionFx, GLExtrusion, GLFBO, GLFBORenderer,
- GLFeedback, GLFireFX, GLFPSMovement, GLGameMenu, GLGeomObjects, GLGizmo,
- GLGizmoEx, GLGLUTesselation, GLGraph, GLGraphics, GLGui, GLHeightData,
- GLHeightTileFileHDS, GLHUDObjects, GLImposter, GLLensFlare, GLLinePFX,
- GLManager, GLMaterial, GLMaterialMultiProxy, GLMaterialScript, GLMesh,
- GLMeshBuilder, GLMeshCSG, GLMeshOptimizer, GLMirror, GLMovement,
- GLMultiPolygon, GLMultiProxy, GLMultisampleImage, GLNavigator, GLNodes,
- GLObjects, GLParametricSurfaces, GLParticleFX, GLParticles, GLPerlin,
- GLPerlinBase, GLPerlinPFX, GLPolyhedron, GLPortal, GLPostEffects,
- GLProcTextures, GLProjectedTextures, GLProxyObjects, GLRagdoll,
- GLRenderContextInfo, GLROAMPatch, GLSArchiveManager, GLScene, GLSelection,
- GLShadowHDS, GLShadowPlane, GLShadowVolume, GLSilhouette,
- GLSimpleNavigation, GLSkyBox, GLSkydome, GLSLanguage, GLSLProjectedTextures,
- GLSLBumpShader, GLSLDiffuseSpecularShader, GLSLParameter, GLSLShader,
- GLSmoothNavigator, GLSpatialPartitioning, GLState, GLStrings, GLTeapot,
- GLTerrainRenderer, GLTexLensFlare, GLTexture, GLTexturedHDS,
- GLTextureFormat, GLThorFX, GLTilePlane, GLTimeEventsMgr, GLTrail, GLTree,
- GLUtils, GLVectorFileObjects, GLVerletClasses, GLVerletClothify,
- GLVerletSkeletonColliders, GLWaterPlane, GLWindows, GLWindowsFont,
- GLzBuffer, GLCrossPlatform, GLFullScreenViewer, GLKeyboard, GLScreen,
- GLViewer, GLAsmShader, GLBumpShader, GLCelShader, GLHiddenLineShader,
- GLMultiMaterialShader, GLOutlineShader, GLPhongShader, GLShaderCombiner,
- GLTexCombineShader, GLTextureSharingShader, GLUserShader, GLFileBMP, TGA,
- GLSLPostShaders, GLSLErosionShader, GLSLFurShader, GLSLGlassShader,
- GLSLGoochShader, GLSLIvoryShader, GLSLSemShader, GLSLToonShader,
- GLSLVertexDisplacementShader, GLTriangulation, GLMeshLines,
- GLSLLatticeShader, GLFileQ3BSP, GLFileOCT, GLFileDXF, GLFileGRD,
- GLCustomShader, GLScriptBase;
-
-implementation
-
-end.
+{ This file was automatically created by Lazarus. Do not edit!
+ This source is only used to compile and install the package.
+ }
+
+unit GLScene_RunTime;
+
+{$warn 5023 off : no warning about unused units}
+interface
+
+uses
+ GLApplicationFileIO, GLAsyncTimer, GLBaseClasses, GLBumpMapping,
+ GLCurvesAndSurfaces, GLGeometryBB, GLGeometryCoordinates, GLCanvas, GLColor,
+ GLCoordinates, GLPipelineTransformation, GLSCrossXML, GLSLog,
+ GLTextureCombiners, GLHeightTileFile, GLImageUtils, GLMeshUtils, GLOctree,
+ OpenGLAdapter, OpenGLTokens, GLPerlinNoise3D, GLPersistentClasses,
+ GLPolynomials, GLSpacePartition, GLSpline, GLVectorGeometry, GLVectorLists,
+ GLVectorTypes, GLVerletTypes, GLVerletHairClasses, GLXCollection, XOpenGL,
+ Const3DS, DDSImage, DXTC, File3DS, FileB3D, FileGL2, FileMD2, FileMD3,
+ FileOCT, FileX, GLFile3DS, GLFile3DSSceneObjects, GLFileASE, GLFileB3D,
+ GLFileDDS, GLFileGL2, GLFileGTS, GLFileHDR, GLFileJPEG, GLFileLMTS,
+ GLFileLWO, GLFileMD2, GLFileMD3, GLFileMD5, GLFileMDC, GLFileMS3D,
+ GLFileNMF, GLFileNurbs, GLFileO3TC, GLFileOBJ, GLFilePAK, GLFilePLY,
+ GLFilePNG, GLFileSMD, GLFileSTL, GLFileTIN, GLFileVRML, GLFileZLIB,
+ GLStarRecord, GLVfsPAK, HDRImage, LWObjects, O3TCImage, Q3BSP, Q3MD3,
+ GLSRGBE, GLFileTGA, Types3DS, Utils3DS, VRMLParser, GLSZLibEx, GLSZLibExApi,
+ GLAnimatedSprite, GLAsyncHDS, GLAtmosphere, GLBaseMeshSilhouette,
+ GLBehaviours, GLBitmapFont, GLBlur, GLBSP, GLBumpmapHDS, GLCadencer,
+ GLCameraController, GLCollision, GLCompositeImage, GLConsole, GLContext,
+ GLDCE, GLDCEMisc, GLDynamicTexture, GLEllipseCollision,
+ GLEParticleMasksManager, GLExplosionFx, GLExtrusion, GLFBO, GLFBORenderer,
+ GLFeedback, GLFireFX, GLFPSMovement, GLGameMenu, GLGeomObjects, GLGizmo,
+ GLGizmoEx, GLGLUTesselation, GLGraph, GLGraphics, GLGui, GLHeightData,
+ GLHeightTileFileHDS, GLHUDObjects, GLImposter, GLLensFlare, GLLinePFX,
+ GLManager, GLMaterial, GLMaterialMultiProxy, GLMaterialScript, GLMesh,
+ GLMeshBuilder, GLMeshCSG, GLMeshOptimizer, GLMirror, GLMovement,
+ GLMultiPolygon, GLMultiProxy, GLMultisampleImage, GLNavigator, GLNodes,
+ GLObjects, GLParametricSurfaces, GLParticleFX, GLParticles, GLPerlin,
+ GLPerlinBase, GLPerlinPFX, GLPolyhedron, GLPortal, GLPostEffects,
+ GLProcTextures, GLProjectedTextures, GLProxyObjects, GLRagdoll,
+ GLRenderContextInfo, GLROAMPatch, GLSArchiveManager, GLScene, GLSelection,
+ GLShadowHDS, GLShadowPlane, GLShadowVolume, GLSilhouette,
+ GLSimpleNavigation, GLSkyBox, GLSkydome, GLSLanguage, GLSLProjectedTextures,
+ GLSLBumpShader, GLSLDiffuseSpecularShader, GLSLParameter, GLSLShader,
+ GLSmoothNavigator, GLSpatialPartitioning, GLState, GLStrings, GLTeapot,
+ GLTerrainRenderer, GLTexLensFlare, GLTexture, GLTexturedHDS,
+ GLTextureFormat, GLThorFX, GLTilePlane, GLTimeEventsMgr, GLTrail, GLTree,
+ GLUtils, GLVectorFileObjects, GLVerletClasses, GLVerletClothify,
+ GLVerletSkeletonColliders, GLWaterPlane, GLWindows, GLWindowsFont,
+ GLzBuffer, GLCrossPlatform, GLFullScreenViewer, GLKeyboard, GLScreen,
+ GLViewer, GLAsmShader, GLBumpShader, GLCelShader, GLHiddenLineShader,
+ GLMultiMaterialShader, GLOutlineShader, GLPhongShader, GLShaderCombiner,
+ GLTexCombineShader, GLTextureSharingShader, GLUserShader, GLFileBMP, TGA,
+ GLSLPostShaders, GLSLErosionShader, GLSLFurShader, GLSLGlassShader,
+ GLSLGoochShader, GLSLIvoryShader, GLSLSemShader, GLSLToonShader,
+ GLSLVertexDisplacementShader, GLTriangulation, GLMeshLines,
+ GLSLLatticeShader, GLFileQ3BSP, GLFileOCT, GLFileDXF, GLFileGRD,
+ GLCustomShader, GLScriptBase, GLLCLViewer, GLSceneForm;
+
+implementation
+
+end.
Index: Source/DesignTime/GLSceneForm.pas
===================================================================
--- Source/DesignTime/GLSceneForm.pas (revision 7332)
+++ Source/DesignTime/GLSceneForm.pas (working copy)
@@ -139,6 +139,7 @@
public
constructor Create(AOwner: TComponent); override;
destructor Destroy; override;
+ class procedure WSRegisterClass; override;
procedure DestroyWnd; override;
property IsRenderingContextAvailable: Boolean read
@@ -219,6 +220,17 @@
inherited Destroy;
end;
+class procedure TGLSceneForm.WSRegisterClass;
+const
+ Registered : Boolean = False;
+begin
+ if Registered then
+ Exit;
+ inherited WSRegisterClass;
+ RegisterWSComponent(TGLSceneForm, TGLSOpenGLForm);
+ Registered := True;
+end;
+
// Notification
//
@@ -793,7 +805,7 @@
procedure GLRegisterWSComponent(aControl: TComponentClass);
begin
- RegisterWSComponent(aControl, TGLSOpenGLForm);
+// RegisterWSComponent(aControl, TGLSOpenGLForm);
end;
{$endif}
Index: Source/GLViewer.pas
===================================================================
--- Source/GLViewer.pas (revision 7332)
+++ Source/GLViewer.pas (working copy)
@@ -29,14 +29,19 @@
{$I GLScene.inc}
uses
- GLContext,
+ GLContext, WSLCLClasses, GLWidgetContext,
GLLCLViewer;
type
- TGLSceneViewer = GLLCLViewer.TGLSceneViewer;
+ { TGLSceneViewer }
+ TGLSceneViewer = class(GLLCLViewer.TGLSceneViewer)
+ public
+ class procedure WSRegisterClass; override;
+ end;
+
procedure SetupVSync(const AVSyncMode : TVSyncMode);
implementation
@@ -60,6 +65,20 @@
end;
end;
end;
+
+{ TGLSceneViewer }
+
+class procedure TGLSceneViewer.WSRegisterClass;
+const
+ Registered : Boolean = False;
+begin
+ if Registered then
+ Exit;
+ inherited WSRegisterClass;
+ RegisterWSComponent(TGLSceneViewer, TGLSOpenGLControl);
+ Registered := True;
+end;
+
{$ENDIF}
{$IFDEF Linux}
begin
Index: Source/Plateform/GLWidgetContext.pas
===================================================================
--- Source/Plateform/GLWidgetContext.pas (revision 7332)
+++ Source/Plateform/GLWidgetContext.pas (working copy)
@@ -258,7 +258,7 @@
procedure GLRegisterWSComponent(aControl: TComponentClass);
begin
- RegisterWSComponent(aControl, TGLSOpenGLControl);
+// RegisterWSComponent(aControl, TGLSOpenGLControl);
end;
{$ENDIF}