TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-03 10:22:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

further improvements

Browse Source
This commit is contained in:
David Rose 2009-12-14 20:46:18 +00:00
parent 930570f1b5
commit 3bb37ce5ce
2 changed files with 193 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

233
panda/src/pgui/pgFrameStyle.cxx
View File

@ -181,11 +181,11 @@ generate_into(const NodePath &parent, const LVecBase4f &frame,
break; break;
case T_bevel_out: case T_bevel_out:
new_node = generate_bevel_geom(scaled_frame, false, false); new_node = generate_bevel_geom(scaled_frame, false);
break; break;
case T_bevel_in: case T_bevel_in:
new_node = generate_bevel_geom(scaled_frame, true, false); new_node = generate_bevel_geom(scaled_frame, true);
break; break;
case T_groove: case T_groove:
@ -197,7 +197,7 @@ generate_into(const NodePath &parent, const LVecBase4f &frame,
break; break;
case T_texture_border: case T_texture_border:
new_node = generate_bevel_geom(scaled_frame, false, true); new_node = generate_texture_border_geom(scaled_frame);
break; break;
default: default:
@ -263,16 +263,13 @@ generate_flat_geom(const LVecBase4f &frame) {
strip->close_primitive(); strip->close_primitive();
CPT(RenderState) state = RenderState::make(ColorAttrib::make_flat(_color), -1); CPT(RenderState) state = RenderState::make(ColorAttrib::make_flat(_color), -1);
if (has_texture()) {
state = state->set_attrib(TextureAttrib::make(get_texture()));
}
PT(Geom) geom = new Geom(vdata); PT(Geom) geom = new Geom(vdata);
geom->add_primitive(strip); geom->add_primitive(strip);
gnode->add_geom(geom, state); gnode->add_geom(geom, state);
if (has_texture()) {
CPT(RenderState) state =
RenderState::make(TextureAttrib::make(get_texture()));
gnode->set_geom_state(0, state);
}
return gnode.p(); return gnode.p();
} }
@ -283,7 +280,7 @@ generate_flat_geom(const LVecBase4f &frame) {
// T_bevel_out, or T_texture_border frame. // T_bevel_out, or T_texture_border frame.
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
PT(PandaNode) PGFrameStyle:: PT(PandaNode) PGFrameStyle::
generate_bevel_geom(const LVecBase4f &frame, bool in, bool flat_color) { generate_bevel_geom(const LVecBase4f &frame, bool in) {
// //
// Colors: // Colors:
// //
@ -348,10 +345,13 @@ generate_bevel_geom(const LVecBase4f &frame, bool in, bool flat_color) {
float bottom = frame[2]; float bottom = frame[2];
float top = frame[3]; float top = frame[3];
float inner_left = left + _width[0]; float cx = (left + right) * 0.5;
float inner_right = right - _width[0]; float cy = (top + bottom) * 0.5;
float inner_bottom = bottom + _width[1];
float inner_top = top - _width[1]; float inner_left = min(left + _width[0], cx);
float inner_right = max(right - _width[0], cx);
float inner_bottom = min(bottom + _width[1], cy);
float inner_top = max(top - _width[1], cy);
float left_color_scale = 1.2; float left_color_scale = 1.2;
float right_color_scale = 0.8; float right_color_scale = 0.8;
@ -364,12 +364,6 @@ generate_bevel_geom(const LVecBase4f &frame, bool in, bool flat_color) {
top_color_scale = 0.7; top_color_scale = 0.7;
bottom_color_scale = 1.3; bottom_color_scale = 1.3;
} }
if (flat_color) {
left_color_scale = 1.0;
right_color_scale = 1.0;
bottom_color_scale = 1.0;
top_color_scale = 1.0;
}
// Clamp all colors at white, and don't scale the alpha. // Clamp all colors at white, and don't scale the alpha.
Colorf cleft(min(_color[0] * left_color_scale, 1.0f), Colorf cleft(min(_color[0] * left_color_scale, 1.0f),
@ -443,10 +437,7 @@ generate_bevel_geom(const LVecBase4f &frame, bool in, bool flat_color) {
strip->add_next_vertices(6); strip->add_next_vertices(6);
strip->close_primitive(); strip->close_primitive();
strip->set_shade_model(Geom::SM_flat_last_vertex);
if (!flat_color) {
strip->set_shade_model(Geom::SM_flat_last_vertex);
}
if (has_texture()) { if (has_texture()) {
// Generate UV's. // Generate UV's.
@ -454,10 +445,14 @@ generate_bevel_geom(const LVecBase4f &frame, bool in, bool flat_color) {
float right = uv_range[1]; float right = uv_range[1];
float bottom = uv_range[2]; float bottom = uv_range[2];
float top = uv_range[3]; float top = uv_range[3];
float inner_left = left + _uv_width[0];
float inner_right = right - _uv_width[0]; float cx = (left + right) * 0.5;
float inner_bottom = bottom + _uv_width[1]; float cy = (top + bottom) * 0.5;
float inner_top = top - _uv_width[1];
float inner_left = min(left + _uv_width[0], cx);
float inner_right = max(right - _uv_width[0], cx);
float inner_bottom = min(bottom + _uv_width[1], cy);
float inner_top = max(top - _uv_width[1], cy);
GeomVertexWriter texcoord(vdata, InternalName::get_texcoord()); GeomVertexWriter texcoord(vdata, InternalName::get_texcoord());
texcoord.add_data2f(right, bottom); texcoord.add_data2f(right, bottom);
@ -481,12 +476,8 @@ generate_bevel_geom(const LVecBase4f &frame, bool in, bool flat_color) {
geom->add_primitive(strip); geom->add_primitive(strip);
CPT(RenderState) state; CPT(RenderState) state;
if (flat_color) { state = RenderState::make(ShadeModelAttrib::make(ShadeModelAttrib::M_flat),
state = RenderState::make(ColorAttrib::make_flat(_color)); ColorAttrib::make_vertex());
} else {
state = RenderState::make(ShadeModelAttrib::make(ShadeModelAttrib::M_flat),
ColorAttrib::make_vertex());
}
if (has_texture()) { if (has_texture()) {
state = state->set_attrib(TextureAttrib::make(get_texture())); state = state->set_attrib(TextureAttrib::make(get_texture()));
} }
@ -608,15 +599,18 @@ generate_groove_geom(const LVecBase4f &frame, bool in) {
float bottom = frame[2]; float bottom = frame[2];
float top = frame[3]; float top = frame[3];
float mid_left = left + 0.5f * _width[0]; float cx = (left + right) * 0.5;
float mid_right = right - 0.5f * _width[0]; float cy = (top + bottom) * 0.5;
float mid_bottom = bottom + 0.5f * _width[1];
float mid_top = top - 0.5f * _width[1];
float inner_left = left + _width[0]; float mid_left = min(left + 0.5f * _width[0], cx);
float inner_right = right - _width[0]; float mid_right = max(right - 0.5f * _width[0], cx);
float inner_bottom = bottom + _width[1]; float mid_bottom = min(bottom + 0.5f * _width[1], cy);
float inner_top = top - _width[1]; float mid_top = max(top - 0.5f * _width[1], cy);
float inner_left = min(left + _width[0], cx);
float inner_right = max(right - _width[0], cx);
float inner_bottom = min(bottom + _width[1], cy);
float inner_top = max(top - _width[1], cy);
float left_color_scale = 1.2f; float left_color_scale = 1.2f;
float right_color_scale = 0.8f; float right_color_scale = 0.8f;
@ -736,3 +730,158 @@ generate_groove_geom(const LVecBase4f &frame, bool in) {
return gnode.p(); return gnode.p();
} }
////////////////////////////////////////////////////////////////////
// Function: PGFrameStyle::generate_texture_border_geom
// Access: Private
// Description: Generates the GeomNode appropriate to a
// T_texture_border frame.
////////////////////////////////////////////////////////////////////
PT(PandaNode) PGFrameStyle::
generate_texture_border_geom(const LVecBase4f &frame) {
//
// Vertices:
//
// tristrip 1:
// 0 * * * 2 * * * * * * * * * * * * * 4 * * * 6
// * * * * * * * * *
// * * * * * * * * * * * *
// * * * * * * * * * *
// 1 * * * 3 * * * * * * * * * * * * * 5 * * * 7
//
// tristrip 2:
// 1 * * * 3 * * * * * * * * * * * * * 5 * * * 7
// * * * * *
// * * * * * * * *
// * * * * * * * * *
// * * * * * * * * *
// * * * * * * * *
// * * * * * *
// 8 * * *10 * * * * * * * * * * * * *12 * * *14
//
// tristrip 3:
// 8 * * *10 * * * * * * * * * * * * *12 * * *14
// * * * * * * * * *
// * * * * * * * * * * * *
// * * * * * * * * * *
// 9 * * *11 * * * * * * * * * * * * *13 * * *15
PT(GeomNode) gnode = new GeomNode("flat");
float left = frame[0];
float right = frame[1];
float bottom = frame[2];
float top = frame[3];
float cx = (left + right) * 0.5;
float cy = (top + bottom) * 0.5;
float inner_left = min(left + _width[0], cx);
float inner_right = max(right - _width[0], cx);
float inner_bottom = min(bottom + _width[1], cy);
float inner_top = max(top - _width[1], cy);
CPT(GeomVertexFormat) format;
if (has_texture()) {
format = GeomVertexFormat::get_v3t2();
} else {
format = GeomVertexFormat::get_v3();
}
PT(GeomVertexData) vdata = new GeomVertexData
("PGFrame", format, Geom::UH_static);
GeomVertexWriter vertex(vdata, InternalName::get_vertex());
// verts 0,1,2,3
vertex.add_data3f(left, 0.0f, top);
vertex.add_data3f(left, 0.0f, inner_top);
vertex.add_data3f(inner_left, 0.0f, top);
vertex.add_data3f(inner_left, 0.0f, inner_top);
// verts 4,5,6,7
vertex.add_data3f(inner_right, 0.0f, top);
vertex.add_data3f(inner_right, 0.0f, inner_top);
vertex.add_data3f(right, 0.0f, top);
vertex.add_data3f(right, 0.0f, inner_top);
// verts 8,9,10,11
vertex.add_data3f(left, 0.0f, inner_bottom);
vertex.add_data3f(left, 0.0f, bottom);
vertex.add_data3f(inner_left, 0.0f, inner_bottom);
vertex.add_data3f(inner_left, 0.0f, bottom);
// verts 12,13,14,15
vertex.add_data3f(inner_right, 0.0f, inner_bottom);
vertex.add_data3f(inner_right, 0.0f, bottom);
vertex.add_data3f(right, 0.0f, inner_bottom);
vertex.add_data3f(right, 0.0f, bottom);
if (has_texture()) {
// Generate UV's.
float left = uv_range[0];
float right = uv_range[1];
float bottom = uv_range[2];
float top = uv_range[3];
float cx = (left + right) * 0.5;
float cy = (top + bottom) * 0.5;
float inner_left = min(left + _uv_width[0], cx);
float inner_right = max(right - _uv_width[0], cx);
float inner_bottom = min(bottom + _uv_width[1], cy);
float inner_top = max(top - _uv_width[1], cy);
GeomVertexWriter texcoord(vdata, InternalName::get_texcoord());
// verts 0,1,2,3
texcoord.add_data2f(left, top);
texcoord.add_data2f(left, inner_top);
texcoord.add_data2f(inner_left, top);
texcoord.add_data2f(inner_left, inner_top);
// verts 4,5,6,7
texcoord.add_data2f(inner_right, top);
texcoord.add_data2f(inner_right, inner_top);
texcoord.add_data2f(right, top);
texcoord.add_data2f(right, inner_top);
// verts 8,9,10,11
texcoord.add_data2f(left, inner_bottom);
texcoord.add_data2f(left, bottom);
texcoord.add_data2f(inner_left, inner_bottom);
texcoord.add_data2f(inner_left, bottom);
// verts 12,13,14,15
texcoord.add_data2f(inner_right, inner_bottom);
texcoord.add_data2f(inner_right, bottom);
texcoord.add_data2f(right, inner_bottom);
texcoord.add_data2f(right, bottom);
}
PT(GeomTristrips) strip = new GeomTristrips(Geom::UH_static);
// tristrip #1
strip->add_consecutive_vertices(0, 8);
strip->close_primitive();
// tristrip #2
strip->add_vertex(1);
strip->add_vertex(8);
strip->add_vertex(3);
strip->add_vertex(10);
strip->add_vertex(5);
strip->add_vertex(12);
strip->add_vertex(7);
strip->add_vertex(14);
strip->close_primitive();
// tristrip #3
strip->add_consecutive_vertices(8, 8);
strip->close_primitive();
CPT(RenderState) state = RenderState::make(ColorAttrib::make_flat(_color), -1);
if (has_texture()) {
state = state->set_attrib(TextureAttrib::make(get_texture()));
}
PT(Geom) geom = new Geom(vdata);
geom->add_primitive(strip);
gnode->add_geom(geom, state);
return gnode.p();
}

3
panda/src/pgui/pgFrameStyle.h
View File

@ -81,8 +81,9 @@ public:
private: private:
PT(PandaNode) generate_flat_geom(const LVecBase4f &frame); PT(PandaNode) generate_flat_geom(const LVecBase4f &frame);
PT(PandaNode) generate_bevel_geom(const LVecBase4f &frame, bool in, bool flat_color); PT(PandaNode) generate_bevel_geom(const LVecBase4f &frame, bool in);
PT(PandaNode) generate_groove_geom(const LVecBase4f &frame, bool in); PT(PandaNode) generate_groove_geom(const LVecBase4f &frame, bool in);
PT(PandaNode) generate_texture_border_geom(const LVecBase4f &frame);
private: private:
Type _type; Type _type;