Merge branch 'master' of https://github.com/IldusEps/castle-engine

src/3d/castlecameras.pas

@@ -150,10 +150,12 @@   TCastleOrthographic = class(TComponent)
     FOrigin: TVector2;
     FWidth, FHeight, FScale: Single;
     FEffectiveWidth, FEffectiveHeight: Single;
+    FStretch: Boolean;
     procedure SetOrigin(const Value: TVector2);
     procedure SetWidth(const Value: Single);
     procedure SetHeight(const Value: Single);
     procedure SetScale(const Value: Single);
+    procedure SetStretch(const Value: Boolean);
   private
     Camera: TCastleCamera;
   public
@@ -222,17 +224,27 @@   TCastleOrthographic = class(TComponent)
           of the viewport control.
         )
 
-        @item(When both @link(Width) and @link(Height) are non-zero,
-          then they explicitly determine the @italic(minimum)
-          projection width and height along the given axis.
-
-          This, again, allows to easily display the same piece of the game world,
+        @item(When both @link(Width) and @link(Height) are non-zero, then
+          they determine the projection width and height.
+          This also allows to easily display the same piece of the game world,
           regardless of the viewport size.
 
-          If the displayed viewport aspect ratio wil be different than given
-          @link(Width) and @link(Height) ratio, then these value will be
-          treated as minimum values, and they will be adjusted.
-          This follows the X3D OrthoViewpoint.fieldOfView specification.
+          @unorderedList(
+            @item(When @link(Stretch) = @false (default), they determine the @italic(minimum)
+              projection width and height along the given axis.
+
+              If the displayed viewport aspect ratio wil be different than given
+              @link(Width) and @link(Height) ratio, then these value will be
+              treated as minimum values, and they will be adjusted.
+              This follows the X3D OrthoViewpoint.fieldOfView specification.)
+
+            @item(When @link(Stretch) = @true, these values are used directly,
+              even if it means that aspect ratio of the projection
+              will not reflect the aspect ratio of the viewport on screen.
+
+              This allows for some tricks, like @italic(Military Projection),
+              https://github.com/castle-engine/castle-engine/issues/290 .)
+          )
         )
       )
 
@@ -257,6 +269,12 @@   TCastleOrthographic = class(TComponent)
       the middle of the viewport. }
     property Scale: Single read FScale write SetScale default 1;
 
+    { Allow non-proportional stretch of projection.
+      In effect the @link(Width) and @link(Height)
+      (if both non-zero) are applied directly, without correcting them to follow
+      aspect ratio of the viewport. }
+    property Stretch: Boolean read FStretch write SetStretch default false;
+
   {$define read_interface_class}
   {$I auto_generated_persistent_vectors/tcastleorthographic_persistent_vectors.inc}
   {$undef read_interface_class}
@@ -2320,6 +2338,15 @@ procedure TCastleOrthographic.SetScale(const Value: Single);
   end;
 end;
 
+procedure TCastleOrthographic.SetStretch(const Value: Boolean);
+begin
+  if FStretch <> Value then
+  begin
+    FStretch := Value;
+    Camera.VisibleChange;
+  end;
+end;
+
 procedure TCastleOrthographic.InternalSetEffectiveSize(const W, H: Single);
 begin
   FEffectiveWidth := W;

src/x3d/castlescenecore.pas

@@ -7565,6 +7565,7 @@ procedure TCastleSceneCore.InternalUpdateCamera(const ACamera: TCastleCamera;
   ACamera.Orthographic.Width := 0;
   ACamera.Orthographic.Height := 0;
   ACamera.Orthographic.Origin := TVector2.Zero;
+  ACamera.Orthographic.Stretch := false;
 
   ViewpointNode := ViewpointStack.Top;
   NavigationNode := NavigationInfoStack.Top;

src/x3d/castleshapes.pas

@@ -1243,7 +1243,11 @@ procedure TShapeTree.UnAssociateNode(const Node: TX3DNode);
   begin
     if Node.InternalSceneShape = nil then
     begin
-      WritelnWarning('Calling %s.UnAssociateNode on X3D node that is already not associated with anything: %s. This can happen when you manually change nodes.',
+      { TODO: Document when it may happen, seems this situation is just valid,
+        and it occurs easily with primitives like TCastleBox
+        if you change TCastleAbstractPrimitive.Material type.
+        For now change warning -> log. }
+      WritelnLog('Calling %s.UnAssociateNode on X3D node that is already not associated with anything: %s. This can happen when you manually change nodes.',
         [ClassName, Node.NiceName]);
       Exit;
     end;

src/x3d/opengl/castleviewport.pas

@@ -2031,10 +2031,11 @@ function TCastleViewport.CalculateProjection: TProjection;
 
       CalculateDimensions;
 
-      Result.Dimensions := TOrthoViewpointNode.InternalFieldOfView(
-        Result.Dimensions,
-        Viewport.Width,
-        Viewport.Height);
+      if not Camera.Orthographic.Stretch then
+        Result.Dimensions := TOrthoViewpointNode.InternalFieldOfView(
+          Result.Dimensions,
+          Viewport.Width,
+          Viewport.Height);
 
       EffectiveProjectionWidth := Result.Dimensions.Width;
       EffectiveProjectionHeight := Result.Dimensions.Height;