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

Added recognition of class MovieTexture

Browse Source
This commit is contained in:
Josh Yelon 2007-08-14 04:15:37 +00:00
parent 0caaf136cd
commit 299a3b4ae1
1 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
panda/src/framework/windowFramework.cxx
View File

@ -50,6 +50,7 @@
#include "geomNode.h" #include "geomNode.h"
#include "texture.h" #include "texture.h"
#include "videoTexture.h" #include "videoTexture.h"
#include "movieTexture.h"
#include "texturePool.h" #include "texturePool.h"
#include "loaderFileTypeRegistry.h" #include "loaderFileTypeRegistry.h"
#include "pnmImage.h" #include "pnmImage.h"
@ -1121,6 +1122,12 @@ load_image_as_model(const Filename &filename) {
x_size = vtex->get_video_width(); x_size = vtex->get_video_width();
y_size = vtex->get_video_height(); y_size = vtex->get_video_height();
tex_scale = vtex->get_tex_scale(); tex_scale = vtex->get_tex_scale();
} else if (tex->is_of_type(MovieTexture::get_class_type())) {
// Get the size from the video stream.
MovieTexture *mtex = DCAST(MovieTexture, tex);
x_size = mtex->get_video_width();
y_size = mtex->get_video_height();
tex_scale = mtex->get_tex_scale();
} else if (!tex->get_loaded_from_txo()) { } else if (!tex->get_loaded_from_txo()) {
// Get the size from the original image (the texture may have // Get the size from the original image (the texture may have
@ -1140,10 +1147,20 @@ load_image_as_model(const Filename &filename) {
// Ok, now make a polygon to show the texture. // Ok, now make a polygon to show the texture.
// Choose the dimensions of the polygon appropriately. // Choose the dimensions of the polygon appropriately.
float left = -x_size / 2.0; float left,right,top,bottom;
float right = x_size / 2.0; if (x_size > y_size) {
float bottom = -y_size / 2.0; float scale = 10.0;
float top = y_size / 2.0; left = -scale;
right = scale;
top = (scale * y_size) / x_size;
bottom = -(scale * y_size) / x_size;
} else {
float scale = 10.0;
left = -(scale * x_size) / y_size;
right = (scale * x_size) / y_size;
top = scale;
bottom = -scale;
}
PT(GeomNode) card_node = new GeomNode("card"); PT(GeomNode) card_node = new GeomNode("card");
card_node->set_attrib(TextureAttrib::make(tex)); card_node->set_attrib(TextureAttrib::make(tex));