New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Terrain basetex formats #793

Merged
merged 3 commits into from Nov 4, 2014

Conversation

Projects
None yet
3 participants
@lukaspj
Contributor

lukaspj commented Sep 23, 2014

Necessary for fixing an issue described in #710 supports DDS PNG and JPG

@crabmusket

This comment has been minimized.

Show comment
Hide comment
@crabmusket

crabmusket Sep 23, 2014

Contributor

Awesome. Code looks fairly clean but we get this error under GCC:

../../../../Engine/source/terrain/terrData.cpp: In constructor ‘TerrainBlock::TerrainBlock()’:
../../../../Engine/source/terrain/terrData.cpp:201:20: error: ‘BaseTexFormat’ is not a class or
namespace
    mBaseTexFormat( BaseTexFormat::JPG ),

I suspect you need the TerrainBlock:: on there. Not sure what the scoping rules are for those initialisers.

Contributor

crabmusket commented Sep 23, 2014

Awesome. Code looks fairly clean but we get this error under GCC:

../../../../Engine/source/terrain/terrData.cpp: In constructor ‘TerrainBlock::TerrainBlock()’:
../../../../Engine/source/terrain/terrData.cpp:201:20: error: ‘BaseTexFormat’ is not a class or
namespace
    mBaseTexFormat( BaseTexFormat::JPG ),

I suspect you need the TerrainBlock:: on there. Not sure what the scoping rules are for those initialisers.

@dottools

This comment has been minimized.

Show comment
Hide comment
@dottools

dottools Sep 23, 2014

Needs to be TerrainBlock::JPG. Using <enumName>::<enumLabel> is a Microsoft specific extension, but I think recent C++11 standard optionally supports it now.

dottools commented Sep 23, 2014

Needs to be TerrainBlock::JPG. Using <enumName>::<enumLabel> is a Microsoft specific extension, but I think recent C++11 standard optionally supports it now.

@lukaspj

This comment has been minimized.

Show comment
Hide comment
@lukaspj

lukaspj Sep 23, 2014

Contributor

Should be fixed now.. Damn Microsoft :P

Contributor

lukaspj commented Sep 23, 2014

Should be fixed now.. Damn Microsoft :P

@crabmusket crabmusket added this to the 3.7 milestone Sep 30, 2014

@crabmusket crabmusket self-assigned this Nov 4, 2014

crabmusket added a commit that referenced this pull request Nov 4, 2014

@crabmusket crabmusket merged commit 97ae344 into GarageGames:development Nov 4, 2014

1 check passed

default Merged build finished.
Details
@crabmusket

This comment has been minimized.

Show comment
Hide comment
@crabmusket

crabmusket Nov 4, 2014

Contributor

Looks good! Thanks heaps for your hard work on this.

Contributor

crabmusket commented Nov 4, 2014

Looks good! Thanks heaps for your hard work on this.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment