Fixed|Heretic: Sky textures are incorrectly sized

The SKY* patches in Heretic are 200 pixels tall even though the texture is declared as 128 pixels tall. The extra height is supposed to make the sky extend upward to facilitate looking up. However, for some reason only Composite::dimensions() is updated to account for this extended height, and not Composite::logicalDimensions(). If both are updated, skyfix walls appear as black in DOOM (for an unknown reason). Therefore, apply a hacky workaround that uses the true composite dimensions for sky textures only.

IssueID #2446

# Conflicts:
#	doomsday/apps/libdoomsday/src/resource/textures.cpp

doomsday/apps/client/src/render/skydrawable.cpp

@@ -118,7 +118,9 @@ struct Hemisphere
     {
         if (world::Material *mat = chooseMaterialForSkyLayer(layer))
         {
-            MaterialAnimator &matAnimator = mat->as<ClientMaterial>().getAnimator(SkyDrawable::layerMaterialSpec(layer.isMasked()));
+            MaterialAnimator &matAnimator =
+                mat->as<ClientMaterial>()
+                    .getAnimator(SkyDrawable::layerMaterialSpec(layer.isMasked()));
 
             // Ensure we've up to date info about the material.
             matAnimator.prepare();

doomsday/apps/libdoomsday/src/resource/composite.cpp

@@ -284,7 +284,10 @@ Composite *Composite::constructFrom(de::Reader &reader,
     if (geom.top()  < 0) geom.setTop(0);
     if (geom.height() > int(pctex->d->logicalDimensions.y))
     {
-        pctex->d->dimensions.y = geom.height();
+        // BUG: Why not update both logical dimensions and pixel dimensions? Are these
+        // only intended to be different if there are more than 1 pixel per logical unit?
+
+        /*pctex->d->logicalDimensions.y = */pctex->d->dimensions.y = geom.height();
     }
 
     if (!foundComponentCount)

doomsday/apps/libdoomsday/src/resource/textures.cpp

@@ -267,7 +267,7 @@ DENG2_PIMPL(Textures)
 
             // Ensure the offset is within valid range.
             if (offset < 0 || unsigned(offset) < unsigned(definitionCount) * sizeof(offset) ||
-               dsize(offset) > reader.source()->size())
+                dsize(offset) > reader.source()->size())
             {
                 LOG_RES_WARNING("Ignoring definition #%i: invalid offset %i") << i << offset;
             }
@@ -474,9 +474,22 @@ DENG2_PIMPL(Textures)
 
             try
             {
-                TextureManifest &manifest =
-                    self().declareTexture(uri, flags, def.logicalDimensions(),
-                                        Vector2i(), def.origIndex());
+                // BUG: See IssueID #2446 -- The SKY* patches in Heretic are 200 pixels tall
+                // even though the texture is declared as 128 pixels tall. The extra height
+                // is supposed to make the sky extend upward to facilitate looking up.
+                // However, for some reason only Composite::dimensions() is updated to account for
+                // this extended height, and not Composite::logicalDimensions(). If both are
+                // updated, skyfix walls appear as black in DOOM (for an unknown reason).
+                // Therefore, apply a hacky workaround that uses the true composite dimensions
+                // for sky textures only.
+
+                TextureManifest &manifest = self().declareTexture(
+                    uri,
+                    flags,
+                    def.percentEncodedName().beginsWith("SKY") ? def.dimensions()
+                                                               : def.logicalDimensions(),
+                    Vec2i(),
+                    def.origIndex());
 
                 // Are we redefining an existing texture?
                 if (manifest.hasTexture())

doomsday/apps/plugins/heretic/defs/heretic/skies.ded

@@ -8,11 +8,12 @@ Header { Version = 6; }
 
 Sky {
   ID = "sky1";
-  Height = 0.6;
-  Horizon offset = -0.105;
+  Height = 0.75;
+  Horizon offset = 0;
   Layer 1 {
     Flags = enable;
     Material = "textures:SKY1";
+    Color limit = 0.1;
   };
 }