diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 39fd976..d804393 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -20,8 +20,8 @@ on: env: # To which GitHub release tag should we upload artifacts. # Can be "snapshot" or "vX.Y.Z" (latter when we make stable release). - #release_tag: snapshot - release_tag: v5.2.0 + release_tag: snapshot + #release_tag: vX.Y.Z # Which Castle Game Engine tag/branch to use for building. # This *should* be "snapshot", which is our latest CGE that passed automatic tests. diff --git a/CastleEngineManifest.xml b/CastleEngineManifest.xml index 456c3a4..ec8a60c 100644 --- a/CastleEngineManifest.xml +++ b/CastleEngineManifest.xml @@ -17,7 +17,7 @@ - + diff --git a/code/v3dsceneraytrace.pas b/code/v3dsceneraytrace.pas index 068578c..dd7c1ea 100644 --- a/code/v3dsceneraytrace.pas +++ b/code/v3dsceneraytrace.pas @@ -51,29 +51,6 @@ implementation V3DSceneStatus, V3DSceneWindow; {$warnings on} -{ TODO: Copy from new CGE code, to make 5.2.0 compatible with engine 7.0-alpha.3. - Remove when bumping version to 5.3.0. } -{ Create spatial structure to resolve collisions in the given scene. - Caller is responsible for freeing the result. } -function CreateOctreeVisibleTrianglesForScene( - const Scene: TCastleSceneCore): TTriangleOctree; -var - ShapeList: TShapeList; - Shape: TShape; -begin - Result := TTriangleOctree.Create(DefTriangleOctreeLimits, Scene.LocalBoundingBox); - try - Result.Triangles.Capacity := Scene.TrianglesCount; - ShapeList := Scene.Shapes.TraverseList( - { OnlyActive } true, - { OnlyVisible } true, - { OnlyCollidable } false - ); - for Shape in ShapeList do - Shape.Triangulate({$ifdef FPC}@{$endif} Result.AddItemTriangle); - except Result.Free; raise end; -end; - const DefaultPrimarySamplesCount = 1; DefaultNonPrimarySamplesCount = 4; diff --git a/code/v3dsceneversion.pas b/code/v3dsceneversion.pas index be5cec1..3ce77f8 100644 --- a/code/v3dsceneversion.pas +++ b/code/v3dsceneversion.pas @@ -2,7 +2,7 @@ unit V3DSceneVersion; interface const - Version = '5.2.0'; + Version = '5.3.0'; ViewerUrl = 'https://castle-engine.io/castle-model-viewer'; SupportURL = 'https://www.patreon.com/castleengine'; implementation diff --git a/pack/snap/snap/snapcraft.yaml b/pack/snap/snap/snapcraft.yaml index c632e4d..f1d07aa 100644 --- a/pack/snap/snap/snapcraft.yaml +++ b/pack/snap/snap/snapcraft.yaml @@ -6,7 +6,7 @@ name: castle-model-viewer # The base snap is the execution environment for this snap. base: core20 -version: '5.2.0' +version: '5.3.0' summary: Viewer for 3D and 2D models - glTF, X3D, VRML, Spine JSON and more # 79 char long summary description: | Viewer for all 3D and 2D models suported by Castle Game Engine: