wraitii Posted July 9, 2012 Report Share Posted July 9, 2012 The premake blunder should have been fixed... Do report if anything else is missing. Quote Link to comment Share on other sites More sharing options...
zoot Posted July 9, 2012 Report Share Posted July 9, 2012 I get the following message when trying to checkout:$ git checkout wraitii/merged error: The following untracked working tree files would be overwritten by checkout:build/premake/.gccver.tmpbuild/premake/premake4/bin/release/premake4build/premake/premake4/build/gmake.unix/obj/Release/lapi.dbuild/premake/premake4/build/gmake.unix/obj/Release/lapi.obuild/premake/premake4/build/gmake.unix/obj/Release/lauxlib.dbuild/premake/premake4/build/gmake.unix/obj/Release/lauxlib.obuild/premake/premake4/build/gmake.unix/obj/Release/lbaselib.dbuild/premake/premake4/build/gmake.unix/obj/Release/lbaselib.obuild/premake/premake4/build/gmake.unix/obj/Release/lcode.dbuild/premake/premake4/build/gmake.unix/obj/Release/lcode.obuild/premake/premake4/build/gmake.unix/obj/Release/ldblib.dbuild/premake/premake4/build/gmake.unix/obj/Release/ldblib.obuild/premake/premake4/build/gmake.unix/obj/Release/ldebug.dbuild/premake/premake4/build/gmake.unix/obj/Release/ldebug.obuild/premake/premake4/build/gmake.unix/obj/Release/ldo.dbuild/premake/premake4/build/gmake.unix/obj/Release/ldo.obuild/premake/premake4/build/gmake.unix/obj/Release/ldump.dbuild/premake/premake4/build/gmake.unix/obj/Release/ldump.obuild/premake/premake4/build/gmake.unix/obj/Release/lfunc.dbuild/premake/premake4/build/gmake.unix/obj/Release/lfunc.obuild/premake/premake4/build/gmake.unix/obj/Release/lgc.dbuild/premake/premake4/build/gmake.unix/obj/Release/lgc.obuild/premake/premake4/build/gmake.unix/obj/Release/linit.dbuild/premake/premake4/build/gmake.unix/obj/Release/linit.obuild/premake/premake4/build/gmake.unix/obj/Release/liolib.dbuild/premake/premake4/build/gmake.unix/obj/Release/liolib.obuild/premake/premake4/build/gmake.unix/obj/Release/llex.dbuild/premake/premake4/build/gmake.unix/obj/Release/llex.obuild/premake/premake4/build/gmake.unix/obj/Release/lmathlib.dbuild/premake/premake4/build/gmake.unix/obj/Release/lmathlib.obuild/premake/premake4/build/gmake.unix/obj/Release/lmem.dbuild/premake/premake4/build/gmake.unix/obj/Release/lmem.obuild/premake/premake4/build/gmake.unix/obj/Release/loadlib.dbuild/premake/premake4/build/gmake.unix/obj/Release/loadlib.obuild/premake/premake4/build/gmake.unix/obj/Release/lobject.dbuild/premake/premake4/build/gmake.unix/obj/Release/lobject.obuild/premake/premake4/build/gmake.unix/obj/Release/lopcodes.dbuild/premake/premake4/build/gmake.unix/obj/Release/lopcodes.obuild/premake/premake4/build/gmake.unix/obj/Release/loslib.dbuild/premake/premake4/build/gmake.unix/obj/Release/loslib.obuild/premake/premake4/build/gmake.unix/obj/Release/lparser.dbuild/premake/premake4/build/gmake.unix/obj/Release/lparser.obuild/premake/premake4/build/gmake.unix/obj/Release/lstate.dbuild/premake/premake4/build/gmake.unix/obj/Release/lstate.obuild/premake/premake4/build/gmake.unix/obj/Release/lstring.dbuild/premake/premake4/build/gmake.unix/obj/Release/lstring.obuild/premake/premake4/build/gmake.unix/obj/Release/lstrlib.dbuild/premake/premake4/build/gmake.unix/obj/Release/lstrlib.obuild/premake/premake4/build/gmake.unix/obj/Release/ltable.dbuild/premake/premake4/build/gmake.unix/obj/Release/ltable.obuild/premake/premake4/build/gmake.unix/obj/Release/ltablib.dbuild/premake/premake4/build/gmake.unix/obj/Release/ltablib.obuild/premake/premake4/build/gmake.unix/obj/Release/ltm.dbuild/premake/premake4/build/gmake.unix/obj/Release/ltm.obuild/premake/premake4/build/gmake.unix/obj/Release/lundump.dbuild/premake/premake4/build/gmake.unix/obj/Release/lundump.obuild/premake/premake4/build/gmake.unix/obj/Release/lvm.dbuild/premake/premake4/build/gmake.unix/obj/Release/lvm.obuild/premake/premake4/build/gmake.unix/obj/Release/lzio.dbuild/premake/premake4/build/gmake.unix/obj/Release/lzio.obuild/premake/premake4/build/gmake.unix/obj/Release/os_chdir.dbuild/premake/premake4/build/gmake.unix/obj/Release/os_chdir.obuild/premake/premake4/build/gmake.unix/obj/Release/os_copyfile.dbuild/premake/premake4/build/gmake.unix/obj/Release/os_copyfile.obuild/premake/premake4/build/gmake.unix/obj/Release/os_getcwd.dbuild/premake/premake4/build/gmake.unix/obAbortingTo be honest, I have no idea what that means, but I found this. Quote Link to comment Share on other sites More sharing options...
wraitii Posted July 9, 2012 Report Share Posted July 9, 2012 Yeah, it's because it would overwrite the files. you can probably use some option to force the overwrite, it's not a problem. Quote Link to comment Share on other sites More sharing options...
zoot Posted July 9, 2012 Report Share Posted July 9, 2012 Okay, did checkout -f.I get this upon update-workspaces.sh:gcc-4.6.real: error: CoreServices: No such file or directory Quote Link to comment Share on other sites More sharing options...
wraitii Posted July 9, 2012 Report Share Posted July 9, 2012 Ah, for some reason it updated with an osx specific version... Tried to clean-workspaces? Quote Link to comment Share on other sites More sharing options...
zoot Posted July 9, 2012 Report Share Posted July 9, 2012 I get the same message after having done clean-workspaces.sh. Quote Link to comment Share on other sites More sharing options...
wraitii Posted July 9, 2012 Report Share Posted July 9, 2012 Allright, well I'll see that tomorrow, in the meantime you should be able to compile if you copy SVN's premake over it. Quote Link to comment Share on other sites More sharing options...
zoot Posted July 9, 2012 Report Share Posted July 9, 2012 I'll try that. Quote Link to comment Share on other sites More sharing options...
historic_bruno Posted July 9, 2012 Report Share Posted July 9, 2012 k776, there have been a few bugfixes, so I'll generate new patches.I can still faintly see the terrain after un-revealing the map, it seems it's not restored to fully black. You may need to adjust your monitor and zoom in to see it:Already fixed but not committed. Done.Confirmed Grass is not implemented in the ARB shaders. The grass texture is actually identical to the default texture, but also contains an alpha channel -- the alpha should be ignored, sounds like it isn't.Right, on both GLSL and ARB I see the alpha channel as black, which could be partially responsible for the ugliness. It may be specific to my GPU/drivers: But yeah I figured it was experimental, that's why I mentioned it last Quote Link to comment Share on other sites More sharing options...
historic_bruno Posted July 10, 2012 Report Share Posted July 10, 2012 I'm aware of this. Not sure if there's anything that can be done about it. The terrain adds new geometry that is higher than the terrain itself, and there's no way of telling the overlay renderers about that.Hopefully there is something that can be done, because it also obscures selection rings and territory boundaries. Not that it's any worse in theory than other grass we use, but it could cover large areas of the map, so it makes the little problem into a monster problem Maybe we need a way to draw overlays on top/in front of certain types of rendered things. Obviously you wouldn't want them on top of structures or units, but they should be on top of e.g. grass including alpha textured grass models.@zoot: I believe tickets are not used for "art" stuffs... I'll post in the forum, that'll be best.Actually from now on, you're fine creating a ticket for art tasks. But creating a topic in the Art Development forum is good for discussion too This topic pretty much explains what's going on with the art department: http://www.wildfiregames.com/forum/index.php?showtopic=16198I tested your "merged" branch, please forgive me if I report something you already know, this topic has become difficult to follow in its entirety.Seems to be a bug with decals, a few of them are black either when zooming in or at all times:AO or something breaks the UI, because I can only reproduce this after viewing the new Temple of Mars:Other than some bugs, everything you've done seems to work with ARB on my system, great job on that Quote Link to comment Share on other sites More sharing options...
zoot Posted July 10, 2012 Report Share Posted July 10, 2012 AO or something breaks the UI, because I can only reproduce this after viewing the new Temple of Mars:I can confirm seeing this (while testing parallax, I think) too. Quote Link to comment Share on other sites More sharing options...
Wijitmaker Posted July 10, 2012 Report Share Posted July 10, 2012 If someone could... would you please test these two normal files?The celt_struct_1_normal should work with any (over a dozen) celt structure actors that still uses celt_struct_1 for it's base texture.binaries\data\mods\public\art\actors\structures\celtsThe other is a test on a unit, it should work for actor:binaries\data\mods\public\art\actors\units\celts\brennus.xmlThanksPS - as someone mentioned here...Why not use SSAO (perhaps as a supplement)?SSAO would add ambient occlusion to the ground and dynamic objects (animated stuff like infantry and wagons) as well, not just static models. (If this method is used on a dynamic model, the lighting would not be correct in many circumstances)Would it be reasonable to make a distinction between dynamic an static objects. Apply SSAO to the dynamic ones and prerendered AO to the static ones? Quote Link to comment Share on other sites More sharing options...
wraitii Posted July 10, 2012 Report Share Posted July 10, 2012 (edited) Seems to be a bug with decals, a few of them are black either when zooming in or at all times:AO or something breaks the UI, because I can only reproduce this after viewing the new Temple of Mars:Other than some bugs, everything you've done seems to work with ARB on my system, great job on that I'm not completely sure what causes this, but when setting "preferglsl = false", the choice of shaders for the GUI is the fixed function, not the GLSL shaders. I'm not completely sure, but myconid may have modified the fixed function, so the problem could come from that. I'll have to check.The decals problem looks like it stems from the unfinished terrain shader. I'll try porting this over when Myconid has decided on the ≈ final version.BTW, I'm still facing a problem with the ARB shaders... Since I can't have "IF", then the parallax is always active: this could slow computers down considerably. I'd want to try to implement something in the source code that would tell me if the nVIDIA extension is supported, and then if so, use the modified shader and not the basic one. I've actually already tried and succeeded at that, but it's a semi-important design change so I though I'd share. Particularly since in the perspective of ahving advanced graphic options to deactivate parallax specifically, you could have a tooltip for the case where the extension is not activated. Also, changing HWDetect to switch it off if the extension is not there and we want ARB shaders.BTW, I assume the game prefers ARB shaders because of their wider compatibility? Edited July 10, 2012 by wraitii Quote Link to comment Share on other sites More sharing options...
zoot Posted July 10, 2012 Report Share Posted July 10, 2012 (edited) BTW, I'm still facing a problem with the ARB shaders... Since I can't have "IF", then the parallax is always active: this could slow computers down considerably. I'd want to try to implement something in the source code that would tell me if the nVIDIA extension is supported, and then if so, use the modified shader and not the basic one.It would be a shame to have to drop all the non-nVidia users at this point, now that you have come so far. Can you describe what specifically you need "IF" for? Edited July 10, 2012 by zoot Quote Link to comment Share on other sites More sharing options...
wraitii Posted July 10, 2012 Report Share Posted July 10, 2012 (edited) I'm not dropping the non-nvidia users. It's just that nVidia users could benefit from a faster, more efficient shader at no cost.The GLSL parallax module uses "if" to determine if the distance is small enough to draw the parallax(for optimization). I can't do that with the ARB shader as is...Alternatively, I might be able to have the engine calculate this, and then send it as a define. But that'd be more of a hack, and I'm not sure how usable it is. I dunno. Any opinions? Edited July 10, 2012 by wraitii Quote Link to comment Share on other sites More sharing options...
wraitii Posted July 10, 2012 Report Share Posted July 10, 2012 (edited) Zoot, does it work now?(reposting the link)I'd recommend a clean-workspaces / update-workspaces. Edited July 10, 2012 by wraitii Quote Link to comment Share on other sites More sharing options...
zoot Posted July 10, 2012 Report Share Posted July 10, 2012 (edited) The GLSL parallax module uses "if" to determine if the distance is small enough to draw the parallax(for optimization). I can't do that with the ARB shader as is...Can't you use the SLT instruction in some clever way? Are you familiar with Boolean algebra:In summary the three basic Boolean operations can be defined arithmetically as follows.x∧y = xyx∨y = x + y − xy¬x = 1 − x The basic idea is that you should be able to do AND, OR and NOT just with ordinary arithmetics.From a quick glance at the GLSL, I think it should be possible, but do report back if that doesn't make sense to you.Zoot, does it work now?(reposting the link)I'd recommend a clean-workspaces / update-workspaces.I'm on it Edited July 10, 2012 by zoot Quote Link to comment Share on other sites More sharing options...
wraitii Posted July 10, 2012 Report Share Posted July 10, 2012 The thing is... I can, but the instruction would still be processed (only not doing anything). So from a speed point of view, I might just as well do it. Quote Link to comment Share on other sites More sharing options...
zoot Posted July 10, 2012 Report Share Posted July 10, 2012 Ah, okay. Yeah, I guess there is no other option then. Quote Link to comment Share on other sites More sharing options...
zoot Posted July 10, 2012 Report Share Posted July 10, 2012 The premake file is missing:make[1]: Premake4.make: No such file or directory Quote Link to comment Share on other sites More sharing options...
wraitii Posted July 10, 2012 Report Share Posted July 10, 2012 Okay, so now it ought to be allright. Quote Link to comment Share on other sites More sharing options...
myconid Posted July 10, 2012 Author Report Share Posted July 10, 2012 Actually, dynamic branching is inefficient and to be avoided in all shaders, even when it's supported, and that includes GLSL shaders.Ideally, I want to unroll the loop in the GLSL shader as well. I'd prefer we find a unified solution that executes the condition just once on the CPU, based on eye distance and a user-defined parameter, and then chooses the appropriate shaders rather than have to execute the condition on the GPU for each and every fragment with predetermined parameters. Quote Link to comment Share on other sites More sharing options...
wraitii Posted July 10, 2012 Report Share Posted July 10, 2012 The idea would be to load two shaders and switch depending on the situation? Quote Link to comment Share on other sites More sharing options...
myconid Posted July 10, 2012 Author Report Share Posted July 10, 2012 The idea would be to load two shaders and switch depending on the situation?Yeah, and it should all be abstracted as much as possible, so everything is defined in the xml and config. Quote Link to comment Share on other sites More sharing options...
wraitii Posted July 10, 2012 Report Share Posted July 10, 2012 (edited) Well using techniques and the "ShaderManager", I don't think it would be too hard to switch between two techniques. The hard part is defining the switch criterion. We could probably do it by adding a line along the lines of "<ifCriterion criterion = "distance" value="50" type="GreaterThan">" or something to the XML.Ideally, we'd have a "base" shader, and if some criteria are met, we switch to another (more detailed) shader. This way, we could link 1/2/3/4… different shaders for different LOD, and also prevent this switching by options, so that lower configs would only use the base shader or the level 1. Edited July 10, 2012 by wraitii Quote Link to comment Share on other sites More sharing options...
Recommended Posts
Join the conversation
You can post now and register later. If you have an account, sign in now to post with your account.