RomanNum3ral
/
open_toontown_panda3d
mirror of https://github.com/open-toontown/panda3d.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

various opencv and artoolkit fixes

This commit is contained in:
rdb 2009-01-14 21:06:22 +00:00
parent 298a56ce32
commit 64203dcf87
2 changed files with 28 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
panda/src/grutil/arToolKit.cxx
View File

@ -257,12 +257,12 @@ detach_patterns() {
////////////////////////////////////////////////////////////////////
void ARToolKit::
analyze(Texture *tex) {
nassertv(tex->has_ram_image());
//nassertv(tex->has_ram_image());
nassertv(tex->get_ram_image_compression() == Texture::CM_off);
nassertv(tex->get_component_type() == Texture::T_unsigned_byte);
nassertv(tex->get_texture_type() == Texture::TT_2d_texture);
if (tex->get_num_components() != 4) {
if (tex->get_num_components() != 4 && tex->get_num_components() != 3) {
grutil_cat.error() << "ARToolKit can only analyze RGBA textures.\n";
return;
}
@ -285,10 +285,22 @@ analyze(Texture *tex) {
const unsigned char *ram = ri.p();
unsigned char *data = new unsigned char[xsize * ysize * 4];
int dstlen = xsize * 4;
int srclen = (xsize + padx) * 4;
for (int y=0; y<ysize; y++) {
int invy = (ysize - y - 1);
memcpy(data + invy * dstlen, ram + y * srclen, dstlen);
// Until we find a better solution, we'll need to add the Alpha component ourselves.
if (tex->get_num_components() == 3) {
int srclen = (xsize + padx) * 3;
for (int y=0; y<ysize; y++) {
int invy = (ysize - y - 1);
memcpy(data + invy * dstlen, ram + y * srclen, dstlen - 1);
for (int x=0; x<xsize; x++) {
data[invy * dstlen + x * 4 + 3] = -1;
}
}
} else {
int srclen = (xsize + padx) * 4;
for (int y=0; y<ysize; y++) {
int invy = (ysize - y - 1);
memcpy(data + invy * dstlen, ram + y * srclen, dstlen);
}
}
Controls::const_iterator ctrli;
@ -301,6 +313,7 @@ analyze(Texture *tex) {
if (arDetectMarker(data, _threshold * 256, &marker_info, &marker_num) < 0) {
grutil_cat.error() << "ARToolKit detection error.\n";
delete data;
return;
}
@ -327,10 +340,10 @@ analyze(Texture *tex) {
arGetTransMat(inf, center, _marker_size, patt_trans);
LMatrix4f mat;
for (int i=0; i<4; i++) {
mat(i,0) = patt_trans[0][i];
mat(i,1) = patt_trans[2][i];
mat(i,2) = -patt_trans[1][i];
mat(i,3) = 0.0;
mat(i,0) = patt_trans[0][i];
mat(i,1) = patt_trans[2][i];
mat(i,2) = -patt_trans[1][i];
mat(i,3) = 0.0;
}
mat(3,3) = 1.0;
LVecBase3f scale, shear, hpr, pos;
@ -354,5 +367,5 @@ analyze(Texture *tex) {
delete data;
}
#endif // HAVE_ARTOOLKIT

5
panda/src/grutil/openCVTexture.cxx
View File

@ -118,7 +118,7 @@ from_camera(int camera_index, int z, const LoaderOptions &options) {
set_loaded_from_image();
clear_current_frame();
update_frame(0);
return true;
}
@ -224,6 +224,7 @@ make_texture() {
////////////////////////////////////////////////////////////////////
void OpenCVTexture::
update_frame(int frame) {
grutil_cat.spam() << "OpenCVTexture::update_frame called\n";
int max_z = max(_z_size, (int)_pages.size());
for (int z = 0; z < max_z; ++z) {
VideoPage &page = _pages[z];
@ -375,7 +376,7 @@ do_read_one(const Filename &fullpath, const Filename &alpha_fullpath,
set_loaded_from_image();
clear_current_frame();
update_frame(0);
return true;
}