diff --git a/panda/src/movies/inkblotVideo.cxx b/panda/src/movies/inkblotVideo.cxx index a9cf682ef3..38bdf15cbf 100644 --- a/panda/src/movies/inkblotVideo.cxx +++ b/panda/src/movies/inkblotVideo.cxx @@ -1,51 +1,51 @@ -// Filename: inkblotVideo.cxx -// Created by: jyelon (02Jul07) -// -//////////////////////////////////////////////////////////////////// -// +// Filename: inkblotVideo.cxx +// Created by: jyelon (02Jul07) +// +//////////////////////////////////////////////////////////////////// +// // PANDA 3D SOFTWARE // Copyright (c) Carnegie Mellon University. All rights reserved. // // All use of this software is subject to the terms of the revised BSD // license. You should have received a copy of this license along // with this source code in a file named "LICENSE." -// -//////////////////////////////////////////////////////////////////// - -#include "inkblotVideo.h" -#include "inkblotVideoCursor.h" - -TypeHandle InkblotVideo::_type_handle; - -//////////////////////////////////////////////////////////////////// -// Function: InkblotVideo::Constructor -// Access: Public -// Description: xxx -//////////////////////////////////////////////////////////////////// -InkblotVideo:: -InkblotVideo(int x, int y, int fps) : - MovieVideo("inkblot"), - _specified_x(x), - _specified_y(y), - _specified_fps(y) -{ -} - -//////////////////////////////////////////////////////////////////// -// Function: InkblotVideo::Destructor -// Access: Public, Virtual -// Description: -//////////////////////////////////////////////////////////////////// -InkblotVideo:: -~InkblotVideo() { -} - -//////////////////////////////////////////////////////////////////// -// Function: InkblotVideo::open -// Access: Published, Virtual -// Description: Open this video, returning a MovieVideoCursor. -//////////////////////////////////////////////////////////////////// -PT(MovieVideoCursor) InkblotVideo:: -open() { - return new InkblotVideoCursor(this); -} +// +//////////////////////////////////////////////////////////////////// + +#include "inkblotVideo.h" +#include "inkblotVideoCursor.h" + +TypeHandle InkblotVideo::_type_handle; + +//////////////////////////////////////////////////////////////////// +// Function: InkblotVideo::Constructor +// Access: Public +// Description: xxx +//////////////////////////////////////////////////////////////////// +InkblotVideo:: +InkblotVideo(int x, int y, int fps) : + MovieVideo("inkblot"), + _specified_x(x), + _specified_y(y), + _specified_fps(y) +{ +} + +//////////////////////////////////////////////////////////////////// +// Function: InkblotVideo::Destructor +// Access: Public, Virtual +// Description: +//////////////////////////////////////////////////////////////////// +InkblotVideo:: +~InkblotVideo() { +} + +//////////////////////////////////////////////////////////////////// +// Function: InkblotVideo::open +// Access: Published, Virtual +// Description: Open this video, returning a MovieVideoCursor. +//////////////////////////////////////////////////////////////////// +PT(MovieVideoCursor) InkblotVideo:: +open() { + return new InkblotVideoCursor(this); +} diff --git a/panda/src/movies/inkblotVideo.h b/panda/src/movies/inkblotVideo.h index 27525af3d2..b5982cde42 100644 --- a/panda/src/movies/inkblotVideo.h +++ b/panda/src/movies/inkblotVideo.h @@ -1,60 +1,60 @@ -// Filename: inkblotVideo.h -// Created by: jyelon (02Jul07) -// -//////////////////////////////////////////////////////////////////// -// +// Filename: inkblotVideo.h +// Created by: jyelon (02Jul07) +// +//////////////////////////////////////////////////////////////////// +// // PANDA 3D SOFTWARE // Copyright (c) Carnegie Mellon University. All rights reserved. // // All use of this software is subject to the terms of the revised BSD // license. You should have received a copy of this license along // with this source code in a file named "LICENSE." -// -//////////////////////////////////////////////////////////////////// - -#ifndef INKBLOTVIDEO_H -#define INKBLOTVIDEO_H - -#include "movieVideo.h" - -class InkblotVideoCursor; - -//////////////////////////////////////////////////////////////////// -// Class : InkblotVideo -// Description : A cellular automaton that generates an amusing -// pattern of swirling colors. -//////////////////////////////////////////////////////////////////// -class EXPCL_PANDA_MOVIES InkblotVideo : public MovieVideo { - - PUBLISHED: - InkblotVideo(int x, int y, int fps); - virtual ~InkblotVideo(); - virtual PT(MovieVideoCursor) open(); - - private: - int _specified_x; - int _specified_y; - int _specified_fps; - friend class InkblotVideoCursor; - -public: - static TypeHandle get_class_type() { - return _type_handle; - } - static void init_type() { - MovieVideo::init_type(); - register_type(_type_handle, "InkblotVideo", - MovieVideo::get_class_type()); - } - virtual TypeHandle get_type() const { - return get_class_type(); - } - virtual TypeHandle force_init_type() {init_type(); return get_class_type();} - -private: - static TypeHandle _type_handle; -}; - -#include "inkblotVideo.I" - -#endif +// +//////////////////////////////////////////////////////////////////// + +#ifndef INKBLOTVIDEO_H +#define INKBLOTVIDEO_H + +#include "movieVideo.h" + +class InkblotVideoCursor; + +//////////////////////////////////////////////////////////////////// +// Class : InkblotVideo +// Description : A cellular automaton that generates an amusing +// pattern of swirling colors. +//////////////////////////////////////////////////////////////////// +class EXPCL_PANDA_MOVIES InkblotVideo : public MovieVideo { + + PUBLISHED: + InkblotVideo(int x, int y, int fps); + virtual ~InkblotVideo(); + virtual PT(MovieVideoCursor) open(); + + private: + int _specified_x; + int _specified_y; + int _specified_fps; + friend class InkblotVideoCursor; + +public: + static TypeHandle get_class_type() { + return _type_handle; + } + static void init_type() { + MovieVideo::init_type(); + register_type(_type_handle, "InkblotVideo", + MovieVideo::get_class_type()); + } + virtual TypeHandle get_type() const { + return get_class_type(); + } + virtual TypeHandle force_init_type() {init_type(); return get_class_type();} + +private: + static TypeHandle _type_handle; +}; + +#include "inkblotVideo.I" + +#endif