Remove awesomium (see #440)

doc/INSTALL

@@ -194,7 +194,6 @@ it will show you the available command-line options:
   --use-wx          --no-wx        (enable/disable use of WX)
   --use-fltk        --no-fltk      (enable/disable use of FLTK)
   --use-rocket      --no-rocket    (enable/disable use of ROCKET)
-  --use-awesomium   --no-awesomium (enable/disable use of AWESOMIUM)
   --use-carbon      --no-carbon    (enable/disable use of CARBON)
   --use-cocoa       --no-cocoa     (enable/disable use of COCOA)
   --use-x11         --no-x11       (enable/disable use of X11)

makepanda/installer.nsi

@@ -333,7 +333,6 @@ SectionGroup "Python support"
 
         File /nonfatal /r "${BUILT}\panda3d\core${EXT_SUFFIX}"
         File /nonfatal /r "${BUILT}\panda3d\ai${EXT_SUFFIX}"
-        File /nonfatal /r "${BUILT}\panda3d\awesomium${EXT_SUFFIX}"
         File /nonfatal /r "${BUILT}\panda3d\direct${EXT_SUFFIX}"
         File /nonfatal /r "${BUILT}\panda3d\egg${EXT_SUFFIX}"
         File /nonfatal /r "${BUILT}\panda3d\fx${EXT_SUFFIX}"

makepanda/makepanda.py

@@ -91,7 +91,7 @@ PkgListSet(["PYTHON", "DIRECT",                        # Python support
   "ARTOOLKIT", "OPENCV", "DIRECTCAM", "VISION",        # Augmented Reality
   "GTK2",                                              # GTK2 is used for PStats on Unix
   "MFC", "WX", "FLTK",                                 # Used for web plug-in only
-  "ROCKET", "AWESOMIUM",                               # GUI libraries
+  "ROCKET",                                            # GUI libraries
   "CARBON", "COCOA",                                   # Mac OS X toolkits
   "X11",                                               # Unix platform support
   "PANDATOOL", "PVIEW", "DEPLOYTOOLS",                 # Toolchain
@@ -677,7 +677,6 @@ if (COMPILER == "MSVC"):
     if (PkgSkip("OPENCV")==0):   LibName("OPENCV",   GetThirdpartyDir() + "opencv/lib/cvaux.lib")
     if (PkgSkip("OPENCV")==0):   LibName("OPENCV",   GetThirdpartyDir() + "opencv/lib/ml.lib")
     if (PkgSkip("OPENCV")==0):   LibName("OPENCV",   GetThirdpartyDir() + "opencv/lib/cxcore.lib")
-    if (PkgSkip("AWESOMIUM")==0):LibName("AWESOMIUM",GetThirdpartyDir() + "awesomium/lib/Awesomium.lib")
     if (PkgSkip("FFMPEG")==0):   LibName("FFMPEG",   GetThirdpartyDir() + "ffmpeg/lib/avcodec.lib")
     if (PkgSkip("FFMPEG")==0):   LibName("FFMPEG",   GetThirdpartyDir() + "ffmpeg/lib/avformat.lib")
     if (PkgSkip("FFMPEG")==0):   LibName("FFMPEG",   GetThirdpartyDir() + "ffmpeg/lib/avutil.lib")
@@ -797,7 +796,6 @@ if (COMPILER == "MSVC"):
         LibName("BULLET", GetThirdpartyDir() + "bullet/lib/BulletSoftBody" + suffix)
 
 if (COMPILER=="GCC"):
-    PkgDisable("AWESOMIUM")
     if GetTarget() != "darwin":
         PkgDisable("CARBON")
         PkgDisable("COCOA")
@@ -2850,8 +2848,6 @@ if not PkgSkip("SKEL"):
     panda_modules.append('skel')
 if not PkgSkip("EGG"):
     panda_modules.append('egg')
-if not PkgSkip("AWESOMIUM"):
-    panda_modules.append('awesomium')
 if not PkgSkip("ODE"):
     panda_modules.append('ode')
 if not PkgSkip("VRPN"):
@@ -3197,7 +3193,6 @@ CopyAllHeaders('panda/src/text')
 CopyAllHeaders('panda/src/grutil')
 if (PkgSkip("VISION")==0):
     CopyAllHeaders('panda/src/vision')
-CopyAllHeaders('panda/src/awesomium')
 if (PkgSkip("FFMPEG")==0):
     CopyAllHeaders('panda/src/ffmpeg')
 CopyAllHeaders('panda/src/tform')
@@ -4372,32 +4367,6 @@ if (PkgSkip("ROCKET") == 0) and (not RUNTIME):
   PyTargetAdd('rocket.pyd', input=COMMON_PANDA_LIBS)
   PyTargetAdd('rocket.pyd', opts=['ROCKET'])
 
-#
-# DIRECTORY: panda/src/p3awesomium
-#
-if PkgSkip("AWESOMIUM") == 0 and not RUNTIME:
-  OPTS=['DIR:panda/src/awesomium', 'BUILDING:PANDAAWESOMIUM',  'AWESOMIUM']
-  TargetAdd('pandaawesomium_composite1.obj', opts=OPTS, input='pandaawesomium_composite1.cxx')
-  TargetAdd('libp3awesomium.dll', input='pandaawesomium_composite1.obj')
-  TargetAdd('libp3awesomium.dll', input=COMMON_PANDA_LIBS)
-  TargetAdd('libp3awesomium.dll', opts=OPTS)
-
-  OPTS=['DIR:panda/src/awesomium', 'AWESOMIUM']
-  IGATEFILES=GetDirectoryContents('panda/src/awesomium', ["*.h", "*_composite1.cxx"])
-  TargetAdd('libp3awesomium.in', opts=OPTS, input=IGATEFILES)
-  TargetAdd('libp3awesomium.in', opts=['IMOD:panda3d.awesomium', 'ILIB:libp3awesomium', 'SRCDIR:panda/src/awesomium'])
-
-
-  PyTargetAdd('awesomium_module.obj', input='libp3awesomium.in')
-  PyTargetAdd('awesomium_module.obj', opts=OPTS)
-  PyTargetAdd('awesomium_module.obj', opts=['IMOD:panda3d.awesomium', 'ILIB:awesomium', 'IMPORT:panda3d.core'])
-
-  PyTargetAdd('awesomium.pyd', input='awesomium_module.obj')
-  PyTargetAdd('awesomium.pyd', input='libp3awesomium_igate.obj')
-  PyTargetAdd('awesomium.pyd', input='libp3awesomium.dll')
-  PyTargetAdd('awesomium.pyd', input='libp3interrogatedb.dll')
-  PyTargetAdd('awesomium.pyd', input=COMMON_PANDA_LIBS)
-
 #
 # DIRECTORY: panda/src/p3skel
 #

makepanda/makepanda.vcproj

@@ -3578,25 +3578,6 @@
 				<File RelativePath="..\panda\src\net\datagram_ui.cxx"></File>
 				<File RelativePath="..\panda\src\net\netAddress.cxx"></File>
 			</Filter>
-			<Filter Name="awesomium">
-				<File RelativePath="..\panda\src\awesomium\WebBrowserTexture.cxx"></File>
-				<File RelativePath="..\panda\src\awesomium\awesomium_includes.h"></File>
-				<File RelativePath="..\panda\src\awesomium\pandaawesomium_composite1.cxx"></File>
-				<File RelativePath="..\panda\src\awesomium\awWebViewListener.cxx"></File>
-				<File RelativePath="..\panda\src\awesomium\awWebViewListener.h"></File>
-				<File RelativePath="..\panda\src\awesomium\awWebCore.h"></File>
-				<File RelativePath="..\panda\src\awesomium\WebBrowserTexture.h"></File>
-				<File RelativePath="..\panda\src\awesomium\awWebCore.cxx"></File>
-				<File RelativePath="..\panda\src\awesomium\AwMouseAndKeyboard.h"></File>
-				<File RelativePath="..\panda\src\awesomium\awWebViewListener.I"></File>
-				<File RelativePath="..\panda\src\awesomium\awWebView.h"></File>
-				<File RelativePath="..\panda\src\awesomium\config_awesomium.h"></File>
-				<File RelativePath="..\panda\src\awesomium\awWebCore.I"></File>
-				<File RelativePath="..\panda\src\awesomium\awWebView.I"></File>
-				<File RelativePath="..\panda\src\awesomium\awWebView.cxx"></File>
-				<File RelativePath="..\panda\src\awesomium\AwMouseAndKeyboard.cxx"></File>
-				<File RelativePath="..\panda\src\awesomium\config_awesomium.cxx"></File>
-			</Filter>
 			<Filter Name="movies">
 				<File RelativePath="..\panda\src\movies\ffmpegVideoCursor.h"></File>
 				<File RelativePath="..\panda\src\movies\movies_composite.cxx"></File>

panda/src/awesomium/AwMouseAndKeyboard.cxx

@@ -1,47 +0,0 @@
-/**
- * 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."
- *
- * @file AwMouseAndKeyboard.cxx
- * @author Bei Yang
- * @date 2010-03
- */
-
-#include "config_awesomium.h"
-#include "AwMouseAndKeyboard.h"
-#include "dataNodeTransmit.h"
-
-TypeHandle AwMouseAndKeyboard::_type_handle;
-
-AwMouseAndKeyboard::AwMouseAndKeyboard(const std::string &name):
-DataNode(name)
-{
-  _button_events_input = define_input("button_events", ButtonEventList::get_class_type());
-  _button_events_output = define_output("button_events", ButtonEventList::get_class_type());
-}
-
-
-void AwMouseAndKeyboard::do_transmit_data(DataGraphTraverser *trav, const DataNodeTransmit &input, DataNodeTransmit &output){
-
-  if (input.has_data(_button_events_input)) {
-    const ButtonEventList *button_events;
-    DCAST_INTO_V(button_events, input.get_data(_button_events_input).get_ptr());
-
-    int num_events = button_events->get_num_events();
-    for (int i = 0; i < num_events; i++) {
-      const ButtonEvent &be = button_events->get_event(i);
-      std::string event_name = be._button.get_name();
-      printf("Button Event! : %s with code %i and index %i ", event_name.c_str(), be._keycode, be._button.get_index());
-      if(be._type == ButtonEvent::T_down) printf("down");
-      if(be._type == ButtonEvent::T_repeat) printf("repeat");
-      if(be._type == ButtonEvent::T_up) printf("up");
-      if(be._type == ButtonEvent::T_resume_down) printf("T_resume_down");
-      printf("\n");
-    }
-  }
-
-}

panda/src/awesomium/AwMouseAndKeyboard.h

@@ -1,61 +0,0 @@
-/**
- * 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."
- *
- * @file AwMouseAndKeyboard.h
- * @author rurbino
- * @date 2009-10-12
- */
-
-#ifndef AWWEBKEYBOARDMOUSE_H
-#define AWWEBKEYBOARDMOUSE_H
-
-#include "pandabase.h"
-#include "typedReferenceCount.h"
-#include "luse.h"
-
-#include "mouseAndKeyboard.h"
-
-
-/**
- * Thin wrappings arround WebCore.h
- */
-class EXPCL_PANDAAWESOMIUM AwMouseAndKeyboard : public DataNode {
-// member data data
-protected:
-  // inputs adn output indices... initialized in constructor
-  int _button_events_input;
-  int _button_events_output;
-
-PUBLISHED:
-  AwMouseAndKeyboard(const std::string &name);
-
-protected:
-  // Inherited from DataNode
-  virtual void do_transmit_data(DataGraphTraverser *trav,
-                                const DataNodeTransmit &input,
-                                DataNodeTransmit &output);
-
-public:
-  static TypeHandle get_class_type() {
-    return _type_handle;
-  }
-  static void init_type() {
-    MouseAndKeyboard::init_type();
-    register_type(_type_handle, "AwMouseAndKeyboard",
-                  DataNode::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;
-};
-
-#endif

panda/src/awesomium/ReadMe.txt

@@ -1,8 +0,0 @@
-See http://www.sirikata.com/wiki/index.php?title=Compiling_Awesomium
-
-But the Chromium revision 22725.
-The awesomium git repository used is at: http://github.com/pathorn/awesomium/network
-The version of awesomium is from the master August 7 checkin, tree fc3239b4f49031285682cb5d78256d56e9001b66
-
-Any method that had a wstring in the parameter, a second method was created which just accepts all std::string. This fixes the VC7 - VC9 linker error.
-

panda/src/awesomium/WebBrowserTexture.cxx

@@ -1,194 +0,0 @@
-/**
- * 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."
- *
- * @file WebBrowserTexture.cxx
- * @author bei yang
- * @date 2010-03
- */
-
-#include "config_awesomium.h"
-#include "WebBrowserTexture.h"
-
-TypeHandle WebBrowserTexture::_type_handle;
-
-/**
- * Copy constructor for web browser texture.  The behavior of copying a
- * webtexture is that will be the same as a standard texture copy.  However,
- * the content will remain the system until set_web_view is called.
- */
-WebBrowserTexture::WebBrowserTexture(const WebBrowserTexture &copy):
-Texture(copy)
-{
-    // this kind of assumes that the previous texture was initialized properly
-    _aw_web_view = copy._aw_web_view;
-    _update_active = copy._update_active;
-    _flip_texture_active = copy._flip_texture_active;
-}
-
-/**
- * This initializes a web browser texture with the given AwWebView class.
- */
-WebBrowserTexture::WebBrowserTexture(const std::string &name, AwWebView* aw_web_view):
-Texture(name),
-_update_active(true),
-_flip_texture_active(false)
-{
-    set_web_view(aw_web_view);
-    set_minfilter(FT_linear);
-    set_magfilter(FT_linear);
-
-}
-
-/**
- * Standard destructor... doesn't do anything.  All destructing happens in
- * parent texture class.
- */
-WebBrowserTexture::~WebBrowserTexture()
-{
-    // do nothing
-}
-
-
-/**
- * Standard destructor... doesn't do anything.  All destructing happens in
- * parent texture class.
- */
-bool WebBrowserTexture::get_keep_ram_image() const {
-    return true;
-}
-
-/**
- * A WebBrowserTexture must always keep its ram image.  This is essentially a
- * sub.
- */
-void WebBrowserTexture::do_reload_ram_image() {
-    // A MovieTexture should never dump its RAM image.  Therefore, this is not
-    // needed.
-}
-
-/**
- * Should be overridden by derived classes to return true if cull_callback()
- * has been defined.  Otherwise, returns false to indicate cull_callback()
- * does not need to be called for this node during the cull traversal.
- *
- * This one returns true because it uses the cull traverser method to do the
- * texture udpate.
- */
-bool WebBrowserTexture::has_cull_callback() const {
-    return true;
-}
-
-/**
- * Sets the internal AwWebView of this texture.  After calling this, the
- * texture will automatically set it's width and height to match the AwWebView
- * at the next time it is culled and rendered.
- */
-void WebBrowserTexture::set_web_view(AwWebView* aw_web_view){
-    _aw_web_view = aw_web_view;
-}
-
-
-/**
- * Gets the current internal AwWebView of this texture.
- */
-AwWebView* WebBrowserTexture::get_web_view() const{
-    return _aw_web_view;
-}
-
-
-/**
- * Gives the ability to toggle updating this texture or not.  This can be
- * disabled to improve performance so that only the one that needs to be
- * active is active.
- */
-void WebBrowserTexture::set_update_active(bool active_flag){
-    _update_active = active_flag;
-}
-
-
-/**
- * Gets whether or not this texture is updating itself every time it is
- * rendered.
- */
-bool WebBrowserTexture::get_update_active() const{
-    return _update_active;
-}
-
-
-/**
- * This toggles on/off automatic flipping of the of the texture at a source
- * level.  Awesomium renders things that are flipped vertically.  This enables
- * automatic flipping of that.
- *
- * Since it is doing byte manipulation, this can get rather slow.  Turning
- * this on should be avoided.  Instead, flipping should be taken care of via
- * UV coordinates or shaders.
- */
-void WebBrowserTexture::set_flip_texture_active(bool active_flag){
-    _flip_texture_active = active_flag;
-}
-
-/**
- * Returns whether automatic texture flipping is enabled.
- */
-bool WebBrowserTexture::get_flip_texture_active() const {
-    return _flip_texture_active;
-}
-
-
-/**
- * This function will be called during the cull traversal to update the
- * WebBrowserTexture.  This method calls the render method of AwWebView but
- * does not call the update method of AwWebCore.
- */
-bool WebBrowserTexture::cull_callback(CullTraverser *trav, const CullTraverserData &data) const{
-    // see if we are in a state where udpates can happen.  else just return
-    if( !_update_active ) return true;
-    if( _aw_web_view == nullptr ) return true;
-
-    // do we even need to update?
-    if( !_aw_web_view->is_dirty() ) return true;
-
-    // see if we're the same size, if not we need to make sure this texture
-    // matches the webview
-    if( _aw_web_view->get_width() != get_x_size() || _aw_web_view->get_height() != get_y_size() || get_texture_type() != TT_2d_texture){
-        // these casts are so dirty especially when the method itself is
-        // labled as const.  Really Texture::cull_callback should be not const
-        // first clean up
-        ((WebBrowserTexture*)this)->clear_ram_mipmap_images();
-        ((WebBrowserTexture*)this)->clear_ram_image();
-        // now set up the texture again
-        ((WebBrowserTexture*)this)->setup_2d_texture( _aw_web_view->get_width(), _aw_web_view->get_height(), T_unsigned_byte, F_rgba );
-        // should be good to go at this point
-    }
-
-    // get the pointer
-    PTA_uchar ram_image = ((WebBrowserTexture*)this)->modify_ram_image();
-    unsigned char* cp_data = ram_image.p();
-    // render it
-    _aw_web_view->render((void*)cp_data, get_x_size()*4, 4);
-
-    if(_flip_texture_active){
-        // flips the texture around... this is super slow.  Really this should
-        // never be enabled.  However beginners might find this useful
-        size_t width = get_x_size();
-        size_t height = get_y_size();
-        for(size_t i=0; i < height/2; i++){
-            for(size_t j=0; j < width; j++){
-                unsigned char tmp[4];
-                size_t a_pos = j+width*i;
-                size_t b_pos = j + width*(height-i-1);
-                memcpy(tmp,&cp_data[4*a_pos], 4); //tmp = a
-                memcpy(&cp_data[4*a_pos], &cp_data[4*b_pos], 4); //a = b
-                memcpy(&cp_data[4*b_pos], tmp, 4); //b = tmp
-            }
-        }
-    }
-    // success
-    return true;
-}

panda/src/awesomium/WebBrowserTexture.h

@@ -1,77 +0,0 @@
-/**
- * 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."
- *
- * @file WebBrowserTexture.h
- * @author Bei Yang
- * @date 2010-08-03
- */
-
-#ifndef WebBrowserTexture_H
-#define WebBrowserTexture_H
-
-#include "pandabase.h"
-#include "texture.h"
-#include "awWebView.h"
-
-
-/**
- * A Wrapper class for Awesomium webview.  This implements most of Awesomium's
- * features and updates on the cull_traverser callback much much like a movie
- * texture.
- *
- * The use of class means that you will have to follow Awesomium license
- * agreement give below http://www.khrona.com/products/awesomium/licensing
- */
-class EXPCL_PANDAAWESOMIUM WebBrowserTexture : public Texture {
-protected:
-    AwWebView* _aw_web_view;
-    bool _update_active;
-    bool _flip_texture_active;
-
-// Constructors & Destructors ------------
-private:
-    WebBrowserTexture(const WebBrowserTexture &copy);
-PUBLISHED:
-    WebBrowserTexture(const std::string &name, AwWebView* aw_web_view = nullptr);
-    virtual ~WebBrowserTexture();
-
-
-// methods --------------
-protected:
-    bool get_keep_ram_image() const;
-    void do_reload_ram_image();
-public:
-    virtual bool has_cull_callback() const;
-    virtual bool cull_callback(CullTraverser *trav, const CullTraverserData &data) const;
-PUBLISHED:
-    void set_web_view(AwWebView* aw_web_view);
-    AwWebView* get_web_view() const;
-    void set_update_active(bool active_flag);
-    bool get_update_active() const;
-    void set_flip_texture_active(bool active_flag);
-    bool get_flip_texture_active() const;
-
-// Type handles ----------------
-public:
-    static TypeHandle get_class_type() {
-        return _type_handle;
-    }
-    static void init_type() {
-        Texture::init_type();
-        register_type(_type_handle, "WebBrowserTexture",
-            Texture::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;
-};
-#endif

panda/src/awesomium/awWebCore.I

@@ -1,48 +0,0 @@
-/**
- * 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."
- *
- * @file awWebCore.I
- * @author rurbino
- * @date 2009-10-12
- */
-
-INLINE void AwWebCore::
-setBaseDirectory(const std::string& baseDirectory) {
-  WebCore::setBaseDirectory(baseDirectory);
-}
-
-INLINE void AwWebCore::
-setCustomResponsePage(int statusCode, const std::string& filePath) {
-  WebCore::setCustomResponsePage(statusCode, filePath);
-}
-
-INLINE void AwWebCore::
-update() {
-  WebCore::update();
-}
-
-INLINE const std::string& AwWebCore::
-getBaseDirectory() const {
-  return WebCore::getBaseDirectory();
-}
-
-INLINE bool AwWebCore::
-arePluginsEnabled() const {
-  return WebCore::arePluginsEnabled();
-}
-
-
-INLINE void AwWebCore::
-pause(){
-  WebCore::pause();
-}
-
-INLINE void AwWebCore::
-resume() {
-  WebCore::resume();
-}

panda/src/awesomium/awWebCore.cxx

@@ -1,56 +0,0 @@
-/**
- * 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."
- *
- * @file awWebCore.cxx
- * @author rurbino
- * @date 2009-10-12
- */
-
-#include "config_awesomium.h"
-#include "awWebCore.h"
-
-#include <WebCore.h>
-
-TypeHandle AwWebCore::_type_handle;
-
-AwWebCore::
-AwWebCore(AwWebCore::LogLevel level, bool enablePlugins , AwWebCore::PixelFormat pixelFormat)
-#ifndef CPPPARSER
-:
-  WebCore(static_cast<Awesomium::LogLevel>(level), enablePlugins, static_cast<Awesomium::PixelFormat>(pixelFormat))
-#endif
-  {
-  awesomium_cat.info() << "constructing webcore\n";
-}
-
-AwWebCore::
-~AwWebCore() {
-  awesomium_cat.info() << "destructor webcore\n";
-}
-
-Awesomium::WebCore& AwWebCore::
-Get() {
-  return WebCore::Get();
-}
-
-Awesomium::WebCore* AwWebCore::
-GetPointer() {
-  return WebCore::GetPointer();
-}
-
-AwWebView *  AwWebCore::
-createWebView(int width, int height, bool isTransparent , bool enableAsyncRendering , int maxAsyncRenderPerSec ) {
-  Awesomium::WebView * newView = WebCore::createWebView(width, height, isTransparent, enableAsyncRendering, maxAsyncRenderPerSec);
-  AwWebView * result = new AwWebView(newView);
-  return result;
-}
-
-AwWebCore::PixelFormat AwWebCore::
-getPixelFormat() const {
-  return ( static_cast<AwWebCore::PixelFormat>( WebCore::getPixelFormat()) );
-}

panda/src/awesomium/awWebCore.h

@@ -1,94 +0,0 @@
-/**
- * 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."
- *
- * @file awWebCore.h
- * @author rurbino
- * @date 2009-10-12
- */
-
-#ifndef AWWEBCORE_H
-#define AWWEBCORE_H
-
-#include "pandabase.h"
-#include "typedReferenceCount.h"
-#include "luse.h"
-
-#include "awesomium_includes.h"
-
-class AwWebView;
-/**
- * Thin wrappings arround WebCore.h
- */
-class EXPCL_PANDAAWESOMIUM AwWebCore : public TypedReferenceCount, public Awesomium::WebCore {
-PUBLISHED:
-  /**
-  * An enumeration of the three verbosity settings for the Awesomium Log.
-  */
-  enum LogLevel
-  {
-    LOG_NONE ,      // No log is created
-    LOG_NORMAL ,        // Logs only errors
-    LOG_VERBOSE         // Logs everything
-  };
-
-  /**
-  * An enumeration of the two output pixel formats that WebView::render will use.
-  */
-  enum PixelFormat
-  {
-    PF_BGRA,    // BGRA byte ordering [Blue, Green, Red, Alpha]
-    PF_RGBA     // RGBA byte ordering [Red, Green, Blue, Alpha]
-  };
-
-  AwWebCore(LogLevel level = LOG_NORMAL, bool enablePlugins = true, PixelFormat pixelFormat = PF_BGRA);
-
-  virtual ~AwWebCore();
-
-  static Awesomium::WebCore& Get();
-
-  static Awesomium::WebCore* GetPointer();
-
-  INLINE void setBaseDirectory(const std::string& baseDirectory);
-
-  AwWebView * createWebView(int width, int height, bool isTransparent = false, bool enableAsyncRendering = false, int maxAsyncRenderPerSec = 70);
-
-  INLINE void setCustomResponsePage(int statusCode, const std::string& filePath);
-
-  INLINE void update();
-
-  INLINE const std::string& getBaseDirectory() const;
-
-  AwWebCore::PixelFormat getPixelFormat() const;
-
-  INLINE bool arePluginsEnabled() const;
-
-  INLINE void pause();
-
-  INLINE void resume();
-
-public:
-  static TypeHandle get_class_type() {
-    return _type_handle;
-  }
-  static void init_type() {
-    TypedReferenceCount::init_type();
-    register_type(_type_handle, "AwWebCore",
-                  TypedReferenceCount::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 "awWebCore.I"
-
-#endif

panda/src/awesomium/awWebView.I

@@ -1,82 +0,0 @@
-/**
- * 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."
- *
- * @file awWebView.I
- * @author rurbino
- * @date 2009-10-12
- */
-
-INLINE void AwWebView::
-destroy(void)
-{
-  _myWebView->destroy();
-}
-
-
-INLINE void AwWebView::
-setListener(Awesomium::WebViewListener *  listener) {
-  _myWebView->setListener(listener);
-}
-
-INLINE Awesomium::WebViewListener* AwWebView::
-getListener() {
-  return _myWebView->getListener();
-}
-
-INLINE void AwWebView::
-goToHistoryOffset(int offset) {
-  _myWebView->goToHistoryOffset(offset);
-}
-
-INLINE void AwWebView::
-executeJavascript2(const std::string& javascript, const std::string& frameName ) {
-  _myWebView->executeJavascript2(javascript, frameName);
-}
-
-INLINE Awesomium::FutureJSValue AwWebView::
-executeJavascriptWithResult2(const std::string& javascript, const std::string& frameName ) {
-  return _myWebView->executeJavascriptWithResult2(javascript, frameName);
-}
-
-INLINE void AwWebView::
-setProperty(const std::string& name, const Awesomium::JSValue& value) {
-  _myWebView->setProperty(name, value);
-}
-
-INLINE void AwWebView::
-setCallback(const std::string& name) {
-  _myWebView->setCallback(name);
-}
-
-INLINE bool AwWebView::
-isDirty() {
-  return _myWebView->isDirty();
-}
-
-INLINE void AwWebView::
-render( size_t  destination, int destRowSpan, int destDepth)
-{
-  _myWebView->render( reinterpret_cast<unsigned char *>(destination), destRowSpan, destDepth, 0);
-}
-
-
-
-INLINE void AwWebView::
-injectMouseUp(AwWebView::MouseButton button) {
-  _myWebView->injectMouseUp(static_cast<Awesomium::MouseButton>(button));
-}
-
-INLINE void AwWebView::
-injectMouseWheelXY(int scrollAmountX, int scrollAmountY){
-  _myWebView->injectMouseWheelXY(scrollAmountX, scrollAmountY);
-}
-
-INLINE void AwWebView::
-injectKeyEvent(bool press, int modifiers, int windowsCode, int nativeCode) {
-  _myWebView->injectKeyEvent(press, modifiers, windowsCode, nativeCode);
-}

panda/src/awesomium/awWebView.cxx

@@ -1,74 +0,0 @@
-/**
- * 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."
- *
- * @file awWebView.cxx
- * @author rurbino
- * @date 2009-10-12
- */
-
-#include "config_awesomium.h"
-#include "awWebView.h"
-
-TypeHandle AwWebView::_type_handle;
-
-AwWebView::
-AwWebView(Awesomium::WebView * webViewPtr)  {
-  _myWebView = webViewPtr;
-
-}
-
-AwWebView::
-~AwWebView() {
-}
-
-
-void AwWebView::
-loadURL2(const std::string& url, const std::string& frameName , const std::string& username , const std::string& password )
-{
-  _myWebView->loadURL2(url, frameName, username, password);
-
-}
-
-void AwWebView::
-loadHTML2(const std::string& html, const std::string& frameName )
-{
-  _myWebView->loadHTML2(html, frameName);
-}
-
-
-void AwWebView::
-loadFile2(const std::string& file, const std::string& frameName )
-{
-  _myWebView->loadFile2(file, frameName);
-}
-
-
-void AwWebView::
-render(size_t destination, int destRowSpan, int destDepth, AwWebView::Rect * renderedRect) {
-  if (renderedRect) {
-    Awesomium::Rect rect(renderedRect->x, renderedRect->y, renderedRect->width, renderedRect->height);
-    _myWebView->Awesomium::WebView::render( reinterpret_cast<unsigned char *>(destination), destRowSpan, destDepth, &rect);
-  }
-  else
-  {
-    AwWebView::render(destination, destRowSpan, destDepth, 0);
-  }
-}
-
-void AwWebView::
-injectMouseDown(AwWebView::MouseButton button) {
-  awesomium_cat.debug() <<"got mouse down " << button << "\n";
-  _myWebView->injectMouseDown(static_cast<Awesomium::MouseButton>(button));
-}
-
-
-void AwWebView::
-injectMouseMove(int x, int y) {
-  // awesomium_cat.debug() <<"got mouse move " << x << " " << y << "\n";
-  _myWebView->injectMouseMove(x,y);
-}

panda/src/awesomium/awWebView.h

@@ -1,131 +0,0 @@
-/**
- * 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."
- *
- * @file awWebView.h
- * @author rurbino
- * @date 2009-10-12
- */
-
-#ifndef AWWEBVIEW_H
-#define AWWEBVIEW_H
-
-#include "pandabase.h"
-#include "typedReferenceCount.h"
-#include "luse.h"
-
-#include "awesomium_includes.h"
-
-class WebViewListener;
-
-/**
- * Thin bindings, wraps a WebView * returned from WebCore.createWebView
- */
-class EXPCL_PANDAAWESOMIUM AwWebView : public TypedReferenceCount{
-PUBLISHED:
-
-  /**
-  * Mouse button enumerations, used with WebView::injectMouseDown
-  * and WebView::injectMouseUp
-  */
-  enum MouseButton {
-    LEFT_MOUSE_BTN,
-    MIDDLE_MOUSE_BTN,
-    RIGHT_MOUSE_BTN
-  };
-
-  /**
-   * A simple rectangle class, used with WebView::render
-   */
-  struct Rect {
-    int x, y, width, height;
-
-    Rect();
-    Rect(int x, int y, int width, int height);
-    bool isEmpty() const;
-  };
-
-
-PUBLISHED:
-  AwWebView(Awesomium::WebView * webView);
-
-  virtual ~AwWebView();
-
-  INLINE void destroy(void);
-
-  INLINE void setListener(Awesomium::WebViewListener * listener);
-
-  INLINE Awesomium::WebViewListener* getListener();
-
-  // VC7 linker doesn't like wstring from VS2008, hence using the all regular
-  // string version
-  void loadURL2(const std::string& url, const std::string& frameName ="", const std::string& username="" , const std::string& password="");
-
-  // VC7 linker doesn't like wstring from VS2008, hence using the all regular
-  // string version
-  void loadHTML2(const std::string& html, const std::string& frameName = "");
-
-  // VC7 linker doesn't like wstring from VS2008, hence using the all regular
-  // string version
-  void loadFile2(const std::string& file, const std::string& frameName = "" );
-
-  INLINE void goToHistoryOffset(int offset);
-
-  // VC7 linker doesn't like wstring from VS2008, hence using the all regular
-  // string version
-  INLINE void executeJavascript2(const std::string& javascript, const std::string& frameName = "" );
-
-  INLINE Awesomium::FutureJSValue executeJavascriptWithResult2(const std::string& javascript, const std::string& frameName = "");
-
-  INLINE void setProperty(const std::string& name, const Awesomium::JSValue& value);
-
-  INLINE void setCallback(const std::string& name);
-
-  INLINE bool isDirty();
-
-  INLINE void render(size_t destination, int destRowSpan, int destDepth);
-
-  void render(size_t destination, int destRowSpan, int destDepth, AwWebView::Rect * renderedRect);
-
-  void injectMouseMove(int x, int y);
-
-  void injectMouseDown(AwWebView::MouseButton button);
-
-  INLINE void injectMouseUp(AwWebView::MouseButton button);
-
-  INLINE void injectMouseWheelXY(int scrollAmountX, int scrollAmountY);
-
-  INLINE void injectMouseWheel(int scrollAmountY) {
-    injectMouseWheelXY(0, scrollAmountY);
-  }
-
-  INLINE void injectKeyEvent(bool press, int modifiers, int windowsCode, int nativeCode=0);
-
-private:
-  Awesomium::WebView * _myWebView;
-
-public:
-  static TypeHandle get_class_type() {
-    return _type_handle;
-  }
-  static void init_type() {
-    TypedReferenceCount::init_type();
-    register_type(_type_handle, "AwWebView",
-                  TypedReferenceCount::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 "awWebView.I"
-
-#endif

panda/src/awesomium/awWebViewListener.I

@@ -1,12 +0,0 @@
-/**
- * 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."
- *
- * @file awWebViewListener.I
- * @author rurbino
- * @date 2009-10-12
- */

panda/src/awesomium/awWebViewListener.cxx

@@ -1,80 +0,0 @@
-/**
- * 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."
- *
- * @file awWebViewListener.cxx
- * @author rurbino
- * @date 2009-10-12
- */
-
-#include "config_awesomium.h"
-#include "awWebViewListener.h"
-
-TypeHandle AwWebViewListener::_type_handle;
-
-AwWebViewListener::
-AwWebViewListener()  {
-  awesomium_cat.info() << "constructing WebViewListner" ;
-}
-
-void AwWebViewListener::onBeginNavigation(const std::string& url, const std::wstring& frameName){
-}
-
-void AwWebViewListener::onBeginLoading(const std::string& url, const std::wstring& frameName, int statusCode, const std::wstring& mimeType) {
-  awesomium_cat.info() << "onBeginLoading" ;
-}
-
-    /**
-    * This event is fired when all loads have finished for a WebView.
-    */
-void AwWebViewListener::onFinishLoading() {
-}
-
-    /**
-    * This event is fired when a Client callback has been invoked via Javascript from a page.
-    *
-    * @param    name    The name of the client callback that was invoked (specifically, "Client._this_name_here_(...)").
-    *
-    * @param    args    The arguments passed to the callback.
-    */
-void AwWebViewListener::onCallback(const std::string& name, const Awesomium::JSArguments& args) {
-}
-
-    /**
-    * This event is fired when a page title is received.
-    *
-    * @param    title   The page title.
-    *
-    * @param    frameName   The name of the frame that this event originated from.
-    */
-void AwWebViewListener::onReceiveTitle(const std::wstring& title, const std::wstring& frameName) {
-}
-
-    /**
-    * This event is fired when a tooltip has changed state.
-    *
-    * @param    tooltip     The tooltip text (or, is an empty string when the tooltip should disappear).
-    */
-void AwWebViewListener::onChangeTooltip(const std::wstring& tooltip) {
-}
-
-    /**
-    * This event is fired when keyboard focus has changed.
-    *
-    * @param    isFocused   Whether or not the keyboard is currently focused.
-    */
-void AwWebViewListener::onChangeKeyboardFocus(bool isFocused) {
-}
-
-    /**
-    * This event is fired when the target URL has changed. This is usually the result of
-    * hovering over a link on the page.
-    *
-    * @param    url The updated target URL (or empty if the target URL is cleared).
-    */
-void AwWebViewListener::onChangeTargetURL(const std::string& url) {
-}

panda/src/awesomium/awWebViewListener.h

@@ -1,123 +0,0 @@
-/**
- * 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."
- *
- * @file awWebViewListener.h
- * @author rurbino
- * @date 2009-10-12
- */
-
-#ifndef AWWEBVIEWLISTENER_H
-#define AWWEBVIEWLISTENER_H
-
-#include "pandabase.h"
-#include "typedReferenceCount.h"
-#include "luse.h"
-
-#include "awesomium_includes.h"
-
-/**
- * Thin bindings, wraps a WebViewListener
- */
-class EXPCL_PANDAAWESOMIUM AwWebViewListener : public TypedReferenceCount, public Awesomium::WebCore {
-PUBLISHED:
-
-
-PUBLISHED:
-        AwWebViewListener();
-
-        virtual ~AwWebViewListener() {}
-
-    /**
-    * This event is fired when a WebView begins navigating to a new URL.
-    *
-    * @param    url     The URL that is being navigated to.
-    *
-    * @param    frameName   The name of the frame that this event originated from.
-    */
-    void onBeginNavigation(const std::string& url, const std::wstring& frameName) ;
-
-    /**
-    * This event is fired when a WebView begins to actually receive data from a server.
-    *
-    * @param    url     The URL of the frame that is being loaded.
-    *
-    * @param    frameName   The name of the frame that this event originated from.
-    *
-    * @param    statusCode  The HTTP status code returned by the server.
-    *
-    * @param    mimeType    The mime-type of the content that is being loaded.
-    */
-        void onBeginLoading(const std::string& url, const std::wstring& frameName, int statusCode, const std::wstring& mimeType);
-
-    /**
-    * This event is fired when all loads have finished for a WebView.
-    */
-        void onFinishLoading();
-
-    /**
-    * This event is fired when a Client callback has been invoked via Javascript from a page.
-    *
-    * @param    name    The name of the client callback that was invoked (specifically, "Client._this_name_here_(...)").
-    *
-    * @param    args    The arguments passed to the callback.
-    */
-  void onCallback(const std::string& name, const Awesomium::JSArguments& args);
-
-    /**
-    * This event is fired when a page title is received.
-    *
-    * @param    title   The page title.
-    *
-    * @param    frameName   The name of the frame that this event originated from.
-    */
-  void onReceiveTitle(const std::wstring& title, const std::wstring& frameName) ;
-
-    /**
-    * This event is fired when a tooltip has changed state.
-    *
-    * @param    tooltip     The tooltip text (or, is an empty string when the tooltip should disappear).
-    */
-    void onChangeTooltip(const std::wstring& tooltip);
-
-    /**
-    * This event is fired when keyboard focus has changed.
-    *
-    * @param    isFocused   Whether or not the keyboard is currently focused.
-    */
-    void onChangeKeyboardFocus(bool isFocused) ;
-
-    /**
-    * This event is fired when the target URL has changed. This is usually the result of
-    * hovering over a link on the page.
-    *
-    * @param    url The updated target URL (or empty if the target URL is cleared).
-    */
-    void onChangeTargetURL(const std::string& url) ;
-
-
-public:
-  static TypeHandle get_class_type() {
-    return _type_handle;
-  }
-  static void init_type() {
-    TypedReferenceCount::init_type();
-    register_type(_type_handle, "AwWebViewListener",
-                  TypedReferenceCount::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 "awWebViewListener.I"
-
-#endif

panda/src/awesomium/awesomium_includes.h

@@ -1,21 +0,0 @@
-/**
- * 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."
- *
- * @file awesomium_includes.h
- * @author rurbino
- * @date 2010-10-08
- */
-
-#ifndef _AWESOMIUM_INCLUDES_H_
-#define _AWESOMIUM_INCLUDES_H_
-
-#include <WebCore.h>
-#include <WebView.h>
-#include <WebViewListener.h>
-
-#endif

panda/src/awesomium/config_awesomium.cxx

@@ -1,51 +0,0 @@
-/**
- * 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."
- *
- * @file config_awesomium.cxx
- * @author rurbino
- * @date 2009-10-12
- */
-
-#include "config_awesomium.h"
-#include "awWebCore.h"
-#include "awWebView.h"
-#include "awWebViewListener.h"
-#include "dconfig.h"
-
-
-#if !defined(CPPPARSER) && !defined(LINK_ALL_STATIC) && !defined(BUILDING_PANDAAWESOMIUM)
-  #error Buildsystem error: BUILDING_PANDAAWESOMIUM not defined
-#endif
-
-Configure(config_awesomium);
-NotifyCategoryDef(awesomium, "");
-
-
-ConfigureFn(config_awesomium) {
-  init_libawesomium();
-}
-
-/**
- * Initializes the library.  This must be called at least once before any of
- * the functions or classes in this library can be used.  Normally it will be
- * called by the static initializers and need not be called explicitly, but
- * special cases exist.
- */
-void
-init_libawesomium() {
-  static bool initialized = false;
-  if (initialized) {
-    return;
-  }
-  initialized = true;
-
-  AwWebCore::init_type();
-  AwWebView::init_type();
-  AwWebViewListener::init_type();
-
-}

panda/src/awesomium/config_awesomium.h

@@ -1,26 +0,0 @@
-/**
- * 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."
- *
- * @file config_awesomium.h
- * @author rurbino
- * @date 2009-10-12
- */
-
-#ifndef CONFIG_AWESOMIUM_H
-#define CONFIG_AWESOMIUM_H
-
-#include "pandabase.h"
-#include "notifyCategoryProxy.h"
-
-#include "dconfig.h"
-
-NotifyCategoryDecl(awesomium, EXPCL_PANDAAWESOMIUM, EXPTP_PANDAAWESOMIUM);
-
-extern EXPCL_PANDAAWESOMIUM void init_libawesomium();
-
-#endif /* CONFIG_AWESOMIUM_H */

panda/src/awesomium/pandaawesomium_composite1.cxx

@@ -1,4 +0,0 @@
-#include "config_awesomium.cxx"
-#include "awWebCore.cxx"
-#include "awWebView.cxx"
-#include "awWebViewListener.cxx"

panda/src/pandabase/pandasymbols.h

@@ -476,14 +476,6 @@
   #define EXPTP_PANDA_WGLDISPLAY IMPORT_TEMPL
 #endif
 
-#ifdef BUILDING_PANDAAWESOMIUM
-  #define EXPCL_PANDAAWESOMIUM EXPORT_CLASS
-  #define EXPTP_PANDAAWESOMIUM EXPORT_TEMPL
-#else
-  #define EXPCL_PANDAAWESOMIUM IMPORT_CLASS
-  #define EXPTP_PANDAAWESOMIUM IMPORT_TEMPL
-#endif
-
 #ifdef BUILDING_PANDAGL
   #define EXPCL_PANDAGL EXPORT_CLASS
   #define EXPTP_PANDAGL EXPORT_TEMPL