Test file and 'map' cleanup

[Serpentine]

Hey there,

 

There are a few material and particle files (and likely others). Can we start removing these from the SVN? while backing your work up is good and I know that the packaging scripts remove them. It does make working on the engine a bit messy with loads of warnings and errors which are not actually important.

 

If you're finishing an asset and want to iterate design based on feedback, its fine to just use the real files. I can set an ignore rule to allow personal test files to be ignored (stops you accidentally adding them); i.e if the name includes 'ptest', ignore it when committing. Would this be something that would interest anyone?

 

We also have a bunch of maps which are either out of date or not related to mapping within the main repo - Do we really need these?

 

Just trying to get some spring-cleaning done so that I can reduce noise in logs and prevent some bit rot.

[Tels]

For a logn time I have tried to clean up the repository (even did it after a while because I added a lot of cruft

 

So I am all for it.

 

However, it is really complicated, because the testmaps are used a lot, but sometimes a specific issue is not tested for a year, so the testmap gets outdated quickly. I amtrying to fix them everytime I come some across, but it is hopeless. We do have testmaps that still contain D3 AI (and no longer work). However, I am not sure if we really need the testmaps for the old issues - usually, what happens is when someone has an issue, they build a new testmap, anyway...

 

As for the particle and material files, I think these should be cleaned up and have a good chance as there are so few (most of them are actually needed).

 

So, basically, if you clean anything up, I am for it, but can't help you with that (as I spent already hundreds of hours on this

 

Btw, don't want to discourage you, but before you start getting side-tracked, could you please commit the new console font, and the compressed normal maps? I'd rather have these for v1.08, then a clean repository

[Serpentine]

The font itself is already in, the normalmaps can go in - but will be messy until I can enable them by default, however for that to happen we need the performance regression to be out of the way so that it doesnt end up either being a pain to revert or hiding the problem.

[Tels]

Ah ok, wasn't aware the font is already in Thanx! So commence cleanup

[Serpentine]

@BC - Are you using your test materials/particles?

[Baddcog]

umm, that's so old, I'll grab a copy of that and it can be deleted...

 

OK, it's deleted

[Serpentine]

Thanks

[Serpentine]

Removed a bunch of these files, nothing too major.

 

While I was in the area I fixed up the skins for various lights. 'non-extinguishable' has the '-' character in it, which is problematic for images/materials/skins/etc. However since the models have a hard path including them, I cant just rename the models and change the skins to represent that. I have replaced the -'s with _'s this should work (I did test, but I would not consider it a clean test).

 

I expect this might not work, but I hope it does.

 

PLEASE stick to a-Z, 0-9 and underscores for names.

[Tels]

Erm, the change from "models/darkmod/lights/non-extinguishable/lamp_shaded02.lwo" to "models/darkmod/lights/non_extinguishable/lamp_shaded02.lwo" is not a good idea. It means that the actual file is A, but the skin refers to it as B, which will not confuse huimans mightly (it confused me for a couple of minutes while trying to figure out what exactly the diff was about), but also any script that looks for this file.

 

Can you please revert this? Instead the code should be fixed to no longer warn just because a path contains "-" (for whatever reasons the code can't handle a "-", this is wrong and should be fixed).

 

As for the "PLEASE stick to a-Z, 0-9 and underscores for names.": Well, duh, it is too late for that, we have already folders with "-" in it

 

Edit: I forgot that our entityDef names have "atdm:foo", I am not exactly happy about the ":" in there, but it needs to stay - we can't rename them now. Not the brightest idea we had, but well, it works for now.

[Serpentine]

The skin should still find the model, it does with my little test here, however I'm only looking at it in the engine - not DR.

 

Feel free to revert it, but if you're going to go changing lexers - you're going to have one hell of a time testing that all operand uses are still working correctly. I really doubt that these skin have ever worked correctly, seeing as it cant load the correct image.

[Baddcog]

I think those names have been there for a long time.

 

When I worked on the lights I didn't change any of that, just stuck with convention.

 

However I never noticed missing skins on any lights in DR or game. (at least not because of the name, and definitely not by the time i was done.... all skins were working fine)

[Serpentine]

They must have been defaulting to something else, I think the easiest way around it is just to make the model loader replace minuses with underscores. Least work, solves a bunch of possible issues and lets us rename things safely in the future.

[Serpentine]

An example of the problem can be seen here - this is the training mission (and as such the list is only that of models used on the map):

WARNING: Couldn't load image: -
WARNING: Couldn't load image: extinguishable/arclight
WARNING: Couldn't load image: extinguishable/electric_plain1_unattached
WARNING: Couldn't load image: extinguishable/grill_light
WARNING: Couldn't load image: extinguishable/grill_light_short
WARNING: Couldn't load image: extinguishable/lamp_shaded
WARNING: Couldn't load image: extinguishable/lamp_shaded02
WARNING: Couldn't load image: extinguishable/lantern_oil_hand
WARNING: Couldn't load image: extinguishable/wallight1
WARNING: Couldn't load image: extinguishable/wallight2
WARNING: Couldn't load image: extinguishable/wallight_3_unattached
WARNING: Couldn't load image: extinguishable/wallight_3_unnatached
WARNING: Couldn't load image: extinguishable/wallight_outdoor3
WARNING: Couldn't load image: models/darkmod/lights/non
WARNING: Couldn't load image: }

[Baddcog]

So it thinks the - is a name?

 

I don't know what it would replace them with, they all show up fine (in 1.07 at least) in dr and game. Is it just some console bug?

[Tels]

The skin should still find the model, it does with my little test here, however I'm only looking at it in the engine - not DR.

 

Feel free to revert it, but if you're going to go changing lexers - you're going to have one hell of a time testing that all operand uses are still working correctly. I really doubt that these skin have ever worked correctly, seeing as it cant load the correct image.

 

I think the consensus was that the warning is there, but the correct image is loaded, anyway. (At least the engine loads the model!)

 

What I don't understand how you expect (or even the engine does it) to be able to write "foo_bar" and have the engine load the file "foo-bar" from the file-system. That would mean it replaces "_" with "-" while loading, AND that would mean we couldn't have a "_" in a filename, anyway. But we do have files with a "_" in a name, so this can never work.

 

It can be only one of these, either "_" is found, or "-" is found. We have files with "_" in their name and files with "-" in their name and the engine can't simply swap one with the other and still fine the other kind of file.

 

I'll take a look, tracked here: http://bugs.angua.at/view.php?id=3059

 

In the meantime, can you please revert all the changes from "-" to "_" in the skin files please?

[Tels]

A short look at the code doesn't look like skin files are treated indepently from other declaration files. So it occured to me, would this work:

 

"model" "models/darkmod/lights/non-extinguishable/arclight.lwo"

 

or even this:

 

model "models/darkmod/lights/non-extinguishable/arclight.lwo"

 

We do use the same syntax in the def files (where we ALWAYS add "" around names and values) and if that works for skins, we don't need to modify the code, just change all the skin delcarations with search&replace.

[Serpentine]

Hmmm sure, that makes sense.

 

As to the assumption about the loader translating -'s to _'s or whatever, the idea is more that we could make all non-word characters into underscores, this would not load them, however it would allow the files to be renamed to comply(rather than allowing more bad sprawl), without breaking any other defs/lexer/tokens. However should this work, it wont be required.

[Tels]

The funny thing is, the loader does only translate ":", "/" and "\" to "/", so it never cares for underscores or dash. And I don't think we can change this, as it would break other stuff.

 

So I think this is what happens:

 

* if you have "model models/non-extingushable/foo.lwo" - the parser parses this is "model models/non" and "-" and "extingushable/foo.lwo", This will try to apply the skin to the wrong model, and also try to load an image that never exists (and isn't even an image)

* if you have "model models/non_extingushable/foo.lwo" - the parser parses this is "model models/non_extingushable/foo.lwo", This will try to apply the skin to the wrong model, but somehow the skin will still be applied to the right model (haven't found out where this exactly happens)

* if you have "model "models/non_extingushable/foo.lwo"" - the parser parses this is "model models/non_extingushable/foo.lwo", This will try to apply the skin to the right model, and not warn, and not confuse humans. Hopefully

 

So, if we add "", it hopefully works. Could you please test this, too? If it works, I don't mind doing the replace, but if you beat me to it, I won't complain either

[Serpentine]

Yeah I just tested, works as expected - so good call there.

 

I'm just going to make a better expression to try find other characters which would need this to be done.

[Tels]

All right, I assume you want to do the change with a script then? I thought maybe we just convert every "model ...." line, regardless of content of the model file name. Simple, but easier

[Serpentine]

Nah, regex was more than enough - and in the end, it was only the lights file that needed it.

[Serpentine]

@Spring - Do we still need materials/springheels_characters.mtr?

[Springheel]

It doesn't need to be on SVN anymore, but I still use it. Is there an easy way to remove it from SVN without losing the file?

[Serpentine]

I don't use TortSVN, however it seems that you hold down shift and right-click the file, there should be an option for "Delete (keep local)",