Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
This is rather a big commit, I removed old unused variables and funct…
…ions. Now

QtnPropery should work fine.
  • Loading branch information
kmkolasinski committed May 3, 2016
1 parent 2d26a59 commit 0caa488
Show file tree
Hide file tree
Showing 16 changed files with 652 additions and 7,018 deletions.
3 changes: 3 additions & 0 deletions .gitmodules
@@ -0,0 +1,3 @@
[submodule "Sources/utils/QtnProperty"]
path = Sources/utils/QtnProperty
url = https://github.com/kmkolasinski/QtnProperty
10 changes: 1 addition & 9 deletions Sources/CommonObjects.cpp
Expand Up @@ -11,16 +11,8 @@ bool FBOImageProporties::bSeamlessTranslationsFirst = true;
int FBOImageProporties::seamlessMirroModeType = 0;
bool FBOImageProporties::bConversionBaseMap = false;
bool FBOImageProporties::bConversionBaseMapShowHeightTexture = false;
float FBOImageProporties::grungeOverallWeight = 0.0; // general weight for all images
float FBOImageProporties::grungeRadius = 25.0; // general weight for all images
bool FBOImageProporties::bGrungeEnableRandomTranslations = false; //
bool FBOImageProporties::bGrungeReplotAllWhenChanged = false;
int FBOImageProporties::grungeSeed = 0; // grunge randomization seed (if = 0 no randomization)
float FBOImageProporties::grungeNormalWarp = 0.0;
QString FBOImageProporties::normalMixerFileName = "";
map<QString,int> FBOImageProporties::materialIndices;
int FBOImageProporties::currentMaterialIndeks = MATERIALS_DISABLED;

int FBOImageProporties::currentMaterialIndeks = MATERIALS_DISABLED;
RandomTilingMode FBOImageProporties::seamlessRandomTiling = RandomTilingMode();

float Display3DSettings::openGLVersion = 3.3;
Expand Down

0 comments on commit 0caa488

Please sign in to comment.