TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-02 09:52:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

Let's use OpenGL-style vertex colors by default on non-Windows platforms

Browse Source
This commit is contained in:
rdb 2015-04-04 21:38:54 +02:00
parent b323d73622
commit 4976345486
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
panda/src/egg2pg/eggLoader.cxx
View File

@ -2216,7 +2216,7 @@ check_for_polysets(EggGroup *egg_group, bool &all_polysets, bool &any_hidden) {
// transform, just returns it. // transform, just returns it.
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
PT(GeomVertexData) EggLoader:: PT(GeomVertexData) EggLoader::
make_vertex_data(const EggRenderState *render_state, make_vertex_data(const EggRenderState *render_state,
EggVertexPool *vertex_pool, EggNode *primitive_home, EggVertexPool *vertex_pool, EggNode *primitive_home,
const LMatrix4d &transform, TransformBlendTable *blend_table, const LMatrix4d &transform, TransformBlendTable *blend_table,
bool is_dynamic, CharacterMaker *character_maker, bool is_dynamic, CharacterMaker *character_maker,
@ -2231,7 +2231,7 @@ make_vertex_data(const EggRenderState *render_state,
if (di != _vertex_pool_data.end()) { if (di != _vertex_pool_data.end()) {
return (*di).second; return (*di).second;
} }
PT(GeomVertexArrayFormat) array_format = new GeomVertexArrayFormat; PT(GeomVertexArrayFormat) array_format = new GeomVertexArrayFormat;
array_format->add_column array_format->add_column
(InternalName::get_vertex(), vertex_pool->get_num_dimensions(), (InternalName::get_vertex(), vertex_pool->get_num_dimensions(),
@ -2244,9 +2244,15 @@ make_vertex_data(const EggRenderState *render_state,
} }
if (!ignore_color) { if (!ignore_color) {
array_format->add_column // Let's not use Direct3D-style colors on platforms where we only
(InternalName::get_color(), 1, // have OpenGL anyway.
Geom::NT_packed_dabc, Geom::C_color); #ifdef _WIN32
array_format->add_column(InternalName::get_color(), 1,
Geom::NT_packed_dabc, Geom::C_color);
#else
array_format->add_column(InternalName::get_color(), 4,
Geom::NT_uint8, Geom::C_color);
#endif
} }
vector_string uv_names, uvw_names, tbn_names; vector_string uv_names, uvw_names, tbn_names;