Skip to content
Snippets Groups Projects
Commit 82a097b0 authored by Graham Linden's avatar Graham Linden
Browse files

MAINT-8676 modify XUI to allow negative offsets again and fix up material... 

MAINT-8676  modify XUI to allow negative offsets again and fix up material handling of normal/specular offsets
parent 27679824
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
indra/llprimitive/llmaterial.cpp
+ 257
− 16
View file @ 82a097b0
...@@ -114,23 +114,249 @@ LLMaterial::LLMaterial(const LLSD& material_data) ...@@ -114,23 +114,249 @@ LLMaterial::LLMaterial(const LLSD& material_data)
fromLLSD(material_data); fromLLSD(material_data);
} }
const LLUUID& LLMaterial::getNormalID() const
{
return mNormalID;
}
void LLMaterial::setNormalID(const LLUUID& normal_id)
{
mNormalID = normal_id;
}
void LLMaterial::getNormalOffset(F32& offset_x, F32& offset_y) const
{
offset_x = mNormalOffsetX;
offset_y = mNormalOffsetY;
}
F32 LLMaterial::getNormalOffsetX() const
{
return mNormalOffsetX;
}
F32 LLMaterial::getNormalOffsetY() const
{
return mNormalOffsetY;
}
void LLMaterial::setNormalOffset(F32 offset_x, F32 offset_y)
{
mNormalOffsetX = offset_x;
mNormalOffsetY = offset_y;
}
void LLMaterial::setNormalOffsetX(F32 offset_x)
{
mNormalOffsetX = offset_x;
}
void LLMaterial::setNormalOffsetY(F32 offset_y)
{
mNormalOffsetY = offset_y;
}
void LLMaterial::getNormalRepeat(F32& repeat_x, F32& repeat_y) const
{
repeat_x = mNormalRepeatX;
repeat_y = mNormalRepeatY;
}
F32 LLMaterial::getNormalRepeatX() const
{
return mNormalRepeatX;
}
F32 LLMaterial::getNormalRepeatY() const
{
return mNormalRepeatY;
}
void LLMaterial::setNormalRepeat(F32 repeat_x, F32 repeat_y)
{
mNormalRepeatX = repeat_x;
mNormalRepeatY = repeat_y;
}
void LLMaterial::setNormalRepeatX(F32 repeat_x)
{
mNormalRepeatX = repeat_x;
}
void LLMaterial::setNormalRepeatY(F32 repeat_y)
{
mNormalRepeatY = repeat_y;
}
F32 LLMaterial::getNormalRotation() const
{
return mNormalRotation;
}
void LLMaterial::setNormalRotation(F32 rot)
{
mNormalRotation = rot;
}
const LLUUID& LLMaterial::getSpecularID() const
{
return mSpecularID;
}
void LLMaterial::setSpecularID(const LLUUID& specular_id)
{
mSpecularID = specular_id;
}
void LLMaterial::getSpecularOffset(F32& offset_x, F32& offset_y) const
{
offset_x = mSpecularOffsetX;
offset_y = mSpecularOffsetY;
}
F32 LLMaterial::getSpecularOffsetX() const
{
return mSpecularOffsetX;
}
F32 LLMaterial::getSpecularOffsetY() const
{
return mSpecularOffsetY;
}
void LLMaterial::setSpecularOffset(F32 offset_x, F32 offset_y)
{
mSpecularOffsetX = offset_x;
mSpecularOffsetY = offset_y;
}
void LLMaterial::setSpecularOffsetX(F32 offset_x)
{
mSpecularOffsetX = offset_x;
}
void LLMaterial::setSpecularOffsetY(F32 offset_y)
{
mSpecularOffsetY = offset_y;
}
void LLMaterial::getSpecularRepeat(F32& repeat_x, F32& repeat_y) const
{
repeat_x = mSpecularRepeatX;
repeat_y = mSpecularRepeatY;
}
F32 LLMaterial::getSpecularRepeatX() const
{
return mSpecularRepeatX;
}
F32 LLMaterial::getSpecularRepeatY() const
{
return mSpecularRepeatY;
}
void LLMaterial::setSpecularRepeat(F32 repeat_x, F32 repeat_y)
{
mSpecularRepeatX = repeat_x; mSpecularRepeatY = repeat_y;
}
void LLMaterial::setSpecularRepeatX(F32 repeat_x)
{
mSpecularRepeatX = repeat_x;
}
void LLMaterial::setSpecularRepeatY(F32 repeat_y)
{
mSpecularRepeatY = repeat_y;
}
F32 LLMaterial::getSpecularRotation() const
{
return mSpecularRotation;
}
void LLMaterial::setSpecularRotation(F32 rot)
{
mSpecularRotation = rot;
}
const LLColor4U LLMaterial::getSpecularLightColor() const
{
return mSpecularLightColor;
}
void LLMaterial::setSpecularLightColor(const LLColor4U& color)
{
mSpecularLightColor = color;
}
U8 LLMaterial::getSpecularLightExponent() const
{
return mSpecularLightExponent;
}
void LLMaterial::setSpecularLightExponent(U8 exponent)
{
mSpecularLightExponent = exponent;
}
U8 LLMaterial::getEnvironmentIntensity() const
{
return mEnvironmentIntensity;
}
void LLMaterial::setEnvironmentIntensity(U8 intensity)
{
mEnvironmentIntensity = intensity;
}
U8 LLMaterial::getDiffuseAlphaMode() const
{
return mDiffuseAlphaMode;
}
void LLMaterial::setDiffuseAlphaMode(U8 alpha_mode)
{
mDiffuseAlphaMode = alpha_mode;
}
U8 LLMaterial::getAlphaMaskCutoff() const
{
return mAlphaMaskCutoff;
}
void LLMaterial::setAlphaMaskCutoff(U8 cutoff)
{
mAlphaMaskCutoff = cutoff;
}
LLSD LLMaterial::asLLSD() const LLSD LLMaterial::asLLSD() const
{ {
LLSD material_data; LLSD material_data;
S32 normalOffsetXInt = ll_round(mNormalOffsetX * MATERIALS_MULTIPLIER);
S32 normalOffsetYInt = ll_round(mNormalOffsetY * MATERIALS_MULTIPLIER);
S32 normalRotInt = ll_round(mNormalRotation * MATERIALS_MULTIPLIER);
material_data[MATERIALS_CAP_NORMAL_MAP_FIELD] = mNormalID; material_data[MATERIALS_CAP_NORMAL_MAP_FIELD] = mNormalID;
material_data[MATERIALS_CAP_NORMAL_MAP_OFFSET_X_FIELD] = ll_round(mNormalOffsetX * MATERIALS_MULTIPLIER); material_data[MATERIALS_CAP_NORMAL_MAP_OFFSET_X_FIELD] = normalOffsetXInt;
material_data[MATERIALS_CAP_NORMAL_MAP_OFFSET_Y_FIELD] = ll_round(mNormalOffsetY * MATERIALS_MULTIPLIER); material_data[MATERIALS_CAP_NORMAL_MAP_OFFSET_Y_FIELD] = normalOffsetYInt;
material_data[MATERIALS_CAP_NORMAL_MAP_REPEAT_X_FIELD] = ll_round(mNormalRepeatX * MATERIALS_MULTIPLIER); material_data[MATERIALS_CAP_NORMAL_MAP_REPEAT_X_FIELD] = ll_round(mNormalRepeatX * MATERIALS_MULTIPLIER);
material_data[MATERIALS_CAP_NORMAL_MAP_REPEAT_Y_FIELD] = ll_round(mNormalRepeatY * MATERIALS_MULTIPLIER); material_data[MATERIALS_CAP_NORMAL_MAP_REPEAT_Y_FIELD] = ll_round(mNormalRepeatY * MATERIALS_MULTIPLIER);
material_data[MATERIALS_CAP_NORMAL_MAP_ROTATION_FIELD] = ll_round(mNormalRotation * MATERIALS_MULTIPLIER); material_data[MATERIALS_CAP_NORMAL_MAP_ROTATION_FIELD] = normalRotInt;
material_data[MATERIALS_CAP_SPECULAR_MAP_FIELD] = mSpecularID; material_data[MATERIALS_CAP_SPECULAR_MAP_FIELD] = mSpecularID;
material_data[MATERIALS_CAP_SPECULAR_MAP_OFFSET_X_FIELD] = ll_round(mSpecularOffsetX * MATERIALS_MULTIPLIER);
material_data[MATERIALS_CAP_SPECULAR_MAP_OFFSET_Y_FIELD] = ll_round(mSpecularOffsetY * MATERIALS_MULTIPLIER); S32 specularOffsetXInt = ll_round(mSpecularOffsetX * MATERIALS_MULTIPLIER);
S32 specularOffsetYInt = ll_round(mSpecularOffsetY * MATERIALS_MULTIPLIER);
S32 specularRotInt = ll_round(mSpecularRotation * MATERIALS_MULTIPLIER);
material_data[MATERIALS_CAP_SPECULAR_MAP_OFFSET_X_FIELD] = specularOffsetXInt;
material_data[MATERIALS_CAP_SPECULAR_MAP_OFFSET_Y_FIELD] = specularOffsetYInt;
material_data[MATERIALS_CAP_SPECULAR_MAP_REPEAT_X_FIELD] = ll_round(mSpecularRepeatX * MATERIALS_MULTIPLIER); material_data[MATERIALS_CAP_SPECULAR_MAP_REPEAT_X_FIELD] = ll_round(mSpecularRepeatX * MATERIALS_MULTIPLIER);
material_data[MATERIALS_CAP_SPECULAR_MAP_REPEAT_Y_FIELD] = ll_round(mSpecularRepeatY * MATERIALS_MULTIPLIER); material_data[MATERIALS_CAP_SPECULAR_MAP_REPEAT_Y_FIELD] = ll_round(mSpecularRepeatY * MATERIALS_MULTIPLIER);
material_data[MATERIALS_CAP_SPECULAR_MAP_ROTATION_FIELD] = ll_round(mSpecularRotation * MATERIALS_MULTIPLIER); material_data[MATERIALS_CAP_SPECULAR_MAP_ROTATION_FIELD] = specularRotInt;
material_data[MATERIALS_CAP_SPECULAR_COLOR_FIELD] = mSpecularLightColor.getValue(); material_data[MATERIALS_CAP_SPECULAR_COLOR_FIELD] = mSpecularLightColor.getValue();
material_data[MATERIALS_CAP_SPECULAR_EXP_FIELD] = mSpecularLightExponent; material_data[MATERIALS_CAP_SPECULAR_EXP_FIELD] = mSpecularLightExponent;
...@@ -144,18 +370,33 @@ LLSD LLMaterial::asLLSD() const ...@@ -144,18 +370,33 @@ LLSD LLMaterial::asLLSD() const
void LLMaterial::fromLLSD(const LLSD& material_data) void LLMaterial::fromLLSD(const LLSD& material_data)
{ {
mNormalID = getMaterialField<LLSD::UUID>(material_data, MATERIALS_CAP_NORMAL_MAP_FIELD, LLSD::TypeUUID); mNormalID = getMaterialField<LLSD::UUID>(material_data, MATERIALS_CAP_NORMAL_MAP_FIELD, LLSD::TypeUUID);
mNormalOffsetX = (F32)getMaterialField<LLSD::Integer>(material_data, MATERIALS_CAP_NORMAL_MAP_OFFSET_X_FIELD, LLSD::TypeInteger) / MATERIALS_MULTIPLIER;
mNormalOffsetY = (F32)getMaterialField<LLSD::Integer>(material_data, MATERIALS_CAP_NORMAL_MAP_OFFSET_Y_FIELD, LLSD::TypeInteger) / MATERIALS_MULTIPLIER; S32 normalOffsetXInt = getMaterialField<LLSD::Integer>(material_data, MATERIALS_CAP_NORMAL_MAP_OFFSET_X_FIELD, LLSD::TypeInteger);
mNormalRepeatX = (F32)getMaterialField<LLSD::Integer>(material_data, MATERIALS_CAP_NORMAL_MAP_REPEAT_X_FIELD, LLSD::TypeInteger) / MATERIALS_MULTIPLIER; S32 normalOffsetYInt = getMaterialField<LLSD::Integer>(material_data, MATERIALS_CAP_NORMAL_MAP_OFFSET_Y_FIELD, LLSD::TypeInteger);
mNormalRepeatY = (F32)getMaterialField<LLSD::Integer>(material_data, MATERIALS_CAP_NORMAL_MAP_REPEAT_Y_FIELD, LLSD::TypeInteger) / MATERIALS_MULTIPLIER; S32 normalRotInt = getMaterialField<LLSD::Integer>(material_data, MATERIALS_CAP_NORMAL_MAP_ROTATION_FIELD, LLSD::TypeInteger);
mNormalRotation = (F32)getMaterialField<LLSD::Integer>(material_data, MATERIALS_CAP_NORMAL_MAP_ROTATION_FIELD, LLSD::TypeInteger) / MATERIALS_MULTIPLIER;
mNormalOffsetX = F32(normalOffsetXInt) / MATERIALS_MULTIPLIER;
mNormalOffsetY = F32(normalOffsetYInt) / MATERIALS_MULTIPLIER;
mNormalRotation = F32(normalRotInt) / MATERIALS_MULTIPLIER;
mNormalOffsetY = ((F32)getMaterialField<LLSD::Integer>(material_data, MATERIALS_CAP_NORMAL_MAP_OFFSET_Y_FIELD, LLSD::TypeInteger)) / MATERIALS_MULTIPLIER;
mNormalRepeatX = ((F32)getMaterialField<LLSD::Integer>(material_data, MATERIALS_CAP_NORMAL_MAP_REPEAT_X_FIELD, LLSD::TypeInteger)) / MATERIALS_MULTIPLIER;
mNormalRepeatY = ((F32)getMaterialField<LLSD::Integer>(material_data, MATERIALS_CAP_NORMAL_MAP_REPEAT_Y_FIELD, LLSD::TypeInteger)) / MATERIALS_MULTIPLIER;
mSpecularID = getMaterialField<LLSD::UUID>(material_data, MATERIALS_CAP_SPECULAR_MAP_FIELD, LLSD::TypeUUID); mSpecularID = getMaterialField<LLSD::UUID>(material_data, MATERIALS_CAP_SPECULAR_MAP_FIELD, LLSD::TypeUUID);
mSpecularOffsetX = (F32)getMaterialField<LLSD::Integer>(material_data, MATERIALS_CAP_SPECULAR_MAP_OFFSET_X_FIELD, LLSD::TypeInteger) / MATERIALS_MULTIPLIER;
mSpecularOffsetY = (F32)getMaterialField<LLSD::Integer>(material_data, MATERIALS_CAP_SPECULAR_MAP_OFFSET_Y_FIELD, LLSD::TypeInteger) / MATERIALS_MULTIPLIER; S32 specularOffsetXInt = getMaterialField<LLSD::Integer>(material_data, MATERIALS_CAP_SPECULAR_MAP_OFFSET_X_FIELD, LLSD::TypeInteger);
mSpecularRepeatX = (F32)getMaterialField<LLSD::Integer>(material_data, MATERIALS_CAP_SPECULAR_MAP_REPEAT_X_FIELD, LLSD::TypeInteger) / MATERIALS_MULTIPLIER; S32 specularOffsetYInt = getMaterialField<LLSD::Integer>(material_data, MATERIALS_CAP_SPECULAR_MAP_OFFSET_Y_FIELD, LLSD::TypeInteger);
mSpecularRepeatY = (F32)getMaterialField<LLSD::Integer>(material_data, MATERIALS_CAP_SPECULAR_MAP_REPEAT_Y_FIELD, LLSD::TypeInteger) / MATERIALS_MULTIPLIER; S32 specularRotInt = getMaterialField<LLSD::Integer>(material_data, MATERIALS_CAP_SPECULAR_MAP_ROTATION_FIELD, LLSD::TypeInteger);
mSpecularRotation = (F32)getMaterialField<LLSD::Integer>(material_data, MATERIALS_CAP_SPECULAR_MAP_ROTATION_FIELD, LLSD::TypeInteger) / MATERIALS_MULTIPLIER;
mSpecularOffsetX = F32(specularOffsetXInt) / MATERIALS_MULTIPLIER;
mSpecularOffsetY = F32(specularOffsetYInt) / MATERIALS_MULTIPLIER;
mSpecularRotation = F32(specularRotInt) / MATERIALS_MULTIPLIER;
mSpecularOffsetY = ((F32)getMaterialField<LLSD::Integer>(material_data, MATERIALS_CAP_SPECULAR_MAP_OFFSET_Y_FIELD, LLSD::TypeInteger)) / MATERIALS_MULTIPLIER;
mSpecularRepeatX = ((F32)getMaterialField<LLSD::Integer>(material_data, MATERIALS_CAP_SPECULAR_MAP_REPEAT_X_FIELD, LLSD::TypeInteger)) / MATERIALS_MULTIPLIER;
mSpecularRepeatY = ((F32)getMaterialField<LLSD::Integer>(material_data, MATERIALS_CAP_SPECULAR_MAP_REPEAT_Y_FIELD, LLSD::TypeInteger)) / MATERIALS_MULTIPLIER;
mSpecularRotation = ((F32)getMaterialField<LLSD::Integer>(material_data, MATERIALS_CAP_SPECULAR_MAP_ROTATION_FIELD, LLSD::TypeInteger)) / MATERIALS_MULTIPLIER;
mSpecularLightColor.setValue(getMaterialField<LLSD>(material_data, MATERIALS_CAP_SPECULAR_COLOR_FIELD, LLSD::TypeArray)); mSpecularLightColor.setValue(getMaterialField<LLSD>(material_data, MATERIALS_CAP_SPECULAR_COLOR_FIELD, LLSD::TypeArray));
mSpecularLightExponent = (U8)getMaterialField<LLSD::Integer>(material_data, MATERIALS_CAP_SPECULAR_EXP_FIELD, LLSD::TypeInteger); mSpecularLightExponent = (U8)getMaterialField<LLSD::Integer>(material_data, MATERIALS_CAP_SPECULAR_EXP_FIELD, LLSD::TypeInteger);
......
indra/llprimitive/llmaterial.h
+ 53
− 52
View file @ 82a097b0
...@@ -66,58 +66,59 @@ class LLMaterial : public LLRefCount ...@@ -66,58 +66,59 @@ class LLMaterial : public LLRefCount
LLSD asLLSD() const; LLSD asLLSD() const;
void fromLLSD(const LLSD& material_data); void fromLLSD(const LLSD& material_data);
const LLUUID& getNormalID() const { return mNormalID; } const LLUUID& getNormalID() const;
void setNormalID(const LLUUID& normal_id) { mNormalID = normal_id; } void setNormalID(const LLUUID& normal_id);
void getNormalOffset(F32& offset_x, F32& offset_y) const { offset_x = mNormalOffsetX; offset_y = mNormalOffsetY; }
F32 getNormalOffsetX() const { return mNormalOffsetX; } void getNormalOffset(F32& offset_x, F32& offset_y) const;
F32 getNormalOffsetY() const { return mNormalOffsetY; } F32 getNormalOffsetX() const;
F32 getNormalOffsetY() const;
void setNormalOffset(F32 offset_x, F32 offset_y) { mNormalOffsetX = offset_x; mNormalOffsetY = offset_y; }
void setNormalOffsetX(F32 offset_x) { mNormalOffsetX = offset_x; } void setNormalOffset(F32 offset_x, F32 offset_y);
void setNormalOffsetY(F32 offset_y) { mNormalOffsetY = offset_y; } void setNormalOffsetX(F32 offset_x);
void setNormalOffsetY(F32 offset_y);
void getNormalRepeat(F32& repeat_x, F32& repeat_y) const { repeat_x = mNormalRepeatX; repeat_y = mNormalRepeatY; }
F32 getNormalRepeatX() const { return mNormalRepeatX; } void getNormalRepeat(F32& repeat_x, F32& repeat_y) const;
F32 getNormalRepeatY() const { return mNormalRepeatY; } F32 getNormalRepeatX() const;
F32 getNormalRepeatY() const;
void setNormalRepeat(F32 repeat_x, F32 repeat_y) { mNormalRepeatX = repeat_x; mNormalRepeatY = repeat_y; }
void setNormalRepeatX(F32 repeat_x) { mNormalRepeatX = repeat_x; } void setNormalRepeat(F32 repeat_x, F32 repeat_y);
void setNormalRepeatY(F32 repeat_y) { mNormalRepeatY = repeat_y; } void setNormalRepeatX(F32 repeat_x);
void setNormalRepeatY(F32 repeat_y);
F32 getNormalRotation() const { return mNormalRotation; }
void setNormalRotation(F32 rot) { mNormalRotation = rot; } F32 getNormalRotation() const;
void setNormalRotation(F32 rot);
const LLUUID& getSpecularID() const { return mSpecularID; }
void setSpecularID(const LLUUID& specular_id) { mSpecularID = specular_id; } const LLUUID& getSpecularID() const;
void getSpecularOffset(F32& offset_x, F32& offset_y) const { offset_x = mSpecularOffsetX; offset_y = mSpecularOffsetY; } void setSpecularID(const LLUUID& specular_id);
F32 getSpecularOffsetX() const { return mSpecularOffsetX; } void getSpecularOffset(F32& offset_x, F32& offset_y) const;
F32 getSpecularOffsetY() const { return mSpecularOffsetY; } F32 getSpecularOffsetX() const;
F32 getSpecularOffsetY() const;
void setSpecularOffset(F32 offset_x, F32 offset_y) { mSpecularOffsetX = offset_x; mSpecularOffsetY = offset_y; }
void setSpecularOffsetX(F32 offset_x) { mSpecularOffsetX = offset_x; } void setSpecularOffset(F32 offset_x, F32 offset_y);
void setSpecularOffsetY(F32 offset_y) { mSpecularOffsetY = offset_y; } void setSpecularOffsetX(F32 offset_x);
void setSpecularOffsetY(F32 offset_y);
void getSpecularRepeat(F32& repeat_x, F32& repeat_y) const { repeat_x = mSpecularRepeatX; repeat_y = mSpecularRepeatY; }
F32 getSpecularRepeatX() const { return mSpecularRepeatX; } void getSpecularRepeat(F32& repeat_x, F32& repeat_y) const;
F32 getSpecularRepeatY() const { return mSpecularRepeatY; } F32 getSpecularRepeatX() const;
F32 getSpecularRepeatY() const;
void setSpecularRepeat(F32 repeat_x, F32 repeat_y) { mSpecularRepeatX = repeat_x; mSpecularRepeatY = repeat_y; }
void setSpecularRepeatX(F32 repeat_x) { mSpecularRepeatX = repeat_x; } void setSpecularRepeat(F32 repeat_x, F32 repeat_y);
void setSpecularRepeatY(F32 repeat_y) { mSpecularRepeatY = repeat_y; } void setSpecularRepeatX(F32 repeat_x);
void setSpecularRepeatY(F32 repeat_y);
F32 getSpecularRotation() const { return mSpecularRotation; }
void setSpecularRotation(F32 rot) { mSpecularRotation = rot; } F32 getSpecularRotation() const;
void setSpecularRotation(F32 rot);
const LLColor4U getSpecularLightColor() const { return mSpecularLightColor; }
void setSpecularLightColor(const LLColor4U& color) { mSpecularLightColor = color; } const LLColor4U getSpecularLightColor() const;
U8 getSpecularLightExponent() const { return mSpecularLightExponent; } void setSpecularLightColor(const LLColor4U& color);
void setSpecularLightExponent(U8 exponent) { mSpecularLightExponent = exponent; } U8 getSpecularLightExponent() const;
U8 getEnvironmentIntensity() const { return mEnvironmentIntensity; } void setSpecularLightExponent(U8 exponent);
void setEnvironmentIntensity(U8 intensity) { mEnvironmentIntensity = intensity; } U8 getEnvironmentIntensity() const;
U8 getDiffuseAlphaMode() const { return mDiffuseAlphaMode; } void setEnvironmentIntensity(U8 intensity);
void setDiffuseAlphaMode(U8 alpha_mode) { mDiffuseAlphaMode = alpha_mode; } U8 getDiffuseAlphaMode() const;
U8 getAlphaMaskCutoff() const { return mAlphaMaskCutoff; } void setDiffuseAlphaMode(U8 alpha_mode);
void setAlphaMaskCutoff(U8 cutoff) { mAlphaMaskCutoff = cutoff; } U8 getAlphaMaskCutoff() const;
void setAlphaMaskCutoff(U8 cutoff);
bool isNull() const; bool isNull() const;
static const LLMaterial null; static const LLMaterial null;
......
indra/newview/skins/default/xui/en/panel_tools_texture.xml
+ 14
− 11
View file @ 82a097b0
...@@ -603,11 +603,10 @@ ...@@ -603,11 +603,10 @@
layout="topleft" layout="topleft"
label_width="205" label_width="205"
left="10" left="10"
max_val="9999" max_val="360"
min_val="-9999" min_val="-360"
name="TexRot" name="TexRot"
width="265" /> width="265" />
<spinner <spinner
follows="left|top" follows="left|top"
height="19" height="19"
...@@ -617,6 +616,7 @@ ...@@ -617,6 +616,7 @@
layout="topleft" layout="topleft"
left="10" left="10"
min_val="-1" min_val="-1"
max_val="1"
name="TexOffsetU" name="TexOffsetU"
width="265" /> width="265" />
<spinner <spinner
...@@ -628,6 +628,7 @@ ...@@ -628,6 +628,7 @@
layout="topleft" layout="topleft"
left="10" left="10"
min_val="-1" min_val="-1"
max_val="1"
name="TexOffsetV" name="TexOffsetV"
width="265" /> width="265" />
<spinner <spinner
...@@ -667,10 +668,9 @@ ...@@ -667,10 +668,9 @@
label_width="205" label_width="205"
left="10" left="10"
max_val="360" max_val="360"
min_val="0" min_val="-360"
name="bumpyRot" name="bumpyRot"
width="265" /> width="265" />
<spinner <spinner
follows="left|top" follows="left|top"
height="19" height="19"
...@@ -679,7 +679,8 @@ ...@@ -679,7 +679,8 @@
label_width="205" label_width="205"
layout="topleft" layout="topleft"
left="10" left="10"
min_val="0" min_val="-1"
max_val="1"
name="bumpyOffsetU" name="bumpyOffsetU"
width="265" /> width="265" />
<spinner <spinner
...@@ -690,7 +691,8 @@ ...@@ -690,7 +691,8 @@
label_width="205" label_width="205"
layout="topleft" layout="topleft"
left="10" left="10"
min_val="0" min_val="-1"
max_val="1"
name="bumpyOffsetV" name="bumpyOffsetV"
width="265" /> width="265" />
<spinner <spinner
...@@ -730,10 +732,9 @@ ...@@ -730,10 +732,9 @@
label_width="205" label_width="205"
left="10" left="10"
max_val="360" max_val="360"
min_val="0" min_val="-360"
name="shinyRot" name="shinyRot"
width="265" /> width="265" />
<spinner <spinner
follows="left|top" follows="left|top"
height="19" height="19"
...@@ -742,7 +743,8 @@ ...@@ -742,7 +743,8 @@
label_width="205" label_width="205"
layout="topleft" layout="topleft"
left="10" left="10"
min_val="0" min_val="-1"
max_val="1"
name="shinyOffsetU" name="shinyOffsetU"
width="265" /> width="265" />
<spinner <spinner
...@@ -753,7 +755,8 @@ ...@@ -753,7 +755,8 @@
label_width="205" label_width="205"
layout="topleft" layout="topleft"
left="10" left="10"
min_val="0" min_val="-1"
max_val="1"
name="shinyOffsetV" name="shinyOffsetV"
width="265" /> width="265" />
<check_box <check_box
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment