wraitii

Ah, for some reason it updated with an osx specific version... Tried to clean-workspaces?

Yeah, it's because it would overwrite the files. you can probably use some option to force the overwrite, it's not a problem.

I had centralized a lot, everything in "Headquarters"... I'm going to decentralize a tad, or it'll get messy. I'm currently working on proper resource management, as I will need that for my economic manager to work (by that, I mean: I just started. Was busy porting fancy shader-y stuff.) I'm kind of backtracking from my "UnitInfoManager" and "BuildingInfoManager" idea... Storing in entity collection was the right idea, but my implementation is not always practical. These will probably remain in use to decide which unit/building to train/build, what is available, these sort of things.

The premake blunder should have been fixed... Do report if anything else is missing.

Ah, it's possible I have inadvertantly deleted som files when trying to use gitignore. You can use SVN premake meanwhile.

Allright, I've ported the water shader (slightly modified), experimental grass, moving trees and modelMapping as a whole. Download here. Edit: should check, but the ARB shader might have grass' alpha decreasing with each layer. T'was a test.

Ported the grass shader, and ensured the rest was working. I won't modify terrainCommon any more, since everything else is both complicated and an WIP.

I've finished porting the modelCommon shader. I'm moving on to the terrainCommon, but I can already tell the triplanar stuff is going to be a huge pain.

Okay, I got the AO and the self-light to work (along with the rest). AO looks so incredibly cool.

@zoot: I believe tickets are not used for "art" stuffs... I'll post in the forum, that'll be best. @myconid: that's probably the easiest... I just have to update your biwater with my patch.

Allright, so I've once again lost at Anno 1404's "build the cathedral" mission, so I'm off to try converting the shaders to ARB again. Edit: Still about the grass: you may want to try experimenting with lowering the alpha as the layers go up, or "thinning" the grass. could reduce some of the artifacts. I'm getting your last update (figured that upstream stuff).

Your first point is probably an ARB problem, because if GLSL is not preferred, it should use those shaders. Some things may have changed in terrain_common or terrain_base that make the ARB one crash. I'm going to try fixing that today. Your second point looks to me like the same issue: it's not yet implemented for ARB. Again, as the guy who decided he wanted to port stuff to ARB, I'll try that today. Is no-one else but me getting a wrong result with the AO? It doesn't seem to recognize the second layer of UV. BTW, hav you reached a decision about my water shader? It think it's an improvement, but it requires re-working most maps to take into account the new settings...

Myconid, testing your merged branch (using GLSL): -I get a "LOS framebuffer object incomplete: 0x8CDD" error, and indeed LOS doesn't work in-game (all black). -I still have an issue with the AO uv, it seems not recognized or something Otherwise it all looks fine, here's a small screenshot using my waterShader too:

Should have kept the same... I must have messed that up. These files should not have changed anyway... I committed them by mistake.

Okay, so I've committed (here still) my changes (merging them too) to yours. It should work properly, though I have not yet tried adding to ARB your stuff from smoothLOS or terrainmapping.

Did it the "no-braincell" way and restarted clean. Thanks to a very neat tool from Apple to merge files, I'll get everything back up in no time.

Well I'll refork from your merged branch and try to reconvert everything from ARB (not re-starting from scratch, though). I'll let you know.

Yup, it fixed it. I'll refork from your merged branch and work from that.

Well, unless you have a reason not too, I'd say it would be a good idea to put that in your code (I don't think it's much slower, and if it offers compatibility). I've seen this thread which seems to be the same issue. I haven't checked but I do not think there is any "newer" driver than the one in the latest system update, on Apple computers... I'm not running the latest on my iMac, but I'll update when 10.8 (mountain Lion) comes out in ~3 weeks Perhaps they'll at last support openGL 3.

I'll check your code with my updated water shader... I'll see if anything works. Yeah, the mat3 thing is probably a bug in my compiler... But then it's probably widespread between all Apple computers (and as my MacBookAir seems to bug the same, I'm inclined to believe so. And the OGL driver's (and thus GLSL compilers) are Apple-made on every Apple machine, and I believe are the same.). I'll check if I can port your merged shader to ARB, but as I haven't found a way to pass "varying" variables, I have to rely on texCoord and I'm getting short of them.

@Myconid: I mean stretching the texture sampling (of the grass) in a perpendicular direction to the eyeDir... I'm not sure how to calculate that, but it could perhaps be done. BTW... I still get the normal problem with this code: vec3 normal = mat3(instancingTransform) * a_normal; #if (USE_NORMAL_MAP || USE_PARALLAX_MAP) vec4 tangent = vec4(mat3(instancingTransform) * a_tangent.xyz, a_tangent.w); And not using this code: vec3 normal = (instancingTransform * vec4(a_normal,0.0) ).rgb; #if (USE_NORMAL_MAP || USE_PARALLAX_MAP) vec4 tangent = vec4( (instancingTransform * vec4(a_tangent.xyz,0.0)).rgb, a_tangent.w); Both should work the same, but it appears "mat3" doesn't work properly on my computer. I can confirm the "bi" water sampling, but I've found it to look slightly weird as the two move at different speeds.

I got the grass effect to work, myconid... Looks really nice (though of course lighting is still not really supported). I think you could try to use less layers if you simulated rotating each grass layer to face the camera (in the fragment shader).

Probably an easier way would be to use 256x256 textures instead of the 128x128 the game is using now. The scaling issue is actually mainly visible in huge zones of open sea with little waviness in the latest version, because in this case I repeat the texture more so the waves appear smaller.

This image is mostly right (the actual images were changed, but still look a lot like this): The transition probably could be smoother. But I'm unsure they'll ever be perfect. Edit: ah, actually, there's a few more now. But still, the problem remains: the gradient could be smoother for some textures.

I'm talking about that too... By using bigger blending squares/textures, we could blend more smoothly as we'd have more space for the gradient.