Revision: 38838
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38838
Author: kupoman
Date: 2011-07-29 22:05:44 +0000 (Fri, 29 Jul 2011)
Log Message:
-----------
Renamed RAS_IRasterizer::RAS_TEXCO_UV1 to RAS_IRasterizer::RAS_TEXCO_UV.
Modified Paths:
--------------
branches/soc-2011-cucumber/source/gameengine/Ketsji/BL_BlenderShader.cpp
branches/soc-2011-cucumber/source/gameengine/Ketsji/KX_BlenderMaterial.cpp
branches/soc-2011-cucumber/source/gameengine/Rasterizer/RAS_IRasterizer.h
branches/soc-2011-cucumber/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
branches/soc-2011-cucumber/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_StorageIM.cpp
branches/soc-2011-cucumber/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_StorageVA.cpp
branches/soc-2011-cucumber/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_StorageVBO.cpp
Modified:
branches/soc-2011-cucumber/source/gameengine/Ketsji/BL_BlenderShader.cpp
===================================================================
--- branches/soc-2011-cucumber/source/gameengine/Ketsji/BL_BlenderShader.cpp
2011-07-29 21:58:31 UTC (rev 38837)
+++ branches/soc-2011-cucumber/source/gameengine/Ketsji/BL_BlenderShader.cpp
2011-07-29 22:05:44 UTC (rev 38838)
@@ -100,7 +100,7 @@
continue;
if(attribs.layer[i].type == CD_MTFACE)
- ras->SetAttrib(RAS_IRasterizer::RAS_TEXCO_UV1,
attribs.layer[i].glindex);
+ ras->SetAttrib(RAS_IRasterizer::RAS_TEXCO_UV,
attribs.layer[i].glindex);
else if(attribs.layer[i].type == CD_TANGENT)
ras->SetAttrib(RAS_IRasterizer::RAS_TEXTANGENT,
attribs.layer[i].glindex);
else if(attribs.layer[i].type == CD_ORCO)
Modified:
branches/soc-2011-cucumber/source/gameengine/Ketsji/KX_BlenderMaterial.cpp
===================================================================
--- branches/soc-2011-cucumber/source/gameengine/Ketsji/KX_BlenderMaterial.cpp
2011-07-29 21:58:31 UTC (rev 38837)
+++ branches/soc-2011-cucumber/source/gameengine/Ketsji/KX_BlenderMaterial.cpp
2011-07-29 22:05:44 UTC (rev 38838)
@@ -642,7 +642,7 @@
else if(mode &USENORM)
ras->SetTexCoord(RAS_IRasterizer::RAS_TEXCO_NORM, i);
else if(mode &USEUV)
-
ras->SetTexCoord(RAS_IRasterizer::RAS_TEXCO_UV1, i);
+ ras->SetTexCoord(RAS_IRasterizer::RAS_TEXCO_UV,
i);
else if(mode &USETANG)
ras->SetTexCoord(RAS_IRasterizer::RAS_TEXTANGENT, i);
else
Modified:
branches/soc-2011-cucumber/source/gameengine/Rasterizer/RAS_IRasterizer.h
===================================================================
--- branches/soc-2011-cucumber/source/gameengine/Rasterizer/RAS_IRasterizer.h
2011-07-29 21:58:31 UTC (rev 38837)
+++ branches/soc-2011-cucumber/source/gameengine/Rasterizer/RAS_IRasterizer.h
2011-07-29 22:05:44 UTC (rev 38838)
@@ -136,7 +136,7 @@
RAS_TEXCO_GEN, //< GPU will generate texture
coordinates
RAS_TEXCO_ORCO, //< Vertex coordinates (object space)
RAS_TEXCO_GLOB, //< Vertex coordinates (world space)
- RAS_TEXCO_UV1, //< UV coordinates
+ RAS_TEXCO_UV, //< UV coordinates
RAS_TEXCO_OBJECT, //< Use another object's position as
coordinates
RAS_TEXCO_LAVECTOR, //< Light vector as coordinates
RAS_TEXCO_VIEW, //< View vector as coordinates
Modified:
branches/soc-2011-cucumber/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
===================================================================
---
branches/soc-2011-cucumber/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
2011-07-29 21:58:31 UTC (rev 38837)
+++
branches/soc-2011-cucumber/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
2011-07-29 22:05:44 UTC (rev 38838)
@@ -650,7 +650,7 @@
glattrib = -1;
if(GLEW_ARB_vertex_program)
for(unit=0; unit<m_attrib_num; unit++)
- if(m_attrib[unit] ==
RAS_TEXCO_UV1)
+ if(m_attrib[unit] ==
RAS_TEXCO_UV)
glattrib = unit;
rendertools->RenderText(polymat->GetDrawingMode(), polymat,
@@ -692,69 +692,6 @@
m_attrib[unit] = coords;
}
-void RAS_OpenGLRasterizer::TexCoord(const RAS_TexVert &tv)
-{
- int unit;
-
- if(GLEW_ARB_multitexture) {
- for(unit=0; unit<m_texco_num; unit++) {
- if(tv.getFlag() & RAS_TexVert::SECOND_UV &&
(int)tv.getUnit() == unit) {
- glMultiTexCoord2fvARB(GL_TEXTURE0_ARB+unit,
tv.getUV2());
- continue;
- }
- switch(m_texco[unit]) {
- case RAS_TEXCO_ORCO:
- case RAS_TEXCO_GLOB:
- glMultiTexCoord3fvARB(GL_TEXTURE0_ARB+unit,
tv.getXYZ());
- break;
- case RAS_TEXCO_UV1:
- glMultiTexCoord2fvARB(GL_TEXTURE0_ARB+unit,
tv.getUV1());
- break;
- case RAS_TEXCO_NORM:
- glMultiTexCoord3fvARB(GL_TEXTURE0_ARB+unit,
tv.getNormal());
- break;
- case RAS_TEXTANGENT:
- glMultiTexCoord4fvARB(GL_TEXTURE0_ARB+unit,
tv.getTangent());
- break;
- case RAS_TEXCO_UV2:
- glMultiTexCoord2fvARB(GL_TEXTURE0_ARB+unit,
tv.getUV2());
- break;
- default:
- break;
- }
- }
- }
-
- if(GLEW_ARB_vertex_program) {
- for(unit=0; unit<m_attrib_num; unit++) {
- switch(m_attrib[unit]) {
- case RAS_TEXCO_ORCO:
- case RAS_TEXCO_GLOB:
- glVertexAttrib3fvARB(unit, tv.getXYZ());
- break;
- case RAS_TEXCO_UV1:
- glVertexAttrib2fvARB(unit, tv.getUV1());
- break;
- case RAS_TEXCO_NORM:
- glVertexAttrib3fvARB(unit, tv.getNormal());
- break;
- case RAS_TEXTANGENT:
- glVertexAttrib4fvARB(unit, tv.getTangent());
- break;
- case RAS_TEXCO_UV2:
- glVertexAttrib2fvARB(unit, tv.getUV2());
- break;
- case RAS_TEXCO_VCOL:
- glVertexAttrib4ubvARB(unit, tv.getRGBA());
- break;
- default:
- break;
- }
- }
- }
-
-}
-
void RAS_OpenGLRasterizer::IndexPrimitives(RAS_MeshSlot& ms)
{
if (ms.m_pDerivedMesh)
Modified:
branches/soc-2011-cucumber/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_StorageIM.cpp
===================================================================
---
branches/soc-2011-cucumber/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_StorageIM.cpp
2011-07-29 21:58:31 UTC (rev 38837)
+++
branches/soc-2011-cucumber/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_StorageIM.cpp
2011-07-29 22:05:44 UTC (rev 38838)
@@ -77,7 +77,7 @@
case RAS_IRasterizer::RAS_TEXCO_GLOB:
glMultiTexCoord3fvARB(GL_TEXTURE0_ARB+unit,
tv.getXYZ());
break;
- case RAS_IRasterizer::RAS_TEXCO_UV1:
+ case RAS_IRasterizer::RAS_TEXCO_UV:
glMultiTexCoord2fvARB(GL_TEXTURE0_ARB+unit,
tv.getUV(unit));
break;
case RAS_IRasterizer::RAS_TEXCO_NORM:
@@ -100,7 +100,7 @@
case RAS_IRasterizer::RAS_TEXCO_GLOB:
glVertexAttrib3fvARB(unit, tv.getXYZ());
break;
- case RAS_IRasterizer::RAS_TEXCO_UV1:
+ case RAS_IRasterizer::RAS_TEXCO_UV:
glVertexAttrib2fvARB(unit, tv.getUV(uv++));
break;
case RAS_IRasterizer::RAS_TEXCO_NORM:
Modified:
branches/soc-2011-cucumber/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_StorageVA.cpp
===================================================================
---
branches/soc-2011-cucumber/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_StorageVA.cpp
2011-07-29 21:58:31 UTC (rev 38837)
+++
branches/soc-2011-cucumber/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_StorageVA.cpp
2011-07-29 22:05:44 UTC (rev 38838)
@@ -144,7 +144,7 @@
case RAS_IRasterizer::RAS_TEXCO_GLOB:
glTexCoordPointer(3, GL_FLOAT,
sizeof(RAS_TexVert),tv->getXYZ());
break;
- case RAS_IRasterizer::RAS_TEXCO_UV1:
+ case RAS_IRasterizer::RAS_TEXCO_UV:
glTexCoordPointer(2, GL_FLOAT,
sizeof(RAS_TexVert),tv->getUV(unit));
break;
case RAS_IRasterizer::RAS_TEXCO_NORM:
@@ -169,7 +169,7 @@
case RAS_IRasterizer::RAS_TEXCO_GLOB:
glVertexAttribPointerARB(unit, 3, GL_FLOAT,
GL_FALSE, sizeof(RAS_TexVert), tv->getXYZ());
break;
- case RAS_IRasterizer::RAS_TEXCO_UV1:
+ case RAS_IRasterizer::RAS_TEXCO_UV:
glVertexAttribPointerARB(unit, 2, GL_FLOAT,
GL_FALSE, sizeof(RAS_TexVert), tv->getUV(uv++));
break;
case RAS_IRasterizer::RAS_TEXCO_NORM:
@@ -221,7 +221,7 @@
{
case RAS_IRasterizer::RAS_TEXCO_ORCO:
case RAS_IRasterizer::RAS_TEXCO_GLOB:
- case RAS_IRasterizer::RAS_TEXCO_UV1:
+ case RAS_IRasterizer::RAS_TEXCO_UV:
case RAS_IRasterizer::RAS_TEXCO_NORM:
case RAS_IRasterizer::RAS_TEXTANGENT:
if(enable)
glEnableClientState(GL_TEXTURE_COORD_ARRAY);
@@ -247,7 +247,7 @@
switch(attrib[unit]) {
case RAS_IRasterizer::RAS_TEXCO_ORCO:
case RAS_IRasterizer::RAS_TEXCO_GLOB:
- case RAS_IRasterizer::RAS_TEXCO_UV1:
+ case RAS_IRasterizer::RAS_TEXCO_UV:
case RAS_IRasterizer::RAS_TEXCO_NORM:
case RAS_IRasterizer::RAS_TEXTANGENT:
case RAS_IRasterizer::RAS_TEXCO_VCOL:
Modified:
branches/soc-2011-cucumber/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_StorageVBO.cpp
===================================================================
---
branches/soc-2011-cucumber/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_StorageVBO.cpp
2011-07-29 21:58:31 UTC (rev 38837)
+++
branches/soc-2011-cucumber/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_StorageVBO.cpp
2011-07-29 22:05:44 UTC (rev 38838)
@@ -214,7 +214,7 @@
glEnableClientState(GL_TEXTURE_COORD_ARRAY);
glTexCoordPointer(3, GL_FLOAT, 0, 0);
break;
- case RAS_IRasterizer::RAS_TEXCO_UV1:
+ case RAS_IRasterizer::RAS_TEXCO_UV:
glBindBufferARB(GL_ARRAY_BUFFER_ARB,
this->UV[unit]);
glEnableClientState(GL_TEXTURE_COORD_ARRAY);
glTexCoordPointer(2, GL_FLOAT, 0, 0);
@@ -256,7 +256,7 @@
glVertexAttribPointerARB(unit, 3,
GL_FLOAT, GL_FALSE, 0, 0);
glEnableVertexAttribArrayARB(unit);
break;
- case RAS_IRasterizer::RAS_TEXCO_UV1:
+ case RAS_IRasterizer::RAS_TEXCO_UV:
glBindBufferARB(GL_ARRAY_BUFFER_ARB,
this->UV[unit-1]);
glVertexAttribPointerARB(unit, 2,
GL_FLOAT, GL_FALSE, 0, 0);
glEnableVertexAttribArrayARB(unit);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
