2005-01-16 06:02:06 +00:00
|
|
|
/**
|
|
|
|
* $Id$
|
2008-04-16 22:40:48 +00:00
|
|
|
* ***** BEGIN GPL LICENSE BLOCK *****
|
2005-01-16 06:02:06 +00:00
|
|
|
*
|
|
|
|
* This program is free software; you can redistribute it and/or
|
|
|
|
* modify it under the terms of the GNU General Public License
|
|
|
|
* as published by the Free Software Foundation; either version 2
|
2008-04-16 22:40:48 +00:00
|
|
|
* of the License, or (at your option) any later version.
|
2005-01-16 06:02:06 +00:00
|
|
|
*
|
|
|
|
* This program is distributed in the hope that it will be useful,
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
* GNU General Public License for more details.
|
|
|
|
*
|
|
|
|
* You should have received a copy of the GNU General Public License
|
|
|
|
* along with this program; if not, write to the Free Software Foundation,
|
2010-02-12 13:34:04 +00:00
|
|
|
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
2005-01-16 06:02:06 +00:00
|
|
|
*
|
|
|
|
* The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
|
|
|
|
* All rights reserved.
|
|
|
|
*
|
|
|
|
* The Original Code is: all of this file.
|
|
|
|
*
|
|
|
|
* Contributor(s): none yet.
|
|
|
|
*
|
2008-04-16 22:40:48 +00:00
|
|
|
* ***** END GPL LICENSE BLOCK *****
|
2005-01-16 06:02:06 +00:00
|
|
|
*/
|
|
|
|
#include "KX_PolygonMaterial.h"
|
|
|
|
|
|
|
|
#include "BKE_mesh.h"
|
|
|
|
#include "BKE_global.h"
|
|
|
|
#include "BKE_image.h"
|
|
|
|
|
|
|
|
#include "DNA_material_types.h"
|
|
|
|
#include "DNA_texture_types.h"
|
|
|
|
#include "DNA_image_types.h"
|
Added custom vertex/edge/face data for meshes:
All data layers, including MVert/MEdge/MFace, are now managed as custom
data layers. The pointers like Mesh.mvert, Mesh.dvert or Mesh.mcol are
still used of course, but allocating, copying or freeing these arrays
should be done through the CustomData API.
Work in progress documentation on this is here:
http://mediawiki.blender.org/index.php/BlenderDev/BlenderArchitecture/CustomData
Replaced TFace by MTFace:
This is the same struct, except that it does not contain color, that now
always stays separated in MCol. This was not a good design decision to
begin with, and it is needed for adding multiple color layers later. Note
that this does mean older Blender versions will not be able to read UV
coordinates from the next release, due to an SDNA limitation.
Removed DispListMesh:
This now fully replaced by DerivedMesh. To provide access to arrays of
vertices, edges and faces, like DispListMesh does. The semantics of the
DerivedMesh.getVertArray() and similar functions were changed to return
a pointer to an array if one exists, or otherwise allocate a temporary
one. On releasing the DerivedMesh, this temporary array will be removed
automatically.
Removed ssDM and meshDM DerivedMesh backends:
The ssDM backend was for DispListMesh, so that became obsolete automatically.
The meshDM backend was replaced by the custom data backend, that now figures
out which layers need to be modified, and only duplicates those.
This changes code in many places, and overall removes 2514 lines of code.
So, there's a good chance this might break some stuff, although I've been
testing it for a few days now. The good news is, adding multiple color and
uv layers should now become easy.
2006-11-20 04:28:02 +00:00
|
|
|
#include "DNA_meshdata_types.h"
|
2005-01-16 06:02:06 +00:00
|
|
|
|
|
|
|
#include "IMB_imbuf_types.h"
|
|
|
|
|
Merge of first part of changes from the apricot branch, especially
the features that are needed to run the game. Compile tested with
scons, make, but not cmake, that seems to have an issue not related
to these changes. The changes include:
* GLSL support in the viewport and game engine, enable in the game
menu in textured draw mode.
* Synced and merged part of the duplicated blender and gameengine/
gameplayer drawing code.
* Further refactoring of game engine drawing code, especially mesh
storage changed a lot.
* Optimizations in game engine armatures to avoid recomputations.
* A python function to get the framerate estimate in game.
* An option take object color into account in materials.
* An option to restrict shadow casters to a lamp's layers.
* Increase from 10 to 18 texture slots for materials, lamps, word.
An extra texture slot shows up once the last slot is used.
* Memory limit for undo, not enabled by default yet because it
needs the .B.blend to be changed.
* Multiple undo for image painting.
* An offset for dupligroups, so not all objects in a group have to
be at the origin.
2008-09-04 20:51:28 +00:00
|
|
|
#include "GPU_draw.h"
|
|
|
|
|
2005-01-16 06:02:06 +00:00
|
|
|
#include "MEM_guardedalloc.h"
|
|
|
|
|
|
|
|
#include "RAS_LightObject.h"
|
|
|
|
#include "RAS_MaterialBucket.h"
|
|
|
|
|
|
|
|
#include "KX_PyMath.h"
|
|
|
|
|
2009-06-28 11:22:26 +00:00
|
|
|
KX_PolygonMaterial::KX_PolygonMaterial()
|
|
|
|
: PyObjectPlus(),
|
2009-06-08 20:08:19 +00:00
|
|
|
RAS_IPolyMaterial(),
|
|
|
|
|
|
|
|
m_tface(NULL),
|
|
|
|
m_mcol(NULL),
|
|
|
|
m_material(NULL),
|
2009-09-29 21:42:40 +00:00
|
|
|
#ifndef DISABLE_PYTHON
|
2009-06-08 20:08:19 +00:00
|
|
|
m_pymaterial(NULL),
|
2009-09-29 21:42:40 +00:00
|
|
|
#endif
|
2009-06-08 20:08:19 +00:00
|
|
|
m_pass(0)
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
|
|
|
void KX_PolygonMaterial::Initialize(
|
|
|
|
const STR_String &texname,
|
|
|
|
Material* ma,
|
|
|
|
int materialindex,
|
|
|
|
int tile,
|
|
|
|
int tilexrep,
|
|
|
|
int tileyrep,
|
|
|
|
int mode,
|
|
|
|
int transp,
|
|
|
|
bool alpha,
|
|
|
|
bool zsort,
|
|
|
|
int lightlayer,
|
|
|
|
struct MTFace* tface,
|
|
|
|
unsigned int* mcol)
|
|
|
|
{
|
|
|
|
RAS_IPolyMaterial::Initialize(
|
|
|
|
texname,
|
|
|
|
ma?ma->id.name:"",
|
|
|
|
materialindex,
|
2005-01-16 06:02:06 +00:00
|
|
|
tile,
|
|
|
|
tilexrep,
|
|
|
|
tileyrep,
|
|
|
|
mode,
|
2008-07-29 15:48:31 +00:00
|
|
|
transp,
|
|
|
|
alpha,
|
2009-07-31 09:05:13 +00:00
|
|
|
zsort);
|
2009-06-08 20:08:19 +00:00
|
|
|
m_tface = tface;
|
|
|
|
m_mcol = mcol;
|
|
|
|
m_material = ma;
|
2009-09-29 21:42:40 +00:00
|
|
|
#ifndef DISABLE_PYTHON
|
2009-06-08 20:08:19 +00:00
|
|
|
m_pymaterial = 0;
|
2009-09-29 21:42:40 +00:00
|
|
|
#endif
|
2009-06-08 20:08:19 +00:00
|
|
|
m_pass = 0;
|
2005-01-16 06:02:06 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
KX_PolygonMaterial::~KX_PolygonMaterial()
|
|
|
|
{
|
2009-09-29 21:42:40 +00:00
|
|
|
#ifndef DISABLE_PYTHON
|
2005-01-16 06:02:06 +00:00
|
|
|
if (m_pymaterial)
|
|
|
|
{
|
|
|
|
Py_DECREF(m_pymaterial);
|
|
|
|
}
|
2009-09-29 21:42:40 +00:00
|
|
|
#endif // DISABLE_PYTHON
|
2005-01-16 06:02:06 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
bool KX_PolygonMaterial::Activate(RAS_IRasterizer* rasty, TCachingInfo& cachingInfo) const
|
|
|
|
{
|
|
|
|
bool dopass = false;
|
2009-09-29 21:42:40 +00:00
|
|
|
|
|
|
|
#ifndef DISABLE_PYTHON
|
2005-01-16 06:02:06 +00:00
|
|
|
if (m_pymaterial)
|
|
|
|
{
|
|
|
|
PyObject *pyRasty = PyCObject_FromVoidPtr((void*)rasty, NULL); /* new reference */
|
|
|
|
PyObject *pyCachingInfo = PyCObject_FromVoidPtr((void*) &cachingInfo, NULL); /* new reference */
|
2009-04-20 15:06:46 +00:00
|
|
|
PyObject *ret = PyObject_CallMethod(m_pymaterial, "activate", "(NNO)", pyRasty, pyCachingInfo, (PyObject*) this->m_proxy);
|
2005-01-16 06:02:06 +00:00
|
|
|
if (ret)
|
|
|
|
{
|
2009-06-29 02:25:54 +00:00
|
|
|
bool value = PyLong_AsSsize_t(ret);
|
2005-01-16 06:02:06 +00:00
|
|
|
Py_DECREF(ret);
|
|
|
|
dopass = value;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
PyErr_Print();
|
2009-04-20 15:06:46 +00:00
|
|
|
PyErr_Clear();
|
|
|
|
PySys_SetObject( (char *)"last_traceback", NULL);
|
2005-01-16 06:02:06 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
2009-09-29 21:42:40 +00:00
|
|
|
#endif // DISABLE_PYTHON
|
2005-01-16 06:02:06 +00:00
|
|
|
{
|
|
|
|
switch (m_pass++)
|
|
|
|
{
|
|
|
|
case 0:
|
|
|
|
DefaultActivate(rasty, cachingInfo);
|
|
|
|
dopass = true;
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
m_pass = 0;
|
|
|
|
dopass = false;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return dopass;
|
|
|
|
}
|
|
|
|
|
|
|
|
void KX_PolygonMaterial::DefaultActivate(RAS_IRasterizer* rasty, TCachingInfo& cachingInfo) const
|
|
|
|
{
|
|
|
|
if (GetCachingInfo() != cachingInfo)
|
|
|
|
{
|
|
|
|
if (!cachingInfo)
|
2009-08-16 20:14:49 +00:00
|
|
|
GPU_set_tpage(NULL, 0);
|
Merge of first part of changes from the apricot branch, especially
the features that are needed to run the game. Compile tested with
scons, make, but not cmake, that seems to have an issue not related
to these changes. The changes include:
* GLSL support in the viewport and game engine, enable in the game
menu in textured draw mode.
* Synced and merged part of the duplicated blender and gameengine/
gameplayer drawing code.
* Further refactoring of game engine drawing code, especially mesh
storage changed a lot.
* Optimizations in game engine armatures to avoid recomputations.
* A python function to get the framerate estimate in game.
* An option take object color into account in materials.
* An option to restrict shadow casters to a lamp's layers.
* Increase from 10 to 18 texture slots for materials, lamps, word.
An extra texture slot shows up once the last slot is used.
* Memory limit for undo, not enabled by default yet because it
needs the .B.blend to be changed.
* Multiple undo for image painting.
* An offset for dupligroups, so not all objects in a group have to
be at the origin.
2008-09-04 20:51:28 +00:00
|
|
|
|
2005-01-16 06:02:06 +00:00
|
|
|
cachingInfo = GetCachingInfo();
|
|
|
|
|
|
|
|
if ((m_drawingmode & 4)&& (rasty->GetDrawingMode() == RAS_IRasterizer::KX_TEXTURED))
|
|
|
|
{
|
Merge of first part of changes from the apricot branch, especially
the features that are needed to run the game. Compile tested with
scons, make, but not cmake, that seems to have an issue not related
to these changes. The changes include:
* GLSL support in the viewport and game engine, enable in the game
menu in textured draw mode.
* Synced and merged part of the duplicated blender and gameengine/
gameplayer drawing code.
* Further refactoring of game engine drawing code, especially mesh
storage changed a lot.
* Optimizations in game engine armatures to avoid recomputations.
* A python function to get the framerate estimate in game.
* An option take object color into account in materials.
* An option to restrict shadow casters to a lamp's layers.
* Increase from 10 to 18 texture slots for materials, lamps, word.
An extra texture slot shows up once the last slot is used.
* Memory limit for undo, not enabled by default yet because it
needs the .B.blend to be changed.
* Multiple undo for image painting.
* An offset for dupligroups, so not all objects in a group have to
be at the origin.
2008-09-04 20:51:28 +00:00
|
|
|
Image *ima = (Image*)m_tface->tpage;
|
|
|
|
GPU_update_image_time(ima, rasty->GetTime());
|
2009-08-16 20:14:49 +00:00
|
|
|
GPU_set_tpage(m_tface, 1);
|
2005-01-16 06:02:06 +00:00
|
|
|
}
|
|
|
|
else
|
2009-08-16 20:14:49 +00:00
|
|
|
GPU_set_tpage(NULL, 0);
|
2005-01-16 06:02:06 +00:00
|
|
|
|
|
|
|
if(m_drawingmode & RAS_IRasterizer::KX_TWOSIDE)
|
|
|
|
rasty->SetCullFace(false);
|
|
|
|
else
|
|
|
|
rasty->SetCullFace(true);
|
|
|
|
|
Merge of first part of changes from the apricot branch, especially
the features that are needed to run the game. Compile tested with
scons, make, but not cmake, that seems to have an issue not related
to these changes. The changes include:
* GLSL support in the viewport and game engine, enable in the game
menu in textured draw mode.
* Synced and merged part of the duplicated blender and gameengine/
gameplayer drawing code.
* Further refactoring of game engine drawing code, especially mesh
storage changed a lot.
* Optimizations in game engine armatures to avoid recomputations.
* A python function to get the framerate estimate in game.
* An option take object color into account in materials.
* An option to restrict shadow casters to a lamp's layers.
* Increase from 10 to 18 texture slots for materials, lamps, word.
An extra texture slot shows up once the last slot is used.
* Memory limit for undo, not enabled by default yet because it
needs the .B.blend to be changed.
* Multiple undo for image painting.
* An offset for dupligroups, so not all objects in a group have to
be at the origin.
2008-09-04 20:51:28 +00:00
|
|
|
if ((m_drawingmode & RAS_IRasterizer::KX_LINES) ||
|
|
|
|
(rasty->GetDrawingMode() <= RAS_IRasterizer::KX_WIREFRAME))
|
2005-01-16 06:02:06 +00:00
|
|
|
rasty->SetLines(true);
|
Merge of first part of changes from the apricot branch, especially
the features that are needed to run the game. Compile tested with
scons, make, but not cmake, that seems to have an issue not related
to these changes. The changes include:
* GLSL support in the viewport and game engine, enable in the game
menu in textured draw mode.
* Synced and merged part of the duplicated blender and gameengine/
gameplayer drawing code.
* Further refactoring of game engine drawing code, especially mesh
storage changed a lot.
* Optimizations in game engine armatures to avoid recomputations.
* A python function to get the framerate estimate in game.
* An option take object color into account in materials.
* An option to restrict shadow casters to a lamp's layers.
* Increase from 10 to 18 texture slots for materials, lamps, word.
An extra texture slot shows up once the last slot is used.
* Memory limit for undo, not enabled by default yet because it
needs the .B.blend to be changed.
* Multiple undo for image painting.
* An offset for dupligroups, so not all objects in a group have to
be at the origin.
2008-09-04 20:51:28 +00:00
|
|
|
else
|
2005-01-16 06:02:06 +00:00
|
|
|
rasty->SetLines(false);
|
2009-06-08 20:08:19 +00:00
|
|
|
rasty->SetSpecularity(m_specular[0],m_specular[1],m_specular[2],m_specularity);
|
|
|
|
rasty->SetShinyness(m_shininess);
|
|
|
|
rasty->SetDiffuse(m_diffuse[0], m_diffuse[1],m_diffuse[2], 1.0);
|
|
|
|
if (m_material)
|
|
|
|
rasty->SetPolygonOffset(-m_material->zoffs, 0.0);
|
2005-01-16 06:02:06 +00:00
|
|
|
}
|
|
|
|
|
2009-06-08 20:08:19 +00:00
|
|
|
//rasty->SetSpecularity(m_specular[0],m_specular[1],m_specular[2],m_specularity);
|
|
|
|
//rasty->SetShinyness(m_shininess);
|
|
|
|
//rasty->SetDiffuse(m_diffuse[0], m_diffuse[1],m_diffuse[2], 1.0);
|
|
|
|
//if (m_material)
|
|
|
|
// rasty->SetPolygonOffset(-m_material->zoffs, 0.0);
|
|
|
|
}
|
|
|
|
|
|
|
|
void KX_PolygonMaterial::GetMaterialRGBAColor(unsigned char *rgba) const
|
|
|
|
{
|
|
|
|
if (m_material) {
|
|
|
|
*rgba++ = (unsigned char) (m_material->r*255.0);
|
|
|
|
*rgba++ = (unsigned char) (m_material->g*255.0);
|
|
|
|
*rgba++ = (unsigned char) (m_material->b*255.0);
|
|
|
|
*rgba++ = (unsigned char) (m_material->alpha*255.0);
|
|
|
|
} else
|
|
|
|
RAS_IPolyMaterial::GetMaterialRGBAColor(rgba);
|
2005-01-16 06:02:06 +00:00
|
|
|
}
|
|
|
|
|
2009-09-29 21:42:40 +00:00
|
|
|
#ifndef DISABLE_PYTHON
|
2009-06-08 20:08:19 +00:00
|
|
|
|
2005-01-16 06:02:06 +00:00
|
|
|
//----------------------------------------------------------------------------
|
|
|
|
//Python
|
|
|
|
|
|
|
|
|
|
|
|
PyMethodDef KX_PolygonMaterial::Methods[] = {
|
|
|
|
KX_PYMETHODTABLE(KX_PolygonMaterial, setCustomMaterial),
|
|
|
|
KX_PYMETHODTABLE(KX_PolygonMaterial, updateTexture),
|
|
|
|
KX_PYMETHODTABLE(KX_PolygonMaterial, setTexture),
|
|
|
|
KX_PYMETHODTABLE(KX_PolygonMaterial, activate),
|
|
|
|
// KX_PYMETHODTABLE(KX_PolygonMaterial, setPerPixelLights),
|
|
|
|
|
|
|
|
{NULL,NULL} //Sentinel
|
|
|
|
};
|
|
|
|
|
2009-02-26 09:04:06 +00:00
|
|
|
PyAttributeDef KX_PolygonMaterial::Attributes[] = {
|
2009-04-20 15:06:46 +00:00
|
|
|
KX_PYATTRIBUTE_RO_FUNCTION("texture", KX_PolygonMaterial, pyattr_get_texture),
|
|
|
|
KX_PYATTRIBUTE_RO_FUNCTION("material", KX_PolygonMaterial, pyattr_get_material), /* should probably be .name ? */
|
|
|
|
|
|
|
|
KX_PYATTRIBUTE_INT_RW("tile", INT_MIN, INT_MAX, true, KX_PolygonMaterial, m_tile),
|
|
|
|
KX_PYATTRIBUTE_INT_RW("tilexrep", INT_MIN, INT_MAX, true, KX_PolygonMaterial, m_tilexrep),
|
|
|
|
KX_PYATTRIBUTE_INT_RW("tileyrep", INT_MIN, INT_MAX, true, KX_PolygonMaterial, m_tileyrep),
|
|
|
|
KX_PYATTRIBUTE_INT_RW("drawingmode", INT_MIN, INT_MAX, true, KX_PolygonMaterial, m_drawingmode),
|
2009-06-08 20:08:19 +00:00
|
|
|
//KX_PYATTRIBUTE_INT_RW("lightlayer", INT_MIN, INT_MAX, true, KX_PolygonMaterial, m_lightlayer),
|
2009-04-20 15:06:46 +00:00
|
|
|
|
|
|
|
KX_PYATTRIBUTE_BOOL_RW("transparent", KX_PolygonMaterial, m_alpha),
|
|
|
|
KX_PYATTRIBUTE_BOOL_RW("zsort", KX_PolygonMaterial, m_zsort),
|
|
|
|
|
|
|
|
KX_PYATTRIBUTE_FLOAT_RW("shininess", 0.0f, 1000.0f, KX_PolygonMaterial, m_shininess),
|
|
|
|
KX_PYATTRIBUTE_FLOAT_RW("specularity", 0.0f, 1000.0f, KX_PolygonMaterial, m_specularity),
|
|
|
|
|
|
|
|
KX_PYATTRIBUTE_RW_FUNCTION("diffuse", KX_PolygonMaterial, pyattr_get_texture, pyattr_set_diffuse),
|
|
|
|
KX_PYATTRIBUTE_RW_FUNCTION("specular",KX_PolygonMaterial, pyattr_get_specular, pyattr_set_specular),
|
|
|
|
|
|
|
|
KX_PYATTRIBUTE_RO_FUNCTION("tface", KX_PolygonMaterial, pyattr_get_tface), /* How the heck is this even useful??? - Campbell */
|
|
|
|
KX_PYATTRIBUTE_RO_FUNCTION("gl_texture", KX_PolygonMaterial, pyattr_get_gl_texture), /* could be called 'bindcode' */
|
|
|
|
|
|
|
|
/* triangle used to be an attribute, removed for 2.49, nobody should be using it */
|
2009-02-26 09:04:06 +00:00
|
|
|
{ NULL } //Sentinel
|
|
|
|
};
|
2005-01-16 06:02:06 +00:00
|
|
|
|
|
|
|
PyTypeObject KX_PolygonMaterial::Type = {
|
2009-06-08 20:08:19 +00:00
|
|
|
PyVarObject_HEAD_INIT(NULL, 0)
|
2009-08-10 00:07:34 +00:00
|
|
|
"KX_PolygonMaterial",
|
|
|
|
sizeof(PyObjectPlus_Proxy),
|
|
|
|
0,
|
|
|
|
py_base_dealloc,
|
|
|
|
0,
|
|
|
|
0,
|
|
|
|
0,
|
|
|
|
0,
|
|
|
|
py_base_repr,
|
|
|
|
0,0,0,0,0,0,0,0,0,
|
|
|
|
Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE,
|
|
|
|
0,0,0,0,0,0,0,
|
|
|
|
Methods,
|
|
|
|
0,
|
|
|
|
0,
|
|
|
|
&PyObjectPlus::Type,
|
|
|
|
0,0,0,0,0,0,
|
|
|
|
py_base_new
|
2005-01-16 06:02:06 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
KX_PYMETHODDEF_DOC(KX_PolygonMaterial, setCustomMaterial, "setCustomMaterial(material)")
|
|
|
|
{
|
|
|
|
PyObject *material;
|
2009-04-20 15:06:46 +00:00
|
|
|
if (PyArg_ParseTuple(args, "O:setCustomMaterial", &material))
|
2005-01-16 06:02:06 +00:00
|
|
|
{
|
2009-02-21 12:43:24 +00:00
|
|
|
if (m_pymaterial) {
|
2005-01-16 06:02:06 +00:00
|
|
|
Py_DECREF(m_pymaterial);
|
2009-02-21 12:43:24 +00:00
|
|
|
}
|
2005-01-16 06:02:06 +00:00
|
|
|
m_pymaterial = material;
|
|
|
|
Py_INCREF(m_pymaterial);
|
2009-02-21 12:43:24 +00:00
|
|
|
Py_RETURN_NONE;
|
2005-01-16 06:02:06 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
KX_PYMETHODDEF_DOC(KX_PolygonMaterial, updateTexture, "updateTexture(tface, rasty)")
|
|
|
|
{
|
|
|
|
PyObject *pyrasty, *pytface;
|
2009-04-20 15:06:46 +00:00
|
|
|
if (PyArg_ParseTuple(args, "O!O!:updateTexture", &PyCObject_Type, &pytface, &PyCObject_Type, &pyrasty))
|
2005-01-16 06:02:06 +00:00
|
|
|
{
|
Added custom vertex/edge/face data for meshes:
All data layers, including MVert/MEdge/MFace, are now managed as custom
data layers. The pointers like Mesh.mvert, Mesh.dvert or Mesh.mcol are
still used of course, but allocating, copying or freeing these arrays
should be done through the CustomData API.
Work in progress documentation on this is here:
http://mediawiki.blender.org/index.php/BlenderDev/BlenderArchitecture/CustomData
Replaced TFace by MTFace:
This is the same struct, except that it does not contain color, that now
always stays separated in MCol. This was not a good design decision to
begin with, and it is needed for adding multiple color layers later. Note
that this does mean older Blender versions will not be able to read UV
coordinates from the next release, due to an SDNA limitation.
Removed DispListMesh:
This now fully replaced by DerivedMesh. To provide access to arrays of
vertices, edges and faces, like DispListMesh does. The semantics of the
DerivedMesh.getVertArray() and similar functions were changed to return
a pointer to an array if one exists, or otherwise allocate a temporary
one. On releasing the DerivedMesh, this temporary array will be removed
automatically.
Removed ssDM and meshDM DerivedMesh backends:
The ssDM backend was for DispListMesh, so that became obsolete automatically.
The meshDM backend was replaced by the custom data backend, that now figures
out which layers need to be modified, and only duplicates those.
This changes code in many places, and overall removes 2514 lines of code.
So, there's a good chance this might break some stuff, although I've been
testing it for a few days now. The good news is, adding multiple color and
uv layers should now become easy.
2006-11-20 04:28:02 +00:00
|
|
|
MTFace *tface = (MTFace*) PyCObject_AsVoidPtr(pytface);
|
2005-01-16 06:02:06 +00:00
|
|
|
RAS_IRasterizer *rasty = (RAS_IRasterizer*) PyCObject_AsVoidPtr(pyrasty);
|
Merge of first part of changes from the apricot branch, especially
the features that are needed to run the game. Compile tested with
scons, make, but not cmake, that seems to have an issue not related
to these changes. The changes include:
* GLSL support in the viewport and game engine, enable in the game
menu in textured draw mode.
* Synced and merged part of the duplicated blender and gameengine/
gameplayer drawing code.
* Further refactoring of game engine drawing code, especially mesh
storage changed a lot.
* Optimizations in game engine armatures to avoid recomputations.
* A python function to get the framerate estimate in game.
* An option take object color into account in materials.
* An option to restrict shadow casters to a lamp's layers.
* Increase from 10 to 18 texture slots for materials, lamps, word.
An extra texture slot shows up once the last slot is used.
* Memory limit for undo, not enabled by default yet because it
needs the .B.blend to be changed.
* Multiple undo for image painting.
* An offset for dupligroups, so not all objects in a group have to
be at the origin.
2008-09-04 20:51:28 +00:00
|
|
|
Image *ima = (Image*)tface->tpage;
|
|
|
|
GPU_update_image_time(ima, rasty->GetTime());
|
|
|
|
|
2009-02-21 12:43:24 +00:00
|
|
|
Py_RETURN_NONE;
|
2005-01-16 06:02:06 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
KX_PYMETHODDEF_DOC(KX_PolygonMaterial, setTexture, "setTexture(tface)")
|
|
|
|
{
|
|
|
|
PyObject *pytface;
|
2009-04-20 15:06:46 +00:00
|
|
|
if (PyArg_ParseTuple(args, "O!:setTexture", &PyCObject_Type, &pytface))
|
2005-01-16 06:02:06 +00:00
|
|
|
{
|
Added custom vertex/edge/face data for meshes:
All data layers, including MVert/MEdge/MFace, are now managed as custom
data layers. The pointers like Mesh.mvert, Mesh.dvert or Mesh.mcol are
still used of course, but allocating, copying or freeing these arrays
should be done through the CustomData API.
Work in progress documentation on this is here:
http://mediawiki.blender.org/index.php/BlenderDev/BlenderArchitecture/CustomData
Replaced TFace by MTFace:
This is the same struct, except that it does not contain color, that now
always stays separated in MCol. This was not a good design decision to
begin with, and it is needed for adding multiple color layers later. Note
that this does mean older Blender versions will not be able to read UV
coordinates from the next release, due to an SDNA limitation.
Removed DispListMesh:
This now fully replaced by DerivedMesh. To provide access to arrays of
vertices, edges and faces, like DispListMesh does. The semantics of the
DerivedMesh.getVertArray() and similar functions were changed to return
a pointer to an array if one exists, or otherwise allocate a temporary
one. On releasing the DerivedMesh, this temporary array will be removed
automatically.
Removed ssDM and meshDM DerivedMesh backends:
The ssDM backend was for DispListMesh, so that became obsolete automatically.
The meshDM backend was replaced by the custom data backend, that now figures
out which layers need to be modified, and only duplicates those.
This changes code in many places, and overall removes 2514 lines of code.
So, there's a good chance this might break some stuff, although I've been
testing it for a few days now. The good news is, adding multiple color and
uv layers should now become easy.
2006-11-20 04:28:02 +00:00
|
|
|
MTFace *tface = (MTFace*) PyCObject_AsVoidPtr(pytface);
|
2009-08-16 20:14:49 +00:00
|
|
|
GPU_set_tpage(tface, 1);
|
2009-02-21 12:43:24 +00:00
|
|
|
Py_RETURN_NONE;
|
2005-01-16 06:02:06 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
KX_PYMETHODDEF_DOC(KX_PolygonMaterial, activate, "activate(rasty, cachingInfo)")
|
|
|
|
{
|
|
|
|
PyObject *pyrasty, *pyCachingInfo;
|
2009-04-20 15:06:46 +00:00
|
|
|
if (PyArg_ParseTuple(args, "O!O!:activate", &PyCObject_Type, &pyrasty, &PyCObject_Type, &pyCachingInfo))
|
2005-01-16 06:02:06 +00:00
|
|
|
{
|
|
|
|
RAS_IRasterizer *rasty = static_cast<RAS_IRasterizer*>(PyCObject_AsVoidPtr(pyrasty));
|
|
|
|
TCachingInfo *cachingInfo = static_cast<TCachingInfo*>(PyCObject_AsVoidPtr(pyCachingInfo));
|
|
|
|
if (rasty && cachingInfo)
|
|
|
|
{
|
|
|
|
DefaultActivate(rasty, *cachingInfo);
|
2009-02-21 12:43:24 +00:00
|
|
|
Py_RETURN_NONE;
|
2005-01-16 06:02:06 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return NULL;
|
|
|
|
}
|
2009-04-20 15:06:46 +00:00
|
|
|
|
|
|
|
PyObject* KX_PolygonMaterial::pyattr_get_texture(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
|
|
|
|
{
|
|
|
|
KX_PolygonMaterial* self= static_cast<KX_PolygonMaterial*>(self_v);
|
2009-06-29 02:25:54 +00:00
|
|
|
return PyUnicode_FromString(self->m_texturename.ReadPtr());
|
2009-04-20 15:06:46 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
PyObject* KX_PolygonMaterial::pyattr_get_material(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
|
|
|
|
{
|
|
|
|
KX_PolygonMaterial* self= static_cast<KX_PolygonMaterial*>(self_v);
|
2009-06-29 02:25:54 +00:00
|
|
|
return PyUnicode_FromString(self->m_materialname.ReadPtr());
|
2009-04-20 15:06:46 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* this does not seem useful */
|
|
|
|
PyObject* KX_PolygonMaterial::pyattr_get_tface(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
|
|
|
|
{
|
|
|
|
KX_PolygonMaterial* self= static_cast<KX_PolygonMaterial*>(self_v);
|
|
|
|
return PyCObject_FromVoidPtr(self->m_tface, NULL);
|
|
|
|
}
|
|
|
|
|
|
|
|
PyObject* KX_PolygonMaterial::pyattr_get_gl_texture(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
|
|
|
|
{
|
|
|
|
KX_PolygonMaterial* self= static_cast<KX_PolygonMaterial*>(self_v);
|
|
|
|
int bindcode= 0;
|
|
|
|
if (self->m_tface && self->m_tface->tpage)
|
|
|
|
bindcode= self->m_tface->tpage->bindcode;
|
|
|
|
|
2009-06-29 02:25:54 +00:00
|
|
|
return PyLong_FromSsize_t(bindcode);
|
2009-04-20 15:06:46 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
PyObject* KX_PolygonMaterial::pyattr_get_diffuse(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
|
|
|
|
{
|
|
|
|
KX_PolygonMaterial* self= static_cast<KX_PolygonMaterial*>(self_v);
|
|
|
|
return PyObjectFrom(self->m_diffuse);
|
|
|
|
}
|
|
|
|
|
|
|
|
int KX_PolygonMaterial::pyattr_set_diffuse(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef, PyObject *value)
|
|
|
|
{
|
|
|
|
KX_PolygonMaterial* self= static_cast<KX_PolygonMaterial*>(self_v);
|
|
|
|
MT_Vector3 vec;
|
|
|
|
|
|
|
|
if (!PyVecTo(value, vec))
|
2009-06-08 20:08:19 +00:00
|
|
|
return PY_SET_ATTR_FAIL;
|
2009-04-20 15:06:46 +00:00
|
|
|
|
|
|
|
self->m_diffuse= vec;
|
2009-06-08 20:08:19 +00:00
|
|
|
return PY_SET_ATTR_SUCCESS;
|
2009-04-20 15:06:46 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
PyObject* KX_PolygonMaterial::pyattr_get_specular(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
|
|
|
|
{
|
|
|
|
KX_PolygonMaterial* self= static_cast<KX_PolygonMaterial*>(self_v);
|
|
|
|
return PyObjectFrom(self->m_specular);
|
|
|
|
}
|
|
|
|
|
|
|
|
int KX_PolygonMaterial::pyattr_set_specular(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef, PyObject *value)
|
|
|
|
{
|
|
|
|
KX_PolygonMaterial* self= static_cast<KX_PolygonMaterial*>(self_v);
|
|
|
|
MT_Vector3 vec;
|
|
|
|
|
|
|
|
if (!PyVecTo(value, vec))
|
2009-06-08 20:08:19 +00:00
|
|
|
return PY_SET_ATTR_FAIL;
|
2009-04-20 15:06:46 +00:00
|
|
|
|
|
|
|
self->m_specular= vec;
|
2009-06-08 20:08:19 +00:00
|
|
|
return PY_SET_ATTR_SUCCESS;
|
2009-04-20 15:06:46 +00:00
|
|
|
}
|
2009-09-29 21:42:40 +00:00
|
|
|
|
|
|
|
#endif // DISABLE_PYTHON
|