mirror of
https://github.com/panda3d/panda3d.git
synced 2025-09-29 00:06:44 -04:00
*** empty log message ***
This commit is contained in:
parent
2974dcad65
commit
be91428169
@ -95,7 +95,6 @@ void ShaderTransition::
|
|||||||
insert(Shader *shader) {
|
insert(Shader *shader) {
|
||||||
PT(Shader) sp(shader);
|
PT(Shader) sp(shader);
|
||||||
Shaders::iterator si = _shaders.begin();
|
Shaders::iterator si = _shaders.begin();
|
||||||
ShaderOrder::iterator soi;
|
|
||||||
int order = -1;
|
int order = -1;
|
||||||
|
|
||||||
if ((_shader_order == NULL) && (_overrides.find(sp) == _overrides.end()))
|
if ((_shader_order == NULL) && (_overrides.find(sp) == _overrides.end()))
|
||||||
|
@ -82,7 +82,7 @@ advance() {
|
|||||||
dg.add_be_int16(_opcode);
|
dg.add_be_int16(_opcode);
|
||||||
dg.add_be_int16(_datagram.get_length() + header_size);
|
dg.add_be_int16(_datagram.get_length() + header_size);
|
||||||
|
|
||||||
nassertr(dg.get_length() == header_size, FE_internal);
|
nassertr((int)dg.get_length() == header_size, FE_internal);
|
||||||
|
|
||||||
_out.write(dg.get_message().data(), dg.get_length());
|
_out.write(dg.get_message().data(), dg.get_length());
|
||||||
if (_out.fail()) {
|
if (_out.fail()) {
|
||||||
|
@ -60,4 +60,5 @@ bool FltUnsupportedRecord::
|
|||||||
build_record(FltRecordWriter &writer) const {
|
build_record(FltRecordWriter &writer) const {
|
||||||
writer.set_opcode(_opcode);
|
writer.set_opcode(_opcode);
|
||||||
writer.set_datagram(_datagram);
|
writer.set_datagram(_datagram);
|
||||||
|
return true;
|
||||||
}
|
}
|
||||||
|
@ -64,7 +64,7 @@ void StitchImageConverter::
|
|||||||
create_image_geometry(Image &im) {
|
create_image_geometry(Image &im) {
|
||||||
assert(_output_image != NULL);
|
assert(_output_image != NULL);
|
||||||
|
|
||||||
double dist = 1.0 + (double)im._index / (double)_images.size();
|
// double dist = 1.0 + (double)im._index / (double)_images.size();
|
||||||
#if 0
|
#if 0
|
||||||
int x_verts = _output_image->get_x_verts();
|
int x_verts = _output_image->get_x_verts();
|
||||||
int y_verts = _output_image->get_y_verts();
|
int y_verts = _output_image->get_y_verts();
|
||||||
|
Loading…
x
Reference in New Issue
Block a user