32bit Graphics Extra Zoom Patch

[GeekToo]

Maquinista,
The palette remaps are defined here:
http://docs.openttd.org/town__land_8h_source.html

Search for sprite 5b4 (hex for spritenr 1460), to find the various variations. The palette variable behind it ( like PALETTE_TO_STRUCT_RED) defines the color table to use, as defined by the nonsprites in the grf files.

[GeekToo]

Maquinista,
Which tar file does contain the oversaturated roof you pointed to here (in the jpg):
http://www.tt-forums.net/viewtopic.php?p=901616#p901616

[maquinista]

Maquinista,
Which tar file does contain the oversaturated roof you pointed to here (in the jpg):
http://www.tt-forums.net/viewtopic.php?p=901616#p901616

Here:
http://jupix.info/openttd/gfxdev-repo/i ... file&id=29
Sprites 4424-4427.

[GeekToo]

Thanks Maquinista, for the link.

I am aware of the problem with the saturation, but as Zephyris said, it is not that easy to solve.
The problem is that the company colours in OTTD distinguish themselves in different ways:
-most obvious by hue, like purple and red,
-some by lightness, like white and gray,
-and others by difference in saturation. This is mostly a problem for the blues, two of them got almost the same hue, but differ by saturation, and also orange and brown would look almost the same without difference in lightness and saturation.

So, if I would implement your algorithm, the blues and brown /orange would be hard to distinguish. So that is one problem swapped for another.

The only way I see to solve this, is to define a different hue for every company colour (except maybe white and gray), and take the saturation and lightness of the original sprite.

So we could make a small 32bpp LUT (Look Up Table) for the company colours, in which every company colour differs like 25 or 30 degrees in hue, and map those to the company colour names that best fit it.

[maquinista]

So we could make a small 32bpp LUT (Look Up Table) for the company colours, in which every company colour differs like 25 or 30 degrees in hue, and map those to the company colour names that best fit it.

It could be a interesting idea.

Do You have some screenshots with these blues that have different saturations?

[GeekToo]

When you check the colours in this picture with e.g. Gimp, you'll see that the hue of some of the blues are almost the same

http://wiki.ttdpatch.net/img/wiki_up//playercolours.png

[Zephyris]

These are the raw hues from the player colours image. Notice how similar the hues of the pale green, green and dark green (2, 7, 8) dark blue and blue (1, 9) red and pink (3, 5) orange and brown (13, 14) and mauve and purple (11, 12) are.

[sweetdude]

I found out that sprites 2700~2723 in the Vehicle stations and depots.tar are not added in the nightly dev build. Is there a reason for it?

[maquinista]

I found out that sprites 2700~2723 in the Vehicle stations and depots.tar are not added in the nightly dev build. Is there a reason for it?

Some sprites needs lower zoom level (Z1 and Z2) files. Also, the shadows of the truck station are too dark.

Maybe I could try to add a element painted in CC to the tram depot, like this:

[Jupix]

I found out that sprites 2700~2723 in the Vehicle stations and depots.tar are not added in the nightly dev build. Is there a reason for it?

http://jupix.info/openttd/gfxdev-repo/i ... file&id=38
The whole package is ignored because of its status. It needs to be split into separate entries on a per-building basis. When that gets done I think most of it will end up in the dev build.

[GeekToo]

The openttd compile farm has compiled a fresh set of binaries for the patch for every platform OTTD is available for (latest updates contain mainly optimizing changes):
http://bundles.openttdcoop.org/32bpp-ez/LATEST/

[GeekToo]

There's a new version of the patch:
http://bundles.openttdcoop.org/32bpp-ez/LATEST/

Solving this bug: http://dev.openttdcoop.org/issues/1606 (fast zoom in/out changes position on the map)

Lord Aro (e.a), if you want you can check whether the problem is solved.

[Lord Aro]

a quick test with no 32bpp graphics indicated that it is fixed

[xmirakulix]

I noticed that frosch's changes in trunk r21785 to r21788 changed the spritecache in a way that the ez-patch doesn't apply anymore.
I tried to fix it, but my cpp knowledge is far to little for that.

I'd be happy, if someone more skilled could take a look into this.

[Rubidium]

Interestingly enough it has been failing since somewhere around r21646 according to http://dev.openttdcoop.org/issues/2069

[GeekToo]

Even more interesting, it now works again. Updated to trunk of yesterday. See first link in my previous post for binaries.

[xmirakulix]

The patch applies cleanly now, but I am getting two compile errors.

It seems to me, that one error is due to an error in the ez.diff on Line 1412:

Code: Select all

/Users/flo/Desktop/openttd/git-openttd/src/spritecache.cpp:351: error: ‘AllocSprite’ was not declared in this scope

The lines in the patch:

Code: Select all

-	return BlitterFactoryBase::GetCurrentBlitter()->Encode(&sprite, allocator);
+	return BlitterFactoryBase::GetCurrentBlitter()->Encode(&sprite, &AllocSprite);

I don't know, what causes the second error. Maybe a speciality of the OSX gcc? gcc -v says: "gcc version 4.2.1 (Apple Inc. build 5664)".
It doesn't occur when I compile a vanilla trunk.

Code: Select all

/Users/flo/Desktop/openttd/git-openttd/src/spritecache.cpp:326: error: passing ‘const SpriteTypeByte’ as ‘this’ argument of ‘SimpleTinyEnumT<enum_type, storage_type>& SimpleTinyEnumT<enum_type, storage_type>::operator=(enum_type) [with enum_type = SpriteType, storage_type = unsigned char]’ discards qualifiers

[GeekToo]

It is a patch queue, so please apply the second patch also:
http://dev.openttdcoop.org/projects/32b ... o_gfx.diff

(Though I admit they should be applicable standalone, at least from the bottom to the top of the patch queue stack)

[xmirakulix]

It seems to me, that the ez patch currently isn't that actively maintained, the last update was 6 months ago.
The one on http://bundles.openttdcoop.org/32bpp-ez ... ng/LATEST/ doesn't apply anymore, as there were changes in trunk to FioOpenFile(), vehicle shadowing, settings, ...

I updated the full patch (not each patch in the queue separately) to apply against current trunk.
If needed, I can update the smaller patches separately too.

[Lord Aro]

great!

if you could update the smaller patches too, that'd be even better, as then i could (get someone to) upload them to the repo