diff --git a/.travis.yml b/.travis.yml
index 26088946eb..92732bb929 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,12 +4,12 @@ compiler:
   - clang
 before_script:
   - sudo apt-get install python-dev libpng-dev zlib1g-dev libssl-dev libx11-dev libgl1-mesa-dev libxrandr-dev libxxf86dga-dev libxcursor-dev bison flex libfreetype6-dev libvorbis-dev libjpeg-dev libopenal-dev libode-dev nvidia-cg-toolkit
-script: python makepanda/makepanda.py --everything --git-commit $TRAVIS_COMMIT
+script: python makepanda/makepanda.py --everything --git-commit $TRAVIS_COMMIT --installer
 notifications:
   irc:
     channels:
       - "chat.freenode.net#panda3d"
     on_success: change
-    on_failure: change
+    on_failure: always
     use_notice: true
     skip_join: true
diff --git a/direct/src/autorestart/Sources.pp b/direct/src/autorestart/Sources.pp
deleted file mode 100644
index a85fc78a17..0000000000
--- a/direct/src/autorestart/Sources.pp
+++ /dev/null
@@ -1,8 +0,0 @@
-#begin bin_target
-  // This program only compiles on Unix.
-  #define BUILD_TARGET $[UNIX_PLATFORM]
-  #define C++FLAGS -DWITHIN_PANDA
-
-  #define TARGET autorestart
-  #define SOURCES autorestart.c
-#end bin_target
diff --git a/direct/src/autorestart/autorestart.c b/direct/src/autorestart/autorestart.c
deleted file mode 100644
index bfcad109de..0000000000
--- a/direct/src/autorestart/autorestart.c
+++ /dev/null
@@ -1,901 +0,0 @@
-/* Filename: autorestart.c
- * Created by:  drose (05Sep02)
- *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- * 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."
- *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-#ifdef WITHIN_PANDA
-#include "dtoolbase.h"
-#endif
-
-#include <getopt.h>
-#include <stdio.h>
-#include <errno.h>
-#include <string.h>  /* for strerror */
-#include <unistd.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <time.h>
-#include <signal.h>
-#include <stdlib.h>
-#include <assert.h>
-#include <pwd.h>
-#include <grp.h>
-
-#ifdef HAVE_LIBCURL
-#include <curl/curl.h>
-#endif
-
-/* The maximum number of seconds to wait for a process to go away
-   after issuing SIGTERM.  This is only used in watchdog mode, when -W
-   is provided on the command line. */
-#define MAX_WAITTERM_SEC 10
-
-char **params = NULL;
-char *logfile_name = NULL;
-char *pidfile_name = NULL;
-int dont_fork = 0;
-char *watchdog_url = NULL;
-int watchdog_start_sec = 0;
-int watchdog_cycle_sec = 0;
-int watchdog_timeout_sec = 0;
-char *startup_username = NULL;
-char *startup_groupname = NULL;
-char *startup_chdir = NULL;
-int logfile_fd = -1;
-int stop_on_terminate = 0;
-int stop_always = 0;
-char *respawn_script = NULL;
-int respawn_count_time = 0;
-
-/* If requested, delay these many seconds between restart attempts */
-int respawn_delay_time = 5;
-
-
-/* We shouldn't respawn more than (spam_respawn_count - 1) times over
-   spam_respawn_time seconds. */
-int spam_respawn_count = 5;
-int spam_respawn_time = 60;
-int spam_restart_delay_time = 600;  /* Optionally, do not exit if we spam too much; simply sleep for this many seconds*/
-
-
-
-pid_t child_pid = 0;
-pid_t watchdog_pid = 0;
-
-#define TIME_BUFFER_SIZE 128
-
-/* Keep track of the frequency with which we respawn, so we can report
-   this to our respawn script. */
-typedef struct respawn_record_struct {
-  time_t _time;
-  struct respawn_record_struct *_next;
-} respawn_record;
-
-respawn_record *respawns = NULL;
-
-int
-record_respawn(time_t now) {
-  /* Records the respawning event in the respawn_record, and returns
-     the number of respawns in the last respawn_count_time
-     interval. */
-  respawn_record *rec;
-  respawn_record *next;
-  int count;
-
-  if (respawn_count_time <= 0) {
-    /* We're not tracking respawns if respawn_count_time is 0. */
-    return 0;
-  }
-
-  rec = (respawn_record *)malloc(sizeof(respawn_record));
-  rec->_time = now;
-  rec->_next = respawns;
-  respawns = rec;
-
-  /* Now walk through the rest of the list and count up the number of
-     respawn events until we reach a record more than
-     respawn_count_time seconds old. */
-  count = 0;
-  while (rec->_next != NULL &&
-         (now - rec->_time) <= respawn_count_time) {
-    rec = rec->_next;
-    count++;
-  }
-
-  /* The remaining respawn records get removed. */
-  next = rec->_next;
-  rec->_next = NULL;
-  while (next != NULL) {
-    rec = next;
-    next = rec->_next;
-    free(rec);
-  }
-
-  return count;
-}
-
-void
-invoke_respawn_script(time_t now) {
-  char buffer[32];
-  char *new_command;
-  int new_command_length;
-
-  /* The process is about to be respawned; run the script that we were
-     given on the command line. */
-  if (respawn_count_time <= 0) {
-    /* We're not counting respawn times, so just run the script
-       directly. */
-    system(respawn_script);
-
-  } else {
-    /* We are counting respawn times, so append that information as a
-       parameter to the command. */
-    sprintf(buffer, " %d", record_respawn(now));
-    new_command_length = strlen(respawn_script) + strlen(buffer);
-    new_command = (char *)malloc(new_command_length + 1);
-    strcpy(new_command, respawn_script);
-    strcat(new_command, buffer);
-    assert(strlen(new_command) == new_command_length);
-
-    system(new_command);
-
-    free(new_command);
-  }
-}
-
-/* A callback function passed to libcurl that simply discards the data
-   retrieved from the server.  We only care about the HTTP status. */
-size_t 
-watchdog_bitbucket(void *ptr, size_t size, size_t nmemb, void *userdata) {
-  return size * nmemb;
-}
-
-/* Waits up to timeout_ms for a particular child to terminate.
-   Returns 0 if the timeout expires. */
-pid_t 
-waitpid_timeout(pid_t child_pid, int *status_ptr, int timeout_ms) {
-  pid_t result;
-  struct timeval now, tv;
-  int now_ms, start_ms, elapsed_ms;
-  
-  gettimeofday(&now, NULL);
-  start_ms = now.tv_sec * 1000 + now.tv_usec / 1000;
-    
-  result = waitpid(child_pid, status_ptr, WNOHANG);
-  while (result == 0) {
-    gettimeofday(&now, NULL);
-    now_ms = now.tv_sec * 1000 + now.tv_usec / 1000;
-    elapsed_ms = now_ms - start_ms;
-    
-    if (elapsed_ms > timeout_ms) {
-      /* Tired of waiting. */
-      return 0;
-    }
-    
-    /* Yield the timeslice and wait some more. */
-    tv.tv_sec = 0;
-    tv.tv_usec = 1;
-    select(0, NULL, NULL, NULL, &tv);
-    result = waitpid(child_pid, status_ptr, WNOHANG);
-  }
-  if (result == -1) {
-    perror("waitpid");
-  }
-
-  return result;
-}
-
-
-/* Poll the requested URL until a failure or timeout occurs, or until
-   the child terminates on its own.  Returns 1 on HTTP failure or
-   timeout, 0 on self-termination.  In either case, *status_ptr is
-   filled in with the status value returned by waitpid().*/
-int 
-do_watchdog(int *status_ptr) {
-#ifndef HAVE_LIBCURL
-  fprintf(stderr, "Cannot watchdog; no libcurl available.\n");
-  return 0;
-#else  /* HAVE_LIBCURL */
-
-  CURL *curl;
-  CURLcode res;
-  char error_buffer[CURL_ERROR_SIZE];
-  pid_t wresult;
-
-  // Before we start polling the URL, wait at least start milliseconds.
-  wresult = waitpid_timeout(child_pid, status_ptr, watchdog_start_sec * 1000);
-  if (wresult == child_pid) {
-    // The child terminated on its own before we got started.
-    return 0;
-  }
-
-  curl = curl_easy_init();
-  if (!curl) {
-    fprintf(stderr, "Cannot watchdog; curl failed to init.\n");
-    return 0;
-  }
-
-  curl_easy_setopt(curl, CURLOPT_URL, watchdog_url);
-  /*curl_easy_setopt(curl, CURLOPT_VERBOSE, 1);*/
-  curl_easy_setopt(curl, CURLOPT_TIMEOUT_MS, watchdog_timeout_sec * 1000);
-  curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, watchdog_bitbucket);
-  curl_easy_setopt(curl, CURLOPT_ERRORBUFFER, error_buffer);
-  curl_easy_setopt(curl, CURLOPT_USERAGENT, "autorestart");
-  curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1);
-  curl_easy_setopt(curl, CURLOPT_FRESH_CONNECT, 1);
-  curl_easy_setopt(curl, CURLOPT_FORBID_REUSE, 1);
-
-  res = curl_easy_perform(curl);
-  while (res == 0) {
-    /* 0: The HTTP request finished successfully (but might or might
-       not have returned an error code like a 404). */
-    long http_response = 0;
-    curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &http_response);
-    if ((http_response / 100) != 2) {
-      /* Anything in the 200 range is deemed success.  Anything else
-         is deemed failure. */
-      fprintf(stderr, "%s returned %ld\n", watchdog_url, http_response);
-      break;
-    }
-
-    wresult = waitpid_timeout(child_pid, status_ptr, watchdog_cycle_sec * 1000);
-    if (wresult == child_pid) {
-      /* The process terminated on its own.  Return 0 to indicate this. */
-      return 0;
-    }
-
-    res = curl_easy_perform(curl);
-  }
-
-  curl_easy_cleanup(curl);
-
-  /* Failed to retrieve the watchdog URL. */
-  if (res != 0) {
-    fprintf(stderr, "Failed to contact %s: %s\n", watchdog_url, error_buffer);
-  }
-  
-  /* Kill the child process and wait for it to go away. */
-  kill(child_pid, SIGTERM);
-
-  pid_t result = waitpid_timeout(child_pid, status_ptr, MAX_WAITTERM_SEC * 1000);
-  if (result != child_pid) {
-    if (result == -1) {
-      perror("waitpid");
-    } else {
-      /* SIGTERM didn't make the process die.  Try SIGKILL. */
-      fprintf(stderr, "Force-killing child process\n");
-      kill(child_pid, SIGKILL);
-      result = waitpid_timeout(child_pid, status_ptr, MAX_WAITTERM_SEC * 1000);
-      if (result == -1) {
-        perror("waitpid");
-      }
-    }
-  }
-
-  /* Return 1 to indicate we killed the child due to an HTTP error. */
-  return 1;
-#endif  /* HAVE_LIBCURL */
-}
-
-void
-exec_process() {
-  /* First, output the command line to the log file. */
-  char **p;
-  for (p = params; *p != NULL; ++p) {
-    fprintf(stderr, "%s ", *p);
-  }
-  fprintf(stderr, "\n");
-  execvp(params[0], params);
-  fprintf(stderr, "Cannot exec %s: %s\n", params[0], strerror(errno));
-
-  /* Exit with a status of 0, to indicate to the parent process that
-     we should stop. */
-  exit(0); 
-}
-
-int
-spawn_process() {
-  /* Spawns the child process.  Returns true if the process terminated
-     by itself and should be respawned, false if it was explicitly
-     killed (or some other error condition exists), and it should not
-     respawn any more. */
-  pid_t wresult;
-  int status;
-  int error_exit;
-
-  child_pid = fork();
-  if (child_pid < 0) {
-    /* Fork error. */
-    perror("fork");
-    return 0;
-  }
-
-  if (child_pid == 0) {
-    /* Child.  Exec the process. */
-    fprintf(stderr, "Child pid is %d.\n", getpid());
-    exec_process();
-    /* Shouldn't get here. */
-    exit(1);
-  }
-
-  /* Parent. */
-
-  error_exit = 0;
-
-  if (watchdog_url != NULL) {
-    /* If we're watchdogging, then go check the URL.  This function
-       won't return until the URL fails or the child exits. */
-    error_exit = do_watchdog(&status);
-
-  } else {
-    /* If we're not watchdogging, then just wait for the child to
-       terminate, and diagnose the reason. */
-    wresult = waitpid(child_pid, &status, 0);
-    if (wresult < 0) {
-      perror("waitpid");
-      return 0;
-    }
-  }
-
-  /* Now that we've returned from waitpid, clear the child pid number
-     so our signal handler doesn't get too confused. */
-  child_pid = 0;
-
-  if (error_exit) {
-    /* An HTTP error exit is a reason to respawn. */
-    return 1;
-
-  } else if (WIFSIGNALED(status)) {
-    int signal = WTERMSIG(status);
-    fprintf(stderr, "\nprocess caught signal %d.\n\n", signal);
-    /* A signal exit is a reason to respawn unless the signal is TERM
-       or KILL. */
-    return !stop_on_terminate || (signal != SIGTERM && signal != SIGKILL);
-
-  } else {
-    int exit_status = WEXITSTATUS(status);
-    fprintf(stderr, "\nprocess exited with status %d.\n\n", WEXITSTATUS(status));
-    /* Normal exit is a reason to respawn if the status indicates failure. */
-    return !stop_on_terminate || (exit_status != 0);
-  }
-}
-
-void
-sigterm_handler() {
-  pid_t wresult;
-  int status;
-  time_t now;
-  char time_buffer[TIME_BUFFER_SIZE];
-
-  now = time(NULL);
-  strftime(time_buffer, TIME_BUFFER_SIZE, "%T on %A, %d %b %Y", localtime(&now));
-
-  fprintf(stderr, "\nsigterm caught at %s; shutting down.\n", time_buffer);
-  if (child_pid == 0) {
-    fprintf(stderr, "no child process.\n\n");
-
-  } else {
-    kill(child_pid, SIGTERM);
-
-    wresult = waitpid(child_pid, &status, 0);
-    if (wresult < 0) {
-      perror("waitpid");
-    } else {
-      fprintf(stderr, "child process terminated.\n\n");
-    }
-  }
-  exit(1);
-}
-
-void
-sighup_handler() {
-  time_t now;
-  char time_buffer[TIME_BUFFER_SIZE];
-
-  now = time(NULL);
-  strftime(time_buffer, TIME_BUFFER_SIZE, "%T on %A, %d %b %Y", localtime(&now));
-
-  fprintf(stderr, "\nsighup caught at %s.\n", time_buffer);
-  if (child_pid == 0) {
-    fprintf(stderr, "no child process.\n\n");
-
-  } else {
-    kill(child_pid, SIGHUP);
-  }
-}
-
-void 
-sigalarm_handler() {
-  fprintf(stderr, "sleep epoch was complete.\n");
-}
-
-void
-do_autorestart() {
-  char time_buffer[TIME_BUFFER_SIZE];
-  time_t now;
-  time_t *spam_respawn = NULL;
-  int sri, num_sri;
-  struct sigaction sa;
-
-  if (spam_respawn_count > 1) {
-    spam_respawn = (time_t *)malloc(sizeof(time_t) * spam_respawn_count);
-  }
-
-  /* Make our process its own process group. */
-  setpgid(0, 0);
-
-  /* Set up a signal handler to trap SIGTERM. */
-  sa.sa_handler = sigterm_handler;
-  sigemptyset(&sa.sa_mask);
-  sa.sa_flags = 0;
-  if (sigaction(SIGTERM, &sa, NULL) < 0) {
-    perror("sigaction");
-  }
-
-  /* Set up a signal handler to trap SIGHUP.  We pass this into the
-     child. */
-  sa.sa_handler = sighup_handler;
-  sigemptyset(&sa.sa_mask);
-  sa.sa_flags = 0;
-  if (sigaction(SIGHUP, &sa, NULL) < 0) {
-    perror("sigaction");
-  }
-
-  if (logfile_fd >= 0) {
-    /* If we have a logfile, dup it onto stdout and stderr. */
-    dup2(logfile_fd, STDOUT_FILENO);
-    dup2(logfile_fd, STDERR_FILENO);
-    close(logfile_fd);
-  }
-
-  /* Make sure stdin is closed. */
-  close(STDIN_FILENO);
-
-  now = time(NULL);
-  strftime(time_buffer, TIME_BUFFER_SIZE, "%T on %A, %d %b %Y", localtime(&now));
-  fprintf(stderr, "autorestart begun at %s.\n", time_buffer);
-
-  if (pidfile_name != NULL) {
-    unlink(pidfile_name);
-    FILE *pidfile = fopen(pidfile_name, "w");
-    if (pidfile == NULL) {
-      fprintf(stderr, "Could not write pidfile %s\n", pidfile_name);
-    } else {
-      fprintf(pidfile, "%d\n", getpid());
-      fclose(pidfile);
-    }
-  }
-
-  sri = 1;
-  num_sri = 1;
-  if (spam_respawn_count > 1) {
-    spam_respawn[1] = now;
-  }
-  
-  while (spawn_process()) {
-    now = time(NULL);
-
-    if (respawn_script != NULL) {
-      invoke_respawn_script(now);
-    }
-    
-    if (respawn_delay_time) {
-      sleep(respawn_delay_time);
-    }
-
-    /* Make sure we're not respawning too fast. */
-    if (spam_respawn_count > 1) {
-      sri = (sri + 1) % spam_respawn_count;
-      spam_respawn[sri] = now;
-      if (num_sri < spam_respawn_count) {
-        num_sri++;
-      } else {
-        time_t last = spam_respawn[(sri + 1) % spam_respawn_count];
-        if (now - last < spam_respawn_time) 
-        {
-          if(!spam_restart_delay_time) 
-          {
-            fprintf(stderr, "respawning too fast, giving up.\n");
-            break;
-          } 
-          else 
-          {
-            num_sri = 1; /* reset num_sri */
-            fprintf(stderr, "respawning too fast, will sleep for %d seconds.\n", spam_restart_delay_time);
-            signal (SIGALRM, sigalarm_handler);
-            alarm(spam_restart_delay_time);
-            pause();
-            signal (SIGALRM, SIG_IGN);
-          }
-        }
-      }
-    }
-    
-    if (stop_always) {
-      fprintf(stderr, "instructed to not autorestart, exiting.\n");
-      break;
-    }
-      
-    strftime(time_buffer, TIME_BUFFER_SIZE, "%T on %A, %d %b %Y", localtime(&now));
-    fprintf(stderr, "respawning at %s.\n", time_buffer);
-  }
-
-  now = time(NULL);
-  strftime(time_buffer, TIME_BUFFER_SIZE, "%T on %A, %d %b %Y", localtime(&now));
-  fprintf(stderr, "autorestart terminated at %s.\n", time_buffer);
-  exit(0);
-}
-
-void
-double_fork() {
-  pid_t child, grandchild, wresult;
-  int status;
-
-  /* Fork once, then again, to disassociate the child from the command
-     shell process group. */
-  child = fork();
-  if (child < 0) {
-    /* Failure to fork. */
-    perror("fork");
-    exit(1);
-  }
-
-  if (child == 0) {
-    /* Child.  Fork again. */
-    grandchild = fork();
-    if (grandchild < 0) {
-      perror("fork");
-      exit(1);
-    }
-
-    if (grandchild == 0) {
-      /* Grandchild.  Begin useful work. */
-      do_autorestart();
-      /* Shouldn't get here. */
-      exit(1);
-    }
-
-    /* Child.  Report the new pid, then terminate gracefully. */
-    fprintf(stderr, "Spawned, monitoring pid is %d.\n", grandchild);
-    exit(0);
-  }
-
-  /* Parent.  Wait for the child to terminate, then return. */
-  wresult = waitpid(child, &status, 0);
-  if (wresult < 0) {
-    perror("waitpid");
-    exit(1);
-  }
-
-  if (!WIFEXITED(status)) {
-    if (WIFSIGNALED(status)) {
-      fprintf(stderr, "child caught signal %d unexpectedly.\n", WTERMSIG(status));
-    } else {
-      fprintf(stderr, "child exited with status %d.\n", WEXITSTATUS(status));
-    }
-    exit(1);
-  }
-}
-
-void
-usage() {
-  fprintf(stderr,
-          "\n"
-          "autorestart [opts] program [args . . . ]\n"
-          "autorestart -h\n\n");
-}
-
-void
-help() {
-  usage();
-  fprintf(stderr,
-          "This program is used to run a program as a background task and\n"
-          "automatically restart it should it terminate for any reason other\n"
-          "than normal exit or explicit user kill.\n\n"
-
-          "If the program exits with a status of 0, indicating successful\n"
-          "completion, it is not restarted.\n\n"
-
-          "If the program is terminated via a TERM or KILL signal (e.g. via\n"
-          "kill [pid] or kill -9 [pid]), it is assumed the user meant for the\n"
-          "process to stop, and it is not restarted.\n\n"
-
-          "Options:\n\n"
-
-          "  -l logfilename\n"
-          "     Route stdout and stderr from the child process into the indicated\n"
-          "     log file.\n\n"
-
-          "  -p pidfilename\n"
-          "     Write the pid of the monitoring process to the indicated pidfile.\n\n"
-          "  -f\n"
-          "     Don't fork autorestart itself; run it as a foreground process. \n"
-          "     (Normally, autorestart forks itself to run as a background process.)\n"
-          "     In this case, the file named by -p is not used.\n\n"
-          
-          "  -n\n"
-          "     Do not attempt to restart the process under any circumstance.\n"
-          "     The program can still be used to execute a script on abnormal\n"
-          "     process termination.\n\n"
-
-          "  -t\n"
-          "     Stop on terminate: don't restart if the child process exits\n"
-          "     normally or is killed with a SIGTERM.  With this flag, the\n"
-          "     child process will be restarted only if it exits with a\n"
-          "     non-zero exit status, or if it is killed with a signal other\n"
-          "     than SIGTERM.  Without this flag, the default behavior is to\n"
-          "     restart the child process if it exits for any reason.\n\n"
-
-          "  -r count,secs,sleep\n"
-          "     Sleep 'sleep' seconds if the process respawns 'count' times\n"
-          "     within 'secs' seconds.  This is designed to prevent respawning\n"
-          "     from using too many system resources if something is wrong with\n"
-          "     the child process.  The default value is %d,%d,%d. Use -r 0,0,0\n"
-          "     to disable this feature.\n\n"
-
-          "  -s \"command\"\n"
-          "     Run the indicated command or script each time the process is\n"
-          "     respawned, using the system() call.  This may be useful, for\n"
-          "     instance, to notify an operator via email each time a respawn\n"
-          "     occurs.  If -c is also specified, an additional parameter will\n"
-          "     be appended to the command, indicating the number of times the\n"
-          "     respawn has occurred in the given time interval.\n\n"
-
-          "  -c secs\n"
-          "     Specifies the number of seconds over which to count respawn events\n"
-          "     for the purposes of passing an argument to the script named with\n"
-          "     -s.\n\n"
-
-          "  -d secs\n"
-          "     Specifies the number of seconds to delay for between restarts.\n"
-          "     The default is %d.\n\n"
-
-#ifdef HAVE_LIBCURL
-          "  -W watchdog_url,start,cycle,timeout\n"
-          "     Specifies an optional URL to watch while waiting for the process\n"
-          "     to terminate.  If this is specified, autorestart will start the process,\n"
-          "     wait start seconds, and then repeatedly poll the indicated URL\n"
-          "     every cycle seconds.  If a HTTP failure code is detected,\n"
-          "     or no response is received within timeout seconds, then the\n"
-          "     child is terminated and restarted.  The start, cycle, and timeout\n"
-          "     parameters are all required.\n\n"
-#endif  /* HAVE_LIBCURL */
-
-          "  -U username\n"
-          "     Change to the indicated user upon startup.  The logfile is still\n"
-          "     created as the initial user.\n\n"
-
-          "  -G groupname\n"
-          "     Change to the indicated group upon startup.\n\n"
-
-          "  -D dirname\n"
-          "     Change to the indicated working directory upon startup.  The logfile\n"
-          "     is still created relative to the initial startup directory.\n\n"
-
-          "  -h\n"
-          "     Output this help information.\n\n",
-          spam_respawn_count, spam_respawn_time, spam_restart_delay_time, respawn_delay_time);
-}
-
-void
-parse_int_triplet(char *param, int *a, int *b, int *c) {
-  char *comma;
-  char *comma2;
-  
-  comma = strchr(param, ',');
-  if (comma == NULL) {
-    fprintf(stderr, "Comma required: %s\n", param);
-    exit(1);
-  }
-
-  comma2 = strchr(comma+1, ',');
-  if (comma2 == NULL) {
-    fprintf(stderr, "Second comma required: %s\n", param);
-    exit(1);
-  }
-
-  *comma = '\0';
-  *comma2 = '\0';
-  
-  *a = atoi(param);
-  *b = atoi(comma + 1);
-  *c = atoi(comma2 + 1);
-}
-
-void 
-parse_watchdog(char *param) {
-  char *comma;
-  char *comma2;
-  char *comma3;
-
-#ifndef HAVE_LIBCURL
-  fprintf(stderr, "-W requires autorestart to have been compiled with libcurl support.\n");
-  exit(1);
-#endif  /* HAVE_LIBCURL */
-
-  comma = strrchr(param, ',');
-  if (comma == NULL) {
-    fprintf(stderr, "Comma required: %s\n", param);
-    exit(1);
-  }
-  *comma = '\0';
-
-  comma2 = strrchr(param, ',');
-  if (comma2 == NULL) {
-    *comma = ',';
-    fprintf(stderr, "Second comma required: %s\n", param);
-    exit(1);
-  }
-  *comma2 = '\0';
-
-  comma3 = strrchr(param, ',');
-  if (comma3 == NULL) {
-    *comma = ',';
-    *comma2 = ',';
-    fprintf(stderr, "Third comma required: %s\n", param);
-    exit(1);
-  }
-  *comma3 = '\0';
-
-  watchdog_url = param;
-  watchdog_start_sec = atoi(comma3 + 1);
-  watchdog_cycle_sec = atoi(comma2 + 1);
-  watchdog_timeout_sec = atoi(comma + 1);
-}
-
-
-int 
-main(int argc, char *argv[]) {
-  extern char *optarg;
-  extern int optind;
-  /* The initial '+' instructs GNU getopt not to reorder switches. */
-  static const char *optflags = "+l:p:fntr:s:c:d:W:U:G:D:h";
-  int flag;
-
-  flag = getopt(argc, argv, optflags);
-  while (flag != EOF) {
-    switch (flag) {
-    case 'l':
-      logfile_name = optarg;
-      break;
-
-    case 'p':
-      pidfile_name = optarg;
-      break;
-
-    case 'f':
-      dont_fork = 1;
-      break;
-
-    case 'n':
-      stop_always = 1;
-      break;
-
-    case 't':
-      stop_on_terminate = 1;
-      break;
-
-    case 'r':
-      parse_int_triplet(optarg, &spam_respawn_count, &spam_respawn_time, &spam_restart_delay_time);
-      break;
-
-    case 's':
-      respawn_script = optarg;
-      break;
-
-    case 'c':
-      respawn_count_time = atoi(optarg);
-      break;
-
-    case 'd':
-      respawn_delay_time = atoi(optarg);
-      break;
-
-    case 'W':
-      parse_watchdog(optarg);
-      break;
-
-    case 'U':
-      startup_username = optarg;
-      break;
-
-    case 'G':
-      startup_groupname = optarg;
-      break;
-
-    case 'D':
-      startup_chdir = optarg;
-      break;
-      
-    case 'h':
-      help();
-      return 1;
-
-    case '?':
-    case '+':
-      usage();
-      return 1;
-
-    default:
-      fprintf(stderr, "Unhandled switch: -%c\n", flag);
-      return 1;
-    }
-    flag = getopt(argc, argv, optflags);
-  }
-
-  argc -= (optind - 1);
-  argv += (optind - 1);
-
-  if (argc < 2) {
-    fprintf(stderr, "No program to execute given.\n");
-    usage();
-    return 1;
-  }
-
-  params = &argv[1];
-
-  if (logfile_name != NULL) {
-    logfile_fd = open(logfile_name, O_WRONLY | O_CREAT | O_TRUNC, 0666);
-    if (logfile_fd < 0) {
-      fprintf(stderr, "Cannot write to logfile %s: %s\n", 
-              logfile_name, strerror(errno));
-      return 1;
-    }
-    fprintf(stderr, "Generating output to %s.\n", logfile_name);
-  }
-
-  if (startup_chdir != NULL) {
-    if (chdir(startup_chdir) != 0) {
-      perror(startup_chdir);
-      return 1;
-    }
-  }
-
-  if (startup_groupname != NULL) {
-    struct group *grp;
-    grp = getgrnam(startup_groupname);
-    if (grp == NULL) {
-      perror(startup_groupname);
-      return 1;
-    }
-
-    if (setgid(grp->gr_gid) != 0) {
-      perror(startup_groupname);
-      return 1;
-    }
-  }
-
-  if (startup_username != NULL) {
-    struct passwd *pwd;
-    pwd = getpwnam(startup_username);
-    if (pwd == NULL) {
-      perror(startup_username);
-      return 1;
-    }
-
-    if (setuid(pwd->pw_uid) != 0) {
-      perror(startup_username);
-      return 1;
-    }
-  }
-
-  if (dont_fork) {
-    do_autorestart();
-  } else {
-    double_fork();
-  }
-
-  return 0;
-}
-
diff --git a/direct/src/dcparser/dcPacker.cxx b/direct/src/dcparser/dcPacker.cxx
index 9be83fda34..c0e711ecc6 100755
--- a/direct/src/dcparser/dcPacker.cxx
+++ b/direct/src/dcparser/dcPacker.cxx
@@ -20,6 +20,10 @@
 #include "dcSwitchParameter.h"
 #include "dcClass.h"
 
+#ifdef HAVE_PYTHON
+#include "py_panda.h"
+#endif
+
 DCPacker::StackElement *DCPacker::StackElement::_deleted_chain = NULL;
 int DCPacker::StackElement::_num_ever_allocated = 0;
 
diff --git a/direct/src/dcparser/dcPacker.h b/direct/src/dcparser/dcPacker.h
index 0c7cfb58ab..bbbcb3e2d3 100755
--- a/direct/src/dcparser/dcPacker.h
+++ b/direct/src/dcparser/dcPacker.h
@@ -220,7 +220,7 @@ private:
   const DCPackerCatalog *_catalog;
   const DCPackerCatalog::LiveCatalog *_live_catalog;
 
-  class StackElement {
+  class EXPCL_DIRECT StackElement {
   public:
     // As an optimization, we implement operator new and delete here
     // to minimize allocation overhead during push() and pop().
diff --git a/direct/src/directnotify/Notifier.py b/direct/src/directnotify/Notifier.py
index eb91d5244e..2d59c5bf70 100644
--- a/direct/src/directnotify/Notifier.py
+++ b/direct/src/directnotify/Notifier.py
@@ -4,7 +4,7 @@ for the programmer/user
 """
 from LoggerGlobal import defaultLogger
 from direct.showbase import PythonUtil
-from panda3d.core import ConfigVariableBool
+from panda3d.core import ConfigVariableBool, NotifyCategory, StreamWriter, Notify
 import time
 import types
 import sys
@@ -18,9 +18,8 @@ class Notifier:
     # with the C++ notify system.
     streamWriter = None
     if ConfigVariableBool('notify-integrate', True):
-        from panda3d.core import StreamWriter, Notify
         streamWriter = StreamWriter(Notify.out(), False)
-        
+
     showTime = ConfigVariableBool('notify-timestamp', False)
 
     def __init__(self, name, logger=None):
@@ -44,9 +43,6 @@ class Notifier:
         self.__warning = 1
         self.__debug = 0
         self.__logging = 0
-        
-        
-
 
     def setServerDelta(self, delta, timezone):
         """
@@ -62,7 +58,6 @@ class Notifier:
         # The following call is necessary to make the output from C++
         # notify messages show the same timestamp as those generated
         # from Python-level notify messages.
-        from pandac.PandaModules import NotifyCategory
         NotifyCategory.setServerDelta(self.serverDelta)
 
         self.info("Notify clock adjusted by %s (and timezone adjusted by %s hours) to synchronize with server." % (PythonUtil.formatElapsedSeconds(delta), (time.timezone - timezone) / 3600))
@@ -92,7 +87,7 @@ class Notifier:
 
     # Severity funcs
     def setSeverity(self, severity):
-        from pandac.PandaModules import NSDebug, NSInfo, NSWarning, NSError
+        from panda3d.core import NSDebug, NSInfo, NSWarning, NSError
         if severity >= NSError:
             self.setWarning(0)
             self.setInfo(0)
@@ -111,7 +106,7 @@ class Notifier:
             self.setDebug(1)
 
     def getSeverity(self):
-        from pandac.PandaModules import NSDebug, NSInfo, NSWarning, NSError
+        from panda3d.core import NSDebug, NSInfo, NSWarning, NSError
         if self.getDebug():
             return NSDebug
         elif self.getInfo():
diff --git a/direct/src/directscripts/Doxyfile.python b/direct/src/directscripts/Doxyfile.python
index 32ba23481d..81b68dc6b2 100644
--- a/direct/src/directscripts/Doxyfile.python
+++ b/direct/src/directscripts/Doxyfile.python
@@ -643,8 +643,7 @@ RECURSIVE              = YES
 # excluded from the INPUT source files. This way you can easily exclude a 
 # subdirectory from a directory tree whose root is specified with the INPUT tag.
 
-EXCLUDE                = built/direct/test \
-                         built/direct/plugin \
+EXCLUDE                = built/direct/plugin \
                          built/direct/plugin_npapi \
                          built/direct/plugin_activex \
                          built/direct/plugin_installer \
diff --git a/direct/src/directscripts/profilepaths-osx.command b/direct/src/directscripts/profilepaths-osx.command
old mode 100644
new mode 100755
diff --git a/direct/src/distributed/cConnectionRepository.cxx b/direct/src/distributed/cConnectionRepository.cxx
index 75bde7d1d0..1216d85758 100644
--- a/direct/src/distributed/cConnectionRepository.cxx
+++ b/direct/src/distributed/cConnectionRepository.cxx
@@ -26,11 +26,7 @@
 #include "pStatTimer.h"
 
 #ifdef HAVE_PYTHON
-#ifndef CPPPARSER
-#include "py_panda.h"  
-IMPORT_THIS struct   Dtool_PyTypedObject Dtool_DatagramIterator;
-IMPORT_THIS struct   Dtool_PyTypedObject Dtool_DCClass;
-#endif
+#include "py_panda.h"
 #endif
 
 const string CConnectionRepository::_overflow_event_name = "CRDatagramOverflow";
@@ -42,14 +38,13 @@ PStatCollector CConnectionRepository::_update_pcollector("App:Show code:readerPo
 ////////////////////////////////////////////////////////////////////
 //     Function: CConnectionRepository::Constructor
 //       Access: Published
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 CConnectionRepository::
 CConnectionRepository(bool has_owner_view, bool threaded_net) :
   _lock("CConnectionRepository::_lock"),
 #ifdef HAVE_PYTHON
   _python_repository(NULL),
-  _python_ai_datagramiterator(NULL),
 #endif
 #ifdef HAVE_OPENSSL
   _http_conn(NULL),
@@ -82,19 +77,12 @@ CConnectionRepository(bool has_owner_view, bool threaded_net) :
   }
 #endif
   _tcp_header_size = tcp_header_size;
-
-#ifdef HAVE_PYTHON
-  PyObject *  PyDitterator = DTool_CreatePyInstance(&_di,Dtool_DatagramIterator,false,false);
-  if(PyDitterator != NULL)
-      _python_ai_datagramiterator = Py_BuildValue("(O)",PyDitterator);
-#endif
-
 }
 
 ////////////////////////////////////////////////////////////////////
 //     Function: CConnectionRepository::Destructor
 //       Access: Published
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 CConnectionRepository::
 ~CConnectionRepository() {
@@ -182,7 +170,7 @@ try_connect_net(const URLSpec &url) {
 
   disconnect();
 
-  _net_conn = 
+  _net_conn =
     _qcm.open_TCP_client_connection(url.get_server(), url.get_port(),
                                     game_server_timeout_ms);
 
@@ -315,7 +303,7 @@ check_datagram() {
         _msg_channels.push_back(schan);
       }
       _msg_sender = _di.get_uint64();
-      
+
 #ifdef HAVE_PYTHON
       // For now, we need to stuff this field onto the Python
       // structure, to support legacy code that expects to find it
@@ -361,7 +349,7 @@ check_datagram() {
       }
       break;
 #endif  // HAVE_PYTHON
-      
+
     default:
       // Some unknown message; let the caller deal with it.
       return true;
@@ -372,9 +360,6 @@ check_datagram() {
   return false;
 }
 
-
-
-
 ////////////////////////////////////////////////////////////////////
 //     Function: CConnectionRepository::is_connected
 //       Access: Published
@@ -745,7 +730,7 @@ handle_update_field() {
 
   PStatTimer timer(_update_pcollector);
   unsigned int do_id = _di.get_uint32();
-  if (_python_repository != (PyObject *)NULL) 
+  if (_python_repository != (PyObject *)NULL)
   {
     PyObject *doId2do =
       PyObject_GetAttrString(_python_repository, "doId2do");
@@ -794,9 +779,9 @@ handle_update_field() {
       // method might get into trouble if it tried to delete the
       // object from the doId2do map.
       Py_INCREF(distobj);
-      dclass->receive_update(distobj, _di); 
+      dclass->receive_update(distobj, _di);
       Py_DECREF(distobj);
-      
+
       if (PyErr_Occurred()) {
 #if defined(HAVE_THREADS) && !defined(SIMPLE_THREADS)
         PyGILState_Release(gstate);
@@ -810,7 +795,7 @@ handle_update_field() {
 #if defined(HAVE_THREADS) && !defined(SIMPLE_THREADS)
   PyGILState_Release(gstate);
 #endif
-  #endif  // HAVE_PYTHON  
+  #endif  // HAVE_PYTHON
   return true;
 }
 
@@ -880,9 +865,9 @@ handle_update_field_owner() {
         // make a copy of the datagram iterator so that we can use the main
         // iterator for the non-owner update
         DatagramIterator _odi(_di);
-        dclass->receive_update(distobjOV, _odi); 
+        dclass->receive_update(distobjOV, _odi);
         Py_DECREF(distobjOV);
-      
+
         if (PyErr_Occurred()) {
 #if defined(HAVE_THREADS) && !defined(SIMPLE_THREADS)
           PyGILState_Release(gstate);
@@ -919,9 +904,9 @@ handle_update_field_owner() {
         // method might get into trouble if it tried to delete the
         // object from the doId2do map.
         Py_INCREF(distobj);
-        dclass->receive_update(distobj, _di); 
+        dclass->receive_update(distobj, _di);
         Py_DECREF(distobj);
-      
+
         if (PyErr_Occurred()) {
 #if defined(HAVE_THREADS) && !defined(SIMPLE_THREADS)
           PyGILState_Release(gstate);
@@ -935,7 +920,7 @@ handle_update_field_owner() {
 #if defined(HAVE_THREADS) && !defined(SIMPLE_THREADS)
   PyGILState_Release(gstate);
 #endif
-#endif  // HAVE_PYTHON  
+#endif  // HAVE_PYTHON
 
   return true;
 }
@@ -948,17 +933,17 @@ handle_update_field_owner() {
 //               output stream.
 ////////////////////////////////////////////////////////////////////
 void CConnectionRepository::
-describe_message(ostream &out, const string &prefix, 
+describe_message(ostream &out, const string &prefix,
                  const Datagram &dg) const {
   DCPacker packer;
-  
+
   packer.set_unpack_data(dg.get_message());
   CHANNEL_TYPE do_id;
   int msg_type;
   bool is_update = false;
   string full_prefix = "CR::" + prefix;
 
-  if (!_client_datagram) 
+  if (!_client_datagram)
   {
     unsigned char mcnt = packer.raw_unpack_uint8();
     for( ;mcnt > 0; mcnt--)
@@ -967,7 +952,7 @@ describe_message(ostream &out, const string &prefix,
     packer.RAW_UNPACK_CHANNEL();  // msg_sender
     msg_type = packer.raw_unpack_uint16();
     is_update = (msg_type == STATESERVER_OBJECT_SET_FIELD);
-    
+
   } else {
     msg_type = packer.raw_unpack_uint16();
     is_update = (msg_type == CLIENT_OBJECT_SET_FIELD);
@@ -1045,12 +1030,12 @@ describe_message(ostream &out, const string &prefix,
         Py_DECREF(dclass_this);
       }
     }
-    #endif  // HAVE_PYTHON  
+    #endif  // HAVE_PYTHON
 
     int field_id = packer.raw_unpack_uint16();
 
     if (dclass == (DCClass *)NULL) {
-      out << full_prefix << "update for unknown object " << do_id 
+      out << full_prefix << "update for unknown object " << do_id
           << ", field " << field_id << "\n";
 
     } else {
@@ -1059,7 +1044,7 @@ describe_message(ostream &out, const string &prefix,
       DCField *field = dclass->get_field_by_index(field_id);
       if (field == (DCField *)NULL) {
         out << "unknown field " << field_id << "\n";
-        
+
       } else {
         out << field->get_name();
         packer.begin_unpack(field);
@@ -1070,148 +1055,3 @@ describe_message(ostream &out, const string &prefix,
     }
   }
 }
-
-
-
-
-#ifdef HAVE_PYTHON
-#ifdef WANT_NATIVE_NET
-
-bool CConnectionRepository::network_based_reader_and_yielder(PyObject *PycallBackFunction,ClockObject &clock, float returnBy)
-{
-  ReMutexHolder holder(_lock);
-    while(is_connected())
-    {        
-        check_datagram_ai(PycallBackFunction);
-        if(is_connected())
-            _bdc.Flush();
-        float currentTime = clock.get_real_time();
-        float dif_time = returnBy - currentTime;
-        if(dif_time <= 0.001) // to avoi over runs..
-            break;
-        if(is_connected())
-            _bdc.WaitForNetworkReadEvent(dif_time);
-    }
-    return false;
-}
-
-bool CConnectionRepository::check_datagram_ai(PyObject *PycallBackFunction)
-{
-  ReMutexHolder holder(_lock);
-    // these could be static .. not 
-  PyObject *doId2do = NULL; 
-  float startTime =0;
-  float endTime = 0;
-  // this seems weird...here
-  _bdc.Flush();
-  while (_bdc.GetMessage(_dg))
-  { 
-      if (get_verbose()) 
-          describe_message(nout, "RECV", _dg);
-
-      if (_time_warning > 0) 
-        startTime = ClockObject::get_global_clock()->get_real_time();
-
-      // Start breaking apart the datagram.
-      _di.assign(_dg);
-      unsigned char  wc_cnt = _di.get_uint8();
-      _msg_channels.clear();
-      for(unsigned char lp1 = 0; lp1 < wc_cnt; lp1++)
-          _msg_channels.push_back(_di.get_uint64());
-
-      _msg_sender = _di.get_uint64();
-      _msg_type = _di.get_uint16();
-
-      if( _msg_type == STATESERVER_OBJECT_SET_FIELD)
-      {
-          if(doId2do == NULL)
-          {
-              // this is my attemp to take it out of the inner loop  RHH
-              doId2do =PyObject_GetAttrString(_python_repository, "doId2do");
-              nassertr(doId2do != NULL, false);
-          }
-
-          if (!handle_update_field_ai(doId2do)) 
-          {
-              Py_XDECREF(doId2do);
-              if (_time_warning > 0) {
-                endTime = ClockObject::get_global_clock()->get_real_time(); 
-                if ( _time_warning < (endTime - startTime)) {
-                  nout << "msg " << _msg_type <<" from " << _msg_sender << " took "<<  (endTime-startTime) << "secs to process\n";
-                  _dg.dump_hex(nout,2);
-                }
-              }
-              return false; 
-          }
-      }
-      else
-      {
-          PyObject * result = PyEval_CallObject(PycallBackFunction, _python_ai_datagramiterator);
-          if (PyErr_Occurred()) 
-          {        
-              Py_XDECREF(doId2do);
-              if (_time_warning > 0) {
-                endTime = ClockObject::get_global_clock()->get_real_time(); 
-                if ( _time_warning < (endTime - startTime)) {
-                  nout << "msg " << _msg_type <<" from " << _msg_sender << " took "<<  (endTime-startTime) << "secs to process\n";
-                  _dg.dump_hex(nout,2);                
-                }
-              }
-              return true;
-          }
-      }
-
-      if (_time_warning > 0) {
-        endTime = ClockObject::get_global_clock()->get_real_time(); 
-        if ( _time_warning < (endTime - startTime)) {
-          nout << "msg " << _msg_type <<" from " << _msg_sender << " took "<<  (endTime-startTime) << "secs to process\n";
-          _dg.dump_hex(nout,2);   
-        }
-      }
-             
-  }
-
-
-  Py_XDECREF(doId2do);
-  return false;
-}
-
-#endif  // #ifdef WANT_NATIVE_NET
-#endif  // #ifdef HAVE_PYTHON
-
-
-#ifdef HAVE_PYTHON
-#ifdef WANT_NATIVE_NET
-
-
-bool CConnectionRepository::handle_update_field_ai(PyObject *doId2do) 
-{
-  PStatTimer timer(_update_pcollector);
-  unsigned int do_id = _di.get_uint32();
- 
-  PyObject *doId = PyLong_FromUnsignedLong(do_id);
-  PyObject *distobj = PyDict_GetItem(doId2do, doId);
-  Py_DECREF(doId);
-
-  if (distobj != NULL)
-  {
-      PyObject *dclass_obj = PyObject_GetAttrString(distobj, "dclass");
-      nassertr(dclass_obj != NULL, false);
-
-      DCClass *dclass = NULL;
-      DTOOL_Call_ExtractThisPointerForType(dclass_obj, &Dtool_DCClass, (void **) &dclass);
-      if(dclass == NULL)
-          return false;
-
-      Py_INCREF(distobj);
-      dclass->receive_update(distobj, _di); 
-      Py_DECREF(distobj);
-
-      if (PyErr_Occurred()) 
-          return false;
-  }
-  return true;
-}
-
-#endif  // #ifdef WANT_NATIVE_NET
-#endif  // #ifdef HAVE_PYTHON
diff --git a/direct/src/distributed/cConnectionRepository.h b/direct/src/distributed/cConnectionRepository.h
index d7adac4714..06f581764c 100644
--- a/direct/src/distributed/cConnectionRepository.h
+++ b/direct/src/distributed/cConnectionRepository.h
@@ -100,7 +100,7 @@ PUBLISHED:
 #endif
 #ifdef HAVE_NET
   BLOCKING bool try_connect_net(const URLSpec &url);
-  
+
   INLINE QueuedConnectionManager &get_qcm();
   INLINE ConnectionWriter &get_cw();
   INLINE QueuedConnectionReader &get_qcr();
@@ -117,13 +117,7 @@ PUBLISHED:
 #endif
 
   BLOCKING bool check_datagram();
-#ifdef HAVE_PYTHON
-#ifdef WANT_NATIVE_NET
-  BLOCKING bool check_datagram_ai(PyObject *PycallBackFunction);
-  BLOCKING bool network_based_reader_and_yielder(PyObject *PycallBackFunction,ClockObject &clock, float returnBy);
-#endif
-#endif
-    
+
   BLOCKING INLINE void get_datagram(Datagram &dg);
   BLOCKING INLINE void get_datagram_iterator(DatagramIterator &di);
   BLOCKING INLINE CHANNEL_TYPE get_msg_channel(int offset = 0) const;
@@ -167,18 +161,11 @@ PUBLISHED:
   INLINE float get_time_warning() const;
 
 private:
-#ifdef HAVE_PYTHON
-#ifdef WANT_NATIVE_NET
-    bool handle_update_field_ai(PyObject *doId2do);
-#endif
-#endif
-
-
   bool do_check_datagram();
   bool handle_update_field();
   bool handle_update_field_owner();
 
-  void describe_message(ostream &out, const string &prefix, 
+  void describe_message(ostream &out, const string &prefix,
                         const Datagram &dg) const;
 
 private:
@@ -186,7 +173,6 @@ private:
 
 #ifdef HAVE_PYTHON
   PyObject *_python_repository;
-  PyObject *_python_ai_datagramiterator;
 #endif
 
 #ifdef HAVE_OPENSSL
diff --git a/direct/src/ffi/DoGenPyCode.py b/direct/src/ffi/DoGenPyCode.py
index 62b15585a1..5bb7cb56e7 100644
--- a/direct/src/ffi/DoGenPyCode.py
+++ b/direct/src/ffi/DoGenPyCode.py
@@ -143,7 +143,7 @@ def doGetopts():
             doSqueeze = False
         elif (flag == '-s'):
             deleteSourceAfterSqueeze = False
-            
+
         else:
             FFIConstants.notify.error('illegal option: ' + flag)
 
@@ -168,7 +168,7 @@ def doGetopts():
         if codeLib not in newLibs:
             newLibs.append(codeLib)
     codeLibs = newLibs
-        
+
 
 def doErrorCheck():
     global outputCodeDir
@@ -278,9 +278,9 @@ def generateNativeWrappers():
         # in the runtime (plugin) environment, where all libraries are
         # not necessarily downloaded.
         if sys.version_info >= (3, 0):
-            pandaModules.write('try:\n  from .%s import *\nexcept ImportError as err:\n  if "DLL loader cannot find" not in str(err):\n    raise\n' % (metaModuleName))
+            pandaModules.write('try:\n    from .%s import *\nexcept ImportError as err:\n    if "DLL loader cannot find" not in str(err):\n        raise\n' % (metaModuleName))
         else:
-            pandaModules.write('try:\n  from %s import *\nexcept ImportError, err:\n  if "DLL loader cannot find" not in str(err):\n    raise\n' % (metaModuleName))
+            pandaModules.write('try:\n    from %s import *\nexcept ImportError, err:\n    if "DLL loader cannot find" not in str(err):\n        raise\n' % (metaModuleName))
 
         # Not sure if this message is helpful or annoying.
         #pandaModules.write('  print("Failed to import %s")\n' % (moduleName))
@@ -306,7 +306,7 @@ def generateNativeWrappers():
                     extension = open(extensionFilename, 'r')
                     moduleModules.write(extension.read())
                     moduleModules.write('\n')
-        
+
 
 def run():
     global outputCodeDir
diff --git a/direct/src/filter/CommonFilters.py b/direct/src/filter/CommonFilters.py
index ee3de9ac8d..a561487e16 100644
--- a/direct/src/filter/CommonFilters.py
+++ b/direct/src/filter/CommonFilters.py
@@ -167,7 +167,7 @@ class CommonFilters:
                 auxbits |= AuxBitplaneAttrib.ABOGlow
 
             if ("VolumetricLighting" in configuration):
-                needtex[configuration["VolumetricLighting"].source] = True
+                needtex.add(configuration["VolumetricLighting"].source)
 
             for tex in needtex:
                 self.textures[tex] = Texture("scene-" + tex)
@@ -199,7 +199,7 @@ class CommonFilters:
                 self.ssao[0].setShaderInput("depth", self.textures["depth"])
                 self.ssao[0].setShaderInput("normal", self.textures["aux"])
                 self.ssao[0].setShaderInput("random", loader.loadTexture("maps/random.rgb"))
-                self.ssao[0].setShader(Shader.make(SSAO_BODY % configuration["AmbientOcclusion"].numsamples))
+                self.ssao[0].setShader(Shader.make(SSAO_BODY % configuration["AmbientOcclusion"].numsamples, Shader.SL_Cg))
                 self.ssao[1].setShaderInput("src", ssao0)
                 self.ssao[1].setShader(self.loadShader("filter-blurx.sha"))
                 self.ssao[2].setShaderInput("src", ssao1)
@@ -339,7 +339,7 @@ class CommonFilters:
                 text += "  o_color = float4(1, 1, 1, 1) - o_color;\n"
             text += "}\n"
             
-            self.finalQuad.setShader(Shader.make(text))
+            self.finalQuad.setShader(Shader.make(text, Shader.SL_Cg))
             for tex in self.textures:
                 self.finalQuad.setShaderInput("tx"+tex, self.textures[tex])
             
diff --git a/direct/src/heapq/Sources.pp b/direct/src/heapq/Sources.pp
deleted file mode 100755
index e072ecf367..0000000000
--- a/direct/src/heapq/Sources.pp
+++ /dev/null
@@ -1,29 +0,0 @@
-// DIR_TYPE "metalib" indicates we are building a shared library that
-// consists mostly of references to other shared libraries.  Under
-// Windows, this directly produces a DLL (as opposed to the regular
-// src libraries, which don't produce anything but a pile of OBJ files
-// under Windows).
-
-#define DIR_TYPE metalib
-
-// This directory strictly contains a Python utility; therefore, only
-// build it if we actually have Python.
-#define BUILD_DIRECTORY $[HAVE_PYTHON]
-
-
-#define OTHER_LIBS \
-  pandaexpress:m \
-  p3dconfig:c p3dtoolconfig:m \
-  p3dtoolutil:c p3dtoolbase:c p3prc:c p3dtool:m
-
-#begin metalib_target
-  #define TARGET p3heapq
-
-  // Tell ppremake to treat this file as if it had been generated via
-  // interrogate.  On OSX, this will move it into the .so, instead of
-  // the .dylib, so that it can be imported into Python.
-  #define PYTHON_MODULE_ONLY 1
-
-  #define SOURCES heapq.cxx
-#end metalib_target
-
diff --git a/direct/src/heapq/heapq.cxx b/direct/src/heapq/heapq.cxx
deleted file mode 100755
index dcfe34f4bd..0000000000
--- a/direct/src/heapq/heapq.cxx
+++ /dev/null
@@ -1,240 +0,0 @@
-
-/* Note: This module can probably go away when we upgrade to Python 2.4.
-   Python 2.3 has a heapq implementation, but it is in Python. This is
-   reported to be about 20x faster. In 2.4 they reimplemented heapq in C so
-   it should be comparable to this. At this time though, Python 2.4 is
-   still in alpha.
-   
-   Note: This code has been bastardized to only work on Tasks temporarily.
-
-*/
-
-#include <Python.h>
-
-/* Prototypes */
-static PyObject * heappush(PyObject *self, PyObject *args);
-static PyObject * heappop(PyObject *self, PyObject *args);
-static PyObject * heapreplace(PyObject *self, PyObject *args);
-static PyObject * heapify(PyObject *self, PyObject *args);
-static int _siftdown(PyObject *list, int startpos, int pos);
-static int _siftup(PyObject *list, int pos);
-
-#ifdef _WIN32
-extern "C" __declspec(dllexport) void initlibheapq(void);
-extern "C" __declspec(dllexport) void initlibp3heapq(void);
-#else
-extern "C" void initlibheapq();
-extern "C" void initlibp3heapq();
-#endif
-
-static PyObject *
-heappush(PyObject *self, PyObject *args) {
-    int len;
-    PyObject *list = NULL;
-    PyObject *node = NULL;
-    
-    if (!PyArg_ParseTuple(args,"O!O",&PyList_Type,&list,&node))
-        return NULL;
-
-    len = PyList_Size(list);
-    if (PyList_Append(list,node))
-        return NULL;
-    
-    if (_siftdown(list,0,len))
-        return NULL;
-    
-    Py_INCREF(Py_None);
-    return Py_None;
-}
-
-static PyObject *
-heappop(PyObject *self, PyObject *args) {
-    PyObject *list = NULL;
-    PyObject *node = NULL;
-    PyObject *returnNode = NULL;
-    int len;
-    
-    if (!PyArg_ParseTuple(args,"O!",&PyList_Type,&list))
-        return NULL;
-
-    len = PyList_Size(list);
-    if (len == 0) {
-        /* Special-case most common failure cause */
-        PyErr_SetString(PyExc_IndexError, "pop from empty list");
-        return NULL;
-    }
-
-    node = PySequence_GetItem(list,-1);
-    PySequence_DelItem(list,-1);
-
-    len -= 1;
-    if (len > 0) {
-        returnNode = PySequence_GetItem(list,0);
-        PyList_SetItem(list,0,node);
-        if (_siftup(list,0))
-            return NULL;
-    } else {
-        returnNode = node;
-    }
-    
-    return returnNode;
-}
-
-static PyObject * 
-heapreplace(PyObject *self, PyObject *args) {
-    PyObject *list = NULL;
-    PyObject *node = NULL;
-    PyObject *returnNode = NULL;
-    int len;
-    
-    if (!PyArg_ParseTuple(args,"O!O",&PyList_Type,&list,&node))
-        return NULL;
-
-    len = PyList_Size(list);
-    if (len == 0) {
-        /* Special-case most common failure cause */
-        PyErr_SetString(PyExc_IndexError, "replace on an empty list");
-        return NULL;
-    }
-
-    returnNode = PySequence_GetItem(list,0);
-    PySequence_SetItem(list,0,node);
-    if (_siftup(list,0))
-        return NULL;
-
-    return returnNode;
-}
-
-static PyObject *
-heapify(PyObject *self, PyObject *args) {
-    int n, i;
-    PyObject *list;
-
-    if (!PyArg_ParseTuple(args,"O!",&PyList_Type,&list))
-        return NULL;
-    n = (PyList_Size(list)/2)-1;
-    
-    for (i=n;i>=0;i--) {
-        if (_siftup(list,i))
-            return NULL;
-    }
-
-    Py_INCREF(Py_None);
-    return Py_None;
-}
-
-static int
-_siftdown(PyObject *list, int startpos, int pos) {
-    PyObject *newitem, *parent;
-    int parentpos;
-
-    newitem = PySequence_GetItem(list,pos);
-
-    PyObject *newitem_wakeTime_obj = PyObject_GetAttrString(newitem, "wakeTime");
-    double newitem_wakeTime = 0.0;
-    if (newitem_wakeTime_obj != NULL) {
-      newitem_wakeTime = PyFloat_AS_DOUBLE(newitem_wakeTime_obj);
-      Py_DECREF(newitem_wakeTime_obj);
-    }
-
-    while (pos > startpos) {
-        parentpos = (pos - 1) >> 1;
-        parent = PyList_GetItem(list,parentpos);
-
-        /*
-        cmp = PyObject_RichCompareBool(parent,newitem,Py_LE);
-        if (cmp > 0)
-            break;
-        else if (cmp < 0)
-            return -1;
-        */
-
-        PyObject *parent_wakeTime_obj = PyObject_GetAttrString(parent, "wakeTime");
-        double parent_wakeTime = 0.0;
-        if (parent_wakeTime_obj != NULL) {
-          parent_wakeTime = PyFloat_AS_DOUBLE(parent_wakeTime_obj);
-          Py_DECREF(parent_wakeTime_obj);
-        }
-
-        if (parent_wakeTime <= newitem_wakeTime) {
-          break;
-        }
-
-        Py_INCREF(parent);
-        PyList_SetItem(list,pos,parent);
-        pos = parentpos;
-    }
-    PyList_SetItem(list,pos,newitem);
-    return 0;
-}
-
-static int
-_siftup(PyObject *list, int pos) {
-    PyObject *newitem, *right, *child;
-    int endpos, rightpos, childpos;
-    int startpos = pos;
-    
-    endpos = PyList_Size(list);
-    newitem = PySequence_GetItem(list,pos);
-    
-    childpos = (2*pos)+1;
-    while (childpos < endpos) {
-        rightpos = childpos + 1;
-        child = PySequence_Fast_GET_ITEM(list,childpos);
-
-        PyObject *child_wakeTime_obj = PyObject_GetAttrString(child, "wakeTime");
-        double child_wakeTime = 0.0;
-        if (child_wakeTime_obj != NULL) {
-          child_wakeTime = PyFloat_AS_DOUBLE(child_wakeTime_obj);
-          Py_DECREF(child_wakeTime_obj);
-        }
-
-
-        if (rightpos < endpos) {
-            right = PySequence_Fast_GET_ITEM(list,rightpos);
-
-            PyObject *right_wakeTime_obj = PyObject_GetAttrString(right, "wakeTime");
-            double right_wakeTime = 0.0;
-            if (right_wakeTime_obj != NULL) {
-              right_wakeTime = PyFloat_AS_DOUBLE(right_wakeTime_obj);
-              Py_DECREF(right_wakeTime_obj);
-            }
-
-            /*
-            cmp = PyObject_RichCompareBool(right,child,Py_LE);
-            if (cmp > 0)
-              childpos = rightpos;
-            else if (cmp < 0)
-              return -1;
-            */
-
-            if (right_wakeTime <= child_wakeTime) {
-              childpos = rightpos;
-            }
-        }
-        child = PySequence_GetItem(list,childpos);
-        PyList_SetItem(list,pos,child);
-        pos = childpos;
-        childpos = (2*pos)+1;
-    }
-    PyList_SetItem(list,pos,newitem);
-
-    return _siftdown(list,startpos,pos);
-}
-
-static PyMethodDef heapqcMethods[] = {
-    {"heappush",heappush,METH_VARARGS},
-    {"heappop",heappop,METH_VARARGS},
-    {"heapreplace",heapreplace,METH_VARARGS},
-    {"heapify",heapify,METH_VARARGS},
-    {NULL, NULL} /* Sentinel */
-};
-
-void initlibheapq(void) {
-    (void) Py_InitModule("libheapq", heapqcMethods);
-};
-
-void initlibp3heapq(void) {
-    (void) Py_InitModule("libp3heapq", heapqcMethods);
-};
-
diff --git a/direct/src/showbase/HTMLTree.py b/direct/src/http/HTMLTree.py
similarity index 90%
rename from direct/src/showbase/HTMLTree.py
rename to direct/src/http/HTMLTree.py
index 9defe47dff..f96b5c9d05 100755
--- a/direct/src/showbase/HTMLTree.py
+++ b/direct/src/http/HTMLTree.py
@@ -1,4 +1,4 @@
-from direct.showbase import ElementTree as ET
+import xml.etree.ElementTree as ET
 
 class HTMLTree(ET.ElementTree):
     def __init__(self, title):
diff --git a/direct/src/http/LandingPage.py b/direct/src/http/LandingPage.py
index 927994d326..212e3a6e20 100755
--- a/direct/src/http/LandingPage.py
+++ b/direct/src/http/LandingPage.py
@@ -3,7 +3,7 @@ from direct.directnotify.DirectNotifyGlobal import directNotify
 from pandac.PandaModules import VirtualFileSystem
 from pandac.PandaModules import Filename
 from pandac.PandaModules import DSearchPath
-from direct.showbase import ElementTree as ET
+import xml.etree.ElementTree as ET
 import LandingPageHTML
 from StringIO import StringIO
 
diff --git a/direct/src/http/LandingPageHTML.py b/direct/src/http/LandingPageHTML.py
index b40eac6324..bc04caf80e 100755
--- a/direct/src/http/LandingPageHTML.py
+++ b/direct/src/http/LandingPageHTML.py
@@ -1,6 +1,6 @@
 # -- Text content for the landing page.  You should change these for yours! --
 
-from direct.showbase import ElementTree as ET
+import xml.etree.ElementTree as ET
 
 title = "Landing Page"
 defaultTitle = title
diff --git a/direct/src/http/WebRequest.py b/direct/src/http/WebRequest.py
index 95b058ef5e..dc40be7e28 100755
--- a/direct/src/http/WebRequest.py
+++ b/direct/src/http/WebRequest.py
@@ -4,7 +4,7 @@ from direct.directnotify.DirectNotifyGlobal import directNotify
 from direct.task.TaskManagerGlobal import taskMgr
 from direct.task import Task
 from LandingPage import LandingPage
-from direct.showbase import ElementTree as ET
+import xml.etree.ElementTree as ET
 
 notify = directNotify.newCategory('WebRequestDispatcher')
 
diff --git a/direct/src/p3d/AppRunner.py b/direct/src/p3d/AppRunner.py
index 47c1a20d65..b6b86a2c2e 100644
--- a/direct/src/p3d/AppRunner.py
+++ b/direct/src/p3d/AppRunner.py
@@ -25,16 +25,13 @@ if 'VFSImporter' in sys.modules:
     direct.showbase.VFSImporter = VFSImporter
     sys.modules['direct.showbase.VFSImporter'] = VFSImporter
 else:
-    # Otherwise, we can import the VFSImporter normally.  We have to
-    # import PandaModules first, to get the funny renaming with
-    # pandaexpress.
-    import direct
-    from pandac import PandaModules
+    # Otherwise, we can import the VFSImporter normally.
     from direct.showbase import VFSImporter
 
 from direct.showbase.DirectObject import DirectObject
-from pandac.PandaModules import VirtualFileSystem, Filename, Multifile, loadPrcFileData, unloadPrcFile, getModelPath, Thread, WindowProperties, ExecutionEnvironment, PandaSystem, Notify, StreamWriter, ConfigVariableString, ConfigPageManager, initAppForGui
-from pandac import PandaModules
+from panda3d.core import VirtualFileSystem, Filename, Multifile, loadPrcFileData, unloadPrcFile, getModelPath, Thread, WindowProperties, ExecutionEnvironment, PandaSystem, Notify, StreamWriter, ConfigVariableString, ConfigPageManager
+from panda3d.direct import init_app_for_gui
+from panda3d import core
 from direct.stdpy import file, glob
 from direct.task.TaskManagerGlobal import taskMgr
 from direct.showbase.MessengerGlobal import messenger
@@ -83,7 +80,7 @@ class AppRunner(DirectObject):
 
     # Also from p3d_plugin.h
     P3D_CONTENTS_DEFAULT_MAX_AGE = 5
-    
+
     def __init__(self):
         DirectObject.__init__(self)
 
@@ -119,8 +116,8 @@ class AppRunner(DirectObject):
         self.windowPrc = None
 
         self.http = None
-        if hasattr(PandaModules, 'HTTPClient'):
-            self.http = PandaModules.HTTPClient.getGlobalPtr()
+        if hasattr(core, 'HTTPClient'):
+            self.http = core.HTTPClient.getGlobalPtr()
 
         self.Undefined = Undefined
         self.ConcreteStruct = ConcreteStruct
@@ -213,7 +210,7 @@ class AppRunner(DirectObject):
         # this instance, e.g. the WindowProperties necessary to
         # re-embed a window in the browser frame.
         self.windowProperties = None
-        
+
         # Store our pointer so DirectStart-based apps can find us.
         if AppRunnerGlobal.appRunner is None:
             AppRunnerGlobal.appRunner = self
@@ -263,7 +260,7 @@ class AppRunner(DirectObject):
             value = bool(value)
         return value
 
-        
+
 
     def installPackage(self, packageName, version = None, hostUrl = None):
 
@@ -353,7 +350,7 @@ class AppRunner(DirectObject):
 
         # No shenanigans, just return the requested host.
         return host
-        
+
     def getHost(self, hostUrl, hostDir = None):
         """ Returns a new HostInfo object corresponding to the
         indicated host URL.  If we have already seen this URL
@@ -419,7 +416,7 @@ class AppRunner(DirectObject):
                 # the host directory too.
                 del self.hosts[hostUrl]
                 self.__deleteHostFiles(host)
-                
+
         return packages
 
     def __deleteHostFiles(self, host):
@@ -431,7 +428,7 @@ class AppRunner(DirectObject):
         self.rmtree(host.hostDir)
 
         self.sendRequest('forget_package', host.hostUrl, '', '')
-        
+
 
     def freshenFile(self, host, fileSpec, localPathname):
         """ Ensures that the localPathname is the most current version
@@ -449,18 +446,18 @@ class AppRunner(DirectObject):
         doc = None
         if self.superMirrorUrl:
             # Use the "super mirror" first.
-            url = PandaModules.URLSpec(self.superMirrorUrl + fileSpec.filename)
+            url = core.URLSpec(self.superMirrorUrl + fileSpec.filename)
             self.notify.info("Freshening %s" % (url))
             doc = self.http.getDocument(url)
-            
+
         if not doc or not doc.isValid():
             # Failing the super mirror, contact the actual host.
-            url = PandaModules.URLSpec(host.hostUrlPrefix + fileSpec.filename)
+            url = core.URLSpec(host.hostUrlPrefix + fileSpec.filename)
             self.notify.info("Freshening %s" % (url))
             doc = self.http.getDocument(url)
             if not doc.isValid():
                 return False
-        
+
         file = Filename.temporary('', 'p3d_')
         if not doc.downloadToFile(file):
             # Failed to download.
@@ -522,12 +519,11 @@ class AppRunner(DirectObject):
         """ Reads the config.xml file that may be present in the root
         directory. """
 
-        if not hasattr(PandaModules, 'TiXmlDocument'):
+        if not hasattr(core, 'TiXmlDocument'):
             return
-        from pandac.PandaModules import TiXmlDocument
 
         filename = Filename(self.rootDir, self.ConfigBasename)
-        doc = TiXmlDocument(filename.toOsSpecific())
+        doc = core.TiXmlDocument(filename.toOsSpecific())
         if not doc.LoadFile():
             return
 
@@ -544,7 +540,7 @@ class AppRunner(DirectObject):
         called automatically; an application may call this after
         adjusting some parameters (such as self.maxDiskUsage). """
 
-        from pandac.PandaModules import TiXmlDocument, TiXmlDeclaration, TiXmlElement
+        from panda3d.core import TiXmlDocument, TiXmlDeclaration, TiXmlElement
 
         filename = Filename(self.rootDir, self.ConfigBasename)
         doc = TiXmlDocument(filename.toOsSpecific())
@@ -561,7 +557,7 @@ class AppRunner(DirectObject):
         tfile = Filename.temporary(self.rootDir.cStr(), '.xml')
         if doc.SaveFile(tfile.toOsSpecific()):
             tfile.renameTo(filename)
-        
+
 
     def checkDiskUsage(self):
         """ Checks the total disk space used by all packages, and
@@ -574,11 +570,11 @@ class AppRunner(DirectObject):
                 totalSize += packageData.totalSize
         self.notify.info("Total Panda3D disk space used: %s MB" % (
             (totalSize + 524288) / 1048576))
-        
+
         if self.verifyContents == self.P3DVCNever:
             # We're not allowed to delete anything anyway.
             return
-        
+
         self.notify.info("Configured max usage is: %s MB" % (
             (self.maxDiskUsage + 524288) / 1048576))
         if totalSize <= self.maxDiskUsage:
@@ -592,7 +588,7 @@ class AppRunner(DirectObject):
                 if packageData.package and packageData.package.installed:
                     # Don't uninstall any packages we're currently using.
                     continue
-                
+
                 usedPackages.append((packageData.lastUse, packageData))
 
         # Sort the packages into oldest-first order.
@@ -609,13 +605,13 @@ class AppRunner(DirectObject):
                 packages.append(packageData.package)
             else:
                 # If it's an unknown package, just delete it directly.
-                print "Deleting unknown package %s" % (packageData.pathname)
+                print("Deleting unknown package %s" % (packageData.pathname))
                 self.rmtree(packageData.pathname)
 
         packages = self.deletePackages(packages)
         if packages:
-            print "Unable to delete %s packages" % (len(packages))
-        
+            print("Unable to delete %s packages" % (len(packages)))
+
         return
 
     def stop(self):
@@ -663,10 +659,10 @@ class AppRunner(DirectObject):
             for child in filename.scanDirectory():
                 self.rmtree(Filename(filename, child))
             if not filename.rmdir():
-                print "could not remove directory %s" % (filename)
+                print("could not remove directory %s" % (filename))
         else:
             if not filename.unlink():
-                print "could not delete %s" % (filename)
+                print("could not delete %s" % (filename))
 
     def setSessionId(self, sessionId):
         """ This message should come in at startup. """
@@ -747,10 +743,23 @@ class AppRunner(DirectObject):
             # will properly get ignored by ShowBase.
             self.initialAppImport = True
 
-            __import__(moduleName)
-            main = sys.modules[moduleName]
-            if hasattr(main, 'main') and hasattr(main.main, '__call__'):
-                main.main(self)
+            # Python won't let us import a module named __main__.  So,
+            # we have to do that manually, via the VFSImporter.
+            if moduleName == '__main__':
+                dirName = Filename(self.multifileRoot).toOsSpecific()
+                importer = VFSImporter.VFSImporter(dirName)
+                loader = importer.find_module('__main__')
+                if loader is None:
+                    raise ImportError('No module named __main__')
+
+                mainModule = loader.load_module('__main__')
+            else:
+                __import__(moduleName)
+                mainModule = sys.modules[moduleName]
+
+            # Check if it has a main() function.  If so, call it.
+            if hasattr(mainModule, 'main') and hasattr(mainModule.main, '__call__'):
+                mainModule.main(self)
 
             # Now clear this flag.
             self.initialAppImport = False
@@ -814,7 +823,7 @@ class AppRunner(DirectObject):
 
         # Now that we have rootDir, we can read the config file.
         self.readConfigXml()
-        
+
 
     def addPackageInfo(self, name, platform, version, hostUrl, hostDir = None,
                        recurse = False):
@@ -858,7 +867,7 @@ class AppRunner(DirectObject):
                 # Maybe the contents.xml file isn't current.  Re-fetch it.
                 if host.redownloadContentsFile(self.http):
                     return self.addPackageInfo(name, platform, version, hostUrl, hostDir = hostDir, recurse = True)
-            
+
             message = "Couldn't find %s %s on %s" % (name, version, hostUrl)
             raise OSError, message
 
@@ -866,18 +875,18 @@ class AppRunner(DirectObject):
         if not package.downloadDescFile(self.http):
             message = "Couldn't get desc file for %s" % (name)
             raise OSError, message
-        
+
         if not package.downloadPackage(self.http):
             message = "Couldn't download %s" % (name)
             raise OSError, message
-        
+
         if not package.installPackage(self):
             message = "Couldn't install %s" % (name)
             raise OSError, message
 
         if package.guiApp:
             self.guiApp = True
-            initAppForGui()
+            init_app_for_gui()
 
     def setP3DFilename(self, p3dFilename, tokens, argv, instanceId,
                        interactiveConsole, p3dOffset = 0, p3dUrl = None):
@@ -885,7 +894,7 @@ class AppRunner(DirectObject):
         contains the application itself, along with the web tokens
         and/or command-line arguments.  Once this method has been
         called, the application is effectively started. """
-        
+
         # One day we will have support for multiple instances within a
         # Python session.  Against that day, we save the instance ID
         # for this instance.
@@ -937,9 +946,9 @@ class AppRunner(DirectObject):
         self.allowPythonDev = False
 
         i = mf.findSubfile('p3d_info.xml')
-        if i >= 0 and hasattr(PandaModules, 'readXmlStream'):
+        if i >= 0 and hasattr(core, 'readXmlStream'):
             stream = mf.openReadSubfile(i)
-            self.p3dInfo = PandaModules.readXmlStream(stream)
+            self.p3dInfo = core.readXmlStream(stream)
             mf.closeReadSubfile(stream)
         if self.p3dInfo:
             self.p3dPackage = self.p3dInfo.FirstChildElement('package')
@@ -975,7 +984,7 @@ class AppRunner(DirectObject):
             ConfigVariableString('frame-rate-meter-text-pattern').setValue('allow_python_dev %0.1f fps')
 
         if self.guiApp:
-            initAppForGui()
+            init_app_for_gui()
 
         self.initPackedAppEnvironment()
 
@@ -992,7 +1001,7 @@ class AppRunner(DirectObject):
             # provided if available.  It is only for documentation
             # purposes; the actual p3d file has already been
             # downloaded to p3dFilename.
-            self.p3dUrl = PandaModules.URLSpec(p3dUrl)
+            self.p3dUrl = core.URLSpec(p3dUrl)
 
         # Send this call to the main thread; don't call it directly.
         messenger.send('AppRunner_startIfReady', taskChain = 'default')
@@ -1015,14 +1024,14 @@ class AppRunner(DirectObject):
                     newUrl = xalthost.Attribute('url')
                     self.altHostMap[origUrl] = newUrl
                     break
-                
+
                 xalthost = xalthost.NextSiblingElement('alt_host')
-    
+
     def loadMultifilePrcFiles(self, mf, root):
         """ Loads any prc files in the root of the indicated
         Multifile, which is presumed to have been mounted already
         under root. """
-        
+
         # We have to load these prc files explicitly, since the
         # ConfigPageManager can't directly look inside the vfs.  Use
         # the Multifile interface to find the prc files, rather than
@@ -1046,12 +1055,12 @@ class AppRunner(DirectObject):
                     cp = loadPrcFileData(pathname, data)
                     # Set it to sort value 20, behind the implicit pages.
                     cp.setSort(20)
-        
-    
+
+
     def __clearWindowProperties(self):
         """ Clears the windowPrc file that was created in a previous
         call to setupWindow(), if any. """
-        
+
         if self.windowPrc:
             unloadPrcFile(self.windowPrc)
             self.windowPrc = None
@@ -1127,12 +1136,12 @@ class AppRunner(DirectObject):
         function that can be used to deliver requests upstream, to the
         core API, and thereby to the browser. """
         self.requestFunc = func
-        
+
     def sendRequest(self, request, *args):
         """ Delivers a request to the browser via self.requestFunc.
         This low-level function is not intended to be called directly
         by user code. """
-        
+
         assert self.requestFunc
         return self.requestFunc(self.instanceId, request, args)
 
@@ -1176,7 +1185,7 @@ class AppRunner(DirectObject):
             # Evaluate it now.
             return self.scriptRequest('eval', self.dom, value = expression,
                                       needsResponse = needsResponse)
-        
+
     def scriptRequest(self, operation, object, propertyName = '',
                       value = None, needsResponse = True):
         """ Issues a new script request to the browser.  This queries
@@ -1184,7 +1193,7 @@ class AppRunner(DirectObject):
         low-level method that user code should not call directly;
         instead, just operate on the Python wrapper objects that
         shadow the DOM objects, beginning with appRunner.dom.
-        
+
         operation may be one of [ 'get_property', 'set_property',
         'call', 'evaluate' ].
 
@@ -1233,7 +1242,7 @@ def dummyAppRunner(tokens = [], argv = None):
     first-look sanity check. """
 
     if AppRunnerGlobal.appRunner:
-        print "Already have AppRunner, not creating a new one."
+        print("Already have AppRunner, not creating a new one.")
         return AppRunnerGlobal.appRunner
 
     appRunner = AppRunner()
@@ -1243,7 +1252,7 @@ def dummyAppRunner(tokens = [], argv = None):
     platform = PandaSystem.getPlatform()
     version = PandaSystem.getPackageVersionString()
     hostUrl = PandaSystem.getPackageHostUrl()
-    
+
     if platform.startswith('win'):
         rootDir = Filename(Filename.getUserAppdataDirectory(), 'Panda3D')
     elif platform.startswith('osx'):
@@ -1256,7 +1265,7 @@ def dummyAppRunner(tokens = [], argv = None):
 
     # Of course we will have the panda3d application loaded.
     appRunner.addPackageInfo('panda3d', platform, version, hostUrl)
-        
+
     appRunner.tokens = tokens
     appRunner.tokenDict = dict(tokens)
     if argv is None:
@@ -1274,6 +1283,6 @@ def dummyAppRunner(tokens = [], argv = None):
     vfs.mount(cwd, appRunner.multifileRoot, vfs.MFReadOnly)
 
     appRunner.initPackedAppEnvironment()
-    
+
     return appRunner
 
diff --git a/direct/src/p3d/DeploymentTools.py b/direct/src/p3d/DeploymentTools.py
index ef046a5490..b0e348f245 100644
--- a/direct/src/p3d/DeploymentTools.py
+++ b/direct/src/p3d/DeploymentTools.py
@@ -8,9 +8,9 @@ import os, sys, subprocess, tarfile, shutil, time, zipfile, glob, socket, getpas
 from cStringIO import StringIO
 from direct.directnotify.DirectNotifyGlobal import *
 from direct.showbase.AppRunnerGlobal import appRunner
-from pandac.PandaModules import PandaSystem, HTTPClient, Filename, VirtualFileSystem, Multifile
-from pandac.PandaModules import TiXmlDocument, TiXmlDeclaration, TiXmlElement, readXmlStream
-from pandac.PandaModules import PNMImage, PNMFileTypeRegistry
+from panda3d.core import PandaSystem, HTTPClient, Filename, VirtualFileSystem, Multifile
+from panda3d.core import TiXmlDocument, TiXmlDeclaration, TiXmlElement, readXmlStream
+from panda3d.core import PNMImage, PNMFileTypeRegistry
 from direct.stdpy.file import *
 from direct.p3d.HostInfo import HostInfo
 # This is important for some reason
@@ -296,7 +296,7 @@ class Icon:
 
     def __init__(self):
         self.images = {}
-    
+
     def addImage(self, image):
         """ Adds an image to the icon.  Returns False on failure, True on success.
         Only one image per size can be loaded, and the image size must be square. """
@@ -1097,7 +1097,7 @@ class Installer:
 
         # Tell Vista that we require admin rights
         print >>nsi, 'RequestExecutionLevel admin'
-        print >>nsi 
+        print >>nsi
         if self.offerRun:
             print >>nsi, 'Function launch'
             print >>nsi, '  ExecShell "open" "$INSTDIR\\%s.exe"' % self.shortname
@@ -1112,7 +1112,7 @@ class Installer:
                 print >>nsi, '  CreateShortcut "$DESKTOP\\%s.lnk" "$INSTDIR\\%s.exe" "" "$INSTDIR\\%s.ico"' % (self.fullname, self.shortname, self.shortname)
             print >>nsi, 'FunctionEnd'
             print >>nsi
-            
+
         print >>nsi, '!include "MUI2.nsh"'
         print >>nsi, '!define MUI_ABORTWARNING'
         if self.offerRun:
@@ -1213,7 +1213,7 @@ class Installer:
 
         if icofile is not None:
             icofile.unlink()
-        
+
         return output
 
     def os_walk(self, top):
diff --git a/direct/src/p3d/FileSpec.py b/direct/src/p3d/FileSpec.py
index 78dff88fe8..822bfccb5f 100644
--- a/direct/src/p3d/FileSpec.py
+++ b/direct/src/p3d/FileSpec.py
@@ -1,6 +1,6 @@
 import os
 import time
-from pandac.PandaModules import Filename, HashVal, VirtualFileSystem
+from panda3d.core import Filename, HashVal, VirtualFileSystem
 
 class FileSpec:
     """ This class represents a disk file whose hash and size
@@ -18,13 +18,13 @@ class FileSpec:
     def fromFile(self, packageDir, filename, pathname = None, st = None):
         """ Reads the file information from the indicated file.  If st
         is supplied, it is the result of os.stat on the filename. """
-        
+
         vfs = VirtualFileSystem.getGlobalPtr()
 
         filename = Filename(filename)
         if pathname is None:
             pathname = Filename(packageDir, filename)
-        
+
         self.filename = filename.cStr()
         self.basename = filename.getBasename()
 
@@ -41,17 +41,17 @@ class FileSpec:
         hv = HashVal()
         hv.hashFile(pathname)
         self.hash = hv.asHex()
-                 
+
 
     def loadXml(self, xelement):
         """ Reads the file information from the indicated XML
         element. """
-        
+
         self.filename = xelement.Attribute('filename')
         self.basename = None
         if self.filename:
             self.basename = Filename(self.filename).getBasename()
-            
+
         size = xelement.Attribute('size')
         try:
             self.size = int(size)
@@ -87,7 +87,7 @@ class FileSpec:
             xelement.SetAttribute('size', str(self.size))
         if self.hash:
             xelement.SetAttribute('hash', self.hash)
-            
+
     def quickVerify(self, packageDir = None, pathname = None,
                     notify = None, correctSelf = False):
         """ Performs a quick test to ensure the file has not been
@@ -157,8 +157,8 @@ class FileSpec:
             self.__updateTimestamp(pathname, st)
 
         return True
-        
-            
+
+
     def fullVerify(self, packageDir = None, pathname = None, notify = None):
         """ Performs a more thorough test to ensure the file has not
         been modified.  This test is less vulnerable to malicious
@@ -235,7 +235,7 @@ class FileSpec:
         """ Corrects the internal hash to match the one on disk. """
         if not self.actualFile:
             self.checkHash(packageDir, pathname, st)
-            
+
         if notify:
             notify.info("Correcting hash %s to %s" % (
                 self.filename, self.actualFile.hash))
diff --git a/direct/src/p3d/HostInfo.py b/direct/src/p3d/HostInfo.py
index d72da61585..ab033f3383 100644
--- a/direct/src/p3d/HostInfo.py
+++ b/direct/src/p3d/HostInfo.py
@@ -1,7 +1,6 @@
-from pandac.PandaModules import HashVal, Filename, PandaSystem, DocumentSpec, Ramfile
-from pandac.PandaModules import HTTPChannel
-from pandac import PandaModules
-from libpandaexpress import ConfigVariableInt
+from panda3d.core import HashVal, Filename, PandaSystem, DocumentSpec, Ramfile
+from panda3d.core import HTTPChannel, ConfigVariableInt
+from panda3d import core
 from direct.p3d.PackageInfo import PackageInfo
 from direct.p3d.FileSpec import FileSpec
 from direct.directnotify.DirectNotifyGlobal import directNotify
@@ -49,7 +48,7 @@ class HostInfo:
 
         if hostDir and not isinstance(hostDir, Filename):
             hostDir = Filename.fromOsSpecific(hostDir)
-            
+
         self.hostDir = hostDir
         self.asMirror = asMirror
         self.perPlatform = perPlatform
@@ -175,7 +174,7 @@ class HostInfo:
                         statusString = channel.getStatusString()
                         self.notify.warning("Could not contact download server at %s" % (url,))
                         self.notify.warning("Status code = %s %s" % (statusCode, statusString))
-                                    
+
                 if not rf:
                     self.notify.warning("Unable to download %s" % (url,))
                     try:
@@ -206,7 +205,7 @@ class HostInfo:
                         self.notify.warning("%s" % (str(e),))
                         pass
                     return False
-                    
+
         tempFilename = Filename.temporary('', 'p3d_', '.xml')
         if rf:
             f = open(tempFilename.toOsSpecific(), 'wb')
@@ -278,7 +277,7 @@ class HostInfo:
 
         now = int(time.time())
         return now < self.contentsExpiration and self.hasContentsFile
-        
+
     def readContentsFile(self, tempFilename = None, freshDownload = False):
         """ Reads the contents.xml file for this particular host, once
         it has been downloaded into the indicated temporary file.
@@ -290,7 +289,7 @@ class HostInfo:
         there already.  If tempFilename is not specified, the standard
         filename is read if it is known. """
 
-        if not hasattr(PandaModules, 'TiXmlDocument'):
+        if not hasattr(core, 'TiXmlDocument'):
             return False
 
         if not tempFilename:
@@ -304,7 +303,7 @@ class HostInfo:
 
             tempFilename = Filename(hostDir, 'contents.xml')
 
-        doc = PandaModules.TiXmlDocument(tempFilename.toOsSpecific())
+        doc = core.TiXmlDocument(tempFilename.toOsSpecific())
         if not doc.LoadFile():
             return False
 
@@ -337,12 +336,12 @@ class HostInfo:
                 xcontents.RemoveChild(xorig)
                 xorig = xcontents.FirstChildElement('orig')
 
-            xorig = PandaModules.TiXmlElement('orig')
+            xorig = core.TiXmlElement('orig')
             self.contentsSpec.storeXml(xorig)
             xorig.SetAttribute('expiration', str(self.contentsExpiration))
 
             xcontents.InsertEndChild(xorig)
-            
+
         else:
             # Read the download hash and expiration time from the XML.
             expiration = None
@@ -385,7 +384,7 @@ class HostInfo:
                 perPlatform = int(xpackage.Attribute('per_platform') or '')
             except ValueError:
                 perPlatform = False
-                
+
             package = self.__makePackage(name, platform, version, solo, perPlatform)
             package.descFile = FileSpec()
             package.descFile.loadXml(xpackage)
@@ -418,7 +417,7 @@ class HostInfo:
         """ Looks for the <host> or <alt_host> entry in the
         contents.xml that corresponds to the URL that we actually
         downloaded from. """
-        
+
         xhost = xcontents.FirstChildElement('host')
         while xhost:
             url = xhost.Attribute('url')
@@ -433,7 +432,7 @@ class HostInfo:
                     self.readHostXml(xalthost)
                     return
                 xalthost = xalthost.NextSiblingElement('alt_host')
-            
+
             xhost = xhost.NextSiblingElement('host')
 
     def __findHostXmlForHostDir(self, xcontents):
@@ -442,7 +441,7 @@ class HostInfo:
         contents.xml from.  This is used when reading a contents.xml
         file found on disk, as opposed to downloading it from a
         site. """
-        
+
         xhost = xcontents.FirstChildElement('host')
         while xhost:
             url = xhost.Attribute('url')
@@ -463,7 +462,7 @@ class HostInfo:
                     self.readHostXml(xalthost)
                     return
                 xalthost = xalthost.NextSiblingElement('alt_host')
-            
+
             xhost = xhost.NextSiblingElement('host')
 
     def readHostXml(self, xhost):
@@ -487,7 +486,7 @@ class HostInfo:
                 self.downloadUrlPrefix += '/'
         else:
             self.downloadUrlPrefix = self.hostUrlPrefix
-            
+
         xmirror = xhost.FirstChildElement('mirror')
         while xmirror:
             url = xmirror.Attribute('url')
@@ -611,7 +610,7 @@ class HostInfo:
         the list of packages that were NOT found. """
 
         packages = packages[:]
-        
+
         for key, platforms in self.packages.items():
             for platform, package in platforms.items():
                 if package in packages:
diff --git a/direct/src/p3d/InstalledHostData.py b/direct/src/p3d/InstalledHostData.py
index 470c300da3..e8c9e5d5d2 100644
--- a/direct/src/p3d/InstalledHostData.py
+++ b/direct/src/p3d/InstalledHostData.py
@@ -1,11 +1,11 @@
-from pandac.PandaModules import URLSpec
+from panda3d.core import URLSpec
 
 class InstalledHostData:
     """ A list of instances of this class is returned by
     AppRunner.scanInstalledPackages().  Each of these corresponds to a
     particular host that has provided packages that have been
     installed on the local client. """
-    
+
     def __init__(self, host, dirnode):
         self.host = host
         self.pathname = dirnode.pathname
diff --git a/direct/src/p3d/PackageInfo.py b/direct/src/p3d/PackageInfo.py
index 7dcd35c62e..7f2d382cd2 100644
--- a/direct/src/p3d/PackageInfo.py
+++ b/direct/src/p3d/PackageInfo.py
@@ -1,6 +1,5 @@
-from pandac.PandaModules import Filename, URLSpec, DocumentSpec, Ramfile, Multifile, Decompressor, EUOk, EUSuccess, VirtualFileSystem, Thread, getModelPath, ExecutionEnvironment, PStatCollector, TiXmlDocument, TiXmlDeclaration, TiXmlElement
-from pandac import PandaModules
-from libpandaexpress import ConfigVariableInt
+from panda3d.core import Filename, URLSpec, DocumentSpec, Ramfile, Multifile, Decompressor, EUOk, EUSuccess, VirtualFileSystem, Thread, getModelPath, ExecutionEnvironment, PStatCollector, TiXmlDocument, TiXmlDeclaration, TiXmlElement
+import panda3d.core as core
 from direct.p3d.FileSpec import FileSpec
 from direct.p3d.ScanDirectoryNode import ScanDirectoryNode
 from direct.showbase import VFSImporter
@@ -55,7 +54,7 @@ class PackageInfo:
             tokens.  This function defines a new generator that yields
             each of those tokens, but wraps each call into the nested
             generator within a pair of start/stop collector calls. """
-            
+
             self.pStatCol.start()
             for token in self.__funcPtr(self):
                 self.pStatCol.stop()
@@ -76,7 +75,7 @@ class PackageInfo:
             if self.bytesNeeded == 0:
                 return 1
             return min(float(self.bytesDone) / float(self.bytesNeeded), 1)
-    
+
     def __init__(self, host, packageName, packageVersion, platform = None,
                  solo = False, asMirror = False, perPlatform = False):
         self.host = host
@@ -94,7 +93,7 @@ class PackageInfo:
         # This will be filled in when the host's contents.xml file is
         # read.
         self.packageDir = None
-            
+
         # These will be filled in by HostInfo when the package is read
         # from contents.xml.
         self.descFile = None
@@ -110,11 +109,11 @@ class PackageInfo:
         self.extracts = []
         self.requires = []
         self.installPlans = None
- 
+
         # This is updated during downloadPackage().  It is in the
         # range 0..1.
         self.downloadProgress = 0
-        
+
         # This is set true when the package file has been fully
         # downloaded and unpacked.
         self.hasPackage = False
@@ -133,12 +132,12 @@ class PackageInfo:
         This may not be known until the host's contents.xml file has
         been downloaded, which informs us of the host's own install
         directory. """
-        
+
         if not self.packageDir:
             if not self.host.hasContentsFile:
                 if not self.host.readContentsFile():
                     self.host.downloadContentsFile(self.http)
-            
+
             # Derive the packageDir from the hostDir.
             self.packageDir = Filename(self.host.hostDir, self.packageName)
             if self.packageVersion:
@@ -159,7 +158,7 @@ class PackageInfo:
                 # plugin--and we therefore shouldn't include the
                 # platform in the directory hierarchy.
                 includePlatform = False
-                
+
             if includePlatform and self.platform:
                 self.packageDir = Filename(self.packageDir, self.platform)
 
@@ -176,7 +175,7 @@ class PackageInfo:
         # Return the size of plan A, assuming it will work.
         plan = self.installPlans[0]
         size = sum([step.getEffort() for step in plan])
-        
+
         return size
 
     def getPrevDownloadedEffort(self):
@@ -209,13 +208,13 @@ class PackageInfo:
             name += ' rev %s' % (self.patchVersion)
 
         return name
-        
+
 
     def setupFilenames(self):
         """ This is called by the HostInfo when the package is read
         from contents.xml, to set up the internal filenames and such
         that rely on some of the information from contents.xml. """
-        
+
         dirname, basename = self.descFile.filename.rsplit('/', 1)
         self.descFileDirname = dirname
         self.descFileBasename = basename
@@ -264,7 +263,7 @@ class PackageInfo:
             Thread.considerYield()
 
         return (token == self.stepComplete)
-    
+
     def downloadDescFileGenerator(self, http):
         """ A generator function that implements downloadDescFile()
         one piece at a time.  It yields one of stepComplete,
@@ -343,9 +342,9 @@ class PackageInfo:
 
         filename = Filename(self.getPackageDir(), self.descFileBasename)
 
-        if not hasattr(PandaModules, 'TiXmlDocument'):
+        if not hasattr(core, 'TiXmlDocument'):
             return False
-        doc = PandaModules.TiXmlDocument(filename.toOsSpecific())
+        doc = core.TiXmlDocument(filename.toOsSpecific())
         if not doc.LoadFile():
             return False
 
@@ -432,7 +431,7 @@ class PackageInfo:
         pc.start()
 
         self.hasPackage = False
-        
+
         if self.host.appRunner and self.host.appRunner.verifyContents == self.host.appRunner.P3DVCNever:
             # We're not allowed to download anything.
             self.installPlans = []
@@ -447,12 +446,12 @@ class PackageInfo:
             # archive.
             downloadSize = self.compressedArchive.size
             func = lambda step, fileSpec = self.compressedArchive: self.__downloadFile(step, fileSpec, allowPartial = True)
-            
+
             step = self.InstallStep(func, downloadSize, self.downloadFactor, 'download')
             installPlan = [step]
             self.installPlans = [installPlan]
             pc.stop()
-            return 
+            return
 
         # The normal download process.  Determine what we will need to
         # download, and build a plan (or two) to download it all.
@@ -520,9 +519,9 @@ class PackageInfo:
             # plan B as the only plan.
             self.installPlans = [planB]
 
-        # In case of unexpected failures on the internet, we will retry 
+        # In case of unexpected failures on the internet, we will retry
         # the full download instead of just giving up.
-        for retry in range(ConfigVariableInt('package-full-dl-retries', 1)):
+        for retry in range(core.ConfigVariableInt('package-full-dl-retries', 1)):
             self.installPlans.append(planB[:])
 
         pc.stop()
@@ -530,7 +529,7 @@ class PackageInfo:
     def __scanDirectoryRecursively(self, dirname):
         """ Generates a list of Filename objects: all of the files
         (not directories) within and below the indicated dirname. """
-        
+
         contents = []
         for dirpath, dirnames, filenames in os.walk(dirname.toOsSpecific()):
             dirpath = Filename.fromOsSpecific(dirpath)
@@ -560,7 +559,7 @@ class PackageInfo:
 
         # Get a list of all of the files in the directory, so we can
         # remove files that don't belong.
-        contents = self.__scanDirectoryRecursively(self.getPackageDir()) 
+        contents = self.__scanDirectoryRecursively(self.getPackageDir())
         self.__removeFileFromList(contents, self.descFileBasename)
         self.__removeFileFromList(contents, self.compressedArchive.filename)
         self.__removeFileFromList(contents, self.UsageBasename)
@@ -582,7 +581,7 @@ class PackageInfo:
 
         if self.asMirror:
             return self.compressedArchive.quickVerify(self.getPackageDir(), notify = self.notify)
-            
+
         allExtractsOk = True
         if not self.uncompressedArchive.quickVerify(self.getPackageDir(), notify = self.notify):
             self.notify.debug("File is incorrect: %s" % (self.uncompressedArchive.filename))
@@ -593,7 +592,7 @@ class PackageInfo:
             # shouldn't be a compressed archive file here.
             pathname = Filename(self.getPackageDir(), self.compressedArchive.filename)
             pathname.unlink()
-            
+
             for file in self.extracts:
                 if not file.quickVerify(self.getPackageDir(), notify = self.notify):
                     self.notify.debug("File is incorrect: %s" % (file.filename))
@@ -614,7 +613,7 @@ class PackageInfo:
 
         size = self.totalPlanCompleted + self.currentStepEffort * step.getProgress()
         self.downloadProgress = min(float(size) / float(self.totalPlanSize), 1)
-    
+
     def downloadPackage(self, http):
         """ Downloads the package file, synchronously, then
         uncompresses and unpacks it.  Returns true on success, false
@@ -630,7 +629,7 @@ class PackageInfo:
             Thread.considerYield()
 
         return (token == self.stepComplete)
-    
+
     def downloadPackageGenerator(self, http):
         """ A generator function that implements downloadPackage() one
         piece at a time.  It yields one of stepComplete, stepFailed,
@@ -655,7 +654,7 @@ class PackageInfo:
                 yield token
             else:
                 break
-            
+
         while token == self.restartDownload:
             # Try again.
             for token in self.downloadDescFileGenerator(http):
@@ -675,7 +674,7 @@ class PackageInfo:
 
         assert token == self.stepComplete
         yield self.stepComplete; return
-            
+
 
     def __followInstallPlans(self):
         """ Performs all of the steps in self.installPlans.  Yields
@@ -701,16 +700,16 @@ class PackageInfo:
                         yield token
                     else:
                         break
-                    
+
                 if token == self.restartDownload:
                     yield token
                 if token == self.stepFailed:
                     planFailed = True
                     break
                 assert token == self.stepComplete
-                
+
                 self.totalPlanCompleted += self.currentStepEffort
-                
+
             if not planFailed:
                 # Successfully downloaded!
                 yield self.stepComplete; return
@@ -754,7 +753,7 @@ class PackageInfo:
     def __downloadFile(self, step, fileSpec, urlbase = None, filename = None,
                        allowPartial = False):
         """ Downloads the indicated file from the host into
-        packageDir.  Yields one of stepComplete, stepFailed, 
+        packageDir.  Yields one of stepComplete, stepFailed,
         restartDownload, or stepContinue. """
 
         if self.host.appRunner and self.host.appRunner.verifyContents == self.host.appRunner.P3DVCNever:
@@ -806,7 +805,7 @@ class PackageInfo:
                 url += '?' + str(int(time.time()))
                 request = DocumentSpec(url)
                 request.setCacheControl(DocumentSpec.CCNoCache)
-             
+
             self.notify.info("%s downloading %s" % (self.packageName, url))
 
             if not filename:
@@ -839,7 +838,7 @@ class PackageInfo:
                 targetPathname.makeDir()
                 targetPathname.unlink()
                 channel.beginGetDocument(request)
-                
+
             channel.downloadToFile(targetPathname)
             while channel.run():
                 if step:
@@ -849,7 +848,7 @@ class PackageInfo:
                         # it's the wrong file.
                         self.notify.warning("Got more data than expected for download %s" % (url))
                         break
-                    
+
                     self.__updateStepProgress(step)
 
                 if taskMgr.destroyed:
@@ -857,9 +856,9 @@ class PackageInfo:
                     # be shutting down.  Get out of here.
                     self.notify.warning("Task Manager destroyed, aborting %s" % (url))
                     yield self.stepFailed; return
-                    
+
                 yield self.stepContinue
-                
+
             if step:
                 step.bytesDone = channel.getBytesDownloaded() + channel.getFirstByteDelivered()
                 self.__updateStepProgress(step)
@@ -897,7 +896,7 @@ class PackageInfo:
     def __applyPatch(self, step, patchfile):
         """ Applies the indicated patching in-place to the current
         uncompressed archive.  The patchfile is removed after the
-        operation.  Yields one of stepComplete, stepFailed, 
+        operation.  Yields one of stepComplete, stepFailed,
         restartDownload, or stepContinue. """
 
         self.updated = True
@@ -907,7 +906,7 @@ class PackageInfo:
         result = Filename.temporary('', 'patch_')
         self.notify.info("Patching %s with %s" % (origPathname, patchPathname))
 
-        p = PandaModules.Patchfile()  # The C++ class
+        p = core.Patchfile()  # The C++ class
 
         ret = p.initiate(patchPathname, origPathname, result)
         if ret == EUSuccess:
@@ -925,7 +924,7 @@ class PackageInfo:
             ret = p.run()
         del p
         patchPathname.unlink()
-        
+
         if ret < 0:
             self.notify.warning("Patching of %s failed." % (origPathname))
             result.unlink()
@@ -934,12 +933,12 @@ class PackageInfo:
         if not result.renameTo(origPathname):
             self.notify.warning("Couldn't rename %s to %s" % (result, origPathname))
             yield self.stepFailed; return
-            
+
         yield self.stepComplete; return
 
     def __uncompressArchive(self, step):
         """ Turns the compressed archive into the uncompressed
-        archive.  Yields one of stepComplete, stepFailed, 
+        archive.  Yields one of stepComplete, stepFailed,
         restartDownload, or stepContinue. """
 
         if self.host.appRunner and self.host.appRunner.verifyContents == self.host.appRunner.P3DVCNever:
@@ -970,7 +969,7 @@ class PackageInfo:
 
         if result != EUSuccess:
             yield self.stepFailed; return
-            
+
         step.bytesDone = totalBytes
         self.__updateStepProgress(step)
 
@@ -985,10 +984,10 @@ class PackageInfo:
         # Now we can safely remove the compressed archive.
         sourcePathname.unlink()
         yield self.stepComplete; return
-    
+
     def __unpackArchive(self, step):
         """ Unpacks any files in the archive that want to be unpacked
-        to disk.  Yields one of stepComplete, stepFailed, 
+        to disk.  Yields one of stepComplete, stepFailed,
         restartDownload, or stepContinue. """
 
         if not self.extracts:
@@ -1008,7 +1007,7 @@ class PackageInfo:
         if not mf.openRead(mfPathname):
             self.notify.warning("Couldn't open %s" % (mfPathname))
             yield self.stepFailed; return
-        
+
         allExtractsOk = True
         step.bytesDone = 0
         for file in self.extracts:
@@ -1025,7 +1024,7 @@ class PackageInfo:
                 self.notify.warning("Couldn't extract: %s" % (file.filename))
                 allExtractsOk = False
                 continue
-            
+
             if not file.quickVerify(self.getPackageDir(), notify = self.notify):
                 self.notify.warning("After extracting, still incorrect: %s" % (file.filename))
                 allExtractsOk = False
@@ -1157,7 +1156,7 @@ class PackageInfo:
         """ Marks the package as having been used.  This is normally
         called automatically by installPackage(). """
 
-        if not hasattr(PandaModules, 'TiXmlDocument'):
+        if not hasattr(core, 'TiXmlDocument'):
             return
 
         if self.host.appRunner and self.host.appRunner.verifyContents == self.host.appRunner.P3DVCNever:
@@ -1174,14 +1173,14 @@ class PackageInfo:
         if not doc.LoadFile():
             decl = TiXmlDeclaration("1.0", "utf-8", "")
             doc.InsertEndChild(decl)
-            
+
         xusage = doc.FirstChildElement('usage')
         if not xusage:
             doc.InsertEndChild(TiXmlElement('usage'))
             xusage = doc.FirstChildElement('usage')
 
         now = int(time.time())
-        
+
         count = xusage.Attribute('count_app')
         try:
             count = int(count or '')
@@ -1214,22 +1213,22 @@ class PackageInfo:
         tfile = Filename.temporary(self.getPackageDir().cStr(), '.xml')
         if doc.SaveFile(tfile.toOsSpecific()):
             tfile.renameTo(filename)
-        
+
     def getUsage(self):
         """ Returns the xusage element that is read from the usage.xml
         file, or None if there is no usage.xml file. """
 
-        if not hasattr(PandaModules, 'TiXmlDocument'):
+        if not hasattr(core, 'TiXmlDocument'):
             return None
 
         filename = Filename(self.getPackageDir(), self.UsageBasename)
         doc = TiXmlDocument(filename.toOsSpecific())
         if not doc.LoadFile():
             return None
-            
+
         xusage = doc.FirstChildElement('usage')
         if not xusage:
             return None
 
         return copy.copy(xusage)
-    
+
diff --git a/direct/src/p3d/PackageInstaller.py b/direct/src/p3d/PackageInstaller.py
index 2c97d3c7e6..3f920b8bd3 100644
--- a/direct/src/p3d/PackageInstaller.py
+++ b/direct/src/p3d/PackageInstaller.py
@@ -3,7 +3,7 @@ from direct.stdpy.threading import Lock, RLock
 from direct.showbase.MessengerGlobal import messenger
 from direct.task.TaskManagerGlobal import taskMgr
 from direct.p3d.PackageInfo import PackageInfo
-from pandac.PandaModules import TPLow, PStatCollector
+from panda3d.core import TPLow, PStatCollector
 from direct.directnotify.DirectNotifyGlobal import directNotify
 
 class PackageInstaller(DirectObject):
@@ -33,7 +33,7 @@ class PackageInstaller(DirectObject):
     S_ready = 1      # donePackages() has been called
     S_started = 2    # download has started
     S_done = 3       # download is over
-    
+
     class PendingPackage:
         """ This class describes a package added to the installer for
         download. """
@@ -121,12 +121,12 @@ class PackageInstaller(DirectObject):
                 self.prevDownloadedEffort = self.package.getPrevDownloadedEffort()
 
             return True
-            
+
 
         def getDescFile(self, http):
             """ Synchronously downloads the desc files required for
             the package. """
-            
+
             if not self.host.downloadContentsFile(http):
                 return False
 
@@ -156,10 +156,10 @@ class PackageInstaller(DirectObject):
             PackageInstaller.nextUniqueId += 1
         finally:
             self.globalLock.release()
-        
+
         self.appRunner = appRunner
         self.taskChain = taskChain
-        
+
         # If we're to be running on an asynchronous task chain, and
         # the task chain hasn't yet been set up already, create the
         # default parameters now.
@@ -180,7 +180,7 @@ class PackageInstaller(DirectObject):
         # A list of packages that are waiting for their desc files.
         self.needsDescFile = []
         self.descFileTask = None
-        
+
         # A list of packages that are waiting to be downloaded and
         # installed.
         self.needsDownload = []
@@ -198,7 +198,7 @@ class PackageInstaller(DirectObject):
         # This task is spawned on the default task chain, to update
         # the status during the download.
         self.progressTask = None
-        
+
         self.accept('PackageInstaller-%s-allHaveDesc' % self.uniqueId,
                     self.__allHaveDesc)
         self.accept('PackageInstaller-%s-packageStarted' % self.uniqueId,
@@ -231,7 +231,7 @@ class PackageInstaller(DirectObject):
             self.progressTask = None
 
         self.ignoreAll()
-        
+
     def addPackage(self, packageName, version = None, hostUrl = None):
         """ Adds the named package to the list of packages to be
         downloaded.  Call donePackages() to finish the list. """
@@ -256,7 +256,7 @@ class PackageInstaller(DirectObject):
         if pp in self.packages:
             # Already added.
             return
-        
+
         self.packages.append(pp)
 
         # We always add the package to needsDescFile, even if we
@@ -323,7 +323,7 @@ class PackageInstaller(DirectObject):
         (beginning) to 1 (complete). """
 
         self.notify.debug("packageProgress: %s %s" % (package.packageName, progress))
-        
+
     def downloadProgress(self, overallProgress):
         """ This callback is made repeatedly between downloadStarted()
         and downloadFinished() to update the current progress through
@@ -384,7 +384,7 @@ class PackageInstaller(DirectObject):
         """ This method is called internally when all of the pending
         packages have their desc info. """
         working = True
-        
+
         self.packageLock.acquire()
         try:
             if self.state == self.S_ready:
@@ -489,7 +489,7 @@ class PackageInstaller(DirectObject):
         it extracts one package from self.needsDescFile and downloads
         its desc file.  On success, it adds the package to
         self.needsDownload. """
-        
+
         self.packageLock.acquire()
         try:
             # If we've finished all of the packages that need desc
@@ -515,7 +515,7 @@ class PackageInstaller(DirectObject):
         # This package is now ready to be downloaded.  We always add
         # it to needsDownload, even if it's already downloaded, to
         # guarantee ordering of packages.
-        
+
         self.packageLock.acquire()
         try:
             # Also add any packages required by this one.
@@ -527,7 +527,7 @@ class PackageInstaller(DirectObject):
             self.packageLock.release()
 
         return task.cont
-        
+
     def __downloadPackageTask(self, task):
 
         """ This task runs on the aysynchronous task chain; each pass,
@@ -543,7 +543,7 @@ class PackageInstaller(DirectObject):
                     self.packageLock.release()
                     yield task.done; return
 
-                assert self.state == self.S_started        
+                assert self.state == self.S_started
                 pp = self.needsDownload[0]
                 del self.needsDownload[0]
             except:
@@ -578,7 +578,7 @@ class PackageInstaller(DirectObject):
 
             # Continue the loop without yielding, so we pick up the
             # next package within this same frame.
-        
+
     def __donePackage(self, pp, success):
         """ Marks the indicated package as done, either successfully
         or otherwise. """
@@ -630,9 +630,9 @@ class PackageInstaller(DirectObject):
             else:
                 progress = float(currentDownloadSize) / float(downloadEffort)
             self.downloadProgress(progress)
-            
+
         finally:
             self.callbackLock.release()
 
         return task.cont
-    
+
diff --git a/direct/src/p3d/PackageMerger.py b/direct/src/p3d/PackageMerger.py
index 12eff00233..e5b90705e3 100644
--- a/direct/src/p3d/PackageMerger.py
+++ b/direct/src/p3d/PackageMerger.py
@@ -1,7 +1,7 @@
 from direct.p3d.FileSpec import FileSpec
 from direct.p3d.SeqValue import SeqValue
 from direct.directnotify.DirectNotifyGlobal import *
-from pandac.PandaModules import *
+from panda3d.core import *
 import copy
 import shutil
 import os
@@ -18,11 +18,11 @@ class PackageMerger:
     always the most current version of the file. """
 
     notify = directNotify.newCategory("PackageMerger")
- 
+
     class PackageEntry:
         """ This corresponds to a <package> entry in the contents.xml
         file. """
-        
+
         def __init__(self, xpackage, sourceDir):
             self.sourceDir = sourceDir
             self.loadXml(xpackage)
@@ -48,7 +48,7 @@ class PackageMerger:
             self.descFile.loadXml(xpackage)
 
             self.validatePackageContents()
-            
+
             self.descFile.quickVerify(packageDir = self.sourceDir, notify = PackageMerger.notify, correctSelf = True)
 
             self.packageSeq = SeqValue()
@@ -84,7 +84,7 @@ class PackageMerger:
                 ximport = TiXmlElement('import')
                 self.importDescFile.storeXml(ximport)
                 xpackage.InsertEndChild(ximport)
-            
+
             return xpackage
 
         def validatePackageContents(self):
@@ -170,7 +170,7 @@ class PackageMerger:
             xhost = xcontents.FirstChildElement('host')
             if xhost:
                 self.xhost = xhost.Clone()
-                
+
             xpackage = xcontents.FirstChildElement('package')
             while xpackage:
                 pe = self.PackageEntry(xpackage, sourceDir)
@@ -183,7 +183,7 @@ class PackageMerger:
                     if not other or pe.isNewer(other):
                         # Store this package in the resulting output.
                         self.contents[pe.getKey()] = pe
-                    
+
                 xpackage = xpackage.NextSiblingElement('package')
 
         self.contentsDoc = doc
@@ -247,7 +247,7 @@ class PackageMerger:
             else:
                 # Both the source file and target file are
                 # directories.
-                
+
                 # We have to clean out the target directory first.
                 # Instead of using shutil.rmtree(), remove the files in
                 # this directory one at a time, so we don't inadvertently
@@ -282,10 +282,10 @@ class PackageMerger:
         the current pool.  If packageNames is not None, it is a list
         of package names that we wish to include from the source;
         packages not named in this list will be unchanged. """
-        
+
         if not self.__readContentsFile(sourceDir, packageNames):
             message = "Couldn't read %s" % (sourceDir)
-            raise PackageMergerError, message            
+            raise PackageMergerError, message
 
     def close(self):
         """ Finalizes the results of all of the previous calls to
@@ -302,4 +302,4 @@ class PackageMerger:
 
         self.contentsSeq += 1
         self.__writeContentsFile()
-        
+
diff --git a/direct/src/p3d/Packager.py b/direct/src/p3d/Packager.py
index deb55f3a5e..18cce7d7d9 100644
--- a/direct/src/p3d/Packager.py
+++ b/direct/src/p3d/Packager.py
@@ -15,6 +15,7 @@ import types
 import getpass
 import platform
 import struct
+import subprocess
 from direct.p3d.FileSpec import FileSpec
 from direct.p3d.SeqValue import SeqValue
 from direct.showbase import Loader
@@ -58,7 +59,7 @@ class Packager:
             self.required = required
 
             if not self.newName:
-                self.newName = self.filename.cStr()
+                self.newName = str(self.filename)
 
             ext = Filename(self.newName).getExtension()
             if ext == 'pz':
@@ -66,7 +67,7 @@ class Packager:
                 # within the Multifile without it.
                 filename = Filename(self.newName)
                 filename.setExtension('')
-                self.newName = filename.cStr()
+                self.newName = str(filename)
                 ext = Filename(self.newName).getExtension()
                 if self.compress is None:
                     self.compress = True
@@ -80,8 +81,8 @@ class Packager:
 
             if self.executable and self.dependencyDir is None:
                 # By default, install executable dependencies in the
-                # same directory with the executable itself.
-                self.dependencyDir = Filename(self.newName).getDirname()
+                # root directory, which is the one that's added to PATH.
+                self.dependencyDir = ''
 
             if self.extract is None:
                 self.extract = self.executable or (ext in packager.extractExtensions)
@@ -93,13 +94,13 @@ class Packager:
 
             if self.executable:
                 # Look up the filename along the system PATH, if necessary.
-                if not self.filename.resolveFilename(packager.executablePath):
+                if not packager.resolveLibrary(self.filename):
                     # If it wasn't found, try looking it up under its
                     # basename only.  Sometimes a Mac user will copy
                     # the library file out of a framework and put that
                     # along the PATH, instead of the framework itself.
                     basename = Filename(self.filename.getBasename())
-                    if basename.resolveFilename(packager.executablePath):
+                    if packager.resolveLibrary(basename):
                         self.filename = basename
 
             if ext in packager.textExtensions and not self.executable:
@@ -156,7 +157,7 @@ class Packager:
             if not self.localOnly:
                 filename = Filename(filename)
                 filename.makeCanonical()
-            self.glob = GlobPattern(filename.cStr())
+            self.glob = GlobPattern(str(filename))
 
             if self.packager.platform.startswith('win'):
                 self.glob.setCaseSensitive(False)
@@ -167,7 +168,7 @@ class Packager:
             if self.localOnly:
                 return self.glob.matches(filename.getBasename())
             else:
-                return self.glob.matches(filename.cStr())
+                return self.glob.matches(str(filename))
 
     class PackageEntry:
         """ This corresponds to a <package> entry in the contents.xml
@@ -586,9 +587,9 @@ class Packager:
                     # (i.e. missing) modules.
                     continue
 
-                if newName == '__main__':
-                    # Ignore this special case.
-                    continue
+                #if newName == '__main__':
+                #    # Ignore this special case.
+                #    continue
 
                 self.moduleNames[newName] = mdef
 
@@ -937,7 +938,7 @@ class Packager:
                         # means we should include the manifest
                         # file itself in the package.
                         newName = Filename(file.dependencyDir, mfile.getBasename())
-                        self.addFile(mfile, newName = newName.cStr(),
+                        self.addFile(mfile, newName = str(newName),
                                      explicit = False, executable = True)
 
                     if afilenames is None and out != 31:
@@ -957,7 +958,7 @@ class Packager:
                     filename.makeTrueCase()
 
                     newName = Filename(file.dependencyDir, filename.getBasename())
-                    self.addFile(filename, newName = newName.cStr(),
+                    self.addFile(filename, newName = str(newName),
                                  explicit = False, executable = True)
 
         def __parseDependenciesWindows(self, tempFile):
@@ -1172,7 +1173,7 @@ class Packager:
                             # It's a fully-specified filename; look
                             # for it under the system root first.
                             if self.packager.systemRoot:
-                                f2 = Filename(self.packager.systemRoot + filename.cStr())
+                                f2 = Filename(self.packager.systemRoot, filename)
                                 if f2.exists():
                                     filename = f2
 
@@ -1181,7 +1182,7 @@ class Packager:
                         continue
 
                     newName = Filename(file.dependencyDir, filename.getBasename())
-                    self.addFile(filename, newName = newName.cStr(),
+                    self.addFile(filename, newName = str(newName),
                                  explicit = False, executable = True)
 
         def __parseDependenciesOSX(self, tempFile):
@@ -1346,6 +1347,7 @@ class Packager:
 
                 # If that failed, perhaps ldd will help us.
                 if filenames is None:
+                    self.notify.warning("Reading ELF library %s failed, using ldd instead" % (file.filename))
                     tempFile = Filename.temporary('', 'p3d_', '.txt')
                     command = 'ldd "%s" >"%s"' % (
                         file.filename.toOsSpecific(),
@@ -1379,7 +1381,7 @@ class Packager:
                     filename.setBinary()
 
                     newName = Filename(file.dependencyDir, filename.getBasename())
-                    self.addFile(filename, newName = newName.cStr(),
+                    self.addFile(filename, newName = str(newName),
                                  explicit = False, executable = True)
 
         def __parseDependenciesPosix(self, tempFile):
@@ -1470,7 +1472,7 @@ class Packager:
             # compatible with older versions of the core API that
             # didn't understand the SF_text flag.
             filename.setBinary()
-            
+
             doc.SaveFile(filename.toOsSpecific())
 
             # It's important not to compress this file: the core API
@@ -1772,8 +1774,6 @@ class Packager:
 
             return xspec
 
-
-
         def addPyFile(self, file):
             """ Adds the indicated python file, identified by filename
             instead of by module name, to the package. """
@@ -1793,6 +1793,18 @@ class Packager:
                 # deal with it again.
                 return
 
+            # Make sure that it is actually in a package.
+            parentName = moduleName
+            while '.' in parentName:
+                parentName = parentName.rsplit('.', 1)[0]
+                if parentName not in self.freezer.modules:
+                    message = 'Cannot add Python file %s; not in package' % (file.newName)
+                    if file.required or file.explicit:
+                        raise StandardError, message
+                    else:
+                        self.notify.warning(message)
+                    return
+
             self.freezer.addModule(moduleName, filename = file.filename)
 
         def addEggFile(self, file):
@@ -1803,7 +1815,7 @@ class Packager:
 
             bamName = Filename(file.newName)
             bamName.setExtension('bam')
-            self.addNode(np.node(), file.filename, bamName.cStr())
+            self.addNode(np.node(), file.filename, str(bamName))
 
         def addBamFile(self, file):
             # Load the bam file so we can massage its textures.
@@ -2207,6 +2219,9 @@ class Packager:
         cvar = ConfigVariableSearchPath('pdef-path')
         self.installSearch = list(map(Filename, cvar.getDirectories()))
 
+        # This is where we cache the location of libraries.
+        self.libraryCache = {}
+
         # The system PATH, for searching dll's and exe's.
         self.executablePath = DSearchPath()
 
@@ -2219,22 +2234,36 @@ class Packager:
         # Now add the actual system search path.
         if self.platform.startswith('win'):
             self.addWindowsSearchPath(self.executablePath, "PATH")
-        elif self.platform.startswith('osx'):
-            self.addPosixSearchPath(self.executablePath, "DYLD_LIBRARY_PATH")
-            self.addPosixSearchPath(self.executablePath, "LD_LIBRARY_PATH")
-            self.addPosixSearchPath(self.executablePath, "PATH")
-            self.executablePath.appendDirectory('/lib')
-            self.executablePath.appendDirectory('/usr/lib')
-            self.executablePath.appendDirectory('/usr/local/lib')
-        else:
-            self.addPosixSearchPath(self.executablePath, "LD_LIBRARY_PATH")
-            self.addPosixSearchPath(self.executablePath, "PATH")
-            self.executablePath.appendDirectory('/lib')
-            self.executablePath.appendDirectory('/usr/lib')
-            self.executablePath.appendDirectory('/usr/local/lib')
 
-        import platform
-        if platform.uname()[1]=="pcbsd":
+        else:
+            if self.platform.startswith('osx'):
+                self.addPosixSearchPath(self.executablePath, "DYLD_LIBRARY_PATH")
+
+            self.addPosixSearchPath(self.executablePath, "LD_LIBRARY_PATH")
+            self.addPosixSearchPath(self.executablePath, "PATH")
+
+            if self.platform.startswith('linux'):
+                # It used to be okay to just add some common paths on Linux.
+                # But nowadays, each distribution has their own convention for
+                # where they put their libraries.  Instead, we query the ldconfig
+                # cache, which contains the location of all libraries.
+
+                if not self.loadLdconfigCache():
+                    # Ugh, failure.  All that remains is to guess.  This should
+                    # work for the most common Debian configurations.
+                    multiarchDir = "/lib/%s-linux-gnu" % (os.uname()[4])
+                    if os.path.isdir(multiarchDir):
+                        self.executablePath.appendDirectory(multiarchDir)
+                    if os.path.isdir("/usr/" + multiarchDir):
+                        self.executablePath.appendDirectory("/usr/" + multiarchDir)
+
+            else:
+                # FreeBSD, or some other system that still makes sense.
+                self.executablePath.appendDirectory('/lib')
+                self.executablePath.appendDirectory('/usr/lib')
+                self.executablePath.appendDirectory('/usr/local/lib')
+
+        if os.uname()[1] == "pcbsd":
             self.executablePath.appendDirectory('/usr/PCBSD/local/lib')
 
         # Set this flag true to automatically add allow_python_dev to
@@ -2388,6 +2417,7 @@ class Packager:
             GlobPattern('libpthread.so*'),
             GlobPattern('libthr.so*'),
             GlobPattern('ld-linux.so*'),
+            GlobPattern('ld-linux-*.so*'),
             ]
 
         # A Loader for loading models.
@@ -2405,6 +2435,60 @@ class Packager:
         # file.
         self.contents = {}
 
+    def loadLdconfigCache(self):
+        """ On GNU/Linux, runs ldconfig -p to find out where all the
+        libraries on the system are located.  Assumes that the platform
+        has already been set. """
+
+        if not os.path.isfile('/sbin/ldconfig'):
+            return False
+
+        handle = subprocess.Popen(['/sbin/ldconfig', '-p'], stdout=subprocess.PIPE)
+        out, err = handle.communicate()
+
+        if handle.returncode != 0:
+            self.notify.warning("/sbin/ldconfig -p returned code %d" %(handle.returncode))
+            return False
+
+        for line in out.splitlines():
+            if '=>' not in line:
+                continue
+
+            prefix, location = line.rsplit('=>', 1)
+            prefix = prefix.strip()
+            location = location.strip()
+
+            if not location or not prefix or ' ' not in prefix:
+                self.notify.warning("Ignoring malformed ldconfig -p line: " + line)
+                continue
+
+            lib, opts = prefix.split(' ', 1)
+            if ('x86-64' in opts) != self.platform.endswith('_amd64'):
+                # This entry isn't meant for our architecture.  I think
+                # x86-64 is the only platform where ldconfig supplies
+                # this extra arch string.
+                continue
+
+            self.libraryCache[lib] = Filename.fromOsSpecific(location)
+
+        return True
+
+    def resolveLibrary(self, filename):
+        """ Resolves the given shared library filename along the executable path,
+        or by cross-referencing it with the library cache. """
+
+        path = str(filename)
+
+        if path in self.libraryCache:
+            filename.setFullpath(self.libraryCache[path].getFullpath())
+            return True
+
+        if filename.resolveFilename(self.executablePath):
+            self.libraryCache[path] = Filename(filename)
+            return True
+
+        return False
+
     def setPlatform(self, platform = None):
         """ Sets the platform that this Packager will compute for.  On
         OSX, this can be used to specify the particular architecture
@@ -3143,9 +3227,17 @@ class Packager:
         for moduleName in args:
             self.currentPackage.freezer.excludeModule(moduleName)
 
+    def do_main(self, filename):
+        """ Includes the indicated file as __main__ module of the application.
+        Also updates mainModule to point to this module. """
+
+        self.addModule(['__main__'], '__main__', filename, required = True)
+        self.currentPackage.mainModule = ('__main__', '__main__')
+
     def do_mainModule(self, moduleName, newName = None, filename = None):
         """ Names the indicated module as the "main" module of the
-        application or exe. """
+        application or exe.  In most cases, you will want to use main()
+        instead. """
 
         if not self.currentPackage:
             raise OutsideOfPackageError
@@ -3162,7 +3254,7 @@ class Packager:
             newFilename = Filename('/'.join(moduleName.split('.')))
             newFilename.setExtension(filename.getExtension())
             self.currentPackage.addFile(
-                filename, newName = newFilename.cStr(),
+                filename, newName = str(newFilename),
                 explicit = True, extract = True, required = True)
 
         self.currentPackage.mainModule = (moduleName, newName)
@@ -3194,7 +3286,9 @@ class Packager:
         # Multifile, so this file can't itself be in the Multifile.
 
         # This requires a bit of care, because we only want to freeze
-        # VFSImporter.py, and not any other part of direct.
+        # VFSImporter.py, and not any other part of direct.  We do
+        # also want panda3d/__init__.py, though, since it would
+        # otherwise be part of the multifile.
         self.do_excludeModule('direct')
 
         # Import the actual VFSImporter module to get its filename on
@@ -3205,7 +3299,7 @@ class Packager:
         self.do_module('VFSImporter', filename = filename)
         self.do_freeze('_vfsimporter', compileToExe = False)
 
-        self.do_file('libpandaexpress.dll');
+        self.do_file('panda3d/core.pyd');
 
         # Now that we're done freezing, explicitly add 'direct' to
         # counteract the previous explicit excludeModule().
@@ -3438,13 +3532,13 @@ class Packager:
                     # build.
                     dllFilename = Filename(filename)
                     dllFilename.setExtension('so')
-                    dllFilename = Filename.dsoFilename(dllFilename.cStr())
+                    dllFilename = Filename.dsoFilename(str(dllFilename))
                     if dllFilename != filename:
                         thisFiles = glob.glob(filename.toOsSpecific())
                         if not thisFiles:
                             # We have to resolve this filename to
                             # determine if it's a _d or not.
-                            if dllFilename.resolveFilename(self.executablePath):
+                            if self.resolveLibrary(dllFilename):
                                 thisFiles = [dllFilename.toOsSpecific()]
                             else:
                                 thisFiles = [filename.toOsSpecific()]
@@ -3455,7 +3549,7 @@ class Packager:
 
         prefix = ''
         if newDir is not None:
-            prefix = Filename(newDir).cStr()
+            prefix = str(Filename(newDir))
             if prefix and prefix[-1] != '/':
                 prefix += '/'
 
@@ -3527,13 +3621,22 @@ class Packager:
         sys.path.append(dirname.toOsSpecific())
         self.__recurseDir(dirname, newDir, unprocessed = unprocessed)
 
-    def __recurseDir(self, filename, newName, unprocessed = None):
+    def __recurseDir(self, filename, newName, unprocessed = None, packageTree = None):
         dirList = vfs.scanDirectory(filename)
         if dirList:
             # It's a directory name.  Recurse.
             prefix = newName
             if prefix and prefix[-1] != '/':
                 prefix += '/'
+
+            # First check if this is a Python package tree.  If so, add it
+            # implicitly as a module.
+            for subfile in dirList:
+                filename = subfile.getFilename()
+                if filename.getBasename() == '__init__.py':
+                    moduleName = newName.replace("/", ".")
+                    self.addModule([moduleName], filename=filename)
+
             for subfile in dirList:
                 filename = subfile.getFilename()
                 self.__recurseDir(filename, prefix + filename.getBasename(),
@@ -3550,7 +3653,7 @@ class Packager:
                 # Strip off an implicit .pz extension.
                 newFilename = Filename(filename)
                 newFilename.setExtension('')
-                newFilename = Filename(newFilename.cStr())
+                newFilename = Filename(str(newFilename))
                 ext = newFilename.getExtension()
 
             if ext in self.knownExtensions:
diff --git a/direct/src/p3d/PatchMaker.py b/direct/src/p3d/PatchMaker.py
index ba7bd3b222..e11306b82f 100644
--- a/direct/src/p3d/PatchMaker.py
+++ b/direct/src/p3d/PatchMaker.py
@@ -1,6 +1,6 @@
 from direct.p3d.FileSpec import FileSpec
 from direct.p3d.SeqValue import SeqValue
-from pandac.PandaModules import *
+from panda3d.core import *
 import copy
 
 class PatchMaker:
@@ -14,7 +14,7 @@ class PatchMaker:
         the package's "version" string; it also corresponds to the
         particular patch version, which increments independently of
         the "version". """
-        
+
         def __init__(self, packageName, platform, version, hostUrl, file):
             self.packageName = packageName
             self.platform = platform
@@ -84,7 +84,7 @@ class PatchMaker:
             apply in sequence, and the packageVersion object
             associated with each patch.  Returns (None, None, None) if
             there is no way to recreate this archive file.  """
-            
+
             if self.tempFile:
                 return (self.tempFile, self, [])
 
@@ -101,7 +101,7 @@ class PatchMaker:
                 # version of some package.
                 package = self.packageCurrent
                 return (Filename(package.packageDir, package.compressedFilename), self, [])
-            
+
             if self.packageBase:
                 # This PackageVersion instance represents the base
                 # (oldest) version of some package.
@@ -144,7 +144,7 @@ class PatchMaker:
                     # Failure trying to decompress the file.
                     return None
                 startFile = startPv.tempFile
-            
+
             if not plan:
                 # If plan is a zero-length list, we're already
                 # here--return startFile.  If plan is None, there's no
@@ -162,7 +162,7 @@ class PatchMaker:
                 if not result:
                     # Failure trying to re-create the file.
                     return None
-                
+
                 pv.tempFile = result
                 prevFile = result
 
@@ -194,10 +194,10 @@ class PatchMaker:
                     return patch.toPv
 
             return None
-        
+
     class Patchfile:
         """ A single patchfile for a package. """
-        
+
         def __init__(self, package):
             self.package = package
             self.packageName = package.packageName
@@ -233,7 +233,7 @@ class PatchMaker:
         def fromFile(self, packageDir, patchFilename, sourceFile, targetFile):
             """ Creates the data structures from an existing patchfile
             on disk. """
-            
+
             self.file = FileSpec()
             self.file.fromFile(packageDir, patchFilename)
             self.sourceFile = sourceFile
@@ -241,7 +241,7 @@ class PatchMaker:
 
         def loadXml(self, xpatch):
             """ Reads the data structures from an xml file. """
-            
+
             self.packageName = xpatch.Attribute('name') or self.packageName
             self.platform = xpatch.Attribute('platform') or self.platform
             self.version = xpatch.Attribute('version') or self.version
@@ -287,7 +287,7 @@ class PatchMaker:
     class Package:
         """ This is a particular package.  This contains all of the
         information needed to reconstruct the package's desc file. """
-        
+
         def __init__(self, packageDesc, patchMaker, xpackage = None):
             self.packageDir = Filename(patchMaker.installDir, packageDesc.getDirname())
             self.packageDesc = packageDesc
@@ -312,19 +312,19 @@ class PatchMaker:
         def getCurrentKey(self):
             """ Returns the key to locate the current version of this
             package. """
-            
+
             return (self.packageName, self.platform, self.version, self.hostUrl, self.currentFile)
 
         def getBaseKey(self):
             """ Returns the key to locate the "base" or oldest version
             of this package. """
-            
+
             return (self.packageName, self.platform, self.version, self.hostUrl, self.baseFile)
 
         def getTopKey(self):
             """ Returns the key to locate the "top" or newest version
             of this package. """
-            
+
             return (self.packageName, self.platform, self.version, self.hostUrl, self.topFile)
 
         def getGenericKey(self, fileSpec):
@@ -345,7 +345,7 @@ class PatchMaker:
             if not self.doc.LoadFile():
                 print "Couldn't read %s" % (packageDescFullpath)
                 return False
-            
+
             xpackage = self.doc.FirstChildElement('package')
             if not xpackage:
                 return False
@@ -358,7 +358,7 @@ class PatchMaker:
             # other hosts, which means we'll need to fill in a value
             # here for those hosts.
             self.hostUrl = None
-        
+
             self.currentFile = None
             self.baseFile = None
             self.topFile = None
@@ -388,7 +388,7 @@ class PatchMaker:
                 else:
                     # There's a new version this pass.  Update it.
                     self.anyChanges = True
-                
+
             else:
                 # If there isn't a top_version yet, we have to make
                 # one, by duplicating the currentFile.
@@ -516,7 +516,7 @@ class PatchMaker:
             xarchive = TiXmlElement('top_version')
             self.currentFile.storeXml(xarchive)
             xpackage.InsertEndChild(xarchive)
-            
+
             for patchfile in self.patches:
                 xpatch = patchfile.makeXml(self)
                 xpackage.InsertEndChild(xpatch)
@@ -571,7 +571,7 @@ class PatchMaker:
         patches for all packages; otherwise, it should be a list of
         package name strings, limiting the set of packages that are
         processed. """
-        
+
         if not self.readContentsFile():
             return False
         self.buildPatchChains()
@@ -587,7 +587,7 @@ class PatchMaker:
     def cleanup(self):
         """ Should be called on exit to remove temporary files and
         such created during processing. """
-        
+
         for pv in self.packageVersions.values():
             pv.cleanup()
 
@@ -596,11 +596,11 @@ class PatchMaker:
         constructs a patch chain from the version represented by
         fileSpec to the current version of this package, if possible.
         Returns the patch chain if successful, or None otherwise. """
-        
+
         package = self.readPackageDescFile(descFilename)
         if not package:
             return None
-        
+
         self.buildPatchChains()
         fromPv = self.getPackageVersion(package.getGenericKey(fileSpec))
         toPv = package.currentPv
@@ -619,7 +619,7 @@ class PatchMaker:
         package = self.Package(Filename(descFilename), self)
         if not package.readDescFile(doProcessing = False):
             return None
-        
+
         self.packages.append(package)
         return package
 
@@ -640,7 +640,7 @@ class PatchMaker:
             contentsSeq.loadXml(xcontents)
             contentsSeq += 1
             contentsSeq.storeXml(xcontents)
-            
+
             xpackage = xcontents.FirstChildElement('package')
             while xpackage:
                 solo = xpackage.Attribute('solo')
@@ -651,7 +651,7 @@ class PatchMaker:
                     package = self.Package(filename, self, xpackage)
                     package.readDescFile(doProcessing = True)
                     self.packages.append(package)
-                    
+
                 xpackage = xpackage.NextSiblingElement('package')
 
         self.contentsDoc = doc
@@ -685,7 +685,7 @@ class PatchMaker:
             pv = self.PackageVersion(*key)
             self.packageVersions[k] = pv
         return pv
-    
+
     def buildPatchChains(self):
         """ Builds up the chains of PackageVersions and the patchfiles
         that connect them. """
@@ -696,7 +696,7 @@ class PatchMaker:
             if not package.baseFile:
                 # This package doesn't have any versions yet.
                 continue
-            
+
             currentPv = self.getPackageVersion(package.getCurrentKey())
             package.currentPv = currentPv
             currentPv.packageCurrent = package
@@ -710,7 +710,7 @@ class PatchMaker:
             topPv = self.getPackageVersion(package.getTopKey())
             package.topPv = topPv
             topPv.packageTop = package
-            
+
             for patchfile in package.patches:
                 self.recordPatchfile(patchfile)
 
@@ -757,7 +757,7 @@ class PatchMaker:
         # What's the current version on the top of the tree?
         topPv = package.topPv
         currentPv = package.currentPv
-        
+
         if topPv != currentPv:
             # They're different, so build a new patch.
             filename = Filename(package.currentFile.filename + '.%s.patch' % (package.patchVersion))
@@ -786,7 +786,7 @@ class PatchMaker:
                            v1.file, v2.file)
         package.patches.append(patchfile)
         package.anyChanges = True
-        
+
         self.recordPatchfile(patchfile)
 
         return True
diff --git a/direct/src/p3d/ScanDirectoryNode.py b/direct/src/p3d/ScanDirectoryNode.py
index b3618880ae..1569ed642f 100644
--- a/direct/src/p3d/ScanDirectoryNode.py
+++ b/direct/src/p3d/ScanDirectoryNode.py
@@ -1,9 +1,9 @@
-from pandac.PandaModules import VirtualFileSystem, VirtualFileMountSystem, Filename, TiXmlDocument
+from panda3d.core import VirtualFileSystem, VirtualFileMountSystem, Filename, TiXmlDocument
 vfs = VirtualFileSystem.getGlobalPtr()
 
 class ScanDirectoryNode:
     """ This class is used to scan a list of files on disk. """
-    
+
     def __init__(self, pathname, ignoreUsageXml = False):
         self.pathname = pathname
         self.filenames = []
@@ -38,7 +38,7 @@ class ScanDirectoryNode:
                 if not isinstance(vfile.getMount(), VirtualFileMountSystem):
                     # Not a real file; ignore it.
                     continue
-                
+
             if vfile.isDirectory():
                 # A nested directory.
                 subdir = ScanDirectoryNode(vfile.getFilename(), ignoreUsageXml = ignoreUsageXml)
@@ -49,7 +49,7 @@ class ScanDirectoryNode:
                 # A nested file.
                 self.filenames.append(vfile.getFilename())
                 self.fileSize += vfile.getFileSize()
-                
+
             else:
                 # Some other wacky file thing.
                 self.filenames.append(vfile.getFilename())
@@ -78,7 +78,7 @@ class ScanDirectoryNode:
                 self.nested.remove(subdir)
                 self.nestedSize -= subdir.getTotalSize()
                 return subdir
-            
+
             result = subdir.extractSubdir(pathname)
             if result:
                 self.nestedSize -= result.getTotalSize()
@@ -89,5 +89,5 @@ class ScanDirectoryNode:
                 return result
 
         return None
-    
+
 
diff --git a/direct/src/p3d/coreapi.pdef b/direct/src/p3d/coreapi.pdef
index c3a2086401..bf066e5d51 100644
--- a/direct/src/p3d/coreapi.pdef
+++ b/direct/src/p3d/coreapi.pdef
@@ -1,4 +1,4 @@
-from pandac.PandaModules import getModelPath, Filename, ConfigVariableFilename, DSearchPath, ExecutionEnvironment, PandaSystem
+from panda3d.core import getModelPath, Filename, ConfigVariableFilename, DSearchPath, ExecutionEnvironment, PandaSystem
 
 # This file defines a number of standard "packages" that correspond to
 # a Panda3D distribution.  These packages are built by passing this
@@ -57,7 +57,7 @@ class images(package):
             basename = '%s.jpg' % (name)
             filename = Filename(basename)
             found = filename.resolveFilename(search)
-            
+
         if found:
             # Add the image file to the package
             file(filename, newName = basename, extract = True)
@@ -91,7 +91,7 @@ class certlist(package):
     # ".pem" or ".crt" extension, and they should be added with the
     # extract = True flag so they will be extracted to disk.
     pass
-    
+
 
 class p3dcert(package):
     # This special application, used to pop up a dialog to prompt the
@@ -102,7 +102,7 @@ class p3dcert(package):
         # On Mac, we package up a P3DCert.app bundle.  This includes
         # specifications in the plist file to avoid creating a dock
         # icon and stuff.
-        
+
         # Find p3dcert.plist in the direct source tree.
         import direct
         plist = Filename(direct.__path__[0], 'plugin/p3dcert.plist')
diff --git a/direct/src/p3d/packp3d.py b/direct/src/p3d/packp3d.py
index 6331995448..7dbe3a30b9 100755
--- a/direct/src/p3d/packp3d.py
+++ b/direct/src/p3d/packp3d.py
@@ -93,8 +93,8 @@ import os
 import getopt
 import glob
 import direct
-from direct.p3d import Packager 
-from pandac.PandaModules import *
+from direct.p3d import Packager
+from panda3d.core import *
 
 # Temp hack for debugging.
 #from direct.p3d.AppRunner import dummyAppRunner; dummyAppRunner()
@@ -113,7 +113,7 @@ def makePackedApp(args):
     configFlags = []
     requires = []
     allowPythonDev = False
-    
+
     for option, value in opts:
         if option == '-o':
             appFilename = Filename.fromOsSpecific(value)
@@ -183,11 +183,7 @@ def makePackedApp(args):
             main = os.path.split(main[0])[1]
 
     main = Filename.fromOsSpecific(main)
-    mainModule = Filename(main)
-    mainModule.setExtension('')
 
-    mainModule = mainModule.cStr().replace('/', '.')
-    
     packager.installDir = appDir
     packager.allowPythonDev = allowPythonDev
 
@@ -206,7 +202,7 @@ def makePackedApp(args):
         # panda3d.
         if 'panda3d' not in [t[0] for t in requires]:
             packager.do_require('panda3d')
-        
+
         for name, version, host in requires:
             packager.do_require(name, version = version, host = host)
 
@@ -214,10 +210,10 @@ def makePackedApp(args):
             packager.do_config(**dict(configFlags))
 
         packager.do_dir(root)
-        packager.do_mainModule(mainModule)
+        packager.do_main(main)
         packager.endPackage()
         packager.close()
-        
+
     except Packager.PackagerError:
         # Just print the error message and exit gracefully.
         inst = sys.exc_info()[1]
diff --git a/direct/src/p3d/panda3d.pdef b/direct/src/p3d/panda3d.pdef
index 6c93c4485d..4f3df21c97 100755
--- a/direct/src/p3d/panda3d.pdef
+++ b/direct/src/p3d/panda3d.pdef
@@ -1,4 +1,4 @@
-from pandac.PandaModules import Filename, PandaSystem, getModelPath
+from panda3d.core import Filename, PandaSystem, getModelPath
 
 # This file defines a number of standard "packages" that correspond to
 # a Panda3D distribution.  These packages are built by passing this
@@ -54,7 +54,11 @@ class panda3d(package):
            'direct.showutil.*',
            'direct.stdpy.*',
            'direct.task.*')
-    module('panda3d')
+
+    module('panda3d.core',
+           'panda3d.direct',
+           'panda3d.fx',
+           'panda3d.physics')
 
     # Include various standard Python encodings.  The rest is in morepy.
     module('encodings', 'encodings.aliases', 'encodings.undefined,'
@@ -65,9 +69,19 @@ class panda3d(package):
     import direct
     file(Filename(direct.__path__[0], 'filter/*.sha'), newDir = 'direct/filter')
 
+    # pandac.PandaModules pulls in other Panda3D libs automatically.
     # Exclude these Panda3D libs; they are big and many applications don't
     # use them.  We define them as separate, optional packages, below,
     # except for skel - this is useless in a shipped game anyways.
+    excludeModule('panda3d.egg')
+    excludeModule('panda3d.ode')
+    excludeModule('panda3d.bullet')
+    excludeModule('panda3d.vision')
+    excludeModule('panda3d.skel')
+    excludeModule('panda3d.physx')
+    excludeModule('panda3d.ai')
+    excludeModule('panda3d.vrpn')
+
     excludeModule('libpandaegg')
     excludeModule('libpandaode')
     excludeModule('libpandabullet')
@@ -89,6 +103,8 @@ class panda3d(package):
 
     excludeModule('MySQLdb', '_mysql')
 
+    excludeModule('xml', 'xml.parsers.expat', 'xml.sax')
+
     # Most of the core Panda3D DLL's will be included implicitly due to
     # being referenced by the above Python code.  Here we name a few more
     # that are also needed, but aren't referenced by any code.  Again,
@@ -96,7 +112,7 @@ class panda3d(package):
     # platform-specific extension for an executable.
     file('libpandagl.dll', 'libp3tinydisplay.dll')
     if platform.startswith('win'):
-        file('libpandadx8.dll', 'libpandadx9.dll')
+        file('libpandadx9.dll')
 
     # A basic config file is needed to lay some some fundamental runtime
     # variables.
@@ -104,7 +120,6 @@ class panda3d(package):
         auxDisplays = """
 aux-display pandagl
 aux-display pandadx9
-aux-display pandadx8
 aux-display p3tinydisplay
 """
     else:
@@ -270,6 +285,7 @@ class egg(package):
     config(display_name = "Panda3D egg loader")
     require('panda3d')
 
+    module('panda3d.egg', required = True)
     file('libpandaegg.dll', required = True)
     file('libp3ptloader.dll', required = True)
 
@@ -287,6 +303,7 @@ class ode(package):
     config(display_name = "Panda3D Open Dynamics Engine integration")
     require('panda3d')
 
+    module('panda3d.ode', required = True)
     file('libpandaode.dll', required = True)
 
 class bullet(package):
@@ -297,6 +314,7 @@ class bullet(package):
     config(display_name = "Panda3D Bullet integration")
     require('panda3d')
 
+    module('panda3d.bullet', required = True)
     file('libpandabullet.dll', required = True)
 
 class physx(package):
@@ -307,6 +325,7 @@ class physx(package):
     config(display_name = "Panda3D PhysX integration")
     require('panda3d')
 
+    module('panda3d.physx', required = True)
     file('libpandaphysx.dll', required = True)
     file('physxcudart_20.dll')
     file('PhysXDevice.dll')
@@ -320,6 +339,7 @@ class ai(package):
     config(display_name = "Panda3D AI modules")
     require('panda3d')
 
+    module('panda3d.ai', required = True)
     file('libpandaai.dll', required = True)
 
 class vision(package):
@@ -331,6 +351,7 @@ class vision(package):
     config(display_name = "Panda3D vision modules")
     require('panda3d')
 
+    module('panda3d.vision', required = True)
     file('libp3vision.dll', required = True)
 
 class rocket(package):
@@ -341,6 +362,7 @@ class rocket(package):
     config(display_name = "Panda3D libRocket support")
     require('panda3d')
 
+    module('panda3d.rocket', required = True)
     module('_rocketcore', '_rocketcontrols')
     file('libp3rocket.dll', required = True)
 
@@ -351,6 +373,7 @@ class vrpn(package):
     config(display_name = "Panda3D VRPN support")
     require('panda3d')
 
+    module('panda3d.vrpn', required = True)
     file('libp3vrpn.dll', required = True)
 
 
diff --git a/direct/src/p3d/pdeploy.py b/direct/src/p3d/pdeploy.py
index e13bd55d66..9ba14e43be 100644
--- a/direct/src/p3d/pdeploy.py
+++ b/direct/src/p3d/pdeploy.py
@@ -102,7 +102,7 @@ Options:
      is licensed under.
      Only relevant when generating a graphical installer.
 
-  -O 
+  -O
      Specify this option when generating a graphical installer to omit
      the default checkboxes for "run this program" and "install a
      desktop shortcut" on completion.
@@ -147,7 +147,7 @@ import sys
 import os
 import getopt
 from direct.p3d.DeploymentTools import Standalone, Installer, Icon
-from pandac.PandaModules import Filename, PandaSystem
+from panda3d.core import Filename, PandaSystem
 
 def usage(code, msg = ''):
     if not msg:
diff --git a/direct/src/p3d/pmerge.py b/direct/src/p3d/pmerge.py
index 835cfcc5f3..2b290eb044 100755
--- a/direct/src/p3d/pmerge.py
+++ b/direct/src/p3d/pmerge.py
@@ -47,7 +47,7 @@ import getopt
 import os
 
 from direct.p3d import PackageMerger
-from pandac.PandaModules import *
+from panda3d.core import *
 
 def usage(code, msg = ''):
     print >> sys.stderr, usageText % {'prog' : os.path.split(sys.argv[0])[1]}
@@ -66,7 +66,7 @@ for opt, arg in opts:
         installDir = Filename.fromOsSpecific(arg)
     elif opt == '-p':
         packageNames += arg.split(',')
-        
+
     elif opt == '-h':
         usage(0)
     else:
@@ -92,7 +92,7 @@ try:
     for dir in inputDirs:
         pm.merge(dir, packageNames = packageNames)
     pm.close()
-        
+
 except PackageMerger.PackageMergerError:
     # Just print the error message and exit gracefully.
     inst = sys.exc_info()[1]
diff --git a/direct/src/p3d/ppackage.py b/direct/src/p3d/ppackage.py
index fa2c74c846..3897c7c52c 100755
--- a/direct/src/p3d/ppackage.py
+++ b/direct/src/p3d/ppackage.py
@@ -132,7 +132,7 @@ import getopt
 import os
 
 from direct.p3d import Packager
-from pandac.PandaModules import *
+from panda3d.core import *
 
 def usage(code, msg = ''):
     print >> sys.stderr, usageText % {
diff --git a/direct/src/p3d/ppatcher.py b/direct/src/p3d/ppatcher.py
index 3f2ef16b67..440e22cb61 100755
--- a/direct/src/p3d/ppatcher.py
+++ b/direct/src/p3d/ppatcher.py
@@ -60,7 +60,7 @@ import getopt
 import os
 
 from direct.p3d.PatchMaker import PatchMaker
-from pandac.PandaModules import *
+from panda3d.core import *
 
 def usage(code, msg = ''):
     print >> sys.stderr, usageText % {'prog' : os.path.split(sys.argv[0])[1]}
@@ -76,7 +76,7 @@ installDir = None
 for opt, arg in opts:
     if opt == '-i':
         installDir = Filename.fromOsSpecific(arg)
-        
+
     elif opt == '-h':
         usage(0)
     else:
diff --git a/direct/src/p3d/runp3d.py b/direct/src/p3d/runp3d.py
index a7807de332..e561e73a0f 100644
--- a/direct/src/p3d/runp3d.py
+++ b/direct/src/p3d/runp3d.py
@@ -28,7 +28,7 @@ import sys
 import getopt
 from AppRunner import AppRunner, ArgumentError
 from direct.task.TaskManagerGlobal import taskMgr
-from pandac.PandaModules import Filename
+from panda3d.core import Filename
 
 def parseSysArgs():
     """ Handles sys.argv, if there are any local arguments, and
diff --git a/direct/src/p3d/thirdparty.pdef b/direct/src/p3d/thirdparty.pdef
index 6148f27d58..b657aac95b 100644
--- a/direct/src/p3d/thirdparty.pdef
+++ b/direct/src/p3d/thirdparty.pdef
@@ -13,7 +13,7 @@
 
 # Also see panda3d.pdef.
 
-from pandac.PandaModules import Filename
+from panda3d.core import Filename
 import sys
 
 class wx(package):
@@ -95,7 +95,7 @@ class twisted(package):
            'twisted.runner', 'twisted.scripts', 'twisted.spread',
            'twisted.tap', 'twisted.trial', 'twisted.vfs',
            'twisted.web', 'twisted.web2', 'twisted.words')
-           
+
     module('twisted.*', 'twisted.*.*')
 
 class pil(package):
diff --git a/direct/src/particles/ForceGroup.py b/direct/src/particles/ForceGroup.py
index c0b21e4c61..8c04052232 100644
--- a/direct/src/particles/ForceGroup.py
+++ b/direct/src/particles/ForceGroup.py
@@ -12,7 +12,7 @@ class ForceGroup(DirectObject):
 
     def __init__(self, name=None):
         if (name == None):
-            self.name = 'ForceGroup-%d' % ForceGroup.id 
+            self.name = 'ForceGroup-%d' % ForceGroup.id
             ForceGroup.id += 1
         else:
             self.name = name
@@ -65,7 +65,7 @@ class ForceGroup(DirectObject):
     def getNodePath(self):
         return self.nodePath
 
-    # Utility functions 
+    # Utility functions
     def __getitem__(self, index):
         numForces = self.node.getNumForces()
         if ((index < 0) or (index >= numForces)):
diff --git a/direct/src/particles/ParticleManagerGlobal.py b/direct/src/particles/ParticleManagerGlobal.py
index d68070afed..b4380be412 100644
--- a/direct/src/particles/ParticleManagerGlobal.py
+++ b/direct/src/particles/ParticleManagerGlobal.py
@@ -1,6 +1,6 @@
 """
 Contains the global particle system manager
 """
-from pandac.PandaModules import ParticleSystemManager
+from panda3d.physics import ParticleSystemManager
 
 particleMgr = ParticleSystemManager()
diff --git a/direct/src/particles/Particles.py b/direct/src/particles/Particles.py
index cdf0550d05..826b004b80 100644
--- a/direct/src/particles/Particles.py
+++ b/direct/src/particles/Particles.py
@@ -1,27 +1,27 @@
 from pandac.PandaModules import *
 
-from pandac.PandaModules import ParticleSystem
-from pandac.PandaModules import BaseParticleFactory
-from pandac.PandaModules import PointParticleFactory
-from pandac.PandaModules import ZSpinParticleFactory
-#from pandac.PandaModules import OrientedParticleFactory
-from pandac.PandaModules import BaseParticleRenderer
-from pandac.PandaModules import PointParticleRenderer
-from pandac.PandaModules import LineParticleRenderer
-from pandac.PandaModules import GeomParticleRenderer
-from pandac.PandaModules import SparkleParticleRenderer
-#from pandac.PandaModules import SpriteParticleRenderer
-from pandac.PandaModules import BaseParticleEmitter
-from pandac.PandaModules import ArcEmitter
-from pandac.PandaModules import BoxEmitter
-from pandac.PandaModules import DiscEmitter
-from pandac.PandaModules import LineEmitter
-from pandac.PandaModules import PointEmitter
-from pandac.PandaModules import RectangleEmitter
-from pandac.PandaModules import RingEmitter
-from pandac.PandaModules import SphereSurfaceEmitter
-from pandac.PandaModules import SphereVolumeEmitter
-from pandac.PandaModules import TangentRingEmitter
+from panda3d.physics import ParticleSystem
+from panda3d.physics import BaseParticleFactory
+from panda3d.physics import PointParticleFactory
+from panda3d.physics import ZSpinParticleFactory
+#from panda3d.physics import OrientedParticleFactory
+from panda3d.physics import BaseParticleRenderer
+from panda3d.physics import PointParticleRenderer
+from panda3d.physics import LineParticleRenderer
+from panda3d.physics import GeomParticleRenderer
+from panda3d.physics import SparkleParticleRenderer
+#from panda3d.physics import SpriteParticleRenderer
+from panda3d.physics import BaseParticleEmitter
+from panda3d.physics import ArcEmitter
+from panda3d.physics import BoxEmitter
+from panda3d.physics import DiscEmitter
+from panda3d.physics import LineEmitter
+from panda3d.physics import PointEmitter
+from panda3d.physics import RectangleEmitter
+from panda3d.physics import RingEmitter
+from panda3d.physics import SphereSurfaceEmitter
+from panda3d.physics import SphereVolumeEmitter
+from panda3d.physics import TangentRingEmitter
 
 import SpriteParticleRendererExt
 
@@ -464,7 +464,7 @@ class Particles(ParticleSystem):
                     t_b = seg.getTimeBegin()
                     t_e = seg.getTimeEnd()
                     mod = seg.isModulated()
-                    fun = seg.getFunction()                    
+                    fun = seg.getFunction()
                     typ = type(fun).__name__
                     if typ == 'ColorInterpolationFunctionConstant':
                         c_a = fun.getColorA()
@@ -560,7 +560,7 @@ class Particles(ParticleSystem):
             file.write('# Tangent Ring parameters\n')
             file.write(targ + '.emitter.setRadius(%.4f)\n' % self.emitter.getRadius())
             file.write(targ + '.emitter.setRadiusSpread(%.4f)\n' % self.emitter.getRadiusSpread())
-            
+
     def getPoolSizeRanges(self):
         litterRange = [max(1,self.getLitterSize()-self.getLitterSpread()),
                        self.getLitterSize(),
@@ -573,9 +573,9 @@ class Particles(ParticleSystem):
         print 'Litter Ranges:    ',litterRange
         print 'LifeSpan Ranges:  ',lifespanRange
         print 'BirthRate Ranges: ',birthRateRange
-        
+
         return dict(zip(('min','median','max'),[l*s/b for l,s,b in zip(litterRange,lifespanRange,birthRateRange)]))
-            
+
 
     def accelerate(self,time,stepCount = 1,stepTime=0.0):
         if time > 0.0:
@@ -585,14 +585,13 @@ class Particles(ParticleSystem):
             else:
                 stepCount = int(float(time)/stepTime)
                 remainder = time-stepCount*stepTime
-                
+
             for step in range(stepCount):
                 base.particleMgr.doParticles(stepTime,self,False)
                 base.physicsMgr.doPhysics(stepTime,self)
-                
+
             if(remainder):
                 base.particleMgr.doParticles(remainder,self,False)
                 base.physicsMgr.doPhysics(remainder,self)
-                
+
             self.render()
-        
diff --git a/direct/src/particles/SpriteParticleRendererExt.py b/direct/src/particles/SpriteParticleRendererExt.py
index 6f8cbe5820..5a929b2dbc 100644
--- a/direct/src/particles/SpriteParticleRendererExt.py
+++ b/direct/src/particles/SpriteParticleRendererExt.py
@@ -1,4 +1,4 @@
-from pandac.PandaModules import SpriteParticleRenderer
+from panda3d.physics import SpriteParticleRenderer
 
 
 class SpriteParticleRendererExt(SpriteParticleRenderer):
@@ -126,4 +126,3 @@ class SpriteParticleRendererExt(SpriteParticleRenderer):
         m.removeNode()
 
         return True
-
diff --git a/direct/src/plugin/p3dPythonRun.cxx b/direct/src/plugin/p3dPythonRun.cxx
index d6b2e9df1d..92002298b3 100755
--- a/direct/src/plugin/p3dPythonRun.cxx
+++ b/direct/src/plugin/p3dPythonRun.cxx
@@ -34,11 +34,11 @@ TypeHandle P3DPythonRun::P3DWindowHandle::_type_handle;
 ////////////////////////////////////////////////////////////////////
 //     Function: P3DPythonRun::Constructor
 //       Access: Public
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 P3DPythonRun::
 P3DPythonRun(const char *program_name, const char *archive_file,
-             FHandle input_handle, FHandle output_handle, 
+             FHandle input_handle, FHandle output_handle,
              const char *log_pathname, bool interactive_console) {
   P3DWindowHandle::init_type();
   init_xml();
@@ -115,7 +115,7 @@ P3DPythonRun(const char *program_name, const char *archive_file,
 ////////////////////////////////////////////////////////////////////
 //     Function: P3DPythonRun::Destructor
 //       Access: Public
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 P3DPythonRun::
 ~P3DPythonRun() {
@@ -150,72 +150,32 @@ run_python() {
   PyRun_SimpleString("import sys; sys.dll_suffix = '_d'");
 #endif
 
-  // We'll need libpandaexpress to be imported before we can load
-  // _vfsimporter.  So, find it and load it.
-  Filename libpandaexpress;
+  Filename dir = _archive_file.get_dirname();
 
-#ifdef _WIN32
-  // Of course it's already resident, so use that version.
-  wstring basename = Filename::dso_filename("libpandaexpress.so").to_os_specific_w();
-  HMODULE h = GetModuleHandleW(basename.c_str());
-
-  if (h == NULL) {
-    nout << "Can't find libpandaexpress in memory.\n";
-  } else {
-    static const int buffer_size = 4096;
-    wchar_t buffer[buffer_size];
-    GetModuleFileNameW(h, buffer, buffer_size);
-    libpandaexpress = Filename::from_os_specific_w(buffer);
-  }
-#endif  // _WIN32
-
-  if (libpandaexpress.empty()) {
-    // Go look for it on disk.
-    libpandaexpress = Filename(_archive_file.get_dirname(), 
-                               Filename::dso_filename("libpandaexpress.so"));
-#if defined(__APPLE__) && PY_VERSION_HEX < 0x02050000
-    // On OSX, for Python versions 2.4 and before, we have to load the
-    // .so file, not the .dylib file.
-    libpandaexpress.set_type(Filename::T_general);
-#endif
-  }
-
-  if (!libpandaexpress.exists()) {
-    nout << "Can't find " << libpandaexpress << "\n";
-    return false;
-  }
-
-  // We need the "imp" built-in module for that.
-  PyObject *imp_module = PyImport_ImportModule("imp");
-  if (imp_module == NULL) {
-    nout << "Failed to import module imp\n";
+  // We'll need to synthesize a 'panda3d' module before loading
+  // VFSImporter.  We could simply freeze it, but Python has a bug
+  // setting __path__ of frozen modules properly.
+  PyObject *panda3d_module = PyImport_AddModule("panda3d");
+  if (panda3d_module == NULL) {
+    nout << "Failed to create panda3d module:\n";
     PyErr_Print();
     return false;
   }
 
-  // And here's where we run into a brick wall attempting to make the
-  // whole plugin system Unicode-safe for Windows.  It turns out that
-  // this Python call, imp.load_dynamic(), will not accept a Unicode
-  // pathname.  So if the DLL in question is in a location that
-  // contains non-ASCII characters, it can't be loaded.
-  string os_specific = libpandaexpress.to_os_specific();
-  PyObject *result = PyObject_CallMethod
-    (imp_module, (char *)"load_dynamic", (char *)"ss", 
-     "libpandaexpress", os_specific.c_str());
-  if (result == NULL) {
-    nout << "Failed to import libpandaexpress as a module\n";
-    PyErr_Print();
-    return false;
-  }
-  Py_DECREF(result);
-  Py_DECREF(imp_module);
+  // Set the __path__ such that it can find panda3d/core.pyd, etc.
+  Filename panda3d_dir(dir, "panda3d");
+  string dir_str = panda3d_dir.to_os_specific();
+  PyObject *panda3d_dict = PyModule_GetDict(panda3d_module);
+  PyObject *panda3d_path = Py_BuildValue("[s#]", dir_str.data(), dir_str.length());
+  PyDict_SetItemString(panda3d_dict, "__path__", panda3d_path);
+  Py_DECREF(panda3d_path);
 
   // Now we can load _vfsimporter.pyd.  Since this is a magic frozen
   // pyd, importing it automatically makes all of its frozen contents
   // available to import as well.
   PyObject *vfsimporter = PyImport_ImportModule("_vfsimporter");
   if (vfsimporter == NULL) {
-    nout << "Failed to import _vfsimporter\n";
+    nout << "Failed to import _vfsimporter:\n";
     PyErr_Print();
     return false;
   }
@@ -224,15 +184,15 @@ run_python() {
   // And now we can import the VFSImporter module that was so defined.
   PyObject *vfsimporter_module = PyImport_ImportModule("VFSImporter");
   if (vfsimporter_module == NULL) {
-    nout << "Failed to import VFSImporter\n";
+    nout << "Failed to import VFSImporter:\n";
     PyErr_Print();
     return false;
   }
 
   // And register the VFSImporter.
-  result = PyObject_CallMethod(vfsimporter_module, (char *)"register", (char *)"");
+  PyObject *result = PyObject_CallMethod(vfsimporter_module, (char *)"register", (char *)"");
   if (result == NULL) {
-    nout << "Failed to call VFSImporter.register()\n";
+    nout << "Failed to call VFSImporter.register():\n";
     PyErr_Print();
     return false;
   }
@@ -248,7 +208,6 @@ run_python() {
     nout << "Could not read " << _archive_file << "\n";
     return false;
   }
-  Filename dir = _archive_file.get_dirname();
   VirtualFileSystem *vfs = VirtualFileSystem::get_global_ptr();
   if (!vfs->mount(mf, dir, VirtualFileSystem::MF_read_only)) {
     nout << "Could not mount " << _archive_file << "\n";
@@ -346,7 +305,7 @@ run_python() {
   }
   Py_DECREF(result);
   Py_DECREF(request_func);
- 
+
 
   // Now add check_comm() as a task.  It can be a threaded task, but
   // this does mean that application programmers will have to be alert
@@ -545,7 +504,7 @@ handle_command(TiXmlDocument *doc) {
         assert(!needs_response);
         int instance_id;
         TiXmlElement *xwparams = xcommand->FirstChildElement("wparams");
-        if (xwparams != (TiXmlElement *)NULL && 
+        if (xwparams != (TiXmlElement *)NULL &&
             xcommand->QueryIntAttribute("instance_id", &instance_id) == TIXML_SUCCESS) {
           setup_window(instance_id, xwparams);
         }
@@ -591,7 +550,7 @@ handle_command(TiXmlDocument *doc) {
             _sent_objects.erase(si);
           }
         }
-        
+
       } else {
         nout << "Unhandled command " << cmd << "\n";
         if (needs_response) {
@@ -678,7 +637,7 @@ handle_pyobj_command(TiXmlElement *xcommand, bool needs_response,
         if (method_name == NULL) {
           // No method name; call the object directly.
           result = PyObject_CallObject(obj, params);
-          
+
           // Several special-case "method" names.
         } else if (strcmp(method_name, "__bool__") == 0) {
           result = PyBool_FromLong(PyObject_IsTrue(obj));
@@ -713,7 +672,7 @@ handle_pyobj_command(TiXmlElement *xcommand, bool needs_response,
                 PyErr_Clear();
               }
             }
-            
+
             // If the object supports the mapping protocol, store it
             // in the object's dictionary.
             if (!success && PyMapping_Check(obj)) {
@@ -761,7 +720,7 @@ handle_pyobj_command(TiXmlElement *xcommand, bool needs_response,
                 PyErr_Clear();
               }
             }
-            
+
             if (success) {
               result = Py_True;
             } else {
@@ -1066,8 +1025,8 @@ py_request_func(PyObject *args) {
     PyObject *value;
     int needs_response;
     int unique_id;
-    if (!PyArg_ParseTuple(extra_args, "sOsOii", 
-                          &operation, &object, &property_name, &value, 
+    if (!PyArg_ParseTuple(extra_args, "sOsOii",
+                          &operation, &object, &property_name, &value,
                           &needs_response, &unique_id)) {
       return NULL;
     }
@@ -1256,7 +1215,7 @@ set_instance_info(P3DCInstance *inst, TiXmlElement *xinstance) {
   xinstance->Attribute("respect_per_platform", &respect_per_platform);
 
   PyObject *result = PyObject_CallMethod
-    (_runner, (char *)"setInstanceInfo", (char *)"sssiOi", root_dir, 
+    (_runner, (char *)"setInstanceInfo", (char *)"sssiOi", root_dir,
      log_directory, super_mirror, verify_contents, main, respect_per_platform);
   Py_DECREF(main);
 
@@ -1347,7 +1306,7 @@ set_p3d_filename(P3DCInstance *inst, TiXmlElement *xfparams) {
       value = value_c;
     }
 
-    PyObject *tuple = Py_BuildValue("(ss)", keyword.c_str(), 
+    PyObject *tuple = Py_BuildValue("(ss)", keyword.c_str(),
                                     value.c_str());
     PyList_Append(token_list, tuple);
     Py_DECREF(tuple);
@@ -1419,7 +1378,7 @@ setup_window(P3DCInstance *inst, TiXmlElement *xwparams) {
   }
 
   int win_x, win_y, win_width, win_height;
-  
+
   xwparams->Attribute("win_x", &win_x);
   xwparams->Attribute("win_y", &win_y);
   xwparams->Attribute("win_width", &win_width);
@@ -1531,7 +1490,7 @@ terminate_session() {
         Py_DECREF(result);
       }
     }
-    
+
     _session_terminated = true;
   }
 }
@@ -1772,7 +1731,7 @@ xml_to_pyobj(TiXmlElement *xvalue) {
     int object_id;
     if (xvalue->QueryIntAttribute("object_id", &object_id) == TIXML_SUCCESS) {
       // Construct a new BrowserObject wrapper around this object.
-      return PyObject_CallFunction(_browser_object_class, (char *)"Oi", 
+      return PyObject_CallFunction(_browser_object_class, (char *)"Oi",
                                    _runner, object_id);
     }
 
@@ -1852,7 +1811,7 @@ rt_thread_run() {
     }
 
     // Successfully read an XML document.
-    
+
     // Check for one special case: the "exit" command means we shut
     // down the read thread along with everything else.
     TiXmlElement *xcommand = doc->FirstChildElement("command");
@@ -1875,7 +1834,7 @@ rt_thread_run() {
 ////////////////////////////////////////////////////////////////////
 //     Function: P3DPythonRun::P3DWindowHandle::Constructor
 //       Access: Public
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 P3DPythonRun::P3DWindowHandle::
 P3DWindowHandle(P3DPythonRun *p3dpython, P3DCInstance *inst,
diff --git a/direct/src/plugin/p3dX11SplashWindow.cxx b/direct/src/plugin/p3dX11SplashWindow.cxx
index 18bc7d537d..aaaa4c8e0a 100755
--- a/direct/src/plugin/p3dX11SplashWindow.cxx
+++ b/direct/src/plugin/p3dX11SplashWindow.cxx
@@ -28,10 +28,10 @@
 ////////////////////////////////////////////////////////////////////
 //     Function: P3DX11SplashWindow::Constructor
 //       Access: Public
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 P3DX11SplashWindow::
-P3DX11SplashWindow(P3DInstance *inst, bool make_visible) : 
+P3DX11SplashWindow(P3DInstance *inst, bool make_visible) :
   P3DSplashWindow(inst, make_visible)
 {
   // Init for parent process
@@ -61,7 +61,7 @@ P3DX11SplashWindow(P3DInstance *inst, bool make_visible) :
 ////////////////////////////////////////////////////////////////////
 //     Function: P3DX11SplashWindow::Destructor
 //       Access: Public, Virtual
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 P3DX11SplashWindow::
 ~P3DX11SplashWindow() {
@@ -312,13 +312,13 @@ stop_subprocess() {
   _pipe_write.close();
 
   static const int max_wait_ms = 2000;
-  
+
   // Wait for a certain amount of time for the process to stop by
   // itself.
   struct timeval start;
   gettimeofday(&start, NULL);
   int start_ms = start.tv_sec * 1000 + start.tv_usec / 1000;
-  
+
   int status;
   pid_t result = waitpid(_subprocess_pid, &status, WNOHANG);
   while (result != _subprocess_pid) {
@@ -326,20 +326,20 @@ stop_subprocess() {
       perror("waitpid");
       break;
     }
-    
+
     struct timeval now;
     gettimeofday(&now, NULL);
     int now_ms = now.tv_sec * 1000 + now.tv_usec / 1000;
     int elapsed = now_ms - start_ms;
-    
+
     if (elapsed > max_wait_ms) {
       // Tired of waiting.  Kill the process.
-      nout << "Force-killing splash window process, pid " << _subprocess_pid 
+      nout << "Force-killing splash window process, pid " << _subprocess_pid
            << "\n";
       kill(_subprocess_pid, SIGKILL);
       start_ms = now_ms;
     }
-    
+
     // Yield the timeslice and wait some more.
     struct timeval tv;
     tv.tv_sec = 0;
@@ -353,7 +353,7 @@ stop_subprocess() {
     nout << "  exited normally, status = "
          << WEXITSTATUS(status) << "\n";
   } else if (WIFSIGNALED(status)) {
-    nout << "  signalled by " << WTERMSIG(status) << ", core = " 
+    nout << "  signalled by " << WTERMSIG(status) << ", core = "
          << WCOREDUMP(status) << "\n";
   } else if (WIFSTOPPED(status)) {
     nout << "  stopped by " << WSTOPSIG(status) << "\n";
@@ -396,7 +396,7 @@ check_stopped() {
     nout << "  exited normally, status = "
          << WEXITSTATUS(status) << "\n";
   } else if (WIFSIGNALED(status)) {
-    nout << "  signalled by " << WTERMSIG(status) << ", core = " 
+    nout << "  signalled by " << WTERMSIG(status) << ", core = "
          << WCOREDUMP(status) << "\n";
   } else if (WIFSTOPPED(status)) {
     nout << "  stopped by " << WSTOPSIG(status) << "\n";
@@ -522,14 +522,14 @@ subprocess_run() {
           _win_height = event.xconfigure.height;
 
           set_button_range(_button_ready_image);
-          
+
           // If the window changes size, we need to recompute the
           // composed image.
           _needs_new_composite = true;
         }
         needs_redraw = true;
         break;
-        
+
       case MotionNotify:
         set_mouse_data(event.xmotion.x, event.xmotion.y, _mouse_down);
         break;
@@ -537,7 +537,7 @@ subprocess_run() {
       case ButtonPress:
         set_mouse_data(_mouse_x, _mouse_y, true);
         break;
-        
+
       case ButtonRelease:
         set_mouse_data(_mouse_x, _mouse_y, false);
         break;
@@ -563,7 +563,7 @@ subprocess_run() {
       needs_redraw = true;
       prev_label = _install_label;
     }
-    
+
     if (_progress_known != prev_progress_known) {
       needs_update_progress = true;
       needs_redraw_progress = true;
@@ -592,7 +592,7 @@ subprocess_run() {
         needs_redraw = true;
       }
     }
-    
+
     if (needs_redraw) {
       redraw();
       XFlush(_display);
@@ -619,23 +619,23 @@ subprocess_run() {
                    text_width + 4, text_height + 4, false);
         XDrawString(_display, _window, _graphics_context, text_x, text_y,
                     _install_label.c_str(), _install_label.size());
-        
+
         needs_draw_label = false;
       }
-      
+
       if (needs_redraw_progress) {
-        XClearArea(_display, _window, 
+        XClearArea(_display, _window,
                    bar_x, bar_y, bar_width, bar_height, false);
-        XDrawRectangle(_display, _window, _graphics_context, 
+        XDrawRectangle(_display, _window, _graphics_context,
                        bar_x, bar_y, bar_width, bar_height);
         needs_update_progress = true;
         needs_redraw_progress = false;
       }
-      
+
       if (needs_update_progress) {
         if (_progress_known) {
           int progress_width = (int)((bar_width - 2) * _install_progress + 0.5);
-          XFillRectangle(_display, _window, _bar_context, 
+          XFillRectangle(_display, _window, _bar_context,
                          bar_x + 1, bar_y + 1,
                          progress_width + 1, bar_height - 1);
         } else {
@@ -649,7 +649,7 @@ subprocess_run() {
             progress = block_travel * 2 - progress;
           }
 
-          XFillRectangle(_display, _window, _bar_context, 
+          XFillRectangle(_display, _window, _bar_context,
                          bar_x + 1 + progress, bar_y + 1,
                          block_width + 1, bar_height - 1);
         }
@@ -665,7 +665,7 @@ subprocess_run() {
       fd_set fds;
       FD_ZERO(&fds);
       FD_SET(read_fd, &fds);
-      
+
       // Sleep a bit to yield the timeslice if there's nothing new.
       struct timeval tv;
       tv.tv_sec = 0;
@@ -729,27 +729,30 @@ receive_command() {
       } else if (strcmp(cmd, "set_image_filename") == 0) {
         const string *image_filename = xcommand->Attribute(string("image_filename"));
         int image_placement;
-        if (image_filename != NULL && 
+        if (image_filename != NULL &&
             xcommand->QueryIntAttribute("image_placement", &image_placement) == TIXML_SUCCESS) {
-          
+
           X11ImageData *image = NULL;
           switch ((ImagePlacement)image_placement) {
           case IP_background:
             image = &_background_image;
             break;
-            
+
           case IP_button_ready:
             image = &_button_ready_image;
             set_button_range(_button_ready_image);
             break;
-            
+
           case IP_button_rollover:
             image = &_button_rollover_image;
             break;
-            
+
           case IP_button_click:
             image = &_button_click_image;
             break;
+
+          case IP_none:
+            break;
           }
           if (image != NULL) {
             if (image->_filename != *image_filename) {
@@ -804,7 +807,7 @@ redraw() {
     // If we have an image, draw it.
     int xo = (_win_width - _composite_width) / 2;
     int yo = (_win_height - _composite_height) / 2;
-    XPutImage(_display, _window, _graphics_context, _composite_image, 0, 0, 
+    XPutImage(_display, _window, _graphics_context, _composite_image, 0, 0,
               xo, yo, _composite_width, _composite_height);
 
     // Then clear the rectangles around it carefully (rather than just
@@ -840,12 +843,12 @@ make_window() {
   }
 
   X11_Window parent = 0;
-  
+
   // Hum, if we use the display provided by the browser,
   // it causes a crash in some browsers when you make an Xlib
   // call with the plugin window minimized.
   // So I kept XOpenDisplay until we have a better workaround.
-  
+
   //_display = (X11_Display*) _wparams.get_parent_window()._xdisplay;
   //_own_display = false;
   //if (_display == 0) {
@@ -871,7 +874,7 @@ make_window() {
     // Create a toplevel window.
     parent = XRootWindow(_display, _screen);
   }
-  
+
   assert(parent != None);
 
   int depth = DefaultDepth(_display, _screen);
@@ -955,7 +958,7 @@ setup_gc() {
   XFontStruct* fs = XLoadQueryFont(_display, "6x13");
 
   XGCValues gcval;
-  gcval.font = fs->fid; 
+  gcval.font = fs->fid;
   gcval.function = GXcopy;
   gcval.plane_mask = AllPlanes;
   gcval.foreground = BlackPixel(_display, _screen);
@@ -966,8 +969,8 @@ setup_gc() {
   if (_bg_pixel != -1) {
     gcval.background = _bg_pixel;
   }
-  _graphics_context = XCreateGC(_display, _window, 
-    GCFont | GCFunction | GCPlaneMask | GCForeground | GCBackground, &gcval); 
+  _graphics_context = XCreateGC(_display, _window,
+    GCFont | GCFunction | GCPlaneMask | GCForeground | GCBackground, &gcval);
 
   // Also create a gc for filling in the interior of the progress bar
   // in a pleasant blue color (or whatever color the user requested).
@@ -983,7 +986,7 @@ setup_gc() {
     gcval.foreground = bar.pixel;
   }
 
-  _bar_context = XCreateGC(_display, _window, 
+  _bar_context = XCreateGC(_display, _window,
     GCFont | GCFunction | GCPlaneMask | GCForeground | GCBackground, &gcval);
 }
 
@@ -998,7 +1001,7 @@ close_window() {
     XDestroyImage(_composite_image);
     _composite_image = NULL;
   }
-  
+
   if (_bar_context != None) {
     if (_bar_context != _graphics_context) {
       XFreeGC(_display, _bar_context);
@@ -1009,22 +1012,22 @@ close_window() {
     Colormap colormap = DefaultColormap(_display, _screen);
     XFreeColors(_display, colormap, &_bar_pixel, 1, 0);
   }
-  
+
   if (_fg_pixel != -1) {
     Colormap colormap = DefaultColormap(_display, _screen);
     XFreeColors(_display, colormap, &_fg_pixel, 1, 0);
   }
-  
+
   if (_bg_pixel != -1) {
     Colormap colormap = DefaultColormap(_display, _screen);
     XFreeColors(_display, colormap, &_bg_pixel, 1, 0);
   }
-  
+
   if (_graphics_context != None) {
     XFreeGC(_display, _graphics_context);
     _graphics_context = None;
   }
-  
+
   if (_window != None) {
     XDestroyWindow(_display, _window);
     _window = None;
@@ -1150,7 +1153,7 @@ compose_image() {
   }
 
   // Now load the image.
-  _composite_image = XCreateImage(_display, CopyFromParent, DefaultDepth(_display, _screen), 
+  _composite_image = XCreateImage(_display, CopyFromParent, DefaultDepth(_display, _screen),
                                   ZPixmap, 0, (char *)new_data, image1_width, image1_height, 32, 0);
   _composite_width = image1_width;
   _composite_height = image1_height;
diff --git a/direct/src/pyinst/Builder.py b/direct/src/pyinst/Builder.py
deleted file mode 100644
index b43f18172b..0000000000
--- a/direct/src/pyinst/Builder.py
+++ /dev/null
@@ -1,504 +0,0 @@
-import string
-import pprint
-import sys
-import os
-import ConfigParser
-import pprint
-import shutil
-import tempfile
-import ltoc
-import tocfilter
-import resource
-import archive
-import archivebuilder
-import carchive
-
-logfile = None
-autopath = []
-built = {}
-copyFile = None
-
-class Target:
-    def __init__(self, cfg, sectnm, cnvrts):
-        self.children = []
-        self._dependencies = ltoc.lTOC() # the stuff an outer package will need to use me
-        self.cfg = cfg
-        self.__name__ = 'joe'
-        for optnm in cfg.options(sectnm):
-            cnvrt = cnvrts.get(optnm, 'getstringlist')
-            if cnvrt:
-                f = getattr(self, cnvrt, None)
-                if f:
-                    self.__dict__[optnm] = f(cfg.get(sectnm, optnm))
-        if not hasattr(self, 'name'):
-            self.name = self.__name__
-        print "Initializing", self.__name__
-        self.pathprefix = autopath + self.pathprefix
-        self.pathprefix.append(os.path.join(pyinsthome, 'support'))
-        for z in self.zlib:
-            if z in self.cfg.sections():
-                self.children.append(z)
-            else:
-                raise ValueError, "%s - zlib '%s' does not refer to a sections" \
-                      % (self.name, z)
-        for i in range(len(self.misc)):
-            x = self.misc[i]
-            if x in self.cfg.sections():
-                if self.cfg.get(x, "type") == 'PYZ':
-                    self.zlib.append(x)
-                    self.misc[i] = None
-                self.children.append(x)
-        self.misc = filter(None, self.misc)
-        self.edit()
-        self.toc = ltoc.lTOC()
-        for thingie in self.excludes:
-            try:
-                fltr = tocfilter.makefilter(thingie, self.pathprefix)
-            except ValueError:
-                print "Warning: '%s' not found - no filter created" % thingie
-            else:
-                self.toc.addFilter(fltr)
-        if self.exstdlib:
-            self.toc.addFilter(tocfilter.StdLibFilter())
-        if self.extypes:
-            self.toc.addFilter(tocfilter.ExtFilter(self.extypes))
-        if self.expatterns:
-            self.toc.addFilter(tocfilter.PatternFilter(self.expatterns))
-
-        ##------utilities------##
-    def dump(self):
-        logfile.write("---- %s: %s -----\n" % (self.__class__.__name__, self.name))
-        pprint.pprint(self.__dict__, logfile)
-    def getstringlist(self, opt):
-        tmp = string.split(opt, ',')
-        return filter(None, map(string.strip, tmp))
-    def getstring(self, opt):
-        return opt
-    def getbool(self, opt):
-        if opt in ('0','f','F','n','N'):
-            return 0
-        return 1
-        ##-----framework-----##
-    def build(self):
-        print "Gathering components of %s" % self.name
-        self.gather()
-        logfile.write("Final Table of Contents for %s:\n" % self.name)
-        pprint.pprint(self.toc.toList(), logfile)
-        print "Creating %s" % self.name
-        self.assemble()
-        ##-----overrideables-----##
-    def edit(self):
-        pass
-    def gather(self):
-        pass
-    def assemble(self):
-        pass
-
-class PYZTarget(Target):
-    def __init__(self, cfg, sectnm, cnvrts):
-        Target.__init__(self, cfg, sectnm, cnvrts)
-        # to use a PYZTarget, you'll need imputil and archive
-        archivebuilder.GetCompiled([os.path.join(pyinsthome, 'imputil.py')])
-        print "pyinsthome:", pyinsthome
-        imputil = resource.makeresource('imputil.py', [pyinsthome])
-        self._dependencies.append(imputil)
-        archivebuilder.GetCompiled([os.path.join(pyinsthome, 'archive_rt.py')])
-        archmodule = resource.makeresource('archive_rt.py', [pyinsthome])
-        self._dependencies.merge(archmodule.dependencies())
-        self._dependencies.append(archmodule)
-        self.toc.addFilter(archmodule)
-        self.toc.addFilter(imputil)
-        for mod in archmodule.modules:
-            self.toc.addFilter(mod)
-    def edit(self):
-        if self.extypes:
-            print "PYZ target %s ignoring extypes = %s" % (self.__name__, self.extypes)
-
-    def gather(self):
-        for script in self.dependencies:
-            rsrc = resource.makeresource(script, self.pathprefix)
-            if not isinstance(rsrc, resource.scriptresource):
-                print "Bug alert - Made %s from %s!" % (rsrc, script)
-            self.toc.merge(rsrc.modules)
-        logfile.write("lTOC after expanding 'depends':\n")
-        pprint.pprint(self.toc.toList(), logfile)
-        for thingie in self.includes + self.directories + self.packages:
-            rsrc = resource.makeresource(thingie, self.pathprefix)
-##            if not isinstance(rsrc, resource.pythonresource):
-##                print "PYZ target %s ignoring include %s" % (self.name, thingie)
-##            else:
-            self.toc.merge(rsrc.contents())
-        logfile.write("lTOC after includes, dir, pkgs:\n")
-        pprint.pprint(self.toc.toList(), logfile)
-        self.toc.addFilter(tocfilter.ExtFilter(['.py', '.pyc', '.pyo'], 1))
-        logfile.write("Applying the following filters:\n")
-        pprint.pprint(self.toc.filters, logfile)
-        self.toc.filter()
-
-    def assemble(self):
-        contents = self.toc.toList()
-        if contents:
-            lib = archive.ZlibArchive()
-            lib.build(self.name, archivebuilder.GetCompiled(self.toc.toList()))
-
-class CollectTarget(Target):
-    def __init__(self, cfg, sectnm, cnvrts):
-        Target.__init__(self, cfg, sectnm, cnvrts)
-
-    _rsrcdict = {'COLLECT': resource.dirresource, 'PYZ': resource.zlibresource, 'CARCHIVE': resource.archiveresource}
-
-    def gather(self):
-        if self.support:
-            # the bare minimum
-            self.toc.merge([resource.makeresource('python20.dll')])
-            self.toc.merge([resource.makeresource('exceptions.pyc').asBinary()])
-        # zlib, bindepends, misc, trees, destdir
-        for i in range(len(self.zlib)):
-            # z refers to the section name
-            z = self.zlib[i]
-            nm = self.cfg.get(z, 'name')
-            try:
-                self.toc.merge([resource.makeresource(nm, ['.'])])
-            except ValueError:
-                # zlibs aren't written if they turn out to be empty
-                self.zlib[i] = None
-        self.zlib = filter(None, self.zlib)
-        if self.zlib:
-            target = built.get(self.zlib[0], None)
-            if target:
-                self.toc.merge(target._dependencies)
-        for script in self.bindepends:
-            rsrc = resource.makeresource(script, self.pathprefix)
-            self.toc.merge(rsrc.binaries)
-        logfile.write('ltoc after bindepends:\n')
-        pprint.pprint(self.toc.toList(), logfile)
-        for thingie in self.misc:
-            if thingie in self.cfg.sections():
-                name = self.cfg.get(thingie, "name")
-                typ = self.cfg.get(thingie, "type")
-                klass = self._rsrcdict.get(typ, resource.dataresource)
-                rsrc = apply(klass, (name, name))
-                #now make sure we have the stuff the resource requires
-                target = built.get(thingie, None)
-                if target:
-                    self.toc.merge(target._dependencies)
-            else:
-                rsrc = resource.makeresource(thingie, self.pathprefix)
-            self.toc.merge(rsrc.contents())
-        logfile.write('ltoc after misc:\n')
-        pprint.pprint(self.toc.toList(), logfile)
-        for script in self.script:
-            if string.find(script, '.') == -1:
-                script = script + '.py'
-            rsrc = resource.makeresource(script, self.pathprefix)
-            if rsrc.typ == 'm':
-                rsrc.typ = 's'
-            self.toc.merge([rsrc])
-        logfile.write('ltoc after scripts:\n')
-        pprint.pprint(self.toc.toList(), logfile)
-        for tree in self.trees:
-            try:
-                rsrc = resource.treeresource('.', tree)
-            except ValueError:
-                print "tree %s not found" % tree
-            else:
-                self.toc.merge(rsrc.contents())
-        logfile.write('ltoc after trees:\n')
-        pprint.pprint(self.toc.toList(), logfile)
-        self.toc.addFilter(tocfilter.TypeFilter(['d']))
-        logfile.write("Applying the following filters:\n")
-        pprint.pprint(self.toc.filters, logfile)
-        self.toc.filter()
-        #don't dupe stuff in a zlib that's part of this target
-        if self.zlib:
-           ztoc = ltoc.lTOC()
-           for zlibnm in self.zlib:
-               target = built.get(zlibnm, None)
-               if target:
-                   ztoc.merge(target.toc)
-           for i in range(len(self.toc)-1, -1, -1):
-               rsrc = self.toc[i]
-               if isinstance(rsrc, resource.moduleresource) and rsrc in ztoc:
-                   del self.toc[i]
-
-    def assemble(self):
-        if os.path.exists(self.name):
-            if os.path.isdir(self.name):
-                for fnm in os.listdir(self.name):
-                    try:
-                        os.remove(os.path.join(self.name, fnm))
-                    except:
-                        print "Could not delete file %s" % os.path.join(self.name, fnm)
-        else:
-            os.makedirs(self.name)
-        mysite = []
-        for nm, path, typ in self.toc.toList():
-            shutil.copy2(path, self.name)
-            if typ == 'z':
-                mysite.append('imputil.FuncImporter(archive.ZlibArchive("%s", 0).get_code).install()' % nm)
-        if mysite:
-            mysite.insert(0, 'import archive, imputil')
-            open(os.path.join(self.name, 'site.py'),'w').write(string.join(mysite, '\n'))
-
-
-class ArchiveTarget(CollectTarget):
-    usefullname = 1
-    def __init__(self, cfg, sectnm, cnvrts):
-        CollectTarget.__init__(self, cfg, sectnm, cnvrts)
-        archivebuilder.GetCompiled([os.path.join(pyinsthome, 'carchive_rt.py')])
-        carchmodule = resource.makeresource('carchive_rt.py', [pyinsthome])
-        self._dependencies.merge(carchmodule.dependencies())
-        self._dependencies.append(carchmodule)
-
-    def edit(self):
-        if self.destdir:
-            print "Warning 'destdir = %s' ignored for %s" % (self.destdir, self.name)
-
-    def gather(self):
-        CollectTarget.gather(self)
-
-    _cdict = {'s':2,'m':1,'b':1,'x':1,'a':0,'z':0, 'p':1}
-
-    def assemble(self, pkgnm=None):
-        if pkgnm is None:
-            pkgnm = self.name
-        arch = carchive.CArchive()
-        toc = []
-        pytoc = []
-        for nm, path, typ in self.toc.toList():
-            compress = self._cdict[typ]
-            if typ == 'b' or (self.usefullname and typ in 'ms'):
-                nm = os.path.basename(path)
-            if typ == 'm':
-                pytoc.append((nm, path, compress, typ))
-            else:
-                toc.append((nm, path, compress, typ))
-        toc = toc + archivebuilder.GetCompiled(pytoc)
-        arch.build(pkgnm, toc)
-        return arch
-
-class FullExeTarget(ArchiveTarget):
-    usefullname = 0
-    def __init__(self, cfg, sectnm, cnvrts):
-        ArchiveTarget.__init__(self, cfg, sectnm, cnvrts)
-
-    def gather(self):
-        for script in self.script:
-            #print "FullExeTarget.gather: script is", repr(script)
-            rsrc = resource.makeresource(script, self.pathprefix)
-            rsrc = resource.scriptresource(rsrc.name, rsrc.path)
-            #print " resource is", repr(rsrc)
-            self.toc.merge(rsrc.binaries)
-        ArchiveTarget.gather(self)
-        if not self.zlib:
-            self.toc.merge(rsrc.modules)
-        self._dependencies = ltoc.lTOC()
-
-    _cdict = {'s':2,'m':0,'b':1,'x':0,'a':0,'z':0}
-    _edict = { (1, 1):'Runw_d.exe', (1, 0):'Runw.exe', (0, 1):'Run_d.exe', (0, 0):'Run.exe'}
-
-    def assemble(self):
-        pkgname = tempfile.mktemp()
-        arch = ArchiveTarget.assemble(self, pkgname)
-        exe = self._edict[(self.userunw, self.debug)]
-        exe = os.path.normpath(os.path.join(pyinsthome, 'support', exe))
-##        copyFile([exe, pkgname], self.name)
-##        os.remove(pkgname)
-        # Thomas Heller's icon code
-        # my version
-        if self.icon:
-            myexe = tempfile.mktemp()
-            copyFile (exe, myexe)
-            try:
-                from icon import CopyIcons
-                CopyIcons(myexe, self.icon)
-            except ImportError:
-                print "win32api is required for updating icons"
-                print "You should have win32api.pyd and PyWinTypes20.dll"
-                print "in the installation directory."
-                print "Please copy them to Python's DLLS subdirectory"
-                print "(or install Mark Hammond's Win32 extensions)."
-##        iconfile = None
-##        for name in self.cfg.sections():
-##            if self.cfg.get (name, "type") == "STANDALONE":
-##                try:
-##                    iconfile = self.cfg.get (name, "iconfile")
-##                except:
-##                    pass
-##        if iconfile:
-##            from icon import CopyIcons
-##            CopyIcons (myexe, iconfile)
-            copyFile ([myexe, pkgname], self.name)
-            os.remove(myexe)
-        else:
-            copyFile([exe, pkgname], self.name)
-        #os.remove(pkgname)
-
-class ExeTarget(FullExeTarget):
-    def __init__(self, cfg, sectnm, cnvrts):
-        FullExeTarget.__init__(self, cfg, sectnm, cnvrts)
-
-    def edit(self):
-        if not self.script:
-            raise ValueError, "EXE target %s requires 'script= <script>'" % self.__name__
-
-    def gather(self):
-        FullExeTarget.gather(self)
-        for i in range(len(self.toc)-1, -1, -1):
-            rsrc = self.toc[i]
-            if rsrc.typ == 'b':
-                self._dependencies.append(rsrc)
-                del self.toc[i]
-
-installpreamble = """\
-import sys, os
-import installutils
-import carchive_rt
-idir = installutils.getinstalldir()
-me = sys.argv[0]
-if me[:-4] != '.exe':
-    me = me + '.exe'
-this = carchive_rt.CArchive(sys.argv[0])
-here = sys.path[0]
-"""
-mvfile = "installutils.copyFile(os.path.join(here, '%s'), os.path.join(idir, '%s'))\n"
-extractfile = "open(os.path.join(idir, '%s'), 'wb').write(this.extract('%s')[1])\n"
-sitepreamble = """\
-import archive_rt
-import imputil
-import sys
-"""
-importzlib = "imputil.FuncImporter(archive_rt.ZlibArchive(sys.path[0]+'/%s').get_code).install()\n"
-
-class InstallTarget(FullExeTarget):
-    def __init__(self, cfg, sectnm, cnvrts):
-        FullExeTarget.__init__(self, cfg, sectnm, cnvrts)
-
-    def edit(self):
-        if not self.script:
-            open('gen_install.py', 'w').write(installpreamble)
-            self.script = ['gen_install.py']
-
-    def gather(self):
-        FullExeTarget.gather(self)
-        if self.script[0] == 'gen_install.py':
-            f = open(self.script[0], 'a')
-            for rsrc in self.toc:
-                if isinstance(rsrc, resource.binaryresource):
-                    nm = os.path.basename(rsrc.path)
-                    f.write(mvfile % (nm, nm))
-                elif isinstance(rsrc, resource.pythonresource):
-                    pass
-                elif isinstance(rsrc, resource.zlibresource):
-                    pass
-                else:
-                    f.write(extractfile % (rsrc.name, rsrc.name))
-                    if isinstance(rsrc, resource.archiveresource):
-                        #did it come with an install script?
-                        target = built.get(rsrc.name, None)
-                        if target:
-                           if hasattr(target, "installscript"):
-                               for script in target.installscript:
-                                   s = resource.makeresource(script, self.pathprefix)
-                                   txt = open(s.path, 'r').read()
-                                   f.write(txt)
-            f.close()
-
-dispatch = {
-                'PYZ': PYZTarget,
-                'CARCHIVE': ArchiveTarget,
-                'COLLECT': CollectTarget,
-                'STANDALONE': ExeTarget,
-                'INSTALL': InstallTarget,
-                'FULLEXE': FullExeTarget,
-}
-
-
-def makeTarget(cfg, section):
-    return dispatch[cfg.get(section, 'type')](cfg, section, optcnvrts)
-
-optdefaults = { 'type':'PYZ',
-                'script':'',            # INSTALL (opt) & STANDALONE (required)
-                'zlib':'',              # INSTALL, STANDALONE, COLLECT
-                'bindepends':'',        # INSTALL, COLLECT
-                'misc':'',              # INSTALL. COLLECT
-                'includetk': '0',       # INSTALL, COLLECT
-        'userunw': '0',         # STANDALONE
-                'dependencies':'',      # PYZ
-                'directories':'',       # PYZ
-                'excludes':'',          # PYZ, INSTALL, COLLECT
-                'expatterns': '',
-                'exstdlib': '0',
-                'extypes': '',
-                'includes':'',          # PYZ
-                'packages':'',          # PYZ
-                'destdir':'',           # COLLECT
-                'pathprefix': '',
-                'trees': '',
-                'debug': '0',
-                'support': '1', # include python20.dll & exceptons.pyc at a minimum
-                'icon': '',
-}
-
-optcnvrts = {   'type':'',
-                'name': 'getstring',
-                'exstdlib': 'getbool',
-                'console': 'getbool',
-                'analyze': 'getbool',
-                'debug': 'getbool',
-                'includetk': 'getbool',
-                'userunw': 'getbool',
-                'destdir': 'getstring',
-                'support': 'getbool',
-                '__name__': 'getstring',
-                'icon': 'getstring',
-}
-def main(opts, args):
-    global pyinsthome
-    global copyFile
-    pyinsthome = os.path.abspath(os.path.dirname(sys.argv[0]))
-    # sys.path.insert(0, os.path.join(pyinsthome, 'support'))
-    import installutils
-    copyFile = installutils.copyFile
-    global logfile
-    logfile = open('Builder.log','w')
-    targets = []
-    xref = {}
-    cfg = ConfigParser.ConfigParser(optdefaults)
-    for arg in args:
-        dirnm = os.path.dirname(arg)
-        if dirnm == '':
-            dirnm = '.'
-        autopath.append(os.path.abspath(dirnm))
-    cfg.read(args)
-    for section in cfg.sections():
-        target = makeTarget(cfg, section)
-        targets.append(target)
-        xref[section] = target
-    while targets:
-        for i in range(len(targets)):
-            target = targets[i]
-            for child in target.children:
-                if xref[child] in targets:
-                    break
-            else:       #no break - ready to build
-                target.dump()
-                target.build()
-                built[target.__name__] = target
-                built[target.name] = target
-                targets[i] = None
-                break
-        else:       #no break - couldn't find anything to build
-            names = map(lambda x: getattr(x, 'name'), targets)
-            raise RuntimeError, "circular dependencies in %s" % repr(names)
-        targets = filter(None, targets)
-
-def run(file):
-    main ([], file)
-
-if __name__ == '__main__':
-    import getopt
-    (opts, args) = getopt.getopt(sys.argv[1:], 'dv')
-    print "opts:", opts
-    print "args:", args
-    main(opts, args)
diff --git a/direct/src/pyinst/Sources.pp b/direct/src/pyinst/Sources.pp
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/direct/src/pyinst/__init__.py b/direct/src/pyinst/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/direct/src/pyinst/archive.py b/direct/src/pyinst/archive.py
deleted file mode 100644
index a1afce6fdc..0000000000
--- a/direct/src/pyinst/archive.py
+++ /dev/null
@@ -1,246 +0,0 @@
-#
-# Gordon McMillan (as inspired and influenced by Greg Stein)
-#
-
-# subclasses may not need marshal or struct, but since they're
-# builtin, importing is safe.
-#
-# While an Archive is really an abstraction for any "filesystem
-# within a file", it is tuned for use with imputil.FuncImporter.
-# This assumes it contains python code objects, indexed by the
-# the internal name (ie, no '.py').
-# See carchive.py for a more general archive (contains anything)
-# that can be understood by a C program.
-
-import marshal
-import struct
-
-class Archive:
-  """ A base class for a repository of python code objects.
-
-      The get_code method is used by imputil.FuntionImporter
-      to get code objects by name.
-      Archives are flat namespaces, so conflict between module
-      names in different packages are possible. Use a different
-      Archive for each package.
-  """
-  MAGIC = 'PYL\0'
-  HDRLEN = 12        # default is MAGIC followed by python's magic, int pos of toc
-  TOCPOS = 8
-  TRLLEN = 0        # default - no trailer
-  TOCTMPLT = {}     #
-  os = None
-  def __init__(self, path=None, start=0):
-    """
-         Initialize an Archive. If path is omitted, it will be an empty Archive.
-         start is the seek position within path where the Archive starts."""
-    self.toc = None
-    self.path = path
-    self.start = start
-    import imp
-    self.pymagic = imp.get_magic()
-    if path is not None:
-      self.lib = open(self.path, 'rb')
-      self.checkmagic()
-      self.loadtoc()
-
-  ####### Sub-methods of __init__ - override as needed #############
-  def checkmagic(self):
-    """Verify version and validity of file.
-
-        Overridable.
-        Check to see if the file object self.lib actually has a file
-        we understand.
-    """
-    self.lib.seek(self.start)   #default - magic is at start of file
-    if self.lib.read(len(self.MAGIC)) != self.MAGIC:
-      raise RuntimeError, "%s is not a valid %s archive file" \
-                % (self.path, self.__class__.__name__)
-    if self.lib.read(len(self.pymagic)) != self.pymagic:
-      raise RuntimeError, "%s has version mismatch to dll" % (self.path)
-
-  def loadtoc(self):
-    """Load the table of contents.
-
-        Overridable.
-        Default: After magic comes an int (4 byte native) giving the
-        position of the TOC within self.lib.
-        Default: The TOC is a marshal-able string.
-    """
-    self.lib.seek(self.start + self.TOCPOS)
-    (offset,) = struct.unpack('=i', self.lib.read(4))
-    self.lib.seek(self.start + offset)
-    self.toc = marshal.load(self.lib)
-
-  ######## This is what is called by FuncImporter #######
-  ## Since an Archive is flat, we ignore parent and modname.
-
-  def get_code(self, parent, modname, fqname):
-    """The import hook.
-
-       Called by imputil.FunctionImporter.
-       Override extract to tune getting code from the Archive."""
-    rslt = self.extract(fqname) # None if not found, (ispkg, code) otherwise
-    if rslt is None:
-      return None
-    ispkg, code = rslt
-    if ispkg:
-      return ispkg, code, {'__path__': []}
-    return rslt
-
-  ####### Core method - Override as needed  #########
-  def extract(self, name):
-    """ Get the object corresponding to name, or None.
-
-        NAME is the name as specified in an 'import name'.
-        'import a.b' will become:
-        extract('a') (return None because 'a' is not a code object)
-        extract('a.__init__') (return a code object)
-        extract('a.b') (return a code object)
-        Default implementation:
-          self.toc is a dict
-          self.toc[name] is pos
-          self.lib has the code object marshal-ed at pos
-    """
-    ispkg, pos = self.toc.get(name, (0, None))
-    if pos is None:
-      return None
-    self.lib.seek(self.start + pos)
-    return ispkg, marshal.load(self.lib)
-
-  ########################################################################
-  # Informational methods
-
-  def contents(self):
-    """Return a list of the contents.
-
-       Default implementation assumes self.toc is a dict like object.
-    """
-    return self.toc.keys()
-
-  ########################################################################
-  # Building
-
-  ####### Top level method - shouldn't need overriding #######
-  def build(self, path, lTOC):
-    """Create an archive file of name PATH from LTOC.
-
-       lTOC is a 'logical TOC' - a list of (name, path, ...)
-       where name is the internal (import) name,
-       and path is a file to get the object from, eg './a.pyc'.
-    """
-    self.path = path
-    self.lib = open(path, 'wb')
-    #reserve space for the header
-    if self.HDRLEN:
-      self.lib.write('\0'*self.HDRLEN)
-
-    #create an empty toc
-
-    if type(self.TOCTMPLT) == type({}):
-      self.toc = {}
-    else:       # assume callable
-      self.toc = self.TOCTMPLT()
-
-    for tocentry in lTOC:
-      self.add(tocentry)   # the guts of the archive
-
-    tocpos = self.lib.tell()
-    self.save_toc(tocpos)
-    if self.TRLLEN:
-      self.save_trailer(tocpos)
-    if self.HDRLEN:
-      self.update_headers(tocpos)
-    self.lib.close()
-
-
-  ####### manages keeping the internal TOC and the guts in sync #######
-  def add(self, entry):
-    """Add an entry to the archive.
-
-      Override this to influence the mechanics of the Archive.
-       Assumes entry is a seq beginning with (nm, pth, ...) where
-       nm is the key by which we'll be asked for the object.
-       pth is the name of where we find the object.
-    """
-    if self.os is None:
-      import os
-      self.os = os
-    nm = entry[0]
-    pth = entry[1]
-    ispkg = self.os.path.splitext(self.os.path.basename(pth))[0] == '__init__'
-    self.toc[nm] = (ispkg, self.lib.tell())
-    f = open(entry[1], 'rb')
-    f.seek(8)   #skip magic and timestamp
-    self.lib.write(f.read())
-
-  def save_toc(self, tocpos):
-    """Save the table of contents.
-
-       Default - toc is a dict
-       Gets marshaled to self.lib
-    """
-    marshal.dump(self.toc, self.lib)
-
-  def save_trailer(self, tocpos):
-    """Placeholder for Archives with trailers."""
-    pass
-
-  def update_headers(self, tocpos):
-    """Update any header data.
-
-       Default header is  MAGIC + Python's magic + tocpos"""
-    self.lib.seek(self.start)
-    self.lib.write(self.MAGIC)
-    self.lib.write(self.pymagic)
-    self.lib.write(struct.pack('=i', tocpos))
-
-##############################################################
-#
-# ZlibArchive - an archive with compressed entries
-#
-
-class ZlibArchive(Archive):
-  """A subclass of Archive that compresses entries with zlib
-     and uses a (marshalled) dict as a table of contents"""
-  MAGIC = 'PYZ\0'
-  TOCPOS = 8
-  HDRLEN = 12
-  TRLLEN = 0
-  TOCTMPLT = {}
-  LEVEL = 9
-
-  def __init__(self, path=None, offset=0):
-    Archive.__init__(self, path, offset)
-    # dynamic import so not imported if not needed
-    global zlib
-    import zlib
-
-  def extract(self, name):
-    """Get the code object for NAME.
-
-       Return None if name is not in the table of contents.
-       Otherwise, return a tuple (ispkg, code)"""
-    (ispkg, pos, lngth) = self.toc.get(name, (0, None, 0))
-    if pos is None:
-      return None
-    self.lib.seek(self.start + pos)
-    return ispkg, marshal.loads(zlib.decompress(self.lib.read(lngth)))
-
-  def add(self, entry):
-    """Add an entry.
-
-       ENTRY is a sequence where entry[0] is name and entry[1] is full path name.
-       zlib compress the code object, and build a toc entry"""
-    if self.os is None:
-      import os
-      self.os = os
-    nm = entry[0]
-    pth = entry[1]
-    ispkg = self.os.path.splitext(self.os.path.basename(pth))[0] == '__init__'
-    f = open(pth, 'rb')
-    f.seek(8)   #skip magic and timestamp
-    obj = zlib.compress(f.read(), self.LEVEL)
-    self.toc[nm] = (ispkg, self.lib.tell(), len(obj))
-    self.lib.write(obj)
-
diff --git a/direct/src/pyinst/archive_rt.py b/direct/src/pyinst/archive_rt.py
deleted file mode 100644
index 05abfc08a0..0000000000
--- a/direct/src/pyinst/archive_rt.py
+++ /dev/null
@@ -1,226 +0,0 @@
-#
-# Gordon McMillan (as inspired and influenced by Greg Stein)
-#
-
-# subclasses may not need marshal or struct, but since they're
-# builtin, importing is safe.
-#
-# While an Archive is really an abstraction for any "filesystem
-# within a file", it is tuned for use with imputil.FuncImporter.
-# This assumes it contains python code objects, indexed by the
-# the internal name (ie, no '.py').
-# See carchive.py for a more general archive (contains anything)
-# that can be understood by a C program.
-
-#archive_rt is a stripped down version of MEInc.Dist.archive.
-#It has had all building logic removed.
-#It's purpose is to bootstrap the Python installation.
-
-import marshal
-import struct
-
-class Archive:
-  """ A base class for a repository of python code objects.
-      The extract method is used by imputil.ArchiveImporter
-      to get code objects by name (fully qualified name), so
-      an enduser "import a.b" would become
-        extract('a.__init__')
-        extract('a.b')
-  """
-  MAGIC = 'PYL\0'
-  HDRLEN = 12        # default is MAGIC followed by python's magic, int pos of toc
-  TOCPOS = 8
-  TRLLEN = 0        # default - no trailer
-  TOCTMPLT = {}     #
-  os = None
-  def __init__(self, path=None, start=0):
-    "Initialize an Archive. If path is omitted, it will be an empty Archive."
-    self.toc = None
-    self.path = path
-    self.start = start
-    import imp
-    self.pymagic = imp.get_magic()
-    if path is not None:
-      self.lib = open(self.path, 'rb')
-      self.checkmagic()
-      self.loadtoc()
-
-  ####### Sub-methods of __init__ - override as needed #############
-  def checkmagic(self):
-    """ Overridable.
-        Check to see if the file object self.lib actually has a file
-        we understand.
-    """
-    self.lib.seek(self.start)   #default - magic is at start of file
-    if self.lib.read(len(self.MAGIC)) != self.MAGIC:
-      raise RuntimeError, "%s is not a valid %s archive file" \
-                % (self.path, self.__class__.__name__)
-    if self.lib.read(len(self.pymagic)) != self.pymagic:
-      raise RuntimeError, "%s has version mismatch to dll" % (self.path)
-
-  def loadtoc(self):
-    """ Overridable.
-        Default: After magic comes an int (4 byte native) giving the
-        position of the TOC within self.lib.
-        Default: The TOC is a marshal-able string.
-    """
-    self.lib.seek(self.start + self.TOCPOS)
-    (offset,) = struct.unpack('=i', self.lib.read(4))
-    self.lib.seek(self.start + offset)
-    self.toc = marshal.load(self.lib)
-
-  ######## This is what is called by FuncImporter #######
-  ## Since an Archive is flat, we ignore parent and modname.
-
-  def get_code(self, parent, modname, fqname):
-    print "parent: ", parent
-    print "modname: ", modname
-    print "fqname: ", fqname
-    return self.extract(fqname) # None if not found, (ispkg, code) otherwise
-    if rslt is None:
-      return None
-    ispkg, code = rslt
-    if ispkg:
-      return ispkg, code, {'__path__': []}
-    return rslt
-
-  ####### Core method - Override as needed  #########
-  def extract(self, name):
-    """ Get the object corresponding to name, or None.
-        For use with imputil ArchiveImporter, object is a python code object.
-        'name' is the name as specified in an 'import name'.
-        'import a.b' will become:
-        extract('a') (return None because 'a' is not a code object)
-        extract('a.__init__') (return a code object)
-        extract('a.b') (return a code object)
-        Default implementation:
-          self.toc is a dict
-          self.toc[name] is pos
-          self.lib has the code object marshal-ed at pos
-    """
-    ispkg, pos = self.toc.get(name, (0, None))
-    if pos is None:
-      return None
-    self.lib.seek(self.start + pos)
-    return ispkg, marshal.load(self.lib)
-
-  ########################################################################
-  # Informational methods
-
-  def contents(self):
-    """Return a list of the contents
-       Default implementation assumes self.toc is a dict like object.
-       Not required by ArchiveImporter.
-    """
-    return self.toc.keys()
-
-  ########################################################################
-  # Building
-
-  ####### Top level method - shouldn't need overriding #######
-##  def build(self, path, lTOC):
-##    """Create an archive file of name 'path'.
-##       lTOC is a 'logical TOC' - a list of (name, path, ...)
-##       where name is the internal name, eg 'a'
-##       and path is a file to get the object from, eg './a.pyc'.
-##    """
-##    self.path = path
-##    self.lib = open(path, 'wb')
-##    #reserve space for the header
-##    if self.HDRLEN:
-##      self.lib.write('\0'*self.HDRLEN)
-##
-##    #create an empty toc
-##
-##    if type(self.TOCTMPLT) == type({}):
-##      self.toc = {}
-##    else:       # assume callable
-##      self.toc = self.TOCTMPLT()
-##
-##    for tocentry in lTOC:
-##      self.add(tocentry)   # the guts of the archive
-##
-##    tocpos = self.lib.tell()
-##    self.save_toc(tocpos)
-##    if self.TRLLEN:
-##      self.save_trailer(tocpos)
-##    if self.HDRLEN:
-##      self.update_headers(tocpos)
-##    self.lib.close()
-##
-##
-##  ####### manages keeping the internal TOC and the guts in sync #######
-##  def add(self, entry):
-##    """Override this to influence the mechanics of the Archive.
-##       Assumes entry is a seq beginning with (nm, pth, ...) where
-##       nm is the key by which we'll be asked for the object.
-##       pth is the name of where we find the object. Overrides of
-##       get_obj_from can make use of further elements in entry.
-##    """
-##    if self.os is None:
-##      import os
-##      self.os = os
-##    nm = entry[0]
-##    pth = entry[1]
-##    ispkg = self.os.path.splitext(self.os.path.basename(pth))[0] == '__init__'
-##    self.toc[nm] = (ispkg, self.lib.tell())
-##    f = open(entry[1], 'rb')
-##    f.seek(8) #skip magic and timestamp
-##    self.lib.write(f.read())
-##
-##  def save_toc(self, tocpos):
-##    """Default - toc is a dict
-##       Gets marshaled to self.lib
-##    """
-##    marshal.dump(self.toc, self.lib)
-##
-##  def save_trailer(self, tocpos):
-##    """Default - not used"""
-##    pass
-##
-##  def update_headers(self, tocpos):
-##    """Default - MAGIC + Python's magic + tocpos"""
-##    self.lib.seek(self.start)
-##    self.lib.write(self.MAGIC)
-##    self.lib.write(self.pymagic)
-##    self.lib.write(struct.pack('=i', tocpos))
-
-##############################################################
-#
-# ZlibArchive - an archive with compressed entries
-#
-
-class ZlibArchive(Archive):
-  MAGIC = 'PYZ\0'
-  TOCPOS = 8
-  HDRLEN = 12
-  TRLLEN = 0
-  TOCTMPLT = {}
-  LEVEL = 9
-
-  def __init__(self, path=None, offset=0):
-    Archive.__init__(self, path, offset)
-    # dynamic import so not imported if not needed
-    global zlib
-    import zlib
-
-  def extract(self, name):
-    (ispkg, pos, lngth) = self.toc.get(name, (0, None, 0))
-    if pos is None:
-      return None
-    self.lib.seek(self.start + pos)
-    return ispkg, marshal.loads(zlib.decompress(self.lib.read(lngth)))
-
-##  def add(self, entry):
-##    if self.os is None:
-##      import os
-##      self.os = os
-##    nm = entry[0]
-##    pth = entry[1]
-##    ispkg = self.os.path.splitext(self.os.path.basename(pth))[0] == '__init__'
-##    f = open(pth, 'rb')
-##    f.seek(8) #skip magic and timestamp
-##    obj = zlib.compress(f.read(), self.LEVEL)
-##    self.toc[nm] = (ispkg, self.lib.tell(), len(obj))
-##    self.lib.write(obj)
-##
diff --git a/direct/src/pyinst/archivebuilder.py b/direct/src/pyinst/archivebuilder.py
deleted file mode 100644
index cfc058e212..0000000000
--- a/direct/src/pyinst/archivebuilder.py
+++ /dev/null
@@ -1,81 +0,0 @@
-# copyright 1999 McMillan Enterprises, Inc.
-# license: use as you please. No warranty.
-# Gordon McMillan gmcm@hypernet.com
-#
-# A collection of routines for building a logical Table Of Contents
-# that Archive (subclasses) use to build themselves.
-# A logical Table of Contents is a sequence, each element of which is
-# a sequence, with at least 2 entries - "name" and "path".
-
-import os
-
-import string
-
-import py_compile
-
-def GetCompiled(seq, lvl='c'):
-  """SEQ is a list of .py files, or a logical TOC.
-     Return as .pyc or .pyo files (LVL) after ensuring their existence"""
-  if len(seq) == 0:
-    return seq
-  rslt = []
-  isTOC = 0
-  if type(seq[0]) == type(()):
-    isTOC = 1
-  for py in seq:
-    if isTOC:
-      (nm, fnm), rest = py[:2], py[2:]
-    else:
-      fnm = py
-    fnm = os.path.splitext(fnm)[0] + '.py'
-    cmpl = 1
-    pyc = fnm + lvl
-    if os.path.exists(pyc):
-      pytm = long(os.stat(fnm)[8])
-      ctm = long(os.stat(pyc)[8])
-      if pytm < ctm:
-        cmpl = 0
-    if cmpl:
-      py_compile.compile(fnm, pyc)
-    if isTOC:
-      rslt.append((nm, pyc)+rest)
-    else:
-      rslt.append(pyc)
-  return rslt
-
-import modulefinder
-MF = modulefinder
-import sys
-
-def Dependencies(script):
-  """Get a logical TOC directly from the dependencies of a script.
-  
-     The returned TOC does NOT contain the script.
-     It does contain extension modules. Uses modulefinder."""
-  rslt = []
-  (dir, name) = os.path.split(script)
-  if dir:
-    ppath = [os.path.normpath(dir)] + sys.path
-  else:
-    ppath = sys.path[:]
-  mf = MF.ModuleFinder(ppath, 0)
-  try:
-    mf.run_script(script)
-  except IOError:
-    print " Script not found:", script
-    return []
-  del mf.modules['__main__']
-  for (k, v) in mf.modules.items():
-    if v.__file__ is None:
-      del mf.modules[k]  # a builtin
-  for (k, v) in mf.modules.items():
-    #ispkg = os.path.basename(v.__file__) == '__init__.py'
-    d = os.path.dirname(v.__file__)
-    if not d:
-      v.__file__ = os.path.join(os.getcwd(), v.__file__)
-    #if ispkg:
-    #    rslt.append(k+'.__init__', v.__file__)
-    #else:
-    rslt.append((k, v.__file__))
-  return rslt
-
diff --git a/direct/src/pyinst/bindepend.py b/direct/src/pyinst/bindepend.py
deleted file mode 100644
index a28ee42758..0000000000
--- a/direct/src/pyinst/bindepend.py
+++ /dev/null
@@ -1,169 +0,0 @@
-# copyright 1999 McMillan Enterprises, Inc.
-# license: use as you please. No warranty.
-#
-# use dumpbin.exe (if present) to find the binary
-# dependencies of an extension module.
-# if dumpbin not available, pick apart the PE hdr of the binary
-# while this appears to work well, it is complex and subject to
-# problems with changes to PE hdrs (ie, this works only on 32 bit Intel
-# Windows format binaries)
-#
-# Note also that you should check the results to make sure that the
-# dlls are redistributable. I've listed most of the common MS dlls
-# under "excludes" below; add to this list as necessary (or use the
-# "excludes" option in the INSTALL section of the config file).
-
-import os
-import time
-import string
-import sys
-import tempfile
-import finder
-
-seen = {}
-excludes = {'KERNEL32.DLL':1,
-      'ADVAPI.DLL':1,
-      'MSVCRT.DLL':1,
-      'ADVAPI32.DLL':1,
-      'COMCTL32.DLL':1,
-      'CRTDLL.DLL':1,
-      'GDI32.DLL':1,
-      'MFC42.DLL':1,
-      'NTDLL.DLL':1,
-      'OLE32.DLL':1,
-      'OLEAUT32.DLL':1,
-      'RPCRT4.DLL':1,
-      'SHELL32.DLL':1,
-      'USER32.DLL':1,
-      'WINSPOOL.DRV':1,
-      'WS2HELP.DLL':1,
-      'WS2_32.DLL':1,
-      'WSOCK32.DLL':1,
-      'WINMM.DLL':1,
-      'COMDLG32.DLL':1,
-      'ZLIB.DLL':1,
-      'ODBC32.DLL':1,
-      'VERSION.DLL':1}
-
-def getfullnameof(mod, xtrapath = None):
-  """Return the full path name of MOD.
-
-      MOD is the basename of a dll or pyd.
-      XTRAPATH is a path or list of paths to search first.
-      Return the full path name of MOD.
-      Will search the full Windows search path, as well as sys.path"""
-  epath = finder.getpath()
-  if mod[-4:] in ('.pyd', '.PYD'):
-    epath = epath + sys.path
-  if xtrapath is not None:
-    if type(xtrapath) == type(''):
-      epath.insert(0, xtrapath)
-    else:
-      epath = xtrapath + epath
-  for p in epath:
-    npth = os.path.join(p, mod)
-    if os.path.exists(npth):
-      return npth
-  return ''
-
-def getImports1(pth):
-    """Find the binary dependencies of PTH.
-
-        This implementation (not used right now) uses the MSVC utility dumpbin"""
-    rslt = []
-    tmpf = tempfile.mktemp()
-    os.system('dumpbin /IMPORTS "%s" >%s' %(pth, tmpf))
-    time.sleep(0.1)
-    txt = open(tmpf,'r').readlines()
-    os.remove(tmpf)
-    i = 0
-    while i < len(txt):
-        tokens = string.split(txt[i])
-        if len(tokens) == 1 and string.find(tokens[0], '.') > 0:
-            rslt.append(string.strip(tokens[0]))
-        i = i + 1
-    return rslt
-
-def getImports2(pth):
-    """Find the binary dependencies of PTH.
-
-        This implementation walks through the PE header"""
-    import struct
-    rslt = []
-    try:
-      f = open(pth, 'rb').read()
-      pehdrd = struct.unpack('l', f[60:64])[0]
-      magic = struct.unpack('l', f[pehdrd:pehdrd+4])[0]
-      numsecs = struct.unpack('h', f[pehdrd+6:pehdrd+8])[0]
-      numdirs = struct.unpack('l', f[pehdrd+116:pehdrd+120])[0]
-      idata = ''
-      if magic == 17744:
-          importsec, sz = struct.unpack('2l', f[pehdrd+128:pehdrd+136])
-          secttbl = pehdrd + 120 + 8*numdirs
-          secttblfmt = '8s7l2h'
-          seclist = []
-          for i in range(numsecs):
-              seclist.append(struct.unpack(secttblfmt, f[secttbl+i*40:secttbl+(i+1)*40]))
-              #nm, vsz, va, rsz, praw, preloc, plnnums, qrelocs, qlnnums, flags \
-              # = seclist[-1]
-          for i in range(len(seclist)-1):
-              if seclist[i][2] <= importsec < seclist[i+1][2]:
-                  break
-          vbase = seclist[i][2]
-          raw = seclist[i][4]
-          idatastart = raw + importsec - vbase
-          idata = f[idatastart:idatastart+seclist[i][1]]
-          i = 0
-          while 1:
-              vsa =  struct.unpack('5l', idata[i*20:i*20+20])[3]
-              if vsa == 0:
-                  break
-              sa = raw + vsa - vbase
-              end = string.find(f, '\000', sa)
-              rslt.append(f[sa:end])
-              i = i + 1
-    except IOError:
-      print "bindepend cannot analyze %s - file not found!"
-    except struct.error:
-      print "bindepend cannot analyze %s - error walking thru pehdr"
-    return rslt
-
-def Dependencies(lTOC):
-  """Expand LTOC to include all the closure of binary dependencies.
-
-     LTOC is a logical table of contents, ie, a seq of tuples (name, path).
-     Return LTOC expanded by all the binary dependencies of the entries
-     in LTOC, except those listed in the module global EXCLUDES"""
-  for (nm, pth) in lTOC:
-    fullnm = string.upper(os.path.basename(pth))
-    if seen.get(string.upper(nm), 0):
-      continue
-    print "analyzing", nm
-    seen[string.upper(nm)] = 1
-    dlls = getImports(pth)
-    for lib in dlls:
-        print " found", lib
-        if excludes.get(string.upper(lib), 0):
-          continue
-        if seen.get(string.upper(lib), 0):
-          continue
-        npth = getfullnameof(lib)
-        if npth:
-          lTOC.append((lib, npth))
-        else:
-          print " lib not found:", lib, "dependency of",
-  return lTOC
-
-
-##if getfullnameof('dumpbin.exe') == '':
-##    def getImports(pth):
-##        return getImports2(pth)
-##else:
-##    def getImports(pth):
-##        return getImports1(pth)
-
-def getImports(pth):
-    """Forwards to either getImports1 or getImports2
-    """
-    return getImports2(pth)
-
diff --git a/direct/src/pyinst/carchive.py b/direct/src/pyinst/carchive.py
deleted file mode 100644
index 12551669e0..0000000000
--- a/direct/src/pyinst/carchive.py
+++ /dev/null
@@ -1,204 +0,0 @@
-# copyright 1999 McMillan Enterprises, Inc.
-# license: use as you please. No warranty.
-#
-# A subclass of Archive that can be understood
-# by a C program. See uplaunch.cpp for unpacking
-# from C.
-import archive
-import struct
-import zlib
-import strop
-
-class CTOC:
-  """A class encapsulating the table of contents of a CArchive.
-  
-     When written to disk, it is easily read from C."""
-  ENTRYSTRUCT = 'iiiibc' #(structlen, dpos, dlen, ulen, flag, typcd) followed by name
-  def __init__(self):
-    self.data = []
-  
-  def frombinary(self, s):
-    """Decode the binary string into an in memory list.
-    
-        S is a binary string."""
-    entrylen = struct.calcsize(self.ENTRYSTRUCT)
-    p = 0
-    while p<len(s):
-      (slen, dpos, dlen, ulen, flag, typcd) = struct.unpack(self.ENTRYSTRUCT, 
-                                                  s[p:p+entrylen]) 
-      nmlen = slen - entrylen 
-      p = p + entrylen
-      (nm,) = struct.unpack(repr(nmlen)+'s', s[p:p+nmlen])
-      p = p + nmlen 
-      self.data.append((dpos, dlen, ulen, flag, typcd, nm[:-1]))
-
-  def tobinary(self):
-    """Return self as a binary string."""
-    import string
-    entrylen = struct.calcsize(self.ENTRYSTRUCT)
-    rslt = []
-    for (dpos, dlen, ulen, flag, typcd, nm) in self.data:
-      nmlen = len(nm) + 1       # add 1 for a '\0'
-      rslt.append(struct.pack(self.ENTRYSTRUCT+repr(nmlen)+'s',
-        nmlen+entrylen, dpos, dlen, ulen, flag, typcd, nm+'\0'))
-    return string.join(rslt, '')
-
-  def add(self, dpos, dlen, ulen, flag, typcd, nm):
-    """Add an entry to the table of contents.
-    
-       DPOS is data position.
-       DLEN is data length.
-       ULEN is the uncompressed data len.
-       FLAG says if the data is compressed.
-       TYPCD is the "type" of the entry (used by the C code)
-       NM is the entry's name."""
-    self.data.append((dpos, dlen, ulen, flag, typcd, nm))
-
-  def get(self, ndx):
-    """return the toc entry (tuple) at index NDX"""
-    return self.data[ndx]
-
-  def __getitem__(self, ndx):
-    return self.data[ndx]
-
-  def find(self, name):
-    """Return the index of the toc entry with name NAME.
-    
-       Return -1 for failure."""
-    for i in range(len(self.data)):
-      if self.data[i][-1] == name:
-        return i
-    return -1
-
-class CArchive(archive.Archive):
-  """An Archive subclass that an hold arbitrary data.
-  
-     Easily handled from C or from Python."""
-  MAGIC = 'MEI\014\013\012\013\015'
-  HDRLEN = 0
-  TOCTMPLT = CTOC
-  TRLSTRUCT = '8siii'
-  TRLLEN = 20
-  LEVEL = 9
-  def __init__(self, path=None, start=0, len=0):
-    """Constructor.
-    
-       PATH is path name of file (create an empty CArchive if path is None).
-       START is the seekposition within PATH.
-       LEN is the length of the CArchive (if 0, then read till EOF). """
-    self.len = len
-    archive.Archive.__init__(self, path, start)
-
-  def checkmagic(self):
-    """Verify that self is a valid CArchive.
-    
-        Magic signature is at end of the archive."""
-    #magic is at EOF; if we're embedded, we need to figure where that is
-    if self.len:
-      self.lib.seek(self.start+self.len, 0)
-    else:
-      self.lib.seek(0, 2)
-    filelen = self.lib.tell()
-    if self.len:
-      self.lib.seek(self.start+self.len-self.TRLLEN, 0)
-    else:
-      self.lib.seek(-self.TRLLEN, 2)
-    (magic, totallen, tocpos, toclen) = struct.unpack(self.TRLSTRUCT, 
-                                                self.lib.read(self.TRLLEN))
-    if magic != self.MAGIC:
-      raise RuntimeError, "%s is not a valid %s archive file" \
-                % (self.path, self.__class__.__name__)
-    self.pkgstart = filelen - totallen
-    if self.len:
-      if totallen != self.len or self.pkgstart != self.start:
-        raise RuntimeError, "Problem with embedded archive in %s" % self.path
-    self.tocpos, self.toclen = tocpos, toclen
-
-  def loadtoc(self):
-    """Load the table of contents into memory."""
-    self.toc = self.TOCTMPLT()
-    self.lib.seek(self.pkgstart+self.tocpos)
-    tocstr = self.lib.read(self.toclen)
-    self.toc.frombinary(tocstr)
-
-  def extract(self, name):
-    """Get the contents of an entry.
-    
-       NAME is an entry name.
-       Return the tuple (ispkg, contents).
-       For non-Python resoures, ispkg is meaningless (and 0).
-       Used by the import mechanism."""
-    if type(name) == type(''):
-      ndx = self.toc.find(name)
-      if ndx == -1:
-        return None
-    else:
-      ndx = name
-    (dpos, dlen, ulen, flag, typcd, nm) = self.toc.get(ndx)
-    self.lib.seek(self.pkgstart+dpos)
-    rslt = self.lib.read(dlen)
-    if flag == 1:
-      rslt = zlib.decompress(rslt)
-    if typcd == 'M':
-      return (1, rslt)
-    return (0, rslt)
-
-  def contents(self):
-    """Return the names of the entries"""
-    rslt = []
-    for (dpos, dlen, ulen, flag, typcd, nm) in self.toc:
-      rslt.append(nm)
-    return rslt
-
-  def add(self, entry):
-    """Add an ENTRY to the CArchive.
-    
-       ENTRY must have:
-         entry[0] is name (under which it will be saved).
-         entry[1] is fullpathname of the file.
-         entry[2] is a flag for it's storage format (0==uncompressed,
-         1==compressed, 2==Python source format)
-         entry[3] is the entry's type code."""
-    (nm, pathnm, flag, typcd) = entry[:4]
-    if flag == 2:
-        s = open(pathnm, 'r').read()
-        s = s + '\n\0'
-    else:
-        s = open(pathnm, 'rb').read()
-    ulen = len(s)
-    if flag == 1:
-      s = zlib.compress(s, self.LEVEL)
-    dlen = len(s)
-    where = self.lib.tell()
-    if typcd == 'm':
-      if strop.find(pathnm, '.__init__.py') > -1:
-        typcd = 'M'
-    self.toc.add(where, dlen, ulen, flag, typcd, nm)
-    self.lib.write(s)
-
-  def save_toc(self, tocpos):
-    """Save the table of contents to disk."""
-    self.tocpos = tocpos
-    tocstr = self.toc.tobinary()
-    self.toclen = len(tocstr)
-    self.lib.write(tocstr)
-
-  def save_trailer(self, tocpos):
-    """Save the trailer to disk.
-    
-       CArchives can be opened from the end - the trailer points
-       back to the start. """
-    totallen = tocpos + self.toclen + self.TRLLEN
-    trl = struct.pack(self.TRLSTRUCT, self.MAGIC, totallen, 
-                      tocpos, self.toclen)
-    self.lib.write(trl)
-
-  def openEmbedded(self, name):
-    """Open a CArchive of name NAME embedded within this CArchive."""
-    ndx = self.toc.find(name)
-    if ndx == -1:
-      raise KeyError, "Member '%s' not found in %s" % (name, self.path)
-    (dpos, dlen, ulen, flag, typcd, nm) = self.toc.get(ndx)
-    if flag:
-      raise ValueError, "Cannot open compressed archive %s in place"
-    return CArchive(self.path, self.pkgstart+dpos, dlen)
diff --git a/direct/src/pyinst/carchive_rt.py b/direct/src/pyinst/carchive_rt.py
deleted file mode 100644
index 409c5254de..0000000000
--- a/direct/src/pyinst/carchive_rt.py
+++ /dev/null
@@ -1,157 +0,0 @@
-# copyright 1999 McMillan Enterprises, Inc.
-# license: use as you please. No warranty.
-#
-# A subclass of Archive that can be understood
-# by a C program. See uplaunch.cpp for unpacking
-# from C.
-
-#carchive_rt is a stripped down version of MEInc.Dist.carchive.
-#It has had all building logic removed.
-#It's purpose is to bootstrap the Python installation.
-
-import archive_rt
-import struct
-import zlib
-import strop
-
-class CTOC:
-  ENTRYSTRUCT = 'iiiibc' #(structlen, dpos, dlen, ulen, flag, typcd) followed by name
-  def __init__(self):
-    self.data = []
-  
-  def frombinary(self, s):
-    entrylen = struct.calcsize(self.ENTRYSTRUCT)
-    p = 0
-    while p<len(s):
-      (slen, dpos, dlen, ulen, flag, typcd) = struct.unpack(self.ENTRYSTRUCT, 
-                                                  s[p:p+entrylen]) 
-      nmlen = slen - entrylen 
-      p = p + entrylen
-      (nm,) = struct.unpack(repr(nmlen)+'s', s[p:p+nmlen])
-      p = p + nmlen 
-      self.data.append((dpos, dlen, ulen, flag, typcd, nm[:-1]))
-
-##  def tobinary(self):
-##    import string
-##    entrylen = struct.calcsize(self.ENTRYSTRUCT)
-##    rslt = []
-##    for (dpos, dlen, ulen, flag, typcd, nm) in self.data:
-##      nmlen = len(nm) + 1     # add 1 for a '\0'
-##      rslt.append(struct.pack(self.ENTRYSTRUCT+repr(nmlen)+'s',
-##        nmlen+entrylen, dpos, dlen, ulen, flag, typcd, nm+'\0'))
-##    return string.join(rslt, '')
-##
-##  def add(self, dpos, dlen, ulen, flag, typcd, nm):
-##    self.data.append(dpos, dlen, ulen, flag, typcd, nm)
-
-  def get(self, ndx):
-    return self.data[ndx]
-
-  def __getitem__(self, ndx):
-    return self.data[ndx]
-
-  def find(self, name):
-    for i in range(len(self.data)):
-      if self.data[i][-1] == name:
-        return i
-    return -1
-
-class CArchive(archive_rt.Archive):
-  MAGIC = 'MEI\014\013\012\013\015'
-  HDRLEN = 0
-  TOCTMPLT = CTOC
-  TRLSTRUCT = '8siii'
-  TRLLEN = 20
-  LEVEL = 9
-  def __init__(self, path=None, start=0, len=0):
-    self.len = len
-    archive_rt.Archive.__init__(self, path, start)
-
-  def checkmagic(self):
-    #magic is at EOF; if we're embedded, we need to figure where that is
-    if self.len:
-      self.lib.seek(self.start+self.len, 0)
-    else:
-      self.lib.seek(0, 2)
-    filelen = self.lib.tell()
-    if self.len:
-      self.lib.seek(self.start+self.len-self.TRLLEN, 0)
-    else:
-      self.lib.seek(-self.TRLLEN, 2)
-    (magic, totallen, tocpos, toclen) = struct.unpack(self.TRLSTRUCT, 
-                                                self.lib.read(self.TRLLEN))
-    if magic != self.MAGIC:
-      raise RuntimeError, "%s is not a valid %s archive file" \
-                % (self.path, self.__class__.__name__)
-    self.pkgstart = filelen - totallen
-    if self.len:
-      if totallen != self.len or self.pkgstart != self.start:
-        raise RuntimeError, "Problem with embedded archive in %s" % self.path
-    self.tocpos, self.toclen = tocpos, toclen
-
-  def loadtoc(self):
-    self.toc = self.TOCTMPLT()
-    self.lib.seek(self.pkgstart+self.tocpos)
-    tocstr = self.lib.read(self.toclen)
-    self.toc.frombinary(tocstr)
-
-  def extract(self, name):
-    if type(name) == type(''):
-      ndx = self.toc.find(name)
-      if ndx == -1:
-        return None
-    else:
-      ndx = name
-    (dpos, dlen, ulen, flag, typcd, nm) = self.toc.get(ndx)
-    self.lib.seek(self.pkgstart+dpos)
-    rslt = self.lib.read(dlen)
-    if flag == 1:
-      rslt = zlib.decompress(rslt)
-    if typcd == 'M':
-      return (1, rslt)
-    return (0, rslt)
-
-  def contents(self):
-    rslt = []
-    for (dpos, dlen, ulen, flag, typcd, nm) in self.toc:
-      rslt.append(nm)
-    return rslt
-
-##  def add(self, entry):
-##    (nm, pathnm, flag, typcd) = entry[:4]
-##    if flag == 2:
-##        s = open(pathnm, 'r').read()
-##        s = s + '\0'
-##    else:
-##        s = open(pathnm, 'rb').read()
-##    ulen = len(s)
-##    if flag == 1:
-##      s = zlib.compress(s, self.LEVEL)
-##    dlen = len(s)
-##    where = self.lib.tell()
-##    if typcd == 'm':
-##      if strop.find(pathnm, '.__init__.py') > -1:
-##        typcd = 'M'
-##    self.toc.add(where, dlen, ulen, flag, typcd, nm)
-##    self.lib.write(s)
-##
-##  def save_toc(self, tocpos):
-##    self.tocpos = tocpos
-##    tocstr = self.toc.tobinary()
-##    self.toclen = len(tocstr)
-##    self.lib.write(tocstr)
-##
-##  def save_trailer(self, tocpos):
-##    totallen = tocpos + self.toclen + self.TRLLEN
-##    trl = struct.pack(self.TRLSTRUCT, self.MAGIC, totallen, 
-##                      tocpos, self.toclen)
-##    self.lib.write(trl)
-
-  def openEmbedded(self, name):
-    ndx = self.toc.find(name)
-    if ndx == -1:
-      raise KeyError, "Member '%s' not found in %s" % (name, self.path)
-    (dpos, dlen, ulen, flag, typcd, nm) = self.toc.get(ndx)
-    if flag:
-      raise ValueError, "Cannot open compressed archive %s in place"
-    return CArchive(self.path, self.pkgstart+dpos, dlen)
diff --git a/direct/src/pyinst/finder.py b/direct/src/pyinst/finder.py
deleted file mode 100644
index 1c6a34f240..0000000000
--- a/direct/src/pyinst/finder.py
+++ /dev/null
@@ -1,178 +0,0 @@
-# copyright McMillan Enterprises, 1999
-import os, sys
-import string
-
-SCRIPT = 1
-GSCRIPT = 2
-MODULE = 3
-PACKAGE = 4
-PBINARY = 5
-BINARY = 6
-ZLIB = 7
-DIRECTORY = 8
-DATA = 9
-
-_bpath = None
-_ppath = None
-_pcache = {}
-
-def _locate(nm, xtrapath=None, base=None):
-    """Find a file / directory named NM in likely places.
-    
-       XTRAPATH is a list of paths to prepend to BASE.
-       If BASE is None, sys.path (as extended by packages) is used."""
-    ppath = base
-    if base is None:
-        ppath = _ppath
-    if xtrapath:
-        ppath = xtrapath + ppath
-    for pth in ppath:
-        fullnm = os.path.join(pth, nm)
-        #print " _locate trying", fullnm
-        if os.path.exists(fullnm):
-            break
-    else:
-        return ''
-    return fullnm
-
-def _locatepython(name, xtrapath=None):
-    """Locate a Python resource named NAME.
-    
-       All of the standard file extensions will be tried.
-       XTRAPATH is prepended to sys.path."""
-    for ext in ('.py', '.pyc', '.pyw', '.pyo', '.pyd', '.dll'):
-        fullnm = _locate(name+ext, xtrapath)
-        if fullnm:
-            break
-    else:
-        for ext in ('.pyd', '.dll'):
-            fullnm = _locate(name+ext, [], _bpath)
-            if fullnm:
-                break
-    return fullnm
-
-def ispackage(name):
-    """Determine if NAME is the name of a package."""
-    if os.path.exists(os.path.join(name, '__init__.py')):
-        return 1
-    if os.path.exists(os.path.join(name, '__init__.pyc')):
-        return 1
-    if os.path.exists(os.path.join(name, '__init__.pyo')):
-        return 1
-    return 0
-        
-def idtype(fullnm):
-    """Figure out what type of resource FULLNM refers to."""
-    if os.path.isdir(fullnm):
-        if ispackage(fullnm):
-            return PACKAGE
-        return DIRECTORY
-    ext = os.path.splitext(fullnm)[1]
-    if ext:
-        if ext == '.pyd':
-            return PBINARY
-        if ext == '.dll':
-            return BINARY
-        if ext in ('.pyc', '.pyo'):
-            return MODULE
-        if ext == '.py':
-            return SCRIPT
-        if ext == '.pyw':
-            return GSCRIPT
-        if ext == '.pyz':
-            return ZLIB
-    return DATA
-
-def identify(name, xtrapath=None):
-    """Find, and identify the type of NAME, using XTRAPATH as the
-       first place to look.
-
-       Return type, name and full path name.
-       NAME can be a logical or physical name. However, the logical
-       name of a Python module can easily conflict with the physical
-       name of something else, so beware."""
-    if os.path.exists(name):
-        fullnm = name
-    else:
-        if xtrapath is None:
-            xtra = []
-        elif id(xtrapath) in _pcache:
-            xtra = _pcache[id(xtrapath)]
-        else:
-            xtra = expand(xtrapath)
-            _pcache[id(xtrapath)] = xtra 
-        fullnm = _locate(name, xtra)
-        if not fullnm:
-            fullnm =  _locate(name, [], _bpath)
-            if not fullnm:
-                ext = os.path.splitext(name)[1]
-                if not ext:
-                    fullnm = _locatepython(name, xtra)
-                    if not fullnm:
-                        raise ValueError, "%s not found" % name
-                else:
-                    nm = name
-                    while string.count(nm, '.'):
-                        nm = string.replace(nm, '.', '/', 1)
-                        fullnm = _locatepython(nm, xtra)
-                        if fullnm:
-                            break
-                    else:
-                        raise ValueError, "%s not found" % name
-                    
-    typ = idtype(fullnm)
-    nm = name
-    if typ in (GSCRIPT, SCRIPT, MODULE, PACKAGE, PBINARY):
-        dir, nm = os.path.split(fullnm)
-        nm = os.path.splitext(nm)[0]
-    if typ == SCRIPT:
-        if os.path.exists(fullnm+'c') or os.path.exists(fullnm+'o'):
-            typ = MODULE
-    if typ in (MODULE, PACKAGE):
-        while idtype(dir) == PACKAGE:
-            dir, lnode = os.path.split(dir)
-            nm = lnode+'.'+nm
-    elif typ == BINARY:
-        nm = os.path.basename(fullnm)
-    return typ, nm, fullnm
- 
-def expand(plist):
-    """ expand a list of paths (like sys.path) to include all the 
-        directories that qualify as packages """
-    pkgdirs = []
-    for pth in plist:
-        os.path.walk(pth, pkgfinder, pkgdirs)
-    return plist + pkgdirs
-
-def pkgfinder(pkgdirs, dir, fnms):
-    i = 0
-    while i < len(fnms):
-        fnm = os.path.join(dir, fnms[i])
-        if os.path.isdir(fnm):
-            if ispackage(fnm):
-                pkgdirs.append(fnm)
-                i = i + 1
-            else:
-                del fnms[i]
-        else:
-            i = i + 1
-
-if _bpath is None:
-    try:
-        import win32api
-    except ImportError:
-        print "Cannot determine your Windows or System directories"
-        print "Please add them to your PATH if .dlls are not found"
-        _bpath = []
-    else:
-        sysdir = win32api.GetSystemDirectory()
-        sysdir2 = os.path.join(sysdir, '../SYSTEM')
-        windir = win32api.GetWindowsDirectory()
-        _bpath = [sysdir, sysdir2, windir]
-    _bpath.extend(string.split(os.environ.get('PATH', ''), ';'))
-if _ppath is None:
-    _ppath = expand(sys.path)
-        
-def getpath():
-    """Return the path that Windows will search for dlls."""
-    return _bpath
diff --git a/direct/src/pyinst/icon.py b/direct/src/pyinst/icon.py
deleted file mode 100644
index 82601694c3..0000000000
--- a/direct/src/pyinst/icon.py
+++ /dev/null
@@ -1,138 +0,0 @@
-# This code is courtesy of Thomas Heller, who
-# has kindly donated it to this project.
-RT_ICON = 3
-RT_GROUP_ICON = 14
-LOAD_LIBRARY_AS_DATAFILE = 2
-
-import struct
-
-class Structure:
-    def __init__ (self):
-        size = self._sizeInBytes = struct.calcsize (self._format_)
-        self._fields_ = list (struct.unpack (self._format_, '\000' * size))
-        indexes = self._indexes_ = {}
-        for i in range (len (self._names_)):
-            indexes[self._names_[i]] = i
-    def dump (self):
-        print "DUMP of", self
-        for name in self._names_:
-            if name[0] != '_':
-                print "%20s = %s" % (name, getattr (self, name))
-        print
-    def __getattr__ (self, name):
-        if name in self._names_:
-            index = self._indexes_[name]
-            return self._fields_[index]
-        try:
-            return self.__dict__[name]
-        except KeyError:
-            raise AttributeError, name
-    def __setattr__ (self, name, value):
-        if name in self._names_:
-            index = self._indexes_[name]
-            self._fields_[index] = value
-        else:
-            self.__dict__[name] = value
-    def tostring (self):
-        return apply (struct.pack, [self._format_,] + self._fields_)
-    def fromfile (self, file):
-        data = file.read (self._sizeInBytes)
-        self._fields_ = list (struct.unpack (self._format_, data))
-
-class ICONDIRHEADER (Structure):
-    _names_ = "idReserved", "idType", "idCount"
-    _format_ = "hhh"
-
-class ICONDIRENTRY (Structure):
-    _names_ = "bWidth", "bHeight", "bColorCount", "bReserved", "wPlanes", "wBitCount", "dwBytesInRes", "dwImageOffset"
-    _format_ = "bbbbhhii"
-
-class GRPICONDIR (Structure):
-    _names_ = "idReserved", "idType", "idCount"
-    _format_ = "hhh"
-
-class GRPICONDIRENTRY (Structure):
-    _names_ = "bWidth", "bHeight", "bColorCount", "bReserved", "wPlanes", "wBitCount", "dwBytesInRes", "nID"
-    _format_ = "bbbbhhih"
-
-class IconFile:
-    def __init__ (self, path):
-        self.path = path
-        file = open (path, "rb")
-        self.entries = []
-        self.images = []
-        header = self.header = ICONDIRHEADER()
-        header.fromfile (file)
-        for i in range (header.idCount):
-            entry = ICONDIRENTRY()
-            entry.fromfile (file)
-            self.entries.append (entry)
-        for e in self.entries:
-            file.seek (e.dwImageOffset, 0)
-            self.images.append (file.read (e.dwBytesInRes))
-
-    def grp_icon_dir (self):
-        return self.header.tostring()
-
-    def grp_icondir_entries (self):
-        data = ""
-        i = 1
-        for entry in self.entries:
-            e = GRPICONDIRENTRY()
-            for n in e._names_[:-1]:
-                setattr(e, n, getattr (entry, n))
-            e.nID = i
-            i = i + 1
-            data = data + e.tostring()
-        return data
-            
-
-def CopyIcons_FromIco (dstpath, srcpath):
-    f = IconFile (srcpath)
-    print "Updating icons from", srcpath, "to", dstpath
-    import win32api #, win32con
-    hdst = win32api.BeginUpdateResource (dstpath, 0)
-    data = f.grp_icon_dir()
-    data = data + f.grp_icondir_entries()
-    win32api.UpdateResource (hdst, RT_GROUP_ICON, 1, data)
-    print "Writing RT_GROUP_ICON resource with %d bytes" % len (data)
-    i = 1
-    for data in f.images:
-        win32api.UpdateResource (hdst, RT_ICON, i, data)
-        print "Writing RT_ICON resource with %d bytes" % len (data)
-        i = i + 1
-    win32api.EndUpdateResource (hdst, 0)
-
-def CopyIcons (dstpath, srcpath):
-    import os.path, string
-    index = None
-    try:
-        srcpath, index = map (string.strip, string.split (srcpath, ','))
-        index = int (index)
-    except:
-        pass
-    print "PATH, INDEX", srcpath, index
-    srcext = os.path.splitext (srcpath)[1]
-    if string.lower (srcext) == '.ico':
-        return CopyIcons_FromIco (dstpath, srcpath)
-    if index is not None:
-        print "Updating icons from", srcpath, ", %d to" % index, dstpath
-    else:
-        print "Updating icons from", srcpath, "to", dstpath
-    import win32api #, win32con
-    hdst = win32api.BeginUpdateResource (dstpath, 0)
-    hsrc = win32api.LoadLibraryEx (srcpath, 0, LOAD_LIBRARY_AS_DATAFILE)
-    if index is None:
-        grpname = win32api.EnumResourceNames (hsrc, RT_GROUP_ICON)[0]
-    elif index >= 0:
-        grpname = win32api.EnumResourceNames (hsrc, RT_GROUP_ICON)[index]
-    else:
-        grpname = -index
-    data = win32api.LoadResource (hsrc, RT_GROUP_ICON, grpname)
-    win32api.UpdateResource (hdst, RT_GROUP_ICON, grpname, data)
-    for iconname in win32api.EnumResourceNames (hsrc, RT_ICON):
-        data = win32api.LoadResource (hsrc, RT_ICON, iconname)
-        win32api.UpdateResource (hdst, RT_ICON, iconname, data)
-    win32api.FreeLibrary (hsrc)
-    win32api.EndUpdateResource (hdst, 0)
-
diff --git a/direct/src/pyinst/imputil.py b/direct/src/pyinst/imputil.py
deleted file mode 100644
index dadfe03900..0000000000
--- a/direct/src/pyinst/imputil.py
+++ /dev/null
@@ -1,487 +0,0 @@
-#
-# imputil.py
-#
-# Written by Greg Stein. Public Domain.
-# No Copyright, no Rights Reserved, and no Warranties.
-#
-# Utilities to help out with custom import mechanisms.
-#
-# Additional modifications were contribed by Marc-Andre Lemburg and
-# Gordon McMillan.
-#
-
-__version__ = '0.3'
-
-# note: avoid importing non-builtin modules
-import imp
-import sys
-import strop
-import __builtin__      ### why this instead of just using __builtins__ ??
-
-# for the DirectoryImporter
-import struct
-import marshal
-
-class Importer:
-  "Base class for replacing standard import functions."
-
-  def install(self):
-    self.__chain_import = __builtin__.__import__
-    self.__chain_reload = __builtin__.reload
-    __builtin__.__import__ = self._import_hook
-    __builtin__.reload = self._reload_hook
-
-  ######################################################################
-  #
-  # PRIVATE METHODS
-  #
-  def _import_hook(self, name, globals=None, locals=None, fromlist=None):
-    """Python calls this hook to locate and import a module.
-
-    This method attempts to load the (dotted) module name. If it cannot
-    find it, then it delegates the import to the next import hook in the
-    chain (where "next" is defined as the import hook that was in place
-    at the time this Importer instance was installed).
-    """
-
-    # determine the context of this import
-    parent = self._determine_import_context(globals)
-
-    # import the module within the context, or from the default context
-    top, tail = self._import_top_module(parent, name)
-    if top is None:
-      # the module was not found; delegate to the next import hook
-      return self.__chain_import(name, globals, locals, fromlist)
-
-    # the top module may be under the control of a different importer.
-    # if so, then defer to that importer for completion of the import.
-    # note it may be self, or is undefined so we (self) may as well
-    # finish the import.
-    importer = top.__dict__.get('__importer__', self)
-    return importer._finish_import(top, tail, fromlist)
-
-  def _finish_import(self, top, tail, fromlist):
-    # if "a.b.c" was provided, then load the ".b.c" portion down from
-    # below the top-level module.
-    bottom = self._load_tail(top, tail)
-
-    # if the form is "import a.b.c", then return "a"
-    if not fromlist:
-      # no fromlist: return the top of the import tree
-      return top
-
-    # the top module was imported by self, or it was not imported through
-    # the Importer mechanism and self is simply handling the import of
-    # the sub-modules and fromlist.
-    #
-    # this means that the bottom module was also imported by self, or we
-    # are handling things in the absence of a prior Importer
-    #
-    # ### why the heck are we handling it? what is the example scenario
-    # ### where this happens? note that we can't determine is_package()
-    # ### for non-Importer modules.
-    #
-    # since we imported/handled the bottom module, this means that we can
-    # also handle its fromlist (and reliably determine is_package()).
-
-    # if the bottom node is a package, then (potentially) import some modules.
-    #
-    # note: if it is not a package, then "fromlist" refers to names in
-    #       the bottom module rather than modules.
-    # note: for a mix of names and modules in the fromlist, we will
-    #       import all modules and insert those into the namespace of
-    #       the package module. Python will pick up all fromlist names
-    #       from the bottom (package) module; some will be modules that
-    #       we imported and stored in the namespace, others are expected
-    #       to be present already.
-    if self._is_package(bottom.__dict__):
-      self._import_fromlist(bottom, fromlist)
-
-    # if the form is "from a.b import c, d" then return "b"
-    return bottom
-
-  def _reload_hook(self, module):
-    "Python calls this hook to reload a module."
-
-    # reloading of a module may or may not be possible (depending on the
-    # importer), but at least we can validate that it's ours to reload
-    importer = module.__dict__.get('__importer__', None)
-    if importer is not self:
-      return self.__chain_reload(module)
-
-    # okay. it is ours, but we don't know what to do (yet)
-    ### we should blast the module dict and do another get_code(). need to
-    ### flesh this out and add proper docco...
-    raise SystemError, "reload not yet implemented"
-
-  def _determine_import_context(self, globals):
-    """Returns the context in which a module should be imported.
-
-    The context could be a loaded (package) module and the imported module
-    will be looked for within that package. The context could also be None,
-    meaning there is no context -- the module should be looked for as a
-    "top-level" module.
-    """
-
-    if not globals or \
-       globals.get('__importer__', None) is not self:
-      # globals does not refer to one of our modules or packages.
-      # That implies there is no relative import context, and it
-      # should just pick it off the standard path.
-      return None
-
-    # The globals refer to a module or package of ours. It will define
-    # the context of the new import. Get the module/package fqname.
-    parent_fqname = globals['__name__']
-
-    # for a package, return itself (imports refer to pkg contents)
-    if self._is_package(globals):
-      parent = sys.modules[parent_fqname]
-      assert globals is parent.__dict__
-      return parent
-
-    i = strop.rfind(parent_fqname, '.')
-
-    # a module outside of a package has no particular import context
-    if i == -1:
-      return None
-
-    # for a module in a package, return the package (imports refer to siblings)
-    parent_fqname = parent_fqname[:i]
-    parent = sys.modules[parent_fqname]
-    assert parent.__name__ == parent_fqname
-    return parent
-
-  def _import_top_module(self, parent, name):
-    """Locate the top of the import tree (relative or absolute).
-
-    parent defines the context in which the import should occur. See
-    _determine_import_context() for details.
-
-    Returns a tuple (module, tail). module is the loaded (top-level) module,
-    or None if the module is not found. tail is the remaining portion of
-    the dotted name.
-    """
-    i = strop.find(name, '.')
-    if i == -1:
-      head = name
-      tail = ""
-    else:
-      head = name[:i]
-      tail = name[i+1:]
-    if parent:
-      fqname = "%s.%s" % (parent.__name__, head)
-    else:
-      fqname = head
-    module = self._import_one(parent, head, fqname)
-    if module:
-      # the module was relative, or no context existed (the module was
-      # simply found on the path).
-      return module, tail
-    if parent:
-      # we tried relative, now try an absolute import (from the path)
-      module = self._import_one(None, head, head)
-      if module:
-        return module, tail
-
-    # the module wasn't found
-    return None, None
-
-  def _import_one(self, parent, modname, fqname):
-    "Import a single module."
-
-    # has the module already been imported?
-    try:
-      return sys.modules[fqname]
-    except KeyError:
-      pass
-
-    # load the module's code, or fetch the module itself
-    result = self.get_code(parent, modname, fqname)
-    if result is None:
-      return None
-
-    # did get_code() return an actual module? (rather than a code object)
-    is_module = type(result[1]) is type(sys)
-
-    # use the returned module, or create a new one to exec code into
-    if is_module:
-      module = result[1]
-    else:
-      module = imp.new_module(fqname)
-
-    ### record packages a bit differently??
-    module.__importer__ = self
-    module.__ispkg__ = result[0]
-
-    # if present, the third item is a set of values to insert into the module
-    if len(result) > 2:
-      module.__dict__.update(result[2])
-
-    # the module is almost ready... make it visible
-    sys.modules[fqname] = module
-
-    # execute the code within the module's namespace
-    if not is_module:
-      exec(result[1], module.__dict__)
-
-    # insert the module into its parent
-    if parent:
-      setattr(parent, modname, module)
-    return module
-
-  def _load_tail(self, m, tail):
-    """Import the rest of the modules, down from the top-level module.
-
-    Returns the last module in the dotted list of modules.
-    """
-    if tail:
-      for part in strop.splitfields(tail, '.'):
-        fqname = "%s.%s" % (m.__name__, part)
-        m = self._import_one(m, part, fqname)
-        if not m:
-          raise ImportError, "No module named " + fqname
-    return m
-
-  def _import_fromlist(self, package, fromlist):
-    'Import any sub-modules in the "from" list.'
-
-    # if '*' is present in the fromlist, then look for the '__all__' variable
-    # to find additional items (modules) to import.
-    if '*' in fromlist:
-      fromlist = list(fromlist) + list(package.__dict__.get('__all__', []))
-
-    for sub in fromlist:
-      # if the name is already present, then don't try to import it (it
-      # might not be a module!).
-      if sub != '*' and not hasattr(package, sub):
-        subname = "%s.%s" % (package.__name__, sub)
-        submod = self._import_one(package, sub, subname)
-        if not submod:
-          raise ImportError, "cannot import name " + subname
-
-  def _is_package(self, module_dict):
-    """Determine if a given module (dictionary) specifies a package.
-
-    The package status is in the module-level name __ispkg__. The module
-    must also have been imported by self, so that we can reliably apply
-    semantic meaning to __ispkg__.
-
-    ### weaken the test to issubclass(Importer)?
-    """
-    return module_dict.get('__importer__', None) is self and \
-           module_dict['__ispkg__']
-
-  ######################################################################
-  #
-  # METHODS TO OVERRIDE
-  #
-  def get_code(self, parent, modname, fqname):
-    """Find and retrieve the code for the given module.
-
-    parent specifies a parent module to define a context for importing. It
-    may be None, indicating no particular context for the search.
-
-    modname specifies a single module (not dotted) within the parent.
-
-    fqname specifies the fully-qualified module name. This is a (potentially)
-    dotted name from the "root" of the module namespace down to the modname.
-    If there is no parent, then modname==fqname.
-
-    This method should return None, a 2-tuple, or a 3-tuple.
-
-    * If the module was not found, then None should be returned.
-
-    * The first item of the 2- or 3-tuple should be the integer 0 or 1,
-      specifying whether the module that was found is a package or not.
-
-    * The second item is the code object for the module (it will be
-      executed within the new module's namespace). This item can also
-      be a fully-loaded module object (e.g. loaded from a shared lib).
-
-    * If present, the third item is a dictionary of name/value pairs that
-      will be inserted into new module before the code object is executed.
-      This provided in case the module's code expects certain values (such
-      as where the module was found). When the second item is a module
-      object, then these names/values will be inserted *after* the module
-      has been loaded/initialized.
-    """
-    raise RuntimeError, "get_code not implemented"
-
-
-######################################################################
-#
-# Simple function-based importer
-#
-class FuncImporter(Importer):
-  "Importer subclass to use a supplied function rather than method overrides."
-  def __init__(self, func):
-    self.func = func
-  def get_code(self, parent, modname, fqname):
-    return self.func(parent, modname, fqname)
-
-def install_with(func):
-  FuncImporter(func).install()
-
-
-######################################################################
-#
-# Base class for archive-based importing
-#
-class PackageArchiveImporter(Importer):
-  "Importer subclass to import from (file) archives."
-
-  def get_code(self, parent, modname, fqname):
-    if parent:
-      # if a parent "package" is provided, then we are importing a sub-file
-      # from the archive.
-      result = self.get_subfile(parent.__archive__, modname)
-      if result is None:
-        return None
-      if type(result) == type(()):
-        return (0,) + result
-      return 0, result
-
-    # no parent was provided, so the archive should exist somewhere on the
-    # default "path".
-    archive = self.get_archive(modname)
-    if archive is None:
-      return None
-    return 1, "", {'__archive__':archive}
-
-  def get_archive(self, modname):
-    """Get an archive of modules.
-
-    This method should locate an archive and return a value which can be
-    used by get_subfile to load modules from it. The value may be a simple
-    pathname, an open file, or a complex object that caches information
-    for future imports.
-
-    Return None if the archive was not found.
-    """
-    raise RuntimeError, "get_archive not implemented"
-
-  def get_subfile(self, archive, modname):
-    """Get code from a subfile in the specified archive.
-
-    Given the specified archive (as returned by get_archive()), locate
-    and return a code object for the specified module name.
-
-    A 2-tuple may be returned, consisting of a code object and a dict
-    of name/values to place into the target module.
-
-    Return None if the subfile was not found.
-    """
-    raise RuntimeError, "get_subfile not implemented"
-
-
-class PackageArchive(PackageArchiveImporter):
-  "PackageArchiveImporter subclass that refers to a specific archive."
-
-  def __init__(self, modname, archive_pathname):
-    self.__modname = modname
-    self.__path = archive_pathname
-
-  def get_archive(self, modname):
-    if modname == self.__modname:
-      return self.__path
-    return None
-
-  # get_subfile is passed the full pathname of the archive
-
-
-######################################################################
-#
-# Emulate the standard directory-based import mechanism
-#
-
-class DirectoryImporter(Importer):
-  "Importer subclass to emulate the standard importer."
-
-  def __init__(self, dir):
-    self.dir = dir
-    self.ext_char = __debug__ and 'c' or 'o'
-    self.ext = '.py' + self.ext_char
-
-  def get_code(self, parent, modname, fqname):
-    if parent:
-      dir = parent.__pkgdir__
-    else:
-      dir = self.dir
-
-    # pull the os module from our instance data. we don't do this at the
-    # top-level, because it isn't a builtin module (and we want to defer
-    # loading non-builtins until as late as possible).
-    try:
-      os = self.os
-    except AttributeError:
-      import os
-      self.os = os
-
-    pathname = os.path.join(dir, modname)
-    if os.path.isdir(pathname):
-      values = { '__pkgdir__': pathname }
-      ispkg = 1
-      pathname = os.path.join(pathname, '__init__')
-    else:
-      values = { }
-      ispkg = 0
-
-    t_py = self._timestamp(pathname + '.py')
-    t_pyc = self._timestamp(pathname + self.ext)
-    if t_py is None and t_pyc is None:
-      return None
-    code = None
-    if t_py is None or (t_pyc is not None and t_pyc >= t_py):
-      f = open(pathname + self.ext, 'rb')
-      if f.read(4) == imp.get_magic():
-        t = struct.unpack('<I', f.read(4))[0]
-        if t == t_py:
-          code = marshal.load(f)
-      f.close()
-    if code is None:
-      code = self._compile(pathname + '.py', t_py)
-    return ispkg, code, values
-
-  def _timestamp(self, pathname):
-    try:
-      s = self.os.stat(pathname)
-    except OSError:
-      return None
-    return long(s[8])
-
-  def _compile(self, pathname, timestamp):
-    codestring = open(pathname, 'r').read()
-    if codestring and codestring[-1] != '\n':
-      codestring = codestring + '\n'
-    code = __builtin__.compile(codestring, pathname, 'exec')
-
-    # try to cache the compiled code
-    try:
-      f = open(pathname + self.ext_char, 'wb')
-      f.write('\0\0\0\0')
-      f.write(struct.pack('<I', timestamp))
-      marshal.dump(code, f)
-      f.flush()
-      f.seek(0, 0)
-      f.write(imp.get_magic())
-      f.close()
-    except OSError:
-      pass
-
-    return code
-
-  def __repr__(self):
-    return '<%s.%s for "%s" at 0x%x>' % (self.__class__.__module__,
-                                         self.__class__.__name__,
-                                         self.dir,
-                                         id(self))
-
-def _test_dir():
-  "Debug/test function to create DirectoryImporters from sys.path."
-  path = sys.path[:]
-  path.reverse()
-  for d in path:
-    DirectoryImporter(d).install()
-
-######################################################################
diff --git a/direct/src/pyinst/installutils.py b/direct/src/pyinst/installutils.py
deleted file mode 100644
index 23f4f8becb..0000000000
--- a/direct/src/pyinst/installutils.py
+++ /dev/null
@@ -1,91 +0,0 @@
-# copyright 1999 McMillan Enterprises, Inc.
-# demo code - use as you please.
-import os
-import stat
-
-def copyFile(srcFiles, destFile, append=0):
-    '''
-    Copy one or more files to another file.  If srcFiles is a list, then all
-    will be concatenated together to destFile.  The append flag is also valid
-    for single file copies.
-
-    destFile will have the mode, ownership and timestamp of the last file
-    copied/appended.
-    '''
-    if type(srcFiles) == type([]):
-        # in case we need to overwrite on the first file...
-        copyFile(srcFiles[0], destFile, append)
-        for file in srcFiles[1:]:
-            copyFile(file, destFile, 1)
-        return
-
-    mode = 'wb'
-    if append:
-        mode = 'ab'
-    print " ", srcFiles, "->",
-    input = open(srcFiles, 'rb')
-    if input:
-        print destFile
-        output = open(destFile, mode)
-        while 1:
-            bytesRead = input.read(8192)
-            if bytesRead:
-                output.write(bytesRead)
-            else:
-                break
-
-        input.close()
-        output.close()
-
-        stats = os.stat(srcFiles)
-        os.chmod(destFile, stats[stat.ST_MODE])
-        try:        # FAT16 file systems have only one file time
-            os.utime(destFile, (stats[stat.ST_ATIME], stats[stat.ST_MTIME]))
-        except:
-            pass
-        try:        
-            os.chown(destFile, stats[stat.ST_UID], stats[stat.ST_GID])
-        except:
-            pass
-
-def ensure(dirct):
-    dirnm = dirct
-    plist = []
-    try:
-        while not os.path.exists(dirnm):
-            dirnm, base = os.path.split(dirnm)
-            if base == '':
-                break
-            plist.insert(0, base)
-        for d in plist:
-            dirnm = os.path.join(dirnm, d)
-            os.mkdir(dirnm)
-    except:
-        return 0
-    return 1
-
-def getinstalldir(prompt="Enter an installation directory: "):
-    while 1:
-        installdir = raw_input("Enter an installation directory: ")
-        installdir = os.path.normpath(installdir)
-        if ensure(installdir):
-            break
-        else:
-            print installdir, "is not a valid pathname"
-            r = raw_input("Try again (y/n)?: ")
-            if r in 'nN':
-                sys.exit(0)
-    return installdir
-
-def installCArchive(nm, basedir, suffixdir):
-    import carchive_rt
-    fulldir = os.path.join(basedir, suffixdir)
-    if ensure(fulldir):
-        pkg = carchive_rt.CArchive(nm)
-        for fnm in pkg.contents():
-            stuff = pkg.extract(fnm)[1]
-            outnm = os.path.join(fulldir, fnm)
-            if ensure(os.path.dirname(outnm)):
-                open(outnm, 'wb').write(stuff)
-        pkg = None
-        os.remove(nm)
diff --git a/direct/src/pyinst/ltoc.py b/direct/src/pyinst/ltoc.py
deleted file mode 100644
index 86a741f805..0000000000
--- a/direct/src/pyinst/ltoc.py
+++ /dev/null
@@ -1,85 +0,0 @@
-import os, sys, UserList
-import finder, tocfilter, resource
-
-class lTOC(UserList.UserList):
-    """ A class for managing lists of resources.
-        Should be a UserList subclass. Doh. 
-        Like a list, but has merge(other) and filter() methods """
-    def __init__(self, reslist=None, filters=None):
-        UserList.UserList.__init__(self, reslist)
-        self.filters = []
-        if filters is not None:
-            self.filters = filters[:]
-    def prepend(self, res):
-        self.resources.insert(0, res)
-    def merge(self, other):
-        ' merge in another ltoc, discarding dups and preserving order '
-        tmp = {}
-        for res in self.data:
-            tmp[res.name] = 0
-        for res in other:
-            if tmp.get(res.name, 1):
-                self.data.append(res)
-                tmp[res.name] = 0
-    def filter(self):
-        ' invoke all filters '
-        for i in range(len(self.data)):
-            res = self.data[i]
-            if res:
-                for f in self.filters:
-                    if f.matches(res):
-                        self.data[i] = None
-                        break
-        self.data = filter(None, self.data)
-        return self
-    def unique(self):
-        ' remove all duplicate entries, preserving order '
-        new = self.__class__()
-        new.merge(self)
-        self.data = new.data
-    def toList(self):
-        ' return self as a list of (name, path, typ) '
-        tmp = []
-        for res in self.data:
-            tmp.append((res.name, res.path, res.typ))
-        return tmp
-    def addFilter(self, filter):
-        if type(filter) == type(''):
-            self.filters.append(finder.makeresource(filter).asFilter())
-        else:
-            if type(filter) == type(self):
-                if isinstance(filter, tocfilter._Filter):
-                    self.filters.append(filter)
-                elif isinstance(filter, resource.resource):
-                    self.filters.append(filter.asFilter())
-                else:
-                    raise ValueError, "can't make filter from %s", repr(filter)
-            else:
-                raise ValueError, "can't make filter from %s", repr(filter)
-        print " added filter", repr(self.filters[-1])             
-            
-   
-if __name__ == '__main__':
-    sys.path.insert(0, '.')
-    import finder
-    import pprint
-    s = finder.scriptresource('finder.py', './finder.py')
-    ##    pyltoc = lTOC(s.modules)
-    ##    l1 = pyltoc.toList()
-    ##    print "Raw py ltoc:", pprint.pprint(l1)
-    ##    f1 = ModFilter(['dospath', 'macpath', 'posixpath'])
-    ##    l2 = lTOC(s.modules).filter(f1).toList()
-    ##    print "Filter out dospath, macpath, posixpath:", pprint.pprint(l2)
-    ##    f2 = DirFilter(['.'])
-    ##    l3 = lTOC(s.modules).filter(f2).toList()
-    ##    print "Filter out current dir:", pprint.pprint(l3)
-    ##    f3 = StdLibFilter()
-    ##    l4 = lTOC(s.modules).filter(f3).toList()
-    ##    print "Filter out stdlib:", pprint.pprint(l4)
-    ##    #print "Filter out current dir and stdlib:", lTOC(s.modules).filter(f2, f3).toList()
-    binltoc = lTOC(s.binaries)
-    print "Raw bin ltoc:", pprint.pprint(binltoc.toList())
-    binltoc.addFilter('c:/winnt/system32')
-    pprint.pprint(binltoc.filter().toList())
-    
-    
diff --git a/direct/src/pyinst/mkarchive.py b/direct/src/pyinst/mkarchive.py
deleted file mode 100644
index 56f18b11c7..0000000000
--- a/direct/src/pyinst/mkarchive.py
+++ /dev/null
@@ -1,42 +0,0 @@
-#import MkWrap
-import imputil
-import strop
-import zlib
-import os
-import marshal
-
-class MkImporter:
-    def __init__(self, db, viewnm='pylib'):
-        self.db = db
-        self.view = db.getas(viewnm+'[name:S, ispkg:I, code:M]') # an MkWrap view object
-    def setImportHooks(self):
-        imputil.FuncImporter(self.get_code).install()
-    def get_code(self, parent, modname, fqname):
-        if self.view is None:
-            return None
-        ndx = self.view.search(name=fqname)
-        if ndx < len(self.view):
-            row = self.view[ndx]
-            if row.name == fqname:
-                return (row.ispkg, marshal.loads(zlib.decompress(row.code)))
-        return None
-    def build(self, lTOC):
-        for entry in lTOC:
-            nm, fnm = entry[0], entry[1]
-            ispkg = os.path.splitext(os.path.basename(fnm))[0] == '__init__'
-            ndx = self.view.search(name=nm)
-            if ndx < len(self.view):
-                row = self.view[ndx]
-                if row.name != nm:
-                    self.view.insert(ndx, {})
-                    row = self.view[ndx]
-            else:
-                ndx = self.view.append({})
-                row = self.view[ndx]
-            row.name = nm
-            row.ispkg = ispkg
-            f = open(fnm, 'rb')
-            f.seek(8)
-            obj = zlib.compress(f.read(), 9)
-            row.code = obj
-        self.db.commit()
diff --git a/direct/src/pyinst/modulefinder.py b/direct/src/pyinst/modulefinder.py
deleted file mode 100644
index 5e1b4805aa..0000000000
--- a/direct/src/pyinst/modulefinder.py
+++ /dev/null
@@ -1,436 +0,0 @@
-"""Find modules used by a script, using introspection."""
-
-import dis
-import imp
-import marshal
-import os
-import re
-import string
-import sys
-
-if sys.platform=="win32":
-    # On Windows, we can locate modules in the registry with
-    # the help of the win32api package.
-    try:
-        import win32api
-    except ImportError:
-        print "The win32api module is not available - modules listed"
-        print "in the registry will not be found."
-        win32api = None
-
-
-IMPORT_NAME = dis.opname.index('IMPORT_NAME')
-IMPORT_FROM = dis.opname.index('IMPORT_FROM')
-
-# Modulefinder does a good job at simulating Python's, but it can not
-# handle __path__ modifications packages make at runtime.  Therefore there
-# is a mechanism whereby you can register extra paths in this map for a
-# package, and it will be honoured.
-
-# Note this is a mapping is lists of paths.
-packagePathMap = {}
-
-# A Public interface
-def AddPackagePath(packagename, path):
-    paths = packagePathMap.get(packagename, [])
-    paths.append(path)
-    packagePathMap[packagename] = paths
-
-class Module:
-
-    def __init__(self, name, file=None, path=None):
-        self.__name__ = name
-        self.__file__ = file
-        self.__path__ = path
-        self.__code__ = None
-
-    def __repr__(self):
-        s = "Module(%s" % repr(self.__name__)
-        if self.__file__ is not None:
-            s = s + ", %s" % repr(self.__file__)
-        if self.__path__ is not None:
-            s = s + ", %s" % repr(self.__path__)
-        s = s + ")"
-        return s
-
-
-class ModuleFinder:
-
-    def __init__(self, path=None, debug=0, excludes = []):
-        if path is None:
-            path = sys.path
-        self.path = path
-        self.modules = {}
-        self.badmodules = {}
-        self.debug = debug
-        self.indent = 0
-        self.excludes = excludes
-
-    def msg(self, level, str, *args):
-        if level <= self.debug:
-            for i in range(self.indent):
-                print "   ",
-            print str,
-            for arg in args:
-                print repr(arg),
-            print
-
-    def msgin(self, *args):
-        level = args[0]
-        if level <= self.debug:
-            self.indent = self.indent + 1
-            apply(self.msg, args)
-
-    def msgout(self, *args):
-        level = args[0]
-        if level <= self.debug:
-            self.indent = self.indent - 1
-            apply(self.msg, args)
-
-    def run_script(self, pathname):
-        self.msg(2, "run_script", pathname)
-        fp = open(pathname)
-        stuff = ("", "r", imp.PY_SOURCE)
-        self.load_module('__main__', fp, pathname, stuff)
-
-    def load_file(self, pathname):
-        dir, name = os.path.split(pathname)
-        name, ext = os.path.splitext(name)
-        fp = open(pathname)
-        stuff = (ext, "r", imp.PY_SOURCE)
-        self.load_module(name, fp, pathname, stuff)
-
-    def import_hook(self, name, caller=None, fromlist=None):
-        self.msg(3, "import_hook", name, caller, fromlist)
-        parent = self.determine_parent(caller)
-        q, tail = self.find_head_package(parent, name)
-        m = self.load_tail(q, tail)
-        if not fromlist:
-            return q
-        if m.__path__:
-            self.ensure_fromlist(m, fromlist)
-
-    def determine_parent(self, caller):
-        self.msgin(4, "determine_parent", caller)
-        if not caller:
-            self.msgout(4, "determine_parent -> None")
-            return None
-        pname = caller.__name__
-        if caller.__path__:
-            parent = self.modules[pname]
-            assert caller is parent
-            self.msgout(4, "determine_parent ->", parent)
-            return parent
-        if '.' in pname:
-            i = string.rfind(pname, '.')
-            pname = pname[:i]
-            parent = self.modules[pname]
-            assert parent.__name__ == pname
-            self.msgout(4, "determine_parent ->", parent)
-            return parent
-        self.msgout(4, "determine_parent -> None")
-        return None
-
-    def find_head_package(self, parent, name):
-        self.msgin(4, "find_head_package", parent, name)
-        if '.' in name:
-            i = string.find(name, '.')
-            head = name[:i]
-            tail = name[i+1:]
-        else:
-            head = name
-            tail = ""
-        if parent:
-            qname = "%s.%s" % (parent.__name__, head)
-        else:
-            qname = head
-        q = self.import_module(head, qname, parent)
-        if q:
-            self.msgout(4, "find_head_package ->", (q, tail))
-            return q, tail
-        if parent:
-            qname = head
-            parent = None
-            q = self.import_module(head, qname, parent)
-            if q:
-                self.msgout(4, "find_head_package ->", (q, tail))
-                return q, tail
-        self.msgout(4, "raise ImportError: No module named", qname)
-        raise ImportError, "No module named " + qname
-
-    def load_tail(self, q, tail):
-        self.msgin(4, "load_tail", q, tail)
-        m = q
-        while tail:
-            i = string.find(tail, '.')
-            if i < 0: i = len(tail)
-            head, tail = tail[:i], tail[i+1:]
-            mname = "%s.%s" % (m.__name__, head)
-            m = self.import_module(head, mname, m)
-            if not m:
-                self.msgout(4, "raise ImportError: No module named", mname)
-                raise ImportError, "No module named " + mname
-        self.msgout(4, "load_tail ->", m)
-        return m
-
-    def ensure_fromlist(self, m, fromlist, recursive=0):
-        self.msg(4, "ensure_fromlist", m, fromlist, recursive)
-        for sub in fromlist:
-            if sub == "*":
-                if not recursive:
-                    all = self.find_all_submodules(m)
-                    if all:
-                        self.ensure_fromlist(m, all, 1)
-            elif not hasattr(m, sub):
-                subname = "%s.%s" % (m.__name__, sub)
-                submod = self.import_module(sub, subname, m)
-                if not submod:
-                    raise ImportError, "No module named " + subname
-
-    def find_all_submodules(self, m):
-        if not m.__path__:
-            return
-        modules = {}
-        suffixes = [".py", ".pyc", ".pyo"]
-        for dir in m.__path__:
-            try:
-                names = os.listdir(dir)
-            except os.error:
-                self.msg(2, "can't list directory", dir)
-                continue
-            for name in names:
-                mod = None
-                for suff in suffixes:
-                    n = len(suff)
-                    if name[-n:] == suff:
-                        mod = name[:-n]
-                        break
-                if mod and mod != "__init__":
-                    modules[mod] = mod
-        return modules.keys()
-
-    def import_module(self, partname, fqname, parent):
-        self.msgin(3, "import_module", partname, fqname, parent)
-        try:
-            m = self.modules[fqname]
-        except KeyError:
-            pass
-        else:
-            self.msgout(3, "import_module ->", m)
-            return m
-        if fqname in self.badmodules:
-            self.msgout(3, "import_module -> None")
-            self.badmodules[fqname][parent.__name__] = None
-            return None
-        try:
-            fp, pathname, stuff = self.find_module(partname,
-                                                   parent and parent.__path__)
-        except ImportError:
-            self.msgout(3, "import_module ->", None)
-            return None
-        try:
-            m = self.load_module(fqname, fp, pathname, stuff)
-        finally:
-            if fp: fp.close()
-        if parent:
-            setattr(parent, partname, m)
-        self.msgout(3, "import_module ->", m)
-        return m
-
-    def load_module(self, fqname, fp, pathname, (suffix, mode, type)):
-        self.msgin(2, "load_module", fqname, fp and "fp", pathname)
-        if type == imp.PKG_DIRECTORY:
-            m = self.load_package(fqname, pathname)
-            self.msgout(2, "load_module ->", m)
-            return m
-        if type == imp.PY_SOURCE:
-            co = compile(fp.read()+'\n', pathname, 'exec')
-        elif type == imp.PY_COMPILED:
-            if fp.read(4) != imp.get_magic():
-                self.msgout(2, "raise ImportError: Bad magic number", pathname)
-                raise ImportError, "Bad magic number in %s", pathname
-            fp.read(4)
-            co = marshal.load(fp)
-        else:
-            co = None
-        m = self.add_module(fqname)
-        m.__file__ = pathname
-        if co:
-            m.__code__ = co
-            self.scan_code(co, m)
-        self.msgout(2, "load_module ->", m)
-        return m
-
-    def scan_code(self, co, m):
-        code = co.co_code
-        n = len(code)
-        i = 0
-        lastname = None
-        while i < n:
-            c = code[i]
-            i = i+1
-            op = ord(c)
-            if op >= dis.HAVE_ARGUMENT:
-                oparg = ord(code[i]) + ord(code[i+1])*256
-                i = i+2
-            if op == IMPORT_NAME:
-                name = lastname = co.co_names[oparg]
-                if lastname not in self.badmodules:
-                    try:
-                        self.import_hook(name, m)
-                    except ImportError, msg:
-                        self.msg(2, "ImportError:", str(msg))
-                        if name not in self.badmodules:
-                            self.badmodules[name] = {}
-                        self.badmodules[name][m.__name__] = None
-            elif op == IMPORT_FROM:
-                name = co.co_names[oparg]
-                assert lastname is not None
-                if lastname not in self.badmodules:
-                    try:
-                        self.import_hook(lastname, m, [name])
-                    except ImportError, msg:
-                        self.msg(2, "ImportError:", str(msg))
-                        fullname = lastname + "." + name
-                        if fullname not in self.badmodules:
-                            self.badmodules[fullname] = {}
-                        self.badmodules[fullname][m.__name__] = None
-            else:
-                lastname = None
-        for c in co.co_consts:
-            if isinstance(c, type(co)):
-                self.scan_code(c, m)
-
-    def load_package(self, fqname, pathname):
-        self.msgin(2, "load_package", fqname, pathname)
-        m = self.add_module(fqname)
-        m.__file__ = pathname
-        m.__path__ = [pathname]
-
-        # As per comment at top of file, simulate runtime __path__ additions.
-        m.__path__ = m.__path__ + packagePathMap.get(fqname, [])
-
-        fp, buf, stuff = self.find_module("__init__", m.__path__)
-        self.load_module(fqname, fp, buf, stuff)
-        self.msgout(2, "load_package ->", m)
-        return m
-
-    def add_module(self, fqname):
-        if fqname in self.modules:
-            return self.modules[fqname]
-        self.modules[fqname] = m = Module(fqname)
-        return m
-
-    def find_module(self, name, path):
-        if name in self.excludes:
-            self.msgout(3, "find_module -> Excluded")
-            raise ImportError, name
-
-        if path is None:
-            if name in sys.builtin_module_names:
-                return (None, None, ("", "", imp.C_BUILTIN))
-
-            # Emulate the Registered Module support on Windows.
-            if sys.platform=="win32" and win32api is not None:
-                HKEY_LOCAL_MACHINE = 0x80000002
-                try:
-                    pathname = win32api.RegQueryValue(HKEY_LOCAL_MACHINE, "Software\\Python\\PythonCore\\%s\\Modules\\%s" % (sys.winver, name))
-                    fp = open(pathname, "rb")
-                    # XXX - To do - remove the hard code of C_EXTENSION.
-                    stuff = "", "rb", imp.C_EXTENSION
-                    return fp, pathname, stuff
-                except win32api.error:
-                    pass
-
-            path = self.path
-        return imp.find_module(name, path)
-
-    def report(self):
-        print
-        print "  %-25s %s" % ("Name", "File")
-        print "  %-25s %s" % ("----", "----")
-        # Print modules found
-        keys = self.modules.keys()
-        keys.sort()
-        for key in keys:
-            m = self.modules[key]
-            if m.__path__:
-                print "P",
-            else:
-                print "m",
-            print "%-25s" % key, m.__file__ or ""
-
-        # Print missing modules
-        keys = self.badmodules.keys()
-        keys.sort()
-        for key in keys:
-            # ... but not if they were explicitely excluded.
-            if key not in self.excludes:
-                mods = self.badmodules[key].keys()
-                mods.sort()
-                print "?", key, "from", string.join(mods, ', ')
-
-
-def test():
-    # Parse command line
-    import getopt
-    try:
-        opts, args = getopt.getopt(sys.argv[1:], "dmp:qx:")
-    except getopt.error, msg:
-        print msg
-        return
-
-    # Process options
-    debug = 1
-    domods = 0
-    addpath = []
-    exclude = []
-    for o, a in opts:
-        if o == '-d':
-            debug = debug + 1
-        if o == '-m':
-            domods = 1
-        if o == '-p':
-            addpath = addpath + string.split(a, os.pathsep)
-        if o == '-q':
-            debug = 0
-        if o == '-x':
-            exclude.append(a)
-
-    # Provide default arguments
-    if not args:
-        script = "hello.py"
-    else:
-        script = args[0]
-
-    # Set the path based on sys.path and the script directory
-    path = sys.path[:]
-    path[0] = os.path.dirname(script)
-    path = addpath + path
-    if debug > 1:
-        print "path:"
-        for item in path:
-            print "   ", repr(item)
-
-    # Create the module finder and turn its crank
-    mf = ModuleFinder(path, debug, exclude)
-    for arg in args[1:]:
-        if arg == '-m':
-            domods = 1
-            continue
-        if domods:
-            if arg[-2:] == '.*':
-                mf.import_hook(arg[:-2], None, ["*"])
-            else:
-                mf.import_hook(arg)
-        else:
-            mf.load_file(arg)
-    mf.run_script(script)
-    mf.report()
-
-
-if __name__ == '__main__':
-    try:
-        test()
-    except KeyboardInterrupt:
-        print "\n[interrupt]"
diff --git a/direct/src/pyinst/resource.py b/direct/src/pyinst/resource.py
deleted file mode 100644
index 29e13e7ccd..0000000000
--- a/direct/src/pyinst/resource.py
+++ /dev/null
@@ -1,317 +0,0 @@
-import os
-import string
-import archivebuilder
-import carchive
-import tocfilter
-import bindepend
-import finder
-
-_cache = {}
-
-def makeresource(name, xtrapath=None):
-    """Factory function that returns a resource subclass.
-
-       NAME is the logical or physical name of a resource.
-       XTRAPTH is a path or list of paths to search first.
-       return one of the resource subclasses.
-       Warning - logical names can conflict; archive might return a directory,
-       when the module archive.py was desired."""
-    typ, nm, fullname = finder.identify(name, xtrapath)
-    fullname = os.path.normpath(fullname)
-    if fullname in _cache:
-        return _cache[fullname]
-    elif typ in (finder.SCRIPT, finder.GSCRIPT):
-        rsrc = scriptresource(nm, fullname)
-    elif typ == finder.MODULE:
-        rsrc = moduleresource(nm, fullname)
-    elif typ == finder.PACKAGE:
-        rsrc = pkgresource(nm, fullname)
-    elif typ in (finder.PBINARY, finder.BINARY):
-        rsrc = binaryresource(nm, fullname)
-    elif typ == finder.ZLIB:
-        rsrc = zlibresource(nm, fullname)
-    elif typ == finder.DIRECTORY:
-        rsrc = dirresource(nm, fullname)
-    else:
-        try:
-            carchive.CArchive(fullname)
-        except:
-            rsrc = dataresource(nm, fullname)
-        else:
-            rsrc = archiveresource(nm, fullname)
-    _cache[fullname] = rsrc
-    return rsrc
-
-class resource:
-    """ Base class for all resources.
-
-        contents() returns of list of what's contained (eg files in dirs)
-        dependencies() for Python resources returns a list of moduleresources
-         and binaryresources """
-    def __init__(self, name, path, typ):
-        """NAME is the logical name of the resource.
-           PATH is the full path to the resource.
-           TYP is the type code.
-           No editting or sanity checks."""
-        self.name = name
-        self.path = path
-        self.typ = typ
-    def __repr__(self):
-        return "(%(name)s, %(path)s, %(typ)s)" % self.__dict__
-    def contents(self):
-        """A list of resources within this resource.
-
-           Overridable.
-           Base implementation returns [self]"""
-        return [self]
-    def dependencies(self):
-        """A list of resources this resource requires.
-
-           Overridable.
-           Base implementation returns []"""
-        return []
-    def __cmp__(self, other):
-        if not isinstance(other, self.__class__):
-            return -1
-        return cmp((self.typ, self.name), (other.typ, other.name))
-    def asFilter(self):
-        """Create a tocfilter based on self.
-
-           Pure virtual"""
-        raise NotImplementedError
-    def asSource(self):
-        """Return self in source form.
-
-           Base implementation returns self"""
-        return self
-    def asBinary(self):
-        """Return self in binary form.
-
-           Base implementation returns self"""
-        return self
-
-class pythonresource(resource):
-    """An empty base class.
-
-       Used to classify resources."""
-    pass
-
-
-class scriptresource(pythonresource):
-    """ A top-level python resource.
-
-        Has (lazily computed) attributes, modules and binaries, which together
-        are the scripts dependencies() """
-    def __init__(self, name, fullname):
-        resource.__init__(self, name, fullname, 's')
-    def __getattr__(self, name):
-        if name == 'modules':
-            print "Analyzing python dependencies of", self.name, self.path
-            self.modules = []
-            self._binaries = []
-            nodes = string.split(self.name, '.')[:-1] # MEInc.Dist.archive -> ['MEInc', 'Dist']
-            for i in range(len(nodes)):
-                nm = string.join(nodes[:i+1], '.')
-                rsrc = makeresource(nm+'.__init__')
-                rsrc.name = nm
-                self.modules.append(rsrc)
-            for (nm, path) in archivebuilder.Dependencies(self.path):
-                path = os.path.normcase(os.path.abspath(path))
-                if os.path.splitext(path)[1] == '.py':
-                    self.modules.append(moduleresource(nm, path))
-                else:
-                    self._binaries.append(binaryresource(nm, path))
-            return self.modules
-        elif name == 'binaries':
-            x = self.modules
-            tmp = {}
-            for br in self._binaries:
-                tmp[br.name] = br
-                for br2 in br.dependencies():
-                    tmp[br2.name] = br2
-            self.binaries = tmp.values()
-            return self.binaries
-        else:
-            raise AttributeError, "%s" % name
-    def dependencies(self):
-        """Return all dependencies (Python and binary) of self."""
-        return self.modules + self.binaries
-    def asFilter(self):
-        """Return a ModFilter based on self."""
-        return tocfilter.ModFilter([self.name])
-    def asSource(self):
-        """Return self as a dataresource (ie, a text file wrapper)."""
-        r = dataresource(self.path)
-        r.name = apply(os.path.join, string.split(self.name, '.')[:-1]+[r.name])
-        return r
-
-class moduleresource(scriptresource):
-    """ A module resource (differs from script in that it will generally
-        be worked with as a .pyc instead of in source form) """
-    def __init__(self, name, fullname):
-        resource.__init__(self, name, fullname, 'm')
-    def asBinary(self):
-        """Return self as a dataresource (ie, a binary file wrapper)."""
-        r = dataresource(self.path)
-        r.name = os.path.basename(r.name)
-        r.typ = 'b'
-        return r
-    def asSource(self):
-        """Return self as a scriptresource (ie, uncompiled form)."""
-        return scriptresource(self.name, self.path[:-1]).asSource()
-
-class binaryresource(resource):
-    """A .dll or .pyd.
-
-       dependencies() yields more binaryresources """
-    def __init__(self, name, fullname):
-        if string.find(name, '.') == -1:
-            pth, bnm = os.path.split(fullname)
-            junk, ext = os.path.splitext(bnm)
-            fullname = os.path.join(pth, name + ext)
-        resource.__init__(self, name, fullname, 'b')
-        self._depends = None
-    def dependencies(self):
-        """Return a list of binary dependencies."""
-        if self._depends is not None:
-            return self._depends
-        self._depends = []
-        for (lib, path) in bindepend.Dependencies([(self.name, self.path)]):
-            self._depends.append(binaryresource(lib, path))
-        return self._depends
-    def asFilter(self):
-        """Create a FileFilter from self."""
-        return tocfilter.FileFilter([self.name])
-
-class dataresource(resource):
-    """A subclass for arbitrary files. """
-    def __init__(self, name, fullname=None):
-        resource.__init__(self, name, fullname or name, 'x')
-    def asFilter(self):
-        """Create a FileFilter from self."""
-        return tocfilter.FileFilter([self.name])
-
-class archiveresource(dataresource):
-    """A sublcass for CArchives. """
-    def __init__(self, name, fullname=None):
-        resource.__init__(self, name, fullname or name, 'a')
-
-class zlibresource(dataresource):
-    """A subclass for ZlibArchives. """
-    def __init__(self, name, fullname=None):
-        resource.__init__(self, name, fullname or name, 'z')
-
-class dirresource(resource):
-    """A sublcass for a directory.
-
-       Generally transformed to a list of files through
-        contents() and filtered by file extensions or resource type.
-        Note that contents() is smart enough to regard a .py and .pyc
-        as the same resource. """
-    RECURSIVE = 0
-    def __init__(self, name, fullname=None):
-        resource.__init__(self, name, fullname or name, 'd')
-        self._contents = None
-    def contents(self, prefix=''):
-        """Return the list of (typed) resources in self.name"""
-        if self._contents is not None:
-            return self._contents
-        self._contents = []
-        flist = os.listdir(self.path)
-        for fnm in flist:
-            try:
-                bnm, ext = os.path.splitext(fnm)
-                if ext == '.py' and (bnm+'.pyc' in flist or bnm+'.pyo' in flist):
-                    pass
-                elif ext == '.pyo' and (bnm + '.pyc' in flist):
-                    pass
-                else:
-                    rsrc = makeresource(os.path.join(self.path, fnm))
-                    if isinstance(rsrc, pkgresource):
-                        rsrc = self.__class__(rsrc.path)
-                    if self.RECURSIVE:
-                        if isinstance(rsrc, moduleresource) or isinstance(rsrc, scriptresource):
-                            rsrc = rsrc.asSource()
-                            fnm = os.path.basename(rsrc.path)
-                        rsrc.name = os.path.join(prefix, fnm)
-                        if rsrc.typ == 'd':
-                            rsrc.RECURSIVE = 1
-                            self._contents.extend(rsrc.contents(rsrc.name))
-                        else:
-                            self._contents.append(rsrc)
-                    else:
-                        self._contents.append(rsrc)
-            except ValueError, e:
-                raise RuntimeError, "Can't make resource from %s\n ValueError: %s" \
-                      % (os.path.join(self.path, fnm), repr(e.args))
-        return self._contents
-    def asFilter(self):
-        return tocfilter.DirFilter([self.path])
-
-class treeresource(dirresource):
-    """A subclass for a directory and subdirectories."""
-    RECURSIVE = 1
-    def __init__(self, name, fullname=None):
-        dirresource.__init__(self, name, fullname)
-
-class pkgresource(pythonresource):
-    """A Python package.
-
-        Note that contents() can be fooled by fancy __path__ statements. """
-    def __init__(self, nm, fullname):
-        resource.__init__(self, nm, fullname, 'p')
-        self._contents = None
-        self._depends = None
-    def contents(self, parent=None):
-        """Return a list of subpackages and modules in self."""
-        if self._contents is not None:
-            return self._contents
-        if parent is None:
-            parent = self.name
-        self._contents = []
-        cheat = treeresource(self.path)
-        for rsrc in cheat.contents():
-            if os.path.splitext(rsrc.path)[1] == '.py':
-                rsrc = moduleresource(string.replace(rsrc.name[:-3], os.sep, '.'),
-                                      rsrc.path)
-                if rsrc.name[-8:] == '__init__':
-                    rsrc.name = rsrc.name[:-9]
-            elif os.path.isdir(rsrc.path):
-                rsrc = makeresource(rsrc.path)
-            else:
-                continue
-            if rsrc.name:
-                rsrc.name = parent + '.' + rsrc.name
-            else:
-                rsrc.name = parent
-            if rsrc.typ == 'm':
-                self._contents.append(rsrc)
-            elif rsrc.typ == 'p':
-                self._contents.extend(rsrc.contents(rsrc.name))
-        return self._contents
-    def dependencies(self):
-        """Return the list of accumulated dependencies of all modules in self."""
-        if self._depends is not None:
-            return self._depends
-        self._depends = []
-        tmp = {}
-        for rsrc in self.contents():
-            for r in rsrc.dependencies():
-                tmp[r.name] = r
-        self._depends = tmp.values()
-        return self._depends
-    def asFilter(self):
-        """Create a PkgFilter from self."""
-        return tocfilter.PkgFilter([os.path.dirname(self.path)])
-
-
-
-
-
-
-
-if __name__ == '__main__':
-    s = scriptresource('finder.py', './finder.py')
-    print "s.modules:", s.modules
-    print "s.binaries:", s.binaries
-
diff --git a/direct/src/pyinst/tocfilter.py b/direct/src/pyinst/tocfilter.py
deleted file mode 100644
index aa0c0203e2..0000000000
--- a/direct/src/pyinst/tocfilter.py
+++ /dev/null
@@ -1,131 +0,0 @@
-import os
-import finder
-import re
-import sys
-
-def makefilter(name, xtrapath=None):
-    typ, nm, fullname = finder.identify(name, xtrapath)
-    if typ in (finder.SCRIPT, finder.GSCRIPT, finder.MODULE):
-        return ModFilter([os.path.splitext(nm)[0]])
-    if typ == finder.PACKAGE:
-        return PkgFilter([fullname])
-    if typ == finder.DIRECTORY:
-        return DirFilter([fullname])
-    if typ in (finder.BINARY, finder.PBINARY):
-        return FileFilter([nm])
-    return FileFilter([fullname])
-  
-class _Filter:
-    def __repr__(self):
-        return '<'+self.__class__.__name__+' '+repr(self.elements)+'>'
-    
-class _NameFilter(_Filter):
-    """ A filter mixin that matches (exactly) on name """
-    def matches(self, res):
-        return self.elements.get(res.name, 0)
-        
-class _PathFilter(_Filter):
-    """ A filter mixin that matches if the resource is below any of the paths"""
-    def matches(self, res):
-        p = os.path.normcase(os.path.abspath(res.path))
-        while len(p) > 3:
-            p = os.path.dirname(p)
-            if self.elements.get(p, 0):
-                return 1
-        return 0
-        
-class _ExtFilter(_Filter):
-    """ A filter mixin that matches based on file extensions (either way) """
-    include = 0
-    def matches(self, res):
-        fnd = self.elements.get(os.path.splitext(res.path)[1], 0)
-        if self.include:
-            return not fnd
-        return fnd
-    
-class _TypeFilter(_Filter):
-    """ A filter mixin that matches on resource type (either way) """
-    include = 0
-    def matches(self, res):
-        fnd = self.elements.get(res.typ, 0)
-        if self.include:
-            return not fnd
-        return fnd
-
-class _PatternFilter(_Filter):
-    """ A filter that matches if re.search succeeds on the resource path """
-    def matches(self, res):
-        for regex in self.elements:
-            if regex.search(res.path):
-                return 1
-        return 0
-    
-class ExtFilter(_ExtFilter):
-    """ A file extension filter.
-        ExtFilter(extlist, include=0)
-        where extlist is a list of file extensions """
-    def __init__(self, extlist, include=0):
-        self.elements = {}
-        for ext in extlist:
-            if ext[0:1] != '.':
-                ext = '.'+ext
-            self.elements[ext] = 1
-        self.include = include
-
-class TypeFilter(_TypeFilter):
-    """ A filter for resource types.
-        TypeFilter(typlist, include=0)
-        where typlist is a subset of ['a','b','d','m','p','s','x','z'] """
-    def __init__(self, typlist, include=0):
-        self.elements = {}
-        for typ in typlist:
-            self.elements[typ] = 1
-        self.include = include
-
-class FileFilter(_NameFilter):
-    """ A filter for data files """
-    def __init__(self, filelist):
-        self.elements = {}
-        for f in filelist:
-            self.elements[f] = 1
-              
-class ModFilter(_NameFilter):
-    """ A filter for Python modules.
-        ModFilter(modlist) where modlist is eg ['macpath', 'dospath'] """
-    def __init__(self, modlist):
-        self.elements = {}
-        for mod in modlist:
-            self.elements[mod] = 1
-            
-class DirFilter(_PathFilter):
-    """ A filter based on directories.
-        DirFilter(dirlist)
-        dirs may be relative and will be normalized.
-        Subdirectories of dirs will be excluded. """
-    def __init__(self, dirlist):
-        self.elements = {}
-        for pth in dirlist:
-            pth = os.path.normcase(os.path.abspath(pth))
-            self.elements[pth] = 1
-            
-class PkgFilter(_PathFilter):
-    """At this time, identical to a DirFilter (being lazy) """
-    def __init__(self, pkglist):
-        #warning - pkgs are expected to be full directories
-        self.elements = {}
-        for pkg in pkglist:
-            pth = os.path.normcase(os.path.abspath(pkg))
-            self.elements[pth] = 1
-            
-class StdLibFilter(_PathFilter):
-    """ A filter that excludes anything found in the standard library """
-    def __init__(self):
-        pth = os.path.normcase(os.path.join(sys.exec_prefix, 'lib'))
-        self.elements = {pth:1}
-     
-class PatternFilter(_PatternFilter):
-    """ A filter that excludes if any pattern is found in resource's path """
-    def __init__(self, patterns):
-        self.elements = []
-        for pat in patterns:
-            self.elements.append(re.compile(pat))
diff --git a/direct/src/showbase/BpDb.py b/direct/src/showbase/BpDb.py
deleted file mode 100755
index a0aaeef02d..0000000000
--- a/direct/src/showbase/BpDb.py
+++ /dev/null
@@ -1,557 +0,0 @@
-
-import inspect
-import sys
-
-#Bpdb - breakpoint debugging system (kanpatel - 04/2010)
-class BpMan:
-    def __init__(self):
-        self.bpInfos = {}
-    
-    def partsToPath(self, parts):
-        cfg = parts.get('cfg')
-        grp = parts.get('grp')
-        id = parts.get('id','*')
-        path = ''
-        if cfg:
-            path += '%s'%(cfg,)
-            if grp or id:
-                path += '::'
-        if grp:
-            path += '%s'%(grp,)
-        if isinstance(id, int):
-            path += '(%s)'%(id,)
-        elif grp:
-            path += '.%s'%(id,)
-        else:
-            path += '%s'%(id,)
-        return path
-
-    def pathToParts(self, path=None):
-        parts = {'cfg':None, 'grp':None, 'id':None}
-
-        #verify input        
-        if not isinstance(path, type('')):
-            assert not "error: argument must be string of form '[cfg::][grp.]id'"
-            return parts
-
-        #parse cfg                
-        tokens = path.split('::')
-        if (len(tokens) > 1) and (len(tokens[0]) > 0):
-            parts['cfg'] = tokens[0]
-            path = tokens[1]
-            
-        #parse grp
-        tokens = path.split('.')
-        if (len(tokens) == 1):
-            tokens = path.rsplit(')', 1)
-            if (len(tokens) > 1) and (tokens[-1] == ''):
-                tokens = tokens[-2].rsplit('(', 1)
-                if (len(tokens) > 1):
-                    try:
-                        verifyInt = int(tokens[-1])
-                        parts['grp'] = tokens[0]
-                        path = tokens[-1]
-                    except:
-                        pass
-        elif (len(tokens) > 1) and (len(tokens[0]) > 0):
-            parts['grp'] = tokens[0]
-            path = tokens[1]
-
-        #parse id
-        if (len(path) > 0):
-            parts['id'] = path
-        if parts['id'] == '*':
-            parts['id'] = None
-
-        #done
-        return parts
-
-    def bpToPath(self, bp):
-        if type(bp) is type(''):
-            bp = self.pathToParts(bp)
-        return self.partsToPath(bp)
-        
-    def bpToParts(self, bp):
-        if type(bp) is type({}):
-            bp = self.partsToPath(bp)
-        return self.pathToParts(bp)
-        
-    def makeBpInfo(self, grp, id):
-        self.bpInfos.setdefault(grp, {None:{},})
-        self.bpInfos[grp].setdefault(id, {})
-
-    def getEnabled(self, bp):
-        parts = self.bpToParts(bp)
-        grp, id = parts['grp'], parts['id']
-        self.makeBpInfo(parts['grp'], parts['id'])
-        if not self.bpInfos[grp][None].get('enabled', True):
-            return False
-        if not self.bpInfos[grp][id].get('enabled', True):
-            return False
-        return True
-
-    def setEnabled(self, bp, enabled=True):
-        parts = self.bpToParts(bp)
-        grp, id = parts['grp'], parts['id']
-        self.makeBpInfo(grp, id)
-        self.bpInfos[grp][id]['enabled'] = enabled
-        return enabled
-
-    def toggleEnabled(self, bp):
-        parts = self.bpToParts(bp)
-        grp, id = parts['grp'], parts['id']
-        self.makeBpInfo(grp, id)
-        newEnabled = not self.bpInfos[grp][id].get('enabled', True)
-        self.bpInfos[grp][id]['enabled'] = newEnabled
-        return newEnabled
-
-    def getIgnoreCount(self, bp, decrement=False):
-        parts = self.bpToParts(bp)
-        grp, id = parts['grp'], parts['id']
-        self.makeBpInfo(grp, id)
-        ignoreCount = self.bpInfos[grp][id].get('ignoreCount', 0)
-        if ignoreCount > 0 and decrement:
-            self.bpInfos[grp][id]['ignoreCount'] = ignoreCount - 1
-        return ignoreCount
-
-    def setIgnoreCount(self, bp, ignoreCount=0):
-        if not isinstance(ignoreCount, int):
-            print 'error: first argument should be integer ignoreCount'
-            return
-            
-        parts = self.bpToParts(bp)
-        grp, id = parts['grp'], parts['id']
-        self.makeBpInfo(grp, id)
-        self.bpInfos[grp][id]['ignoreCount'] = ignoreCount
-        return ignoreCount
-
-    def getLifetime(self, bp):
-        parts = self.bpToParts(bp)
-        grp, id = parts['grp'], parts['id']
-        self.makeBpInfo(grp, id)
-        lifetime = self.bpInfos[grp][id].get('lifetime', -1)
-        return lifetime
-        
-    def setLifetime(self, bp, newLifetime):
-        parts = self.bpToParts(bp)
-        grp, id = parts['grp'], parts['id']
-        self.makeBpInfo(grp, id)
-        self.bpInfos[grp][id]['lifetime'] = newLifetime
-        return lifetime
-        
-    def decLifetime(self, bp):
-        parts = self.bpToParts(bp)
-        grp, id = parts['grp'], parts['id']
-        self.makeBpInfo(grp, id)
-        lifetime = self.bpInfos[grp][id].get('lifetime', -1)
-        if lifetime > 0:
-            lifetime = lifetime - 1
-        self.bpInfos[grp][id]['lifetime'] = lifetime
-        return lifetime
-
-    def getHitCount(self, bp):
-        parts = self.bpToParts(bp)
-        grp, id = parts['grp'], parts['id']
-        self.makeBpInfo(grp, id)
-        return self.bpInfos[grp][id].get('count', 0)
-        
-    def setHitCount(self, bp, newHitCount):
-        parts = self.bpToParts(bp)
-        grp, id = parts['grp'], parts['id']
-        self.makeBpInfo(grp, id)
-        self.bpInfos[grp][id]['count'] = newHitCount
-        
-    def incHitCount(self, bp):
-        parts = self.bpToParts(bp)
-        grp, id = parts['grp'], parts['id']
-        self.makeBpInfo(grp, id)
-        self.bpInfos[grp][id]['count'] = self.bpInfos[grp][id].get('count', 0) + 1
-        
-    def resetBp(self, bp):
-        parts = self.bpToParts(bp)
-        grp, id = parts['grp'], parts['id']
-        self.makeBpInfo(grp, id)
-        self.bpInfos[grp][id] = {}
-        if id is None:
-            del self.bpInfos[grp]
-    
-class BpDb:
-    def __init__(self):
-        self.enabled = True
-        self.cfgInfos = { None:True }
-        self.codeInfoCache = {}
-        self.bpMan = BpMan()
-        self.lastBp = None
-        self.pdbAliases = {}
-        self.configCallback = None
-
-    def setEnabledCallback(self, callback):
-        self.enabledCallback = callback
-
-    def verifyEnabled(self):
-        if self.enabledCallback:
-            return self.enabledCallback()
-        return True
-
-    def setConfigCallback(self, callback):
-        self.configCallback = callback
-                
-    def verifySingleConfig(self, cfg):
-        if cfg in self.cfgInfos:
-            return self.cfgInfos[cfg]
-        return not self.configCallback or self.configCallback(cfg)
-
-    def verifyConfig(self, cfg):
-        cfgList = choice(isinstance(cfg, tuple), cfg, (cfg,))
-        passedCfgs = [c for c in cfgList if self.verifySingleConfig(c)]
-        return (len(passedCfgs) > 0)
-
-    def toggleConfig(self, cfg):
-        self.cfgInfos[cfg] = not self.verifyConfig(cfg)
-        return self.cfgInfos[cfg]
-
-    def resetConfig(self, cfg):
-        self.cfgInfos.pop(cfg, None)
-
-    #setup bpdb prompt commands
-    def displayHelp(self):
-        print 'You may use normal pdb commands plus the following:'
-        #print '    cmd  [param <def>]  [cmd] does )this( with [param] (default is def)'
-        #print '    -----------------------------------------------------------------------'
-        print '    _i   [n <0> [, path=<curr>]] set ignore count for bp [path] to [n]'
-        print '    _t   [path <curr>]   toggle bp [path]'
-        print '    _tg  [grp <curr>]    toggle grp'
-        print '    _tc  [cfg <curr>]    toggle cfg'
-        print '    _z   [path <curr>]   clear all settings for bp [path]'
-        print '    _zg  [grp <curr>]    clear all settings for grp'
-        print '    _zc  [cfg <curr>]    clear all settings for cfg (restore .prc setting)'
-        print '    _h                   displays this usage help'
-        print '    _ua                  unalias these commands from pdb'
-
-    def addPdbAliases(self):
-        self.makePdbAlias('_i', 'bpdb._i(%*)')
-        self.makePdbAlias('_t', 'bpdb._t(%*)')
-        self.makePdbAlias('_tg', 'bpdb._tg(%*)')
-        self.makePdbAlias('_tc', 'bpdb._tc(%*)')
-        self.makePdbAlias('_z', 'bpdb._z(%*)')
-        self.makePdbAlias('_zg', 'bpdb._zg(%*)')
-        self.makePdbAlias('_zc', 'bpdb._zc(%*)')
-        self.makePdbAlias('_h', 'bpdb.displayHelp()')
-        self.makePdbAlias('_ua', 'bpdb.removePdbAliases()')
-
-    def makePdbAlias(self, aliasName, aliasCmd):
-        self.pdbAliases[aliasName] = aliasCmd
-        self.pdb.do_alias('%s %s'%(aliasName,aliasCmd))
-
-    def removePdbAliases(self):
-        for aliasName in self.pdbAliases.iterkeys():
-            self.pdb.do_unalias(aliasName)
-        self.pdbAliases = {}
-        print '(bpdb aliases removed)'
-
-    #handle bpdb prompt commands by forwarding to bpMan
-    def _e(self, *args, **kwargs):
-        bp = self._getArg(args, [type(''),type({}),], kwargs, ['path','bp','name',], self.lastBp)
-        enabled = self._getArg(args, [type(True),type(1),], kwargs, ['enabled','on',], True)
-        newEnabled = self.bpMan.setEnabled(bp, enabled)
-        print "'%s' is now %s."%(self.bpMan.bpToPath(bp),choice(newEnabled,'enabled','disabled'),)
-        
-    def _i(self, *args, **kwargs):
-        bp = self._getArg(args, [type(''),type({}),], kwargs, ['path','bp','name',], self.lastBp)
-        count = self._getArg(args, [type(1),], kwargs, ['ignoreCount','count','n',], 0)
-        newCount = self.bpMan.setIgnoreCount(bp, count)
-        print "'%s' will ignored %s times."%(self.bpMan.bpToPath(bp),newCount,)
-
-    def _t(self, *args, **kwargs):
-        bp = self._getArg(args, [type(''),type({}),], kwargs, ['path','bp','name',], self.lastBp)
-        newEnabled = self.bpMan.toggleEnabled(bp)
-        print "'%s' is now %s."%(self.bpMan.bpToPath(bp),choice(newEnabled,'enabled','disabled'),)
-        
-    def _tg(self, *args, **kwargs):
-        bp = self._getArg(args, [type(''),type({}),], kwargs, ['grp',], self.lastBp)
-        if type(bp) == type(''):
-            bp = {'grp':bp}
-        bp = {'grp':bp.get('grp')}
-        newEnabled = self.bpMan.toggleEnabled(bp)
-        print "'%s' is now %s."%(self.bpMan.bpToPath(bp),choice(newEnabled,'enabled','disabled'),)
-        
-    def _tc(self, *args, **kwargs):
-        bp = self._getArg(args, [type(''),type({}),], kwargs, ['cfg',], self.lastBp)
-        if type(bp) == type(''):
-            bp = {'cfg':bp}
-        bp = {'cfg':bp.get('cfg')}
-        newEnabled = self.toggleConfig(bp['cfg'])
-        print "'%s' is now %s."%(self.bpMan.bpToPath(bp),choice(newEnabled,'enabled','disabled'),)
-        
-    def _z(self, *args, **kwargs):
-        bp = self._getArg(args, [type(''),type({}),], kwargs, ['path','bp','name',], self.lastBp)
-        self.bpMan.resetBp(bp)
-        print "'%s' has been reset."%(self.bpMan.partsToPath(bp),)
-
-    def _zg(self, *args, **kwargs):
-        bp = self._getArg(args, [type(''),type({}),], kwargs, ['grp',], self.lastBp)
-        if type(bp) == type(''):
-            bp = {'grp':bp}
-        bp = {'grp':bp.get('grp')}
-        self.bpMan.resetBp(bp)
-        print "'%s' has been reset."%(self.bpMan.partsToPath(bp),)
-
-    def _zc(self, *args, **kwargs):
-        bp = self._getArg(args, [type(''),type({}),], kwargs, ['cfg',], self.lastBp)
-        if type(bp) == type(''):
-            bp = {'cfg':bp}
-        bp = {'cfg':bp.get('cfg')}
-        self.resetConfig(bp['cfg'])
-        print "'%s' has been reset."%(self.bpMan.bpToPath(bp),)
- 
-    def _getArg(self, args, goodTypes, kwargs, goodKeys, default = None):
-        #look for desired arg in args and kwargs lists
-        argVal = default
-        for val in args:
-            if type(val) in goodTypes:
-                argVal = val
-        for key in goodKeys:
-            if key in kwargs:
-                argVal = kwargs[key]
-        return argVal
-                
-    #code for automatically determining param vals
-    def getFrameCodeInfo(self, frameCount=1):
-        #get main bits
-        stack = inspect.stack()
-        try:
-            primaryFrame = stack[frameCount][0]
-        except:
-            return ('<stdin>', None, -1)
-
-        #todo: 
-        #frameInfo is inadequate as a unique marker for this code location
-        #caching disabled until suitable replacement is found
-        #
-        #frameInfo = inspect.getframeinfo(primaryFrame)
-        #frameInfo = (frameInfo[0], frameInfo[1])
-        #check cache
-        #codeInfo = self.codeInfoCache.get(frameInfo)
-        #if codeInfo:
-        #    return codeInfo
-        
-        #look for module name
-        moduleName = None
-        callingModule = inspect.getmodule(primaryFrame)
-        if callingModule and callingModule.__name__ != '__main__':
-            moduleName = callingModule.__name__
-
-        #look for class name
-        className = None
-        for i in range(frameCount, len(stack)):
-            callingContexts = stack[i][4]
-            if callingContexts:
-                contextTokens = callingContexts[0].split()
-                if contextTokens[0] in ['class','def'] and len(contextTokens) > 1:
-                    callingContexts[0] = callingContexts[0].replace('(',' ').replace(':',' ')
-                    contextTokens = callingContexts[0].split()
-                    className = contextTokens[1]
-                    break
-        if className is None:
-            #look for self (this functions inappropriately for inherited classes)
-            slf = primaryFrame.f_locals.get('self')
-            try:
-                if slf:
-                    className = slf.__class__.__name__
-            except:
-                #in __init__ 'self' exists but 'if slf' will crash
-                pass
-
-        #get line number
-        def byteOffsetToLineno(code, byte):
-            # Returns the source line number corresponding to the given byte
-            # offset into the indicated Python code module.
-            import array
-            lnotab = array.array('B', code.co_lnotab)
-            line   = code.co_firstlineno
-            for i in range(0, len(lnotab), 2):
-                byte -= lnotab[i]
-                if byte <= 0:
-                    return line
-                line += lnotab[i+1]
-            return line
-
-        lineNumber = byteOffsetToLineno(primaryFrame.f_code, primaryFrame.f_lasti)
-        #frame = inspect.stack()[frameCount][0]
-        #lineno = byteOffsetToLineno(frame.f_code, frame.f_lasti)
-
-        codeInfo = (moduleName, className, lineNumber)
-        #self.codeInfoCache[frameInfo] = codeInfo
-        return codeInfo
-    
-    #actually deliver the user a prompt
-    def set_trace(self, bp, frameCount=1):
-        #find useful frame
-        self.currFrame = sys._getframe()
-        interactFrame = self.currFrame
-        while frameCount > 0:
-            interactFrame = interactFrame.f_back
-            frameCount -= 1
-
-        #cache this as the latest bp
-        self.lastBp = bp.getParts()
-        #set up and start debuggger
-        import pdb
-        self.pdb = pdb.Pdb()
-        #self.pdb.do_alias('aa bpdb.addPdbAliases()')        
-        self.addPdbAliases()
-        self.pdb.set_trace(interactFrame);
-        
-    #bp invoke methods
-    def bp(self, id=None, grp=None, cfg=None, iff=True, enabled=True, test=None, frameCount=1):
-        if not (self.enabled and self.verifyEnabled()):
-            return
-        if not (enabled and iff):
-            return
-            
-        bpi = bp(id=id, grp=grp, cfg=cfg, frameCount=frameCount+1)
-        bpi.maybeBreak(test=test, frameCount=frameCount+1)
-
-    def bpCall(self,id=None,grp=None,cfg=None,iff=True,enabled=True,test=None,frameCount=1,onEnter=1,onExit=0):
-        def decorator(f):
-            return f
-
-        if not (self.enabled and self.verifyEnabled()):
-            return decorator
-        if not (enabled and iff):
-            return decorator
-        
-        bpi = bp(id=id, grp=grp, cfg=cfg, frameCount=frameCount+1)
-        if bpi.disabled:
-            return decorator
-
-        def decorator(f):
-            def wrap(*args, **kwds):
-                #create our bp object
-                dbp = bp(id=id or f.__name__, grp=bpi.grp, cfg=bpi.cfg, frameCount=frameCount+1)
-                if onEnter:
-                    dbp.maybeBreak(test=test,frameCount=frameCount+1,displayPrefix='Calling ')
-                f_result = f(*args, **kwds)
-                if onExit:
-                    dbp.maybeBreak(test=test,frameCount=frameCount+1,displayPrefix='Exited ')
-                return f_result
-                
-            wrap.func_name = f.func_name
-            wrap.func_dict = f.func_dict
-            wrap.func_doc = f.func_doc
-            wrap.__module__ = f.__module__
-            return wrap
-            
-        return decorator
-        
-    def bpPreset(self, *args, **kArgs):
-        def functor(*cArgs, **ckArgs):
-            return
-        if kArgs.get('call', None):
-            def functor(*cArgs, **ckArgs):
-                def decorator(f):
-                    return f
-                return decorator
-
-        if self.enabled and self.verifyEnabled():
-            argsCopy = args[:]
-            def functor(*cArgs, **ckArgs):
-                kwArgs = {}
-                kwArgs.update(kArgs)
-                kwArgs.update(ckArgs)
-                kwArgs.pop('static', None)
-                kwArgs['frameCount'] = ckArgs.get('frameCount',1)+1
-                if kwArgs.pop('call', None):
-                    return self.bpCall(*(cArgs), **kwArgs)
-                else:
-                    return self.bp(*(cArgs), **kwArgs)
-
-        if kArgs.get('static', None):
-            return staticmethod(functor)
-        else:
-            return functor
-
-    #deprecated:
-    @staticmethod
-    def bpGroup(*args, **kArgs):
-        print "BpDb.bpGroup is deprecated, use bpdb.bpPreset instead"
-        kwArgs = {}
-        kwArgs.update(kArgs)
-        kwArgs['frameCount'] = kArgs.get('frameCount', 1) + 1
-        return bpdb.bpPreset(*(args), **(kwArgs))
-
-
-class bp:
-    def __init__(self, id=None, grp=None, cfg=None, frameCount=1):
-        #check early out conditions 
-        self.disabled = False
-        if not bpdb.enabled:
-            self.disabled = True
-            return
-        
-        #default cfg, grp, id from calling code info
-        moduleName, className, lineNumber = bpdb.getFrameCodeInfo(frameCount=frameCount+1)
-        if moduleName:  #use only leaf module name
-            moduleName = moduleName.split('.')[-1]
-        self.grp = grp or className or moduleName
-        self.id = id or lineNumber
-
-        #default cfg to stripped module name
-        if cfg is None and moduleName:
-            cfg = moduleName.lower()
-            if cfg.find("distributed") == 0:        #prune leading 'Distributed'
-                cfg = cfg[len("distributed"):]
-
-        # check cfgs
-        self.cfg = cfg
-        if not bpdb.verifyConfig(self.cfg):
-            self.disabled = True
-            return
-
-    def getParts(self):
-        return {'id':self.id,'grp':self.grp,'cfg':self.cfg}
-        
-    def displayContextHint(self, displayPrefix=''):
-        contextString = displayPrefix + bpdb.bpMan.partsToPath({'id':self.id,'grp':self.grp,'cfg':self.cfg})
-        dashes = '-'*max(0, (80 - len(contextString) - 4) / 2)
-        print '<%s %s %s>'%(dashes,contextString,dashes)
-    
-    def maybeBreak(self, test=None, frameCount=1, displayPrefix=''):
-        if self.shouldBreak(test=test):
-            self.doBreak(frameCount=frameCount+1,displayPrefix=displayPrefix)
-    
-    def shouldBreak(self, test=None):
-        #check easy early out
-        if self.disabled:
-            return False
-        if test:
-            if not isinstance(test, (list, tuple)):
-                test = (test,)
-            for atest in test:
-                if not atest():
-                    return False
-
-        #check disabled conditions
-        if not bpdb.bpMan.getEnabled({'grp':self.grp,'id':self.id}):
-            return False
-        if not bpdb.verifyConfig(self.cfg):
-            return False
-
-        #check skip conditions
-        if bpdb.bpMan.getIgnoreCount({'grp':self.grp,'id':self.id},decrement=True):
-            return False
-        if bpdb.bpMan.getLifetime({'grp':self.grp,'id':self.id}) == 0:
-            return False
-
-        #all conditions go
-        return True
-        
-    def doBreak(self, frameCount=1,displayPrefix=''):
-        #accumulate hit count
-        bpdb.bpMan.decLifetime({'grp':self.grp,'id':self.id})
-        bpdb.bpMan.incHitCount({'grp':self.grp,'id':self.id})
-        
-        #setup debugger
-        self.displayContextHint(displayPrefix=displayPrefix)
-        bpdb.set_trace(self, frameCount=frameCount+1)
-
diff --git a/direct/src/showbase/BufferViewer.py b/direct/src/showbase/BufferViewer.py
index 1180e1a5a0..0b0f5c3356 100644
--- a/direct/src/showbase/BufferViewer.py
+++ b/direct/src/showbase/BufferViewer.py
@@ -2,7 +2,7 @@
 
 __all__ = ['BufferViewer']
 
-from pandac.PandaModules import *
+from panda3d.core import *
 from direct.task import Task
 from direct.directnotify.DirectNotifyGlobal import *
 from direct.showbase.DirectObject import DirectObject
diff --git a/direct/src/showbase/DirectObject.py b/direct/src/showbase/DirectObject.py
index 71a9b0c99f..62cf20d344 100644
--- a/direct/src/showbase/DirectObject.py
+++ b/direct/src/showbase/DirectObject.py
@@ -5,7 +5,6 @@ __all__ = ['DirectObject']
 
 from direct.directnotify.DirectNotifyGlobal import directNotify
 from MessengerGlobal import messenger
-from direct.showbase.PythonUtil import ClassTree
 
 class DirectObject:
     """
@@ -42,9 +41,6 @@ class DirectObject:
     def isIgnoring(self, event):
         return messenger.isIgnoring(event, self)
 
-    def classTree(self):
-        return ClassTree(self)
-
     #This function must be used if you want a managed task
     def addTask(self, *args, **kwargs):
         if(not hasattr(self,"_taskList")):
diff --git a/direct/src/showbase/ElementTree.py b/direct/src/showbase/ElementTree.py
deleted file mode 100755
index 4e52ff2396..0000000000
--- a/direct/src/showbase/ElementTree.py
+++ /dev/null
@@ -1,1251 +0,0 @@
-#
-# ElementTree
-# $Id$
-#
-# light-weight XML support for Python 1.5.2 and later.
-#
-# history:
-# 2001-10-20 fl   created (from various sources)
-# 2001-11-01 fl   return root from parse method
-# 2002-02-16 fl   sort attributes in lexical order
-# 2002-04-06 fl   TreeBuilder refactoring, added PythonDoc markup
-# 2002-05-01 fl   finished TreeBuilder refactoring
-# 2002-07-14 fl   added basic namespace support to ElementTree.write
-# 2002-07-25 fl   added QName attribute support
-# 2002-10-20 fl   fixed encoding in write
-# 2002-11-24 fl   changed default encoding to ascii; fixed attribute encoding
-# 2002-11-27 fl   accept file objects or file names for parse/write
-# 2002-12-04 fl   moved XMLTreeBuilder back to this module
-# 2003-01-11 fl   fixed entity encoding glitch for us-ascii
-# 2003-02-13 fl   added XML literal factory
-# 2003-02-21 fl   added ProcessingInstruction/PI factory
-# 2003-05-11 fl   added tostring/fromstring helpers
-# 2003-05-26 fl   added ElementPath support
-# 2003-07-05 fl   added makeelement factory method
-# 2003-07-28 fl   added more well-known namespace prefixes
-# 2003-08-15 fl   fixed typo in ElementTree.findtext (Thomas Dartsch)
-# 2003-09-04 fl   fall back on emulator if ElementPath is not installed
-# 2003-10-31 fl   markup updates
-# 2003-11-15 fl   fixed nested namespace bug
-# 2004-03-28 fl   added XMLID helper
-# 2004-06-02 fl   added default support to findtext
-# 2004-06-08 fl   fixed encoding of non-ascii element/attribute names
-# 2004-08-23 fl   take advantage of post-2.1 expat features
-# 2005-02-01 fl   added iterparse implementation
-# 2005-03-02 fl   fixed iterparse support for pre-2.2 versions
-#
-# Copyright (c) 1999-2005 by Fredrik Lundh.  All rights reserved.
-#
-# fredrik@pythonware.com
-# http://www.pythonware.com
-#
-# --------------------------------------------------------------------
-# The ElementTree toolkit is
-#
-# Copyright (c) 1999-2005 by Fredrik Lundh
-#
-# By obtaining, using, and/or copying this software and/or its
-# associated documentation, you agree that you have read, understood,
-# and will comply with the following terms and conditions:
-#
-# Permission to use, copy, modify, and distribute this software and
-# its associated documentation for any purpose and without fee is
-# hereby granted, provided that the above copyright notice appears in
-# all copies, and that both that copyright notice and this permission
-# notice appear in supporting documentation, and that the name of
-# Secret Labs AB or the author not be used in advertising or publicity
-# pertaining to distribution of the software without specific, written
-# prior permission.
-#
-# SECRET LABS AB AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD
-# TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANT-
-# ABILITY AND FITNESS.  IN NO EVENT SHALL SECRET LABS AB OR THE AUTHOR
-# BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY
-# DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-# WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
-# ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
-# OF THIS SOFTWARE.
-# --------------------------------------------------------------------
-
-__all__ = [
-    # public symbols
-    "Comment",
-    "dump",
-    "Element", "ElementTree",
-    "fromstring",
-    "iselement", "iterparse",
-    "parse",
-    "PI", "ProcessingInstruction",
-    "QName",
-    "SubElement",
-    "tostring",
-    "TreeBuilder",
-    "VERSION", "XML",
-    "XMLTreeBuilder",
-    ]
-
-##
-# The <b>Element</b> type is a flexible container object, designed to
-# store hierarchical data structures in memory. The type can be
-# described as a cross between a list and a dictionary.
-# <p>
-# Each element has a number of properties associated with it:
-# <ul>
-# <li>a <i>tag</i>. This is a string identifying what kind of data
-# this element represents (the element type, in other words).</li>
-# <li>a number of <i>attributes</i>, stored in a Python dictionary.</li>
-# <li>a <i>text</i> string.</li>
-# <li>an optional <i>tail</i> string.</li>
-# <li>a number of <i>child elements</i>, stored in a Python sequence</li>
-# </ul>
-#
-# To create an element instance, use the {@link #Element} or {@link
-# #SubElement} factory functions.
-# <p>
-# The {@link #ElementTree} class can be used to wrap an element
-# structure, and convert it from and to XML.
-##
-
-import string, sys, re
-
-class _SimpleElementPath:
-    # emulate pre-1.2 find/findtext/findall behaviour
-    def find(self, element, tag):
-        for elem in element:
-            if elem.tag == tag:
-                return elem
-        return None
-    def findtext(self, element, tag, default=None):
-        for elem in element:
-            if elem.tag == tag:
-                return elem.text or ""
-        return default
-    def findall(self, element, tag):
-        if tag[:3] == ".//":
-            return element.getiterator(tag[3:])
-        result = []
-        for elem in element:
-            if elem.tag == tag:
-                result.append(elem)
-        return result
-
-try:
-    import ElementPath
-except ImportError:
-    # FIXME: issue warning in this case?
-    ElementPath = _SimpleElementPath()
-
-# TODO: add support for custom namespace resolvers/default namespaces
-# TODO: add improved support for incremental parsing
-
-VERSION = "1.2.6"
-
-##
-# Internal element class.  This class defines the Element interface,
-# and provides a reference implementation of this interface.
-# <p>
-# You should not create instances of this class directly.  Use the
-# appropriate factory functions instead, such as {@link #Element}
-# and {@link #SubElement}.
-#
-# @see Element
-# @see SubElement
-# @see Comment
-# @see ProcessingInstruction
-
-class _ElementInterface:
-    # <tag attrib>text<child/>...</tag>tail
-
-    ##
-    # (Attribute) Element tag.
-
-    tag = None
-
-    ##
-    # (Attribute) Element attribute dictionary.  Where possible, use
-    # {@link #_ElementInterface.get},
-    # {@link #_ElementInterface.set},
-    # {@link #_ElementInterface.keys}, and
-    # {@link #_ElementInterface.items} to access
-    # element attributes.
-
-    attrib = None
-
-    ##
-    # (Attribute) Text before first subelement.  This is either a
-    # string or the value None, if there was no text.
-
-    text = None
-
-    ##
-    # (Attribute) Text after this element's end tag, but before the
-    # next sibling element's start tag.  This is either a string or
-    # the value None, if there was no text.
-
-    tail = None # text after end tag, if any
-
-    def __init__(self, tag, attrib):
-        self.tag = tag
-        self.attrib = attrib
-        self._children = []
-
-    def __repr__(self):
-        return "<Element %s at %x>" % (self.tag, id(self))
-
-    ##
-    # Creates a new element object of the same type as this element.
-    #
-    # @param tag Element tag.
-    # @param attrib Element attributes, given as a dictionary.
-    # @return A new element instance.
-
-    def makeelement(self, tag, attrib):
-        return Element(tag, attrib)
-
-    ##
-    # Returns the number of subelements.
-    #
-    # @return The number of subelements.
-
-    def __len__(self):
-        return len(self._children)
-
-    ##
-    # Returns the given subelement.
-    #
-    # @param index What subelement to return.
-    # @return The given subelement.
-    # @exception IndexError If the given element does not exist.
-
-    def __getitem__(self, index):
-        return self._children[index]
-
-    ##
-    # Replaces the given subelement.
-    #
-    # @param index What subelement to replace.
-    # @param element The new element value.
-    # @exception IndexError If the given element does not exist.
-    # @exception AssertionError If element is not a valid object.
-
-    def __setitem__(self, index, element):
-        assert iselement(element)
-        self._children[index] = element
-
-    ##
-    # Deletes the given subelement.
-    #
-    # @param index What subelement to delete.
-    # @exception IndexError If the given element does not exist.
-
-    def __delitem__(self, index):
-        del self._children[index]
-
-    ##
-    # Returns a list containing subelements in the given range.
-    #
-    # @param start The first subelement to return.
-    # @param stop The first subelement that shouldn't be returned.
-    # @return A sequence object containing subelements.
-
-    def __getslice__(self, start, stop):
-        return self._children[start:stop]
-
-    ##
-    # Replaces a number of subelements with elements from a sequence.
-    #
-    # @param start The first subelement to replace.
-    # @param stop The first subelement that shouldn't be replaced.
-    # @param elements A sequence object with zero or more elements.
-    # @exception AssertionError If a sequence member is not a valid object.
-
-    def __setslice__(self, start, stop, elements):
-        for element in elements:
-            assert iselement(element)
-        self._children[start:stop] = list(elements)
-
-    ##
-    # Deletes a number of subelements.
-    #
-    # @param start The first subelement to delete.
-    # @param stop The first subelement to leave in there.
-
-    def __delslice__(self, start, stop):
-        del self._children[start:stop]
-
-    ##
-    # Adds a subelement to the end of this element.
-    #
-    # @param element The element to add.
-    # @exception AssertionError If a sequence member is not a valid object.
-
-    def append(self, element):
-        assert iselement(element)
-        self._children.append(element)
-
-    ##
-    # Inserts a subelement at the given position in this element.
-    #
-    # @param index Where to insert the new subelement.
-    # @exception AssertionError If the element is not a valid object.
-
-    def insert(self, index, element):
-        assert iselement(element)
-        self._children.insert(index, element)
-
-    ##
-    # Removes a matching subelement.  Unlike the <b>find</b> methods,
-    # this method compares elements based on identity, not on tag
-    # value or contents.
-    #
-    # @param element What element to remove.
-    # @exception ValueError If a matching element could not be found.
-    # @exception AssertionError If the element is not a valid object.
-
-    def remove(self, element):
-        assert iselement(element)
-        self._children.remove(element)
-
-    ##
-    # Returns all subelements.  The elements are returned in document
-    # order.
-    #
-    # @return A list of subelements.
-    # @defreturn list of Element instances
-
-    def getchildren(self):
-        return self._children
-
-    ##
-    # Finds the first matching subelement, by tag name or path.
-    #
-    # @param path What element to look for.
-    # @return The first matching element, or None if no element was found.
-    # @defreturn Element or None
-
-    def find(self, path):
-        return ElementPath.find(self, path)
-
-    ##
-    # Finds text for the first matching subelement, by tag name or path.
-    #
-    # @param path What element to look for.
-    # @param default What to return if the element was not found.
-    # @return The text content of the first matching element, or the
-    #     default value no element was found.  Note that if the element
-    #     has is found, but has no text content, this method returns an
-    #     empty string.
-    # @defreturn string
-
-    def findtext(self, path, default=None):
-        return ElementPath.findtext(self, path, default)
-
-    ##
-    # Finds all matching subelements, by tag name or path.
-    #
-    # @param path What element to look for.
-    # @return A list or iterator containing all matching elements,
-    #    in document order.
-    # @defreturn list of Element instances
-
-    def findall(self, path):
-        return ElementPath.findall(self, path)
-
-    ##
-    # Resets an element.  This function removes all subelements, clears
-    # all attributes, and sets the text and tail attributes to None.
-
-    def clear(self):
-        self.attrib.clear()
-        self._children = []
-        self.text = self.tail = None
-
-    ##
-    # Gets an element attribute.
-    #
-    # @param key What attribute to look for.
-    # @param default What to return if the attribute was not found.
-    # @return The attribute value, or the default value, if the
-    #     attribute was not found.
-    # @defreturn string or None
-
-    def get(self, key, default=None):
-        return self.attrib.get(key, default)
-
-    ##
-    # Sets an element attribute.
-    #
-    # @param key What attribute to set.
-    # @param value The attribute value.
-
-    def set(self, key, value):
-        self.attrib[key] = value
-
-    ##
-    # Gets a list of attribute names.  The names are returned in an
-    # arbitrary order (just like for an ordinary Python dictionary).
-    #
-    # @return A list of element attribute names.
-    # @defreturn list of strings
-
-    def keys(self):
-        return self.attrib.keys()
-
-    ##
-    # Gets element attributes, as a sequence.  The attributes are
-    # returned in an arbitrary order.
-    #
-    # @return A list of (name, value) tuples for all attributes.
-    # @defreturn list of (string, string) tuples
-
-    def items(self):
-        return self.attrib.items()
-
-    ##
-    # Creates a tree iterator.  The iterator loops over this element
-    # and all subelements, in document order, and returns all elements
-    # with a matching tag.
-    # <p>
-    # If the tree structure is modified during iteration, the result
-    # is undefined.
-    #
-    # @param tag What tags to look for (default is to return all elements).
-    # @return A list or iterator containing all the matching elements.
-    # @defreturn list or iterator
-
-    def getiterator(self, tag=None):
-        nodes = []
-        if tag == "*":
-            tag = None
-        if tag is None or self.tag == tag:
-            nodes.append(self)
-        for node in self._children:
-            nodes.extend(node.getiterator(tag))
-        return nodes
-
-# compatibility
-_Element = _ElementInterface
-
-##
-# Element factory.  This function returns an object implementing the
-# standard Element interface.  The exact class or type of that object
-# is implementation dependent, but it will always be compatible with
-# the {@link #_ElementInterface} class in this module.
-# <p>
-# The element name, attribute names, and attribute values can be
-# either 8-bit ASCII strings or Unicode strings.
-#
-# @param tag The element name.
-# @param attrib An optional dictionary, containing element attributes.
-# @param **extra Additional attributes, given as keyword arguments.
-# @return An element instance.
-# @defreturn Element
-
-def Element(tag, attrib={}, **extra):
-    attrib = attrib.copy()
-    attrib.update(extra)
-    return _ElementInterface(tag, attrib)
-
-##
-# Subelement factory.  This function creates an element instance, and
-# appends it to an existing element.
-# <p>
-# The element name, attribute names, and attribute values can be
-# either 8-bit ASCII strings or Unicode strings.
-#
-# @param parent The parent element.
-# @param tag The subelement name.
-# @param attrib An optional dictionary, containing element attributes.
-# @param **extra Additional attributes, given as keyword arguments.
-# @return An element instance.
-# @defreturn Element
-
-def SubElement(parent, tag, attrib={}, **extra):
-    attrib = attrib.copy()
-    attrib.update(extra)
-    element = parent.makeelement(tag, attrib)
-    parent.append(element)
-    return element
-
-##
-# Comment element factory.  This factory function creates a special
-# element that will be serialized as an XML comment.
-# <p>
-# The comment string can be either an 8-bit ASCII string or a Unicode
-# string.
-#
-# @param text A string containing the comment string.
-# @return An element instance, representing a comment.
-# @defreturn Element
-
-def Comment(text=None):
-    element = Element(Comment)
-    element.text = text
-    return element
-
-##
-# PI element factory.  This factory function creates a special element
-# that will be serialized as an XML processing instruction.
-#
-# @param target A string containing the PI target.
-# @param text A string containing the PI contents, if any.
-# @return An element instance, representing a PI.
-# @defreturn Element
-
-def ProcessingInstruction(target, text=None):
-    element = Element(ProcessingInstruction)
-    element.text = target
-    if text:
-        element.text = element.text + " " + text
-    return element
-
-PI = ProcessingInstruction
-
-##
-# QName wrapper.  This can be used to wrap a QName attribute value, in
-# order to get proper namespace handling on output.
-#
-# @param text A string containing the QName value, in the form {uri}local,
-#     or, if the tag argument is given, the URI part of a QName.
-# @param tag Optional tag.  If given, the first argument is interpreted as
-#     an URI, and this argument is interpreted as a local name.
-# @return An opaque object, representing the QName.
-
-class QName:
-    def __init__(self, text_or_uri, tag=None):
-        if tag:
-            text_or_uri = "{%s}%s" % (text_or_uri, tag)
-        self.text = text_or_uri
-    def __str__(self):
-        return self.text
-    def __hash__(self):
-        return hash(self.text)
-    def __cmp__(self, other):
-        if isinstance(other, QName):
-            return cmp(self.text, other.text)
-        return cmp(self.text, other)
-
-##
-# ElementTree wrapper class.  This class represents an entire element
-# hierarchy, and adds some extra support for serialization to and from
-# standard XML.
-#
-# @param element Optional root element.
-# @keyparam file Optional file handle or name.  If given, the
-#     tree is initialized with the contents of this XML file.
-
-class ElementTree:
-
-    def __init__(self, element=None, file=None):
-        assert element is None or iselement(element)
-        self._root = element # first node
-        if file:
-            self.parse(file)
-
-    ##
-    # Gets the root element for this tree.
-    #
-    # @return An element instance.
-    # @defreturn Element
-
-    def getroot(self):
-        return self._root
-
-    ##
-    # Replaces the root element for this tree.  This discards the
-    # current contents of the tree, and replaces it with the given
-    # element.  Use with care.
-    #
-    # @param element An element instance.
-
-    def _setroot(self, element):
-        assert iselement(element)
-        self._root = element
-
-    ##
-    # Loads an external XML document into this element tree.
-    #
-    # @param source A file name or file object.
-    # @param parser An optional parser instance.  If not given, the
-    #     standard {@link XMLTreeBuilder} parser is used.
-    # @return The document root element.
-    # @defreturn Element
-
-    def parse(self, source, parser=None):
-        if not hasattr(source, "read"):
-            source = open(source, "rb")
-        if not parser:
-            parser = XMLTreeBuilder()
-        while 1:
-            data = source.read(32768)
-            if not data:
-                break
-            parser.feed(data)
-        self._root = parser.close()
-        return self._root
-
-    ##
-    # Creates a tree iterator for the root element.  The iterator loops
-    # over all elements in this tree, in document order.
-    #
-    # @param tag What tags to look for (default is to return all elements)
-    # @return An iterator.
-    # @defreturn iterator
-
-    def getiterator(self, tag=None):
-        assert self._root is not None
-        return self._root.getiterator(tag)
-
-    ##
-    # Finds the first toplevel element with given tag.
-    # Same as getroot().find(path).
-    #
-    # @param path What element to look for.
-    # @return The first matching element, or None if no element was found.
-    # @defreturn Element or None
-
-    def find(self, path):
-        assert self._root is not None
-        if path[:1] == "/":
-            path = "." + path
-        return self._root.find(path)
-
-    ##
-    # Finds the element text for the first toplevel element with given
-    # tag.  Same as getroot().findtext(path).
-    #
-    # @param path What toplevel element to look for.
-    # @param default What to return if the element was not found.
-    # @return The text content of the first matching element, or the
-    #     default value no element was found.  Note that if the element
-    #     has is found, but has no text content, this method returns an
-    #     empty string.
-    # @defreturn string
-
-    def findtext(self, path, default=None):
-        assert self._root is not None
-        if path[:1] == "/":
-            path = "." + path
-        return self._root.findtext(path, default)
-
-    ##
-    # Finds all toplevel elements with the given tag.
-    # Same as getroot().findall(path).
-    #
-    # @param path What element to look for.
-    # @return A list or iterator containing all matching elements,
-    #    in document order.
-    # @defreturn list of Element instances
-
-    def findall(self, path):
-        assert self._root is not None
-        if path[:1] == "/":
-            path = "." + path
-        return self._root.findall(path)
-
-    ##
-    # Writes the element tree to a file, as XML.
-    #
-    # @param file A file name, or a file object opened for writing.
-    # @param encoding Optional output encoding (default is US-ASCII).
-
-    def write(self, file, encoding="us-ascii"):
-        assert self._root is not None
-        if not hasattr(file, "write"):
-            file = open(file, "wb")
-        if not encoding:
-            encoding = "us-ascii"
-        elif encoding != "utf-8" and encoding != "us-ascii":
-            file.write("<?xml version='1.0' encoding='%s'?>\n" % encoding)
-        self._write(file, self._root, encoding, {})
-
-    def _write(self, file, node, encoding, namespaces):
-        # write XML to file
-        tag = node.tag
-        if tag is Comment:
-            file.write("<!-- %s -->" % _escape_cdata(node.text, encoding))
-        elif tag is ProcessingInstruction:
-            file.write("<?%s?>" % _escape_cdata(node.text, encoding))
-        else:
-            items = node.items()
-            xmlns_items = [] # new namespaces in this scope
-            try:
-                if isinstance(tag, QName) or tag[:1] == "{":
-                    tag, xmlns = fixtag(tag, namespaces)
-                    if xmlns: xmlns_items.append(xmlns)
-            except TypeError:
-                _raise_serialization_error(tag)
-            file.write("<" + _encode(tag, encoding))
-            if items or xmlns_items:
-                items.sort() # lexical order
-                for k, v in items:
-                    try:
-                        if isinstance(k, QName) or k[:1] == "{":
-                            k, xmlns = fixtag(k, namespaces)
-                            if xmlns: xmlns_items.append(xmlns)
-                    except TypeError:
-                        _raise_serialization_error(k)
-                    try:
-                        if isinstance(v, QName):
-                            v, xmlns = fixtag(v, namespaces)
-                            if xmlns: xmlns_items.append(xmlns)
-                    except TypeError:
-                        _raise_serialization_error(v)
-                    file.write(" %s=\"%s\"" % (_encode(k, encoding),
-                                               _escape_attrib(v, encoding)))
-                for k, v in xmlns_items:
-                    file.write(" %s=\"%s\"" % (_encode(k, encoding),
-                                               _escape_attrib(v, encoding)))
-            if node.text or len(node):
-                file.write(">")
-                if node.text:
-                    file.write(_escape_cdata(node.text, encoding))
-                for n in node:
-                    self._write(file, n, encoding, namespaces)
-                file.write("</" + _encode(tag, encoding) + ">")
-            else:
-                file.write(" />")
-            for k, v in xmlns_items:
-                del namespaces[v]
-        if node.tail:
-            file.write(_escape_cdata(node.tail, encoding))
-
-# --------------------------------------------------------------------
-# helpers
-
-##
-# Checks if an object appears to be a valid element object.
-#
-# @param An element instance.
-# @return A true value if this is an element object.
-# @defreturn flag
-
-def iselement(element):
-    # FIXME: not sure about this; might be a better idea to look
-    # for tag/attrib/text attributes
-    return isinstance(element, _ElementInterface) or hasattr(element, "tag")
-
-##
-# Writes an element tree or element structure to sys.stdout.  This
-# function should be used for debugging only.
-# <p>
-# The exact output format is implementation dependent.  In this
-# version, it's written as an ordinary XML file.
-#
-# @param elem An element tree or an individual element.
-
-def dump(elem):
-    # debugging
-    if not isinstance(elem, ElementTree):
-        elem = ElementTree(elem)
-    elem.write(sys.stdout)
-    tail = elem.getroot().tail
-    if not tail or tail[-1] != "\n":
-        sys.stdout.write("\n")
-
-def _encode(s, encoding):
-    try:
-        return s.encode(encoding)
-    except AttributeError:
-        return s # 1.5.2: assume the string uses the right encoding
-
-_escape = re.compile(u"[&<>\"\u0080-\uffff]+")
-
-_escape_map = {
-    "&": "&amp;",
-    "<": "&lt;",
-    ">": "&gt;",
-    '"': "&quot;",
-}
-
-_namespace_map = {
-    # "well-known" namespace prefixes
-    "http://www.w3.org/XML/1998/namespace": "xml",
-    "http://www.w3.org/1999/xhtml": "html",
-    "http://www.w3.org/1999/02/22-rdf-syntax-ns#": "rdf",
-    "http://schemas.xmlsoap.org/wsdl/": "wsdl",
-}
-
-def _raise_serialization_error(text):
-    raise TypeError(
-        "cannot serialize %r (type %s)" % (text, type(text).__name__)
-        )
-
-def _encode_entity(text, pattern=_escape):
-    # map reserved and non-ascii characters to numerical entities
-    def escape_entities(m, map=_escape_map):
-        out = []
-        append = out.append
-        for char in m.group():
-            text = map.get(char)
-            if text is None:
-                text = "&#%d;" % ord(char)
-            append(text)
-        return string.join(out, "")
-    try:
-        return _encode(pattern.sub(escape_entities, text), "ascii")
-    except TypeError:
-        _raise_serialization_error(text)
-
-#
-# the following functions assume an ascii-compatible encoding
-# (or "utf-16")
-
-def _escape_cdata(text, encoding=None):
-    # escape character data
-    try:
-        if encoding:
-            try:
-                text = _encode(text, encoding)
-            except UnicodeError:
-                return _encode_entity(text)
-        text = text.replace("&", "&amp;")
-        text = text.replace("<", "&lt;")
-        text = text.replace( ">", "&gt;")
-        return text
-    except (TypeError, AttributeError):
-        _raise_serialization_error(text)
-
-def _escape_attrib(text, encoding=None):
-    # escape attribute value
-    try:
-        if encoding:
-            try:
-                text = _encode(text, encoding)
-            except UnicodeError:
-                return _encode_entity(text)
-        text = text.replace("&", "&amp;")
-        text = text.replace("'", "&apos;") # FIXME: overkill
-        text = text.replace("\"", "&quot;")
-        text = text.replace("<", "&lt;")
-        text = text.replace(">", "&gt;")
-        return text
-    except (TypeError, AttributeError):
-        _raise_serialization_error(text)
-
-def fixtag(tag, namespaces):
-    # given a decorated tag (of the form {uri}tag), return prefixed
-    # tag and namespace declaration, if any
-    if isinstance(tag, QName):
-        tag = tag.text
-    namespace_uri, tag = string.split(tag[1:], "}", 1)
-    prefix = namespaces.get(namespace_uri)
-    if prefix is None:
-        prefix = _namespace_map.get(namespace_uri)
-        if prefix is None:
-            prefix = "ns%d" % len(namespaces)
-        namespaces[namespace_uri] = prefix
-        if prefix == "xml":
-            xmlns = None
-        else:
-            xmlns = ("xmlns:%s" % prefix, namespace_uri)
-    else:
-        xmlns = None
-    return "%s:%s" % (prefix, tag), xmlns
-
-##
-# Parses an XML document into an element tree.
-#
-# @param source A filename or file object containing XML data.
-# @param parser An optional parser instance.  If not given, the
-#     standard {@link XMLTreeBuilder} parser is used.
-# @return An ElementTree instance
-
-def parse(source, parser=None):
-    tree = ElementTree()
-    tree.parse(source, parser)
-    return tree
-
-##
-# Parses an XML document into an element tree incrementally, and reports
-# what's going on to the user.
-#
-# @param source A filename or file object containing XML data.
-# @param events A list of events to report back.  If omitted, only "end"
-#     events are reported.
-# @return A (event, elem) iterator.
-
-class iterparse:
-
-    def __init__(self, source, events=None):
-        if not hasattr(source, "read"):
-            source = open(source, "rb")
-        self._file = source
-        self._events = []
-        self._index = 0
-        self.root = self._root = None
-        self._parser = XMLTreeBuilder()
-        # wire up the parser for event reporting
-        parser = self._parser._parser
-        append = self._events.append
-        if events is None:
-            events = ["end"]
-        for event in events:
-            if event == "start":
-                try:
-                    parser.ordered_attributes = 1
-                    parser.specified_attributes = 1
-                    def handler(tag, attrib_in, event=event, append=append,
-                                start=self._parser._start_list):
-                        append((event, start(tag, attrib_in)))
-                    parser.StartElementHandler = handler
-                except AttributeError:
-                    def handler(tag, attrib_in, event=event, append=append,
-                                start=self._parser._start):
-                        append((event, start(tag, attrib_in)))
-                    parser.StartElementHandler = handler
-            elif event == "end":
-                def handler(tag, event=event, append=append,
-                            end=self._parser._end):
-                    append((event, end(tag)))
-                parser.EndElementHandler = handler
-            elif event == "start-ns":
-                def handler(prefix, uri, event=event, append=append):
-                    try:
-                        uri = _encode(uri, "ascii")
-                    except UnicodeError:
-                        pass
-                    append((event, (prefix or "", uri)))
-                parser.StartNamespaceDeclHandler = handler
-            elif event == "end-ns":
-                def handler(prefix, event=event, append=append):
-                    append((event, None))
-                parser.EndNamespaceDeclHandler = handler
-
-    def next(self):
-        while 1:
-            try:
-                item = self._events[self._index]
-            except IndexError:
-                if self._parser is None:
-                    self.root = self._root
-                    try:
-                        raise StopIteration
-                    except NameError:
-                        raise IndexError
-                # load event buffer
-                del self._events[:]
-                self._index = 0
-                data = self._file.read(16384)
-                if data:
-                    self._parser.feed(data)
-                else:
-                    self._root = self._parser.close()
-                    self._parser = None
-            else:
-                self._index = self._index + 1
-                return item
-
-    try:
-        iter
-        def __iter__(self):
-            return self
-    except NameError:
-        def __getitem__(self, index):
-            return self.next()
-
-##
-# Parses an XML document from a string constant.  This function can
-# be used to embed "XML literals" in Python code.
-#
-# @param source A string containing XML data.
-# @return An Element instance.
-# @defreturn Element
-
-def XML(text):
-    parser = XMLTreeBuilder()
-    parser.feed(text)
-    return parser.close()
-
-##
-# Parses an XML document from a string constant, and also returns
-# a dictionary which maps from element id:s to elements.
-#
-# @param source A string containing XML data.
-# @return A tuple containing an Element instance and a dictionary.
-# @defreturn (Element, dictionary)
-
-def XMLID(text):
-    parser = XMLTreeBuilder()
-    parser.feed(text)
-    tree = parser.close()
-    ids = {}
-    for elem in tree.getiterator():
-        id = elem.get("id")
-        if id:
-            ids[id] = elem
-    return tree, ids
-
-##
-# Parses an XML document from a string constant.  Same as {@link #XML}.
-#
-# @def fromstring(text)
-# @param source A string containing XML data.
-# @return An Element instance.
-# @defreturn Element
-
-fromstring = XML
-
-##
-# Generates a string representation of an XML element, including all
-# subelements.
-#
-# @param element An Element instance.
-# @return An encoded string containing the XML data.
-# @defreturn string
-
-def tostring(element, encoding=None):
-    class dummy:
-        pass
-    data = []
-    file = dummy()
-    file.write = data.append
-    ElementTree(element).write(file, encoding)
-    return string.join(data, "")
-
-##
-# Generic element structure builder.  This builder converts a sequence
-# of {@link #TreeBuilder.start}, {@link #TreeBuilder.data}, and {@link
-# #TreeBuilder.end} method calls to a well-formed element structure.
-# <p>
-# You can use this class to build an element structure using a custom XML
-# parser, or a parser for some other XML-like format.
-#
-# @param element_factory Optional element factory.  This factory
-#    is called to create new Element instances, as necessary.
-
-class TreeBuilder:
-
-    def __init__(self, element_factory=None):
-        self._data = [] # data collector
-        self._elem = [] # element stack
-        self._last = None # last element
-        self._tail = None # true if we're after an end tag
-        if element_factory is None:
-            element_factory = _ElementInterface
-        self._factory = element_factory
-
-    ##
-    # Flushes the parser buffers, and returns the toplevel documen
-    # element.
-    #
-    # @return An Element instance.
-    # @defreturn Element
-
-    def close(self):
-        assert len(self._elem) == 0, "missing end tags"
-        assert self._last != None, "missing toplevel element"
-        return self._last
-
-    def _flush(self):
-        if self._data:
-            if self._last is not None:
-                text = string.join(self._data, "")
-                if self._tail:
-                    assert self._last.tail is None, "internal error (tail)"
-                    self._last.tail = text
-                else:
-                    assert self._last.text is None, "internal error (text)"
-                    self._last.text = text
-            self._data = []
-
-    ##
-    # Adds text to the current element.
-    #
-    # @param data A string.  This should be either an 8-bit string
-    #    containing ASCII text, or a Unicode string.
-
-    def data(self, data):
-        self._data.append(data)
-
-    ##
-    # Opens a new element.
-    #
-    # @param tag The element name.
-    # @param attrib A dictionary containing element attributes.
-    # @return The opened element.
-    # @defreturn Element
-
-    def start(self, tag, attrs):
-        self._flush()
-        self._last = elem = self._factory(tag, attrs)
-        if self._elem:
-            self._elem[-1].append(elem)
-        self._elem.append(elem)
-        self._tail = 0
-        return elem
-
-    ##
-    # Closes the current element.
-    #
-    # @param tag The element name.
-    # @return The closed element.
-    # @defreturn Element
-
-    def end(self, tag):
-        self._flush()
-        self._last = self._elem.pop()
-        assert self._last.tag == tag,\
-               "end tag mismatch (expected %s, got %s)" % (
-                   self._last.tag, tag)
-        self._tail = 1
-        return self._last
-
-##
-# Element structure builder for XML source data, based on the
-# <b>expat</b> parser.
-#
-# @keyparam target Target object.  If omitted, the builder uses an
-#     instance of the standard {@link #TreeBuilder} class.
-# @keyparam html Predefine HTML entities.  This flag is not supported
-#     by the current implementation.
-# @see #ElementTree
-# @see #TreeBuilder
-
-class XMLTreeBuilder:
-
-    def __init__(self, html=0, target=None):
-        try:
-            from xml.parsers import expat
-        except ImportError:
-            raise ImportError(
-                "No module named expat; use SimpleXMLTreeBuilder instead"
-                )
-        self._parser = parser = expat.ParserCreate(None, "}")
-        if target is None:
-            target = TreeBuilder()
-        self._target = target
-        self._names = {} # name memo cache
-        # callbacks
-        parser.DefaultHandlerExpand = self._default
-        parser.StartElementHandler = self._start
-        parser.EndElementHandler = self._end
-        parser.CharacterDataHandler = self._data
-        # let expat do the buffering, if supported
-        try:
-            self._parser.buffer_text = 1
-        except AttributeError:
-            pass
-        # use new-style attribute handling, if supported
-        try:
-            self._parser.ordered_attributes = 1
-            self._parser.specified_attributes = 1
-            parser.StartElementHandler = self._start_list
-        except AttributeError:
-            pass
-        encoding = None
-        if not parser.returns_unicode:
-            encoding = "utf-8"
-        # target.xml(encoding, None)
-        self._doctype = None
-        self.entity = {}
-
-    def _fixtext(self, text):
-        # convert text string to ascii, if possible
-        try:
-            return _encode(text, "ascii")
-        except UnicodeError:
-            return text
-
-    def _fixname(self, key):
-        # expand qname, and convert name string to ascii, if possible
-        try:
-            name = self._names[key]
-        except KeyError:
-            name = key
-            if "}" in name:
-                name = "{" + name
-            self._names[key] = name = self._fixtext(name)
-        return name
-
-    def _start(self, tag, attrib_in):
-        fixname = self._fixname
-        tag = fixname(tag)
-        attrib = {}
-        for key, value in attrib_in.items():
-            attrib[fixname(key)] = self._fixtext(value)
-        return self._target.start(tag, attrib)
-
-    def _start_list(self, tag, attrib_in):
-        fixname = self._fixname
-        tag = fixname(tag)
-        attrib = {}
-        if attrib_in:
-            for i in range(0, len(attrib_in), 2):
-                attrib[fixname(attrib_in[i])] = self._fixtext(attrib_in[i+1])
-        return self._target.start(tag, attrib)
-
-    def _data(self, text):
-        return self._target.data(self._fixtext(text))
-
-    def _end(self, tag):
-        return self._target.end(self._fixname(tag))
-
-    def _default(self, text):
-        prefix = text[:1]
-        if prefix == "&":
-            # deal with undefined entities
-            try:
-                self._target.data(self.entity[text[1:-1]])
-            except KeyError:
-                from xml.parsers import expat
-                raise expat.error(
-                    "undefined entity %s: line %d, column %d" %
-                    (text, self._parser.ErrorLineNumber,
-                    self._parser.ErrorColumnNumber)
-                    )
-        elif prefix == "<" and text[:9] == "<!DOCTYPE":
-            self._doctype = [] # inside a doctype declaration
-        elif self._doctype is not None:
-            # parse doctype contents
-            if prefix == ">":
-                self._doctype = None
-                return
-            text = string.strip(text)
-            if not text:
-                return
-            self._doctype.append(text)
-            n = len(self._doctype)
-            if n > 2:
-                type = self._doctype[1]
-                if type == "PUBLIC" and n == 4:
-                    name, type, pubid, system = self._doctype
-                elif type == "SYSTEM" and n == 3:
-                    name, type, system = self._doctype
-                    pubid = None
-                else:
-                    return
-                if pubid:
-                    pubid = pubid[1:-1]
-                self.doctype(name, pubid, system[1:-1])
-                self._doctype = None
-
-    ##
-    # Handles a doctype declaration.
-    #
-    # @param name Doctype name.
-    # @param pubid Public identifier.
-    # @param system System identifier.
-
-    def doctype(self, name, pubid, system):
-        pass
-
-    ##
-    # Feeds data to the parser.
-    #
-    # @param data Encoded data.
-
-    def feed(self, data):
-        self._parser.Parse(data, 0)
-
-    ##
-    # Finishes feeding data to the parser.
-    #
-    # @return An element structure.
-    # @defreturn Element
-
-    def close(self):
-        self._parser.Parse("", 1) # end of data
-        tree = self._target.close()
-        del self._target, self._parser # get rid of circular references
-        return tree
diff --git a/direct/src/showbase/EventManager.py b/direct/src/showbase/EventManager.py
index 62a21ba41a..c29cb0b05b 100644
--- a/direct/src/showbase/EventManager.py
+++ b/direct/src/showbase/EventManager.py
@@ -5,11 +5,8 @@ __all__ = ['EventManager']
 
 from MessengerGlobal import *
 from direct.directnotify.DirectNotifyGlobal import *
-
-# This module may not import pandac.PandaModules, since it is imported
-# by the Toontown Launcher before the complete PandaModules have been
-# downloaded.
-#from pandac.PandaModules import *
+from direct.task.TaskManagerGlobal import taskMgr
+from panda3d.core import PStatCollector, EventQueue, EventHandler
 
 class EventManager:
 
@@ -18,11 +15,6 @@ class EventManager:
     # delayed import, since this is imported by the Toontown Launcher
     # before the complete PandaModules have been downloaded.
     PStatCollector = None
-
-    # for efficiency, only call import once per module
-    EventStorePandaNode = None
-    EventQueue = None
-    EventHandler = None
     
     def __init__(self, eventQueue = None):
         """
@@ -43,7 +35,6 @@ class EventManager:
         """
         if self._wantPstats is None:
             self._wantPstats = config.GetBool('pstats-eventmanager', 0)
-            from pandac.PandaModules import PStatCollector
             EventManager.PStatCollector = PStatCollector
         # use different methods for handling events with and without pstats tracking
         # for efficiency
@@ -80,18 +71,8 @@ class EventManager:
             return None
         else:
             # Must be some user defined type, return the ptr
-            # which will be downcast to that type
-            ptr = eventParameter.getPtr()
-
-            if EventManager.EventStorePandaNode is None:
-                from pandac.PandaModules import EventStorePandaNode
-                EventManager.EventStorePandaNode = EventStorePandaNode
-            if isinstance(ptr, EventManager.EventStorePandaNode):
-                # Actually, it's a kludgey wrapper around a PandaNode
-                # pointer.  Return the node.
-                ptr = ptr.getValue()
-
-            return ptr
+            # which will be downcast to that type.
+            return eventParameter.getPtr()
         
     def processEvent(self, event):
         """
@@ -190,28 +171,19 @@ class EventManager:
 
 
     def restart(self):
-        if None in (EventManager.EventQueue, EventManager.EventHandler):
-            from pandac.PandaModules import EventQueue, EventHandler
-            EventManager.EventQueue = EventQueue
-            EventManager.EventHandler = EventHandler
-        
         if self.eventQueue == None:
-            self.eventQueue = EventManager.EventQueue.getGlobalEventQueue()
+            self.eventQueue = EventQueue.getGlobalEventQueue()
 
         if self.eventHandler == None:
-            if self.eventQueue == EventManager.EventQueue.getGlobalEventQueue():
+            if self.eventQueue == EventQueue.getGlobalEventQueue():
                 # If we are using the global event queue, then we also
                 # want to use the global event handler.
-                self.eventHandler = EventManager.EventHandler.getGlobalEventHandler()
+                self.eventHandler = EventHandler.getGlobalEventHandler()
             else:
                 # Otherwise, we need our own event handler.
-                self.eventHandler = EventManager.EventHandler(self.eventQueue)
+                self.eventHandler = EventHandler(self.eventQueue)
 
-        # Should be safe to import the global taskMgr by now.
-        from direct.task.TaskManagerGlobal import taskMgr
         taskMgr.add(self.eventLoopTask, 'eventManager')
 
     def shutdown(self):
-        # Should be safe to import the global taskMgr by now.
-        from direct.task.TaskManagerGlobal import taskMgr
         taskMgr.remove('eventManager')
diff --git a/direct/src/showbase/ExceptionVarDump.py b/direct/src/showbase/ExceptionVarDump.py
index 0c8bd56f6a..a9daafe272 100755
--- a/direct/src/showbase/ExceptionVarDump.py
+++ b/direct/src/showbase/ExceptionVarDump.py
@@ -1,4 +1,4 @@
-from pandac.PandaModules import getConfigShowbase
+from panda3d.direct import get_config_showbase
 from direct.directnotify.DirectNotifyGlobal import directNotify
 from direct.showbase.PythonUtil import fastRepr
 import sys
@@ -6,7 +6,7 @@ import types
 import traceback
 
 notify = directNotify.newCategory("ExceptionVarDump")
-config = getConfigShowbase()
+config = get_config_showbase()
 
 reentry = 0
 
@@ -154,7 +154,7 @@ def _excepthookDumpVars(eType, eValue, tb):
                     for attrName in attrNames:
                         obj = attrName2obj[attrName]
                         stateStack.push(['%s.%s' % (name, attrName), obj, ids])
-                
+
         tb = tb.tb_next
 
     if foundRun:
diff --git a/direct/src/showbase/Job.py b/direct/src/showbase/Job.py
index 5124e2713e..03695a84bd 100755
--- a/direct/src/showbase/Job.py
+++ b/direct/src/showbase/Job.py
@@ -1,7 +1,7 @@
 from direct.showbase.DirectObject import DirectObject
 
 if __debug__:
-    from pandac.PandaModules import PStatCollector
+    from panda3d.core import PStatCollector
 
 class Job(DirectObject):
     # Base class for cpu-intensive or non-time-critical operations that
diff --git a/direct/src/showbase/Messenger.py b/direct/src/showbase/Messenger.py
index 6e45fb088c..3d901d219d 100644
--- a/direct/src/showbase/Messenger.py
+++ b/direct/src/showbase/Messenger.py
@@ -7,78 +7,8 @@ from PythonUtil import *
 from direct.directnotify import DirectNotifyGlobal
 import types
 
-from panda3d.core import ConfigVariableBool
-
-# If using the Toontown ActiveX launcher, this must be set true.
-# Also, Panda must be compiled with SIMPLE_THREADS or no HAVE_THREADS
-# at all.  In the normal Panda case, this should be set false.
-if ConfigVariableBool('delay-messenger-lock', False).getValue():
-    class Lock:
-        """ This is a cheesy delayed implementation of Lock, designed to
-        support the Toontown ActiveX launch, which must import Messenger
-        before it has downloaded the rest of Panda.  Note that this
-        cheesy lock isn't thread-safe if the application starts any
-        threads before acquiring the Messenger lock the first time.
-        (However, it's mostly thread-safe if Panda is compiled with
-        SIMPLE_THREADS.) """
-
-        notify = DirectNotifyGlobal.directNotify.newCategory("Messenger.Lock")
-
-        def __init__(self):
-            self.locked = 0
-
-        def acquire(self):
-            # Before we download Panda, we can't use any threading
-            # interfaces.  So don't, until we observe that we have some
-            # actual contention on the lock.
-
-            if self.locked:
-                # We have contention.
-                return self.__getLock()
-
-            # This relies on the fact that any individual Python statement
-            # is atomic.
-            self.locked += 1
-            if self.locked > 1:
-                # Whoops, we have contention.
-                self.locked -= 1
-                return self.__getLock()
-
-        def release(self):
-            if self.locked:
-                # Still using the old, cheesy lock.
-                self.locked -= 1
-                return
-
-            # The new lock must have been put in place.
-            self.release = self.lock.release
-            return self.lock.release()
-
-        def __getLock(self):
-            # Now that we've started Panda, it's safe to import the Mutex
-            # class, which becomes our actual lock.
-            # From now on, this lock will be used.
-
-            self.notify.info("Acquiring Panda lock for the first time.")
-
-            from pandac.PandaModules import Thread, Mutex
-            self.__dict__.setdefault('lock', Mutex('Messenger'))
-            self.lock.acquire()
-
-            self.acquire = self.lock.acquire
-
-            # Wait for the cheesy lock to be released before we return.
-            self.notify.info("Waiting for cheesy lock to be released.")
-            while self.locked:
-                Thread.forceYield()
-            self.notify.info("Got cheesy lock.")
-
-            # We return with the lock acquired.
-else:            
-    # In the normal case, there's no reason not to import all of
-    # libpanda right away, and so we can just use Lock directly.  This
-    # is perfectly thread-safe.
-    from direct.stdpy.threading import Lock
+from panda3d.core import ConfigVariableBool, Thread, Mutex
+from direct.stdpy.threading import Lock
 
 class Messenger:
 
@@ -215,7 +145,7 @@ class Messenger:
             # on this particular object.
             if id in acceptorDict:
                 # TODO: we're replacing the existing callback. should this be an error?
-                if notifyDebug:        
+                if notifyDebug:
                     oldMethod = acceptorDict[id][0]
                     if oldMethod == method:
                         self.notify.warning(
@@ -420,7 +350,7 @@ class Messenger:
                 if not eventTuple:
                     # No event; we're done.
                     return task.done
-                
+
                 self.__dispatch(*eventTuple)
             finally:
                 self.lock.release()
@@ -450,7 +380,7 @@ class Messenger:
                         if (len(eventDict) == 0):
                             del self.__objectEvents[id]
                         self._releaseObject(self._getObject(id))
-                        
+
                     del acceptorDict[id]
                     # If the dictionary at this event is now empty, remove
                     # the event entry from the Messenger altogether
diff --git a/direct/src/showbase/PandaObject.py b/direct/src/showbase/PandaObject.py
deleted file mode 100644
index b65dedeed8..0000000000
--- a/direct/src/showbase/PandaObject.py
+++ /dev/null
@@ -1,12 +0,0 @@
-"""Undocumented Module"""
-
-__all__ = []
-
-## from DirectObject import *
-## from pandac.PandaModules import *
-## 
-## class PandaObject(DirectObject):
-##     """
-##     This is the class that all Panda/Show classes should inherit from
-##     """
-##     pass
diff --git a/direct/src/showbase/PhysicsManagerGlobal.py b/direct/src/showbase/PhysicsManagerGlobal.py
index a8344f3751..9be21b6060 100644
--- a/direct/src/showbase/PhysicsManagerGlobal.py
+++ b/direct/src/showbase/PhysicsManagerGlobal.py
@@ -2,6 +2,6 @@
 
 __all__ = ['physicsMgr']
 
-from pandac.PandaModules import PhysicsManager
+from panda3d.physics import PhysicsManager
 
 physicsMgr = PhysicsManager()
diff --git a/direct/src/showbase/PythonUtil.py b/direct/src/showbase/PythonUtil.py
index 974ab34537..189b90ea81 100644
--- a/direct/src/showbase/PythonUtil.py
+++ b/direct/src/showbase/PythonUtil.py
@@ -1,39 +1,37 @@
 
 """Undocumented Module"""
 
-__all__ = ['unique', 'indent', 'nonRepeatingRandomList',
-'writeFsmTree', 'StackTrace', 'traceFunctionCall', 'traceParentCall',
-'printThisCall', 'tron', 'trace', 'troff', 'getClassLineage', 'pdir',
-'_pdir', '_is_variadic', '_has_keywordargs', '_varnames', '_getcode',
-'Signature', 'doc', 'adjust', 'difference', 'intersection', 'union',
+__all__ = ['indent',
+'StackTrace', 'traceFunctionCall', 'traceParentCall', 'printThisCall',
+'doc', 'adjust', 'difference', 'intersection', 'union',
 'sameElements', 'makeList', 'makeTuple', 'list2dict', 'invertDict',
 'invertDictLossless', 'uniqueElements', 'disjoint', 'contains',
 'replace', 'reduceAngle', 'fitSrcAngle2Dest', 'fitDestAngle2Src',
 'closestDestAngle2', 'closestDestAngle', 'binaryRepr', 'profileFunc',
 'profiled', 'startProfile', 'printProfile', 'getSetterName',
-'getSetter', 'Functor', 'Stack', 'Queue', 'ParamObj', 
-'POD', 'bound', 'clamp', 'lerp', 'average', 'addListsByValue',
+'getSetter', 'Functor', 'Stack', 'Queue',
+'bound', 'clamp', 'lerp', 'average', 'addListsByValue',
 'boolEqual', 'lineupPos', 'formatElapsedSeconds', 'solveQuadratic',
 'stackEntryInfo', 'lineInfo', 'callerInfo', 'lineTag',
-'findPythonModule', 'describeException', 'mostDerivedLast',
-'clampScalar', 'weightedChoice', 'randFloat', 'normalDistrib',
+'findPythonModule', 'mostDerivedLast',
+'weightedChoice', 'randFloat', 'normalDistrib',
 'weightedRand', 'randUint31', 'randInt32', 'randUint32',
 'SerialNumGen', 'serialNum', 'uniqueName', 'Enum', 'Singleton',
 'SingletonError', 'printListEnum', 'safeRepr',
-'fastRepr', 'tagRepr', 'tagWithCaller', 'isDefaultValue', 'set_trace', 'pm',
-'ScratchPad', 'Sync', 'RefCounter', 'itype', 'getNumberedTypedString',
+'fastRepr', 'isDefaultValue',
+'ScratchPad', 'Sync', 'itype', 'getNumberedTypedString',
 'getNumberedTypedSortedString', 'getNumberedTypedSortedStringWithReferrers',
 'getNumberedTypedSortedStringWithReferrersGen',
 'printNumberedTyped', 'DelayedCall', 'DelayedFunctor',
-'FrameDelayedCall', 'SubframeCall', 'ArgumentEater', 'ClassTree', 'getBase',
+'FrameDelayedCall', 'SubframeCall', 'getBase',
 'HotkeyBreaker','logMethodCalls','GoldenRatio',
-'GoldenRectangle', 'pivotScalar', 'rad90', 'rad180', 'rad270', 'rad360',
+'GoldenRectangle', 'rad90', 'rad180', 'rad270', 'rad360',
 'nullGen', 'loopGen', 'makeFlywheelGen', 'flywheel', 'choice',
 'printStack', 'printReverseStack', 'listToIndex2item', 'listToItem2index',
-'pandaBreak','pandaTrace','formatTimeCompact','DestructiveScratchPad',
+'pandaBreak','pandaTrace','formatTimeCompact',
 'deeptype','getProfileResultString','StdoutCapture','StdoutPassthrough',
 'Averager', 'getRepository', 'formatTimeExact', 'startSuperLog', 'endSuperLog',
-'typeName', 'safeTypeName', 'histogramDict', 'unescapeHtmlString', 'bpdb', ]
+'typeName', 'safeTypeName', 'histogramDict', 'unescapeHtmlString']
 
 import types
 import string
@@ -51,8 +49,6 @@ import traceback
 import __builtin__
 from StringIO import StringIO
 import marshal
-import ElementTree as ET
-import BpDb
 import unicodedata
 import bisect
 
@@ -94,7 +90,7 @@ class Functor:
         del self._kargs
         del self.__name__
         del self.__doc__
-    
+
     def _do__call__(self, *args, **kargs):
         _kargs = self._kargs.copy()
         _kargs.update(kargs)
@@ -185,10 +181,6 @@ if __debug__ and __name__ == '__main__':
     assert len(q) == 0
     assert q.isEmpty()
 
-def unique(L1, L2):
-    """Return a list containing all items in 'L1' that are not in 'L2'"""
-    L2 = dict([(k, None) for k in L2])
-    return [item for item in L1 if item not in L2]
 
 def indent(stream, numIndents, str):
     """
@@ -198,31 +190,6 @@ def indent(stream, numIndents, str):
     stream.write('    ' * numIndents + str)
 
 
-def nonRepeatingRandomList(vals, max):
-    random.seed(time.time())
-    #first generate a set of random values
-    valueList=range(max)
-    finalVals=[]
-    for i in range(vals):
-        index=int(random.random()*len(valueList))
-        finalVals.append(valueList[index])
-        valueList.remove(valueList[index])
-    return finalVals
-
-
-
-def writeFsmTree(instance, indent = 0):
-    if hasattr(instance, 'parentFSM'):
-        writeFsmTree(instance.parentFSM, indent-2)
-    elif hasattr(instance, 'fsm'):
-        name = ''
-        if hasattr(instance.fsm, 'state'):
-            name = instance.fsm.state.name
-        print "%s: %s"%(instance.fsm.name, name)
-
-
-
-
 #if __debug__: #RAU accdg to Darren its's ok that StackTrace is not protected by __debug__
 # DCR: if somebody ends up using StackTrace in production, either
 # A) it will be OK because it hardly ever gets called, or
@@ -247,7 +214,7 @@ class StackTrace:
                                                  limit=limit)
         else:
             self.trace = traceback.extract_stack(sys._getframe(1+start))
-            
+
     def compact(self):
         r = ''
         comma = ','
@@ -331,291 +298,11 @@ def printThisCall():
     print traceFunctionCall(sys._getframe(1))
     return 1 # to allow "assert printThisCall()"
 
-
-if __debug__:
-    def lineage(obj, verbose=0, indent=0):
-        """
-        return instance or class name in as a multiline string.
-
-        Usage: print lineage(foo)
-
-        (Based on getClassLineage())
-        """
-        r=""
-        if type(obj) == types.ListType:
-            r+=(" "*indent)+"python list\n"
-        elif type(obj) == types.DictionaryType:
-            r+=(" "*indent)+"python dictionary\n"
-        elif type(obj) == types.ModuleType:
-            r+=(" "*indent)+str(obj)+"\n"
-        elif type(obj) == types.InstanceType:
-            r+=lineage(obj.__class__, verbose, indent)
-        elif type(obj) == types.ClassType:
-            r+=(" "*indent)
-            if verbose:
-                r+=obj.__module__+"."
-            r+=obj.__name__+"\n"
-            for c in obj.__bases__:
-                r+=lineage(c, verbose, indent+2)
-        return r
-
-def tron():
-    sys.settrace(trace)
-def trace(frame, event, arg):
-    if event == 'line':
-        pass
-    elif event == 'call':
-        print traceFunctionCall(sys._getframe(1))
-    elif event == 'return':
-        print "returning"
-    elif event == 'exception':
-        print "exception"
-    return trace
-def troff():
-    sys.settrace(None)
-
-#-----------------------------------------------------------------------------
-
-def getClassLineage(obj):
-    """
-    print object inheritance list
-    """
-    if type(obj) == types.DictionaryType:
-        # Just a dictionary, return dictionary
-        return [obj]
-    elif (type(obj) == types.InstanceType):
-        # Instance, make a list with the instance and its class interitance
-        return [obj] + getClassLineage(obj.__class__)
-    elif ((type(obj) == types.ClassType) or
-          (type(obj) == types.TypeType)):
-        # Class or type, see what it derives from
-        lineage = [obj]
-        for c in obj.__bases__:
-            lineage = lineage + getClassLineage(c)
-        return lineage
-    # New FFI objects are types that are not defined.
-    # but they still act like classes
-    elif hasattr(obj, '__class__'):
-        # Instance, make a list with the instance and its class interitance
-        return [obj] + getClassLineage(obj.__class__)
-    else:
-        # Not what I'm looking for
-        return []
-
-def pdir(obj, str = None, width = None,
-            fTruncate = 1, lineWidth = 75, wantPrivate = 0):
-    # Remove redundant class entries
-    uniqueLineage = []
-    for l in getClassLineage(obj):
-        if type(l) == types.ClassType:
-            if l in uniqueLineage:
-                break
-        uniqueLineage.append(l)
-    # Pretty print out directory info
-    uniqueLineage.reverse()
-    for obj in uniqueLineage:
-        _pdir(obj, str, width, fTruncate, lineWidth, wantPrivate)
-        print
-
-def _pdir(obj, str = None, width = None,
-            fTruncate = 1, lineWidth = 75, wantPrivate = 0):
-    """
-    Print out a formatted list of members and methods of an instance or class
-    """
-    def printHeader(name):
-        name = ' ' + name + ' '
-        length = len(name)
-        if length < 70:
-            padBefore = int((70 - length)/2.0)
-            padAfter = max(0, 70 - length - padBefore)
-            header = '*' * padBefore + name + '*' * padAfter
-        print header
-        print
-    def printInstanceHeader(i, printHeader = printHeader):
-        printHeader(i.__class__.__name__ + ' INSTANCE INFO')
-    def printClassHeader(c, printHeader = printHeader):
-        printHeader(c.__name__ + ' CLASS INFO')
-    def printDictionaryHeader(d, printHeader = printHeader):
-        printHeader('DICTIONARY INFO')
-    # Print Header
-    if type(obj) == types.InstanceType:
-        printInstanceHeader(obj)
-    elif type(obj) == types.ClassType:
-        printClassHeader(obj)
-    elif type (obj) == types.DictionaryType:
-        printDictionaryHeader(obj)
-    # Get dict
-    if type(obj) == types.DictionaryType:
-        dict = obj
-    # FFI objects are builtin types, they have no __dict__
-    elif not hasattr(obj, '__dict__'):
-        dict = {}
-    else:
-        dict = obj.__dict__
-    # Adjust width
-    if width:
-        maxWidth = width
-    else:
-        maxWidth = 10
-    keyWidth = 0
-    aproposKeys = []
-    privateKeys = []
-    remainingKeys = []
-    for key in dict.keys():
-        if not width:
-            keyWidth = len(key)
-        if str:
-            if re.search(str, key, re.I):
-                aproposKeys.append(key)
-                if (not width) and (keyWidth > maxWidth):
-                    maxWidth = keyWidth
-        else:
-            if key[:1] == '_':
-                if wantPrivate:
-                    privateKeys.append(key)
-                    if (not width) and (keyWidth > maxWidth):
-                        maxWidth = keyWidth
-            else:
-                remainingKeys.append(key)
-                if (not width) and (keyWidth > maxWidth):
-                    maxWidth = keyWidth
-    # Sort appropriate keys
-    if str:
-        aproposKeys.sort()
-    else:
-        privateKeys.sort()
-        remainingKeys.sort()
-    # Print out results
-    if wantPrivate:
-        keys = aproposKeys + privateKeys + remainingKeys
-    else:
-        keys = aproposKeys + remainingKeys
-    format = '%-' + repr(maxWidth) + 's'
-    for key in keys:
-        value = dict[key]
-        if callable(value):
-            strvalue = repr(Signature(value))
-        else:
-            strvalue = repr(value)
-        if fTruncate:
-            # Cut off line (keeping at least 1 char)
-            strvalue = strvalue[:max(1, lineWidth - maxWidth)]
-        print (format % key)[:maxWidth] + '\t' + strvalue
-
 # Magic numbers: These are the bit masks in func_code.co_flags that
 # reveal whether or not the function has a *arg or **kw argument.
 _POS_LIST = 4
 _KEY_DICT = 8
 
-def _is_variadic(function):
-    return function.func_code.co_flags & _POS_LIST
-
-def _has_keywordargs(function):
-    return function.func_code.co_flags & _KEY_DICT
-
-def _varnames(function):
-    return function.func_code.co_varnames
-
-def _getcode(f):
-    """
-    _getcode(f)
-    This function returns the name and function object of a callable
-    object.
-    """
-    def method_get(f):
-        return f.__name__, f.im_func
-    def function_get(f):
-        return f.__name__, f
-    def instance_get(f):
-        if hasattr(f, '__call__'):
-            method = f.__call__
-            if (type(method) == types.MethodType):
-                func = method.im_func
-            else:
-                func = method
-            return ("%s%s" % (f.__class__.__name__, '__call__'), func)
-        else:
-            s = ("Instance %s of class %s does not have a __call__ method" %
-                 (f, f.__class__.__name__))
-            raise TypeError, s
-    def class_get(f):
-        if hasattr(f, '__init__'):
-            return f.__name__, f.__init__.im_func
-        else:
-            return f.__name__, lambda: None
-    codedict = { types.UnboundMethodType: method_get,
-                 types.MethodType:        method_get,
-                 types.FunctionType:      function_get,
-                 types.InstanceType:      instance_get,
-                 types.ClassType:         class_get,
-                 }
-    try:
-        return codedict[type(f)](f)
-    except KeyError:
-        if hasattr(f, '__call__'): # eg, built-in functions and methods
-            # raise ValueError, "type %s not supported yet." % type(f)
-            return f.__name__, None
-        else:
-            raise TypeError, ("object %s of type %s is not callable." %
-                                     (f, type(f)))
-
-class Signature:
-    def __init__(self, func):
-        self.type = type(func)
-        self.name, self.func = _getcode(func)
-    def ordinary_args(self):
-        n = self.func.func_code.co_argcount
-        return _varnames(self.func)[0:n]
-    def special_args(self):
-        n = self.func.func_code.co_argcount
-        x = {}
-        #
-        if _is_variadic(self.func):
-            x['positional'] = _varnames(self.func)[n]
-            if _has_keywordargs(self.func):
-                x['keyword'] = _varnames(self.func)[n+1]
-        elif _has_keywordargs(self.func):
-            x['keyword'] = _varnames(self.func)[n]
-        else:
-            pass
-        return x
-    def full_arglist(self):
-        base = list(self.ordinary_args())
-        x = self.special_args()
-        if 'positional' in x:
-            base.append(x['positional'])
-        if 'keyword' in x:
-            base.append(x['keyword'])
-        return base
-    def defaults(self):
-        defargs = self.func.func_defaults
-        args = self.ordinary_args()
-        mapping = {}
-        if defargs is not None:
-            for i in range(-1, -(len(defargs)+1), -1):
-                mapping[args[i]] = defargs[i]
-        else:
-            pass
-        return mapping
-    def __repr__(self):
-        if self.func:
-            defaults = self.defaults()
-            specials = self.special_args()
-            l = []
-            for arg in self.ordinary_args():
-                if arg in defaults:
-                    l.append(arg + '=' + str(defaults[arg]))
-                else:
-                    l.append(arg)
-            if 'positional' in specials:
-                l.append('*' + specials['positional'])
-            if 'keyword' in specials:
-                l.append('**' + specials['keyword'])
-            return "%s(%s)" % (self.name, ', '.join(l))
-        else:
-            return "%s(?)" % self.name
-
-
 def doc(obj):
     if (isinstance(obj, types.MethodType)) or \
        (isinstance(obj, types.FunctionType)):
@@ -739,7 +426,7 @@ def listToIndex2item(L):
     return d
 
 assert listToIndex2item(['a','b']) == {0: 'a', 1: 'b',}
-    
+
 def listToItem2index(L):
     """converts list to dict of list item->list index
     This is lossy if there are duplicate list items"""
@@ -975,7 +662,7 @@ def profileFunc(callback, name, terse, log=True):
 def profiled(category=None, terse=False):
     """ decorator for profiling functions
     turn categories on and off via "want-profile-categoryName 1"
-    
+
     e.g.
 
     @profiled('particles')
@@ -1136,7 +823,7 @@ def _profileWithoutGarbageLeak(cmd, filename):
     # eliminate the garbage leak
     del prof.dispatcher
     return retVal
-    
+
 def startProfile(filename=PyUtilProfileDefaultFilename,
                  lines=PyUtilProfileDefaultLines,
                  sorts=PyUtilProfileDefaultSorts,
@@ -1208,642 +895,6 @@ def mostDerivedLast(classList):
 
     classList.sort(key=ClassSortKey)
 
-"""
-ParamObj/ParamSet
-=================
-
-These two classes support you in the definition of a formal set of
-parameters for an object type. The parameters may be safely queried/set on
-an object instance at any time, and the object will react to newly-set
-values immediately.
-
-ParamSet & ParamObj also provide a mechanism for atomically setting
-multiple parameter values before allowing the object to react to any of the
-new values--useful when two or more parameters are interdependent and there
-is risk of setting an illegal combination in the process of applying a new
-set of values.
-
-To make use of these classes, derive your object from ParamObj. Then define
-a 'ParamSet' subclass that derives from the parent class' 'ParamSet' class,
-and define the object's parameters within its ParamSet class. (see examples
-below)
-
-The ParamObj base class provides 'get' and 'set' functions for each
-parameter if they are not defined. These default implementations
-respectively set the parameter value directly on the object, and expect the
-value to be available in that location for retrieval.
-
-Classes that derive from ParamObj can optionally declare a 'get' and 'set'
-function for each parameter. The setter should simply store the value in a
-location where the getter can find it; it should not do any further
-processing based on the new parameter value. Further processing should be
-implemented in an 'apply' function. The applier function is optional, and
-there is no default implementation.
-
-NOTE: the previous value of a parameter is available inside an apply
-function as 'self.getPriorValue()'
-
-The ParamSet class declaration lists the parameters and defines a default
-value for each. ParamSet instances represent a complete set of parameter
-values. A ParamSet instance created with no constructor arguments will
-contain the default values for each parameter. The defaults may be
-overriden by passing keyword arguments to the ParamSet's constructor. If a
-ParamObj instance is passed to the constructor, the ParamSet will extract
-the object's current parameter values.
-
-ParamSet.applyTo(obj) sets all of its parameter values on 'obj'.
-
-SETTERS AND APPLIERS
-====================
-Under normal conditions, a call to a setter function, i.e.
-
- cam.setFov(90)
-
-will actually result in the following calls being made:
-
- cam.setFov(90)
- cam.applyFov()
-
-Calls to several setter functions, i.e.
-
- cam.setFov(90)
- cam.setViewType('cutscene')
-
-will result in this call sequence:
-
- cam.setFov(90)
- cam.applyFov()
- cam.setViewType('cutscene')
- cam.applyViewType()
-
-Suppose that you desire the view type to already be set to 'cutscene' at
-the time when applyFov() is called. You could reverse the order of the set
-calls, but suppose that you also want the fov to be set properly at the
-time when applyViewType() is called.
-
-In this case, you can 'lock' the params, i.e.
-
- cam.lockParams()
- cam.setFov(90)
- cam.setViewType('cutscene')
- cam.unlockParams()
-
-This will result in the following call sequence:
-
- cam.setFov(90)
- cam.setViewType('cutscene')
- cam.applyFov()
- cam.applyViewType()
-
-NOTE: Currently the order of the apply calls following an unlock is not
-guaranteed.
-
-EXAMPLE CLASSES
-===============
-Here is an example of a class that uses ParamSet/ParamObj to manage its
-parameters:
-
-class Camera(ParamObj):
-    class ParamSet(ParamObj.ParamSet):
-        Params = {
-            'viewType': 'normal',
-            'fov': 60,
-            }
-    ...
-
-    def getViewType(self):
-        return self.viewType
-    def setViewType(self, viewType):
-        self.viewType = viewType
-    def applyViewType(self):
-        if self.viewType == 'normal':
-            ...
-
-    def getFov(self):
-        return self.fov
-    def setFov(self, fov):
-        self.fov = fov
-    def applyFov(self):
-        base.camera.setFov(self.fov)
-    ...
-
-
-EXAMPLE USAGE
-=============
-
-cam = Camera()
-...
-
-# set up for the cutscene
-savedSettings = cam.ParamSet(cam)
-cam.setViewType('closeup')
-cam.setFov(90)
-...
-
-# cutscene is over, set the camera back
-savedSettings.applyTo(cam)
-del savedSettings
-
-"""
-
-class ParamObj:
-    # abstract base for classes that want to support a formal parameter
-    # set whose values may be queried, changed, 'bulk' changed (defer reaction
-    # to changes until multiple changes have been performed), and
-    # extracted/stored/applied all at once (see documentation above)
-
-    # ParamSet subclass: container of parameter values. Derived class must
-    # derive a new ParamSet class if they wish to define new params. See
-    # documentation above.
-    class ParamSet:
-        Params = {
-            # base class does not define any parameters, but they would
-            # appear here as 'name': defaultValue,
-            #
-            # WARNING: default values of mutable types that do not copy by
-            # value (dicts, lists etc.) will be shared by all class instances
-            # if default value is callable, it will be called to get actual
-            # default value
-            #
-            # for example:
-            #
-            # class MapArea(ParamObj):
-            #     class ParamSet(ParamObj.ParamSet):
-            #         Params = {
-            #             'spawnIndices': Functor(list, [1,5,22]),
-            #         }
-            #
-            }
-
-        def __init__(self, *args, **kwArgs):
-            self.__class__._compileDefaultParams()
-            if len(args) == 1 and len(kwArgs) == 0:
-                # extract our params from an existing ParamObj instance
-                obj = args[0]
-                self.paramVals = {}
-                for param in self.getParams():
-                    self.paramVals[param] = getSetter(obj, param, 'get')()
-            else:
-                assert len(args) == 0
-                if __debug__:
-                    for arg in kwArgs.keys():
-                        assert arg in self.getParams()
-                self.paramVals = dict(kwArgs)
-        def getValue(self, param):
-            if param in self.paramVals:
-                return self.paramVals[param]
-            return self._Params[param]
-        def applyTo(self, obj):
-            # Apply our entire set of params to a ParamObj
-            obj.lockParams()
-            for param in self.getParams():
-                getSetter(obj, param)(self.getValue(param))
-            obj.unlockParams()
-        def extractFrom(self, obj):
-            # Extract our entire set of params from a ParamObj
-            obj.lockParams()
-            for param in self.getParams():
-                self.paramVals[param] = getSetter(obj, param, 'get')()
-            obj.unlockParams()
-        @classmethod
-        def getParams(cls):
-            # returns safely-mutable list of param names
-            cls._compileDefaultParams()
-            return cls._Params.keys()
-        @classmethod
-        def getDefaultValue(cls, param):
-            cls._compileDefaultParams()
-            dv = cls._Params[param]
-            if hasattr(dv, '__call__'):
-                dv = dv()
-            return dv
-        @classmethod
-        def _compileDefaultParams(cls):
-            if '_Params' in cls.__dict__:
-                # we've already compiled the defaults for this class
-                return
-            bases = list(cls.__bases__)
-            if object in bases:
-                bases.remove(object)
-            # bring less-derived classes to the front
-            mostDerivedLast(bases)
-            cls._Params = {}
-            for c in (bases + [cls]):
-                # make sure this base has its dict of param defaults
-                c._compileDefaultParams()
-                if 'Params' in c.__dict__:
-                    # apply this class' default param values to our dict
-                    cls._Params.update(c.Params)
-        def __repr__(self):
-            argStr = ''
-            for param in self.getParams():
-                argStr += '%s=%s,' % (param,
-                                      repr(self.getValue(param)))
-            return '%s.%s(%s)' % (
-                self.__class__.__module__, self.__class__.__name__, argStr)
-    # END PARAMSET SUBCLASS
-
-    def __init__(self, *args, **kwArgs):
-        assert issubclass(self.ParamSet, ParamObj.ParamSet)
-        # If you pass in a ParamSet obj, its values will be applied to this
-        # object in the constructor.
-        params = None
-        if len(args) == 1 and len(kwArgs) == 0:
-            # if there's one argument, assume that it's a ParamSet
-            params = args[0]
-        elif len(kwArgs) > 0:
-            assert len(args) == 0
-            # if we've got keyword arguments, make a ParamSet out of them
-            params = self.ParamSet(**kwArgs)
-
-        self._paramLockRefCount = 0
-        # these hold the current value of parameters while they are being set to
-        # a new value, to support getPriorValue()
-        self._curParamStack = []
-        self._priorValuesStack = []
-
-        # insert stub funcs for param setters, to handle locked params
-        for param in self.ParamSet.getParams():
-
-            # set the default value on the object
-            setattr(self, param, self.ParamSet.getDefaultValue(param))
-            
-            setterName = getSetterName(param)
-            getterName = getSetterName(param, 'get')
-
-            # is there a setter defined?
-            if not hasattr(self, setterName):
-                # no; provide the default
-                def defaultSetter(self, value, param=param):
-                    #print '%s=%s for %s' % (param, value, id(self))
-                    setattr(self, param, value)
-                self.__class__.__dict__[setterName] = defaultSetter
-
-            # is there a getter defined?
-            if not hasattr(self, getterName):
-                # no; provide the default. If there is no value set, return
-                # the default
-                def defaultGetter(self, param=param,
-                                  default=self.ParamSet.getDefaultValue(param)):
-                    return getattr(self, param, default)
-                self.__class__.__dict__[getterName] = defaultGetter
-
-            # have we already installed a setter stub?
-            origSetterName = '%s_ORIG' % (setterName,)
-            if not hasattr(self, origSetterName):
-                # move the original setter aside
-                origSetterFunc = getattr(self.__class__, setterName)
-                setattr(self.__class__, origSetterName, origSetterFunc)
-                """
-                # if the setter is a direct member of this instance, move the setter
-                # aside
-                if setterName in self.__dict__:
-                    self.__dict__[setterName + '_MOVED'] = self.__dict__[setterName]
-                    setterFunc = self.__dict__[setterName]
-                    """
-                # install a setter stub that will a) call the real setter and
-                # then the applier, or b) call the setter and queue the
-                # applier, depending on whether our params are locked
-                """
-                setattr(self, setterName, types.MethodType(
-                    Functor(setterStub, param, setterFunc), self, self.__class__))
-                    """
-                def setterStub(self, value, param=param, origSetterName=origSetterName):
-                    # should we apply the value now or should we wait?
-                    # if this obj's params are locked, we track which values have
-                    # been set, and on unlock, we'll call the applyers for those
-                    # values
-                    if self._paramLockRefCount > 0:
-                        priorValues = self._priorValuesStack[-1]
-                        if param not in priorValues:
-                            try:
-                                priorValue = getSetter(self, param, 'get')()
-                            except:
-                                priorValue = None
-                            priorValues[param] = priorValue
-                        self._paramsSet[param] = None
-                        getattr(self, origSetterName)(value)
-                    else:
-                        # prepare for call to getPriorValue
-                        try:
-                            priorValue = getSetter(self, param, 'get')()
-                        except:
-                            priorValue = None
-                        self._priorValuesStack.append({
-                            param: priorValue,
-                            })
-                        getattr(self, origSetterName)(value)
-                        # call the applier, if there is one
-                        applier = getattr(self, getSetterName(param, 'apply'), None)
-                        if applier is not None:
-                            self._curParamStack.append(param)
-                            applier()
-                            self._curParamStack.pop()
-                        self._priorValuesStack.pop()
-                        if hasattr(self, 'handleParamChange'):
-                            self.handleParamChange((param,))
-
-                setattr(self.__class__, setterName, setterStub)
-
-        if params is not None:
-            params.applyTo(self)
-
-    def destroy(self):
-        """
-        for param in self.ParamSet.getParams():
-            setterName = getSetterName(param)
-            self.__dict__[setterName].destroy()
-            del self.__dict__[setterName]
-            """
-        pass
-    
-    def setDefaultParams(self):
-        # set all the default parameters on ourself
-        self.ParamSet().applyTo(self)
-
-    def getCurrentParams(self):
-        params = self.ParamSet()
-        params.extractFrom(self)
-        return params
-
-    def lockParams(self):
-        self._paramLockRefCount += 1
-        if self._paramLockRefCount == 1:
-            self._handleLockParams()
-    def unlockParams(self):
-        if self._paramLockRefCount > 0:
-            self._paramLockRefCount -= 1
-            if self._paramLockRefCount == 0:
-                self._handleUnlockParams()
-    def _handleLockParams(self):
-        # this will store the names of the parameters that are modified
-        self._paramsSet = {}
-        # this will store the values of modified params (from prior to
-        # the lock).
-        self._priorValuesStack.append({})
-    def _handleUnlockParams(self):
-        for param in self._paramsSet:
-            # call the applier, if there is one
-            applier = getattr(self, getSetterName(param, 'apply'), None)
-            if applier is not None:
-                self._curParamStack.append(param)
-                applier()
-                self._curParamStack.pop()
-        self._priorValuesStack.pop()
-        if hasattr(self, 'handleParamChange'):
-            self.handleParamChange(tuple(self._paramsSet.keys()))
-        del self._paramsSet
-    def paramsLocked(self):
-        return self._paramLockRefCount > 0
-    def getPriorValue(self):
-        # call this within an apply function to find out what the prior value
-        # of the param was
-        return self._priorValuesStack[-1][self._curParamStack[-1]]
-
-    def __repr__(self):
-        argStr = ''
-        for param in self.ParamSet.getParams():
-            try:
-                value = getSetter(self, param, 'get')()
-            except:
-                value = '<unknown>'
-            argStr += '%s=%s,' % (param, repr(value))
-        return '%s(%s)' % (self.__class__.__name__, argStr)
-
-if __debug__ and __name__ == '__main__':
-    class ParamObjTest(ParamObj):
-        class ParamSet(ParamObj.ParamSet):
-            Params = {
-                'num': 0,
-            }
-        def applyNum(self):
-            self.priorValue = self.getPriorValue()
-    pto = ParamObjTest()
-    assert pto.getNum() == 0
-    pto.setNum(1)
-    assert pto.priorValue == 0
-    assert pto.getNum() == 1
-    pto.lockParams()
-    pto.setNum(2)
-    # make sure applyNum is not called until we call unlockParams
-    assert pto.priorValue == 0
-    assert pto.getNum() == 2
-    pto.unlockParams()
-    assert pto.priorValue == 1
-    assert pto.getNum() == 2
-
-"""
-POD (Plain Ol' Data)
-
-Like ParamObj/ParamSet, but without lock/unlock/getPriorValue and without
-appliers. Similar to a C++ struct, but with auto-generated setters and
-getters.
-
-Use POD when you want the generated getters and setters of ParamObj, but
-efficiency is a concern and you don't need the bells and whistles provided
-by ParamObj.
-
-POD.__init__ *MUST* be called. You should NOT define your own data getters
-and setters. Data values may be read, set, and modified directly. You will
-see no errors if you define your own getters/setters, but there is no
-guarantee that they will be called--and they will certainly be bypassed by
-POD internally.
-
-EXAMPLE CLASSES
-===============
-Here is an example of a class heirarchy that uses POD to manage its data:
-
-class Enemy(POD):
-  DataSet = {
-    'faction': 'navy',
-    }
-
-class Sailor(Enemy):
-  DataSet = {
-    'build': HUSKY,
-    'weapon': Cutlass(scale=.9),
-    }
-
-EXAMPLE USAGE
-=============
-s = Sailor(faction='undead', build=SKINNY)
-
-# make two copies of s
-s2 = s.makeCopy()
-s3 = Sailor(s)
-
-# example sets
-s2.setWeapon(Musket())
-s3.build = TALL
-
-# example gets
-faction2 = s2.getFaction()
-faction3 = s3.faction
-"""
-class POD:
-    DataSet = {
-        # base class does not define any data items, but they would
-        # appear here as 'name': defaultValue,
-        #
-        # WARNING: default values of mutable types that do not copy by
-        # value (dicts, lists etc.) will be shared by all class instances.
-        # if default value is callable, it will be called to get actual
-        # default value
-        #
-        # for example:
-        #
-        # class MapData(POD):
-        #     DataSet = {
-        #         'spawnIndices': Functor(list, [1,5,22]),
-        #         }
-        }
-    def __init__(self, **kwArgs):
-        self.__class__._compileDefaultDataSet()
-        if __debug__:
-            # make sure all of the keyword arguments passed in
-            # are present in our data set
-            for arg in kwArgs.keys():
-                assert arg in self.getDataNames(), (
-                    "unknown argument for %s: '%s'" % (
-                    self.__class__, arg))
-        # assign each of our data items directly to self
-        for name in self.getDataNames():
-            # if a value has been passed in for a data item, use
-            # that value, otherwise use the default value
-            if name in kwArgs:
-                getSetter(self, name)(kwArgs[name])
-            else:
-                getSetter(self, name)(self.getDefaultValue(name))
-
-    def setDefaultValues(self):
-        # set all the default data values on ourself
-        for name in self.getDataNames():
-            getSetter(self, name)(self.getDefaultValue(name))
-    # this functionality used to be in the constructor, triggered by a single
-    # positional argument; that was conflicting with POD subclasses that wanted
-    # to define different behavior for themselves when given a positional
-    # constructor argument
-    def copyFrom(self, other, strict=False):
-        # if 'strict' is true, other must have a value for all of our data items
-        # otherwise we'll use the defaults
-        for name in self.getDataNames():
-            if hasattr(other, getSetterName(name, 'get')):
-                setattr(self, name, getSetter(other, name, 'get')())
-            else:
-                if strict:
-                    raise "object '%s' doesn't have value '%s'" % (other, name)
-                else:
-                    setattr(self, name, self.getDefaultValue(name))
-        # support 'p = POD.POD().copyFrom(other)' syntax
-        return self
-    def makeCopy(self):
-        # returns a duplicate of this object
-        return self.__class__().copyFrom(self)
-    def applyTo(self, obj):
-        # Apply our entire set of data to another POD
-        for name in self.getDataNames():
-            getSetter(obj, name)(getSetter(self, name, 'get')())
-    def getValue(self, name):
-        return getSetter(self, name, 'get')()
-
-    @classmethod
-    def getDataNames(cls):
-        # returns safely-mutable list of datum names
-        cls._compileDefaultDataSet()
-        return cls._DataSet.keys()
-    @classmethod
-    def getDefaultValue(cls, name):
-        cls._compileDefaultDataSet()
-        dv = cls._DataSet[name]
-        # this allows us to create a new mutable object every time we ask
-        # for its default value, i.e. if the default value is dict, this
-        # method will return a new empty dictionary object every time. This
-        # will cause problems if the intent is to store a callable object
-        # as the default value itself; we need a way to specify that the
-        # callable *is* the default value and not a default-value creation
-        # function
-        if hasattr(dv, '__call__'):
-            dv = dv()
-        return dv
-    @classmethod
-    def _compileDefaultDataSet(cls):
-        if '_DataSet' in cls.__dict__:
-            # we've already compiled the defaults for this class
-            return
-        # create setters & getters for this class
-        if 'DataSet' in cls.__dict__:
-            for name in cls.DataSet:
-                setterName = getSetterName(name)
-                if not hasattr(cls, setterName):
-                    def defaultSetter(self, value, name=name):
-                        setattr(self, name, value)
-                    cls.__dict__[setterName] = defaultSetter
-                getterName = getSetterName(name, 'get')
-                if not hasattr(cls, getterName):
-                    def defaultGetter(self, name=name):
-                        return getattr(self, name)
-                    cls.__dict__[getterName] = defaultGetter
-        # this dict will hold all of the aggregated default data values for
-        # this particular class, including values from its base classes
-        cls._DataSet = {}
-        bases = list(cls.__bases__)
-        # process in reverse of inheritance order, so that base classes listed first
-        # will take precedence over later base classes
-        bases.reverse()
-        for curBase in bases:
-            # skip multiple-inheritance base classes that do not derive from POD
-            if issubclass(curBase, POD):
-                # make sure this base has its dict of data defaults
-                curBase._compileDefaultDataSet()
-                # grab all inherited data default values
-                cls._DataSet.update(curBase._DataSet)
-        # pull in our own class' default values if any are specified
-        if 'DataSet' in cls.__dict__:
-            cls._DataSet.update(cls.DataSet)
-
-    def __repr__(self):
-        argStr = ''
-        for name in self.getDataNames():
-            argStr += '%s=%s,' % (name, repr(getSetter(self, name, 'get')()))
-        return '%s(%s)' % (self.__class__.__name__, argStr)
-
-if __debug__ and __name__ == '__main__':
-    class PODtest(POD):
-        DataSet = {
-            'foo': dict,
-            }
-    p1 = PODtest()
-    p2 = PODtest()
-    assert hasattr(p1, 'foo')
-    # make sure the getter is working
-    assert p1.getFoo() is p1.foo
-    p1.getFoo()[1] = 2
-    assert p1.foo[1] == 2
-    # make sure that each instance gets its own copy of a mutable
-    # data item
-    assert p1.foo is not p2.foo
-    assert len(p1.foo) == 1
-    assert len(p2.foo) == 0
-    # make sure the setter is working
-    p2.setFoo({10:20})
-    assert p2.foo[10] == 20
-    # make sure modifications to mutable data items don't affect other
-    # instances
-    assert p1.foo[1] == 2
-
-    class DerivedPOD(PODtest):
-        DataSet = {
-            'bar': list,
-            }
-    d1 = DerivedPOD()
-    # make sure that derived instances get their own copy of mutable
-    # data items
-    assert hasattr(d1, 'foo')
-    assert len(d1.foo) == 0
-    # make sure derived instances get their own items
-    assert hasattr(d1, 'bar')
-    assert len(d1.bar) == 0
-
 def bound(value, bound1, bound2):
     """
     returns value if value is between bound1 and bound2
@@ -2066,83 +1117,6 @@ def findPythonModule(module):
 
     return None
 
-def describeException(backTrace = 4):
-    # When called in an exception handler, returns a string describing
-    # the current exception.
-
-    def byteOffsetToLineno(code, byte):
-        # Returns the source line number corresponding to the given byte
-        # offset into the indicated Python code module.
-
-        import array
-        lnotab = array.array('B', code.co_lnotab)
-
-        line   = code.co_firstlineno
-        for i in range(0, len(lnotab), 2):
-            byte -= lnotab[i]
-            if byte <= 0:
-                return line
-            line += lnotab[i+1]
-
-        return line
-
-    infoArr = sys.exc_info()
-    exception = infoArr[0]
-    exceptionName = getattr(exception, '__name__', None)
-    extraInfo = infoArr[1]
-    trace = infoArr[2]
-
-    stack = []
-    while trace.tb_next:
-        # We need to call byteOffsetToLineno to determine the true
-        # line number at which the exception occurred, even though we
-        # have both trace.tb_lineno and frame.f_lineno, which return
-        # the correct line number only in non-optimized mode.
-        frame = trace.tb_frame
-        module = frame.f_globals.get('__name__', None)
-        lineno = byteOffsetToLineno(frame.f_code, frame.f_lasti)
-        stack.append("%s:%s, " % (module, lineno))
-        trace = trace.tb_next
-
-    frame = trace.tb_frame
-    module = frame.f_globals.get('__name__', None)
-    lineno = byteOffsetToLineno(frame.f_code, frame.f_lasti)
-    stack.append("%s:%s, " % (module, lineno))
-
-    description = ""
-    for i in range(len(stack) - 1, max(len(stack) - backTrace, 0) - 1, -1):
-        description += stack[i]
-
-    description += "%s: %s" % (exceptionName, extraInfo)
-    return description
-
-def clampScalar(value, a, b):
-    # calling this ought to be faster than calling both min and max
-    if a < b:
-        if value < a:
-            return a
-        elif value > b:
-            return b
-        else:
-            return value
-    else:
-        if value < b:
-            return b
-        elif value > a:
-            return a
-        else:
-            return value
-
-def pivotScalar(scalar, pivot):
-    # reflect scalar about pivot; see tests below
-    return pivot + (pivot - scalar)
-
-if __debug__ and __name__ == '__main__':
-    assert pivotScalar(1, 0) == -1
-    assert pivotScalar(-1, 0) == 1
-    assert pivotScalar(3, 5) == 7
-    assert pivotScalar(10, 1) == -8
-
 def weightedChoice(choiceList, rng=random.random, sum=None):
     """given a list of (weight, item) pairs, chooses an item based on the
     weights. rng must return 0..1. if you happen to have the sum of the
@@ -2453,14 +1427,14 @@ def printListEnum(l):
 # libdtoolconfig doesn't seem to have this, grab it off of PandaNode
 dtoolSuperBase = None
 
-def _getDtoolSuperBase(): 
+def _getDtoolSuperBase():
     global dtoolSuperBase
-    from pandac.PandaModules import PandaNode
+    from panda3d.core import PandaNode
     dtoolSuperBase = PandaNode('').__class__.__bases__[0].__bases__[0].__bases__[0]
     assert repr(dtoolSuperBase) == "<type 'libdtoolconfig.DTOOL_SUPER_BASE111'>" \
         or repr(dtoolSuperBase) == "<type 'libdtoolconfig.DTOOL_SUPPER_BASE111'>" \
         or repr(dtoolSuperBase) == "<type 'dtoolconfig.DTOOL_SUPER_BASE111'>"
-    
+
 safeReprNotify = None
 
 def _getSafeReprNotify():
@@ -2568,95 +1542,6 @@ def fastRepr(obj, maxLen=200, strFactor=10, _visitedIds=None):
     except:
         return '<** FAILED REPR OF %s **>' % obj.__class__.__name__
 
-baseLine = {}
-
-def baseLineCheck():
-    global baseLine
-    import gc
-    obj = gc.get_objects()
-    baseLine = {}
-    for i in obj:
-        baseLine[str(itype(i))] = 0
-    for i in obj:
-        baseLine[str(itype(i))] += 1
-
-def diffSinceBaseLine():
-    import copy
-    import gc
-    obj = gc.get_objects()    
-    since = copy.deepcopy(baseLine)
-    for i in obj:
-        since.setdefault(str(itype(i)), 0)
-    for i in obj:
-        since[str(itype(i))] -= 1
-    for i in since.keys():
-        if not since[i]:
-            del since[i]
-        else:
-            since[i] = abs(since[i])
-
-    final = [(since[x],x) for x in since]
-    final.sort()
-    final.reverse()
-    for i in final:
-        print i
-
-    final = []
-    since = []
-
-
-# Recursively expand slist's objects
-# into olist, using seen to track
-# already processed objects.
-def _getr(slist, olist, seen):
-  for e in slist:
-    if id(e) in seen:
-      continue
-    seen[id(e)] = None
-    olist.append(e)
-    tl = gc.get_referents(e)
-    if tl:
-      _getr(tl, olist, seen)
-
-# The public function.
-def get_all_objects():
-  """Return a list of all live Python
-  objects, not including the list itself."""
-  gcl = gc.get_objects()
-  olist = []
-  seen = {}
-  # Just in case:
-  seen[id(gcl)] = None
-  seen[id(olist)] = None
-  seen[id(seen)] = None
-  # _getr does the real work.
-  _getr(gcl, olist, seen)
-  return olist    
-
-def getIdList():
-    baseList = get_all_objects()
-    idList = {}
-    for i in baseList:
-        idList[id(i)] = i
-
-    return idList
-
-
-ftype = None
-
-def getTree(obj):
-    global ftype
-    if not ftype:
-        ftype = itype(sys._getframe())
-    objId = id(obj)
-    obj = None
-    idList = getIdList()
-    objList = [objId]
-    objTree = {objId:{}}
-    r_add_chain(objId, objList, objTree[objId], idList, 0 )
-    
-    return convertTree(objTree, idList)
-
 def convertTree(objTree, idList):
     newTree = {}
     for key in objTree.keys():
@@ -2667,86 +1552,32 @@ def convertTree(objTree, idList):
 
 def r_convertTree(oldTree, newTree, idList):
     for key in oldTree.keys():
-        
+
         obj = idList.get(key)
         if(not obj):
             continue
         obj = str(obj)[:100]
-        
+
         newTree[obj] = {}
-        r_convertTree(oldTree[key], newTree[obj], idList)        
+        r_convertTree(oldTree[key], newTree[obj], idList)
 
 
 def pretty_print(tree):
     for name in tree.keys():
         print name
         r_pretty_print(tree[name], 0)
-        
-            
+
 
 def r_pretty_print(tree, num):
     num+=1
     for name in tree.keys():
         print "  "*num,name
         r_pretty_print(tree[name],num)
-        
-def r_add_chain(objId, objList, objTree, idList, num):
-    num+=1
-    obj = idList.get(objId)
-    if(not obj):
-        return
-    
-    refList = gc.get_referrers(obj)
-    for ref in refList:
-        refId = id(ref)
-        if ref == __builtins__:
-            continue
-        if ref == objList:
-            continue
-        if refId in objList:
-            continue
-        if(ref == idList):
-            continue
-        if(itype(ref) == ftype):
-            continue
-        if(itype(ref) == itype(sys)):
-            continue
 
-        objList.append(refId)
-        
-        objTree[refId] = {}
-    refList = None
-    for refId in objTree:
-        r_add_chain(refId, objList, objTree[refId], idList, num)
-                    
-        
-    
-def tagRepr(obj, tag):
-    """adds a string onto the repr output of an instance"""
-    def reprWithTag(oldRepr, tag, self):
-        return oldRepr() + '::<TAG=' + tag + '>'
-    oldRepr = getattr(obj, '__repr__', None)
-    if oldRepr is None:
-        def stringer(s):
-            return s
-        oldRepr = Functor(stringer, repr(obj))
-        stringer = None
-    obj.__repr__ = types.MethodType(Functor(reprWithTag, oldRepr, tag), obj, obj.__class__)
-    reprWithTag = None
-    return obj
-
-def tagWithCaller(obj):
-    """add info about the caller of the caller"""
-    tagRepr(obj, str(callerInfo(howFarBack=1)))
 
 def isDefaultValue(x):
     return x == type(x)()
 
-def notNone(A, B):
-    # returns A if not None, B otherwise
-    if A is None:
-        return B
-    return A
 
 def appendStr(obj, st):
     """adds a string onto the __str__ output of an instance"""
@@ -2762,24 +1593,6 @@ def appendStr(obj, st):
     appendedStr = None
     return obj
 
-# convenience shortcuts for __dev__ debugging
-# we don't have the __dev__ flag at this point
-try:
-    import pdb
-    set_trace = pdb.set_trace
-    # set_trace that can be asserted
-    def setTrace():
-        set_trace()
-        return True
-    pm = pdb.pm
-except:
-    # we're in production, there is no pdb module. assign these to something so that the
-    # __builtin__ exports will work
-    # references in the code should either be if __dev__'d or asserted
-    set_trace = None
-    setTrace = None
-    pm = None
-
 
 class ScratchPad:
     """empty class to stick values onto"""
@@ -2804,19 +1617,6 @@ class ScratchPad:
     def __contains__(self, itemName):
         return itemName in self._keys
 
-class DestructiveScratchPad(ScratchPad):
-    # automatically calls destroy() on elements passed to __init__
-    def add(self, **kArgs):
-        for key, value in kArgs.iteritems():
-            if hasattr(self, key):
-                getattr(self, key).destroy()
-            setattr(self, key, value)
-        self._keys.update(kArgs.keys())
-    def destroy(self):
-        for key in self._keys:
-            getattr(self, key).destroy()
-        ScratchPad.destroy(self)
-
 class Sync:
     _SeriesGen = SerialNumGen()
     def __init__(self, name, other=None):
@@ -2845,29 +1645,6 @@ class Sync:
         return '%s(%s)<family=%s,value=%s>' % (self.__class__.__name__,
                               self._name, self._series, self._value)
 
-class RefCounter:
-    def __init__(self, byId=False):
-        self._byId = byId
-        self._refCounts = {}
-    def _getKey(self, item):
-        if self._byId:
-            key = id(item)
-        else:
-            key = item
-    def inc(self, item):
-        key = self._getKey(item)
-        self._refCounts.setdefault(key, 0)
-        self._refCounts[key] += 1
-    def dec(self, item):
-        """returns True if ref count has hit zero"""
-        key = self._getKey(item)
-        self._refCounts[key] -= 1
-        result = False
-        if self._refCounts[key] == 0:
-            result = True
-            del self._refCounts[key]
-        return result
-
 def itype(obj):
     # version of type that gives more complete information about instance types
     global dtoolSuperBase
@@ -3166,83 +1943,9 @@ class SubframeCall:
             taskMgr.remove(self._taskName)
             self._taskName = None
 
-class ArgumentEater:
-    def __init__(self, numToEat, func):
-        self._numToEat = numToEat
-        self._func = func
-    def destroy(self):
-        del self._func
-    def __call__(self, *args, **kwArgs):
-        self._func(*args[self._numToEat:], **kwArgs)
-
-class ClassTree:
-    def __init__(self, instanceOrClass):
-        if type(instanceOrClass) in (types.ClassType, types.TypeType):
-            cls = instanceOrClass
-        else:
-            cls = instanceOrClass.__class__
-        self._cls = cls
-        self._bases = []
-        for base in self._cls.__bases__:
-            if base not in (types.ObjectType, types.TypeType):
-                self._bases.append(ClassTree(base))
-    def getAllClasses(self):
-        # returns set of this class and all base classes
-        classes = set()
-        classes.add(self._cls)
-        for base in self._bases:
-            classes.update(base.getAllClasses())
-        return classes
-    def _getStr(self, indent=None, clsLeftAtIndent=None):
-        # indent is how far to the right to indent (i.e. how many levels
-        # deep in the hierarchy from the most-derived)
-        #
-        # clsLeftAtIndent is an array of # of classes left to be
-        # printed at each level of the hierarchy; most-derived is
-        # at index 0
-        if indent is None:
-            indent = 0
-            clsLeftAtIndent = [1]
-        s = ''
-        if (indent > 1):
-            for i in range(1, indent):
-                # if we have not printed all base classes at
-                # this indent level, keep printing the vertical
-                # column
-                if clsLeftAtIndent[i] > 0:
-                    s += ' |'
-                else:
-                    s += '  '
-        if (indent > 0):
-            s += ' +'
-        s += self._cls.__name__
-        clsLeftAtIndent[indent] -= 1
-        """
-        ### show the module to the right of the class name
-        moduleIndent = 48
-        if len(s) >= moduleIndent:
-            moduleIndent = (len(s) % 4) + 4
-        padding = moduleIndent - len(s)
-        s += padding * ' '
-        s += self._cls.__module__
-        ###
-        """
-        if len(self._bases):
-            newList = list(clsLeftAtIndent)
-            newList.append(len(self._bases))
-            bases = self._bases
-            # print classes with fewer bases first
-            bases.sort(lambda x,y: len(x._bases)-len(y._bases))
-            for base in bases:
-                s += '\n%s' % base._getStr(indent+1, newList)
-        return s
-    def __repr__(self):
-        return self._getStr()
-
-
 class PStatScope:
     collectors = {}
-    
+
     def __init__(self, level = None):
         self.levels = []
         if level:
@@ -3254,13 +1957,13 @@ class PStatScope:
         if push:
             c.push(push)
         return c
-    
+
     def __repr__(self):
         return 'PStatScope - \'%s\'' % (self,)
-    
+
     def __str__(self):
         return ':'.join(self.levels)
-    
+
     def push(self, level):
         self.levels.append(level.replace('_',''))
 
@@ -3277,26 +1980,26 @@ class PStatScope:
         self.getCollector().stop()
         if pop:
             self.pop()
-        
+
     def getCollector(self):
         label = str(self)
         if label not in self.collectors:
-            from pandac.PandaModules import PStatCollector
+            from panda3d.core import PStatCollector
             self.collectors[label] = PStatCollector(label)
             pass
         # print '  ',self.collectors[label]
         return self.collectors[label]
-            
+
 def pstatcollect(scope, level = None):
     def decorator(f):
         return f
 
     try:
-        
+
         if not (__dev__ or config.GetBool('force-pstatcollect', 0)) or \
            not scope:
             return decorator
-        
+
         def decorator(f):
             def wrap(*args, **kw):
                 scope.start(push = (level or f.__name__))
@@ -3304,7 +2007,7 @@ def pstatcollect(scope, level = None):
                 scope.stop(pop = True)
                 return val
             return wrap
-        
+
         pass
     except:
         pass
@@ -3324,7 +2027,7 @@ def report(types = [], prefix = '', xform = None, notifyFunc = None, dConfigPara
     If __dev__ is not defined, or resolves to False, this function
     has no effect and no wrapping/transform occurs.  So in production,
     it's as if the report has been asserted out.
-    
+
     Parameters::
     types : A subset list of ['timeStamp', 'frameCount', 'avLocation']
             This allows you to specify certain useful bits of info.
@@ -3335,7 +2038,7 @@ def report(types = [], prefix = '', xform = None, notifyFunc = None, dConfigPara
                         this function.
             timeStamp:  Adds the current frame time to the output.
             deltaStamp: Adds the current AI synched frame time to
-                        the output 
+                        the output
             frameCount: Adds the current frame count to the output.
                         Usually cleaner than the timeStamp output.
             avLocation: Adds the localAvatar's network location
@@ -3343,7 +2046,7 @@ def report(types = [], prefix = '', xform = None, notifyFunc = None, dConfigPara
             interests:  Prints the current interest state after the
                         report.
             stackTrace: Prints a stack trace after the report.
-            
+
     prefix: Optional string to prepend to output, just before the function.
             Allows for easy grepping and is useful when merging AI/Client
             reports into a single file.
@@ -3351,26 +2054,26 @@ def report(types = [], prefix = '', xform = None, notifyFunc = None, dConfigPara
     xform:  Optional callback that accepts a single parameter: argument 0 to
             the decorated function. (assumed to be 'self')
             It should return a value to be inserted into the report output string.
-            
+
     notifyFunc: A notify function such as info, debug, warning, etc.
-                By default the report will be printed to stdout. This 
+                By default the report will be printed to stdout. This
                 will allow you send the report to a designated 'notify'
                 output.
-                
+
     dConfigParam: A list of Config.prc string variables.
                   By default the report will always print.  If you
                   specify this param, it will only print if one of the
                   specified config strings resolve to True.
     """
 
-    
+
     def indent(str):
         global __report_indent
         return ' '*__report_indent+str
-    
+
     def decorator(f):
         return f
-    
+
     try:
         if not (__dev__ or config.GetBool('force-reports', 0)):
             return decorator
@@ -3390,10 +2093,10 @@ def report(types = [], prefix = '', xform = None, notifyFunc = None, dConfigPara
 
             dConfigParamList = [param for param in dConfigParams \
                                 if config.GetBool('want-%s-report' % (param,), 0)]
-            
+
             doPrint = bool(dConfigParamList)
             pass
-        
+
         if not doPrint:
             return decorator
 
@@ -3403,17 +2106,17 @@ def report(types = [], prefix = '', xform = None, notifyFunc = None, dConfigPara
         else:
             prefixes = set()
             pass
-        
+
         for param in dConfigParamList:
             prefix = config.GetString('prefix-%s-report' % (param,), '')
             if prefix:
                 prefixes.add(prefix)
                 pass
             pass
-        
+
     except NameError,e:
         return decorator
-    
+
     from direct.distributed.ClockDelta import globalClockDelta
 
     def decorator(f):
@@ -3426,12 +2129,12 @@ def report(types = [], prefix = '', xform = None, notifyFunc = None, dConfigPara
             if 'args' in types:
                 rArgs += [repr(x)+', ' for x in args[1:]] + \
                          [ x + ' = ' + '%s, ' % repr(y) for x,y in kwargs.items()]
-            
+
             if not rArgs:
                 rArgs = '()'
             else:
                 rArgs = '(' + reduce(str.__add__,rArgs)[:-2] + ')'
-                
+
 
             outStr = '%s%s' % (f.func_name, rArgs)
 
@@ -3442,16 +2145,16 @@ def report(types = [], prefix = '', xform = None, notifyFunc = None, dConfigPara
 
             if 'module' in types:
                 outStr = '%s {M:%s}' % (outStr, f.__module__.split('.')[-1])
-                
+
             if 'frameCount' in types:
                 outStr = '%-8d : %s' % (globalClock.getFrameCount(), outStr)
-                
+
             if 'timeStamp' in types:
                 outStr = '%-8.3f : %s' % (globalClock.getFrameTime(), outStr)
 
             if 'deltaStamp' in types:
                 outStr = '%-8.2f : %s' % (globalClock.getRealTime() - \
-                                         globalClockDelta.delta, outStr)                
+                                         globalClockDelta.delta, outStr)
             if 'avLocation' in types:
                 outStr = '%s : %s' % (outStr, str(localAvatar.getLocation()))
 
@@ -3473,10 +2176,10 @@ def report(types = [], prefix = '', xform = None, notifyFunc = None, dConfigPara
 
             if 'interests' in types:
                 base.cr.printInterestSets()
-                    
+
             if 'stackTrace' in types:
                 print StackTrace()
-                
+
             global __report_indent
             rVal = None
             try:
@@ -3531,7 +2234,7 @@ def exceptionLogged(append=True):
         def nullDecorator(f):
             return f
         return nullDecorator
-    
+
     def _decoratorFunc(f, append=append):
         global exceptionLoggedNotify
         if exceptionLoggedNotify is None:
@@ -3651,11 +2354,11 @@ class HotkeyBreaker:
             breakKeys = (breakKeys,)
         for key in breakKeys:
             self.addBreakKey(key)
-        
+
     def addBreakKey(self,breakKey):
         if __dev__:
             self.do.accept(breakKey,self.breakFunc,extraArgs = [breakKey])
-        
+
     def removeBreakKey(self,breakKey):
         if __dev__:
             self.do.ignore(breakKey)
@@ -3742,7 +2445,7 @@ def flywheel(*args, **kArgs):
     """
     >>> for i in flywheel([1,2,3], countList=[10, 5, 1]):
     ...   print i,
-    ... 
+    ...
     1 2 3 1 2 1 2 1 2 1 2 1 1 1 1 1
     """
     for flywheel in makeFlywheelGen(*args, **kArgs):
@@ -3778,9 +2481,9 @@ if __debug__ and __name__ == '__main__':
     assert obj2count[1] == 1 * 3
     assert obj2count[2] == 2 * 3
     assert obj2count[3] == 3 * 3
-    assert obj2count[4] == 4 * 3                  
+    assert obj2count[4] == 4 * 3
 
-def quickProfile(name="unnamed"):    
+def quickProfile(name="unnamed"):
     import pstats
     def profileDecorator(f):
         if(not config.GetBool("use-profiler",0)):
@@ -3810,7 +2513,7 @@ def quickProfile(name="unnamed"):
                 s.strip_dirs()
                 s.sort_stats("cumulative")
                 base.stats[name].append(s)
-                    
+
         _profiled.__doc__ = f.__doc__
         return _profiled
     return profileDecorator
@@ -3849,11 +2552,11 @@ class MiniLog:
     def __str__(self):
         return '%s\nMiniLog: %s\n%s\n%s\n%s' % \
                ('*'*50, self.name, '-'*50, '\n'.join(self.lines), '*'*50)
-    
+
     def enterFunction(self, funcName, *args, **kw):
         rArgs = [repr(x)+', ' for x in args] + \
                 [ x + ' = ' + '%s, ' % repr(y) for x,y in kw.items()]
-            
+
         if not rArgs:
             rArgs = '()'
         else:
@@ -3864,7 +2567,7 @@ class MiniLog:
         self.indent += 1
 
         return line
-    
+
     def exitFunction(self):
         self.indent -= 1
         return self.indent
@@ -3872,7 +2575,7 @@ class MiniLog:
     def appendFunctionCall(self, line):
         self.lines.append(' '*(self.indent*2) + line)
         return line
-    
+
     def appendLine(self, line):
         self.lines.append(' '*(self.indent*2) + '<< ' + line + ' >>')
         return line
@@ -3910,12 +2613,12 @@ class HierarchyException(Exception):
 
     def __repr__(self):
         return 'HierarchyException(%s)' % (self.owner, )
-    
+
 # __dev__ is not defined at import time, call this after it's defined
 def recordFunctorCreationStacks():
     global Functor
-    from pandac.PandaModules import getConfigShowbase
-    config = getConfigShowbase()
+    from panda3d.direct import get_config_showbase
+    config = get_config_showbase()
     # off by default, very slow
     if __dev__ and config.GetBool('record-functor-creation-stacks', 0):
         if not hasattr(Functor, '_functorCreationStacksRecorded'):
@@ -4060,7 +2763,7 @@ def setupPdb():
     globalPdb = pandaPdb()
     globalPdb.reset()
     sys.settrace(globalPdb.trace_dispatch)
-    
+
 def pandaTrace():
     if __dev__:
         if not globalPdb:
@@ -4075,12 +2778,12 @@ packageMap = {
     "otp":"$OTP",
     "pirates":"$PIRATES",
 }
-    
+
 
 #assuming . dereferncing for nice linking to imports
 def pandaBreak(dotpath, linenum, temporary = 0, cond = None):
     if __dev__:
-        from pandac.PandaModules import Filename
+        from panda3d.core import Filename
         if not globalPdb:
             setupPdb()
         dirs = dotpath.split(".")
@@ -4090,7 +2793,7 @@ def pandaBreak(dotpath, linenum, temporary = 0, cond = None):
             filename="%s\\%s"%(filename,d)
         print filename
         globalPdb.set_break(filename+".py", linenum, temporary, cond)
-            
+
 class Default:
     # represents 'use the default value'
     # useful for keyword arguments to virtual methods
@@ -4099,7 +2802,7 @@ class Default:
 superLogFile = None
 def startSuperLog(customFunction = None):
     global superLogFile
-    
+
     if(not superLogFile):
         superLogFile = open("c:\\temp\\superLog.txt", "w")
         def trace_dispatch(a,b,c):
@@ -4110,7 +2813,7 @@ def startSuperLog(customFunction = None):
                 if '__builtins__' in vars:
                     del vars['__builtins__']
                 for i in vars:
-                    vars[i] = safeReprTypeOnFail(vars[i]) 
+                    vars[i] = safeReprTypeOnFail(vars[i])
 
                 if customFunction:
                     superLogFile.write( "before = %s\n"%customFunction())
@@ -4120,18 +2823,18 @@ def startSuperLog(customFunction = None):
                 if customFunction:
                     superLogFile.write( "after = %s\n"%customFunction())
 
-        
+
 
                 return trace_dispatch
         sys.settrace(trace_dispatch)
-      
+
 def endSuperLog():
     global superLogFile
     if(superLogFile):
         sys.settrace(None)
         superLogFile.close()
         superLogFile = None
-    
+
 def isInteger(n):
     return type(n) in (types.IntType, types.LongType)
 
@@ -4200,51 +2903,6 @@ if __debug__ and __name__ == '__main__':
     assert unescapeHtmlString('as%32df') == 'as2df'
     assert unescapeHtmlString('asdf%32') == 'asdf2'
 
-def repeatableRepr(obj):
-    if type(obj) is types.DictType:
-        keys = obj.keys()
-        keys.sort()
-        s = '{'
-        for i in xrange(len(keys)):
-            key = keys[i]
-            s += repeatableRepr(key)
-            s += ': '
-            s += repeatableRepr(obj[key])
-            if i < (len(keys)-1):
-                s += ', '
-        s += '}'
-        return s
-    elif type(obj) is type(set()):
-        l = []
-        for item in obj:
-            l.append(item)
-        l.sort()
-        return repeatableRepr(l)
-    return repr(obj)
-
-if __debug__ and __name__ == '__main__':
-    assert repeatableRepr({1: 'a', 2: 'b'}) == repeatableRepr({2: 'b', 1: 'a'})
-    assert repeatableRepr(set([1,2,3])) == repeatableRepr(set([3,2,1]))
-
-#set up bpdb
-bpdb = BpDb.BpDb()
-def bpdbGetEnabled():
-    enabled = True
-    try:
-        enabled = __dev__
-        enabled = ConfigVariableBool('force-breakpoints', enabled).getValue()
-    finally:
-        return enabled
-bpdb.setEnabledCallback(bpdbGetEnabled)
-bpdb.setConfigCallback(lambda cfg: ConfigVariableBool('want-bp-%s' % (cfg.lower(),), 0).getValue())
-
-def u2ascii(s):
-    # Unicode -> ASCII
-    if type(s) is types.UnicodeType:
-        return unicodedata.normalize('NFKD', s).encode('ascii', 'backslashreplace')
-    else:
-        return str(s)
-
 def unicodeUtf8(s):
     # * -> Unicode UTF-8
     if type(s) is types.UnicodeType:
@@ -4256,76 +2914,6 @@ def encodedUtf8(s):
     # * -> 8-bit-encoded UTF-8
     return unicodeUtf8(s).encode('utf-8')
 
-class PriorityCallbacks:
-    """ manage a set of prioritized callbacks, and allow them to be invoked in order of priority """
-    def __init__(self):
-        self._callbacks = []
-
-    def clear(self):
-        while self._callbacks:
-            self._callbacks.pop()
-
-    def add(self, callback, priority=None):
-        if priority is None:
-            priority = 0
-        item = (priority, callback)
-        bisect.insort(self._callbacks, item)
-        return item
-
-    def remove(self, item):
-        self._callbacks.pop(bisect.bisect_left(self._callbacks, item))
-
-    def __call__(self):
-        for priority, callback in self._callbacks:
-            callback()
-
-if __debug__ and __name__ == '__main__':
-    l = []
-    def a(l=l):
-        l.append('a')
-    def b(l=l):
-        l.append('b')
-    def c(l=l):
-        l.append('c')
-    pc = PriorityCallbacks()
-    pc.add(a)
-    pc()
-    assert l == ['a']
-    while len(l):
-        l.pop()
-    bItem = pc.add(b)
-    pc()
-    assert 'a' in l
-    assert 'b' in l
-    assert len(l) == 2
-    while len(l):
-        l.pop()
-    pc.remove(bItem)
-    pc()
-    assert l == ['a']
-    while len(l):
-        l.pop()
-    pc.add(c, 2)
-    bItem = pc.add(b, 10)
-    pc()
-    assert l == ['a', 'c', 'b']
-    while len(l):
-        l.pop()
-    pc.remove(bItem)
-    pc()
-    assert l == ['a', 'c']
-    while len(l):
-        l.pop()
-    pc.clear()
-    pc()
-    assert len(l) == 0
-    del l
-    del a
-    del b
-    del c
-    del pc
-    del bItem
-
 import __builtin__
 __builtin__.Functor = Functor
 __builtin__.Stack = Stack
@@ -4334,21 +2922,15 @@ __builtin__.Enum = Enum
 __builtin__.SerialNumGen = SerialNumGen
 __builtin__.SerialMaskedGen = SerialMaskedGen
 __builtin__.ScratchPad = ScratchPad
-__builtin__.DestructiveScratchPad = DestructiveScratchPad
 __builtin__.uniqueName = uniqueName
 __builtin__.serialNum = serialNum
 __builtin__.profiled = profiled
-__builtin__.set_trace = set_trace
-__builtin__.setTrace = setTrace
-__builtin__.pm = pm
 __builtin__.itype = itype
 __builtin__.exceptionLogged = exceptionLogged
 __builtin__.appendStr = appendStr
 __builtin__.bound = bound
 __builtin__.clamp = clamp
 __builtin__.lerp = lerp
-__builtin__.notNone = notNone
-__builtin__.clampScalar = clampScalar
 __builtin__.makeList = makeList
 __builtin__.makeTuple = makeTuple
 __builtin__.printStack = printStack
@@ -4358,8 +2940,6 @@ __builtin__.DelayedCall = DelayedCall
 __builtin__.DelayedFunctor = DelayedFunctor
 __builtin__.FrameDelayedCall = FrameDelayedCall
 __builtin__.SubframeCall = SubframeCall
-__builtin__.ArgumentEater = ArgumentEater
-__builtin__.ClassTree = ClassTree
 __builtin__.invertDict = invertDict
 __builtin__.invertDictLossless = invertDictLossless
 __builtin__.getBase = getBase
@@ -4377,7 +2957,6 @@ __builtin__.MiniLog = MiniLog
 __builtin__.MiniLogSentry = MiniLogSentry
 __builtin__.logBlock = logBlock
 __builtin__.HierarchyException = HierarchyException
-__builtin__.pdir = pdir
 __builtin__.deeptype = deeptype
 __builtin__.Default = Default
 __builtin__.isInteger = isInteger
@@ -4385,8 +2964,5 @@ __builtin__.configIsToday = configIsToday
 __builtin__.typeName = typeName
 __builtin__.safeTypeName = safeTypeName
 __builtin__.histogramDict = histogramDict
-__builtin__.repeatableRepr = repeatableRepr
-__builtin__.bpdb = bpdb
-__builtin__.u2ascii = u2ascii
 __builtin__.unicodeUtf8 = unicodeUtf8
 __builtin__.encodedUtf8 = encodedUtf8
diff --git a/direct/src/showbase/ShowBase.py b/direct/src/showbase/ShowBase.py
index e41d456a4f..bb6ad5a2ce 100644
--- a/direct/src/showbase/ShowBase.py
+++ b/direct/src/showbase/ShowBase.py
@@ -8,11 +8,11 @@ __all__ = ['ShowBase', 'WindowControls']
 #import VerboseImport
 
 from panda3d.core import *
-from panda3d.direct import *
+from panda3d.direct import get_config_showbase, throw_new_frame, init_app_for_gui
 
 # This needs to be available early for DirectGUI imports
 import __builtin__
-__builtin__.config = getConfigShowbase()
+__builtin__.config = get_config_showbase()
 
 from direct.directnotify.DirectNotifyGlobal import *
 from MessengerGlobal import *
@@ -46,7 +46,7 @@ import AppRunnerGlobal
 
 __builtin__.FADE_SORT_INDEX = 1000
 __builtin__.NO_FADE_SORT_INDEX = 2000
-    
+
 
 # Now ShowBase is a DirectObject.  We need this so ShowBase can hang
 # hooks on messages, particularly on window-event.  This doesn't
@@ -58,7 +58,7 @@ class ShowBase(DirectObject.DirectObject):
     def __init__(self, fStartDirect = True, windowType = None):
         self.__dev__ = config.GetBool('want-dev', __debug__)
         __builtin__.__dev__ = self.__dev__
-        
+
         logStackDump = (config.GetBool('log-stack-dump', False) or
                         config.GetBool('client-log-stack-dump', False))
         uploadStackDump = config.GetBool('upload-stack-dump', False)
@@ -74,7 +74,7 @@ class ShowBase(DirectObject.DirectObject):
 
         #debug running multiplier
         self.debugRunningMultiplier = 4
-        
+
         # Get the dconfig object
         self.config = config
         # Setup wantVerifyPdb as soon as reasonable:
@@ -91,7 +91,7 @@ class ShowBase(DirectObject.DirectObject):
         self.nextWindowIndex = 1
         self.__directStarted = False
         self.__deadInputs = 0
-        
+
         # Store dconfig variables
         self.sfxActive = self.config.GetBool('audio-sfx-active', 1)
         self.musicActive = self.config.GetBool('audio-music-active', 1)
@@ -253,7 +253,7 @@ class ShowBase(DirectObject.DirectObject):
 
         self.loader = Loader.Loader(self)
         self.graphicsEngine.setDefaultLoader(self.loader.loader)
-            
+
         self.eventMgr = eventMgr
         self.messenger = messenger
         self.bboard = bulletinBoard
@@ -315,7 +315,7 @@ class ShowBase(DirectObject.DirectObject):
         # Make sure we're not making more than one ShowBase.
         if 'base' in __builtin__.__dict__:
             raise StandardError, "Attempt to spawn multiple ShowBase instances!"
-        
+
         __builtin__.base = self
         __builtin__.render2d = self.render2d
         __builtin__.aspect2d = self.aspect2d
@@ -357,7 +357,7 @@ class ShowBase(DirectObject.DirectObject):
 
         # set up recording of Functor creation stacks in __dev__
         PythonUtil.recordFunctorCreationStacks()
-        
+
         if __dev__ or self.config.GetBool('want-e3-hacks', False):
             if self.config.GetBool('track-gui-items', True):
                 # dict of guiId to gui item, for tracking down leaks
@@ -372,6 +372,7 @@ class ShowBase(DirectObject.DirectObject):
         # Now hang a hook on the window-event from Panda.  This allows
         # us to detect when the user resizes, minimizes, or closes the
         # main window.
+        self.__prevWindowProperties = None
         self.accept('window-event', self.windowEvent)
 
         # Transition effects (fade, iris, etc)
@@ -386,7 +387,7 @@ class ShowBase(DirectObject.DirectObject):
         sleepTime = self.config.GetFloat('client-sleep', 0.0)
         self.clientSleep = 0.0
         self.setSleep(sleepTime)
-        
+
         # Extra sleep for running 4+ clients on a single machine
         # adds a sleep right after the main render in igloop
         # tends to even out the frame rate and keeps it from going
@@ -414,7 +415,7 @@ class ShowBase(DirectObject.DirectObject):
 
         # Start IGLOOP
         self.restart()
-        
+
     # add a collision traverser via pushCTrav and remove it via popCTrav
     # that way the owner of the new cTrav doesn't need to hold onto the
     # previous one in order to put it back
@@ -427,7 +428,7 @@ class ShowBase(DirectObject.DirectObject):
     def __setupProfile(self):
         """ Sets up the Python profiler, if avaialable, according to
         some Panda config settings. """
-        
+
         try:
             import profile, pstats
         except ImportError:
@@ -499,7 +500,7 @@ class ShowBase(DirectObject.DirectObject):
 
         vfs = VirtualFileSystem.getGlobalPtr()
         vfs.unmountAll()
-        
+
 
     def exitfunc(self):
         """
@@ -609,7 +610,7 @@ class ShowBase(DirectObject.DirectObject):
 
         If requireWindow is true, it means that the function should
         raise an exception if the window fails to open correctly.
-        
+
         """
 
         # Save this lambda here for convenience; we'll use it to call
@@ -622,19 +623,19 @@ class ShowBase(DirectObject.DirectObject):
             keepCamera = keepCamera, scene = scene, stereo = stereo,
             unexposedDraw = unexposedDraw,
             callbackWindowDict = callbackWindowDict)
-        
+
         if self.win:
             # If we've already opened a window before, this is just a
             # pass-through to _doOpenWindow().
             win = func()
             self.graphicsEngine.openWindows()
             return win
-        
+
         if type is None:
             type = self.windowType
         if requireWindow is None:
             requireWindow = self.requireWindow
-            
+
         win = func()
 
         # Give the window a chance to truly open.
@@ -699,7 +700,7 @@ class ShowBase(DirectObject.DirectObject):
             # GSG from that buffer.
             host = gsg
             gsg = gsg.getGsg()
-            
+
         # If we are using DirectX, force a new GSG to be created,
         # since at the moment DirectX seems to misbehave if we do
         # not do this.  This will cause a delay while all textures
@@ -764,7 +765,7 @@ class ShowBase(DirectObject.DirectObject):
                 func = callbackWindowDict.get(callbackName, None)
                 if not func:
                     continue
-                
+
                 setCallbackName = 'set%sCallback' % (callbackName)
                 setCallback = getattr(win, setCallbackName)
                 setCallback(PythonCallbackObject(func))
@@ -804,10 +805,10 @@ class ShowBase(DirectObject.DirectObject):
         pointer to None.
         """
         win.setActive(False)
-        
+
         # First, remove all of the cameras associated with display
         # regions on the window.
-        numRegions = win.getNumDisplayRegions()        
+        numRegions = win.getNumDisplayRegions()
         for i in range(numRegions):
             dr = win.getDisplayRegion(i)
             # [gjeon] remove drc in base.direct.drList
@@ -816,9 +817,9 @@ class ShowBase(DirectObject.DirectObject):
                     if drc.cam == dr.getCamera():
                         base.direct.drList.displayRegionList.remove(drc)
                         break
-                    
+
             cam = NodePath(dr.getCamera())
-            
+
             dr.setCamera(NodePath())
 
             if not cam.isEmpty() and \
@@ -905,7 +906,7 @@ class ShowBase(DirectObject.DirectObject):
         closed window).
         """
         keepCamera = kw.get('keepCamera', False)
-        
+
         success = 1
         oldWin = self.win
         oldLens = self.camLens
@@ -1066,7 +1067,7 @@ class ShowBase(DirectObject.DirectObject):
         self.aspect2d = self.render2d.attachNewNode(PGTop("aspect2d"))
         self.aspect2d.setScale(1.0 / aspectRatio, 1.0, 1.0)
 
-        self.a2dBackground = self.aspect2d.attachNewNode("a2dBackground") 
+        self.a2dBackground = self.aspect2d.attachNewNode("a2dBackground")
 
         # It's important to know the bounds of the aspect2d screen.
         self.a2dTop = 1.0
@@ -1110,7 +1111,7 @@ class ShowBase(DirectObject.DirectObject):
         self.a2dBottomLeftNs.setPos(self.a2dLeft, 0, self.a2dBottom)
         self.a2dBottomRight.setPos(self.a2dRight, 0, self.a2dBottom)
         self.a2dBottomRightNs.setPos(self.a2dRight, 0, self.a2dBottom)
-        
+
         # This special root, pixel2d, uses units in pixels that are relative
         # to the window. The upperleft corner of the window is (0, 0),
         # the lowerleft corner is (xsize, -ysize), in this coordinate system.
@@ -1182,7 +1183,7 @@ class ShowBase(DirectObject.DirectObject):
         self.a2dpTopRight.setPos(self.a2dpRight, 0, self.a2dpTop)
         self.a2dpBottomLeft.setPos(self.a2dpLeft, 0, self.a2dpBottom)
         self.a2dpBottomRight.setPos(self.a2dpRight, 0, self.a2dpBottom)
-        
+
         # This special root, pixel2d, uses units in pixels that are relative
         # to the window. The upperleft corner of the window is (0, 0),
         # the lowerleft corner is (xsize, -ysize), in this coordinate system.
@@ -1229,7 +1230,7 @@ class ShowBase(DirectObject.DirectObject):
 
         if aspectRatio == 0:
             return 1
-        
+
         return aspectRatio
 
     def getSize(self, win = None):
@@ -1337,7 +1338,7 @@ class ShowBase(DirectObject.DirectObject):
         # we will if clearDepth is specified.
         if clearDepth:
             dr.setClearDepthActive(1)
-            
+
         if clearColor:
             dr.setClearColorActive(1)
             dr.setClearColor(clearColor)
@@ -1370,7 +1371,7 @@ class ShowBase(DirectObject.DirectObject):
             cam2dNode = Camera('cam2d_' + cameraName)
         else:
             cam2dNode = Camera('cam2d')
-            
+
         if lens == None:
             lens = OrthographicLens()
             lens.setFilmSize(right - left, top - bottom)
@@ -1480,12 +1481,12 @@ class ShowBase(DirectObject.DirectObject):
 
         if fMultiWin:
             return bts[0]
-        
+
         self.buttonThrowers = bts[:]
         self.pointerWatcherNodes = pws[:]
 
         self.mouseWatcher = self.buttonThrowers[0].getParent()
-        self.mouseWatcherNode = self.mouseWatcher.node()  
+        self.mouseWatcherNode = self.mouseWatcher.node()
 
         if self.mouseInterface:
             self.mouseInterface.reparentTo(self.mouseWatcher)
@@ -1553,7 +1554,7 @@ class ShowBase(DirectObject.DirectObject):
                 # track the left and right halves of the screen
                 # individually.
                 mw.node().setDisplayRegion(win.getOverlayDisplayRegion())
-                
+
             mb = mw.node().getModifierButtons()
             mb.addButton(KeyboardButton.shift())
             mb.addButton(KeyboardButton.control())
@@ -1675,7 +1676,7 @@ class ShowBase(DirectObject.DirectObject):
             port = -1
         PStatClient.connect(hostname, port)
         return PStatClient.isConnected()
-                
+
 
     def addSfxManager(self, extraSfxManager):
         # keep a list of sfx manager objects to apply settings to,
@@ -1841,11 +1842,11 @@ class ShowBase(DirectObject.DirectObject):
         case we're responsible for taking out Panda's garbage from
         time to time.  This is not to be confused with Python's
         garbage collection.  """
-        
+
         TransformState.garbageCollect()
         RenderState.garbageCollect()
         return Task.cont
-        
+
     def __igLoop(self, state):
         # We render the watch variables for the onScreenDebug as soon
         # as we reasonably can before the renderFrame().
@@ -1881,7 +1882,7 @@ class ShowBase(DirectObject.DirectObject):
 
         # Lerp stuff needs this event, and it must be generated in
         # C++, not in Python.
-        throwNewFrame()
+        throw_new_frame()
         return Task.cont
 
 
@@ -1927,8 +1928,8 @@ class ShowBase(DirectObject.DirectObject):
 
         # Lerp stuff needs this event, and it must be generated in
         # C++, not in Python.
-        throwNewFrame()
-        return Task.cont    
+        throw_new_frame()
+        return Task.cont
 
     def restart(self,clusterSync=False,cluster=None):
         self.shutdown()
@@ -2196,7 +2197,7 @@ class ShowBase(DirectObject.DirectObject):
 
         self.showVertices = self.cam.attachNewNode(cam)
         dr.setCamera(self.showVertices)
-        
+
 
     def oobe(self, cam = None):
         """
@@ -2221,7 +2222,7 @@ class ShowBase(DirectObject.DirectObject):
         """
         if cam is None:
             cam = self.cam
-            
+
         # If oobeMode was never set, set it to false and create the
         # structures we need to implement OOBE.
         if not hasattr(self, 'oobeMode'):
@@ -2614,9 +2615,15 @@ class ShowBase(DirectObject.DirectObject):
             return Task.cont
 
     def windowEvent(self, win):
-        if win == self.win:
-            properties = win.getProperties()
-            self.notify.info("Got window event: %s" % (repr(properties)))
+        if win != self.win:
+            # This event isn't about our window.
+            return
+
+        properties = win.getProperties()
+        if properties != self.__prevWindowProperties:
+            self.__prevWindowProperties = properties
+
+            self.notify.debug("Got window event: %s" % (repr(properties)))
             if not properties.getOpen():
                 # If the user closes the main window, we should exit.
                 self.notify.info("User closed main window.")
@@ -2645,7 +2652,7 @@ class ShowBase(DirectObject.DirectObject):
             # If we have not forced the aspect ratio, let's see if it has
             # changed and update the camera lenses and aspect2d parameters
             self.adjustWindowAspectRatio(self.getAspectRatio())
-            
+
             # Temporary hasattr for old Pandas
             if not hasattr(win, 'getSbsLeftXSize'):
                 self.pixel2d.setScale(2.0 / win.getXSize(), 1.0, 2.0 / win.getYSize())
@@ -2659,7 +2666,7 @@ class ShowBase(DirectObject.DirectObject):
         windowEvent(), but it may also be called to explicitly adjust
         the aspect ratio of the render/render2d DisplayRegion, by a
         class that has redefined these. """
-        
+
         if self.__configAspectRatio:
             aspectRatio = self.__configAspectRatio
 
@@ -2694,13 +2701,13 @@ class ShowBase(DirectObject.DirectObject):
                 self.a2dpTop = 1.0
                 self.a2dpBottom = -1.0
                 self.a2dpLeft = -aspectRatio
-                self.a2dpRight = aspectRatio                        
+                self.a2dpRight = aspectRatio
 
             # Reposition the aspect2d marker nodes
             self.a2dTopCenter.setPos(0, self.a2dTop, self.a2dTop)
             self.a2dBottomCenter.setPos(0, self.a2dBottom, self.a2dBottom)
             self.a2dLeftCenter.setPos(self.a2dLeft, 0, 0)
-            self.a2dRightCenter.setPos(self.a2dRight, 0, 0)                    
+            self.a2dRightCenter.setPos(self.a2dRight, 0, 0)
             self.a2dTopLeft.setPos(self.a2dLeft, self.a2dTop, self.a2dTop)
             self.a2dTopRight.setPos(self.a2dRight, self.a2dTop, self.a2dTop)
             self.a2dBottomLeft.setPos(self.a2dLeft, self.a2dBottom, self.a2dBottom)
@@ -2710,17 +2717,17 @@ class ShowBase(DirectObject.DirectObject):
             self.a2dTopCenterNs.setPos(0, self.a2dTop, self.a2dTop)
             self.a2dBottomCenterNs.setPos(0, self.a2dBottom, self.a2dBottom)
             self.a2dLeftCenterNs.setPos(self.a2dLeft, 0, 0)
-            self.a2dRightCenterNs.setPos(self.a2dRight, 0, 0)                    
+            self.a2dRightCenterNs.setPos(self.a2dRight, 0, 0)
             self.a2dTopLeftNs.setPos(self.a2dLeft, self.a2dTop, self.a2dTop)
             self.a2dTopRightNs.setPos(self.a2dRight, self.a2dTop, self.a2dTop)
             self.a2dBottomLeftNs.setPos(self.a2dLeft, self.a2dBottom, self.a2dBottom)
-            self.a2dBottomRightNs.setPos(self.a2dRight, self.a2dBottom, self.a2dBottom)                    
+            self.a2dBottomRightNs.setPos(self.a2dRight, self.a2dBottom, self.a2dBottom)
 
             # Reposition the aspect2dp marker nodes
             self.a2dpTopCenter.setPos(0, self.a2dpTop, self.a2dpTop)
             self.a2dpBottomCenter.setPos(0, self.a2dpBottom, self.a2dpBottom)
             self.a2dpLeftCenter.setPos(self.a2dpLeft, 0, 0)
-            self.a2dpRightCenter.setPos(self.a2dpRight, 0, 0)                  
+            self.a2dpRightCenter.setPos(self.a2dpRight, 0, 0)
             self.a2dpTopLeft.setPos(self.a2dpLeft, self.a2dpTop, self.a2dpTop)
             self.a2dpTopRight.setPos(self.a2dpRight, self.a2dpTop, self.a2dpTop)
             self.a2dpBottomLeft.setPos(self.a2dpLeft, self.a2dpBottom, self.a2dpBottom)
@@ -2728,7 +2735,7 @@ class ShowBase(DirectObject.DirectObject):
 
             # If anybody needs to update their GUI, put a callback on this event
             messenger.send("aspectRatioChanged")
-        
+
     def userExit(self):
         # The user has requested we exit the program.  Deal with this.
         if self.exitFunc:
@@ -2752,12 +2759,12 @@ class ShowBase(DirectObject.DirectObject):
         This sets up a wxTimer callback so that Panda still gets
         updated, but wxPython owns the main loop (which seems to make
         it happier than the other way around). """
-        
+
         if self.wxApp:
             # Don't do this twice.
             return
 
-        initAppForGui()
+        init_app_for_gui()
 
         import wx
         # Create a new base.wxApp.
@@ -2767,7 +2774,7 @@ class ShowBase(DirectObject.DirectObject):
             # Put wxPython in charge of the main loop.  It really
             # seems to like this better; some features of wx don't
             # work properly unless this is true.
-            
+
             # Set a timer to run the Panda frame 60 times per second.
             wxFrameRate = ConfigVariableDouble('wx-frame-rate', 60.0)
             self.wxTimer = wx.Timer(self.wxApp)
@@ -2802,19 +2809,19 @@ class ShowBase(DirectObject.DirectObject):
             # This happens when the wxTimer expires while igLoop is
             # rendering.  Ignore it.
             return
-        
+
         self.taskMgr.step()
 
     def wxRun(self):
         """ This method replaces base.run() after we have called
         spawnWxLoop().  Since at this point wxPython now owns the main
         loop, this method is a call to wxApp.MainLoop(). """
-        
+
         if Thread.getCurrentThread().getCurrentTask():
             # This happens in the p3d environment during startup.
             # Ignore it.
             return
-        
+
         self.wxApp.MainLoop()
 
     def startTk(self, fWantTk = True):
@@ -2829,7 +2836,7 @@ class ShowBase(DirectObject.DirectObject):
         This sets up a timer callback so that Panda still gets
         updated, but Tkinter owns the main loop (which seems to make
         it happier than the other way around). """
-        
+
         if self.tkRoot:
             # Don't do this twice.
             return
@@ -2841,13 +2848,13 @@ class ShowBase(DirectObject.DirectObject):
         self.tkRoot = Pmw.initialise()
         __builtin__.tkroot = self.tkRoot
 
-        initAppForGui()
+        init_app_for_gui()
 
         if ConfigVariableBool('tk-main-loop', True):
             # Put Tkinter in charge of the main loop.  It really
             # seems to like this better; the GUI otherwise becomes
             # largely unresponsive on Mac OS X unless this is true.
-            
+
             # Set a timer to run the Panda frame 60 times per second.
             tkFrameRate = ConfigVariableDouble('tk-frame-rate', 60.0)
             self.tkDelay = int(1000.0 / tkFrameRate.getValue())
@@ -2885,12 +2892,12 @@ class ShowBase(DirectObject.DirectObject):
         """ This method replaces base.run() after we have called
         spawnTkLoop().  Since at this point Tkinter now owns the main
         loop, this method is a call to tkRoot.mainloop(). """
-        
+
         if Thread.getCurrentThread().getCurrentTask():
             # This happens in the p3d environment during startup.
             # Ignore it.
             return
-        
+
         self.tkRoot.mainloop()
 
     def startDirect(self, fWantDirect = 1, fWantTk = 1, fWantWx = 0):
@@ -2913,7 +2920,7 @@ class ShowBase(DirectObject.DirectObject):
         if self.__directStarted:
             return
         self.__directStarted = False
-        
+
         # Start Tk, Wx and DIRECT if specified by Config.prc
         fTk = self.config.GetBool('want-tk', 0)
         fWx = self.config.GetBool('want-wx', 0)
diff --git a/direct/src/showbase/VFSImporter.py b/direct/src/showbase/VFSImporter.py
index 82f1288ee8..e33f4b551b 100644
--- a/direct/src/showbase/VFSImporter.py
+++ b/direct/src/showbase/VFSImporter.py
@@ -1,14 +1,13 @@
+__all__ = ['register', 'sharedPackages',
+           'reloadSharedPackage', 'reloadSharedPackages']
+
 from panda3d.core import Filename, VirtualFileSystem, VirtualFileMountSystem, OFileStream, copyStream
 import sys
-import os
 import marshal
 import imp
 import types
 import __builtin__
 
-__all__ = ['register', 'sharedPackages',
-           'reloadSharedPackage', 'reloadSharedPackages']
-
 # The sharedPackages dictionary lists all of the "shared packages",
 # special Python packages that automatically span multiple directories
 # via magic in the VFSImporter.  You can make a package "shared"
@@ -76,14 +75,13 @@ class VFSImporter:
         for desc in imp.get_suffixes():
             if desc[2] != imp.C_EXTENSION:
                 continue
-            
+
             filename = Filename(path)
             filename.setExtension(desc[0][1:])
             vfile = vfs.getFile(filename, True)
             if vfile:
                 return VFSLoader(dir_path, vfile, filename, FTExtensionModule,
                                  desc = desc)
-        
 
         # Finally, consider a package, i.e. a directory containing
         # __init__.py.
@@ -105,7 +103,7 @@ class VFSImporter:
 class VFSLoader:
     """ The second part of VFSImporter, this is created for a
     particular .py file or directory. """
-    
+
     def __init__(self, dir_path, vfile, filename, fileType,
                  desc = None, packagePath = None):
         self.dir_path = dir_path
@@ -116,7 +114,7 @@ class VFSLoader:
         self.fileType = fileType
         self.desc = desc
         self.packagePath = packagePath
-    
+
     def load_module(self, fullname, loadingShared = False):
         #print >>sys.stderr, "load_module(%s), dir_path = %s, filename = %s" % (fullname, self.dir_path, self.filename)
         if self.fileType == FTFrozenModule:
@@ -136,11 +134,11 @@ class VFSLoader:
                 loader = importer.find_module(fullname, path = path)
                 assert loader
                 return loader.load_module(fullname)
-        
+
         code = self._read_code()
         if not code:
             raise ImportError, 'No Python code in %s' % (fullname)
-        
+
         mod = sys.modules.setdefault(fullname, imp.new_module(fullname))
         mod.__file__ = self.filename.toOsSpecific()
         mod.__loader__ = self
@@ -169,15 +167,15 @@ class VFSLoader:
 
     def get_filename(self, fullname):
         return self.filename.toOsSpecific()
-        
+
     def _read_source(self):
         """ Returns the Python source for this file, if it is
         available, or None if it is not.  May raise IOError. """
-        
+
         if self.fileType == FTPythonCompiled or \
            self.fileType == FTExtensionModule:
             return None
-        
+
         filename = Filename(self.filename)
         filename.setExtension('py')
         filename.setText()
@@ -281,7 +279,7 @@ class VFSLoader:
     def _loadPyc(self, vfile, timestamp):
         """ Reads and returns the marshal data from a .pyc file.
         Raises ValueError if there is a problem. """
-        
+
         code = None
         data = vfile.readFile(True)
         if data[:4] == imp.get_magic():
@@ -294,13 +292,13 @@ class VFSLoader:
         else:
             raise ValueError, 'Bad magic number in %s' % (vfile)
         return code
-        
+
 
     def _compile(self, filename, source):
         """ Compiles the Python source code to a code object and
         attempts to write it to an appropriate .pyc file.  May raise
         SyntaxError or other errors generated by the compiler. """
-        
+
         if source and source[-1] != '\n':
             source = source + '\n'
         code = __builtin__.compile(source, filename.toOsSpecific(), 'exec')
@@ -335,7 +333,7 @@ class VFSSharedImporter:
 
     def __init__(self):
         pass
-    
+
     def find_module(self, fullname, path = None, reload = False):
         #print >>sys.stderr, "shared find_module(%s), path = %s" % (fullname, path)
 
@@ -364,14 +362,14 @@ class VFSSharedImporter:
         for dir in path:
             if dir in excludePaths:
                 continue
-            
+
             importer = sys.path_importer_cache.get(dir, None)
             if importer is None:
                 try:
                     importer = VFSImporter(dir)
                 except ImportError:
                     continue
-                
+
                 sys.path_importer_cache[dir] = importer
 
             try:
@@ -391,6 +389,9 @@ class VFSSharedImporter:
         """ Returns the directory name that the indicated
         conventionally-loaded module must have been loaded from. """
 
+        if not hasattr(mod, __file__) or mod.__file__ is None:
+            return None
+
         fullname = mod.__name__
         dirname = Filename.fromOsSpecific(mod.__file__).getDirname()
 
@@ -414,15 +415,15 @@ class VFSSharedImporter:
 
         # Couldn't figure it out.
         return None
-        
+
 class VFSSharedLoader:
     """ The second part of VFSSharedImporter, this imports a list of
     packages and combines them. """
-    
+
     def __init__(self, loaders, reload):
         self.loaders = loaders
         self.reload = reload
-    
+
     def load_module(self, fullname):
         #print >>sys.stderr, "shared load_module(%s), loaders = %s" % (fullname, map(lambda l: l.dir_path, self.loaders))
 
@@ -475,7 +476,7 @@ def register():
         _registered = True
         sys.path_hooks.insert(0, VFSImporter)
         sys.meta_path.insert(0, VFSSharedImporter())
-        
+
         # Blow away the importer cache, so we'll come back through the
         # VFSImporter for every folder in the future, even those
         # folders that previously were loaded directly.
diff --git a/direct/src/showutil/FreezeTool.py b/direct/src/showutil/FreezeTool.py
index 5c9afac00e..1e8d35e57f 100644
--- a/direct/src/showutil/FreezeTool.py
+++ b/direct/src/showutil/FreezeTool.py
@@ -17,9 +17,8 @@ except ImportError:
     p3extend_frozen = None
 
 import direct
-from pandac.PandaModules import *
+from panda3d.core import *
 from pandac.extension_native_helpers import dll_suffix, dll_ext
-import panda3d
 
 # Check to see if we are running python_d, which implies we have a
 # debug build, and we have to build the module with debug options.
@@ -578,6 +577,8 @@ class Freezer:
         if self.platform.startswith('win'):
             self.objectExtension = '.obj'
 
+        self.keepTemporaryFiles = True
+
         # Change any of these to change the generated startup and glue
         # code.
         self.frozenMainCode = frozenMainCode
@@ -912,7 +913,7 @@ class Freezer:
                 continue
             if origName in self.modules:
                 continue
-                
+
             # This module is missing.  Let it be missing in the
             # runtime also.
             self.modules[origName] = self.ModuleDef(origName, exclude = True,
@@ -1110,7 +1111,7 @@ class Freezer:
             # The "module" may end in __init__, but that really means
             # the parent directory.
             dirnames = dirnames[:-1]
-            
+
         self.__addPythonDirs(multifile, moduleDirs, dirnames[:-1], compressionLevel)
 
         filename = '/'.join(dirnames)
@@ -1328,10 +1329,11 @@ class Freezer:
         try:
             compileFunc(filename, basename)
         finally:
-            if (os.path.exists(filename)):
-                os.unlink(filename)
-            if (os.path.exists(basename + self.objectExtension)):
-                os.unlink(basename + self.objectExtension)
+            if not self.keepTemporaryFiles:
+                if os.path.exists(filename):
+                    os.unlink(filename)
+                if os.path.exists(basename + self.objectExtension):
+                    os.unlink(basename + self.objectExtension)
 
         return target
 
@@ -1378,19 +1380,6 @@ class PandaModuleFinder(modulefinder.ModuleFinder):
     def __init__(self, *args, **kw):
         modulefinder.ModuleFinder.__init__(self, *args, **kw)
 
-    def import_module(self, partname, fqname, parent):
-        if parent and parent.__name__ == 'panda3d':
-            # A special case: map a reference to the "panda3d.blah"
-            # module into the appropriate Panda3D dll.
-            m = getattr(panda3d, partname, None)
-            if m and hasattr(m, '__libraries__'):
-                libname = m.__libraries__[-1]
-                partname = libname
-                fqname = libname
-                parent = None
-
-        return modulefinder.ModuleFinder.import_module(self, partname, fqname, parent)
-
     def find_module(self, name, path, parent=None):
         try:
             return modulefinder.ModuleFinder.find_module(self, name, path, parent = parent)
@@ -1425,7 +1414,7 @@ class PandaModuleFinder(modulefinder.ModuleFinder):
             m = self.add_module(fqname)
             m.__file__ = '<frozen>'
             if isPackage:
-                m.__path__ = pathname
+                m.__path__ = [pathname]
             co = marshal.loads(co)
             if self.replace_paths:
                 co = self.replace_paths_in_code(co)
diff --git a/direct/src/stdpy/file.py b/direct/src/stdpy/file.py
index 54ca31af55..91cf209b04 100644
--- a/direct/src/stdpy/file.py
+++ b/direct/src/stdpy/file.py
@@ -10,10 +10,10 @@ __all__ = [
     'execfile',
     ]
 
-from pandac import PandaModules as pm
+from panda3d import core
 import types
 
-_vfs = pm.VirtualFileSystem.getGlobalPtr()
+_vfs = core.VirtualFileSystem.getGlobalPtr()
 
 class file:
     def __init__(self, filename, mode = 'r', bufsize = None,
@@ -36,14 +36,14 @@ class file:
         readMode = False
         writeMode = False
 
-        if isinstance(filename, pm.Istream) or isinstance(filename, pm.Ostream):
+        if isinstance(filename, core.Istream) or isinstance(filename, core.Ostream):
             # If we were given a stream instead of a filename, assign
             # it directly.
             self.__stream = filename
-            readMode = isinstance(filename, pm.Istream)
-            writeMode = isinstance(filename, pm.Ostream)
+            readMode = isinstance(filename, core.Istream)
+            writeMode = isinstance(filename, core.Ostream)
 
-        elif isinstance(filename, pm.VirtualFile):
+        elif isinstance(filename, core.VirtualFile):
             # We can also "open" a VirtualFile object for reading.
             self.__stream = filename.openReadFile(autoUnwrap)
             if not self.__stream:
@@ -57,10 +57,10 @@ class file:
             if isinstance(filename, types.StringTypes):
                 # If a raw string is given, assume it's an os-specific
                 # filename.
-                filename = pm.Filename.fromOsSpecific(filename)
+                filename = core.Filename.fromOsSpecific(filename)
             else:
                 # If a Filename is given, make a writable copy anyway.
-                filename = pm.Filename(filename)
+                filename = core.Filename(filename)
 
             self.filename = filename
             self.name = filename.toOsSpecific()
@@ -97,7 +97,7 @@ class file:
                     message = 'Could not open %s for writing' % (filename)
                     raise IOError, message
                 writeMode = True
-                
+
             elif mode == 'a':
                 self.__stream = _vfs.openAppendFile(filename)
                 if not self.__stream:
@@ -142,14 +142,14 @@ class file:
             self.__needsVfsClose = True
 
         if readMode:
-            self.__reader = pm.StreamReader(self.__stream, False)
+            self.__reader = core.StreamReader(self.__stream, False)
         if writeMode:
-            self.__writer = pm.StreamWriter(self.__stream, False)
+            self.__writer = core.StreamWriter(self.__stream, False)
             self.__lastWrite = True
 
     def __del__(self):
         self.close()
-        
+
     def close(self):
         if self.__needsVfsClose:
             if self.__reader and self.__writer:
@@ -158,13 +158,13 @@ class file:
                 _vfs.closeReadFile(self.__stream)
             else:  # self.__writer:
                 _vfs.closeWriteFile(self.__stream)
-                
+
             self.__needsVfsClose = False
         self.__stream = None
         self.__needsVfsClose = False
         self.__reader = None
         self.__writer = None
-        
+
     def flush(self):
         if self.__stream:
             self.__stream.clear()  # clear eof flag
@@ -188,7 +188,7 @@ class file:
             # The stream is open only in write mode.
             message = 'Attempt to read from write-only stream'
             raise IOError, message
-        
+
         self.__stream.clear()  # clear eof flag
         self.__lastWrite = False
         if size >= 0:
@@ -199,7 +199,7 @@ class file:
             while not self.__stream.eof():
                 result += self.__reader.extractBytes(1024)
         return result
-        
+
     def readline(self, size = -1):
         if not self.__reader:
             if not self.__writer:
@@ -213,7 +213,7 @@ class file:
         self.__stream.clear()  # clear eof flag
         self.__lastWrite = False
         return self.__reader.readline()
-        
+
     def readlines(self, sizehint = -1):
         lines = []
         line = self.readline()
@@ -241,7 +241,7 @@ class file:
                 return self.__stream.tellg()
         message = 'I/O operation on closed file'
         raise ValueError, message
-    
+
     def truncate(self):
         """ Sorry, this isn't supported by Panda's low-level I/O,
         because it isn't supported by the standard C++ library. """
@@ -287,7 +287,7 @@ open = file
 def listdir(path):
     """ Implements os.listdir over vfs. """
     files = []
-    dirlist = _vfs.scanDirectory(pm.Filename.fromOsSpecific(path))
+    dirlist = _vfs.scanDirectory(core.Filename.fromOsSpecific(path))
     if dirlist is None:
         message = 'No such file or directory: %s' % (path)
         raise OSError, message
@@ -338,31 +338,31 @@ def join(path, *args):
     return path
 
 def isfile(path):
-    return _vfs.isRegularFile(pm.Filename.fromOsSpecific(path))
+    return _vfs.isRegularFile(core.Filename.fromOsSpecific(path))
 
 def isdir(path):
-    return _vfs.isDirectory(pm.Filename.fromOsSpecific(path))
+    return _vfs.isDirectory(core.Filename.fromOsSpecific(path))
 
 def exists(path):
-    return _vfs.exists(pm.Filename.fromOsSpecific(path))
+    return _vfs.exists(core.Filename.fromOsSpecific(path))
 
 def lexists(path):
-    return _vfs.exists(pm.Filename.fromOsSpecific(path))
-    
+    return _vfs.exists(core.Filename.fromOsSpecific(path))
+
 def getmtime(path):
-    file = _vfs.getFile(pm.Filename.fromOsSpecific(path), True)
+    file = _vfs.getFile(core.Filename.fromOsSpecific(path), True)
     if not file:
         raise os.error
     return file.getTimestamp()
-    
+
 def getsize(path):
-    file = _vfs.getFile(pm.Filename.fromOsSpecific(path), True)
+    file = _vfs.getFile(core.Filename.fromOsSpecific(path), True)
     if not file:
         raise os.error
     return file.getFileSize()
 
 def execfile(path, globals=None, locals=None):
-    file = _vfs.getFile(pm.Filename.fromOsSpecific(path), True)
+    file = _vfs.getFile(core.Filename.fromOsSpecific(path), True)
     if not file:
         raise os.error
 
diff --git a/direct/src/stdpy/pickle.py b/direct/src/stdpy/pickle.py
index 774a4e6314..ae46f3967b 100644
--- a/direct/src/stdpy/pickle.py
+++ b/direct/src/stdpy/pickle.py
@@ -23,7 +23,7 @@ support extensions of this nature. """
 
 from types import *
 from copy_reg import dispatch_table
-from pandac.PandaModules import BamWriter, BamReader
+from panda3d.core import BamWriter, BamReader
 
 # A funny replacement for "import pickle" so we don't get confused
 # with the local pickle.py.
@@ -37,7 +37,7 @@ class Pickler(pickle.Pickler):
 
     # We have to duplicate most of the save() method, so we can add
     # support for __reduce_persist__().
-    
+
     def save(self, obj):
         # Check for persistent id (defined by a subclass)
         pid = self.persistent_id(obj)
@@ -116,7 +116,7 @@ class Unpickler(pickle.Unpickler):
 
     # Duplicate the load_reduce() function, to provide a special case
     # for the reduction function.
-    
+
     def load_reduce(self):
         stack = self.stack
         args = stack.pop()
diff --git a/direct/src/stdpy/thread.py b/direct/src/stdpy/thread.py
index 06d31d599b..ba85a6dcd1 100644
--- a/direct/src/stdpy/thread.py
+++ b/direct/src/stdpy/thread.py
@@ -14,13 +14,12 @@ __all__ = [
     'forceYield', 'considerYield',
     ]
 
-# Import PandaModules as pm, so we don't have any namespace collisions.
-from pandac import PandaModules as pm
+from panda3d import core
 
 # These methods are defined in Panda, and are particularly useful if
 # you may be running in Panda's SIMPLE_THREADS compilation mode.
-forceYield = pm.Thread.forceYield
-considerYield = pm.Thread.considerYield
+forceYield = core.Thread.forceYield
+considerYield = core.Thread.considerYield
 
 class error(StandardError):
     pass
@@ -31,10 +30,10 @@ class LockType:
     provide the described Python lock semantics.  In particular, this
     allows a different thread to release the lock than the one that
     acquired it. """
-    
+
     def __init__(self):
-        self.__lock = pm.Mutex('PythonLock')
-        self.__cvar = pm.ConditionVar(self.__lock)
+        self.__lock = core.Mutex('PythonLock')
+        self.__cvar = core.ConditionVar(self.__lock)
         self.__locked = False
 
     def acquire(self, waitflag = 1):
@@ -44,7 +43,7 @@ class LockType:
                 return False
             while self.__locked:
                 self.__cvar.wait()
-                
+
             self.__locked = True
             return True
 
@@ -56,16 +55,16 @@ class LockType:
         try:
             if not self.__locked:
                 raise error, 'Releasing unheld lock.'
-                
+
             self.__locked = False
             self.__cvar.notify()
 
         finally:
             self.__lock.release()
-        
+
     def locked(self):
         return self.__locked
-    
+
     __enter__ = acquire
 
     def __exit__(self, t, v, tb):
@@ -73,7 +72,7 @@ class LockType:
 
 _threads = {}
 _nextThreadId = 0
-_threadsLock = pm.Mutex('thread._threadsLock')
+_threadsLock = core.Mutex('thread._threadsLock')
 
 def start_new_thread(function, args, kwargs = {}, name = None):
     def threadFunc(threadId, function = function, args = args, kwargs = kwargs):
@@ -94,31 +93,31 @@ def start_new_thread(function, args, kwargs = {}, name = None):
 
         if name is None:
             name = 'PythonThread-%s' % (threadId)
-            
-        thread = pm.PythonThread(threadFunc, [threadId], name, name)
+
+        thread = core.PythonThread(threadFunc, [threadId], name, name)
         thread.setPythonData(threadId)
         _threads[threadId] = (thread, {}, None)
-        
-        thread.start(pm.TPNormal, False)
+
+        thread.start(core.TPNormal, False)
         return threadId
 
     finally:
         _threadsLock.release()
 
 def _add_thread(thread, wrapper):
-    """ Adds the indicated pm.Thread object, with the indicated Python
+    """ Adds the indicated core.Thread object, with the indicated Python
     wrapper, to the thread list.  Returns the new thread ID. """
-    
+
     global _nextThreadId
     _threadsLock.acquire()
     try:
         threadId = _nextThreadId
         _nextThreadId += 1
-            
+
         thread.setPythonData(threadId)
         _threads[threadId] = (thread, {}, wrapper)
         return threadId
-        
+
     finally:
         _threadsLock.release()
 
@@ -130,7 +129,7 @@ def _get_thread_wrapper(thread, wrapperClass):
     threadId = thread.getPythonData()
     if threadId is None:
         # The thread has never been assigned a threadId.  Go assign one.
-        
+
         global _nextThreadId
         _threadsLock.acquire()
         try:
@@ -166,7 +165,7 @@ def _get_thread_locals(thread, i):
     threadId = thread.getPythonData()
     if threadId is None:
         # The thread has never been assigned a threadId.  Go assign one.
-        
+
         global _nextThreadId
         _threadsLock.acquire()
         try:
@@ -195,14 +194,14 @@ def _get_thread_locals(thread, i):
 
 def _remove_thread_id(threadId):
     """ Removes the thread with the indicated ID from the thread list. """
-    
+
     _threadsLock.acquire()
     try:
         thread, locals, wrapper = _threads[threadId]
         assert thread.getPythonData() == threadId
         del _threads[threadId]
         thread.setPythonData(None)
-        
+
     finally:
         _threadsLock.release()
 
@@ -218,7 +217,7 @@ def allocate_lock():
     return LockType()
 
 def get_ident():
-    return pm.Thread.getCurrentThread().this
+    return core.Thread.getCurrentThread().this
 
 def stack_size(size = 0):
     raise error
@@ -244,18 +243,18 @@ class _local(object):
             _threadsLock.release()
 
     def __setattr__(self, key, value):
-        d = _get_thread_locals(pm.Thread.getCurrentThread(), id(self))
+        d = _get_thread_locals(core.Thread.getCurrentThread(), id(self))
         d[key] = value
-        
+
 ##     def __getattr__(self, key):
-##         d = _get_thread_locals(pm.Thread.getCurrentThread(), id(self))
+##         d = _get_thread_locals(core.Thread.getCurrentThread(), id(self))
 ##         try:
 ##             return d[key]
 ##         except KeyError:
 ##             raise AttributeError
 
     def __getattribute__(self, key):
-        d = _get_thread_locals(pm.Thread.getCurrentThread(), id(self))
+        d = _get_thread_locals(core.Thread.getCurrentThread(), id(self))
         if key == '__dict__':
             return d
         try:
@@ -263,5 +262,5 @@ class _local(object):
         except KeyError:
             return object.__getattribute__(self, key)
 
-        
-        
+
+
diff --git a/direct/src/stdpy/threading.py b/direct/src/stdpy/threading.py
index 2c1f8ebf42..b3f2bc57bd 100644
--- a/direct/src/stdpy/threading.py
+++ b/direct/src/stdpy/threading.py
@@ -21,11 +21,8 @@ easier to use and understand.
 It is permissible to mix-and-match both threading and threading2
 within the same application. """
 
-# We import PandaModules as the name pm, so we can avoid namespace
-# collisions between native Panda objects, and our own class
-# definitions in this module. """
 import direct
-from pandac import PandaModules as pm
+from panda3d import core
 from direct.stdpy import thread as _thread
 import sys as _sys
 
@@ -55,10 +52,10 @@ class ThreadBase:
 
     def getName(self):
         return self.name
-    
+
     def is_alive(self):
         return self.__thread.isStarted()
-    
+
     def isAlive(self):
         return self.__thread.isStarted()
 
@@ -68,9 +65,9 @@ class ThreadBase:
     def setDaemon(self, daemon):
         if self.is_alive():
             raise RuntimeError
-        
+
         self.__dict__['daemon'] = daemon
-        
+
     def __setattr__(self, key, value):
         if key == 'name':
             self.setName(value)
@@ -84,8 +81,8 @@ class ThreadBase:
 # Copy these static methods from Panda's Thread object.  These are
 # useful if you may be running in Panda's SIMPLE_THREADS compilation
 # mode.
-ThreadBase.forceYield = pm.Thread.forceYield
-ThreadBase.considerYield = pm.Thread.considerYield
+ThreadBase.forceYield = core.Thread.forceYield
+ThreadBase.considerYield = core.Thread.considerYield
 
 class Thread(ThreadBase):
     """ This class provides a wrapper around Panda's PythonThread
@@ -108,21 +105,21 @@ class Thread(ThreadBase):
         self.__dict__['daemon'] = current.daemon
         self.__dict__['name'] = name
 
-        self.__thread = pm.PythonThread(self.run, None, name, name)
+        self.__thread = core.PythonThread(self.run, None, name, name)
         threadId = _thread._add_thread(self.__thread, weakref.proxy(self))
         self.__dict__['ident'] = threadId
 
     def __del__(self):
         # On interpreter shutdown, the _thread module might have
         # already been cleaned up.
-        if _thread and _thread._remove_thread_id: 
+        if _thread and _thread._remove_thread_id:
             _thread._remove_thread_id(self.ident)
 
     def start(self):
         if self.__thread.isStarted():
             raise RuntimeError
-        
-        if not self.__thread.start(pm.TPNormal, True):
+
+        if not self.__thread.start(core.TPNormal, True):
             raise RuntimeError
 
     def run(self):
@@ -132,7 +129,7 @@ class Thread(ThreadBase):
             _sys.setprofile(_setprofile_func)
 
         self.__target(*self.__args, **self.__kwargs)
-        
+
     def join(self, timeout = None):
         # We don't support a timed join here, sorry.
         assert timeout is None
@@ -146,10 +143,10 @@ class Thread(ThreadBase):
 class ExternalThread(ThreadBase):
     """ Returned for a Thread object that wasn't created by this
     interface. """
-    
+
     def __init__(self, extThread, threadId):
         ThreadBase.__init__(self)
-        
+
         self.__thread = extThread
         self.__dict__['daemon'] = True
         self.__dict__['name'] = self.__thread.getName()
@@ -157,10 +154,10 @@ class ExternalThread(ThreadBase):
 
     def start(self):
         raise RuntimeError
-    
+
     def run(self):
         raise RuntimeError
-        
+
     def join(self, timeout = None):
         raise RuntimeError
 
@@ -169,53 +166,53 @@ class ExternalThread(ThreadBase):
 
 class MainThread(ExternalThread):
     """ Returned for the MainThread object. """
-    
+
     def __init__(self, extThread, threadId):
         ExternalThread.__init__(self, extThread, threadId)
         self.__dict__['daemon'] = False
 
-class Lock(pm.Mutex):
+class Lock(core.Mutex):
     """ This class provides a wrapper around Panda's Mutex object.
     The wrapper is designed to emulate Python's own threading.Lock
     object. """
 
     def __init__(self, name = "PythonLock"):
-        pm.Mutex.__init__(self, name)
+        core.Mutex.__init__(self, name)
 
     def acquire(self, blocking = True):
         if blocking:
-            pm.Mutex.acquire(self)
+            core.Mutex.acquire(self)
             return True
         else:
-            return pm.Mutex.tryAcquire(self)
-    
+            return core.Mutex.tryAcquire(self)
+
     __enter__ = acquire
 
     def __exit__(self, t, v, tb):
         self.release()
 
-class RLock(pm.ReMutex):
+class RLock(core.ReMutex):
     """ This class provides a wrapper around Panda's ReMutex object.
     The wrapper is designed to emulate Python's own threading.RLock
     object. """
 
     def __init__(self, name = "PythonRLock"):
-        pm.ReMutex.__init__(self, name)
+        core.ReMutex.__init__(self, name)
 
     def acquire(self, blocking = True):
         if blocking:
-            pm.ReMutex.acquire(self)
+            core.ReMutex.acquire(self)
             return True
         else:
-            return pm.ReMutex.tryAcquire(self)
-    
+            return core.ReMutex.tryAcquire(self)
+
     __enter__ = acquire
 
     def __exit__(self, t, v, tb):
         self.release()
 
 
-class Condition(pm.ConditionVarFull):
+class Condition(core.ConditionVarFull):
     """ This class provides a wrapper around Panda's ConditionVarFull
     object.  The wrapper is designed to emulate Python's own
     threading.Condition object. """
@@ -229,7 +226,7 @@ class Condition(pm.ConditionVarFull):
         assert isinstance(lock, Lock)
 
         self.__lock = lock
-        pm.ConditionVarFull.__init__(self, self.__lock)
+        core.ConditionVarFull.__init__(self, self.__lock)
 
     def acquire(self, *args, **kw):
         return self.__lock.acquire(*args, **kw)
@@ -239,35 +236,35 @@ class Condition(pm.ConditionVarFull):
 
     def wait(self, timeout = None):
         if timeout is None:
-            pm.ConditionVarFull.wait(self)
+            core.ConditionVarFull.wait(self)
         else:
-            pm.ConditionVarFull.wait(self, timeout)
+            core.ConditionVarFull.wait(self, timeout)
 
     def notifyAll(self):
-        pm.ConditionVarFull.notifyAll(self)
+        core.ConditionVarFull.notifyAll(self)
 
     notify_all = notifyAll
-    
+
     __enter__ = acquire
 
     def __exit__(self, t, v, tb):
         self.release()
 
-class Semaphore(pm.Semaphore):
+class Semaphore(core.Semaphore):
     """ This class provides a wrapper around Panda's Semaphore
     object.  The wrapper is designed to emulate Python's own
     threading.Semaphore object. """
 
     def __init__(self, value = 1):
-        pm.Semaphore.__init__(self, value)
+        core.Semaphore.__init__(self, value)
 
     def acquire(self, blocking = True):
         if blocking:
-            pm.Semaphore.acquire(self)
+            core.Semaphore.acquire(self)
             return True
         else:
-            return pm.Semaphore.tryAcquire(self)
-    
+            return core.Semaphore.tryAcquire(self)
+
     __enter__ = acquire
 
     def __exit__(self, t, v, tb):
@@ -293,8 +290,8 @@ class Event:
     object. """
 
     def __init__(self):
-        self.__lock = pm.Lock("Python Event")
-        self.__cvar = pm.ConditionVarFull(self.__lock)
+        self.__lock = core.Lock("Python Event")
+        self.__cvar = core.ConditionVarFull(self.__lock)
         self.__flag = False
 
     def is_set(self):
@@ -310,7 +307,7 @@ class Event:
 
         finally:
             self.__lock.release()
-            
+
     def clear(self):
         self.__lock.acquire()
         try:
@@ -318,7 +315,7 @@ class Event:
 
         finally:
             self.__lock.release()
-            
+
     def wait(self, timeout = None):
         self.__lock.acquire()
         try:
@@ -326,15 +323,15 @@ class Event:
                 while not self.__flag:
                     self.__cvar.wait()
             else:
-                clock = pm.TrueClock.getGlobalPtr()
+                clock = core.TrueClock.getGlobalPtr()
                 expires = clock.getShortTime() + timeout
                 while not self.__flag:
                     wait = expires - clock.getShortTime()
                     if wait < 0:
                         return
-                    
+
                     self.__cvar.wait(wait)
-                
+
         finally:
             self.__lock.release()
 
@@ -366,7 +363,7 @@ class Timer(Thread):
 
 def _create_thread_wrapper(t, threadId):
     """ Creates a thread wrapper for the indicated external thread. """
-    if isinstance(t, pm.MainThread):
+    if isinstance(t, core.MainThread):
         pyt = MainThread(t, threadId)
     else:
         pyt = ExternalThread(t, threadId)
@@ -374,7 +371,7 @@ def _create_thread_wrapper(t, threadId):
     return pyt
 
 def current_thread():
-    t = pm.Thread.getCurrentThread()
+    t = core.Thread.getCurrentThread()
     return _thread._get_thread_wrapper(t, _create_thread_wrapper)
 
 currentThread = current_thread
@@ -410,7 +407,7 @@ def stack_size(size = None):
 def _test():
 
     from collections import deque
-    _sleep = pm.Thread.sleep
+    _sleep = core.Thread.sleep
 
     _VERBOSE = False
 
diff --git a/direct/src/stdpy/threading2.py b/direct/src/stdpy/threading2.py
index c622995bac..b45d893f6c 100644
--- a/direct/src/stdpy/threading2.py
+++ b/direct/src/stdpy/threading2.py
@@ -17,8 +17,8 @@ import sys as _sys
 
 from direct.stdpy import thread
 from direct.stdpy.thread import stack_size, _local as local
-from pandac import PandaModules as pm
-_sleep = pm.Thread.sleep
+from panda3d import core
+_sleep = core.Thread.sleep
 
 from time import time as _time
 from traceback import format_exc as _format_exc
diff --git a/direct/src/task/Task.py b/direct/src/task/Task.py
index f105e8f33c..f75ebca9ce 100644
--- a/direct/src/task/Task.py
+++ b/direct/src/task/Task.py
@@ -16,7 +16,7 @@ import time
 import random
 import string
 
-from pandac.PandaModules import *
+from panda3d.core import *
 
 def print_exc_plus():
     """
@@ -114,7 +114,7 @@ class TaskManager:
 
         self._frameProfileQueue = Queue()
 
-        # this will be set when it's safe to import StateVar 
+        # this will be set when it's safe to import StateVar
         self._profileFrames = None
         self._frameProfiler = None
         self._profileTasks = None
@@ -231,7 +231,7 @@ class TaskManager:
         in proportion to their time used and to their priority value.
         See AsyncTaskManager.setTimeslicePriority() for more.
         """
-        
+
         chain = self.mgr.makeTaskChain(chainName)
         if numThreads is not None:
             chain.setNumThreads(numThreads)
@@ -249,7 +249,7 @@ class TaskManager:
     def hasTaskNamed(self, taskName):
         """Returns true if there is at least one task, active or
         sleeping, with the indicated name. """
-        
+
         return bool(self.mgr.findTask(taskName))
 
     def getTasksNamed(self, taskName):
@@ -261,7 +261,7 @@ class TaskManager:
         """Returns a list of all tasks, active or sleeping, with a
         name that matches the pattern, which can include standard
         shell globbing characters like *, ?, and []. """
-        
+
         return self.__makeTaskList(self.mgr.findTasksMatching(GlobPattern(taskPattern)))
 
     def getAllTasks(self):
@@ -298,7 +298,7 @@ class TaskManager:
         wish to specify a task that will run in the next frame, use a
         delayTime of 0.
         """
-        
+
         if delayTime < 0:
             assert self.notify.warning('doMethodLater: added task: %s with negative delay: %s' % (name, delayTime))
 
@@ -310,7 +310,7 @@ class TaskManager:
     def add(self, funcOrTask, name = None, sort = None, extraArgs = None,
             priority = None, uponDeath = None, appendTask = False,
             taskChain = None, owner = None):
-        
+
         """
         Add a new task to the taskMgr.  The task will begin executing
         immediately, or next frame if its sort value has already
@@ -363,7 +363,7 @@ class TaskManager:
         added, or the original Task object that was passed in.
 
         """
-        
+
         task = self.__setupTask(funcOrTask, name, priority, sort, extraArgs, taskChain, appendTask, owner, uponDeath)
         self.mgr.add(task)
         return task
@@ -412,7 +412,7 @@ class TaskManager:
             task.setUponDeath(uponDeath)
 
         return task
-        
+
     def remove(self, taskOrName):
         """Removes a task from the task manager.  The task is stopped,
         almost as if it had returned task.done.  (But if the task is
@@ -421,7 +421,7 @@ class TaskManager:
         Task object, or the name of a task.  If you specify a name,
         all tasks with the indicated name are removed.  Returns the
         number of tasks removed. """
-        
+
         if isinstance(taskOrName, types.StringTypes):
             tasks = self.mgr.findTasks(taskOrName)
             return self.mgr.remove(tasks)
@@ -463,7 +463,7 @@ class TaskManager:
         # This is the spot for an internal yield function
         nextTaskTime = self.mgr.getNextWakeTime()
         self.doYield(startFrameTime, nextTaskTime)
-        
+
         # Restore default interrupt handler
         signal.signal(signal.SIGINT, signal.default_int_handler)
         if self.fKeyboardInterrupt:
@@ -472,7 +472,7 @@ class TaskManager:
     def run(self):
         """Starts the task manager running.  Does not return until an
         exception is encountered (including KeyboardInterrupt). """
-        
+
         # Set the clock to have last frame's time in case we were
         # Paused at the prompt for a long time
         t = self.globalClock.getFrameTime()
@@ -554,7 +554,7 @@ class TaskManager:
     def __tryReplaceTaskMethod(self, task, oldMethod, newFunction):
         if not isinstance(task, PythonTask):
             return 0
-        
+
         method = task.getFunction()
         if (type(method) == types.MethodType):
             function = method.im_func
@@ -730,10 +730,10 @@ class TaskManager:
         delta = minFinTime - self.globalClock.getRealTime()
         while(delta > 0.002):
             print ' sleep %s'% (delta)
-            time.sleep(delta)           
+            time.sleep(delta)
             delta = minFinTime - self.globalClock.getRealTime()
     """
-    
+
     if __debug__:
         # to catch memory leaks during the tests at the bottom of the file
         def _startTrackingMemLeaks(self):
diff --git a/direct/src/test/ModelScreenShot.py b/direct/src/test/ModelScreenShot.py
deleted file mode 100755
index 124d0b3422..0000000000
--- a/direct/src/test/ModelScreenShot.py
+++ /dev/null
@@ -1,71 +0,0 @@
-import direct
-from pandac.PandaModules import loadPrcFileData
-
-from direct.showbase.DirectObject import DirectObject
-from direct.directbase.DirectStart import *
-from pandac.PandaModules import *
-import direct.gui.DirectGuiGlobals as DGG
-from direct.gui.DirectGui import *
-from direct.task import Task
-
-from direct.directnotify import DirectNotifyGlobal
-import math
-from operator import *
-
-import ModelScreenShotGlobals
-
-class ModelScreenShot(DirectObject):
-    notify = DirectNotifyGlobal.directNotify.newCategory("ModelScreenShot")
-
-    def __init__(self):
-
-        # Grab a list of models to capture screenshots of from an array in
-        # the globals file
-        self.modelsToView = ModelScreenShotGlobals.models
-        self.models = []
-
-        # Attach all the models listed to render and save a pointer to them
-        # in an array.  Then hide the model.
-        for model in self.modelsToView:
-            m = loader.loadModel(model)
-            m.reparentTo(render)
-            self.models.append(m)
-            m.hide()
-
-        # Set a nice farplane far, far away
-        self.lens = base.camera.getChild(0).node().getLens()
-        self.lens.setFar(10000)
-
-        # Hide the cursor
-        self.props = WindowProperties()
-        self.props.setCursorHidden(0)
-        base.win.requestProperties(self.props)
-
-        # Method for getting the distance to an object from the camera
-        def getDist(obj, lens):
-            rad = obj.getBounds().getRadius()
-            fov = lens.getFov()
-            dist = rad / math.tan(deg2Rad(min(fov[0], fov[1]/2.0)))
-            return dist
-
-        # Determin the optimal camera position
-        def getOptCamPos(obj, dist):
-            cen = obj.getBounds().getCenter()
-            camPos = VBase3(cen.getX(), -dist, cen.getZ())
-            return camPos
-
-        # Generate screenshots
-        def generatePics():
-            for model in self.models:
-                model.show()
-                base.camera.setPos(getOptCamPos(model, getDist(model, self.lens)))
-                uFilename = model.getName().replace('.egg','.jpg')
-                self.notify.info("screenshot %s   camera pos: %s" % (uFilename, base.camera.getPos()))
-                base.graphicsEngine.renderFrame()
-                base.screenshot(namePrefix = uFilename, defaultFilename = 0)
-                model.hide()
-
-        generatePics()
-        
-mss = ModelScreenShot()
-run()
diff --git a/direct/src/test/ModelScreenShotGlobals.py b/direct/src/test/ModelScreenShotGlobals.py
deleted file mode 100644
index 65591d59f5..0000000000
--- a/direct/src/test/ModelScreenShotGlobals.py
+++ /dev/null
@@ -1,6 +0,0 @@
-# Replace these with the models you want to screenshot
-models = [
-    'models/misc/smiley',
-    'models/misc/sphere',
-    'models/misc/xyzAxis'
-]
diff --git a/direct/src/test/Sources.pp b/direct/src/test/Sources.pp
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/direct/src/test/__init__.py b/direct/src/test/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/doc/Config.pp.sample b/doc/Config.pp.sample
index cc9fa0cea9..567961384b 100644
--- a/doc/Config.pp.sample
+++ b/doc/Config.pp.sample
@@ -32,13 +32,10 @@
 
 // Note the use of the Panda filename convention, with forward slashes
 // instead of backslashes, and /c/ instead of c:/ .
-#define DX8_IPATH /c/DXSDK-OCT2004/include
-#define DX8_LPATH /c/DXSDK-OCT2004/lib
 #define DX9_IPATH /c/DXSDK-DEC2006/include
 #define DX9_LPATH /c/DXSDK-DEC2006/lib
 
-// If for any reason you need to turn off either the DX8 or DX9 builds,
-// you can uncomment one of the following lines.  (Defining a
+// If for any reason you need to turn off the DX9 builds,
+// you can uncomment the following line.  (Defining a
 // variable to an empty string means setting it false.)
-//#define HAVE_DX8
 //#define HAVE_DX9
diff --git a/doc/INSTALL-MK b/doc/INSTALL-MK
index 2a5624a6a1..dd1536e60b 100644
--- a/doc/INSTALL-MK
+++ b/doc/INSTALL-MK
@@ -141,7 +141,6 @@ it will show you the available command-line options:
   --use-max9        --no-max9      (enable/disable use of MAX9)
   --use-max2009     --no-max2009   (enable/disable use of MAX2009)
   --use-max2010     --no-max2010   (enable/disable use of MAX2010)
-  --use-dx8         --no-dx8       (enable/disable use of DX8)
   --use-dx9         --no-dx9       (enable/disable use of DX9)
   --use-python      --no-python    (enable/disable use of PYTHON)
   --use-zlib        --no-zlib      (enable/disable use of ZLIB)
diff --git a/doc/INSTALL-PP b/doc/INSTALL-PP
index 46fd4e946d..2f3fc57087 100644
--- a/doc/INSTALL-PP
+++ b/doc/INSTALL-PP
@@ -251,13 +251,13 @@ indicate a variable is true by defining it to some nonempty string
 (e.g. "yes" or "1"), and false by defining it to nothing.  For
 example:
 
-  #define HAVE_DX8 1
+  #define HAVE_DX9 1
 
 Indicates you have the DirectX SDK installed, while
 
-  #define HAVE_DX8
+  #define HAVE_DX9
 
-Indicates you do not.  Do not be tempted to define HAVE_DX8 to no or 0;
+Indicates you do not.  Do not be tempted to define HAVE_DX9 to no or 0;
 since these are both nonempty strings, they are considered to
 represent true!  Also, don't try to use a pair of quotation marks to
 represent the empty string, since the quotation marks become part of
@@ -312,11 +312,6 @@ find useful are:
     header and library files, and the name of the VRPN libraries, if
     VRPN is installed on your system.
 
-  DX8_IPATH / DX8_LPATH / DX8_LIBS - the full pathname to the
-    DirectX 8.1 SDK header and library files, if you have installed
-    this SDK. (You must currently install this SDK in order to
-    build DirectX8 support for Panda.)
-
   DX9_IPATH / DX9_LPATH / DX9_LIBS - the full pathname to the
     DirectX 9 SDK header and library files, if you have installed
     this SDK. (You must currently install this SDK in order to
diff --git a/doc/man/bam-info.1 b/doc/man/bam-info.1
new file mode 100644
index 0000000000..c9432acd7a
--- /dev/null
+++ b/doc/man/bam-info.1
@@ -0,0 +1,21 @@
+.\" Automatically generated by bam-info -write-bam
+.TH BAM-INFO 1 "27 December 2014" "1.9.0" Panda3D
+.SH NAME
+bam-info \- describe the contents of .bam files
+.SH SYNOPSIS
+\fBbam-info\fR [opts] input.bam [input.bam ... ]
+.SH DESCRIPTION
+This program scans one or more Bam files\-\-Panda's Binary Animation and Models native binary format\-\-and describes their contents.
+.SH OPTIONS
+.TP
+.B \-ls
+List the scene graph hierarchy in the bam file.
+.TP
+.B \-t
+List explicitly each transition in the hierarchy.
+.TP
+.B \-g
+Output verbose information about the each Geom in the Bam file.
+.TP
+.B \-h
+Display this help page.
diff --git a/doc/man/bam2egg.1 b/doc/man/bam2egg.1
new file mode 100644
index 0000000000..b88e908d14
--- /dev/null
+++ b/doc/man/bam2egg.1
@@ -0,0 +1,31 @@
+.\" Automatically generated by bam2egg -write-bam
+.TH BAM2EGG 1 "27 December 2014" "1.9.0" Panda3D
+.SH NAME
+bam2egg \- convert a native Panda .bam file to an .egg file
+.SH SYNOPSIS
+\fBbam2egg\fR [opts] input.bam output.egg
+.br
+\fBbam2egg\fR [opts] -o output.egg input.bam
+.br
+\fBbam2egg\fR [opts] input.bam >output.egg
+.SH DESCRIPTION
+This program converts native Panda bam files to egg.  The conversion is somewhat incomplete; running egg2bam followed by bam2egg should not be expected to yield the same egg file you started with.
+.SH OPTIONS
+.TP
+.B \-noabs
+Don't allow the input bam file to have absolute pathnames.  If it does, abort with an error.  This option is designed to help detect errors when populating or building a standalone model tree, which should be self-contained and include only relative pathnames.
+.TP
+.B \-noexist
+Don't treat it as an error if the input file references pathnames (e.g. textures) that don't exist.  Normally, this will be flagged as an error and the command aborted; with this option, an egg file will be generated anyway, referencing pathnames that do not exist.
+.TP
+.B \-ignore
+Ignore non-fatal errors and generate an egg file anyway.
+.TP
+.BI "\-o " "filename"
+Specify the filename to which the resulting egg file will be written.  If this option is omitted, the last parameter name is taken to be the name of the output file, or standard output is used if there are no other parameters.
+.TP
+.BI "\-cs " "coordinate-system"
+Specify the coordinate system of the input bam file.  By default, this is taken from the Config.prc file, which is currently zup_right.
+.TP
+.B \-h
+Display this help page.
diff --git a/doc/man/dae2egg.1 b/doc/man/dae2egg.1
new file mode 100644
index 0000000000..dbcd6bf4d0
--- /dev/null
+++ b/doc/man/dae2egg.1
@@ -0,0 +1,75 @@
+.\" Automatically generated by dae2egg -write-bam
+.TH DAE2EGG 1 "27 December 2014" "1.9.0" Panda3D
+.SH NAME
+dae2egg \- convert COLLADA assets into .egg files
+.SH SYNOPSIS
+\fBdae2egg\fR [opts] input.dae output.egg
+.br
+\fBdae2egg\fR [opts] -o output.egg input.dae
+.br
+\fBdae2egg\fR [opts] input.dae >output.egg
+.SH DESCRIPTION
+This program converts .dae files (COLLADA Digital Asset Exchange) to .egg.
+.SH OPTIONS
+.TP
+.B \-noabs
+Don't allow the input COLLADA file to have absolute pathnames.  If it does, abort with an error.  This option is designed to help detect errors when populating or building a standalone model tree, which should be self-contained and include only relative pathnames.
+.TP
+.B \-noexist
+Don't treat it as an error if the input file references pathnames (e.g. textures) that don't exist.  Normally, this will be flagged as an error and the command aborted; with this option, an egg file will be generated anyway, referencing pathnames that do not exist.
+.TP
+.B \-ignore
+Ignore non-fatal errors and generate an egg file anyway.
+.TP
+.B \-invtrans
+Import the .dae file using inverted transparency. This is useful when importing COLLADA files from some authoring tools that export models with inverted transparency, such as Google SketchUp.
+.TP
+.BI "\-ui " "units"
+Specify the units of the input COLLADA file.  Normally, this can be inferred from the file itself.
+.TP
+.BI "\-uo " "units"
+Specify the units of the resulting egg file.  If this is specified, the vertices in the egg file will be scaled as necessary to make the appropriate units conversion; otherwise, the vertices will be left as they are.
+.TP
+.B \-no
+Strip all normals.
+.TP
+.B \-np
+Strip existing normals and redefine polygon normals.
+.TP
+.BI "\-nv " "threshold"
+Strip existing normals and redefine vertex normals.  Consider an edge between adjacent polygons to be smooth if the angle between them is less than threshold degrees.
+.TP
+.B \-nn
+Preserve normals exactly as they are.  This is the default.
+.TP
+.BI "\-tbn " "name"
+Compute tangent and binormal for the named texture coordinate set(s).  The name may include wildcard characters such as * and ?.  The normal must already exist or have been computed via one of the above options.  The tangent and binormal are used to implement bump mapping and related texture-based lighting effects.  This option may be repeated as necessary to name multiple texture coordinate sets.
+.TP
+.B \-tbnall
+Compute tangent and binormal for all texture coordinate sets.  This is equivalent to -tbn "*".
+.TP
+.B \-tbnauto
+Compute tangent and binormal for all normal maps. 
+.TP
+.BI "\-TS " "sx[,sy,sz]"
+Scale the model uniformly by the given factor (if only one number is given) or in each axis by sx, sy, sz (if three numbers are given).
+.TP
+.BI "\-TR " "x,y,z"
+Rotate the model x degrees about the x axis, then y degrees about the y axis, and then z degrees about the z axis.
+.TP
+.BI "\-TA " "angle,x,y,z"
+Rotate the model angle degrees counterclockwise about the given axis.
+.TP
+.BI "\-TT " "x,y,z"
+Translate the model by the indicated amount.
+
+All transformation options (-TS, -TR, -TA, -TT) are cumulative and are applied in the order they are encountered on the command line.
+.TP
+.BI "\-o " "filename"
+Specify the filename to which the resulting egg file will be written.  If this option is omitted, the last parameter name is taken to be the name of the output file, or standard output is used if there are no other parameters.
+.TP
+.BI "\-cs " "coordinate-system"
+Specify the coordinate system of the input COLLADA file.  Normally, this can inferred from the file itself.
+.TP
+.B \-h
+Display this help page.
diff --git a/doc/man/dxf-points.1 b/doc/man/dxf-points.1
new file mode 100644
index 0000000000..7c7489800c
--- /dev/null
+++ b/doc/man/dxf-points.1
@@ -0,0 +1,16 @@
+.\" Automatically generated by dxf-points -write-bam
+.TH DXF-POINTS 1 "27 December 2014" "1.9.0" Panda3D
+.SH NAME
+dxf-points \- extract points from AutoCAD .dxf files
+.SH SYNOPSIS
+\fBdxf-points\fR [opts] input.dxf > output.txt
+.br
+\fBdxf-points\fR [opts] -o output.txt input.dxf
+.br
+\fBdxf-points\fR [opts] input.dxf output.txt
+.SH DESCRIPTION
+This program reads an AutoCAD .dxf file and generates a simple list of all the points contained within it, one per line, to a text file, or to standard output.
+.SH OPTIONS
+.TP
+.B \-h
+Display this help page.
diff --git a/doc/man/dxf2egg.1 b/doc/man/dxf2egg.1
new file mode 100644
index 0000000000..6e00fa86d7
--- /dev/null
+++ b/doc/man/dxf2egg.1
@@ -0,0 +1,72 @@
+.\" Automatically generated by dxf2egg -write-bam
+.TH DXF2EGG 1 "27 December 2014" "1.9.0" Panda3D
+.SH NAME
+dxf2egg \- convert AutoCAD .dxf files to .egg files
+.SH SYNOPSIS
+\fBdxf2egg\fR [opts] input.dxf output.egg
+.br
+\fBdxf2egg\fR [opts] -o output.egg input.dxf
+.br
+\fBdxf2egg\fR [opts] input.dxf >output.egg
+.SH DESCRIPTION
+This program converts DXF (AutoCAD interchange format) to egg.  It only converts polygon data, with no fancy tricks.  DXF does not support hierarchical databases, so dxf2egg creates a single group at the root level for each layer in the DXF file.
+.SH OPTIONS
+.TP
+.B \-noabs
+Don't allow the input DXF file to have absolute pathnames.  If it does, abort with an error.  This option is designed to help detect errors when populating or building a standalone model tree, which should be self-contained and include only relative pathnames.
+.TP
+.B \-noexist
+Don't treat it as an error if the input file references pathnames (e.g. textures) that don't exist.  Normally, this will be flagged as an error and the command aborted; with this option, an egg file will be generated anyway, referencing pathnames that do not exist.
+.TP
+.B \-ignore
+Ignore non-fatal errors and generate an egg file anyway.
+.TP
+.BI "\-ui " "units"
+Specify the units of the input DXF file.  Normally, this can be inferred from the file itself.
+.TP
+.BI "\-uo " "units"
+Specify the units of the resulting egg file.  If this is specified, the vertices in the egg file will be scaled as necessary to make the appropriate units conversion; otherwise, the vertices will be left as they are.
+.TP
+.B \-no
+Strip all normals.
+.TP
+.B \-np
+Strip existing normals and redefine polygon normals.
+.TP
+.BI "\-nv " "threshold"
+Strip existing normals and redefine vertex normals.  Consider an edge between adjacent polygons to be smooth if the angle between them is less than threshold degrees.
+.TP
+.B \-nn
+Preserve normals exactly as they are.  This is the default.
+.TP
+.BI "\-tbn " "name"
+Compute tangent and binormal for the named texture coordinate set(s).  The name may include wildcard characters such as * and ?.  The normal must already exist or have been computed via one of the above options.  The tangent and binormal are used to implement bump mapping and related texture-based lighting effects.  This option may be repeated as necessary to name multiple texture coordinate sets.
+.TP
+.B \-tbnall
+Compute tangent and binormal for all texture coordinate sets.  This is equivalent to -tbn "*".
+.TP
+.B \-tbnauto
+Compute tangent and binormal for all normal maps. 
+.TP
+.BI "\-TS " "sx[,sy,sz]"
+Scale the model uniformly by the given factor (if only one number is given) or in each axis by sx, sy, sz (if three numbers are given).
+.TP
+.BI "\-TR " "x,y,z"
+Rotate the model x degrees about the x axis, then y degrees about the y axis, and then z degrees about the z axis.
+.TP
+.BI "\-TA " "angle,x,y,z"
+Rotate the model angle degrees counterclockwise about the given axis.
+.TP
+.BI "\-TT " "x,y,z"
+Translate the model by the indicated amount.
+
+All transformation options (-TS, -TR, -TA, -TT) are cumulative and are applied in the order they are encountered on the command line.
+.TP
+.BI "\-o " "filename"
+Specify the filename to which the resulting egg file will be written.  If this option is omitted, the last parameter name is taken to be the name of the output file, or standard output is used if there are no other parameters.
+.TP
+.BI "\-cs " "coordinate-system"
+Specify the coordinate system of the input DXF file.  Normally, this is z-up.
+.TP
+.B \-h
+Display this help page.
diff --git a/doc/man/egg-crop.1 b/doc/man/egg-crop.1
new file mode 100644
index 0000000000..d7cd3f4d50
--- /dev/null
+++ b/doc/man/egg-crop.1
@@ -0,0 +1,32 @@
+.\" Automatically generated by egg-crop -write-bam
+.TH EGG-CROP 1 "27 December 2014" "1.9.0" Panda3D
+.SH NAME
+egg-crop \- crop geometry in an .egg file
+.SH SYNOPSIS
+\fBegg-crop\fR [opts] -o output.egg input.egg
+.br
+\fBegg-crop\fR [opts] input.egg >output.egg
+.SH DESCRIPTION
+egg\-crop strips out all parts of an egg file that fall outside of an arbitrary bounding volume, specified with a minimum and maximum point in world coordinates.
+.SH OPTIONS
+.TP
+.B \-noabs
+Don't allow the input egg file to have absolute pathnames.  If it does, abort with an error.  This option is designed to help detect errors when populating or building a standalone model tree, which should be self-contained and include only relative pathnames.
+.TP
+.BI "\-min " "x,y,z"
+Specify the minimum point.
+.TP
+.BI "\-max " "x,y,z"
+Specify the maximum point.
+.TP
+.BI "\-o " "filename"
+Specify the filename to which the resulting egg file will be written.  If this option is omitted, the egg file is written to standard output.
+.TP
+.BI "\-cs " "coordinate-system"
+Specify the coordinate system of the resulting egg file.  This may be one of 'y-up', 'z-up', 'y-up-left', or 'z-up-left'.  The default is the same coordinate system as the input egg file.  If this is different from the input egg file, a conversion will be performed.
+.TP
+.B \-f
+Force complete loading: load up the egg file along with all of its external references.
+.TP
+.B \-h
+Display this help page.
diff --git a/doc/man/egg-list-textures.1 b/doc/man/egg-list-textures.1
new file mode 100644
index 0000000000..0c8859b12b
--- /dev/null
+++ b/doc/man/egg-list-textures.1
@@ -0,0 +1,21 @@
+.\" Automatically generated by egg-list-textures -write-bam
+.TH EGG-LIST-TEXTURES 1 "27 December 2014" "1.9.0" Panda3D
+.SH NAME
+egg-list-textures \- list textures referenced by an .egg file
+.SH SYNOPSIS
+\fBegg-list-textures\fR [opts] input.egg
+.SH DESCRIPTION
+egg\-list\-textures reads an egg file and writes a list of the textures it references.  It is particularly useful for building up the textures.txa file used for egg\-palettize, since the output format is crafted to be compatible with that file's input format.
+.SH OPTIONS
+.TP
+.B \-noabs
+Don't allow the input egg file to have absolute pathnames.  If it does, abort with an error.  This option is designed to help detect errors when populating or building a standalone model tree, which should be self-contained and include only relative pathnames.
+.TP
+.BI "\-cs " "coordinate-system"
+Specify the coordinate system to operate in.  This may be  one of 'y-up', 'z-up', 'y-up-left', or 'z-up-left'.  The default is the coordinate system of the input egg file.
+.TP
+.B \-f
+Force complete loading: load up the egg file along with all of its external references.
+.TP
+.B \-h
+Display this help page.
diff --git a/doc/man/egg-make-tube.1 b/doc/man/egg-make-tube.1
new file mode 100644
index 0000000000..2f7bc4cdd2
--- /dev/null
+++ b/doc/man/egg-make-tube.1
@@ -0,0 +1,77 @@
+.\" Automatically generated by egg-make-tube -write-bam
+.TH EGG-MAKE-TUBE 1 "27 December 2014" "1.9.0" Panda3D
+.SH NAME
+egg-make-tube \- generate a tube or sphere from geometry in an .egg file
+.SH SYNOPSIS
+\fBegg-make-tube\fR [opts] output.egg
+.br
+\fBegg-make-tube\fR [opts] -o output.egg
+.br
+\fBegg-make-tube\fR [opts] >output.egg
+.SH DESCRIPTION
+egg\-make\-tube generates an egg file representing a "tube" model, a cylinder capped on both ends by hemispheres.  This is similar in shape to the CollisionTube object within Panda.
+.PP
+This program can also generate spheres if you omit \-b; in this case, you are generating a degenerate tube of length 0.
+.SH OPTIONS
+.TP
+.BI "\-a " "x,y,z"
+Specify the first endpoint of the tube.
+.TP
+.BI "\-b " "x,y,z"
+Specify the second endpoint of the tube.
+.TP
+.BI "\-r " "radius"
+Specify the radius of the tube.  The tube will extend beyond the endpoints in each direction by the amount of radius.
+.TP
+.BI "\-slices " "count"
+Specify the number of slices appearing radially around the tube.
+.TP
+.BI "\-crings " "count"
+Specify the number of rings appearing in each endcap of the tube.
+.TP
+.BI "\-trings " "count"
+Specify the number of rings appearing in the cylindrical body of the tube.
+.TP
+.B \-no
+Strip all normals.
+.TP
+.B \-np
+Strip existing normals and redefine polygon normals.
+.TP
+.BI "\-nv " "threshold"
+Strip existing normals and redefine vertex normals.  Consider an edge between adjacent polygons to be smooth if the angle between them is less than threshold degrees.
+.TP
+.B \-nn
+Preserve normals exactly as they are.  This is the default.
+.TP
+.BI "\-tbn " "name"
+Compute tangent and binormal for the named texture coordinate set(s).  The name may include wildcard characters such as * and ?.  The normal must already exist or have been computed via one of the above options.  The tangent and binormal are used to implement bump mapping and related texture-based lighting effects.  This option may be repeated as necessary to name multiple texture coordinate sets.
+.TP
+.B \-tbnall
+Compute tangent and binormal for all texture coordinate sets.  This is equivalent to -tbn "*".
+.TP
+.B \-tbnauto
+Compute tangent and binormal for all normal maps. 
+.TP
+.BI "\-TS " "sx[,sy,sz]"
+Scale the model uniformly by the given factor (if only one number is given) or in each axis by sx, sy, sz (if three numbers are given).
+.TP
+.BI "\-TR " "x,y,z"
+Rotate the model x degrees about the x axis, then y degrees about the y axis, and then z degrees about the z axis.
+.TP
+.BI "\-TA " "angle,x,y,z"
+Rotate the model angle degrees counterclockwise about the given axis.
+.TP
+.BI "\-TT " "x,y,z"
+Translate the model by the indicated amount.
+
+All transformation options (-TS, -TR, -TA, -TT) are cumulative and are applied in the order they are encountered on the command line.
+.TP
+.BI "\-o " "filename"
+Specify the filename to which the resulting egg file will be written.  If this option is omitted, the last parameter name is taken to be the name of the output file, or standard output is used if there are no other parameters.
+.TP
+.BI "\-cs " "coordinate-system"
+Specify the coordinate system of the resulting egg file.  This may be one of 'y-up', 'z-up', 'y-up-left', or 'z-up-left'.  The default is y-up.
+.TP
+.B \-h
+Display this help page.
diff --git a/doc/man/egg-mkfont.1 b/doc/man/egg-mkfont.1
new file mode 100644
index 0000000000..5e3a755e23
--- /dev/null
+++ b/doc/man/egg-mkfont.1
@@ -0,0 +1,76 @@
+.\" Automatically generated by egg-mkfont -write-bam
+.TH EGG-MKFONT 1 "27 December 2014" "1.9.0" Panda3D
+.SH NAME
+egg-mkfont \- generates .egg files with rasterized font glyphs
+.SH SYNOPSIS
+\fBegg-mkfont\fR [opts] -o output.egg font
+.br
+\fBegg-mkfont\fR [opts] font output.egg
+.SH DESCRIPTION
+egg\-mkfont uses the FreeType library to generate an egg file and a series of texture images from a font file input, such as a TTF file.  The resulting egg file can be loaded in Panda as a font for rendering text, even if FreeType is not compiled into the executing Panda.
+.PP
+egg\-mkfont will normally run the generated egg file through egg\-palettize automatically as part of the generation process.  This collects the individual glyph textures into a small number of texture maps.  If you intend to run the font through egg\-palettize yourself later, you may choose to omit this step.
+.SH OPTIONS
+.TP
+.BI "\-fg " "r,g,b[,a]"
+Specifies the foreground color of the generated texture map.  The default is white: 1,1,1,1, which leads to the most flexibility as the color can be modulated at runtime to any suitable color.
+.TP
+.BI "\-bg " "r,g,b[,a]"
+Specifies the background color of the generated texture map.  The default is transparent: 1,1,1,0, which allows the text to be visible against any color background by placing a polygon of a suitable color behind it.  If the alpha component of either -fg or -bg is not 1, the generated texture images will include an alpha component; if both colors specify an alpha component of 1 (or do not specify an alpha compenent), then the generated images will not include an alpha component.
+.TP
+.BI "\-interior " "r,g,b[,a]"
+Specifies the color to render the interior part of a hollow font.  This is a special effect that involves analysis of the bitmap after the font has been rendered, and so is more effective when the pixel size is large.  It also implies -noaa (but you can use a scale factor with -sf to achieve antialiasing).
+.TP
+.BI "\-chars " "range"
+Specifies the characters of the font that are used.  The range specification may include combinations of decimal or hex unicode values (where hex values are identified with a leading 0x), separated by commas and hyphens to indicate ranges, e.g. '32-126,0xfa0-0xfff'.  It also may specify ranges of ASCII characters by enclosing them within square brackets, e.g. '[A-Za-z0-9]'.  If this is not specified, the default is the set of ASCII characters.
+.TP
+.BI "\-extra " "file.egg"
+Specifies additional externally-painted glyphs to mix into the generated egg file.  The named egg file is expected to contain one or more groups, each of which is named with the decimal unicode number of a character and should contain one polygon.  These groups are simply copied into the output egg file as if they were generated locally.  This option may be repeated.
+.TP
+.BI "\-ppu " "pixels"
+Specify the pixels per unit.  This is the number of pixels in the generated texture map that are used for each onscreen unit (or each 10 points of font; see -ps).  Setting this number larger results in an easier-to-read font, but at the cost of more texture memory.  The default is 30.
+.TP
+.BI "\-ps " "size"
+Specify the point size of the resulting font.  This controls the apparent size of the font when it is rendered onscreen.  By convention, a 10 point font is 1 screen unit high, so the default is 10.
+.TP
+.BI "\-pm " "n"
+The number of extra pixels around a single character in the generated polygon.  This may be a floating-point number.  The default is 1.
+.TP
+.BI "\-tm " "n"
+The number of extra pixels around each character in the texture map.  This may only be an integer.  The default is 2.  This is meaningful when -nopal is also used; in the normal case, use -pm to control both the polygon size and the texture map spacing.
+.TP
+.BI "\-rm " "n"
+The amount of padding in screen units to place around the glyph when rendered.  This differs from -pm in that it has no effect on the generated texture map, only on the generated egg.  Use this in order to space the characters out in case they appear to be too close together when rendered. The default is 0.
+.TP
+.BI "\-sf " "factor"
+The scale factor of the generated image.  This is the factor by which the font image is generated oversized, then reduced to its final size, to improve antialiasing.  If the specified font contains one or more fixed-size fonts instead of a scalable font, the scale factor may be automatically adjusted as necessary to scale the closest-matching font to the desired pixel size.  The default is 2.
+.TP
+.B \-noaa
+Disable low-level antialiasing by the Freetype library.  This is unrelated to the antialiasing that is applied due to the scale factor specified by -sf; you may have either one, neither, or both kinds of antialiasing enabled.
+.TP
+.B \-nopal
+Don't run egg-palettize automatically on the output file, but just output the raw egg file and all of its individual texture images, one for each glyph.
+.TP
+.B \-nr
+Don't actually reduce the images after applying the scale factor, but leave them at their inflated sizes.  Presumably you will reduce them later, for instance with egg-palettize.
+.TP
+.BI "\-gp " "pattern"
+The pattern to be used to generate the glyph texture images.  This string will be passed to sprintf to generate the actual file name; it should contain the string %d or %x (or some variant such as %03d) which will be filled in with the Unicode number of each symbol.  If it is omitted, the default is based on the name of the egg file.  This is used only if -nopal is specified; in the normal case, without -nopal, use -pp instead.
+.TP
+.BI "\-pp " "pattern"
+The pattern to be used to generate the palette texture images.  This string is effectively passed to egg-palettize as the -tn option, and thus should contain %i for the palette index number.  This is used if -nopal is not specified.
+.TP
+.BI "\-palsize " "xsize,ysize"
+Specify the size of the palette texture images.  This is used if -nopal is not specified.
+.TP
+.BI "\-face " "index"
+Specify the face index of the particular face within the font file to use.  Some font files contain multiple faces, indexed beginning at 0.  The default is face 0.
+.TP
+.BI "\-o " "filename"
+Specify the filename to which the resulting egg file will be written.  If this option is omitted, the last parameter name is taken to be the name of the output file.
+.TP
+.BI "\-cs " "coordinate-system"
+Specify the coordinate system of the resulting egg file.  This may be one of 'y-up', 'z-up', 'y-up-left', or 'z-up-left'.  The default is y-up.
+.TP
+.B \-h
+Display this help page.
diff --git a/doc/man/egg-optchar.1 b/doc/man/egg-optchar.1
new file mode 100644
index 0000000000..7b6e949fa7
--- /dev/null
+++ b/doc/man/egg-optchar.1
@@ -0,0 +1,150 @@
+.\" Automatically generated by egg-optchar -write-bam
+.TH EGG-OPTCHAR 1 "27 December 2014" "1.9.0" Panda3D
+.SH NAME
+egg-optchar \- optimizes character models and animations in .egg files
+.SH SYNOPSIS
+\fBegg-optchar\fR -o output.egg [opts] input.egg
+.br
+\fBegg-optchar\fR -d dirname [opts] file.egg [file.egg ...]
+.br
+\fBegg-optchar\fR -inplace [opts] file.egg [file.egg ...]
+.br
+\fBegg-optchar\fR -inf input_list_filename [opts]
+.SH DESCRIPTION
+egg\-optchar performs basic optimizations of a character model and its associated animations, primarily by analyzing the animation tables and removing unneeded joints and/or morphs.  It can also perform basic restructuring operations on the character hierarchy.
+.SH OPTIONS
+.TP
+.B \-noabs
+Don't allow any of the named egg files to have absolute pathnames.  If any do, abort with an error.  This option is designed to help detect errors when populating or building a standalone model tree, which should be self-contained and include only relative pathnames.
+.TP
+.B \-ls
+List the joint hierarchy instead of performing any operations.
+.TP
+.B \-lsv
+List the joint hierarchy along with an indication of the properties each joint.
+.TP
+.B \-lsp
+List the existing joint hierarchy as a series of -p joint,parent commands, suitable for pasting into an egg-optchar command line.
+.TP
+.BI "\-keep " "joint[,joint...]"
+Keep the named joints (or sliders) in the character, even if they do not appear to be needed by the animation.
+.TP
+.BI "\-drop " "joint[,joint...]"
+Removes the named joints or sliders, even if they appear to be needed.
+.TP
+.BI "\-expose " "joint[,joint...]"
+Expose the named joints by flagging them with a DCS attribute, so each one can be found in the scene graph when the character is loaded, and objects can be parented to it.  This implies -keep.
+.TP
+.BI "\-suppress " "joint[,joint...]"
+The opposite of suppress, this prevents the named joints from being created with an implicit DCS attribute, even if they contain rigid geometry.  The default is to create an implicit node for any joint that contains rigid geometry, to take advantage of display list and/or vertex buffer caching.  This does not imply -keep.
+.TP
+.BI "\-flag " "node[,node...][=name]"
+Assign the indicated name to the geometry within the given nodes.  This will make the geometry visible as a node in the resulting character model when it is loaded in the scene graph (normally, the node hierarchy is suppressed when loading characters).  This is different from -expose in that it reveals geometry rather than joints; the revealed node can be hidden or its attributes changed at runtime, but it will be animated by its vertices, not the node, so objects parented to this node will not inherit its animation.
+.TP
+.BI "\-defpose " "anim.egg,frame"
+Specify the model's default pose.  The pose is taken from the indicated frame of the named animation file (which must also be named separately on the command line).  The pose will be held by the model in the absence of any animation, and need not be the same pose in which the model was originally skinned.
+.TP
+.B \-preload
+Add an <AnimPreload> entry for each animation to the model file(s).  This can be used at runtime to support asynchronous loading and binding of animation channels.
+.TP
+.BI "\-zero " "joint[,hprxyzijkabc]"
+Zeroes out the animation channels for the named joint.  If a subset of the component letters hprxyzijkabc is included, the operation is restricted to just those components; otherwise the entire transform is cleared.
+.TP
+.B \-keepall
+Keep all joints and sliders in the character, except those named explicitly by -drop.
+.TP
+.BI "\-p " "joint,parent"
+Moves the named joint under the named parent joint.  Use "-p joint," to reparent a joint to the root.  The joint transform is recomputed appropriately under its new parent so that the animation is not affected (the effect is similar to NodePath::wrt_reparent_to).
+.TP
+.BI "\-new " "joint,source"
+Creates a new joint under the named parent joint.  The new joint will inherit the same net transform as its parent.
+.TP
+.BI "\-rename " "joint,newjoint"
+Renames the indicated joint, if present, to the given name.
+.TP
+.BI "\-q " "quantum"
+Quantize joint membership values to the given unit.  This is the smallest significant change in joint membership.  There can be a significant performance (and memory utilization) runtime benefit for eliminating small differences in joint memberships between neighboring vertices.  The default is 0.01; specifying 0 means to preserve the original values.
+.TP
+.BI "\-qa " "quantum[,hprxyzijkabc]"
+Quantizes animation channels to the given unit.  This rounds each of the named components of all joints to the nearest multiple of unit.  There is no performance benefit, and little compression benefit, for doing this; and this may introduce visible artifacts to the animation.  However, sometimes it is a useful tool for animation analysis and comparison.  This option may be repeated several times to quantize different channels by a different amount.
+.TP
+.BI "\-dart " "[default, sync, nosync, or structured]"
+change the dart value in the given eggs
+.TP
+.B \-fixrest
+Specify this to force all the initial rest frames of the various model files to the same value as the first model specified.  This is a fairly drastic way to repair models whose initial rest frame values are completely bogus, but should not be performed when the input models are correct.
+.TP
+.BI "\-pr " "path_replace"
+Sometimes references to other files (textures, external references) are stored with a full path that is appropriate for some other system, but does not exist here.  This option may be used to specify how those invalid paths map to correct paths.  Generally, this is of the form 'orig_prefix=replacement_prefix', which indicates a particular initial sequence of characters that should be replaced with a new sequence; e.g. '/c/home/models=/beta/fish'.  If the replacement prefix does not begin with a slash, the file will then be searched for along the search path specified by -pp.  You may use standard filename matching characters ('*', '?', etc.) in the original prefix, and '**' as a component by itself stands for any number of components.
+
+This option may be repeated as necessary; each file will be tried against each specified method, in the order in which they appear in the command line, until the file is found.  If the file is not found, the last matching prefix is used anyway.
+.TP
+.BI "\-pp " "dirname"
+Adds the indicated directory name to the list of directories to search for filenames referenced by the source file.  This is used only for relative paths, or for paths that are made relative by a -pr replacement string that doesn't begin with a leading slash.  The model-path is always implicitly searched anyway.
+.TP
+.BI "\-ps " "path_store"
+Specifies the way an externally referenced file is to be represented in the resulting output file.  This assumes the named filename actually exists; see -pr to indicate how to deal with external references that have bad pathnames.  This option will not help you to find a missing file, but simply controls how filenames are represented in the output.
+
+The option may be one of: rel, abs, rel_abs, strip, or keep.  If either rel or rel_abs is specified, the files are made relative to the directory specified by -pd.  The default is rel.
+.TP
+.BI "\-pd " "path_directory"
+Specifies the name of a directory to make paths relative to, if '-ps rel' or '-ps rel_abs' is specified.  If this is omitted, the directory name is taken from the name of the output file.
+.TP
+.BI "\-pc " "target_directory"
+Copies textures and other dependent files into the indicated directory.  If a relative pathname is specified, it is relative to the directory specified with -pd, above.
+.TP
+.B \-no
+Strip all normals.
+.TP
+.B \-np
+Strip existing normals and redefine polygon normals.
+.TP
+.BI "\-nv " "threshold"
+Strip existing normals and redefine vertex normals.  Consider an edge between adjacent polygons to be smooth if the angle between them is less than threshold degrees.
+.TP
+.B \-nn
+Preserve normals exactly as they are.  This is the default.
+.TP
+.BI "\-tbn " "name"
+Compute tangent and binormal for the named texture coordinate set(s).  The name may include wildcard characters such as * and ?.  The normal must already exist or have been computed via one of the above options.  The tangent and binormal are used to implement bump mapping and related texture-based lighting effects.  This option may be repeated as necessary to name multiple texture coordinate sets.
+.TP
+.B \-tbnall
+Compute tangent and binormal for all texture coordinate sets.  This is equivalent to -tbn "*".
+.TP
+.B \-tbnauto
+Compute tangent and binormal for all normal maps. 
+.TP
+.BI "\-TS " "sx[,sy,sz]"
+Scale the model uniformly by the given factor (if only one number is given) or in each axis by sx, sy, sz (if three numbers are given).
+.TP
+.BI "\-TR " "x,y,z"
+Rotate the model x degrees about the x axis, then y degrees about the y axis, and then z degrees about the z axis.
+.TP
+.BI "\-TA " "angle,x,y,z"
+Rotate the model angle degrees counterclockwise about the given axis.
+.TP
+.BI "\-TT " "x,y,z"
+Translate the model by the indicated amount.
+
+All transformation options (-TS, -TR, -TA, -TT) are cumulative and are applied in the order they are encountered on the command line.
+.TP
+.BI "\-o " "filename"
+Specify the filename to which the resulting egg file will be written.  This is only valid when there is only one input egg file on the command line.  If you want to process multiple files simultaneously, you must use either -d or -inplace.
+.TP
+.BI "\-d " "dirname"
+Specify the name of the directory in which to write the resulting egg files.  If you are processing only one egg file, this may be omitted in lieu of the -o option.  If you are processing multiple egg files, this may be omitted only if you specify -inplace instead.
+.TP
+.B \-inplace
+If this option is given, the input egg files will be rewritten in place with the results.  This obviates the need to specify -d for an output directory; however, it's risky because the original input egg files are lost.
+.TP
+.BI "\-cs " "coordinate-system"
+Specify the coordinate system to operate in.  This may be one of 'y-up', 'z-up', 'y-up-left', or 'z-up-left'.
+.TP
+.B \-f
+Force complete loading: load up the egg file along with all of its external references.
+.TP
+.BI "\-inf " "filename"
+Reads input args from a text file instead of the command line.  Useful for really, really large lists of args that break the OS-imposed limits on the length of command lines.
+.TP
+.B \-h
+Display this help page.
diff --git a/doc/man/egg-palettize.1 b/doc/man/egg-palettize.1
new file mode 100644
index 0000000000..1309a4556e
--- /dev/null
+++ b/doc/man/egg-palettize.1
@@ -0,0 +1,91 @@
+.\" Automatically generated by egg-palettize -write-bam
+.TH EGG-PALETTIZE 1 "27 December 2014" "1.9.0" Panda3D
+.SH NAME
+egg-palettize \- pack textures from various .egg models into palette images
+.SH SYNOPSIS
+\fBegg-palettize\fR [opts] file.egg [file.egg ...]
+.SH DESCRIPTION
+egg\-palettize attempts to pack several texture maps from various models together into one or more palette images, for improved rendering performance and ease of texture management.  It can also resize textures and convert them to another image file format, whether or not they are actually placed on a palette, and can manage some simple texture properties, like mipmapping and rendering format.
+.PP
+egg\-palettize reads a texture attributes file, usually named textures.txa, which contains instructions from the user about resizing particular textures.  Type egg\-palettize \-H for an introduction to the syntax of this file.
+.PP
+The palettization information from previous runs is recorded in a file named textures.boo (assuming the attributes file is named textures.txa); a complete record of every egg file and every texture that has been referenced is kept here.  This allows the program to intelligently manage the multiple egg files that may reference the textures in question.
+.SH OPTIONS
+.TP
+.B \-noabs
+Don't allow any of the named egg files to have absolute pathnames.  If any do, abort with an error.  This option is designed to help detect errors when populating or building a standalone model tree, which should be self-contained and include only relative pathnames.
+.TP
+.BI "\-af " "filename"
+Read the indicated file as the .txa file.  The default is textures.txa.
+.TP
+.BI "\-a " "filename"
+Deprecated option.  This is the same as -af.
+.TP
+.BI "\-as " "script"
+Accept the script specified on the command line as the contents of the .txa file, instead of reading a file on disk.  This implies -nodb and -opt.
+.TP
+.B \-nodb
+Don't read or record the state information to a .boo file.  By default, the palettization information is recorded so it can be preserved between multiple invocations of egg-palettize.  If you specify this parameter, all the egg files to be palettized together must be named at the same time.  This also implies -opt, since there's no point in not making an optimal packing if you won't be preserving the state for future adjustments.
+.TP
+.BI "\-tn " "pattern"
+Specify the name to generate for each palette image.  The string should contain %g for the group name, %p for the page name, and %i for the index within the page.  The extension is inferred from the image type.  The default is '%g_palette_%p_%i'.
+.TP
+.B \-pi
+Do not process anything, but instead report the detailed palettization information written in the state file.
+.TP
+.B \-s
+Do not process anything, but report statistics on palette and texture utilization from the state file.
+.TP
+.B \-R
+Remove the named egg files from the previously-generated state data file.
+.TP
+.BI "\-d " "dirname"
+The directory in which to write the palettized egg files.  This is only necessary if more than one egg file is processed at the same time; if it is included, each egg file will be processed and written into the indicated directory.
+.TP
+.BI "\-dm " "dirname"
+The directory in which to place all maps: generated palettes, as well as images which were not placed on palettes (but may have been resized).  If this contains the string %g, this will be replaced with the 'dir' string associated with a palette group; see egg-palettize -H.
+.TP
+.BI "\-ds " "dirname"
+The directory to write palette shadow images to.  These are working copies of the palette images, useful when the palette image type is a lossy-compression type like JPEG; you can avoid generational loss of quality on the palette images with each pass through the palettes by storing these extra shadow images in a lossless image type.  This directory is only used if the :shadowtype keyword appears in the .txa file.
+.TP
+.BI "\-dr " "dirname"
+The directory to make map filenames relative to when writing egg files.  If specified, this should be an initial substring of -dm.
+.TP
+.BI "\-g " "group"
+The default palette group that egg files will be assigned to if they are not explicitly assigned to any other group.
+.TP
+.BI "\-gdir " "name"
+The "dir" string to associate with the default palette group specified with -g, if no other dir name is given in the .txa file.
+.TP
+.B \-all
+Consider all the textures referenced in all egg files that have ever been palettized, not just the egg files that appear on the command line.
+.TP
+.B \-egg
+Regenerate all egg files that need modification, even those that aren't named on the command line.
+.TP
+.B \-redo
+Force a regeneration of each image from its original source(s).  When used in conjunction with -egg, this also forces each egg file to be regenerated.
+.TP
+.B \-opt
+Force an optimal packing.  By default, textures are added to existing palettes without disturbing them, which can lead to suboptimal packing.  Including this switch forces the palettes to be rebuilt if necessary to optimize the packing, but this may invalidate other egg files which share this palette.
+.TP
+.B \-omitall
+Re-enables the flag to omit all textures.  This flag is normally on by default, causing nothing actually to be palettized, until the first time egg-palettize is run with the -opt flag, which turns off the omitall flag and thenceforth allows textures to be combined into palettes.  Specifying this flag restores the original behavior of keeping every texture as a separate image (which is convenient for development).
+.TP
+.B \-H
+Describe the syntax of the attributes file.
+.TP
+.BI "\-o " "filename"
+Specify the filename to which the resulting egg file will be written.  This is only valid when there is only one input egg file on the command line.  If you want to process multiple files simultaneously, you must use either -d or -inplace.
+.TP
+.B \-inplace
+If this option is given, the input egg files will be rewritten in place with the results.  This obviates the need to specify -d for an output directory; however, it's risky because the original input egg files are lost.
+.TP
+.BI "\-cs " "coordinate-system"
+Specify the coordinate system to operate in.  This may be one of 'y-up', 'z-up', 'y-up-left', or 'z-up-left'.
+.TP
+.BI "\-inf " "filename"
+Reads input args from a text file instead of the command line.  Useful for really, really large lists of args that break the OS-imposed limits on the length of command lines.
+.TP
+.B \-h
+Display this help page.
diff --git a/doc/man/egg-qtess.1 b/doc/man/egg-qtess.1
new file mode 100644
index 0000000000..cb2416954d
--- /dev/null
+++ b/doc/man/egg-qtess.1
@@ -0,0 +1,76 @@
+.\" Automatically generated by egg-qtess -write-bam
+.TH EGG-QTESS 1 "27 December 2014" "1.9.0" Panda3D
+.SH NAME
+egg-qtess \- tesselate NURBS surfaces in .egg files
+.SH SYNOPSIS
+\fBegg-qtess\fR [opts] -o output.egg input.egg
+.br
+\fBegg-qtess\fR [opts] input.egg >output.egg
+.SH DESCRIPTION
+egg\-qtess reads an egg file, tessellates all of its NURBS surfaces using a simple uniform tessellation, and outputs a polygonal egg file.
+.PP
+Characters are supported, soft\-skinned and otherwise; joint ownership is computed correctly for each new polygon vertex.  Primitives other than NURBS surfaces appearing in the egg file are unaffected.
+.SH OPTIONS
+.TP
+.B \-noabs
+Don't allow the input egg file to have absolute pathnames.  If it does, abort with an error.  This option is designed to help detect errors when populating or building a standalone model tree, which should be self-contained and include only relative pathnames.
+.TP
+.BI "\-f " "filename"
+Read the indicated parameter file.  Type egg-qtess -H to print a description of the parameter file format.
+.TP
+.BI "\-up " "subdiv"
+Specify a uniform subdivision per patch (isoparam).  Each NURBS surface is made up of N x M patches, each of which is divided into subdiv x subdiv quads.  A fractional number is allowed.
+.TP
+.BI "\-us " "subdiv"
+Specify a uniform subdivision per surface.  Each NURBS surface is subdivided into subdiv x subdiv quads, regardless of the number of isoparams it has.  A fractional number is meaningless.
+.TP
+.BI "\-t " "tris"
+Specify an approximate number of triangles to produce.  This is the total number of triangles for the entire egg file, including those surfaces that have already been given an explicit tessellation by a parameter file.
+.TP
+.B \-ap
+Attempt to automatically place tessellation lines where they'll do the most good on each surface (once the number of polygons for the surface has already been determined).
+.TP
+.B \-ad
+Attempt to automatically distribute polygons among the surfaces where they are most needed according to curvature and size, instead of according to the number of isoparams.  This only has meaning when used in conjunction with -t.
+.TP
+.BI "\-ar " "ratio"
+Specify the ratio of dominance of size to curvature for -ap and -ad.  A value of 0 forces placement by curvature only; a very large value (like 1000) forces placement by size only.  The default is 5.0.
+.TP
+.B \-e
+Respect subdivision parameters given in the egg file.  If this is specified, the egg file may define the effective number of patches of each NURBS entry.  This can be used alone or in conjunction with -u or -t to fine-tune the uniform tessellation on a per-surface basis.  (This is ignored if -ad is in effect.)
+.TP
+.B \-q
+Instead of writing an egg file, generate a parameter file for output.
+.TP
+.B \-H
+Describe the format of the parameter file specified with -f.
+.TP
+.B \-no
+Strip all normals.
+.TP
+.B \-np
+Strip existing normals and redefine polygon normals.
+.TP
+.BI "\-nv " "threshold"
+Strip existing normals and redefine vertex normals.  Consider an edge between adjacent polygons to be smooth if the angle between them is less than threshold degrees.
+.TP
+.B \-nn
+Preserve normals exactly as they are.  This is the default.
+.TP
+.BI "\-tbn " "name"
+Compute tangent and binormal for the named texture coordinate set(s).  The name may include wildcard characters such as * and ?.  The normal must already exist or have been computed via one of the above options.  The tangent and binormal are used to implement bump mapping and related texture-based lighting effects.  This option may be repeated as necessary to name multiple texture coordinate sets.
+.TP
+.B \-tbnall
+Compute tangent and binormal for all texture coordinate sets.  This is equivalent to -tbn "*".
+.TP
+.B \-tbnauto
+Compute tangent and binormal for all normal maps. 
+.TP
+.BI "\-o " "filename"
+Specify the filename to which the resulting egg file will be written.  If this option is omitted, the egg file is written to standard output.
+.TP
+.BI "\-cs " "coordinate-system"
+Specify the coordinate system of the resulting egg file.  This may be one of 'y-up', 'z-up', 'y-up-left', or 'z-up-left'.  The default is the same coordinate system as the input egg file.  If this is different from the input egg file, a conversion will be performed.
+.TP
+.B \-h
+Display this help page.
diff --git a/doc/man/egg-rename.1 b/doc/man/egg-rename.1
new file mode 100644
index 0000000000..4cf84e5345
--- /dev/null
+++ b/doc/man/egg-rename.1
@@ -0,0 +1,42 @@
+.\" Automatically generated by egg-rename -write-bam
+.TH EGG-RENAME 1 "27 December 2014" "1.9.0" Panda3D
+.SH NAME
+egg-rename \- rename nodes in .egg files
+.SH SYNOPSIS
+\fBegg-rename\fR -o output.egg [opts] input.egg
+.br
+\fBegg-rename\fR -d dirname [opts] file.egg [file.egg ...]
+.br
+\fBegg-rename\fR -inplace [opts] file.egg [file.egg ...]
+.br
+\fBegg-rename\fR -inf input_list_filename [opts]
+.SH DESCRIPTION
+egg\-rename reads one or more egg files and writes back with modifiednode names. ie. suppressing prefix from all the nodes' names. 
+.SH OPTIONS
+.TP
+.B \-noabs
+Don't allow any of the named egg files to have absolute pathnames.  If any do, abort with an error.  This option is designed to help detect errors when populating or building a standalone model tree, which should be self-contained and include only relative pathnames.
+.TP
+.BI "\-strip_prefix " "name"
+strips out the prefix that is put on all nodes, by maya ext. ref
+.TP
+.BI "\-o " "filename"
+Specify the filename to which the resulting egg file will be written.  This is only valid when there is only one input egg file on the command line.  If you want to process multiple files simultaneously, you must use either -d or -inplace.
+.TP
+.BI "\-d " "dirname"
+Specify the name of the directory in which to write the resulting egg files.  If you are processing only one egg file, this may be omitted in lieu of the -o option.  If you are processing multiple egg files, this may be omitted only if you specify -inplace instead.
+.TP
+.B \-inplace
+If this option is given, the input egg files will be rewritten in place with the results.  This obviates the need to specify -d for an output directory; however, it's risky because the original input egg files are lost.
+.TP
+.BI "\-cs " "coordinate-system"
+Specify the coordinate system to operate in.  This may be one of 'y-up', 'z-up', 'y-up-left', or 'z-up-left'.
+.TP
+.B \-f
+Force complete loading: load up the egg file along with all of its external references.
+.TP
+.BI "\-inf " "filename"
+Reads input args from a text file instead of the command line.  Useful for really, really large lists of args that break the OS-imposed limits on the length of command lines.
+.TP
+.B \-h
+Display this help page.
diff --git a/doc/man/egg-retarget-anim.1 b/doc/man/egg-retarget-anim.1
new file mode 100644
index 0000000000..8b4c044a2f
--- /dev/null
+++ b/doc/man/egg-retarget-anim.1
@@ -0,0 +1,66 @@
+.\" Automatically generated by egg-retarget-anim -write-bam
+.TH EGG-RETARGET-ANIM 1 "27 December 2014" "1.9.0" Panda3D
+.SH NAME
+egg-retarget-anim \- remove transformations from animation data in .egg files
+.SH SYNOPSIS
+\fBegg-retarget-anim\fR -o output.egg [opts] input.egg
+.br
+\fBegg-retarget-anim\fR -d dirname [opts] file.egg [file.egg ...]
+.br
+\fBegg-retarget-anim\fR -inplace [opts] file.egg [file.egg ...]
+.br
+\fBegg-retarget-anim\fR -inf input_list_filename [opts]
+.SH DESCRIPTION
+egg\-retarget\-anim reads a character model and its associated animation files, and removes the translations and scales from the animation files, replacing them with the translations and scales from the rest position of the character model.
+.PP
+This allows an animation that was generated for a model with one skeleton to be played successfully on a model with a different skeleton, provided that both skeletons have the same hierarchy and differ only in scales and/or translations of the various joints, and that scales and translations are not part of the per\-frame animations.
+.SH OPTIONS
+.TP
+.B \-noabs
+Don't allow any of the named egg files to have absolute pathnames.  If any do, abort with an error.  This option is designed to help detect errors when populating or building a standalone model tree, which should be self-contained and include only relative pathnames.
+.TP
+.BI "\-r " "file.egg"
+Read the reference model from the indicated egg file.  All of the animations will be retargeted to match the indicated file.
+.TP
+.BI "\-keep " "joint[,joint...]"
+Preserve the full animation on the named joint(s).  This is especially appropriate for the root joint.
+.TP
+.BI "\-pr " "path_replace"
+Sometimes references to other files (textures, external references) are stored with a full path that is appropriate for some other system, but does not exist here.  This option may be used to specify how those invalid paths map to correct paths.  Generally, this is of the form 'orig_prefix=replacement_prefix', which indicates a particular initial sequence of characters that should be replaced with a new sequence; e.g. '/c/home/models=/beta/fish'.  If the replacement prefix does not begin with a slash, the file will then be searched for along the search path specified by -pp.  You may use standard filename matching characters ('*', '?', etc.) in the original prefix, and '**' as a component by itself stands for any number of components.
+
+This option may be repeated as necessary; each file will be tried against each specified method, in the order in which they appear in the command line, until the file is found.  If the file is not found, the last matching prefix is used anyway.
+.TP
+.BI "\-pp " "dirname"
+Adds the indicated directory name to the list of directories to search for filenames referenced by the source file.  This is used only for relative paths, or for paths that are made relative by a -pr replacement string that doesn't begin with a leading slash.  The model-path is always implicitly searched anyway.
+.TP
+.BI "\-ps " "path_store"
+Specifies the way an externally referenced file is to be represented in the resulting output file.  This assumes the named filename actually exists; see -pr to indicate how to deal with external references that have bad pathnames.  This option will not help you to find a missing file, but simply controls how filenames are represented in the output.
+
+The option may be one of: rel, abs, rel_abs, strip, or keep.  If either rel or rel_abs is specified, the files are made relative to the directory specified by -pd.  The default is rel.
+.TP
+.BI "\-pd " "path_directory"
+Specifies the name of a directory to make paths relative to, if '-ps rel' or '-ps rel_abs' is specified.  If this is omitted, the directory name is taken from the name of the output file.
+.TP
+.BI "\-pc " "target_directory"
+Copies textures and other dependent files into the indicated directory.  If a relative pathname is specified, it is relative to the directory specified with -pd, above.
+.TP
+.BI "\-o " "filename"
+Specify the filename to which the resulting egg file will be written.  This is only valid when there is only one input egg file on the command line.  If you want to process multiple files simultaneously, you must use either -d or -inplace.
+.TP
+.BI "\-d " "dirname"
+Specify the name of the directory in which to write the resulting egg files.  If you are processing only one egg file, this may be omitted in lieu of the -o option.  If you are processing multiple egg files, this may be omitted only if you specify -inplace instead.
+.TP
+.B \-inplace
+If this option is given, the input egg files will be rewritten in place with the results.  This obviates the need to specify -d for an output directory; however, it's risky because the original input egg files are lost.
+.TP
+.BI "\-cs " "coordinate-system"
+Specify the coordinate system to operate in.  This may be one of 'y-up', 'z-up', 'y-up-left', or 'z-up-left'.
+.TP
+.B \-f
+Force complete loading: load up the egg file along with all of its external references.
+.TP
+.BI "\-inf " "filename"
+Reads input args from a text file instead of the command line.  Useful for really, really large lists of args that break the OS-imposed limits on the length of command lines.
+.TP
+.B \-h
+Display this help page.
diff --git a/doc/man/egg-texture-cards.1 b/doc/man/egg-texture-cards.1
new file mode 100644
index 0000000000..35bbf1b5df
--- /dev/null
+++ b/doc/man/egg-texture-cards.1
@@ -0,0 +1,81 @@
+.\" Automatically generated by egg-texture-cards -write-bam
+.TH EGG-TEXTURE-CARDS 1 "27 December 2014" "1.9.0" Panda3D
+.SH NAME
+egg-texture-cards \- generate an .egg file containing texture cards
+.SH SYNOPSIS
+\fBegg-texture-cards\fR [opts] texture [texture ...] output.egg
+.br
+\fBegg-texture-cards\fR [opts] -o output.egg texture [texture ...]
+.br
+\fBegg-texture-cards\fR [opts] texture [texture ...] >output.egg
+.SH DESCRIPTION
+egg\-texture\-cards generates an egg file consisting of several square polygons, one for each texture name that appears on the command line.
+.PP
+This is a handy thing to have for importing texture images through egg\-palettize, even when those textures do not appear on any real geometry; it can also be used for creating a lot of simple polygons for rendering click buttons and similar interfaces.
+.SH OPTIONS
+.TP
+.BI "\-g " "left,right,bottom,top"
+Specifies the geometry of each polygon.  The default is a unit polygon centered on the origin: -0.5,0.5,-0.5,0.5.  Polygons are always created on the X-Y plane.  If -p is not also specified, all polygons will be the same size and shape.
+.TP
+.BI "\-p " "xpixels,ypixels"
+Indicates that polygons should be sized in proportion to the pixel size of the texture image.  This will potentially create a different size and shape polygon for each texture.  The coordinate pair represents the image size in pixels that will exactly fill up the polygon described with -g (or the default polygon if -g is not specified); smaller images will be given proportionately smaller polygons, and larger images will be given proportionately larger polygons.
+.TP
+.BI "\-suffix " "string"
+Normally, each polygon is given a name based on the basename of its corresponding texture's filename (without the filename extension).  This option specifies an ignorable suffix in the texture filename(s); if this suffix is present, it is not included in the polygon's name.  This option may be repeated multiple times.
+.TP
+.BI "\-c " "r,g,b[,a]"
+Specifies the color of each polygon.  The default is white: 1,1,1,1.
+.TP
+.BI "\-wm " "wrap"
+Indicates the wrap mode of the texture: "repeat", "clamp", or any of the other modes supported by egg syntax.  The default is to leave this unspecified.
+.TP
+.BI "\-wmu " "wrap_u"
+Indicates the wrap mode of the texture in the U direction.  This overrides -wm, if specified.
+.TP
+.BI "\-wmv " "wrap_v"
+Indicates the wrap mode of the texture in the V direction.  This overrides -wm, if specified.
+.TP
+.BI "\-minf " "filter"
+Indicates the minfilter mode of the texture: "linear", "mipmap", or any of the other modes supported by egg syntax.  The default is to leave this unspecified.
+.TP
+.BI "\-magf " "filter"
+Indicates the magfilter mode of the texture: "linear" or "nearest".  The default is to leave this unspecified.
+.TP
+.BI "\-aniso " "degree"
+Indicates the anisotropic degree of the texture.  The default is to leave this unspecified.
+.TP
+.BI "\-ql " "[default | fastest | normal | best]"
+Specifies the quality level of the texture.  This mainly affects the tinydisplay software renderer.
+.TP
+.BI "\-f " "format"
+Indicates the format for all textures: typical choices are "rgba12" or "rgb5" or "alpha".  The default is to leave this unspecified.
+.TP
+.BI "\-f1 " "format"
+Indicates the format for one-channel textures only.  If specified, this overrides the format specified by -f.
+.TP
+.BI "\-f2 " "format"
+Indicates the format for two-channel textures only.  If specified, this overrides the format specified by -f.
+.TP
+.BI "\-f3 " "format"
+Indicates the format for three-channel textures only.  If specified, this overrides the format specified by -f.
+.TP
+.BI "\-f4 " "format"
+Indicates the format for four-channel textures only.  If specified, this overrides the format specified by -f.
+.TP
+.B \-b
+Make the textured polygons backfaced (two-sided).
+.TP
+.BI "\-fps " "frame-rate"
+Normally, all of the texture cards are created as a series of nodes beneath a SequenceNode.  This allows all of the cards to be viewed, one at a time, if the output file is loaded in pview.  It also has the nice side-effect of creating an automatic texture flip that can be used directly by applications; use this parameter to specify the frame rate of that texture flip.
+.TP
+.B \-noexist
+Don't treat it as an error if the input file references pathnames (e.g. textures) that don't exist.  Normally, this will be flagged as an error and the command aborted; with this option, an egg file will be generated anyway, referencing pathnames that do not exist.
+.TP
+.BI "\-o " "filename"
+Specify the filename to which the resulting egg file will be written.  If this option is omitted, the last parameter name is taken to be the name of the output file, or standard output is used if there are no other parameters.
+.TP
+.BI "\-cs " "coordinate-system"
+Specify the coordinate system of the resulting egg file.  This may be one of 'y-up', 'z-up', 'y-up-left', or 'z-up-left'.  The default is y-up.
+.TP
+.B \-h
+Display this help page.
diff --git a/doc/man/egg-topstrip.1 b/doc/man/egg-topstrip.1
new file mode 100644
index 0000000000..7b59e09eee
--- /dev/null
+++ b/doc/man/egg-topstrip.1
@@ -0,0 +1,75 @@
+.\" Automatically generated by egg-topstrip -write-bam
+.TH EGG-TOPSTRIP 1 "27 December 2014" "1.9.0" Panda3D
+.SH NAME
+egg-topstrip \- unapplies animation from a joint in an .egg file
+.SH SYNOPSIS
+\fBegg-topstrip\fR -o output.egg [opts] input.egg
+.br
+\fBegg-topstrip\fR -d dirname [opts] file.egg [file.egg ...]
+.br
+\fBegg-topstrip\fR -inplace [opts] file.egg [file.egg ...]
+.br
+\fBegg-topstrip\fR -inf input_list_filename [opts]
+.SH DESCRIPTION
+egg\-topstrip reads a character model and its associated animation files, and unapplies the animation from one of the top joints.  This effectively freezes that particular joint, and makes the rest of the character relative to that joint.
+.PP
+This is a particularly useful thing to do to generate character models that can stack one on top of the other in a sensible way.
+.SH OPTIONS
+.TP
+.B \-noabs
+Don't allow any of the named egg files to have absolute pathnames.  If any do, abort with an error.  This option is designed to help detect errors when populating or building a standalone model tree, which should be self-contained and include only relative pathnames.
+.TP
+.BI "\-t " "name"
+Specify the name of the 'top' joint, from which to draw the animation channels which will be applied to the entire animation.
+.TP
+.B \-i
+Invert the matrix before applying.  This causes a subtractive effect.  This is the default unless -r is specified.
+.TP
+.B \-n
+Do not invert the matrix before applying.  This causes an additive effect.
+.TP
+.BI "\-s " "[ijkphrxyz]"
+Specify the components of the transform that are to be applied.  Use any combination of the nine token letters: i, j, k represent the three scale axes; h, p, r represent rotation; and x, y, z represent translation.  The default is everything: -s ijkphrxyz.
+.TP
+.BI "\-r " "file.egg"
+Read the animation channel from the indicated egg file.  If this is not specified, each egg file will supply its own animation channel.
+.TP
+.BI "\-pr " "path_replace"
+Sometimes references to other files (textures, external references) are stored with a full path that is appropriate for some other system, but does not exist here.  This option may be used to specify how those invalid paths map to correct paths.  Generally, this is of the form 'orig_prefix=replacement_prefix', which indicates a particular initial sequence of characters that should be replaced with a new sequence; e.g. '/c/home/models=/beta/fish'.  If the replacement prefix does not begin with a slash, the file will then be searched for along the search path specified by -pp.  You may use standard filename matching characters ('*', '?', etc.) in the original prefix, and '**' as a component by itself stands for any number of components.
+
+This option may be repeated as necessary; each file will be tried against each specified method, in the order in which they appear in the command line, until the file is found.  If the file is not found, the last matching prefix is used anyway.
+.TP
+.BI "\-pp " "dirname"
+Adds the indicated directory name to the list of directories to search for filenames referenced by the source file.  This is used only for relative paths, or for paths that are made relative by a -pr replacement string that doesn't begin with a leading slash.  The model-path is always implicitly searched anyway.
+.TP
+.BI "\-ps " "path_store"
+Specifies the way an externally referenced file is to be represented in the resulting output file.  This assumes the named filename actually exists; see -pr to indicate how to deal with external references that have bad pathnames.  This option will not help you to find a missing file, but simply controls how filenames are represented in the output.
+
+The option may be one of: rel, abs, rel_abs, strip, or keep.  If either rel or rel_abs is specified, the files are made relative to the directory specified by -pd.  The default is rel.
+.TP
+.BI "\-pd " "path_directory"
+Specifies the name of a directory to make paths relative to, if '-ps rel' or '-ps rel_abs' is specified.  If this is omitted, the directory name is taken from the name of the output file.
+.TP
+.BI "\-pc " "target_directory"
+Copies textures and other dependent files into the indicated directory.  If a relative pathname is specified, it is relative to the directory specified with -pd, above.
+.TP
+.BI "\-o " "filename"
+Specify the filename to which the resulting egg file will be written.  This is only valid when there is only one input egg file on the command line.  If you want to process multiple files simultaneously, you must use either -d or -inplace.
+.TP
+.BI "\-d " "dirname"
+Specify the name of the directory in which to write the resulting egg files.  If you are processing only one egg file, this may be omitted in lieu of the -o option.  If you are processing multiple egg files, this may be omitted only if you specify -inplace instead.
+.TP
+.B \-inplace
+If this option is given, the input egg files will be rewritten in place with the results.  This obviates the need to specify -d for an output directory; however, it's risky because the original input egg files are lost.
+.TP
+.BI "\-cs " "coordinate-system"
+Specify the coordinate system to operate in.  This may be one of 'y-up', 'z-up', 'y-up-left', or 'z-up-left'.
+.TP
+.B \-f
+Force complete loading: load up the egg file along with all of its external references.
+.TP
+.BI "\-inf " "filename"
+Reads input args from a text file instead of the command line.  Useful for really, really large lists of args that break the OS-imposed limits on the length of command lines.
+.TP
+.B \-h
+Display this help page.
diff --git a/doc/man/egg-trans.1 b/doc/man/egg-trans.1
new file mode 100644
index 0000000000..f615a540bd
--- /dev/null
+++ b/doc/man/egg-trans.1
@@ -0,0 +1,117 @@
+.\" Automatically generated by egg-trans -write-bam
+.TH EGG-TRANS 1 "27 December 2014" "1.9.0" Panda3D
+.SH NAME
+egg-trans \- apply transformations and optimizations to an .egg file
+.SH SYNOPSIS
+\fBegg-trans\fR [opts] -o output.egg input.egg
+.br
+\fBegg-trans\fR [opts] input.egg >output.egg
+.SH DESCRIPTION
+egg\-trans reads an egg file and writes an essentially equivalent egg file to the standard output, or to the file specified with \-o.  Some simple operations on the egg file are supported.
+.SH OPTIONS
+.TP
+.B \-noabs
+Don't allow the input egg file to have absolute pathnames.  If it does, abort with an error.  This option is designed to help detect errors when populating or building a standalone model tree, which should be self-contained and include only relative pathnames.
+.TP
+.B \-F
+Flatten out transforms.
+.TP
+.B \-t
+Apply texture matrices to UV's.
+.TP
+.B \-T
+Collapse equivalent texture references.
+.TP
+.B \-c
+Clean out degenerate polygons and unused vertices.
+.TP
+.B \-C
+Clean out higher-order polygons by subdividing into triangles.
+.TP
+.B \-mesh
+Mesh triangles into triangle strips.  This is mainly useful as a tool to visualize the work that the mesher will do, since triangles are automatically meshed whenever an egg file is loaded.  Note that, unlike the automatic meshing at load time, you are must ensure that you do not start out with multiple triangles with different attributes (e.g. texture) together in the same group.
+.TP
+.B \-N
+Standardize and uniquify group names.
+.TP
+.BI "\-ct " "threshold"
+Implies -c, but sets the threshold for determining whether two vertex positions are equivalent.  A higher value here may be used to merge adjacent vertices together, and an even higher value can be used to reduce the density of a model.
+.TP
+.BI "\-pr " "path_replace"
+Sometimes references to other files (textures, external references) are stored with a full path that is appropriate for some other system, but does not exist here.  This option may be used to specify how those invalid paths map to correct paths.  Generally, this is of the form 'orig_prefix=replacement_prefix', which indicates a particular initial sequence of characters that should be replaced with a new sequence; e.g. '/c/home/models=/beta/fish'.  If the replacement prefix does not begin with a slash, the file will then be searched for along the search path specified by -pp.  You may use standard filename matching characters ('*', '?', etc.) in the original prefix, and '**' as a component by itself stands for any number of components.
+
+This option may be repeated as necessary; each file will be tried against each specified method, in the order in which they appear in the command line, until the file is found.  If the file is not found, the last matching prefix is used anyway.
+.TP
+.BI "\-pp " "dirname"
+Adds the indicated directory name to the list of directories to search for filenames referenced by the source file.  This is used only for relative paths, or for paths that are made relative by a -pr replacement string that doesn't begin with a leading slash.  The model-path is always implicitly searched anyway.
+.TP
+.BI "\-ps " "path_store"
+Specifies the way an externally referenced file is to be represented in the resulting output file.  This assumes the named filename actually exists; see -pr to indicate how to deal with external references that have bad pathnames.  This option will not help you to find a missing file, but simply controls how filenames are represented in the output.
+
+The option may be one of: rel, abs, rel_abs, strip, or keep.  If either rel or rel_abs is specified, the files are made relative to the directory specified by -pd.  The default is rel.
+.TP
+.BI "\-pd " "path_directory"
+Specifies the name of a directory to make paths relative to, if '-ps rel' or '-ps rel_abs' is specified.  If this is omitted, the directory name is taken from the name of the output file.
+.TP
+.BI "\-pc " "target_directory"
+Copies textures and other dependent files into the indicated directory.  If a relative pathname is specified, it is relative to the directory specified with -pd, above.
+.TP
+.BI "\-td " "dirname"
+Copy textures to the indicated directory.  The copy is performed only if the destination file does not exist or is older than the source file.
+.TP
+.BI "\-te " "ext"
+Rename textures to have the indicated extension.  This also automatically copies them to the new filename (possibly in a different directory if -td is also specified), and may implicitly convert to a different image format according to the extension.
+.TP
+.BI "\-tt " "type"
+Explicitly specifies the image format to convert textures to when copying them via -td or -te.  Normally, this is unnecessary as the image format can be determined by the extension, but sometimes the extension is insufficient to unambiguously specify an image type.
+.TP
+.BI "\-delod " "dist"
+Eliminate LOD's by choosing the level that would be appropriate for a camera at the indicated fixed distance from each LOD.  Use -delod -1 to keep all the LOD's as they are, which is the default.
+
+.TP
+.B \-no
+Strip all normals.
+.TP
+.B \-np
+Strip existing normals and redefine polygon normals.
+.TP
+.BI "\-nv " "threshold"
+Strip existing normals and redefine vertex normals.  Consider an edge between adjacent polygons to be smooth if the angle between them is less than threshold degrees.
+.TP
+.B \-nn
+Preserve normals exactly as they are.  This is the default.
+.TP
+.BI "\-tbn " "name"
+Compute tangent and binormal for the named texture coordinate set(s).  The name may include wildcard characters such as * and ?.  The normal must already exist or have been computed via one of the above options.  The tangent and binormal are used to implement bump mapping and related texture-based lighting effects.  This option may be repeated as necessary to name multiple texture coordinate sets.
+.TP
+.B \-tbnall
+Compute tangent and binormal for all texture coordinate sets.  This is equivalent to -tbn "*".
+.TP
+.B \-tbnauto
+Compute tangent and binormal for all normal maps. 
+.TP
+.BI "\-TS " "sx[,sy,sz]"
+Scale the model uniformly by the given factor (if only one number is given) or in each axis by sx, sy, sz (if three numbers are given).
+.TP
+.BI "\-TR " "x,y,z"
+Rotate the model x degrees about the x axis, then y degrees about the y axis, and then z degrees about the z axis.
+.TP
+.BI "\-TA " "angle,x,y,z"
+Rotate the model angle degrees counterclockwise about the given axis.
+.TP
+.BI "\-TT " "x,y,z"
+Translate the model by the indicated amount.
+
+All transformation options (-TS, -TR, -TA, -TT) are cumulative and are applied in the order they are encountered on the command line.
+.TP
+.BI "\-o " "filename"
+Specify the filename to which the resulting egg file will be written.  If this option is omitted, the egg file is written to standard output.
+.TP
+.BI "\-cs " "coordinate-system"
+Specify the coordinate system of the resulting egg file.  This may be one of 'y-up', 'z-up', 'y-up-left', or 'z-up-left'.  The default is the same coordinate system as the input egg file.  If this is different from the input egg file, a conversion will be performed.
+.TP
+.B \-f
+Force complete loading: load up the egg file along with all of its external references.
+.TP
+.B \-h
+Display this help page.
diff --git a/doc/man/egg2bam.1 b/doc/man/egg2bam.1
new file mode 100644
index 0000000000..28caf2b502
--- /dev/null
+++ b/doc/man/egg2bam.1
@@ -0,0 +1,81 @@
+.\" Automatically generated by egg2bam -write-bam
+.TH EGG2BAM 1 "27 December 2014" "1.9.0" Panda3D
+.SH NAME
+egg2bam \- convert .egg files to .bam files
+.SH SYNOPSIS
+\fBegg2bam\fR [opts] input.egg output.bam
+.br
+\fBegg2bam\fR [opts] -o output.bam input.egg
+.SH DESCRIPTION
+This program reads Egg files and outputs Bam files, the binary format suitable for direct loading of animation and models into Panda.  Bam files are tied to a particular version of Panda, so should not be considered replacements for egg files, but they tend to be smaller and load much faster than the equivalent egg files.
+.SH OPTIONS
+.TP
+.B \-noabs
+Don't allow the input egg file to have absolute pathnames.  If it does, abort with an error.  This option is designed to help detect errors when populating or building a standalone model tree, which should be self-contained and include only relative pathnames.
+.TP
+.BI "\-flatten " "flag"
+Specifies whether to flatten the egg hierarchy after it is loaded.  If flag is zero, the egg hierarchy will not be flattened, but will instead be written to the bam file exactly as it is.  If flag is non-zero, the hierarchy will be flattened so that unnecessary nodes (usually group nodes with only one child) are eliminated.  The default if this is not specified is taken from the egg-flatten Config.prc variable.
+.TP
+.BI "\-combine-geoms " "flag"
+Specifies whether to combine sibling GeomNodes into a common GeomNode when possible.  This flag is only respected if flatten, above, is also enabled (or implicitly true from the Config.prc file).  The default if this is not specified is taken from the egg-combine-geoms Config.prc variable.
+.TP
+.BI "\-suppress-hidden " "flag"
+Specifies whether to suppress hidden geometry.  If this is nonzero, egg geometry tagged as "hidden" will be removed from the final scene graph; otherwise, it will be preserved (but stashed).  The default is nonzero, to remove it.
+.TP
+.B \-ls
+Writes a scene graph listing to standard output after the egg file has been loaded, showing the nodes that will be written out.
+.TP
+.BI "\-C " "quality"
+Specify the quality level for lossy channel compression.  If this is specified, the animation channels will be compressed at this quality level, which is normally an integer value between 0 and 100, inclusive, where higher numbers produce larger files with greater quality.  Generally, 95 is the highest useful quality level.  Use -NC (described below) to disable channel compression.  If neither option is specified, the default comes from the Config.prc file.
+.TP
+.B \-NC
+Turn off lossy compression of animation channels.  Channels will be written exactly as they are, losslessly.
+.TP
+.B \-rawtex
+Record texture data directly in the bam file, instead of storing a reference to the texture elsewhere on disk.  The textures are stored uncompressed, unless -ctex is also specified.  A particular texture that is encoded into multiple different bam files in this way cannot be unified into the same part of texture memory if the different bam files are loaded together.  That being said, this can sometimes be a convenient way to ensure the bam file is completely self-contained.
+.TP
+.B \-txo
+Rather than writing texture data directly into the bam file, as in -rawtex, create a texture object for each referenced texture.  A texture object is a kind of mini-bam file, with a .txo extension, that contains all of the data needed to recreate a texture, including its image contents, filter and wrap settings, and so on.  3-D textures and cube maps can also be represented in a single .txo file.  Texture object files, like bam files, are tied to a particular version of Panda.
+.TP
+.B \-txopz
+In addition to writing texture object files as above, compress each one using pzip to a .txo.pz file.  In many cases, this will yield a disk file size comparable to that achieved by png compression.  This is an on-disk compression only, and does not affect the amount of RAM or texture memory consumed by the texture when it is loaded.
+.TP
+.B \-ctex
+Pre-compress the texture images using the libsquish library, when using -rawtex or -txo.  This is unrelated to the on-disk compression achieved via -txopz (and it may be used in conjunction with that parameter).  This will result in a smaller RAM and texture memory footprint for the texture images.  The same effect can be achieved at load time by setting compressed-textures in your Config.prc file; but -ctex pre-compresses the textures so that they do not need to be compressed at load time.  
+.TP
+.B \-mipmap
+Records the pre-generated mipmap levels in the texture object file when using -rawtex or -txo, regardless of the texture filter mode.  This will increase the size of the texture object file by about 33%, but it prevents the need to compute the mipmaps at runtime.  The default is to record mipmap levels only when the texture uses a mipmap filter mode.
+.TP
+.BI "\-ctexq " "quality"
+Specifies the compression quality to use when performing the texture compression requested by -ctex.  This may be one of 'default', 'fastest', 'normal', or 'best'.  The default is 'best'.  Set it to 'default' to use whatever is specified by the Config.prc file.  This is a global setting only; individual texture quality settings appearing within the egg file will override this.
+.TP
+.BI "\-load-display " "display name"
+Specifies the particular display module to load to perform the texture compression requested by -ctex.  If this is omitted, the default is taken from the Config.prc file.  Since your Panda has libsquish compiled in, this is not necessary; Panda can compress textures without loading a display module.
+.TP
+.BI "\-pr " "path_replace"
+Sometimes references to other files (textures, external references) are stored with a full path that is appropriate for some other system, but does not exist here.  This option may be used to specify how those invalid paths map to correct paths.  Generally, this is of the form 'orig_prefix=replacement_prefix', which indicates a particular initial sequence of characters that should be replaced with a new sequence; e.g. '/c/home/models=/beta/fish'.  If the replacement prefix does not begin with a slash, the file will then be searched for along the search path specified by -pp.  You may use standard filename matching characters ('*', '?', etc.) in the original prefix, and '**' as a component by itself stands for any number of components.
+
+This option may be repeated as necessary; each file will be tried against each specified method, in the order in which they appear in the command line, until the file is found.  If the file is not found, the last matching prefix is used anyway.
+.TP
+.BI "\-pp " "dirname"
+Adds the indicated directory name to the list of directories to search for filenames referenced by the source file.  This is used only for relative paths, or for paths that are made relative by a -pr replacement string that doesn't begin with a leading slash.  The model-path is always implicitly searched anyway.
+.TP
+.BI "\-ps " "path_store"
+Specifies the way an externally referenced file is to be represented in the resulting output file.  This assumes the named filename actually exists; see -pr to indicate how to deal with external references that have bad pathnames.  This option will not help you to find a missing file, but simply controls how filenames are represented in the output.
+
+The option may be one of: rel, abs, rel_abs, strip, or keep.  If either rel or rel_abs is specified, the files are made relative to the directory specified by -pd.  The default is rel.
+.TP
+.BI "\-pd " "path_directory"
+Specifies the name of a directory to make paths relative to, if '-ps rel' or '-ps rel_abs' is specified.  If this is omitted, the directory name is taken from the name of the output file.
+.TP
+.BI "\-pc " "target_directory"
+Copies textures and other dependent files into the indicated directory.  If a relative pathname is specified, it is relative to the directory specified with -pd, above.
+.TP
+.BI "\-o " "filename"
+Specify the filename to which the resulting Bam file will be written.  If this option is omitted, the last parameter name is taken to be the name of the output file.
+.TP
+.BI "\-cs " "coordinate-system"
+Specify the coordinate system of the resulting Bam file.  This may be one of 'y-up', 'z-up', 'y-up-left', or 'z-up-left'.  The default is z-up.
+.TP
+.B \-h
+Display this help page.
diff --git a/doc/man/egg2c.1 b/doc/man/egg2c.1
new file mode 100644
index 0000000000..2aa826bc2c
--- /dev/null
+++ b/doc/man/egg2c.1
@@ -0,0 +1,49 @@
+.\" Automatically generated by egg2c -write-bam
+.TH EGG2C 1 "27 December 2014" "1.9.0" Panda3D
+.SH NAME
+egg2c \- convert .egg geometry into compilable C tables
+.SH SYNOPSIS
+\fBegg2c\fR [opts] input.egg output.c
+.br
+\fBegg2c\fR [opts] -o output.c input.egg
+.br
+\fBegg2c\fR [opts] input.egg >output.c
+.SH DESCRIPTION
+This program reads Egg files and outputs code that will almost compile as a C or C++ program.  You get to define the data structures for the program after the fact; the program only generates tables of vertices and polygons.
+.SH OPTIONS
+.TP
+.B \-noabs
+Don't allow the input egg file to have absolute pathnames.  If it does, abort with an error.  This option is designed to help detect errors when populating or building a standalone model tree, which should be self-contained and include only relative pathnames.
+.TP
+.B \-v
+Generate a table of vertex positions.
+.TP
+.B \-u
+Generate a table of UV's per each vertex.
+.TP
+.B \-vn
+Generate a table of normals per each vertex.
+.TP
+.B \-vc
+Generate a table of colors per each vertex.
+.TP
+.B \-p
+Generate a table of polygons that index into the above tables.
+.TP
+.B \-pn
+Generate a table of normals per each polygon.
+.TP
+.B \-pc
+Generate a table of colors per each polygon.
+.TP
+.B \-t
+Output only triangles by subdividing higher-order polygons.
+.TP
+.BI "\-o " "filename"
+Specify the filename to which the resulting C file will be written.  If this option is omitted, the last parameter name is taken to be the name of the output file, or standard output is used if there are no other parameters.
+.TP
+.BI "\-cs " "coordinate-system"
+Specify the coordinate system of the resulting C file.  This may be one of 'y-up', 'z-up', 'y-up-left', or 'z-up-left'.  The default is the same coordinate system as the input egg file.  If this is different from the input egg file, a conversion will be performed.
+.TP
+.B \-h
+Display this help page.
diff --git a/doc/man/egg2dxf.1 b/doc/man/egg2dxf.1
new file mode 100644
index 0000000000..3eb38a6c1d
--- /dev/null
+++ b/doc/man/egg2dxf.1
@@ -0,0 +1,29 @@
+.\" Automatically generated by egg2dxf -write-bam
+.TH EGG2DXF 1 "27 December 2014" "1.9.0" Panda3D
+.SH NAME
+egg2dxf \- convert .egg files to AutoCAD .dxf files
+.SH SYNOPSIS
+\fBegg2dxf\fR [opts] input.egg output.dxf
+.br
+\fBegg2dxf\fR [opts] -o output.dxf input.egg
+.SH DESCRIPTION
+This program converts files from egg format to AutoCAD DXF format.  Since DXF does not support nested hierarchies, vertex normals, or any fancy stuff you are probably used to, there is some information lost in the conversion
+.SH OPTIONS
+.TP
+.B \-noabs
+Don't allow the input egg file to have absolute pathnames.  If it does, abort with an error.  This option is designed to help detect errors when populating or building a standalone model tree, which should be self-contained and include only relative pathnames.
+.TP
+.B \-p
+Use POLYLINE to represent polygons instead of the default, 3DFACE.
+.TP
+.BI "\-o " "filename"
+Specify the filename to which the resulting DXF file will be written.  If this option is omitted, the last parameter name is taken to be the name of the output file.
+.TP
+.BI "\-cs " "coordinate-system"
+Specify the coordinate system of the resulting DXF file.  This may be one of 'y-up', 'z-up', 'y-up-left', or 'z-up-left'.  The default is the same coordinate system as the input egg file.  If this is different from the input egg file, a conversion will be performed.
+.TP
+.B \-f
+Force complete loading: load up the egg file along with all of its external references.
+.TP
+.B \-h
+Display this help page.
diff --git a/doc/man/egg2flt.1 b/doc/man/egg2flt.1
new file mode 100644
index 0000000000..7c19ac7697
--- /dev/null
+++ b/doc/man/egg2flt.1
@@ -0,0 +1,26 @@
+.\" Automatically generated by egg2flt -write-bam
+.TH EGG2FLT 1 "27 December 2014" "1.9.0" Panda3D
+.SH NAME
+egg2flt \- convert files from .egg format to MultiGen .flt
+.SH SYNOPSIS
+\fBegg2flt\fR [opts] input.egg output.flt
+.br
+\fBegg2flt\fR [opts] -o output.flt input.egg
+.SH DESCRIPTION
+egg2lt converts files from egg format to MultiGen .flt format.  It attempts to be as robust as possible, and matches the capabilities of flt2egg.  Generally, converting a model from egg2lt and then back via flt2egg will result in essentially the same egg file, within the limitations of what can be represented in flt.
+.SH OPTIONS
+.TP
+.B \-noabs
+Don't allow the input egg file to have absolute pathnames.  If it does, abort with an error.  This option is designed to help detect errors when populating or building a standalone model tree, which should be self-contained and include only relative pathnames.
+.TP
+.BI "\-attr " "none/new/all"
+Specifies whether to write (or rewrite) .attr files for each texture image.  MultiGen stores texture properties like mipmapping in a separate .attr file for each different texture image.  If this parameter is "none", these files will not be generated; if this is "new", these files will only be generated if they do not already exist (even if the properties have changed).  Specifying "all" causes these to be rewritten every time.
+.TP
+.BI "\-o " "filename"
+Specify the filename to which the resulting MultiGen file will be written.  If this option is omitted, the last parameter name is taken to be the name of the output file.
+.TP
+.B \-f
+Force complete loading: load up the egg file along with all of its external references.
+.TP
+.B \-h
+Display this help page.
diff --git a/doc/man/egg2obj.1 b/doc/man/egg2obj.1
new file mode 100644
index 0000000000..74d773a57f
--- /dev/null
+++ b/doc/man/egg2obj.1
@@ -0,0 +1,29 @@
+.\" Automatically generated by egg2obj -write-bam
+.TH EGG2OBJ 1 "27 December 2014" "1.9.0" Panda3D
+.SH NAME
+egg2obj \- convert .egg files to .obj
+.SH SYNOPSIS
+\fBegg2obj\fR [opts] input.egg output.obj
+.br
+\fBegg2obj\fR [opts] -o output.obj input.egg
+.SH DESCRIPTION
+This program converts egg files to obj.  It only converts polygon data, with no fancy tricks.  Very bare\-bones at the moment; not even texture maps are supported.
+.SH OPTIONS
+.TP
+.B \-noabs
+Don't allow the input egg file to have absolute pathnames.  If it does, abort with an error.  This option is designed to help detect errors when populating or building a standalone model tree, which should be self-contained and include only relative pathnames.
+.TP
+.B \-C
+Clean out higher-order polygons by subdividing into triangles.
+.TP
+.BI "\-o " "filename"
+Specify the filename to which the resulting Obj file will be written.  If this option is omitted, the last parameter name is taken to be the name of the output file.
+.TP
+.BI "\-cs " "coordinate-system"
+Specify the coordinate system of the resulting Obj file.  Normally, this is z-up.
+.TP
+.B \-f
+Force complete loading: load up the egg file along with all of its external references.
+.TP
+.B \-h
+Display this help page.
diff --git a/doc/man/egg2x.1 b/doc/man/egg2x.1
new file mode 100644
index 0000000000..03a5c19880
--- /dev/null
+++ b/doc/man/egg2x.1
@@ -0,0 +1,35 @@
+.\" Automatically generated by egg2x -write-bam
+.TH EGG2X 1 "27 December 2014" "1.9.0" Panda3D
+.SH NAME
+egg2x \- convert an .egg file into a DirectX .x file
+.SH SYNOPSIS
+\fBegg2x\fR [opts] input.egg output.x
+.br
+\fBegg2x\fR [opts] -o output.x input.egg
+.SH DESCRIPTION
+This program reads an Egg file and outputs an equivalent, or nearly equivalent, DirectX\-style .x file.  Only simple hierarchy and polygon meshes are supported; advanced features like LOD's, decals, and animation or skinning are not supported.
+.SH OPTIONS
+.TP
+.B \-noabs
+Don't allow the input egg file to have absolute pathnames.  If it does, abort with an error.  This option is designed to help detect errors when populating or building a standalone model tree, which should be self-contained and include only relative pathnames.
+.TP
+.B \-m
+Convert all the objects in the egg file as one big mesh, instead of preserving the normal egg hierarchy.
+.TP
+.BI "\-td " "dirname"
+Copy textures to the indicated directory.  The copy is performed only if the destination file does not exist or is older than the source file.
+.TP
+.BI "\-te " "ext"
+Rename textures to have the indicated extension.  This also automatically copies them to the new filename (possibly in a different directory if -td is also specified), and may implicitly convert to a different image format according to the extension.
+.TP
+.BI "\-tt " "type"
+Explicitly specifies the image format to convert textures to when copying them via -td or -te.  Normally, this is unnecessary as the image format can be determined by the extension, but sometimes the extension is insufficient to unambiguously specify an image type.
+.TP
+.BI "\-delod " "dist"
+Eliminate LOD's by choosing the level that would be appropriate for a camera at the indicated fixed distance from each LOD.  Use -delod -1 to keep all the LOD's as they are.  The default value is 0.
+.TP
+.BI "\-o " "filename"
+Specify the filename to which the resulting DirectX file will be written.  If this option is omitted, the last parameter name is taken to be the name of the output file.
+.TP
+.B \-h
+Display this help page.
diff --git a/doc/man/flt-info.1 b/doc/man/flt-info.1
new file mode 100644
index 0000000000..b05a07d5c7
--- /dev/null
+++ b/doc/man/flt-info.1
@@ -0,0 +1,15 @@
+.\" Automatically generated by flt-info -write-bam
+.TH FLT-INFO 1 "27 December 2014" "1.9.0" Panda3D
+.SH NAME
+flt-info \- describe the contents of a MultiGen .flt file
+.SH SYNOPSIS
+\fBflt-info\fR [opts] input.flt
+.SH DESCRIPTION
+This program reads a MultiGen OpenFlight (.flt) file and reports some interesting things about its contents.
+.SH OPTIONS
+.TP
+.B \-ls
+List the hierarchy in the flt file.
+.TP
+.B \-h
+Display this help page.
diff --git a/doc/man/flt-trans.1 b/doc/man/flt-trans.1
new file mode 100644
index 0000000000..c41c142c97
--- /dev/null
+++ b/doc/man/flt-trans.1
@@ -0,0 +1,39 @@
+.\" Automatically generated by flt-trans -write-bam
+.TH FLT-TRANS 1 "27 December 2014" "1.9.0" Panda3D
+.SH NAME
+flt-trans \- apply various operations to a MultiGen .flt file
+.SH SYNOPSIS
+\fBflt-trans\fR [opts] input.flt output.flt
+.br
+\fBflt-trans\fR [opts] -o output.flt input.flt
+.SH DESCRIPTION
+This program reads a MultiGen OpenFlight (.flt) file and writes an essentially equivalent .flt file, to the file specified with \-o (or as the second parameter).  Some simple operations may be performed.
+.SH OPTIONS
+.TP
+.BI "\-v " "version"
+Upgrade (or downgrade) the flt file to the indicated version.  This may not be completely correct for all version-to-version combinations.
+.TP
+.BI "\-o " "filename"
+Specify the filename to which the resulting .flt file will be written.  If this option is omitted, the last parameter name is taken to be the name of the output file.
+.TP
+.BI "\-pr " "path_replace"
+Sometimes references to other files (textures, external references) are stored with a full path that is appropriate for some other system, but does not exist here.  This option may be used to specify how those invalid paths map to correct paths.  Generally, this is of the form 'orig_prefix=replacement_prefix', which indicates a particular initial sequence of characters that should be replaced with a new sequence; e.g. '/c/home/models=/beta/fish'.  If the replacement prefix does not begin with a slash, the file will then be searched for along the search path specified by -pp.  You may use standard filename matching characters ('*', '?', etc.) in the original prefix, and '**' as a component by itself stands for any number of components.
+
+This option may be repeated as necessary; each file will be tried against each specified method, in the order in which they appear in the command line, until the file is found.  If the file is not found, the last matching prefix is used anyway.
+.TP
+.BI "\-pp " "dirname"
+Adds the indicated directory name to the list of directories to search for filenames referenced by the source file.  This is used only for relative paths, or for paths that are made relative by a -pr replacement string that doesn't begin with a leading slash.  The model-path is always implicitly searched anyway.
+.TP
+.BI "\-ps " "path_store"
+Specifies the way an externally referenced file is to be represented in the resulting output file.  This assumes the named filename actually exists; see -pr to indicate how to deal with external references that have bad pathnames.  This option will not help you to find a missing file, but simply controls how filenames are represented in the output.
+
+The option may be one of: rel, abs, rel_abs, strip, or keep.  If either rel or rel_abs is specified, the files are made relative to the directory specified by -pd.  The default is rel.
+.TP
+.BI "\-pd " "path_directory"
+Specifies the name of a directory to make paths relative to, if '-ps rel' or '-ps rel_abs' is specified.  If this is omitted, the directory name is taken from the name of the output file.
+.TP
+.BI "\-pc " "target_directory"
+Copies textures and other dependent files into the indicated directory.  If a relative pathname is specified, it is relative to the directory specified with -pd, above.
+.TP
+.B \-h
+Display this help page.
diff --git a/doc/man/flt2egg.1 b/doc/man/flt2egg.1
new file mode 100644
index 0000000000..1796b7b543
--- /dev/null
+++ b/doc/man/flt2egg.1
@@ -0,0 +1,94 @@
+.\" Automatically generated by flt2egg -write-bam
+.TH FLT2EGG 1 "27 December 2014" "1.9.0" Panda3D
+.SH NAME
+flt2egg \- convert a MultiGen .flt file to .egg
+.SH SYNOPSIS
+\fBflt2egg\fR [opts] input.flt output.egg
+.br
+\fBflt2egg\fR [opts] -o output.egg input.flt
+.br
+\fBflt2egg\fR [opts] input.flt >output.egg
+.SH DESCRIPTION
+This program converts MultiGen OpenFlight (.flt) files to egg.  Most features of MultiGen that are also recognized by egg are supported.
+.SH OPTIONS
+.TP
+.B \-noabs
+Don't allow the input MultiGen file to have absolute pathnames.  If it does, abort with an error.  This option is designed to help detect errors when populating or building a standalone model tree, which should be self-contained and include only relative pathnames.
+.TP
+.B \-noexist
+Don't treat it as an error if the input file references pathnames (e.g. textures) that don't exist.  Normally, this will be flagged as an error and the command aborted; with this option, an egg file will be generated anyway, referencing pathnames that do not exist.
+.TP
+.B \-ignore
+Ignore non-fatal errors and generate an egg file anyway.
+.TP
+.BI "\-pr " "path_replace"
+Sometimes references to other files (textures, external references) are stored with a full path that is appropriate for some other system, but does not exist here.  This option may be used to specify how those invalid paths map to correct paths.  Generally, this is of the form 'orig_prefix=replacement_prefix', which indicates a particular initial sequence of characters that should be replaced with a new sequence; e.g. '/c/home/models=/beta/fish'.  If the replacement prefix does not begin with a slash, the file will then be searched for along the search path specified by -pp.  You may use standard filename matching characters ('*', '?', etc.) in the original prefix, and '**' as a component by itself stands for any number of components.
+
+This option may be repeated as necessary; each file will be tried against each specified method, in the order in which they appear in the command line, until the file is found.  If the file is not found, the last matching prefix is used anyway.
+.TP
+.BI "\-pp " "dirname"
+Adds the indicated directory name to the list of directories to search for filenames referenced by the source file.  This is used only for relative paths, or for paths that are made relative by a -pr replacement string that doesn't begin with a leading slash.  The model-path is always implicitly searched anyway.
+.TP
+.BI "\-ps " "path_store"
+Specifies the way an externally referenced file is to be represented in the resulting output file.  This assumes the named filename actually exists; see -pr to indicate how to deal with external references that have bad pathnames.  This option will not help you to find a missing file, but simply controls how filenames are represented in the output.
+
+The option may be one of: rel, abs, rel_abs, strip, or keep.  If either rel or rel_abs is specified, the files are made relative to the directory specified by -pd.  The default is rel.
+.TP
+.BI "\-pd " "path_directory"
+Specifies the name of a directory to make paths relative to, if '-ps rel' or '-ps rel_abs' is specified.  If this is omitted, the directory name is taken from the name of the output file.
+.TP
+.BI "\-pc " "target_directory"
+Copies textures and other dependent files into the indicated directory.  If a relative pathname is specified, it is relative to the directory specified with -pd, above.
+.TP
+.BI "\-ui " "units"
+Specify the units of the input MultiGen file.  Normally, this can be inferred from the file itself.
+.TP
+.BI "\-uo " "units"
+Specify the units of the resulting egg file.  If this is specified, the vertices in the egg file will be scaled as necessary to make the appropriate units conversion; otherwise, the vertices will be left as they are.
+.TP
+.B \-f
+Follow and convert all external references in the source file.
+.TP
+.B \-no
+Strip all normals.
+.TP
+.B \-np
+Strip existing normals and redefine polygon normals.
+.TP
+.BI "\-nv " "threshold"
+Strip existing normals and redefine vertex normals.  Consider an edge between adjacent polygons to be smooth if the angle between them is less than threshold degrees.
+.TP
+.B \-nn
+Preserve normals exactly as they are.  This is the default.
+.TP
+.BI "\-tbn " "name"
+Compute tangent and binormal for the named texture coordinate set(s).  The name may include wildcard characters such as * and ?.  The normal must already exist or have been computed via one of the above options.  The tangent and binormal are used to implement bump mapping and related texture-based lighting effects.  This option may be repeated as necessary to name multiple texture coordinate sets.
+.TP
+.B \-tbnall
+Compute tangent and binormal for all texture coordinate sets.  This is equivalent to -tbn "*".
+.TP
+.B \-tbnauto
+Compute tangent and binormal for all normal maps. 
+.TP
+.BI "\-TS " "sx[,sy,sz]"
+Scale the model uniformly by the given factor (if only one number is given) or in each axis by sx, sy, sz (if three numbers are given).
+.TP
+.BI "\-TR " "x,y,z"
+Rotate the model x degrees about the x axis, then y degrees about the y axis, and then z degrees about the z axis.
+.TP
+.BI "\-TA " "angle,x,y,z"
+Rotate the model angle degrees counterclockwise about the given axis.
+.TP
+.BI "\-TT " "x,y,z"
+Translate the model by the indicated amount.
+
+All transformation options (-TS, -TR, -TA, -TT) are cumulative and are applied in the order they are encountered on the command line.
+.TP
+.BI "\-o " "filename"
+Specify the filename to which the resulting egg file will be written.  If this option is omitted, the last parameter name is taken to be the name of the output file, or standard output is used if there are no other parameters.
+.TP
+.BI "\-cs " "coordinate-system"
+Specify the coordinate system of the input MultiGen file.  Normally, this is z-up.
+.TP
+.B \-h
+Display this help page.
diff --git a/doc/man/fltcopy.1 b/doc/man/fltcopy.1
new file mode 100644
index 0000000000..59632efe50
--- /dev/null
+++ b/doc/man/fltcopy.1
@@ -0,0 +1,44 @@
+.\" Automatically generated by fltcopy -write-bam
+.TH FLTCOPY 1 "27 December 2014" "1.9.0" Panda3D
+.SH NAME
+fltcopy \- copy MultiGen .flt files into a CVS source hierarchy
+.SH SYNOPSIS
+\fBfltcopy\fR [opts] file.flt [file.flt ... ]
+.SH DESCRIPTION
+fltcopy copies one or more MultiGen .flt files into a CVS source hierarchy.  Rather than copying the named files immediately into the current directory, it first scans the entire source hierarchy, identifying all the already\-existing files.  If the named file to copy matches the name of an already\-existing file in the current directory or elsewhere in the hierarchy, that file is overwritten.  Other .flt files, as well as texture files, that are externally referenced by the named .flt file(s) are similarly copied.
+.SH OPTIONS
+.TP
+.BI "\-pr " "path_replace"
+Sometimes references to other files (textures, external references) are stored with a full path that is appropriate for some other system, but does not exist here.  This option may be used to specify how those invalid paths map to correct paths.  Generally, this is of the form 'orig_prefix=replacement_prefix', which indicates a particular initial sequence of characters that should be replaced with a new sequence; e.g. '/c/home/models=/beta/fish'.  If the replacement prefix does not begin with a slash, the file will then be searched for along the search path specified by -pp.  You may use standard filename matching characters ('*', '?', etc.) in the original prefix, and '**' as a component by itself stands for any number of components.
+
+This option may be repeated as necessary; each file will be tried against each specified method, in the order in which they appear in the command line, until the file is found.  If the file is not found, the last matching prefix is used anyway.
+.TP
+.BI "\-pp " "dirname"
+Adds the indicated directory name to the list of directories to search for filenames referenced by the source file.  This is used only for relative paths, or for paths that are made relative by a -pr replacement string that doesn't begin with a leading slash.  The model-path is always implicitly searched anyway.
+.TP
+.B \-f
+Force the copy to happen without any input from the user.  If a file with the same name exists anywhere in the source hierarchy, it will be overwritten without prompting; if a file does not yet exist, it will be created in the directory named by -d or by -m, as appropriate.
+.TP
+.B \-i
+The opposite of -f, this will prompt the user before each action.  The default is only to prompt the user when an action is ambiguous or unusual.
+.TP
+.BI "\-d " "dirname"
+Copy model files that are not already present somewhere in the tree to the indicated directory.  The default is the current directory.
+.TP
+.BI "\-m " "dirname"
+Copy texture map files to the indicated directory.  The default is src/maps from the root directory.
+.TP
+.BI "\-root " "dirname"
+Specify the root of the CVS source hierarchy.  The default is to use the ppremake convention of locating the directory above the -d directory that contains a file called Package.pp.
+.TP
+.BI "\-key " "filename"
+Specify the name of the file that must exist in each directory for it to be considered part of the CVS source hierarchy.  The default is the ppremake convention, "Sources.pp".  Other likely candidates are "CVS" to search a CVS hierarchy, or "." to include all subdirectories indiscriminately.
+.TP
+.B \-nc
+Do not attempt to add newly-created files to CVS.  The default is to add them.
+.TP
+.BI "\-cvs " "cvs_binary"
+Specify how to run the cvs program for adding newly-created files.  The default is simply "cvs".
+.TP
+.B \-h
+Display this help page.
diff --git a/doc/man/image-info.1 b/doc/man/image-info.1
new file mode 100644
index 0000000000..60f693f54e
--- /dev/null
+++ b/doc/man/image-info.1
@@ -0,0 +1,14 @@
+.\" Automatically generated by image-info -write-bam
+.TH IMAGE-INFO 1 "27 December 2014" "1.9.0" Panda3D
+.SH NAME
+image-info \- report the size of image files
+.SH SYNOPSIS
+.SH DESCRIPTION
+This program reads the headers of a series of one or more image files and reports the image sizes to standard output.
+.SH OPTIONS
+.TP
+.B \-2
+Report only images that have a non-power-of-two size in either dimension.  Images whose dimensions are both a power of two will not be mentioned.
+.TP
+.B \-h
+Display this help page.
diff --git a/doc/man/image-resize.1 b/doc/man/image-resize.1
new file mode 100644
index 0000000000..27a5dbb66e
--- /dev/null
+++ b/doc/man/image-resize.1
@@ -0,0 +1,29 @@
+.\" Automatically generated by image-resize -write-bam
+.TH IMAGE-RESIZE 1 "27 December 2014" "1.9.0" Panda3D
+.SH NAME
+image-resize \- resize an image file
+.SH SYNOPSIS
+\fBimage-resize\fR [opts] inputimage outputimage
+.br
+\fBimage-resize\fR [opts] -o outputimage inputimage
+.SH DESCRIPTION
+This program reads an image file and resizes it to a larger or smaller image file.
+.SH OPTIONS
+.TP
+.BI "\-x " "xsize"
+Specify the width of the output image in pixels, or as a percentage of the original width (if a trailing percent sign is included).  If this is omitted, the ratio is taken from the ysize parameter.
+.TP
+.BI "\-y " "ysize"
+Specify the height of the output image in pixels, or as a percentage of the original height (if a trailing percent sign is included).  If this is omitted, the ratio is taken from the xsize parameter.
+.TP
+.BI "\-g " "radius"
+Use Gaussian filtering to resize the image, with the indicated radius.
+.TP
+.B \-1
+This option is ignored.  It is provided only for backward compatibility with a previous version of image-resize.
+.TP
+.BI "\-o " "filename"
+Specify the filename to which the resulting image file will be written.  If this option is omitted, the last parameter name is taken to be the name of the output file.
+.TP
+.B \-h
+Display this help page.
diff --git a/doc/man/image-trans.1 b/doc/man/image-trans.1
new file mode 100644
index 0000000000..943902d643
--- /dev/null
+++ b/doc/man/image-trans.1
@@ -0,0 +1,35 @@
+.\" Automatically generated by image-trans -write-bam
+.TH IMAGE-TRANS 1 "27 December 2014" "1.9.0" Panda3D
+.SH NAME
+image-trans \- apply transformations to an image file
+.SH SYNOPSIS
+\fBimage-trans\fR [opts] inputimage outputimage
+.br
+\fBimage-trans\fR [opts] -o outputimage inputimage
+.SH DESCRIPTION
+This program reads an image file and writes a similar image file to the output.  It can implicitly convert from one image file format to another; it uses the extension of the output filename to specify the destination file format.
+.SH OPTIONS
+.TP
+.BI "\-o " "filename"
+Specify the filename to which the resulting image file will be written.  If this option is omitted, the last parameter name is taken to be the name of the output file.
+.TP
+.BI "\-chan " "channels"
+Elevate (or truncate) the image to the indicated number of channels.  This may be 1, 2, 3, or 4.  You may also specify one of the keywords l, la, rgb, or rgba, respectively, or any of the keywords r, g, b, or a to extract out just the indicated channel as a single grayscale image.
+.TP
+.BI "\-cscale " "r,g,b[,a]"
+Apply the indicated color scale to each pixel of the image.
+.TP
+.B \-flip
+Flip the image vertically.
+.TP
+.B \-mirror
+Reverse the image horizontally.
+.TP
+.B \-cw
+Rotate the image 90 degrees clockwise.
+.TP
+.B \-ccw
+Rotate the image 90 degrees counter-clockwise.
+.TP
+.B \-h
+Display this help page.
diff --git a/doc/man/interrogate.1 b/doc/man/interrogate.1
new file mode 100644
index 0000000000..1bea02091e
--- /dev/null
+++ b/doc/man/interrogate.1
@@ -0,0 +1,186 @@
+.TH INTERROGATE 1 "27 December 2014" "" Panda3D
+.SH NAME
+interrogate \- generate scripting language bindings for C/C++ APIs
+.SH SYNOPSIS
+.B interrogate
+[
+.I opts
+]
+.I file.C
+[
+.I file.C ...
+]
+.SH DESCRIPTION
+Interrogate is a program to parse a body of C++ code and build up a table
+of classes, methods, functions, and symbols found, for the purposes of
+calling into the codebase via a non-C++ scripting language like Scheme,
+Smalltalk, or Python.
+.PP
+In addition to identifying all the classes and their relationships,
+interrogate will generate a wrapper function for each callable function.
+The wrapper functions will be callable directly from the scripting language,
+with no understanding of C++ necessary; these wrapper functions will in turn
+call the actual C++ functions or methods.
+.PP
+Most exportable features of C++ are supported, including templates, default
+parameters, and function overloading.
+.SH OPTIONS
+.TP
+.BI "\-oc " output.C
+Specify the name of the file to which generated code will be written.
+This includes all of the function wrappers, as well as those tables
+which must be compiled into the library.
+.TP
+.BI "\-od " output.in
+Specify the name of the file to which the non-compiled data tables
+will be written.  This file describes the relationships between
+all the types and the functions, and associates the function wrappers
+above with this data.  This file will be opened and read at runtime
+when the scripting language first calls some interrogate query
+function.
+.TP
+.BI "\-srcdir " directory
+Specify the name of the directory to which the source filenames are
+relative.
+.TP
+.BI "\-module " module_name
+Defines the name of the module this data is associated with.  This
+is strictly a code-organizational tool.  Conceptually, a module is
+the highest level of grouping for interrogate data; a module may
+contain several libraries.  If this is omitted, no module name is
+specified.
+.PP
+Sometimes, depending on the type of wrappers being generated, there
+may be additional code that needs to be generated on the module
+level, above that which was already generated at the library level.
+Python, for instance, generates the table of python-callable function
+wrappers at the module level.  Use the program
+.BR interrogate_module (1)
+to generate the appropriate code at the module level.
+.TP
+.BI "\-library " library_name
+Defines the name of the library this data is associated with.  This
+is another code-organizational tool.  Typically, there will be one
+invocation of interrogate for each library, and there will be
+multiple libraries per module.  If this is omitted, no library name
+is specified.
+.TP
+.B \-do\-module
+Generate whatever module-level code should be generated immediately,
+rather than waiting for a special
+.BR interrogate_module (1)
+pass.  This, of course, prohibits grouping several libraries together
+into a single module.
+.TP
+.B \-fptrs
+Make void* pointers to the function wrappers directly available.  A
+scripting language will be able to call the interrogate functions
+directly by pointer.
+.TP
+.B \-fnames
+Make the names of the function wrappers public symbols so that the
+scripting language will be able to call the interrogate functions
+by name.
+.PP
+Either or both of \fB\-fptrs\fP and/or \fB\-fnames\fP may be specified.
+If both are omitted, the default is \fB\-fnames\fP.
+.TP
+.B \-string
+Treat char* and basic_string<char> as special cases, and map
+parameters of these types to type atomic string.  The scripting
+language will see only functions that receive and return strings,
+not pointers to character or structures of basic_string<char>.
+If C calling convention wrappers are being generated, the atomic
+string type means type char*.  In any other calling convention, the
+atomic string type is whatever the native string type is.
+.TP
+.B \-refcount
+Treat classes that inherit from a class called ReferenceCount as a
+special case.  Any wrapper function that returns a pointer to
+one of these classes will automatically increment the reference
+count by calling ref() on the object first, and any destructors
+that are generated will call unref_delete() on the object instead of
+simply delete.
+.PP
+Furthermore, parameters of type PointerTo<N> or ConstPointerTo<N>
+will automatically be mapped to N * and const N *, respectively.
+.TP
+.B \-assert
+Generate code in each wrapper that will check the state of the assert
+flag and trigger an exception in the scripting language when a
+C++ assertion fails.  Presently, this only has meaning to the Python
+wrappers.
+.TP
+.B \-true\-names
+Use the actual name of the function being wrapped as the name of
+the generated wrapper function, instead of an ugly hash name.
+This means the wrapper functions may be called directly using a
+meaningful name (especially if \fB\-fnames\fP is also given), but it
+also means that C++ function overloading (including default values
+for parameters) cannot be used, as it will lead to multiple wrapper
+functions with the same name.
+.TP
+.B \-c
+Generate function wrappers using the C calling convention.  Any
+scripting language that can call a C function should be able to
+make advantage of the interrogate database.
+.TP
+.B \-python
+Generate function wrappers using the Python calling convention.
+The shared library will be directly loadable as a Python module
+(especially if the module definitions are made available either by
+running
+.BR interrogate_module (1)
+later, or by specifying \fB\-do\-module\fP on the command line now).
+However, C++ objects and methods will be converted into an object
+handle and a list of independent Python functions.
+.TP
+.B \-python\-obj
+Generate Python function wrappers that convert C++ objects to true
+python objects, with all methods converted to Python methods.  This
+is currently experimental.
+.TP
+.B \-python\-native
+Generate Python function wrappers that convert C++ objects to true
+python objects, with all methods converted to Python methods.  This
+is the recommended method for creating Python wrappers.
+.PP
+Any combination of \fB\-c\fP, \fB\-python\fP, or \fB\-python\-obj\fP
+may be specified. If all are omitted, the default is \fB\-c\fP.
+.TP
+.B \-track\-interpreter
+Generate code within each wrapper function to adjust the global
+variable "in_interpreter" to indicated whether code is running
+within the Panda C++ environment or within the high-level language.
+.TP
+.B \-unique\-names
+Compile a table into the library (i.e. generate code into the
+\fB\-oc\fP file) that defines a lookup of each function wrapper by
+its unique name.  This makes it possible to consistently identify
+function wrappers between sessions, at the cost of having this
+additional table in memory.
+.TP
+.B \-nodb
+Do not build a full interrogate database, but just generate function
+wrappers.  It is assumed that the user will know how to call the
+function wrappers already, from some external source.  This is most
+useful in conjunction with \fB\-true\-names\fP.
+.TP
+.BI "\-longlong " typename
+Specify the name of the 64-bit integer type for the current compiler.
+By default, this is "long long".
+.TP
+.B \-promiscuous
+Export *all* public symbols, functions, and classes seen, even those
+not explicitly marked to be published.
+.TP
+.B \-spam
+Generate wrapper functions that report each invocation to Notify.
+This can sometimes be useful for tracking down bugs.
+.TP
+.B \-noangles
+Treat #include <file> the same as #include "file".  This means
+\fB\-I\fP and \fB\-S\fP are equivalent.
+.SH "SEE ALSO"
+.BR interrogate_module (1),
+.BR test_interrogate (1)
diff --git a/doc/man/interrogate_module.1 b/doc/man/interrogate_module.1
new file mode 100644
index 0000000000..289c65d691
--- /dev/null
+++ b/doc/man/interrogate_module.1
@@ -0,0 +1,69 @@
+.TH INTERROGATE_MODULE 1 "26 December 2014" "" Panda3D
+.SH NAME
+interrogate_module \- generate module-level code for interrogate
+.SH SYNOPSIS
+.B interrogate_module
+[
+.I opts
+]
+.I libname.in
+[
+.I libname.in ...
+]
+.SH DESCRIPTION
+This program generates a module-level file for the
+.BR interrogate (1) program.
+This is a higher level than library, and groups several libraries
+together.  In particular, the code generated by interrogate_module
+typically includes a table of the classes that are to be exported
+to Python.
+.SH OPTIONS
+.TP
+.BI "\-oc " output.C
+Specify the name of the file to which generated code will be written.
+.TP
+.BI "\-module " module_name
+Defines the name of the module this data is associated with.  This
+is strictly a code-organizational tool.  Conceptually, a module is
+the highest level of grouping for interrogate data; a module may
+contain several libraries.  If this is omitted, no module name is
+specified.
+.TP
+.BI "\-library " library_name
+Defines the name of the library this data is associated with.  This
+is another code-organizational tool.  Typically, there will be one
+invocation of interrogate for each library, and there will be
+multiple libraries per module.  If this is omitted, no library name
+is specified.
+.TP
+.B \-c
+Generate function wrappers using the C calling convention.  Any
+scripting language that can call a C function should be able to
+make advantage of the interrogate database.
+.TP
+.B \-python
+Generate function wrappers using the Python calling convention.
+The shared library will be directly loadable as a Python module.
+However, C++ objects and methods will be converted into an object
+handle and a list of independent Python functions.
+.TP
+.B \-python\-obj
+Generate Python function wrappers that convert C++ objects to true
+python objects, with all methods converted to Python methods.  This
+is currently experimental.
+.TP
+.B \-python\-native
+Generate Python function wrappers that convert C++ objects to true
+python objects, with all methods converted to Python methods.  This
+is the recommended method for creating Python wrappers.
+.PP
+Any combination of \fB\-c\fP, \fB\-python\fP, or \fB\-python\-obj\fP
+may be specified. If all are omitted, the default is \fB\-c\fP.
+.TP
+.B \-track\-interpreter
+Generate code within each wrapper function to adjust the global
+variable "in_interpreter" to indicated whether code is running
+within the Panda C++ environment or within the high-level language.
+.SH "SEE ALSO"
+.BR interrogate (1),
+.BR test_interrogate (1)
diff --git a/doc/man/lwo-scan.1 b/doc/man/lwo-scan.1
new file mode 100644
index 0000000000..9da0cf39ae
--- /dev/null
+++ b/doc/man/lwo-scan.1
@@ -0,0 +1,12 @@
+.\" Automatically generated by lwo-scan -write-bam
+.TH LWO-SCAN 1 "27 December 2014" "1.9.0" Panda3D
+.SH NAME
+lwo-scan \- describe the contents of a Lightwave object file
+.SH SYNOPSIS
+\fBlwo-scan\fR [opts] input.lwo
+.SH DESCRIPTION
+This program simply reads a Lightwave object file and dumps its contents to standard output.  It's mainly useful for debugging problems with lwo2egg.
+.SH OPTIONS
+.TP
+.B \-h
+Display this help page.
diff --git a/doc/man/lwo2egg.1 b/doc/man/lwo2egg.1
new file mode 100644
index 0000000000..7f80833a09
--- /dev/null
+++ b/doc/man/lwo2egg.1
@@ -0,0 +1,91 @@
+.\" Automatically generated by lwo2egg -write-bam
+.TH LWO2EGG 1 "27 December 2014" "1.9.0" Panda3D
+.SH NAME
+lwo2egg \- convert a Lightwave Object file to .egg
+.SH SYNOPSIS
+\fBlwo2egg\fR [opts] input.lwo output.egg
+.br
+\fBlwo2egg\fR [opts] -o output.egg input.lwo
+.br
+\fBlwo2egg\fR [opts] input.lwo >output.egg
+.SH DESCRIPTION
+This program converts Lightwave Object (.lwo) files to egg.  Many rendering characteristics of Lightwave (like layered shaders, etc.) are not supported, but fundamental things like polygons and texture maps are.  This program is primarily designed to support files written by Lightwave version 6.x (LWO2 files), but it also has some limited support for version 5.x files (LWOB files).
+.SH OPTIONS
+.TP
+.B \-noabs
+Don't allow the input Lightwave file to have absolute pathnames.  If it does, abort with an error.  This option is designed to help detect errors when populating or building a standalone model tree, which should be self-contained and include only relative pathnames.
+.TP
+.B \-noexist
+Don't treat it as an error if the input file references pathnames (e.g. textures) that don't exist.  Normally, this will be flagged as an error and the command aborted; with this option, an egg file will be generated anyway, referencing pathnames that do not exist.
+.TP
+.B \-ignore
+Ignore non-fatal errors and generate an egg file anyway.
+.TP
+.BI "\-pr " "path_replace"
+Sometimes references to other files (textures, external references) are stored with a full path that is appropriate for some other system, but does not exist here.  This option may be used to specify how those invalid paths map to correct paths.  Generally, this is of the form 'orig_prefix=replacement_prefix', which indicates a particular initial sequence of characters that should be replaced with a new sequence; e.g. '/c/home/models=/beta/fish'.  If the replacement prefix does not begin with a slash, the file will then be searched for along the search path specified by -pp.  You may use standard filename matching characters ('*', '?', etc.) in the original prefix, and '**' as a component by itself stands for any number of components.
+
+This option may be repeated as necessary; each file will be tried against each specified method, in the order in which they appear in the command line, until the file is found.  If the file is not found, the last matching prefix is used anyway.
+.TP
+.BI "\-pp " "dirname"
+Adds the indicated directory name to the list of directories to search for filenames referenced by the source file.  This is used only for relative paths, or for paths that are made relative by a -pr replacement string that doesn't begin with a leading slash.  The model-path is always implicitly searched anyway.
+.TP
+.BI "\-ps " "path_store"
+Specifies the way an externally referenced file is to be represented in the resulting output file.  This assumes the named filename actually exists; see -pr to indicate how to deal with external references that have bad pathnames.  This option will not help you to find a missing file, but simply controls how filenames are represented in the output.
+
+The option may be one of: rel, abs, rel_abs, strip, or keep.  If either rel or rel_abs is specified, the files are made relative to the directory specified by -pd.  The default is rel.
+.TP
+.BI "\-pd " "path_directory"
+Specifies the name of a directory to make paths relative to, if '-ps rel' or '-ps rel_abs' is specified.  If this is omitted, the directory name is taken from the name of the output file.
+.TP
+.BI "\-pc " "target_directory"
+Copies textures and other dependent files into the indicated directory.  If a relative pathname is specified, it is relative to the directory specified with -pd, above.
+.TP
+.BI "\-ui " "units"
+Specify the units of the input Lightwave file.  By convention, this is assumed to be meters if it is unspecified.
+.TP
+.BI "\-uo " "units"
+Specify the units of the resulting egg file.  If this is specified, the vertices in the egg file will be scaled as necessary to make the appropriate units conversion; otherwise, the vertices will be left as they are.
+.TP
+.B \-no
+Strip all normals.
+.TP
+.B \-np
+Strip existing normals and redefine polygon normals.
+.TP
+.BI "\-nv " "threshold"
+Strip existing normals and redefine vertex normals.  Consider an edge between adjacent polygons to be smooth if the angle between them is less than threshold degrees.
+.TP
+.B \-nn
+Preserve normals exactly as they are.  This is the default.
+.TP
+.BI "\-tbn " "name"
+Compute tangent and binormal for the named texture coordinate set(s).  The name may include wildcard characters such as * and ?.  The normal must already exist or have been computed via one of the above options.  The tangent and binormal are used to implement bump mapping and related texture-based lighting effects.  This option may be repeated as necessary to name multiple texture coordinate sets.
+.TP
+.B \-tbnall
+Compute tangent and binormal for all texture coordinate sets.  This is equivalent to -tbn "*".
+.TP
+.B \-tbnauto
+Compute tangent and binormal for all normal maps. 
+.TP
+.BI "\-TS " "sx[,sy,sz]"
+Scale the model uniformly by the given factor (if only one number is given) or in each axis by sx, sy, sz (if three numbers are given).
+.TP
+.BI "\-TR " "x,y,z"
+Rotate the model x degrees about the x axis, then y degrees about the y axis, and then z degrees about the z axis.
+.TP
+.BI "\-TA " "angle,x,y,z"
+Rotate the model angle degrees counterclockwise about the given axis.
+.TP
+.BI "\-TT " "x,y,z"
+Translate the model by the indicated amount.
+
+All transformation options (-TS, -TR, -TA, -TT) are cumulative and are applied in the order they are encountered on the command line.
+.TP
+.BI "\-o " "filename"
+Specify the filename to which the resulting egg file will be written.  If this option is omitted, the last parameter name is taken to be the name of the output file, or standard output is used if there are no other parameters.
+.TP
+.BI "\-cs " "coordinate-system"
+Specify the coordinate system of the input Lightwave file.  Normally, this is y-up-left.
+.TP
+.B \-h
+Display this help page.
diff --git a/doc/man/make-prc-key.1 b/doc/man/make-prc-key.1
new file mode 100644
index 0000000000..ca4f4beedf
--- /dev/null
+++ b/doc/man/make-prc-key.1
@@ -0,0 +1,56 @@
+.TH MAKE-PRC-KEY 1 "27 December 2014" "" Panda3D
+.SH NAME
+make-prc-key \- generate keys for signing .prc files
+.SH SYNOPSIS
+.B make-prc-key
+[\fIopts\fP]
+1[,"\fIpass_phrase\fP"] [2[,"\fIpass_phrase\fP"] 3 ...]
+.SH DESCRIPTION
+This program generates one or more new keys to be used for signing
+a prc file.  The key itself is a completely arbitrary random bit
+sequence.  It is divided into a public and a private key; the public
+key is not secret and will be compiled into libdtool, while the private
+key should be safeguarded and will be written into a .cxx file that
+can be compiled as a standalone application.
+.PP
+The output is a public and private key pair for each trust level.  The
+form of the output for both public and private keys will be compilable
+C++ code; see \-a and \-b, below, for a complete description.
+.PP
+After the options, the remaining arguments list the individual trust
+level keys to generate.  For each integer specified, a different key
+will be created.  There should be one key for each trust level
+required; a typical application will only need one or two keys.
+.SH OPTIONS
+.TP
+.BI "\-a " pub_outfile.cxx
+Specifies the name and location of the public key output file
+to generate.  This file must then be named by the Config.pp
+variable PRC_PUBLIC_KEYS_FILENAME so that it will be compiled
+in with libdtool and available to verify signatures.  If this
+option is omitted, the previously-compiled value is used.
+.TP
+.BI "\-b " priv_outfile#.cxx
+Specifies the name and location of the private key output file(s)
+to generate.  A different output file will be generated for each
+different trust level; the hash mark '#' appearing in the file
+name will be filled in with the corresponding numeric trust level.
+The hash mark may be omitted if you only require one trust level.
+When compiled against dtool, each of these files will generate
+a program that can be used to sign a prc file with the corresponding
+trust level.
+.TP
+.BI "\-p " passphrase
+Uses the indicated pass phrase to encrypt the private key.
+This specifies an overall pass phrase; you may also specify
+a different pass phrase for each key by using the
+\fIkey\fB,"\fIpassphrase\fB"\fR syntax.
+.PP
+If a pass phrase is not specified on the command line, you will be
+prompted interactively.  Every user of the signing programs
+(outfile_sign1.cxx, etc.) will need to know the pass phrase
+in order to sign prc files.
+.PP
+If this is specified as the empty string (""), then the key
+will not be encrypted, and anyone can run the signing
+programs without having to supply a pass phrase.
diff --git a/doc/man/multify.1 b/doc/man/multify.1
new file mode 100644
index 0000000000..62de0b48fe
--- /dev/null
+++ b/doc/man/multify.1
@@ -0,0 +1,156 @@
+.TH MULTIFY 1 "27 December 2014" "" Panda3D
+.SH NAME
+multify \- manipulate .mf multifiles
+.SH SYNOPSIS
+.B multify \-[c|r|u|t|x] -f
+.I multifile_name.mf
+[
+.I options
+]
+.I subfile_name ...
+.SH DESCRIPTION
+\fBmultify\fP is used to store and extract files from a Panda Multifile.
+This is similar to a tar or zip file in that it is an archive file that
+contains a number of subfiles that may later be extracted.
+.PP
+Panda's VirtualFileSystem is capable of mounting Multifiles for direct
+access to the subfiles contained within without having to extract them
+out to independent files first.
+.PP
+The command-line options for multify are designed to be similar to those
+for \fBtar\fR(1), the traditional Unix archiver utility.
+.SH OPTIONS
+You must specify exactly one of the following command switches:
+.TP
+.B \-c
+Create a new Multifile archive.  Subfiles named on the command line
+will be added to the new Multifile.  If the Multifile already exists,
+it is first removed.
+.TP
+.B \-r
+Rewrite an existing Multifile archive.  Subfiles named on the command
+line will be added to the Multifile or will replace subfiles within
+the Multifile with the same name.  The Multifile will be repacked
+after completion, even if no Subfiles were added.
+.TP
+.B \-u
+Update an existing Multifile archive.  This is similar to \fB\-r\fP,
+except that files are compared byte\-for\-byte with their corresponding
+files in the archive first.  If they have not changed, the multifile
+is not modified (other than to repack it if necessary).
+.TP
+.B \-t
+List the contents of an existing Multifile.  With -v, this shows
+the size of each Subfile and its compression ratio, if compressed.
+.TP
+.B \-x
+Extract the contents of an existing Multifile.  The Subfiles named on
+the command line, or all Subfiles if nothing is named, are extracted
+into the current directory or into whichever directory is specified
+with \fB\-C\fP.
+.TP
+.B \-k
+Delete (kill) the named Subfiles from the Multifile.  The Multifile
+will be repacked after completion.
+.PP
+You must always specify the following switch:
+.TP
+.BI "\-f " multifile_name.mf
+Names the Multifile that will be operated on.
+.PP
+The remaining switches are optional:
+.TP
+.B \-v
+Run verbosely.  In \-c, \-r, or \-x mode, list each file as it is
+written or extracted.  In \-t mode, list more information about each
+file.
+.TP
+.B \-z
+Compress subfiles as they are written to the Multifile.  Unlike tar
+(but like zip), subfiles are compressed individually, instead of the
+entire archive being compressed as one stream.  It is not necessary
+to specify \-z when extracting compressed subfiles; they will always be
+decompressed automatically.  Also see \-Z, which restricts which
+subfiles will be compressed based on the filename extension.
+.TP
+.B \-e
+Encrypt subfiles as they are written to the Multifile using the password
+specified with \-p, below.  Subfiles are encrypted individually, rather
+than encrypting the entire multifile, and different subfiles may be
+encrypted using different passwords (although this requires running
+multify multiple times).  It is not possible to encrypt the multifile's
+table of contents using this interface, but see the
+.BR pencrypt (1)
+program to encrypt the entire multifile after it has been generated.
+.TP
+.BI "\-p " password
+Specifies the password to encrypt or decrypt subfiles.  If this is not
+specified, and passwords are required, the user will be prompted from
+standard input.
+.TP
+.BI "\-P " prefix
+Specifies a header_prefix to write to the beginning of the multifile.
+This is primarily useful for creating a multifile that can be invoked
+directly as a program from the shell on Unix-like environments,
+for instance, p3d files.  The header_prefix must begin with a hash
+mark and end with a newline; this will be enforced if it is not
+already so.  This only has effect in conjunction with with -c, -u,
+or -k.
+.TP
+.BI "\-F " scale_factor
+Specify a Multifile scale factor.  This is only necessary to support
+Multifiles that will exceed 4GB in size.  The default scale factor is
+1, which should be sufficient for almost any application, but the total
+size of the Multifile will be limited to 4GB * \fIscale_factor\fP.
+The size of individual subfiles may not exceed 4GB in any case.
+.TP
+.BI "\-C " extract_dir
+Change to the named directory before working on files;
+that is, extraction/creation/update and replace will be based on this path
+.TP
+.BI "\-O
+With \-x, extract subfiles to standard output instead of to disk.
+.TP
+.BI "\-Z " extension_list
+Specify a comma-separated list of filename extensions that represent
+files that are not to be compressed.  The default if this is omitted is
+"\fIjpg,png,mp3,ogg\fP".  Specify \-Z "" (be sure to include the space)
+to allow all files to be compressed.
+.TP
+.BI "\-X " extension_list
+Specify a comma-separated list of filename extensions that represent
+text files.  These files are opened and read in text mode, and added to
+the multifile with the text flag set.  The default if this is omitted is
+"\fItxt\fP".  Specify \-X "" (be sure to include the space) to record
+all files in binary mode.
+.TP
+.BI "\-T " flag
+Enable or disable the recording of file timestamps within the multifile.
+If \fIflag\fP is 1, timestamps will be recorded within the multifile for
+each subfile added; this is the default behavior.  If <flag> is 0,
+timestamps will not be recorded, which will make it easier to do a
+bitwise comparison between multifiles to determine whether their
+contents are equivalent.
+.TP
+.B \-1 .. \-9
+Specify the compression level when \-z is in effect.  Larger numbers
+generate slightly smaller files, but compression takes longer.  The
+default is \-6.
+.TP
+.BI "\-S " file.crt[,chain.crt[,file.key[,"password"]]]
+Sign the multifile.  The signing certificate should be in PEM form in
+\fIfile.crt\fP, with its private key in PEM form in \fIfile.key\fP.
+If the key is encrypted on-disk, specify the decryption password as
+the third option.  If a certificate chain is required, \fIchain.crt\fP
+should also be specified; note that the separating commas should be
+supplied even if this optional filename is omitted.
+You may also provide a single composite file that contains the
+certificate, chain, and key in the same file.
+PEM form is the form accepted by the Apache web server.  The
+signature is written to the multifile to prove it is unchanged; any
+subsequent change to the multifile will invalidate the signature.
+This parameter may be repeated to sign the multifile with additional
+certificates.
+.SH "SEE ALSO"
+.BR pencrypt (1),
+.BR pzip (1)
diff --git a/doc/man/obj2egg.1 b/doc/man/obj2egg.1
new file mode 100644
index 0000000000..842f0527a7
--- /dev/null
+++ b/doc/man/obj2egg.1
@@ -0,0 +1,75 @@
+.\" Automatically generated by obj2egg -write-bam
+.TH OBJ2EGG 1 "27 December 2014" "1.9.0" Panda3D
+.SH NAME
+obj2egg \- convert .obj files to .egg
+.SH SYNOPSIS
+\fBobj2egg\fR [opts] input.obj output.egg
+.br
+\fBobj2egg\fR [opts] -o output.egg input.obj
+.br
+\fBobj2egg\fR [opts] input.obj >output.egg
+.SH DESCRIPTION
+This program converts obj files to egg.  It only converts polygon data, with no fancy tricks.  Very bare\-bones at the moment; not even texture maps are supported.
+.SH OPTIONS
+.TP
+.B \-noabs
+Don't allow the input obj file to have absolute pathnames.  If it does, abort with an error.  This option is designed to help detect errors when populating or building a standalone model tree, which should be self-contained and include only relative pathnames.
+.TP
+.B \-noexist
+Don't treat it as an error if the input file references pathnames (e.g. textures) that don't exist.  Normally, this will be flagged as an error and the command aborted; with this option, an egg file will be generated anyway, referencing pathnames that do not exist.
+.TP
+.B \-ignore
+Ignore non-fatal errors and generate an egg file anyway.
+.TP
+.BI "\-ui " "units"
+Specify the units of the input obj file.  Normally, this can be inferred from the file itself.
+.TP
+.BI "\-uo " "units"
+Specify the units of the resulting egg file.  If this is specified, the vertices in the egg file will be scaled as necessary to make the appropriate units conversion; otherwise, the vertices will be left as they are.
+.TP
+.B \-points
+Construct <PointLight> entries for any unreferenced vertices, to make them visible.
+.TP
+.B \-no
+Strip all normals.
+.TP
+.B \-np
+Strip existing normals and redefine polygon normals.
+.TP
+.BI "\-nv " "threshold"
+Strip existing normals and redefine vertex normals.  Consider an edge between adjacent polygons to be smooth if the angle between them is less than threshold degrees.
+.TP
+.B \-nn
+Preserve normals exactly as they are.  This is the default.
+.TP
+.BI "\-tbn " "name"
+Compute tangent and binormal for the named texture coordinate set(s).  The name may include wildcard characters such as * and ?.  The normal must already exist or have been computed via one of the above options.  The tangent and binormal are used to implement bump mapping and related texture-based lighting effects.  This option may be repeated as necessary to name multiple texture coordinate sets.
+.TP
+.B \-tbnall
+Compute tangent and binormal for all texture coordinate sets.  This is equivalent to -tbn "*".
+.TP
+.B \-tbnauto
+Compute tangent and binormal for all normal maps. 
+.TP
+.BI "\-TS " "sx[,sy,sz]"
+Scale the model uniformly by the given factor (if only one number is given) or in each axis by sx, sy, sz (if three numbers are given).
+.TP
+.BI "\-TR " "x,y,z"
+Rotate the model x degrees about the x axis, then y degrees about the y axis, and then z degrees about the z axis.
+.TP
+.BI "\-TA " "angle,x,y,z"
+Rotate the model angle degrees counterclockwise about the given axis.
+.TP
+.BI "\-TT " "x,y,z"
+Translate the model by the indicated amount.
+
+All transformation options (-TS, -TR, -TA, -TT) are cumulative and are applied in the order they are encountered on the command line.
+.TP
+.BI "\-o " "filename"
+Specify the filename to which the resulting egg file will be written.  If this option is omitted, the last parameter name is taken to be the name of the output file, or standard output is used if there are no other parameters.
+.TP
+.BI "\-cs " "coordinate-system"
+Specify the coordinate system of the input obj file.  Normally, this is z-up.
+.TP
+.B \-h
+Display this help page.
diff --git a/doc/man/p3dcparse.1 b/doc/man/p3dcparse.1
new file mode 100644
index 0000000000..6a37f09d2c
--- /dev/null
+++ b/doc/man/p3dcparse.1
@@ -0,0 +1,38 @@
+.TH DCPARSE 1 "27 December 2014" "" Panda3D
+.SH NAME
+dcparse \- read distributed class files
+.SH SYNOPSIS
+.B p3dcparse
+[
+.I options
+] [
+.I file1 file2 ...
+]
+.br
+.B p3dcparse -h
+.SH DESCRIPTION
+This program reads one or more DC files, which are used to describe the
+communication channels in the distributed class system.  By default,
+the file(s) are read and concatenated, and a single hash code is printed
+corresponding to the file's contents.
+.SH OPTIONS
+.TP
+.B \-v
+Writes a complete parseable version of the file to standard
+output instead of printing a hash code.
+.TP
+.B \-b
+Writes a brief parseable version of the file instead of a full
+version.  This is semantically the same as the output produced
+the above \fB\-v\fP option--reading it would produce exactly the
+same results--but it is designed to be slightly obfuscated.  The
+comments and parameter names are not included.
+.TP
+.B \-c
+Write a list of class names, showing the inheritance hierarchy.
+Some class names will be listed twice in the presence of multiple
+inheritance.
+.TP
+.B \-f
+Write a complete list of field names available for each class,
+including all inherited fields.
diff --git a/doc/man/pdecrypt.1 b/doc/man/pdecrypt.1
new file mode 120000
index 0000000000..cafeec2fb0
--- /dev/null
+++ b/doc/man/pdecrypt.1
@@ -0,0 +1 @@
+pencrypt.1
\ No newline at end of file
diff --git a/doc/man/pencrypt.1 b/doc/man/pencrypt.1
new file mode 100644
index 0000000000..f1493da6fe
--- /dev/null
+++ b/doc/man/pencrypt.1
@@ -0,0 +1,92 @@
+.TH PENCRYPT 1 "27 December 2014" "" Panda3D
+.SH NAME
+pencrypt, pdecrypt \- encrypt or decrypt a file
+.SH SYNOPSIS
+.B pencrypt
+[
+.I opts
+]
+.I file
+[
+.I file2 file3 ...
+]
+.br
+.B pencrypt -o
+.I dest_file file
+.PP
+.B pdecrypt
+[
+.B -p
+.I password
+]
+.I file.pe
+[
+.I file2.pe file3.pe ...
+]
+.br
+.B pdecrypt
+[
+.B -p
+.I password
+]
+.B -o
+.I dest_file file.pe
+.SH DESCRIPTION
+\fBpencrypt\fP will apply an encryption algorithm to a file (or multiple files),
+creating an encrypted version of each file which can only be recovered using
+pdecrypt and the same password that was supplied to \fBpencrypt\fP.  The
+compressed versions are written to a file with the same name as the original,
+but the extension .pe added to the filename, and the original file is removed
+(unless the version with \fB\-o\fP is used, in which case you can encrypt only
+one file, you specify the destination file name, and the original file is not
+removed).
+.PP
+Note that if you are adding files to a Panda multifile (.mf file) with the
+.BR multify (1)
+command, it is not necessary to encrypt them separately; \fBmultify\fP has an
+inline encryption option.
+.PP
+\fBpdecrypt\fP reverses the operation of a previous \fBpdecrypt\fP command.
+It decrypts the contents of the named source file(s) and removes the .pe
+extension.  The encryption algorithm need not be specified; it can be
+determined by examining the header of each encrypted file.  The password
+must match the encryption password exactly.  If it does not, an error may
+or may not be reported; but the file will not be decrypted correctly even
+if no error is reported.
+.SH OPTIONS
+.TP
+.BI "\-p " \"password\"
+Specifies the password to use for encryption.  There are no
+restrictions on the password length or contents, but longer passwords
+are more secure.  If this is not specified, the user is prompted from
+standard input.
+.PP
+The following options are only available to \fBpencrypt\fP.  These settings
+are automatically read from the header of the encrypted file by \fBpdecrypt\fP.
+.TP
+.B \-t
+Read the file as a text file.  This will automatically convert universal
+end-of-line characters into a newline character, ascii 10.
+.TP
+.BI "\-a " \"algorithm\"
+Specifies the particular encryption algorithm to use.  The complete
+set of available algorithms is defined by the current version of
+OpenSSL.  The default algorithm is taken from the encryption-
+algorithm config variable.
+.TP
+.BI "\-k " key_length
+Specifies the key length, in bits, for the selected encryption
+algorithm.  This only makes sense for those algorithms that support
+a variable key length.  The default value is taken from the
+\fBencryption\-key\-length\fP config variable.
+.TP
+.BI "\-i " iteration_count
+Specifies the number of times the password is hashed to generate
+a key.  The only purpose of this is to make it computationally
+more expensive for an attacker to search the key space exhaustively.
+This should be a multiple of 1,000 and should not exceed about 65
+million; the value 0 indicates just one application of the hashing
+algorithm.  The default value is taken from the
+\fBencryption\-iteration\-count\fP config variable.
+.SH "SEE ALSO"
+.BR multify (1)
diff --git a/doc/man/pfm-bba.1 b/doc/man/pfm-bba.1
new file mode 100644
index 0000000000..691b361911
--- /dev/null
+++ b/doc/man/pfm-bba.1
@@ -0,0 +1,17 @@
+.\" Automatically generated by pfm-bba -write-bam
+.TH PFM-BBA 1 "27 December 2014" "1.9.0" Panda3D
+.SH NAME
+pfm-bba \- generate .bba files from .pfm files
+.SH SYNOPSIS
+.SH DESCRIPTION
+pfm\-bba generates a .bba file from a .pfm file that lists the planar bounding volume of the pfm's internal data.
+.SH OPTIONS
+.TP
+.B \-z
+Treats (0,0,0) in the pfm file as a special don't-touch value.
+.TP
+.BI "\-o " "filename"
+Specify the filename to which the resulting bba file will be written.
+.TP
+.B \-h
+Display this help page.
diff --git a/doc/man/pfm-trans.1 b/doc/man/pfm-trans.1
new file mode 100644
index 0000000000..f2ae7ddf33
--- /dev/null
+++ b/doc/man/pfm-trans.1
@@ -0,0 +1,70 @@
+.\" Automatically generated by pfm-trans -write-bam
+.TH PFM-TRANS 1 "27 December 2014" "1.9.0" Panda3D
+.SH NAME
+pfm-trans \- transform .pfm files
+.SH SYNOPSIS
+.SH DESCRIPTION
+pfm\-trans reads an pfm file and transforms it, filters it, operates on it, writing the output to another pfm file.  A pfm file contains a 2\-d table of floating\-point values.
+.SH OPTIONS
+.TP
+.B \-z
+Treats (0,0,0) in the pfm file as a special don't-touch value.
+.TP
+.BI "\-nan " "num_channels"
+Treats a NaN in any of the first num_channels channels as a special don't-touch value.
+.TP
+.BI "\-resize " "width,height"
+Resamples the pfm file to scale it to the indicated grid size.  A simple box filter is applied during the scale.  Don't confuse this with -TS, which scales the individual point values, but doesn't change the number of points.
+.TP
+.BI "\-crop " "xbegin,xend,ybegin,yend"
+Crops the pfm file to the indicated subregion.
+.TP
+.B \-autocrop
+Automatically crops to the smallest possible rectangle that includes all points.  Requires -z or -nan.
+.TP
+.BI "\-rotate " "degrees"
+Rotates the pfm file the specified number of degrees counterclockwise, which must be a multiple of 90.
+.TP
+.B \-mirror_x
+Flips the pfm file about the x axis.
+.TP
+.B \-mirror_y
+Flips the pfm file about the y axis.
+.TP
+.BI "\-TS " "sx[,sy,sz]"
+Scale the model uniformly by the given factor (if only one number is given) or in each axis by sx, sy, sz (if three numbers are given).
+.TP
+.BI "\-TR " "x,y,z"
+Rotate the model x degrees about the x axis, then y degrees about the y axis, and then z degrees about the z axis.
+.TP
+.BI "\-TA " "angle,x,y,z"
+Rotate the model angle degrees counterclockwise about the given axis.
+.TP
+.BI "\-TT " "x,y,z"
+Translate the model by the indicated amount.
+
+All transformation options (-TS, -TR, -TA, -TT) are cumulative and are applied in the order they are encountered on the command line.
+.TP
+.BI "\-o " "filename"
+Specify the filename to which the resulting pfm file will be written.  This is only valid when there is only one input pfm file on the command line.  If you want to process multiple files simultaneously, you must use -d.
+.TP
+.BI "\-d " "dirname"
+Specify the name of the directory in which to write the processed pfm files.  If you are processing only one pfm file, this may be omitted in lieu of the -o option.
+.TP
+.BI "\-vis " "filename.bam"
+Generates a bam file that represents a visualization of the pfm file as a 3-D geometric mesh.  If -vistex is specified, the mesh is textured.
+.TP
+.B \-visinv
+Inverts the visualization, generating a uniform 2-d mesh with the 3-d depth values encoded in the texture coordinates.
+.TP
+.B \-vis2d
+Respect only the first two components of each depth value, ignoring z.
+.TP
+.BI "\-vistex " "texture.jpg"
+Specifies the name of the texture to apply to the visualization.
+.TP
+.BI "\-ls " "filename.txt"
+Lists the points in the file to the indicated text file.
+.TP
+.B \-h
+Display this help page.
diff --git a/doc/man/punzip.1 b/doc/man/punzip.1
new file mode 120000
index 0000000000..93e1901659
--- /dev/null
+++ b/doc/man/punzip.1
@@ -0,0 +1 @@
+pzip.1
\ No newline at end of file
diff --git a/doc/man/pview.1 b/doc/man/pview.1
new file mode 100644
index 0000000000..a45fb8110f
--- /dev/null
+++ b/doc/man/pview.1
@@ -0,0 +1,50 @@
+.TH PVIEW 1 "27 December 2014" "" Panda3D
+.SH NAME
+pview \- quickly view a Panda model and/or animation
+.SH SYNOPSIS
+.B pview
+[
+.I opts
+]
+.I model
+[
+.I model ...
+]
+.br
+.B pview \-h
+.SH DESCRIPTION
+\fBpview\fP opens a quick Panda window for viewing one or more models
+and/or animations.
+.SH OPTIONS
+.TP
+.B \-a
+Convert and play animations, if loading an external file type
+(like .mb) directly and if the converter supports animations.
+Also implicitly enables the animation controls.
+.TP
+.B \-c
+Automatically center models within the viewing window on startup.
+This can also be achieved with the 'c' hotkey at runtime.
+.TP
+.B \-l
+Open the window before loading any models with the text "Loading"
+displayed in the window.  The default is not to open the window
+until all models are loaded.
+.TP
+.B \-i
+Ignore bundle/group names.  Normally, the <group> name must match
+the <bundle> name, or the animation will not be used.
+.TP
+.BI "\-s " filename
+After displaying the models, immediately take a screenshot and
+exit.
+.TP
+.B \-D
+Delete the model files after loading them (presumably this option
+will only be used when loading a temporary model file).
+.TP
+.B \-V
+Report the current version of Panda, and exit.
+.TP
+.B \-h
+Display this help text.
diff --git a/doc/man/pzip.1 b/doc/man/pzip.1
new file mode 100644
index 0000000000..22ac0d931a
--- /dev/null
+++ b/doc/man/pzip.1
@@ -0,0 +1,64 @@
+.TH PZIP 1 "27 December 2014" "" Panda3D
+.SH NAME
+pzip, punzip \- compress or decompress files
+.SH SYNOPSIS
+.B pzip
+.I file
+[
+.I file2 file3 ...
+]
+.br
+.B pzip -c < \fIfile\fB > \fIdest_file\fB
+.br
+.B pzip -o
+.I dest_file file
+.PP
+.B punzip
+.I file.pz
+[
+.I file2.pz file3.pz ...
+]
+.br
+.B punzip -c < \fIfile.pz\fB > \fIdest_file\fB
+.br
+.B punzip -o
+.I dest_file file.pz
+.SH DESCRIPTION
+The \fBpzip\fP program compresses the named file(s) using the Panda
+native compression algorithm (gzip in practice, but with a different
+file header).  The compressed versions are written to a file with the
+same name as the original, but the extension .pz added to the
+filename, and the original file is removed (unless the version with
+\fB\-o\fP is used, in which case you can compress only one file, you
+specify the destination file name, and the original file is not removed).
+.PP
+In many cases, Panda can read the resulting .pz file directly,
+exactly as if it were still in its uncompressed original form.
+In fact, unless \fBvfs\-implicit\-pz\fP is set to \fBfalse\fP in your
+Config.prc file, you can also load the file by referencing it with its
+original filename (without the .pz extension), even though it no longer
+exists under that filename, and Panda will find the .pz file and
+transparently decompress it on the fly, as if the original, uncompressed
+file still existed.
+.PP
+Note that if you are adding files to a Panda multifile (.mf file) with the
+.BR multify (1)
+command, it is not necessary to encrypt them separately; \fBmultify\fP has an
+inline encryption option.
+.PP
+\fBpunzip\fP reverses the operation of a previous \fBpzip\fP command.
+It uncompresses the contents of the named source file(s) and removes
+the .pz extension.
+.SH OPTIONS
+These options apply to \fBpzip\fP only.
+.TP
+.B \-1
+compress faster
+.TP
+.B \-6
+compress default
+.TP
+.B \-9
+compress better (intermediate compression levels supported also)
+.SH "SEE ALSO"
+.BR multify (1)
diff --git a/doc/man/softcvs.1 b/doc/man/softcvs.1
new file mode 100644
index 0000000000..e0f49ab949
--- /dev/null
+++ b/doc/man/softcvs.1
@@ -0,0 +1,22 @@
+.\" Automatically generated by softcvs -write-bam
+.TH SOFTCVS 1 "27 December 2014" "1.9.0" Panda3D
+.SH NAME
+softcvs \- prepare a SoftImage database directory for adding to CVS
+.SH SYNOPSIS
+\fBsoftcvs\fR [opts]
+.SH DESCRIPTION
+softcvs is designed to prepare a directory hierarchy representing a SoftImage database for adding to CVS.  First, it eliminates SoftImage's silly filename\-based versioning system by renaming versioned filenames higher than 1\-0 back to version 1\-0.  Then, it rolls up all the files for each scene except the texture images into a Panda multifile, which is added to CVS; the texture images are directly added to CVS where they are.
+.PP
+The reduction of hundreds of SoftImage files per scene down to one multifile and a handle of texture images should greatly improve the update and commit times of CVS.
+.PP
+You must run this from within the root of a SoftImage database directory; e.g. the directory that contains SCENES, PICTURES, MODELS, and so on.
+.SH OPTIONS
+.TP
+.B \-nc
+Do not attempt to add newly-created files to CVS.  The default is to add them.
+.TP
+.BI "\-cvs " "cvs_binary"
+Specify how to run the cvs program for adding newly-created files.  The default is simply "cvs".
+.TP
+.B \-h
+Display this help page.
diff --git a/doc/man/test_interrogate.1 b/doc/man/test_interrogate.1
new file mode 100644
index 0000000000..325c544eed
--- /dev/null
+++ b/doc/man/test_interrogate.1
@@ -0,0 +1,40 @@
+.TH TEST_INTERROGATE 1 "27 December 2014" "" Panda3D
+.SH NAME
+test_interrogate \- report symbols defined in an interrogate module
+.SH SYNOPSIS
+.B test_interrogate
+[
+.I opts
+]
+.I libfile.so
+[
+.I libfile.so ...
+]
+.SH DESCRIPTION
+Loads the given shared library or libraries, if possible, and reports the
+symbols, types, and functions available within those libraries as reported
+by interrogate.
+.PP
+In lieu of loading a shared library, you may also read the interrogate
+database file directly by specifying a filename like \fIlibfile.in\fP.
+This will report the symbols defined in that file only (without pulling
+in dependent files), and will not have any function pointers available.
+.SH OPTIONS
+.TP
+.BI "\-p " path
+Specify the search path for *.in files.  This option may be repeated.
+.TP
+.B \-f
+Give a detailed report of each function in the database, including
+synthesized functions like upcasts and downcasts.
+.TP
+.B \-t 
+Give a detailed report of every type in the database, including types
+like pointers and const pointers.
+.TP
+.B \-q
+Quickly load up each shared library, if possible, and then immediately
+exit.  Useful for quickly determining whether a library can even load.
+.SH "SEE ALSO"
+.BR interrogate (1),
+.BR interrogate_module (1)
diff --git a/doc/man/text-stats.1 b/doc/man/text-stats.1
new file mode 100644
index 0000000000..187f14a3a6
--- /dev/null
+++ b/doc/man/text-stats.1
@@ -0,0 +1,20 @@
+.\" Automatically generated by text-stats -write-bam
+.TH TEXT-STATS 1 "27 December 2014" "1.9.0" Panda3D
+.SH NAME
+text-stats \- text-based PStats client
+.SH SYNOPSIS
+.SH DESCRIPTION
+This is a simple PStats server that listens on a TCP port for a connection from a PStatClient in a Panda player.  It will then report frame rate and timing information sent by the player.
+.SH OPTIONS
+.TP
+.BI "\-p " "port"
+Specify the TCP port to listen for connections on.  By default, this is taken from the pstats-host Config variable.
+.TP
+.B \-r
+Show the raw frame data, in addition to boiling it down to a total time per collector.
+.TP
+.BI "\-o " "filename"
+Filename where to print. If not given then stderr is being used.
+.TP
+.B \-h
+Display this help page.
diff --git a/doc/man/vrml-trans.1 b/doc/man/vrml-trans.1
new file mode 100644
index 0000000000..e78342935c
--- /dev/null
+++ b/doc/man/vrml-trans.1
@@ -0,0 +1,19 @@
+.\" Automatically generated by vrml-trans -write-bam
+.TH VRML-TRANS 1 "27 December 2014" "1.9.0" Panda3D
+.SH NAME
+vrml-trans \- reads and writes VRML 2.0 files
+.SH SYNOPSIS
+\fBvrml-trans\fR [opts] input.wrl > output.wrl
+.br
+\fBvrml-trans\fR [opts] input.wrl output.wrl
+.br
+\fBvrml-trans\fR [opts] -o output.wrl input.wrl
+.SH DESCRIPTION
+This program reads a VRML 2.0 file (.wrl) and writes an essentially equivalent .wrl file.  It is primarily useful for debugging the VRML parser that is part of the Pandatool library.
+.SH OPTIONS
+.TP
+.BI "\-o " "filename"
+Specify the filename to which the resulting .wrl file will be written.  If this option is omitted, the last parameter name is taken to be the name of the output file.
+.TP
+.B \-h
+Display this help page.
diff --git a/doc/man/vrml2egg.1 b/doc/man/vrml2egg.1
new file mode 100644
index 0000000000..45a5ea5f05
--- /dev/null
+++ b/doc/man/vrml2egg.1
@@ -0,0 +1,72 @@
+.\" Automatically generated by vrml2egg -write-bam
+.TH VRML2EGG 1 "27 December 2014" "1.9.0" Panda3D
+.SH NAME
+vrml2egg \- convert VRML 2.0 model files to .egg
+.SH SYNOPSIS
+\fBvrml2egg\fR [opts] input.wrl output.egg
+.br
+\fBvrml2egg\fR [opts] -o output.egg input.wrl
+.br
+\fBvrml2egg\fR [opts] input.wrl >output.egg
+.SH DESCRIPTION
+This program converts VRML 2.0 model files to egg.  Animated files, and VRML 1.0 files, are not supported.
+.SH OPTIONS
+.TP
+.B \-noabs
+Don't allow the input VRML file to have absolute pathnames.  If it does, abort with an error.  This option is designed to help detect errors when populating or building a standalone model tree, which should be self-contained and include only relative pathnames.
+.TP
+.B \-noexist
+Don't treat it as an error if the input file references pathnames (e.g. textures) that don't exist.  Normally, this will be flagged as an error and the command aborted; with this option, an egg file will be generated anyway, referencing pathnames that do not exist.
+.TP
+.B \-ignore
+Ignore non-fatal errors and generate an egg file anyway.
+.TP
+.BI "\-ui " "units"
+Specify the units of the input VRML file.  Normally, this can be inferred from the file itself.
+.TP
+.BI "\-uo " "units"
+Specify the units of the resulting egg file.  If this is specified, the vertices in the egg file will be scaled as necessary to make the appropriate units conversion; otherwise, the vertices will be left as they are.
+.TP
+.B \-no
+Strip all normals.
+.TP
+.B \-np
+Strip existing normals and redefine polygon normals.
+.TP
+.BI "\-nv " "threshold"
+Strip existing normals and redefine vertex normals.  Consider an edge between adjacent polygons to be smooth if the angle between them is less than threshold degrees.
+.TP
+.B \-nn
+Preserve normals exactly as they are.  This is the default.
+.TP
+.BI "\-tbn " "name"
+Compute tangent and binormal for the named texture coordinate set(s).  The name may include wildcard characters such as * and ?.  The normal must already exist or have been computed via one of the above options.  The tangent and binormal are used to implement bump mapping and related texture-based lighting effects.  This option may be repeated as necessary to name multiple texture coordinate sets.
+.TP
+.B \-tbnall
+Compute tangent and binormal for all texture coordinate sets.  This is equivalent to -tbn "*".
+.TP
+.B \-tbnauto
+Compute tangent and binormal for all normal maps. 
+.TP
+.BI "\-TS " "sx[,sy,sz]"
+Scale the model uniformly by the given factor (if only one number is given) or in each axis by sx, sy, sz (if three numbers are given).
+.TP
+.BI "\-TR " "x,y,z"
+Rotate the model x degrees about the x axis, then y degrees about the y axis, and then z degrees about the z axis.
+.TP
+.BI "\-TA " "angle,x,y,z"
+Rotate the model angle degrees counterclockwise about the given axis.
+.TP
+.BI "\-TT " "x,y,z"
+Translate the model by the indicated amount.
+
+All transformation options (-TS, -TR, -TA, -TT) are cumulative and are applied in the order they are encountered on the command line.
+.TP
+.BI "\-o " "filename"
+Specify the filename to which the resulting egg file will be written.  If this option is omitted, the last parameter name is taken to be the name of the output file, or standard output is used if there are no other parameters.
+.TP
+.BI "\-cs " "coordinate-system"
+Specify the coordinate system of the input VRML file.  Normally, this is y-up.
+.TP
+.B \-h
+Display this help page.
diff --git a/doc/man/x-trans.1 b/doc/man/x-trans.1
new file mode 100644
index 0000000000..ce80ae6632
--- /dev/null
+++ b/doc/man/x-trans.1
@@ -0,0 +1,17 @@
+.\" Automatically generated by x-trans -write-bam
+.TH X-TRANS 1 "27 December 2014" "1.9.0" Panda3D
+.SH NAME
+x-trans \- reads and writes DirectX .x files
+.SH SYNOPSIS
+\fBx-trans\fR [opts] input.x output.x
+.br
+\fBx-trans\fR [opts] -o output.x input.x
+.SH DESCRIPTION
+This program reads a DirectX retained\-mode file (.x) and writes an essentially equivalent .x file.  It is primarily useful for debugging the X file parser that is part of the Pandatool library.
+.SH OPTIONS
+.TP
+.BI "\-o " "filename"
+Specify the filename to which the resulting .x file will be written.  If this option is omitted, the last parameter name is taken to be the name of the output file.
+.TP
+.B \-h
+Display this help page.
diff --git a/doc/man/x2egg.1 b/doc/man/x2egg.1
new file mode 100644
index 0000000000..48e514b023
--- /dev/null
+++ b/doc/man/x2egg.1
@@ -0,0 +1,103 @@
+.\" Automatically generated by x2egg -write-bam
+.TH X2EGG 1 "27 December 2014" "1.9.0" Panda3D
+.SH NAME
+x2egg \- convert a DirectX .x file to an .egg file
+.SH SYNOPSIS
+\fBx2egg\fR [opts] input.x output.egg
+.br
+\fBx2egg\fR [opts] -o output.egg input.x
+.br
+\fBx2egg\fR [opts] input.x >output.egg
+.SH DESCRIPTION
+This program converts DirectX retained\-mode (.x) files to egg.  Polygon meshes, materials, and textures, as well as skeleton animation and skinning data, are supported.  All animations found in the source .x file are written together into the same egg file.
+.SH OPTIONS
+.TP
+.B \-noabs
+Don't allow the input DirectX file to have absolute pathnames.  If it does, abort with an error.  This option is designed to help detect errors when populating or building a standalone model tree, which should be self-contained and include only relative pathnames.
+.TP
+.B \-noexist
+Don't treat it as an error if the input file references pathnames (e.g. textures) that don't exist.  Normally, this will be flagged as an error and the command aborted; with this option, an egg file will be generated anyway, referencing pathnames that do not exist.
+.TP
+.B \-ignore
+Ignore non-fatal errors and generate an egg file anyway.
+.TP
+.BI "\-a " "name"
+Specify the name of the animated character to generate.  This option forces the model to be converted as an animatable character, even if animation channels are not found in the file.  Without this option, the model is converted as a static model (which is usually more efficient to load within Panda), unless animation channels are present in the .x file.
+.TP
+.BI "\-fr " "fps"
+Specify the frame rate of the resulting animation.  If this is omitted or 0, the frame rate is inferred from the file itself; but note that the file must contain evenly-spaced keyframes.
+.TP
+.B \-anim
+Generate animation data only (all geometry will be discarded).
+.TP
+.B \-model
+Generate model data only (all animation data will be discarded).
+.TP
+.BI "\-pr " "path_replace"
+Sometimes references to other files (textures, external references) are stored with a full path that is appropriate for some other system, but does not exist here.  This option may be used to specify how those invalid paths map to correct paths.  Generally, this is of the form 'orig_prefix=replacement_prefix', which indicates a particular initial sequence of characters that should be replaced with a new sequence; e.g. '/c/home/models=/beta/fish'.  If the replacement prefix does not begin with a slash, the file will then be searched for along the search path specified by -pp.  You may use standard filename matching characters ('*', '?', etc.) in the original prefix, and '**' as a component by itself stands for any number of components.
+
+This option may be repeated as necessary; each file will be tried against each specified method, in the order in which they appear in the command line, until the file is found.  If the file is not found, the last matching prefix is used anyway.
+.TP
+.BI "\-pp " "dirname"
+Adds the indicated directory name to the list of directories to search for filenames referenced by the source file.  This is used only for relative paths, or for paths that are made relative by a -pr replacement string that doesn't begin with a leading slash.  The model-path is always implicitly searched anyway.
+.TP
+.BI "\-ps " "path_store"
+Specifies the way an externally referenced file is to be represented in the resulting output file.  This assumes the named filename actually exists; see -pr to indicate how to deal with external references that have bad pathnames.  This option will not help you to find a missing file, but simply controls how filenames are represented in the output.
+
+The option may be one of: rel, abs, rel_abs, strip, or keep.  If either rel or rel_abs is specified, the files are made relative to the directory specified by -pd.  The default is rel.
+.TP
+.BI "\-pd " "path_directory"
+Specifies the name of a directory to make paths relative to, if '-ps rel' or '-ps rel_abs' is specified.  If this is omitted, the directory name is taken from the name of the output file.
+.TP
+.BI "\-pc " "target_directory"
+Copies textures and other dependent files into the indicated directory.  If a relative pathname is specified, it is relative to the directory specified with -pd, above.
+.TP
+.BI "\-ui " "units"
+Specify the units of the input DirectX file.
+.TP
+.BI "\-uo " "units"
+Specify the units of the resulting egg file.  If both this and -ui are specified, the vertices in the egg file will be scaled as necessary to make the appropriate units conversion; otherwise, the vertices will be left as they are.
+.TP
+.B \-no
+Strip all normals.
+.TP
+.B \-np
+Strip existing normals and redefine polygon normals.
+.TP
+.BI "\-nv " "threshold"
+Strip existing normals and redefine vertex normals.  Consider an edge between adjacent polygons to be smooth if the angle between them is less than threshold degrees.
+.TP
+.B \-nn
+Preserve normals exactly as they are.  This is the default.
+.TP
+.BI "\-tbn " "name"
+Compute tangent and binormal for the named texture coordinate set(s).  The name may include wildcard characters such as * and ?.  The normal must already exist or have been computed via one of the above options.  The tangent and binormal are used to implement bump mapping and related texture-based lighting effects.  This option may be repeated as necessary to name multiple texture coordinate sets.
+.TP
+.B \-tbnall
+Compute tangent and binormal for all texture coordinate sets.  This is equivalent to -tbn "*".
+.TP
+.B \-tbnauto
+Compute tangent and binormal for all normal maps. 
+.TP
+.BI "\-TS " "sx[,sy,sz]"
+Scale the model uniformly by the given factor (if only one number is given) or in each axis by sx, sy, sz (if three numbers are given).
+.TP
+.BI "\-TR " "x,y,z"
+Rotate the model x degrees about the x axis, then y degrees about the y axis, and then z degrees about the z axis.
+.TP
+.BI "\-TA " "angle,x,y,z"
+Rotate the model angle degrees counterclockwise about the given axis.
+.TP
+.BI "\-TT " "x,y,z"
+Translate the model by the indicated amount.
+
+All transformation options (-TS, -TR, -TA, -TT) are cumulative and are applied in the order they are encountered on the command line.
+.TP
+.BI "\-o " "filename"
+Specify the filename to which the resulting egg file will be written.  If this option is omitted, the last parameter name is taken to be the name of the output file, or standard output is used if there are no other parameters.
+.TP
+.BI "\-cs " "coordinate-system"
+Specify the coordinate system of the input DirectX file.  Normally, this is y-up-left.
+.TP
+.B \-h
+Display this help page.
diff --git a/dtool/Config.Android.pp b/dtool/Config.Android.pp
index d5fe1f9eef..ff4e57f89e 100644
--- a/dtool/Config.Android.pp
+++ b/dtool/Config.Android.pp
@@ -45,7 +45,6 @@
 
 // We don't have these, of course, so let's disable
 // them for convenience in case they were autodetected.
-#define HAVE_DX8
 #define HAVE_DX9
 #define HAVE_CG
 
diff --git a/dtool/Config.pp b/dtool/Config.pp
index 08e0d31ded..cf59d047b6 100644
--- a/dtool/Config.pp
+++ b/dtool/Config.pp
@@ -588,12 +588,6 @@
 #define CGGL_LIBS $[if $[WINDOWS_PLATFORM],cgGL.lib,CgGL]
 #defer HAVE_CGGL $[or $[CGGL_FRAMEWORK],$[and $[HAVE_CG],$[libtest $[CGGL_LPATH],$[CGGL_LIBS]]]]
 
-// Is CgDX8 installed, and where?
-#defer CGDX8_IPATH $[CG_IPATH]
-#defer CGDX8_LPATH $[CG_LPATH]
-#define CGDX8_LIBS $[if $[WINDOWS_PLATFORM],cgD3D8.lib,CgDX8]
-#defer HAVE_CGDX8 $[and $[HAVE_CG],$[libtest $[CGDX8_LPATH],$[CGDX8_LIBS]]]
-
 // Is CgDX9 installed, and where?
 #defer CGDX9_IPATH $[CG_IPATH]
 #defer CGDX9_LPATH $[CG_LPATH]
@@ -740,12 +734,6 @@
 #define HAVE_COCOA
 #define HAVE_CARBON
 
-// Is DirectX8 available, and should we try to build with it?
-#define DX8_IPATH
-#define DX8_LPATH
-#define DX8_LIBS d3d8.lib d3dx8.lib dxerr8.lib
-#defer HAVE_DX8 $[libtest $[DX8_LPATH],$[DX8_LIBS]]
-
 // Is DirectX9 available, and should we try to build with it?
 #define DX9_IPATH
 #define DX9_LPATH
diff --git a/dtool/LocalSetup.pp b/dtool/LocalSetup.pp
index c9b9efddcf..cdea47c29f 100644
--- a/dtool/LocalSetup.pp
+++ b/dtool/LocalSetup.pp
@@ -66,11 +66,6 @@
 #else
 #print - Did not find Cg OpenGL API
 #endif
-#if $[HAVE_CGDX8]
-#print + Cg DX8 API
-#else
-#print - Did not find Cg DX8 API
-#endif
 #if $[HAVE_CGDX9]
 #print + Cg DX9 API
 #else
@@ -151,11 +146,6 @@
 #else
 #print - Did not find OpenGL ES 2
 #endif
-#if $[HAVE_DX8]
-#print + DirectX8
-#else
-#print - Did not find DirectX8
-#endif
 #if $[HAVE_DX9]
 #print + DirectX9
 #else
@@ -303,18 +293,9 @@ $[cdefine PYTHON_FRAMEWORK]
 /* Define if we have RAD game tools, Miles Sound System installed.  */
 $[cdefine HAVE_RAD_MSS]
 
-/* Define if we have FMODex installed. */
-$[cdefine HAVE_FMODEX]
-
-/* Define if we have OpenAL installed. */
-$[cdefine HAVE_OPENAL]
-
 /* Define if we have Freetype 2.0 or better available. */
 $[cdefine HAVE_FREETYPE]
 
-/* Define if we are using SpeedTree. */
-$[cdefine HAVE_SPEEDTREE]
-
 /* Define if we want to compile in a default font. */
 $[cdefine COMPILE_IN_DEFAULT_FONT]
 
@@ -389,9 +370,6 @@ $[cdefine HAVE_CG]
 /* Define if we have CGGL installed.  */
 $[cdefine HAVE_CGGL]
 
-/* Define if we have CGDX8 installed.  */
-$[cdefine HAVE_CGDX8]
-
 /* Define if we have CGDX9 installed.  */
 $[cdefine HAVE_CGDX9]
 
@@ -404,19 +382,12 @@ $[cdefine USE_GENERIC_DXERR_LIBRARY]
 /* Define if we have zlib installed.  */
 $[cdefine HAVE_ZLIB]
 
-/* Define if we have OpenGL installed and want to build for GL.  */
-$[cdefine HAVE_GL]
+/* Define the preconfigured minimum GL version number.  */
 #if HAVE_GL
 # define MIN_GL_VERSION_MAJOR $[word 1,$[MIN_GL_VERSION]]
 # define MIN_GL_VERSION_MINOR $[word 2,$[MIN_GL_VERSION]]
 #endif
 
-/* Define if we have OpenGL ES installed and want to build for GLES. */
-$[cdefine HAVE_GLES]
-
-/* Define if we have OpenGL ES installed and want to build for GLES2. */
-$[cdefine HAVE_GLES2]
-
 /* Define if we have OpenCV installed and want to build for OpenCV.  */
 $[cdefine HAVE_OPENCV]
 $[cdefine OPENCV_VER_23]
@@ -426,9 +397,6 @@ $[cdefine HAVE_FFMPEG]
 $[cdefine HAVE_SWSCALE]
 $[cdefine HAVE_SWRESAMPLE]
 
-/* Define if we have ODE installed and want to build for ODE.  */
-$[cdefine HAVE_ODE]
-
 /* Define if we have AWESOMIUM installed and want to build for AWESOMIUM.  */
 $[cdefine HAVE_AWESOMIUM]
 
@@ -441,9 +409,6 @@ $[cdefine HAVE_EGL]
 /* Define if we have Windows-GL installed and want to build for Wgl.  */
 $[cdefine HAVE_WGL]
 
-/* Define if we have DirectX installed and want to build for DX.  */
-$[cdefine HAVE_DX8]
-
 /* Define if we have DirectX installed and want to build for DX.  */
 $[cdefine HAVE_DX9]
 
diff --git a/dtool/Package.pp b/dtool/Package.pp
index 64f361ae82..b0b787eb42 100644
--- a/dtool/Package.pp
+++ b/dtool/Package.pp
@@ -191,11 +191,6 @@
 #set CGGL_LIBS $[CGGL_LIBS]
 #set HAVE_CGGL $[HAVE_CGGL]
 
-#set CGDX8_IPATH $[unixfilename $[CGDX8_IPATH]]
-#set CGDX8_LPATH $[unixfilename $[CGDX8_LPATH]]
-#set CGDX8_LIBS $[CGDX8_LIBS]
-#set HAVE_CGDX8 $[HAVE_CGDX8]
-
 #set CGDX9_IPATH $[unixfilename $[CGDX9_IPATH]]
 #set CGDX9_LPATH $[unixfilename $[CGDX9_LPATH]]
 #set CGDX9_LIBS $[CGDX9_LIBS]
@@ -250,11 +245,6 @@
 #set HAVE_COCOA $[HAVE_COCOA]
 #set HAVE_CARBON $[HAVE_CARBON]
 
-#set DX8_IPATH $[unixfilename $[DX8_IPATH]]
-#set DX8_LPATH $[unixfilename $[DX8_LPATH]]
-#set DX8_LIBS $[DX8_LIBS]
-#set HAVE_DX8 $[HAVE_DX8]
-
 #set DX9_IPATH $[unixfilename $[DX9_IPATH]]
 #set DX9_LPATH $[unixfilename $[DX9_LPATH]]
 #set DX9_LIBS $[DX9_LIBS]
diff --git a/dtool/pptempl/Global.pp b/dtool/pptempl/Global.pp
index 22adc27ae0..7cf3ab660f 100644
--- a/dtool/pptempl/Global.pp
+++ b/dtool/pptempl/Global.pp
@@ -199,13 +199,6 @@
   #define egl_libs $[EGL_LIBS]
 #endif
 
-#if $[HAVE_DX8]
-  #define dx8_ipath $[wildcard $[DX8_IPATH]]
-  #define dx8_lpath $[wildcard $[DX8_LPATH]]
-  #define dx8_cflags $[DX8_CFLAGS]
-  #define dx8_libs $[DX8_LIBS]
-#endif
-
 #if $[HAVE_DX9]
   #define dx9_ipath $[wildcard $[DX9_IPATH]]
   #define dx9_lpath $[wildcard $[DX9_LPATH]]
@@ -329,13 +322,6 @@
   #define cggl_framework $[CGGL_FRAMEWORK]
 #endif
 
-#if $[HAVE_CGDX8]
-  #define cgdx8_ipath $[wildcard $[CGDX8_IPATH]]
-  #define cgdx8_lpath $[wildcard $[CGDX8_LPATH]]
-  #define cgdx8_cflags $[CGDX8_CFLAGS]
-  #define cgdx8_libs $[CGDX8_LIBS]
-#endif
-
 #if $[HAVE_CGDX9]
   #define cgdx9_ipath $[wildcard $[CGDX9_IPATH]]
   #define cgdx9_lpath $[wildcard $[CGDX9_LPATH]]
diff --git a/dtool/src/cppparser/cppBison.cxx.prebuilt b/dtool/src/cppparser/cppBison.cxx.prebuilt
index 5d4ffbb537..37f6b532f4 100644
--- a/dtool/src/cppparser/cppBison.cxx.prebuilt
+++ b/dtool/src/cppparser/cppBison.cxx.prebuilt
@@ -107,7 +107,7 @@ CPPScope *current_scope = NULL;
 CPPScope *global_scope = NULL;
 CPPPreprocessor *current_lexer = NULL;
 
-static CPPStructType *current_struct = NULL; 
+static CPPStructType *current_struct = NULL;
 static CPPEnumType *current_enum = NULL;
 static int current_storage_class = 0;
 static CPPType *current_type = NULL;
@@ -167,7 +167,7 @@ parse_cpp(CPPParser *cp) {
   current_scope = old_scope;
   global_scope = old_global_scope;
   current_lexer = old_lexer;
-    
+
 }
 
 CPPExpression *
@@ -209,7 +209,7 @@ parse_type(CPPPreprocessor *pp, CPPScope *new_current_scope,
   yyparse();
 
   CPPType *result = current_type;
-  
+
   current_scope = old_scope;
   global_scope = old_global_scope;
   current_lexer = old_lexer;
@@ -370,34 +370,35 @@ extern int cppyydebug;
      KW_MUTABLE = 328,
      KW_NAMESPACE = 329,
      KW_NEW = 330,
-     KW_OPERATOR = 331,
-     KW_PRIVATE = 332,
-     KW_PROTECTED = 333,
-     KW_PUBLIC = 334,
-     KW_REGISTER = 335,
-     KW_RETURN = 336,
-     KW_SHORT = 337,
-     KW_SIGNED = 338,
-     KW_SIZEOF = 339,
-     KW_STATIC = 340,
-     KW_STATIC_CAST = 341,
-     KW_STRUCT = 342,
-     KW_TEMPLATE = 343,
-     KW_THROW = 344,
-     KW_TRUE = 345,
-     KW_TRY = 346,
-     KW_TYPEDEF = 347,
-     KW_TYPENAME = 348,
-     KW_UNION = 349,
-     KW_UNSIGNED = 350,
-     KW_USING = 351,
-     KW_VIRTUAL = 352,
-     KW_VOID = 353,
-     KW_VOLATILE = 354,
-     KW_WHILE = 355,
-     START_CPP = 356,
-     START_CONST_EXPR = 357,
-     START_TYPE = 358
+     KW_NOEXCEPT = 331,
+     KW_OPERATOR = 332,
+     KW_PRIVATE = 333,
+     KW_PROTECTED = 334,
+     KW_PUBLIC = 335,
+     KW_REGISTER = 336,
+     KW_RETURN = 337,
+     KW_SHORT = 338,
+     KW_SIGNED = 339,
+     KW_SIZEOF = 340,
+     KW_STATIC = 341,
+     KW_STATIC_CAST = 342,
+     KW_STRUCT = 343,
+     KW_TEMPLATE = 344,
+     KW_THROW = 345,
+     KW_TRUE = 346,
+     KW_TRY = 347,
+     KW_TYPEDEF = 348,
+     KW_TYPENAME = 349,
+     KW_UNION = 350,
+     KW_UNSIGNED = 351,
+     KW_USING = 352,
+     KW_VIRTUAL = 353,
+     KW_VOID = 354,
+     KW_VOLATILE = 355,
+     KW_WHILE = 356,
+     START_CPP = 357,
+     START_CONST_EXPR = 358,
+     START_TYPE = 359
    };
 #endif
 /* Tokens.  */
@@ -474,34 +475,35 @@ extern int cppyydebug;
 #define KW_MUTABLE 328
 #define KW_NAMESPACE 329
 #define KW_NEW 330
-#define KW_OPERATOR 331
-#define KW_PRIVATE 332
-#define KW_PROTECTED 333
-#define KW_PUBLIC 334
-#define KW_REGISTER 335
-#define KW_RETURN 336
-#define KW_SHORT 337
-#define KW_SIGNED 338
-#define KW_SIZEOF 339
-#define KW_STATIC 340
-#define KW_STATIC_CAST 341
-#define KW_STRUCT 342
-#define KW_TEMPLATE 343
-#define KW_THROW 344
-#define KW_TRUE 345
-#define KW_TRY 346
-#define KW_TYPEDEF 347
-#define KW_TYPENAME 348
-#define KW_UNION 349
-#define KW_UNSIGNED 350
-#define KW_USING 351
-#define KW_VIRTUAL 352
-#define KW_VOID 353
-#define KW_VOLATILE 354
-#define KW_WHILE 355
-#define START_CPP 356
-#define START_CONST_EXPR 357
-#define START_TYPE 358
+#define KW_NOEXCEPT 331
+#define KW_OPERATOR 332
+#define KW_PRIVATE 333
+#define KW_PROTECTED 334
+#define KW_PUBLIC 335
+#define KW_REGISTER 336
+#define KW_RETURN 337
+#define KW_SHORT 338
+#define KW_SIGNED 339
+#define KW_SIZEOF 340
+#define KW_STATIC 341
+#define KW_STATIC_CAST 342
+#define KW_STRUCT 343
+#define KW_TEMPLATE 344
+#define KW_THROW 345
+#define KW_TRUE 346
+#define KW_TRY 347
+#define KW_TYPEDEF 348
+#define KW_TYPENAME 349
+#define KW_UNION 350
+#define KW_UNSIGNED 351
+#define KW_USING 352
+#define KW_VIRTUAL 353
+#define KW_VOID 354
+#define KW_VOLATILE 355
+#define KW_WHILE 356
+#define START_CPP 357
+#define START_CONST_EXPR 358
+#define START_TYPE 359
 
 
 
@@ -544,7 +546,7 @@ int cppyyparse ();
 /* Copy the second part of user declarations.  */
 
 /* Line 390 of yacc.c  */
-#line 548 "built/tmp/cppBison.yxx.c"
+#line 550 "built/tmp/cppBison.yxx.c"
 
 #ifdef short
 # undef short
@@ -766,20 +768,20 @@ union yyalloc
 /* YYFINAL -- State number of the termination state.  */
 #define YYFINAL  69
 /* YYLAST -- Last index in YYTABLE.  */
-#define YYLAST   3555
+#define YYLAST   3615
 
 /* YYNTOKENS -- Number of terminals.  */
-#define YYNTOKENS  128
+#define YYNTOKENS  129
 /* YYNNTS -- Number of nonterminals.  */
 #define YYNNTS  94
 /* YYNRULES -- Number of rules.  */
-#define YYNRULES  535
+#define YYNRULES  540
 /* YYNRULES -- Number of states.  */
-#define YYNSTATES  968
+#define YYNSTATES  977
 
 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX.  */
 #define YYUNDEFTOK  2
-#define YYMAXUTOK   358
+#define YYMAXUTOK   359
 
 #define YYTRANSLATE(YYX)						\
   ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
@@ -790,16 +792,16 @@ static const yytype_uint8 yytranslate[] =
        0,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,   126,     2,     2,     2,   119,   112,     2,
-     122,   124,   117,   115,   105,   116,   121,   118,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,   107,   106,
-     113,   108,   114,   109,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,   127,     2,     2,     2,   120,   113,     2,
+     123,   125,   118,   116,   106,   117,   122,   119,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,   108,   107,
+     114,   109,   115,   110,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,   123,     2,   127,   111,     2,     2,     2,     2,     2,
+       2,   124,     2,   128,   112,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,   104,   110,   125,   120,     2,     2,     2,
+       2,     2,     2,   105,   111,   126,   121,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
@@ -822,7 +824,7 @@ static const yytype_uint8 yytranslate[] =
       65,    66,    67,    68,    69,    70,    71,    72,    73,    74,
       75,    76,    77,    78,    79,    80,    81,    82,    83,    84,
       85,    86,    87,    88,    89,    90,    91,    92,    93,    94,
-      95,    96,    97,    98,    99,   100,   101,   102,   103
+      95,    96,    97,    98,    99,   100,   101,   102,   103,   104
 };
 
 #if YYDEBUG
@@ -838,283 +840,286 @@ static const yytype_uint16 yyprhs[] =
      161,   164,   169,   172,   177,   178,   183,   184,   190,   194,
      197,   202,   205,   210,   211,   218,   219,   226,   227,   235,
      236,   247,   248,   260,   261,   270,   271,   281,   283,   285,
-     287,   292,   298,   300,   302,   304,   306,   308,   310,   312,
-     314,   316,   318,   320,   322,   324,   326,   328,   330,   332,
-     334,   336,   338,   340,   342,   344,   346,   348,   350,   352,
-     354,   356,   358,   360,   362,   364,   366,   368,   371,   374,
-     376,   378,   380,   382,   383,   390,   392,   394,   396,   400,
-     403,   408,   411,   416,   420,   425,   427,   429,   431,   433,
-     436,   439,   442,   445,   449,   454,   458,   462,   463,   470,
-     472,   474,   476,   480,   483,   485,   489,   491,   494,   496,
-     499,   501,   505,   511,   515,   520,   522,   524,   527,   529,
-     533,   537,   543,   547,   551,   556,   558,   560,   562,   564,
-     567,   570,   573,   577,   582,   584,   586,   588,   591,   594,
-     597,   601,   606,   614,   618,   620,   623,   626,   629,   633,
-     638,   646,   648,   650,   653,   655,   657,   659,   661,   664,
-     667,   669,   671,   674,   676,   678,   680,   682,   685,   688,
-     690,   692,   695,   698,   701,   704,   708,   709,   715,   716,
-     724,   726,   728,   731,   735,   738,   741,   744,   748,   752,
-     756,   760,   764,   768,   769,   775,   776,   783,   785,   789,
-     795,   797,   800,   805,   807,   809,   811,   813,   814,   821,
-     826,   829,   833,   835,   837,   839,   841,   843,   845,   847,
-     849,   851,   853,   855,   857,   860,   863,   866,   869,   871,
-     874,   876,   880,   883,   885,   886,   889,   891,   894,   896,
-     898,   900,   902,   904,   906,   908,   910,   912,   914,   916,
-     918,   920,   922,   924,   926,   928,   930,   932,   934,   936,
-     938,   940,   942,   944,   946,   948,   950,   952,   954,   956,
-     958,   960,   962,   964,   966,   968,   970,   972,   974,   976,
-     978,   980,   982,   984,   986,   988,   990,   992,   994,   996,
-     998,  1000,  1002,  1004,  1006,  1008,  1010,  1012,  1014,  1016,
-    1018,  1020,  1022,  1024,  1026,  1028,  1030,  1032,  1034,  1036,
-    1038,  1040,  1042,  1044,  1046,  1048,  1050,  1052,  1054,  1056,
-    1058,  1060,  1062,  1064,  1066,  1068,  1070,  1072,  1074,  1076,
-    1078,  1080,  1082,  1084,  1086,  1088,  1090,  1092,  1094,  1096,
-    1098,  1100,  1104,  1106,  1108,  1110,  1112,  1114,  1118,  1120,
-    1125,  1133,  1141,  1146,  1149,  1152,  1155,  1158,  1161,  1165,
-    1169,  1173,  1177,  1181,  1185,  1189,  1193,  1197,  1201,  1205,
-    1209,  1213,  1217,  1221,  1225,  1231,  1236,  1241,  1245,  1249,
-    1253,  1257,  1259,  1264,  1272,  1280,  1285,  1290,  1295,  1300,
-    1305,  1310,  1315,  1320,  1325,  1330,  1335,  1340,  1343,  1349,
-    1352,  1355,  1358,  1361,  1364,  1368,  1372,  1376,  1380,  1384,
-    1388,  1392,  1396,  1400,  1404,  1408,  1412,  1416,  1420,  1424,
-    1428,  1432,  1436,  1442,  1447,  1452,  1456,  1460,  1464,  1468,
-    1470,  1472,  1474,  1476,  1478,  1480,  1482,  1484,  1489,  1497,
-    1505,  1510,  1513,  1519,  1522,  1525,  1528,  1531,  1535,  1539,
-    1543,  1547,  1551,  1555,  1559,  1563,  1567,  1571,  1575,  1579,
-    1583,  1587,  1591,  1595,  1599,  1603,  1609,  1614,  1619,  1623,
-    1627,  1631,  1635,  1637,  1639,  1641,  1643,  1645,  1647,  1649,
-    1652,  1655,  1657,  1659,  1661,  1664
+     287,   290,   295,   301,   303,   305,   307,   309,   311,   313,
+     315,   317,   319,   321,   323,   325,   327,   329,   331,   333,
+     335,   337,   339,   341,   343,   345,   347,   349,   351,   353,
+     355,   357,   359,   361,   363,   365,   367,   369,   371,   374,
+     377,   379,   381,   383,   385,   386,   393,   395,   397,   399,
+     403,   406,   411,   414,   419,   423,   428,   430,   432,   434,
+     436,   439,   442,   445,   448,   451,   455,   460,   464,   468,
+     469,   476,   478,   480,   482,   486,   489,   491,   495,   497,
+     500,   502,   505,   507,   511,   517,   521,   526,   528,   530,
+     533,   535,   539,   543,   549,   553,   557,   562,   564,   566,
+     568,   570,   573,   576,   579,   582,   586,   591,   593,   595,
+     597,   600,   603,   606,   609,   613,   618,   626,   630,   632,
+     635,   638,   641,   644,   648,   653,   661,   663,   665,   668,
+     670,   672,   674,   676,   679,   682,   684,   686,   689,   691,
+     693,   695,   697,   700,   703,   705,   707,   710,   713,   716,
+     719,   723,   724,   730,   731,   739,   741,   743,   746,   750,
+     753,   756,   759,   763,   767,   771,   775,   779,   783,   784,
+     790,   791,   798,   800,   804,   810,   812,   815,   820,   822,
+     824,   826,   828,   829,   836,   841,   844,   848,   850,   852,
+     854,   856,   858,   860,   862,   864,   866,   868,   870,   872,
+     875,   878,   881,   884,   886,   889,   891,   895,   898,   900,
+     901,   904,   906,   909,   911,   913,   915,   917,   919,   921,
+     923,   925,   927,   929,   931,   933,   935,   937,   939,   941,
+     943,   945,   947,   949,   951,   953,   955,   957,   959,   961,
+     963,   965,   967,   969,   971,   973,   975,   977,   979,   981,
+     983,   985,   987,   989,   991,   993,   995,   997,   999,  1001,
+    1003,  1005,  1007,  1009,  1011,  1013,  1015,  1017,  1019,  1021,
+    1023,  1025,  1027,  1029,  1031,  1033,  1035,  1037,  1039,  1041,
+    1043,  1045,  1047,  1049,  1051,  1053,  1055,  1057,  1059,  1061,
+    1063,  1065,  1067,  1069,  1071,  1073,  1075,  1077,  1079,  1081,
+    1083,  1085,  1087,  1089,  1091,  1093,  1095,  1097,  1099,  1101,
+    1103,  1105,  1107,  1109,  1111,  1113,  1115,  1119,  1121,  1123,
+    1125,  1127,  1129,  1133,  1135,  1140,  1148,  1156,  1161,  1164,
+    1167,  1170,  1173,  1176,  1180,  1184,  1188,  1192,  1196,  1200,
+    1204,  1208,  1212,  1216,  1220,  1224,  1228,  1232,  1236,  1240,
+    1246,  1251,  1256,  1260,  1264,  1268,  1272,  1274,  1279,  1287,
+    1295,  1300,  1305,  1310,  1315,  1320,  1325,  1330,  1335,  1340,
+    1345,  1350,  1355,  1358,  1364,  1367,  1370,  1373,  1376,  1379,
+    1383,  1387,  1391,  1395,  1399,  1403,  1407,  1411,  1415,  1419,
+    1423,  1427,  1431,  1435,  1439,  1443,  1447,  1451,  1457,  1462,
+    1467,  1471,  1475,  1479,  1483,  1485,  1487,  1489,  1491,  1493,
+    1495,  1497,  1499,  1504,  1512,  1520,  1525,  1528,  1534,  1537,
+    1540,  1543,  1546,  1550,  1554,  1558,  1562,  1566,  1570,  1574,
+    1578,  1582,  1586,  1590,  1594,  1598,  1602,  1606,  1610,  1614,
+    1618,  1624,  1629,  1634,  1638,  1642,  1646,  1650,  1652,  1654,
+    1656,  1658,  1660,  1662,  1664,  1667,  1670,  1672,  1674,  1676,
+    1679
 };
 
 /* YYRHS -- A `-1'-separated list of the rules' RHS.  */
 static const yytype_int16 yyrhs[] =
 {
-     129,     0,    -1,   101,   130,    -1,   102,   214,    -1,   103,
-     183,    -1,   221,    -1,   130,   106,    -1,   130,   135,    -1,
-     132,    -1,   131,   105,   132,    -1,   219,   122,   211,   124,
-      -1,    -1,   138,   104,   134,   130,   125,    -1,   139,    -1,
-     161,    -1,   133,    -1,   199,    -1,   201,    -1,   136,    -1,
-      92,   145,    -1,    43,    -1,    55,    -1,    60,   107,    -1,
-      79,   107,    -1,    78,   107,    -1,    77,   107,    -1,    71,
-     122,     8,   105,     8,   124,   106,    -1,    71,   122,     8,
-     105,     8,   105,     8,   124,   106,    -1,    72,   122,   219,
-     105,   219,   105,   219,   124,   106,    -1,    -1,    63,   137,
-     135,    -1,   221,    -1,   138,    58,    -1,   138,    58,   220,
-      -1,   138,    85,    -1,   138,    67,    -1,   138,    97,    -1,
-     138,    59,    -1,   138,    99,    -1,   138,    73,    -1,   138,
-      80,    -1,   138,    44,    -1,   138,    57,    -1,   140,    -1,
-     138,   181,   106,    -1,   138,   150,   173,    -1,    -1,   138,
-     181,   141,   143,    -1,    -1,   138,    50,   180,   142,   144,
-      -1,   167,   173,    -1,   167,   172,   105,   143,    -1,   167,
-     173,    -1,   167,   172,   105,   144,    -1,    -1,   138,   181,
-     146,   148,    -1,    -1,   138,    50,   180,   147,   149,    -1,
-     138,   150,   173,    -1,   167,   173,    -1,   167,   172,   105,
-     148,    -1,   167,   173,    -1,   167,   172,   105,   149,    -1,
-      -1,     8,   122,   151,   169,   124,   158,    -1,    -1,     9,
-     122,   152,   169,   124,   158,    -1,    -1,   120,   219,   122,
-     153,   169,   124,   158,    -1,    -1,     9,   122,   117,   167,
-     124,   122,   154,   169,   124,   158,    -1,    -1,     9,   122,
-      10,   117,   167,   124,   122,   155,   169,   124,   158,    -1,
-      -1,    76,   180,   177,   122,   156,   169,   124,   158,    -1,
-      -1,    76,    50,   180,   177,   122,   157,   169,   124,   158,
-      -1,     8,    -1,   221,    -1,    50,    -1,   158,    89,   122,
-     124,    -1,   158,    89,   122,   219,   124,    -1,   126,    -1,
-     120,    -1,   117,    -1,   118,    -1,   119,    -1,   115,    -1,
-     116,    -1,   110,    -1,   112,    -1,   111,    -1,    13,    -1,
-      14,    -1,    15,    -1,    16,    -1,    17,    -1,    18,    -1,
-     113,    -1,   114,    -1,    19,    -1,    20,    -1,   108,    -1,
-     105,    -1,    31,    -1,    32,    -1,    33,    -1,    34,    -1,
-      35,    -1,    36,    -1,    37,    -1,    38,    -1,    39,    -1,
-      40,    -1,    41,    -1,    42,    -1,    29,    -1,   123,   127,
-      -1,   122,   124,    -1,    75,    -1,    51,    -1,   139,    -1,
-     161,    -1,    -1,    88,   162,   113,   163,   114,   160,    -1,
-     221,    -1,   164,    -1,   165,    -1,   164,   105,   165,    -1,
-      49,   219,    -1,    49,   219,   108,   183,    -1,    93,   219,
-      -1,    93,   219,   108,   183,    -1,   166,   178,   171,    -1,
-      50,   166,   178,   171,    -1,   202,    -1,     8,    -1,     9,
-      -1,   219,    -1,    76,   159,    -1,    50,   167,    -1,   117,
-     167,    -1,   112,   167,    -1,    10,   117,   167,    -1,   167,
-     123,   210,   127,    -1,   167,   107,     4,    -1,   122,   167,
-     124,    -1,    -1,   167,   122,   168,   169,   124,   158,    -1,
-     221,    -1,    12,    -1,   170,    -1,   170,   105,    12,    -1,
-     170,    12,    -1,   176,    -1,   170,   105,   176,    -1,   221,
-      -1,   108,   213,    -1,   221,    -1,   108,   214,    -1,   106,
-      -1,   104,   206,   125,    -1,   107,   131,   104,   206,   125,
-      -1,   108,   214,   106,    -1,   108,   104,   174,   125,    -1,
-     221,    -1,   175,    -1,   175,   105,    -1,   214,    -1,   104,
-     174,   125,    -1,   175,   105,   214,    -1,   175,   105,   104,
-     174,   125,    -1,   180,   178,   172,    -1,     8,   178,   172,
-      -1,    50,   180,   178,   172,    -1,   216,    -1,   221,    -1,
-       8,    -1,     9,    -1,    50,   177,    -1,   117,   177,    -1,
-     112,   177,    -1,    10,   117,   177,    -1,   177,   123,   210,
-     127,    -1,   221,    -1,     8,    -1,     9,    -1,    50,   178,
-      -1,   117,   178,    -1,   112,   178,    -1,    10,   117,   178,
-      -1,   178,   123,   210,   127,    -1,   122,   178,   124,   122,
-     169,   124,   158,    -1,   122,   178,   124,    -1,   221,    -1,
-      50,   179,    -1,   117,   179,    -1,   112,   179,    -1,    10,
-     117,   179,    -1,   179,   123,   210,   127,    -1,   122,   179,
-     124,   122,   169,   124,   158,    -1,   202,    -1,     9,    -1,
-      93,   219,    -1,   184,    -1,   186,    -1,   191,    -1,   193,
-      -1,   198,   219,    -1,   197,   219,    -1,   202,    -1,     9,
-      -1,    93,   219,    -1,   184,    -1,   186,    -1,   191,    -1,
-     193,    -1,   198,   219,    -1,   197,   219,    -1,   202,    -1,
-       9,    -1,    93,   219,    -1,   198,   219,    -1,   197,   219,
-      -1,   180,   179,    -1,    50,   180,   179,    -1,    -1,   198,
-     104,   185,   130,   125,    -1,    -1,   198,   219,   187,   188,
-     104,   130,   125,    -1,   221,    -1,   189,    -1,   107,   190,
-      -1,   189,   105,   190,    -1,    79,   218,    -1,    78,   218,
-      -1,    77,   218,    -1,    97,    79,   218,    -1,    97,    78,
-     218,    -1,    97,    77,   218,    -1,    79,    97,   218,    -1,
-      78,    97,   218,    -1,    77,    97,   218,    -1,    -1,   197,
-     104,   192,   196,   125,    -1,    -1,   197,   219,   104,   194,
-     196,   125,    -1,   221,    -1,   195,   219,   105,    -1,   195,
-     219,   108,   214,   105,    -1,   195,    -1,   195,   219,    -1,
-     195,   219,   108,   214,    -1,    56,    -1,    49,    -1,    87,
-      -1,    94,    -1,    -1,    74,   219,   104,   200,   130,   125,
-      -1,    74,   104,   130,   125,    -1,    96,   219,    -1,    96,
-      74,   219,    -1,   203,    -1,   204,    -1,   205,    -1,    45,
-      -1,    47,    -1,    48,    -1,    82,    -1,    69,    -1,    70,
-      -1,    95,    -1,    83,    -1,    68,    -1,    82,   203,    -1,
-      69,   203,    -1,    95,   203,    -1,    83,   203,    -1,    62,
-      -1,    69,    62,    -1,    52,    -1,    69,    69,    62,    -1,
-      69,    52,    -1,    98,    -1,    -1,   207,   208,    -1,   221,
-      -1,   208,   209,    -1,     3,    -1,     4,    -1,     6,    -1,
-       5,    -1,     8,    -1,     9,    -1,    10,    -1,     7,    -1,
-      12,    -1,    13,    -1,    14,    -1,    15,    -1,    16,    -1,
-      17,    -1,    18,    -1,    19,    -1,    20,    -1,    21,    -1,
-      22,    -1,    29,    -1,    30,    -1,    31,    -1,    32,    -1,
-      33,    -1,    34,    -1,    35,    -1,    36,    -1,    37,    -1,
-      38,    -1,    39,    -1,    40,    -1,    41,    -1,    42,    -1,
-      45,    -1,    46,    -1,    47,    -1,    48,    -1,    49,    -1,
-      50,    -1,    51,    -1,    52,    -1,    53,    -1,    54,    -1,
-      56,    -1,    58,    -1,    59,    -1,    61,    -1,    62,    -1,
-      63,    -1,    64,    -1,    65,    -1,    66,    -1,    67,    -1,
-      68,    -1,    69,    -1,    73,    -1,    75,    -1,    77,    -1,
-      78,    -1,    79,    -1,    60,    -1,    80,    -1,    81,    -1,
-      82,    -1,    83,    -1,    84,    -1,    85,    -1,    86,    -1,
-      87,    -1,    89,    -1,    90,    -1,    91,    -1,    92,    -1,
-      93,    -1,    94,    -1,    95,    -1,    97,    -1,    98,    -1,
-      99,    -1,   100,    -1,    76,    -1,   115,    -1,   116,    -1,
-     117,    -1,   118,    -1,   112,    -1,   110,    -1,   111,    -1,
-     126,    -1,   120,    -1,   108,    -1,   119,    -1,   113,    -1,
-     114,    -1,   122,    -1,   124,    -1,   121,    -1,   105,    -1,
-     106,    -1,   107,    -1,   123,    -1,   127,    -1,   109,    -1,
-     104,   208,   125,    -1,   221,    -1,   214,    -1,   221,    -1,
-     212,    -1,   214,    -1,   212,   105,   214,    -1,   215,    -1,
-     122,   183,   124,   213,    -1,    86,   113,   183,   114,   122,
-     212,   124,    -1,    53,   113,   183,   114,   122,   212,   124,
-      -1,    84,   122,   183,   124,    -1,   126,   213,    -1,   120,
-     213,    -1,   116,   213,    -1,   117,   213,    -1,   112,   213,
-      -1,   213,   117,   213,    -1,   213,   118,   213,    -1,   213,
-     119,   213,    -1,   213,   115,   213,    -1,   213,   116,   213,
-      -1,   213,   110,   213,    -1,   213,   111,   213,    -1,   213,
-     112,   213,    -1,   213,    13,   213,    -1,   213,    14,   213,
-      -1,   213,    15,   213,    -1,   213,    16,   213,    -1,   213,
-      17,   213,    -1,   213,    18,   213,    -1,   213,    19,   213,
-      -1,   213,    20,   213,    -1,   213,   109,   213,   107,   213,
-      -1,   213,   123,   214,   127,    -1,   213,   122,   212,   124,
-      -1,   213,   122,   124,    -1,   213,   121,   213,    -1,   213,
-      29,   213,    -1,   122,   212,   124,    -1,   215,    -1,   122,
-     183,   124,   214,    -1,    86,   113,   183,   114,   122,   212,
-     124,    -1,    53,   113,   183,   114,   122,   212,   124,    -1,
-       9,   122,   211,   124,    -1,    68,   122,   211,   124,    -1,
-      47,   122,   211,   124,    -1,    48,   122,   211,   124,    -1,
-      45,   122,   211,   124,    -1,    82,   122,   211,   124,    -1,
-      69,   122,   211,   124,    -1,    95,   122,   211,   124,    -1,
-      83,   122,   211,   124,    -1,    62,   122,   211,   124,    -1,
-      52,   122,   211,   124,    -1,    84,   122,   183,   124,    -1,
-      75,   182,    -1,    75,   182,   122,   211,   124,    -1,   126,
-     214,    -1,   120,   214,    -1,   116,   214,    -1,   117,   214,
-      -1,   112,   214,    -1,   214,   117,   214,    -1,   214,   118,
-     214,    -1,   214,   119,   214,    -1,   214,   115,   214,    -1,
-     214,   116,   214,    -1,   214,   110,   214,    -1,   214,   111,
-     214,    -1,   214,   112,   214,    -1,   214,    13,   214,    -1,
-     214,    14,   214,    -1,   214,    15,   214,    -1,   214,    16,
-     214,    -1,   214,    17,   214,    -1,   214,    18,   214,    -1,
-     214,   113,   214,    -1,   214,   114,   214,    -1,   214,    19,
-     214,    -1,   214,    20,   214,    -1,   214,   109,   214,   107,
-     214,    -1,   214,   123,   214,   127,    -1,   214,   122,   212,
-     124,    -1,   214,   122,   124,    -1,   214,   121,   214,    -1,
-     214,    29,   214,    -1,   122,   212,   124,    -1,     4,    -1,
-      90,    -1,    61,    -1,     5,    -1,     3,    -1,   220,    -1,
-       8,    -1,   217,    -1,   122,   183,   124,   214,    -1,    86,
-     113,   183,   114,   122,   212,   124,    -1,    53,   113,   183,
-     114,   122,   212,   124,    -1,    84,   122,   183,   124,    -1,
-      75,   182,    -1,    75,   182,   122,   211,   124,    -1,   126,
-     214,    -1,   120,   214,    -1,   116,   214,    -1,   112,   214,
-      -1,   216,   117,   214,    -1,   216,   118,   214,    -1,   216,
-     119,   214,    -1,   216,   115,   214,    -1,   216,   116,   214,
-      -1,   216,   110,   214,    -1,   216,   111,   214,    -1,   216,
-     112,   214,    -1,   216,    13,   214,    -1,   216,    14,   214,
-      -1,   216,    15,   214,    -1,   216,    16,   214,    -1,   216,
-      17,   214,    -1,   216,    18,   214,    -1,   216,   113,   214,
-      -1,   216,   114,   214,    -1,   216,    19,   214,    -1,   216,
-      20,   214,    -1,   216,   109,   214,   107,   214,    -1,   216,
-     123,   214,   127,    -1,   216,   122,   212,   124,    -1,   216,
-     122,   124,    -1,   216,   121,   214,    -1,   216,    29,   214,
-      -1,   122,   212,   124,    -1,     4,    -1,    90,    -1,    61,
-      -1,     5,    -1,     3,    -1,   220,    -1,   219,    -1,   198,
-     219,    -1,    93,   219,    -1,     8,    -1,     9,    -1,     6,
-      -1,   220,     6,    -1,    -1
+     130,     0,    -1,   102,   131,    -1,   103,   215,    -1,   104,
+     184,    -1,   222,    -1,   131,   107,    -1,   131,   136,    -1,
+     133,    -1,   132,   106,   133,    -1,   220,   123,   212,   125,
+      -1,    -1,   139,   105,   135,   131,   126,    -1,   140,    -1,
+     162,    -1,   134,    -1,   200,    -1,   202,    -1,   137,    -1,
+      93,   146,    -1,    43,    -1,    55,    -1,    60,   108,    -1,
+      80,   108,    -1,    79,   108,    -1,    78,   108,    -1,    71,
+     123,     8,   106,     8,   125,   107,    -1,    71,   123,     8,
+     106,     8,   106,     8,   125,   107,    -1,    72,   123,   220,
+     106,   220,   106,   220,   125,   107,    -1,    -1,    63,   138,
+     136,    -1,   222,    -1,   139,    58,    -1,   139,    58,   221,
+      -1,   139,    86,    -1,   139,    67,    -1,   139,    98,    -1,
+     139,    59,    -1,   139,   100,    -1,   139,    73,    -1,   139,
+      81,    -1,   139,    44,    -1,   139,    57,    -1,   141,    -1,
+     139,   182,   107,    -1,   139,   151,   174,    -1,    -1,   139,
+     182,   142,   144,    -1,    -1,   139,    50,   181,   143,   145,
+      -1,   168,   174,    -1,   168,   173,   106,   144,    -1,   168,
+     174,    -1,   168,   173,   106,   145,    -1,    -1,   139,   182,
+     147,   149,    -1,    -1,   139,    50,   181,   148,   150,    -1,
+     139,   151,   174,    -1,   168,   174,    -1,   168,   173,   106,
+     149,    -1,   168,   174,    -1,   168,   173,   106,   150,    -1,
+      -1,     8,   123,   152,   170,   125,   159,    -1,    -1,     9,
+     123,   153,   170,   125,   159,    -1,    -1,   121,   220,   123,
+     154,   170,   125,   159,    -1,    -1,     9,   123,   118,   168,
+     125,   123,   155,   170,   125,   159,    -1,    -1,     9,   123,
+      10,   118,   168,   125,   123,   156,   170,   125,   159,    -1,
+      -1,    77,   181,   178,   123,   157,   170,   125,   159,    -1,
+      -1,    77,    50,   181,   178,   123,   158,   170,   125,   159,
+      -1,     8,    -1,   222,    -1,    50,    -1,   159,    76,    -1,
+     159,    90,   123,   125,    -1,   159,    90,   123,   220,   125,
+      -1,   127,    -1,   121,    -1,   118,    -1,   119,    -1,   120,
+      -1,   116,    -1,   117,    -1,   111,    -1,   113,    -1,   112,
+      -1,    13,    -1,    14,    -1,    15,    -1,    16,    -1,    17,
+      -1,    18,    -1,   114,    -1,   115,    -1,    19,    -1,    20,
+      -1,   109,    -1,   106,    -1,    31,    -1,    32,    -1,    33,
+      -1,    34,    -1,    35,    -1,    36,    -1,    37,    -1,    38,
+      -1,    39,    -1,    40,    -1,    41,    -1,    42,    -1,    29,
+      -1,   124,   128,    -1,   123,   125,    -1,    75,    -1,    51,
+      -1,   140,    -1,   162,    -1,    -1,    89,   163,   114,   164,
+     115,   161,    -1,   222,    -1,   165,    -1,   166,    -1,   165,
+     106,   166,    -1,    49,   220,    -1,    49,   220,   109,   184,
+      -1,    94,   220,    -1,    94,   220,   109,   184,    -1,   167,
+     179,   172,    -1,    50,   167,   179,   172,    -1,   203,    -1,
+       8,    -1,     9,    -1,   220,    -1,    77,   160,    -1,    50,
+     168,    -1,   118,   168,    -1,   113,   168,    -1,    14,   168,
+      -1,    10,   118,   168,    -1,   168,   124,   211,   128,    -1,
+     168,   108,     4,    -1,   123,   168,   125,    -1,    -1,   168,
+     123,   169,   170,   125,   159,    -1,   222,    -1,    12,    -1,
+     171,    -1,   171,   106,    12,    -1,   171,    12,    -1,   177,
+      -1,   171,   106,   177,    -1,   222,    -1,   109,   214,    -1,
+     222,    -1,   109,   215,    -1,   107,    -1,   105,   207,   126,
+      -1,   108,   132,   105,   207,   126,    -1,   109,   215,   107,
+      -1,   109,   105,   175,   126,    -1,   222,    -1,   176,    -1,
+     176,   106,    -1,   215,    -1,   105,   175,   126,    -1,   176,
+     106,   215,    -1,   176,   106,   105,   175,   126,    -1,   181,
+     179,   173,    -1,     8,   179,   173,    -1,    50,   181,   179,
+     173,    -1,   217,    -1,   222,    -1,     8,    -1,     9,    -1,
+      50,   178,    -1,   118,   178,    -1,   113,   178,    -1,    14,
+     178,    -1,    10,   118,   178,    -1,   178,   124,   211,   128,
+      -1,   222,    -1,     8,    -1,     9,    -1,    50,   179,    -1,
+     118,   179,    -1,   113,   179,    -1,    14,   179,    -1,    10,
+     118,   179,    -1,   179,   124,   211,   128,    -1,   123,   179,
+     125,   123,   170,   125,   159,    -1,   123,   179,   125,    -1,
+     222,    -1,    50,   180,    -1,   118,   180,    -1,   113,   180,
+      -1,    14,   180,    -1,    10,   118,   180,    -1,   180,   124,
+     211,   128,    -1,   123,   180,   125,   123,   170,   125,   159,
+      -1,   203,    -1,     9,    -1,    94,   220,    -1,   185,    -1,
+     187,    -1,   192,    -1,   194,    -1,   199,   220,    -1,   198,
+     220,    -1,   203,    -1,     9,    -1,    94,   220,    -1,   185,
+      -1,   187,    -1,   192,    -1,   194,    -1,   199,   220,    -1,
+     198,   220,    -1,   203,    -1,     9,    -1,    94,   220,    -1,
+     199,   220,    -1,   198,   220,    -1,   181,   180,    -1,    50,
+     181,   180,    -1,    -1,   199,   105,   186,   131,   126,    -1,
+      -1,   199,   220,   188,   189,   105,   131,   126,    -1,   222,
+      -1,   190,    -1,   108,   191,    -1,   190,   106,   191,    -1,
+      80,   219,    -1,    79,   219,    -1,    78,   219,    -1,    98,
+      80,   219,    -1,    98,    79,   219,    -1,    98,    78,   219,
+      -1,    80,    98,   219,    -1,    79,    98,   219,    -1,    78,
+      98,   219,    -1,    -1,   198,   105,   193,   197,   126,    -1,
+      -1,   198,   220,   105,   195,   197,   126,    -1,   222,    -1,
+     196,   220,   106,    -1,   196,   220,   109,   215,   106,    -1,
+     196,    -1,   196,   220,    -1,   196,   220,   109,   215,    -1,
+      56,    -1,    49,    -1,    88,    -1,    95,    -1,    -1,    74,
+     220,   105,   201,   131,   126,    -1,    74,   105,   131,   126,
+      -1,    97,   220,    -1,    97,    74,   220,    -1,   204,    -1,
+     205,    -1,   206,    -1,    45,    -1,    47,    -1,    48,    -1,
+      83,    -1,    69,    -1,    70,    -1,    96,    -1,    84,    -1,
+      68,    -1,    83,   204,    -1,    69,   204,    -1,    96,   204,
+      -1,    84,   204,    -1,    62,    -1,    69,    62,    -1,    52,
+      -1,    69,    69,    62,    -1,    69,    52,    -1,    99,    -1,
+      -1,   208,   209,    -1,   222,    -1,   209,   210,    -1,     3,
+      -1,     4,    -1,     6,    -1,     5,    -1,     8,    -1,     9,
+      -1,    10,    -1,     7,    -1,    12,    -1,    13,    -1,    14,
+      -1,    15,    -1,    16,    -1,    17,    -1,    18,    -1,    19,
+      -1,    20,    -1,    21,    -1,    22,    -1,    29,    -1,    30,
+      -1,    31,    -1,    32,    -1,    33,    -1,    34,    -1,    35,
+      -1,    36,    -1,    37,    -1,    38,    -1,    39,    -1,    40,
+      -1,    41,    -1,    42,    -1,    45,    -1,    46,    -1,    47,
+      -1,    48,    -1,    49,    -1,    50,    -1,    51,    -1,    52,
+      -1,    53,    -1,    54,    -1,    56,    -1,    58,    -1,    59,
+      -1,    61,    -1,    62,    -1,    63,    -1,    64,    -1,    65,
+      -1,    66,    -1,    67,    -1,    68,    -1,    69,    -1,    73,
+      -1,    75,    -1,    78,    -1,    79,    -1,    80,    -1,    60,
+      -1,    81,    -1,    82,    -1,    83,    -1,    84,    -1,    85,
+      -1,    86,    -1,    87,    -1,    88,    -1,    90,    -1,    91,
+      -1,    92,    -1,    93,    -1,    94,    -1,    95,    -1,    96,
+      -1,    98,    -1,    99,    -1,   100,    -1,   101,    -1,    77,
+      -1,   116,    -1,   117,    -1,   118,    -1,   119,    -1,   113,
+      -1,   111,    -1,   112,    -1,   127,    -1,   121,    -1,   109,
+      -1,   120,    -1,   114,    -1,   115,    -1,   123,    -1,   125,
+      -1,   122,    -1,   106,    -1,   107,    -1,   108,    -1,   124,
+      -1,   128,    -1,   110,    -1,   105,   209,   126,    -1,   222,
+      -1,   215,    -1,   222,    -1,   213,    -1,   215,    -1,   213,
+     106,   215,    -1,   216,    -1,   123,   184,   125,   214,    -1,
+      87,   114,   184,   115,   123,   213,   125,    -1,    53,   114,
+     184,   115,   123,   213,   125,    -1,    85,   123,   184,   125,
+      -1,   127,   214,    -1,   121,   214,    -1,   117,   214,    -1,
+     118,   214,    -1,   113,   214,    -1,   214,   118,   214,    -1,
+     214,   119,   214,    -1,   214,   120,   214,    -1,   214,   116,
+     214,    -1,   214,   117,   214,    -1,   214,   111,   214,    -1,
+     214,   112,   214,    -1,   214,   113,   214,    -1,   214,    13,
+     214,    -1,   214,    14,   214,    -1,   214,    15,   214,    -1,
+     214,    16,   214,    -1,   214,    17,   214,    -1,   214,    18,
+     214,    -1,   214,    19,   214,    -1,   214,    20,   214,    -1,
+     214,   110,   214,   108,   214,    -1,   214,   124,   215,   128,
+      -1,   214,   123,   213,   125,    -1,   214,   123,   125,    -1,
+     214,   122,   214,    -1,   214,    29,   214,    -1,   123,   213,
+     125,    -1,   216,    -1,   123,   184,   125,   215,    -1,    87,
+     114,   184,   115,   123,   213,   125,    -1,    53,   114,   184,
+     115,   123,   213,   125,    -1,     9,   123,   212,   125,    -1,
+      68,   123,   212,   125,    -1,    47,   123,   212,   125,    -1,
+      48,   123,   212,   125,    -1,    45,   123,   212,   125,    -1,
+      83,   123,   212,   125,    -1,    69,   123,   212,   125,    -1,
+      96,   123,   212,   125,    -1,    84,   123,   212,   125,    -1,
+      62,   123,   212,   125,    -1,    52,   123,   212,   125,    -1,
+      85,   123,   184,   125,    -1,    75,   183,    -1,    75,   183,
+     123,   212,   125,    -1,   127,   215,    -1,   121,   215,    -1,
+     117,   215,    -1,   118,   215,    -1,   113,   215,    -1,   215,
+     118,   215,    -1,   215,   119,   215,    -1,   215,   120,   215,
+      -1,   215,   116,   215,    -1,   215,   117,   215,    -1,   215,
+     111,   215,    -1,   215,   112,   215,    -1,   215,   113,   215,
+      -1,   215,    13,   215,    -1,   215,    14,   215,    -1,   215,
+      15,   215,    -1,   215,    16,   215,    -1,   215,    17,   215,
+      -1,   215,    18,   215,    -1,   215,   114,   215,    -1,   215,
+     115,   215,    -1,   215,    19,   215,    -1,   215,    20,   215,
+      -1,   215,   110,   215,   108,   215,    -1,   215,   124,   215,
+     128,    -1,   215,   123,   213,   125,    -1,   215,   123,   125,
+      -1,   215,   122,   215,    -1,   215,    29,   215,    -1,   123,
+     213,   125,    -1,     4,    -1,    91,    -1,    61,    -1,     5,
+      -1,     3,    -1,   221,    -1,     8,    -1,   218,    -1,   123,
+     184,   125,   215,    -1,    87,   114,   184,   115,   123,   213,
+     125,    -1,    53,   114,   184,   115,   123,   213,   125,    -1,
+      85,   123,   184,   125,    -1,    75,   183,    -1,    75,   183,
+     123,   212,   125,    -1,   127,   215,    -1,   121,   215,    -1,
+     117,   215,    -1,   113,   215,    -1,   217,   118,   215,    -1,
+     217,   119,   215,    -1,   217,   120,   215,    -1,   217,   116,
+     215,    -1,   217,   117,   215,    -1,   217,   111,   215,    -1,
+     217,   112,   215,    -1,   217,   113,   215,    -1,   217,    13,
+     215,    -1,   217,    14,   215,    -1,   217,    15,   215,    -1,
+     217,    16,   215,    -1,   217,    17,   215,    -1,   217,    18,
+     215,    -1,   217,   114,   215,    -1,   217,   115,   215,    -1,
+     217,    19,   215,    -1,   217,    20,   215,    -1,   217,   110,
+     215,   108,   215,    -1,   217,   124,   215,   128,    -1,   217,
+     123,   213,   125,    -1,   217,   123,   125,    -1,   217,   122,
+     215,    -1,   217,    29,   215,    -1,   123,   213,   125,    -1,
+       4,    -1,    91,    -1,    61,    -1,     5,    -1,     3,    -1,
+     221,    -1,   220,    -1,   199,   220,    -1,    94,   220,    -1,
+       8,    -1,     9,    -1,     6,    -1,   221,     6,    -1,    -1
 };
 
 /* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
 static const yytype_uint16 yyrline[] =
 {
-       0,   383,   383,   384,   388,   395,   396,   397,   401,   402,
-     406,   419,   418,   430,   431,   432,   433,   434,   435,   436,
-     437,   450,   459,   463,   471,   475,   479,   490,   507,   516,
-     515,   530,   534,   538,   549,   553,   557,   561,   565,   569,
-     573,   577,   581,   588,   592,   601,   613,   612,   628,   627,
-     645,   653,   664,   673,   687,   686,   702,   701,   712,   726,
-     734,   745,   754,   769,   768,   791,   790,   815,   814,   845,
-     844,   860,   859,   877,   876,   908,   907,   933,   946,   950,
-     954,   958,   965,   969,   973,   977,   981,   985,   989,   993,
-     997,  1001,  1005,  1009,  1013,  1017,  1021,  1025,  1029,  1033,
-    1037,  1041,  1045,  1049,  1053,  1057,  1061,  1065,  1069,  1073,
-    1077,  1081,  1085,  1089,  1093,  1097,  1101,  1105,  1109,  1113,
-    1117,  1124,  1125,  1130,  1129,  1140,  1141,  1145,  1151,  1160,
-    1164,  1168,  1172,  1176,  1182,  1192,  1196,  1201,  1210,  1214,
-    1228,  1233,  1238,  1243,  1248,  1253,  1258,  1264,  1263,  1285,
-    1289,  1294,  1298,  1303,  1311,  1316,  1324,  1328,  1335,  1339,
-    1346,  1350,  1354,  1358,  1362,  1369,  1370,  1371,  1375,  1378,
-    1379,  1380,  1384,  1389,  1397,  1403,  1413,  1417,  1421,  1425,
-    1430,  1435,  1440,  1445,  1453,  1457,  1461,  1465,  1470,  1475,
-    1480,  1485,  1490,  1496,  1504,  1508,  1513,  1518,  1523,  1528,
-    1533,  1542,  1546,  1551,  1555,  1559,  1563,  1567,  1571,  1587,
-    1606,  1610,  1615,  1619,  1623,  1627,  1631,  1635,  1651,  1670,
-    1674,  1679,  1683,  1699,  1718,  1724,  1735,  1734,  1759,  1758,
-    1788,  1789,  1793,  1794,  1798,  1802,  1806,  1810,  1814,  1818,
-    1822,  1826,  1830,  1838,  1837,  1850,  1849,  1861,  1862,  1868,
-    1876,  1877,  1883,  1892,  1899,  1903,  1907,  1915,  1914,  1936,
-    1940,  1946,  1955,  1956,  1957,  1961,  1965,  1969,  1973,  1978,
-    1983,  1988,  1993,  1998,  2002,  2007,  2016,  2021,  2029,  2033,
-    2038,  2042,  2047,  2055,  2065,  2065,  2075,  2076,  2080,  2083,
-    2086,  2089,  2092,  2095,  2098,  2101,  2104,  2104,  2104,  2105,
-    2105,  2105,  2105,  2106,  2106,  2106,  2106,  2106,  2107,  2107,
-    2107,  2108,  2108,  2108,  2108,  2108,  2109,  2109,  2109,  2109,
-    2109,  2110,  2110,  2110,  2110,  2110,  2110,  2111,  2111,  2111,
-    2111,  2111,  2112,  2112,  2112,  2113,  2113,  2113,  2113,  2114,
-    2114,  2114,  2115,  2115,  2115,  2115,  2115,  2116,  2116,  2116,
-    2116,  2117,  2117,  2117,  2117,  2117,  2118,  2118,  2118,  2118,
-    2118,  2118,  2119,  2119,  2119,  2119,  2119,  2120,  2121,  2124,
-    2124,  2124,  2124,  2124,  2124,  2124,  2124,  2124,  2124,  2124,
-    2125,  2125,  2125,  2125,  2125,  2125,  2125,  2125,  2125,  2125,
-    2126,  2126,  2130,  2134,  2141,  2145,  2152,  2156,  2163,  2167,
-    2171,  2175,  2179,  2183,  2187,  2191,  2203,  2207,  2211,  2215,
-    2219,  2223,  2227,  2231,  2235,  2239,  2243,  2247,  2251,  2255,
-    2259,  2263,  2267,  2271,  2275,  2279,  2283,  2287,  2291,  2295,
-    2299,  2307,  2311,  2315,  2319,  2323,  2330,  2336,  2342,  2348,
-    2354,  2361,  2368,  2375,  2382,  2388,  2394,  2398,  2402,  2406,
-    2410,  2414,  2426,  2430,  2434,  2438,  2442,  2446,  2450,  2454,
-    2458,  2462,  2466,  2470,  2474,  2478,  2482,  2486,  2490,  2494,
-    2498,  2502,  2506,  2510,  2514,  2518,  2522,  2526,  2530,  2537,
-    2541,  2545,  2549,  2553,  2557,  2561,  2575,  2579,  2583,  2587,
-    2591,  2595,  2599,  2603,  2607,  2611,  2623,  2627,  2631,  2635,
-    2639,  2643,  2647,  2651,  2655,  2659,  2663,  2667,  2671,  2675,
-    2679,  2683,  2687,  2691,  2695,  2699,  2703,  2707,  2711,  2715,
-    2719,  2723,  2730,  2734,  2738,  2742,  2746,  2750,  2757,  2765,
-    2773,  2796,  2800,  2807,  2811,  2817
+       0,   384,   384,   385,   389,   396,   397,   398,   402,   403,
+     407,   420,   419,   431,   432,   433,   434,   435,   436,   437,
+     438,   451,   460,   464,   472,   476,   480,   491,   508,   517,
+     516,   531,   535,   539,   550,   554,   558,   562,   566,   570,
+     574,   578,   582,   589,   593,   602,   614,   613,   629,   628,
+     646,   654,   665,   674,   688,   687,   703,   702,   713,   727,
+     735,   746,   755,   770,   769,   792,   791,   816,   815,   846,
+     845,   861,   860,   878,   877,   909,   908,   934,   947,   951,
+     955,   959,   963,   970,   974,   978,   982,   986,   990,   994,
+     998,  1002,  1006,  1010,  1014,  1018,  1022,  1026,  1030,  1034,
+    1038,  1042,  1046,  1050,  1054,  1058,  1062,  1066,  1070,  1074,
+    1078,  1082,  1086,  1090,  1094,  1098,  1102,  1106,  1110,  1114,
+    1118,  1122,  1129,  1130,  1135,  1134,  1145,  1146,  1150,  1156,
+    1165,  1169,  1173,  1177,  1181,  1187,  1197,  1201,  1206,  1215,
+    1219,  1233,  1238,  1243,  1248,  1253,  1258,  1263,  1268,  1274,
+    1273,  1295,  1299,  1304,  1308,  1313,  1321,  1326,  1334,  1338,
+    1345,  1349,  1356,  1360,  1364,  1368,  1372,  1379,  1380,  1381,
+    1385,  1388,  1389,  1390,  1394,  1399,  1407,  1413,  1423,  1427,
+    1431,  1435,  1440,  1445,  1450,  1455,  1460,  1468,  1472,  1476,
+    1480,  1485,  1490,  1495,  1500,  1505,  1510,  1516,  1524,  1528,
+    1533,  1538,  1543,  1548,  1553,  1558,  1567,  1571,  1576,  1580,
+    1584,  1588,  1592,  1596,  1612,  1631,  1635,  1640,  1644,  1648,
+    1652,  1656,  1660,  1676,  1695,  1699,  1704,  1708,  1724,  1743,
+    1749,  1760,  1759,  1784,  1783,  1813,  1814,  1818,  1819,  1823,
+    1827,  1831,  1835,  1839,  1843,  1847,  1851,  1855,  1863,  1862,
+    1875,  1874,  1886,  1887,  1893,  1901,  1902,  1908,  1917,  1924,
+    1928,  1932,  1940,  1939,  1961,  1965,  1971,  1980,  1981,  1982,
+    1986,  1990,  1994,  1998,  2003,  2008,  2013,  2018,  2023,  2027,
+    2032,  2041,  2046,  2054,  2058,  2063,  2067,  2072,  2080,  2090,
+    2090,  2100,  2101,  2105,  2108,  2111,  2114,  2117,  2120,  2123,
+    2126,  2129,  2129,  2129,  2130,  2130,  2130,  2130,  2131,  2131,
+    2131,  2131,  2131,  2132,  2132,  2132,  2133,  2133,  2133,  2133,
+    2133,  2134,  2134,  2134,  2134,  2134,  2135,  2135,  2135,  2135,
+    2135,  2135,  2136,  2136,  2136,  2136,  2136,  2137,  2137,  2137,
+    2138,  2138,  2138,  2138,  2139,  2139,  2139,  2140,  2140,  2140,
+    2140,  2140,  2141,  2141,  2141,  2141,  2142,  2142,  2142,  2142,
+    2142,  2143,  2143,  2143,  2143,  2143,  2143,  2144,  2144,  2144,
+    2144,  2144,  2145,  2146,  2149,  2149,  2149,  2149,  2149,  2149,
+    2149,  2149,  2149,  2149,  2149,  2150,  2150,  2150,  2150,  2150,
+    2150,  2150,  2150,  2150,  2150,  2151,  2151,  2155,  2159,  2166,
+    2170,  2177,  2181,  2188,  2192,  2196,  2200,  2204,  2208,  2212,
+    2216,  2228,  2232,  2236,  2240,  2244,  2248,  2252,  2256,  2260,
+    2264,  2268,  2272,  2276,  2280,  2284,  2288,  2292,  2296,  2300,
+    2304,  2308,  2312,  2316,  2320,  2324,  2332,  2336,  2340,  2344,
+    2348,  2355,  2361,  2367,  2373,  2379,  2386,  2393,  2400,  2407,
+    2413,  2419,  2423,  2427,  2431,  2435,  2439,  2451,  2455,  2459,
+    2463,  2467,  2471,  2475,  2479,  2483,  2487,  2491,  2495,  2499,
+    2503,  2507,  2511,  2515,  2519,  2523,  2527,  2531,  2535,  2539,
+    2543,  2547,  2551,  2555,  2562,  2566,  2570,  2574,  2578,  2582,
+    2586,  2600,  2604,  2608,  2612,  2616,  2620,  2624,  2628,  2632,
+    2636,  2648,  2652,  2656,  2660,  2664,  2668,  2672,  2676,  2680,
+    2684,  2688,  2692,  2696,  2700,  2704,  2708,  2712,  2716,  2720,
+    2724,  2728,  2732,  2736,  2740,  2744,  2748,  2755,  2759,  2763,
+    2767,  2771,  2775,  2782,  2790,  2798,  2821,  2825,  2832,  2836,
+    2842
 };
 #endif
 
@@ -1137,17 +1142,17 @@ static const char *const yytname[] =
   "KW_EXTENSION", "KW_EXTERN", "KW_EXPLICIT", "KW_PUBLISHED", "KW_FALSE",
   "KW_FLOAT", "KW_FRIEND", "KW_FOR", "KW_GOTO", "KW_IF", "KW_INLINE",
   "KW_INT", "KW_LONG", "KW_LONGLONG", "KW_MAKE_PROPERTY", "KW_MAKE_SEQ",
-  "KW_MUTABLE", "KW_NAMESPACE", "KW_NEW", "KW_OPERATOR", "KW_PRIVATE",
-  "KW_PROTECTED", "KW_PUBLIC", "KW_REGISTER", "KW_RETURN", "KW_SHORT",
-  "KW_SIGNED", "KW_SIZEOF", "KW_STATIC", "KW_STATIC_CAST", "KW_STRUCT",
-  "KW_TEMPLATE", "KW_THROW", "KW_TRUE", "KW_TRY", "KW_TYPEDEF",
-  "KW_TYPENAME", "KW_UNION", "KW_UNSIGNED", "KW_USING", "KW_VIRTUAL",
-  "KW_VOID", "KW_VOLATILE", "KW_WHILE", "START_CPP", "START_CONST_EXPR",
-  "START_TYPE", "'{'", "','", "';'", "':'", "'='", "'?'", "'|'", "'^'",
-  "'&'", "'<'", "'>'", "'+'", "'-'", "'*'", "'/'", "'%'", "'~'", "'.'",
-  "'('", "'['", "')'", "'}'", "'!'", "']'", "$accept", "grammar", "cpp",
-  "constructor_inits", "constructor_init", "extern_c", "$@1",
-  "declaration", "friend_declaration", "$@2", "storage_class",
+  "KW_MUTABLE", "KW_NAMESPACE", "KW_NEW", "KW_NOEXCEPT", "KW_OPERATOR",
+  "KW_PRIVATE", "KW_PROTECTED", "KW_PUBLIC", "KW_REGISTER", "KW_RETURN",
+  "KW_SHORT", "KW_SIGNED", "KW_SIZEOF", "KW_STATIC", "KW_STATIC_CAST",
+  "KW_STRUCT", "KW_TEMPLATE", "KW_THROW", "KW_TRUE", "KW_TRY",
+  "KW_TYPEDEF", "KW_TYPENAME", "KW_UNION", "KW_UNSIGNED", "KW_USING",
+  "KW_VIRTUAL", "KW_VOID", "KW_VOLATILE", "KW_WHILE", "START_CPP",
+  "START_CONST_EXPR", "START_TYPE", "'{'", "','", "';'", "':'", "'='",
+  "'?'", "'|'", "'^'", "'&'", "'<'", "'>'", "'+'", "'-'", "'*'", "'/'",
+  "'%'", "'~'", "'.'", "'('", "'['", "')'", "'}'", "'!'", "']'", "$accept",
+  "grammar", "cpp", "constructor_inits", "constructor_init", "extern_c",
+  "$@1", "declaration", "friend_declaration", "$@2", "storage_class",
   "type_like_declaration", "multiple_var_declaration", "$@3", "$@4",
   "multiple_instance_identifiers", "multiple_const_instance_identifiers",
   "typedef_declaration", "$@5", "$@6", "typedef_instance_identifiers",
@@ -1192,69 +1197,70 @@ static const yytype_uint16 yytoknum[] =
      325,   326,   327,   328,   329,   330,   331,   332,   333,   334,
      335,   336,   337,   338,   339,   340,   341,   342,   343,   344,
      345,   346,   347,   348,   349,   350,   351,   352,   353,   354,
-     355,   356,   357,   358,   123,    44,    59,    58,    61,    63,
-     124,    94,    38,    60,    62,    43,    45,    42,    47,    37,
-     126,    46,    40,    91,    41,   125,    33,    93
+     355,   356,   357,   358,   359,   123,    44,    59,    58,    61,
+      63,   124,    94,    38,    60,    62,    43,    45,    42,    47,
+      37,   126,    46,    40,    91,    41,   125,    33,    93
 };
 # endif
 
 /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
 static const yytype_uint8 yyr1[] =
 {
-       0,   128,   129,   129,   129,   130,   130,   130,   131,   131,
-     132,   134,   133,   135,   135,   135,   135,   135,   135,   135,
-     135,   135,   135,   135,   135,   135,   135,   135,   135,   137,
-     136,   138,   138,   138,   138,   138,   138,   138,   138,   138,
-     138,   138,   138,   139,   139,   139,   141,   140,   142,   140,
-     143,   143,   144,   144,   146,   145,   147,   145,   145,   148,
-     148,   149,   149,   151,   150,   152,   150,   153,   150,   154,
-     150,   155,   150,   156,   150,   157,   150,   150,   158,   158,
-     158,   158,   159,   159,   159,   159,   159,   159,   159,   159,
-     159,   159,   159,   159,   159,   159,   159,   159,   159,   159,
-     159,   159,   159,   159,   159,   159,   159,   159,   159,   159,
-     159,   159,   159,   159,   159,   159,   159,   159,   159,   159,
-     159,   160,   160,   162,   161,   163,   163,   164,   164,   165,
-     165,   165,   165,   165,   165,   166,   166,   166,   167,   167,
-     167,   167,   167,   167,   167,   167,   167,   168,   167,   169,
-     169,   169,   169,   169,   170,   170,   171,   171,   172,   172,
-     173,   173,   173,   173,   173,   174,   174,   174,   175,   175,
-     175,   175,   176,   176,   176,   176,   177,   177,   177,   177,
-     177,   177,   177,   177,   178,   178,   178,   178,   178,   178,
-     178,   178,   178,   178,   179,   179,   179,   179,   179,   179,
-     179,   180,   180,   180,   180,   180,   180,   180,   180,   180,
-     181,   181,   181,   181,   181,   181,   181,   181,   181,   182,
-     182,   182,   182,   182,   183,   183,   185,   184,   187,   186,
-     188,   188,   189,   189,   190,   190,   190,   190,   190,   190,
-     190,   190,   190,   192,   191,   194,   193,   195,   195,   195,
-     196,   196,   196,   197,   198,   198,   198,   200,   199,   199,
-     201,   201,   202,   202,   202,   203,   203,   203,   203,   203,
-     203,   203,   203,   203,   203,   203,   203,   203,   204,   204,
-     204,   204,   204,   205,   207,   206,   208,   208,   209,   209,
-     209,   209,   209,   209,   209,   209,   209,   209,   209,   209,
-     209,   209,   209,   209,   209,   209,   209,   209,   209,   209,
-     209,   209,   209,   209,   209,   209,   209,   209,   209,   209,
-     209,   209,   209,   209,   209,   209,   209,   209,   209,   209,
-     209,   209,   209,   209,   209,   209,   209,   209,   209,   209,
-     209,   209,   209,   209,   209,   209,   209,   209,   209,   209,
-     209,   209,   209,   209,   209,   209,   209,   209,   209,   209,
-     209,   209,   209,   209,   209,   209,   209,   209,   209,   209,
-     209,   209,   209,   209,   209,   209,   209,   209,   209,   209,
-     209,   209,   209,   209,   209,   209,   209,   209,   209,   209,
-     209,   209,   210,   210,   211,   211,   212,   212,   213,   213,
-     213,   213,   213,   213,   213,   213,   213,   213,   213,   213,
-     213,   213,   213,   213,   213,   213,   213,   213,   213,   213,
-     213,   213,   213,   213,   213,   213,   213,   213,   213,   213,
-     213,   214,   214,   214,   214,   214,   214,   214,   214,   214,
+       0,   129,   130,   130,   130,   131,   131,   131,   132,   132,
+     133,   135,   134,   136,   136,   136,   136,   136,   136,   136,
+     136,   136,   136,   136,   136,   136,   136,   136,   136,   138,
+     137,   139,   139,   139,   139,   139,   139,   139,   139,   139,
+     139,   139,   139,   140,   140,   140,   142,   141,   143,   141,
+     144,   144,   145,   145,   147,   146,   148,   146,   146,   149,
+     149,   150,   150,   152,   151,   153,   151,   154,   151,   155,
+     151,   156,   151,   157,   151,   158,   151,   151,   159,   159,
+     159,   159,   159,   160,   160,   160,   160,   160,   160,   160,
+     160,   160,   160,   160,   160,   160,   160,   160,   160,   160,
+     160,   160,   160,   160,   160,   160,   160,   160,   160,   160,
+     160,   160,   160,   160,   160,   160,   160,   160,   160,   160,
+     160,   160,   161,   161,   163,   162,   164,   164,   165,   165,
+     166,   166,   166,   166,   166,   166,   167,   167,   167,   168,
+     168,   168,   168,   168,   168,   168,   168,   168,   168,   169,
+     168,   170,   170,   170,   170,   170,   171,   171,   172,   172,
+     173,   173,   174,   174,   174,   174,   174,   175,   175,   175,
+     176,   176,   176,   176,   177,   177,   177,   177,   178,   178,
+     178,   178,   178,   178,   178,   178,   178,   179,   179,   179,
+     179,   179,   179,   179,   179,   179,   179,   179,   180,   180,
+     180,   180,   180,   180,   180,   180,   181,   181,   181,   181,
+     181,   181,   181,   181,   181,   182,   182,   182,   182,   182,
+     182,   182,   182,   182,   183,   183,   183,   183,   183,   184,
+     184,   186,   185,   188,   187,   189,   189,   190,   190,   191,
+     191,   191,   191,   191,   191,   191,   191,   191,   193,   192,
+     195,   194,   196,   196,   196,   197,   197,   197,   198,   199,
+     199,   199,   201,   200,   200,   202,   202,   203,   203,   203,
+     204,   204,   204,   204,   204,   204,   204,   204,   204,   204,
+     204,   204,   204,   205,   205,   205,   205,   205,   206,   208,
+     207,   209,   209,   210,   210,   210,   210,   210,   210,   210,
+     210,   210,   210,   210,   210,   210,   210,   210,   210,   210,
+     210,   210,   210,   210,   210,   210,   210,   210,   210,   210,
+     210,   210,   210,   210,   210,   210,   210,   210,   210,   210,
+     210,   210,   210,   210,   210,   210,   210,   210,   210,   210,
+     210,   210,   210,   210,   210,   210,   210,   210,   210,   210,
+     210,   210,   210,   210,   210,   210,   210,   210,   210,   210,
+     210,   210,   210,   210,   210,   210,   210,   210,   210,   210,
+     210,   210,   210,   210,   210,   210,   210,   210,   210,   210,
+     210,   210,   210,   210,   210,   210,   210,   210,   210,   210,
+     210,   210,   210,   210,   210,   210,   210,   211,   211,   212,
+     212,   213,   213,   214,   214,   214,   214,   214,   214,   214,
      214,   214,   214,   214,   214,   214,   214,   214,   214,   214,
      214,   214,   214,   214,   214,   214,   214,   214,   214,   214,
-     214,   214,   214,   214,   214,   214,   214,   214,   214,   214,
-     214,   214,   214,   214,   214,   214,   214,   214,   214,   215,
-     215,   215,   215,   215,   215,   215,   216,   216,   216,   216,
-     216,   216,   216,   216,   216,   216,   216,   216,   216,   216,
-     216,   216,   216,   216,   216,   216,   216,   216,   216,   216,
-     216,   216,   216,   216,   216,   216,   216,   216,   216,   216,
-     216,   216,   217,   217,   217,   217,   217,   217,   218,   218,
-     218,   219,   219,   220,   220,   221
+     214,   214,   214,   214,   214,   214,   215,   215,   215,   215,
+     215,   215,   215,   215,   215,   215,   215,   215,   215,   215,
+     215,   215,   215,   215,   215,   215,   215,   215,   215,   215,
+     215,   215,   215,   215,   215,   215,   215,   215,   215,   215,
+     215,   215,   215,   215,   215,   215,   215,   215,   215,   215,
+     215,   215,   215,   215,   216,   216,   216,   216,   216,   216,
+     216,   217,   217,   217,   217,   217,   217,   217,   217,   217,
+     217,   217,   217,   217,   217,   217,   217,   217,   217,   217,
+     217,   217,   217,   217,   217,   217,   217,   217,   217,   217,
+     217,   217,   217,   217,   217,   217,   217,   218,   218,   218,
+     218,   218,   218,   219,   219,   219,   220,   220,   221,   221,
+     222
 };
 
 /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN.  */
@@ -1268,27 +1274,28 @@ static const yytype_uint8 yyr2[] =
        2,     4,     2,     4,     0,     4,     0,     5,     3,     2,
        4,     2,     4,     0,     6,     0,     6,     0,     7,     0,
       10,     0,    11,     0,     8,     0,     9,     1,     1,     1,
-       4,     5,     1,     1,     1,     1,     1,     1,     1,     1,
+       2,     4,     5,     1,     1,     1,     1,     1,     1,     1,
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
-       1,     1,     1,     1,     1,     1,     1,     2,     2,     1,
-       1,     1,     1,     0,     6,     1,     1,     1,     3,     2,
-       4,     2,     4,     3,     4,     1,     1,     1,     1,     2,
-       2,     2,     2,     3,     4,     3,     3,     0,     6,     1,
-       1,     1,     3,     2,     1,     3,     1,     2,     1,     2,
-       1,     3,     5,     3,     4,     1,     1,     2,     1,     3,
-       3,     5,     3,     3,     4,     1,     1,     1,     1,     2,
-       2,     2,     3,     4,     1,     1,     1,     2,     2,     2,
-       3,     4,     7,     3,     1,     2,     2,     2,     3,     4,
-       7,     1,     1,     2,     1,     1,     1,     1,     2,     2,
-       1,     1,     2,     1,     1,     1,     1,     2,     2,     1,
-       1,     2,     2,     2,     2,     3,     0,     5,     0,     7,
-       1,     1,     2,     3,     2,     2,     2,     3,     3,     3,
-       3,     3,     3,     0,     5,     0,     6,     1,     3,     5,
-       1,     2,     4,     1,     1,     1,     1,     0,     6,     4,
-       2,     3,     1,     1,     1,     1,     1,     1,     1,     1,
-       1,     1,     1,     1,     2,     2,     2,     2,     1,     2,
-       1,     3,     2,     1,     0,     2,     1,     2,     1,     1,
+       1,     1,     1,     1,     1,     1,     1,     1,     2,     2,
+       1,     1,     1,     1,     0,     6,     1,     1,     1,     3,
+       2,     4,     2,     4,     3,     4,     1,     1,     1,     1,
+       2,     2,     2,     2,     2,     3,     4,     3,     3,     0,
+       6,     1,     1,     1,     3,     2,     1,     3,     1,     2,
+       1,     2,     1,     3,     5,     3,     4,     1,     1,     2,
+       1,     3,     3,     5,     3,     3,     4,     1,     1,     1,
+       1,     2,     2,     2,     2,     3,     4,     1,     1,     1,
+       2,     2,     2,     2,     3,     4,     7,     3,     1,     2,
+       2,     2,     2,     3,     4,     7,     1,     1,     2,     1,
+       1,     1,     1,     2,     2,     1,     1,     2,     1,     1,
+       1,     1,     2,     2,     1,     1,     2,     2,     2,     2,
+       3,     0,     5,     0,     7,     1,     1,     2,     3,     2,
+       2,     2,     3,     3,     3,     3,     3,     3,     0,     5,
+       0,     6,     1,     3,     5,     1,     2,     4,     1,     1,
+       1,     1,     0,     6,     4,     2,     3,     1,     1,     1,
+       1,     1,     1,     1,     1,     1,     1,     1,     1,     2,
+       2,     2,     2,     1,     2,     1,     3,     2,     1,     0,
+       2,     1,     2,     1,     1,     1,     1,     1,     1,     1,
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
@@ -1298,22 +1305,22 @@ static const yytype_uint8 yyr2[] =
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
-       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
-       1,     3,     1,     1,     1,     1,     1,     3,     1,     4,
-       7,     7,     4,     2,     2,     2,     2,     2,     3,     3,
+       1,     1,     1,     1,     1,     1,     3,     1,     1,     1,
+       1,     1,     3,     1,     4,     7,     7,     4,     2,     2,
+       2,     2,     2,     3,     3,     3,     3,     3,     3,     3,
+       3,     3,     3,     3,     3,     3,     3,     3,     3,     5,
+       4,     4,     3,     3,     3,     3,     1,     4,     7,     7,
+       4,     4,     4,     4,     4,     4,     4,     4,     4,     4,
+       4,     4,     2,     5,     2,     2,     2,     2,     2,     3,
        3,     3,     3,     3,     3,     3,     3,     3,     3,     3,
-       3,     3,     3,     3,     5,     4,     4,     3,     3,     3,
-       3,     1,     4,     7,     7,     4,     4,     4,     4,     4,
-       4,     4,     4,     4,     4,     4,     4,     2,     5,     2,
-       2,     2,     2,     2,     3,     3,     3,     3,     3,     3,
+       3,     3,     3,     3,     3,     3,     3,     5,     4,     4,
+       3,     3,     3,     3,     1,     1,     1,     1,     1,     1,
+       1,     1,     4,     7,     7,     4,     2,     5,     2,     2,
+       2,     2,     3,     3,     3,     3,     3,     3,     3,     3,
        3,     3,     3,     3,     3,     3,     3,     3,     3,     3,
-       3,     3,     5,     4,     4,     3,     3,     3,     3,     1,
-       1,     1,     1,     1,     1,     1,     1,     4,     7,     7,
-       4,     2,     5,     2,     2,     2,     2,     3,     3,     3,
-       3,     3,     3,     3,     3,     3,     3,     3,     3,     3,
-       3,     3,     3,     3,     3,     5,     4,     4,     3,     3,
-       3,     3,     1,     1,     1,     1,     1,     1,     1,     2,
-       2,     1,     1,     1,     2,     0
+       5,     4,     4,     3,     3,     3,     3,     1,     1,     1,
+       1,     1,     1,     1,     2,     2,     1,     1,     1,     2,
+       0
 };
 
 /* YYDEFACT[STATE-NAME] -- Default reduction number in state STATE-NUM.
@@ -1321,1070 +1328,1085 @@ static const yytype_uint8 yyr2[] =
    means the default is an error.  */
 static const yytype_uint16 yydefact[] =
 {
-       0,   535,     0,     0,     0,   535,     5,   483,   479,   482,
-     533,   485,     0,     0,     0,     0,     0,     0,   481,     0,
-       0,     0,     0,     0,     0,     0,     0,   480,     0,     0,
-       0,     0,     0,     0,     0,     3,   431,   484,   202,   265,
-     266,   267,   254,     0,   280,   253,   278,   273,   269,   270,
-     268,   272,   255,     0,   256,   271,   283,   535,     4,   204,
-     205,   206,   207,     0,     0,   201,   262,   263,   264,     1,
+       0,   540,     0,     0,     0,   540,     5,   488,   484,   487,
+     538,   490,     0,     0,     0,     0,     0,     0,   486,     0,
+       0,     0,     0,     0,     0,     0,     0,   485,     0,     0,
+       0,     0,     0,     0,     0,     3,   436,   489,   207,   270,
+     271,   272,   259,     0,   285,   258,   283,   278,   274,   275,
+     273,   277,   260,     0,   261,   276,   288,   540,     4,   209,
+     210,   211,   212,     0,     0,   206,   267,   268,   269,     1,
       20,    21,     0,    29,     0,     0,     0,     0,     0,     0,
-     123,   535,     0,     6,    15,     7,    18,     0,    13,    43,
-      14,    16,    17,    31,   535,   535,   535,   535,   535,     0,
-     535,   535,   535,   220,     0,   447,     0,     0,   219,   535,
-     535,     0,     0,   535,   453,   451,   452,   450,   202,   265,
-     266,   267,   280,   278,   273,   269,   268,   272,   271,     0,
-       0,   396,   449,     0,     0,     0,     0,     0,     0,     0,
+     124,   540,     0,     6,    15,     7,    18,     0,    13,    43,
+      14,    16,    17,    31,   540,   540,   540,   540,   540,     0,
+     540,   540,   540,   225,     0,   452,     0,     0,   224,   540,
+     540,     0,     0,   540,   458,   456,   457,   455,   207,   270,
+     271,   272,   285,   283,   278,   274,   273,   277,   276,     0,
+       0,   401,   454,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,   534,   535,   282,   279,
-     269,   275,   269,   274,   277,   531,   532,   203,   276,     0,
-     535,   535,   535,   535,   224,   194,   243,   209,   226,   208,
-      22,   535,     0,     0,   535,     0,    25,    24,    23,     0,
-       0,    19,     0,   260,    77,   211,    41,     0,    42,    32,
-      37,    35,    39,     0,    40,    34,     0,    36,    38,    11,
-       0,     0,    46,   213,   214,   215,   216,     0,     0,   210,
-       0,   395,   394,     0,     0,     0,     0,     0,     0,     0,
-       0,   221,   535,   223,   222,     0,     0,     0,     0,     0,
-       0,     0,   478,   462,   463,   464,   465,   466,   467,   470,
-     471,   477,     0,   459,   460,   461,   468,   469,   457,   458,
-     454,   455,   456,   476,   475,     0,     0,   225,   281,   535,
-     195,   197,   196,     0,   535,   535,   245,   535,   535,    30,
-       0,     0,   535,   257,   535,     0,     0,    54,   261,    63,
-      65,    48,    33,     0,   535,   212,   535,     0,   284,   160,
-       0,     0,    45,    44,     0,   218,   217,   435,   439,   437,
-     438,   445,     0,   444,   436,   441,     0,   440,   443,   446,
-       0,   442,   432,   397,     0,   474,   473,   198,     0,     0,
-     393,   392,   250,     0,   247,   535,   535,     0,     0,   231,
-     230,     0,     0,   259,   535,   136,   137,     0,     0,     0,
-       0,   126,   127,   535,   135,   125,    56,    58,     0,   535,
-       0,     0,   535,     0,   535,   177,   178,     0,   535,   535,
-     535,     0,   176,   535,    67,     0,   535,     0,     8,     0,
-     535,     0,     0,     0,     0,     0,     0,     0,    47,   535,
-     138,     0,   448,     0,   472,   535,   199,   251,   244,     0,
-     227,     0,     0,     0,     0,   232,   535,     0,     0,     0,
-     535,   129,   535,   131,   535,     0,   185,   186,     0,   535,
-     535,   535,   535,   535,   184,     0,    55,   535,   526,   522,
-     525,   535,   150,     0,     0,   524,     0,     0,     0,   523,
-       0,     0,     0,     0,     0,     0,   151,   154,   535,   175,
-     486,   527,   149,     0,     0,     0,    49,   535,     0,   535,
-     179,   181,   180,    73,   535,    12,   535,   161,   285,   286,
-     284,     0,   535,   535,     0,   166,   168,   165,   163,     0,
-     140,    92,    93,    94,    95,    96,    97,   100,   101,   116,
-     104,   105,   106,   107,   108,   109,   110,   111,   112,   113,
-     114,   115,   120,   119,   103,   102,    89,    91,    90,    98,
-      99,    87,    88,    84,    85,    86,    83,     0,     0,    82,
-     139,   142,   141,     0,     0,     0,   147,   535,     0,    50,
-     158,     0,     0,     0,   248,     0,   246,     0,     0,     0,
-     236,   528,     0,   235,     0,   234,     0,     0,     0,   535,
-     233,     0,     0,     0,   258,     0,   535,     0,     0,   121,
-     124,   122,   128,   535,   187,   189,   188,     0,     0,   535,
-     133,   156,    57,   535,     0,    59,   535,   535,     0,   491,
-       0,     0,   496,   495,   494,     0,     0,   493,   535,   153,
-       0,   535,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,   539,   540,   287,   284,
+     274,   280,   274,   279,   282,   536,   537,   208,   281,     0,
+     540,   540,   540,   540,   540,   229,   198,   248,   214,   231,
+     213,    22,   540,     0,     0,   540,     0,    25,    24,    23,
+       0,     0,    19,     0,   265,    77,   216,    41,     0,    42,
+      32,    37,    35,    39,     0,    40,    34,     0,    36,    38,
+      11,     0,     0,    46,   218,   219,   220,   221,     0,     0,
+     215,     0,   400,   399,     0,     0,     0,     0,     0,     0,
+       0,     0,   226,   540,   228,   227,     0,     0,     0,     0,
+       0,     0,     0,   483,   467,   468,   469,   470,   471,   472,
+     475,   476,   482,     0,   464,   465,   466,   473,   474,   462,
+     463,   459,   460,   461,   481,   480,     0,     0,   230,   286,
+     540,   202,   199,   201,   200,     0,   540,   540,   250,   540,
+     540,    30,     0,     0,   540,   262,   540,     0,     0,    54,
+     266,    63,    65,    48,    33,     0,   540,   217,   540,     0,
+     289,   162,     0,     0,    45,    44,     0,   223,   222,   440,
+     444,   442,   443,   450,     0,   449,   441,   446,     0,   445,
+     448,   451,     0,   447,   437,   402,     0,   479,   478,   203,
+       0,     0,   398,   397,   255,     0,   252,   540,   540,     0,
+       0,   236,   235,     0,     0,   264,   540,   137,   138,     0,
+       0,     0,     0,   127,   128,   540,   136,   126,    56,    58,
+       0,   540,     0,     0,   540,     0,   540,   179,   180,     0,
+     540,   540,   540,   540,     0,   178,   540,    67,     0,   540,
+       0,     8,     0,   540,     0,     0,     0,     0,     0,     0,
+       0,     0,    47,   540,   139,     0,   453,     0,   477,   540,
+     204,   256,   249,     0,   232,     0,     0,     0,     0,   237,
+     540,     0,     0,     0,   540,   130,   540,   132,   540,     0,
+     188,   189,     0,   540,   540,   540,   540,   540,   540,   187,
+       0,    55,   540,   531,   527,   530,   540,   152,     0,     0,
+     529,     0,     0,     0,   528,     0,     0,     0,     0,     0,
+       0,   153,   156,   540,   177,   491,   532,   151,     0,     0,
+       0,    49,   540,     0,   540,   184,   181,   183,   182,    73,
+     540,    12,   540,   163,   290,   291,   289,     0,   540,   540,
+       0,   168,   170,   167,   165,     0,   144,   141,    93,    94,
+      95,    96,    97,    98,   101,   102,   117,   105,   106,   107,
+     108,   109,   110,   111,   112,   113,   114,   115,   116,   121,
+     120,   104,   103,    90,    92,    91,    99,   100,    88,    89,
+      85,    86,    87,    84,     0,     0,    83,   140,   143,   142,
+       0,     0,     0,   149,   540,     0,    50,   160,     0,     0,
+       0,   253,     0,   251,     0,     0,     0,   241,   533,     0,
+     240,     0,   239,     0,     0,     0,   540,   238,     0,     0,
+       0,   263,     0,   540,     0,     0,   122,   125,   123,   129,
+     540,   193,   190,   192,   191,     0,     0,   540,   134,   158,
+      57,   540,     0,    59,   540,   540,     0,   496,     0,     0,
+     501,   500,   499,     0,     0,   498,   540,   155,     0,   540,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,   535,     0,
-      52,    75,   182,   535,     0,     0,   288,   289,   291,   290,
-     295,   292,   293,   294,   296,   297,   298,   299,   300,   301,
-     302,   303,   304,   305,   306,   307,   308,   309,   310,   311,
-     312,   313,   314,   315,   316,   317,   318,   319,   320,   321,
-     322,   323,   324,   325,   326,   327,   328,   329,   330,   331,
-     332,   333,   348,   334,   335,   336,   337,   338,   339,   340,
-     341,   342,   343,   344,   368,   345,   346,   347,   349,   350,
-     351,   352,   353,   354,   355,   356,   357,   358,   359,   360,
-     361,   362,   363,   364,   365,   366,   367,   535,   385,   386,
-     387,   378,   390,   374,   375,   373,   380,   381,   369,   370,
-     371,   372,   379,   377,   384,   382,   388,   383,   376,   389,
-     287,     0,     9,     0,     0,   164,   167,   143,   118,   117,
-     146,   145,   159,   535,     0,     0,   434,   433,   535,   252,
-     530,   242,   529,   241,   240,   239,   238,   237,   229,     0,
-      26,     0,   130,   134,   132,   190,   193,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,   157,   398,     0,     0,
-      61,     0,     0,   173,   535,     0,   535,     0,     0,     0,
-     521,    79,    64,    78,   152,   155,   172,   505,   506,   507,
-     508,   509,   510,   513,   514,   520,     0,   502,   503,   504,
-     511,   512,   500,   501,   497,   498,   499,   519,   518,     0,
-       0,     0,    69,    66,     0,   535,     0,   183,   535,     0,
-     162,    10,   169,   535,   170,     0,   144,    51,   200,   249,
-       0,     0,   535,     0,     0,     0,   407,   405,   406,   404,
-       0,     0,   403,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   191,     0,    60,   159,   174,     0,
-       0,   490,     0,   487,     0,     0,   517,   516,    71,   535,
-      53,     0,   535,    68,   391,     0,   535,    27,    28,     0,
-       0,     0,     0,     0,   430,   416,   417,   418,   419,   420,
-     421,   422,   423,   429,     0,   413,   414,   415,   411,   412,
-     408,   409,   410,   428,   427,     0,     0,    62,     0,   492,
-       0,     0,   515,   535,     0,   535,    74,   171,   148,   535,
-       0,   402,     0,   399,     0,   426,   425,     0,     0,    80,
-       0,     0,   535,    76,   192,     0,     0,   424,   489,   488,
-      81,   535,    70,     0,     0,    72,   401,   400
+       0,     0,     0,     0,     0,     0,   540,     0,    52,    75,
+     185,   540,     0,     0,   293,   294,   296,   295,   300,   297,
+     298,   299,   301,   302,   303,   304,   305,   306,   307,   308,
+     309,   310,   311,   312,   313,   314,   315,   316,   317,   318,
+     319,   320,   321,   322,   323,   324,   325,   326,   327,   328,
+     329,   330,   331,   332,   333,   334,   335,   336,   337,   338,
+     353,   339,   340,   341,   342,   343,   344,   345,   346,   347,
+     348,   349,   373,   350,   351,   352,   354,   355,   356,   357,
+     358,   359,   360,   361,   362,   363,   364,   365,   366,   367,
+     368,   369,   370,   371,   372,   540,   390,   391,   392,   383,
+     395,   379,   380,   378,   385,   386,   374,   375,   376,   377,
+     384,   382,   389,   387,   393,   388,   381,   394,   292,     0,
+       9,     0,     0,   166,   169,   145,   119,   118,   148,   147,
+     161,   540,     0,     0,   439,   438,   540,   257,   535,   247,
+     534,   246,   245,   244,   243,   242,   234,     0,    26,     0,
+     131,   135,   133,   194,   197,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,   159,   403,     0,     0,    61,     0,
+       0,   175,   540,     0,   540,     0,     0,     0,   526,    79,
+      64,    78,   154,   157,   174,   510,   511,   512,   513,   514,
+     515,   518,   519,   525,     0,   507,   508,   509,   516,   517,
+     505,   506,   502,   503,   504,   524,   523,     0,     0,     0,
+      69,    66,     0,   540,     0,   186,   540,     0,   164,    10,
+     171,   540,   172,     0,   146,    51,   205,   254,     0,     0,
+     540,     0,     0,     0,   412,   410,   411,   409,     0,     0,
+     408,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,   195,     0,    60,   161,   176,     0,     0,   495,
+       0,   492,    80,     0,     0,   522,   521,    71,   540,    53,
+       0,   540,    68,   396,     0,   540,    27,    28,     0,     0,
+       0,     0,     0,   435,   421,   422,   423,   424,   425,   426,
+     427,   428,   434,     0,   418,   419,   420,   416,   417,   413,
+     414,   415,   433,   432,     0,     0,    62,     0,   497,     0,
+       0,   520,   540,     0,   540,    74,   173,   150,   540,     0,
+     407,     0,   404,     0,   431,   430,     0,     0,    81,     0,
+       0,   540,    76,   196,     0,     0,   429,   494,   493,    82,
+     540,    70,     0,     0,    72,   406,   405
 };
 
 /* YYDEFGOTO[NTERM-NUM].  */
 static const yytype_int16 yydefgoto[] =
 {
-      -1,     4,     5,   377,   378,    84,   296,    85,    86,   181,
-      87,    88,    89,   304,   363,   388,   456,   191,   358,   425,
-     426,   572,   211,   359,   362,   466,   889,   933,   623,   825,
-     792,   520,   560,    90,   189,   350,   351,   352,   353,   389,
-     743,   445,   446,   570,   528,   302,   474,   475,   447,   371,
-     423,   174,    57,   212,   105,    58,    59,   277,    60,   278,
-     338,   339,   405,    61,   275,    62,   335,   332,   333,    63,
-      64,    91,   344,    92,    65,    66,    67,    68,   375,   376,
-     468,   730,   329,   220,   221,   776,   131,    36,   449,   450,
-     540,   390,    37,   222
+      -1,     4,     5,   380,   381,    84,   298,    85,    86,   182,
+      87,    88,    89,   306,   365,   392,   461,   192,   360,   430,
+     431,   580,   212,   361,   364,   472,   898,   942,   631,   833,
+     800,   527,   567,    90,   190,   352,   353,   354,   355,   393,
+     751,   450,   451,   578,   535,   304,   480,   481,   452,   374,
+     428,   175,    57,   213,   105,    58,    59,   279,    60,   280,
+     340,   341,   409,    61,   277,    62,   337,   334,   335,    63,
+      64,    91,   346,    92,    65,    66,    67,    68,   378,   379,
+     474,   738,   331,   221,   222,   784,   131,    36,   454,   455,
+     547,   394,    37,   223
 };
 
 /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
    STATE-NUM.  */
-#define YYPACT_NINF -508
+#define YYPACT_NINF -547
 static const yytype_int16 yypact[] =
 {
-     177,  -508,  2097,  3129,     8,   424,  -508,  -508,  -508,  -508,
-    -508,  -508,   -80,   -73,   -35,   -31,    -6,   -17,  -508,     3,
-      28,    56,  3233,    60,    62,    67,    48,  -508,    75,  2097,
-    2097,  2097,  2097,  1281,  2097,  2689,  -508,   189,  -508,  -508,
-    -508,  -508,  -508,  3285,  -508,  -508,  -508,  -508,  1676,  -508,
-     668,   668,  -508,   113,  -508,   668,  -508,    23,  -508,  -508,
-    -508,  -508,  -508,    32,    39,  -508,  -508,  -508,  -508,  -508,
-    -508,  -508,    98,  -508,   127,   140,    58,   162,   165,   168,
-    -508,  -508,    52,  -508,  -508,  -508,  -508,  2425,  -508,  -508,
-    -508,  -508,  -508,  -508,  2097,  2097,  2097,  2097,  2097,  3129,
-    2097,  2097,  2097,  -508,   113,   170,   113,   113,  -508,  2097,
-    2097,  3129,  3129,  2097,   112,   112,   112,   112,   -80,   -73,
-     -35,   -31,    -6,     3,    28,  2357,  1469,  1865,  1953,   188,
-    -104,  2689,   112,  2097,  2097,  2097,  2097,  2097,  2097,  2097,
-    2097,  2097,  2097,  2097,  2097,  2097,  2097,  2097,  2097,  2097,
-    2097,  2097,  2097,  2097,  1569,  2097,  -508,    23,  -508,  -508,
-    3125,  -508,   668,  -508,  -508,  -508,  -508,  -508,  -508,   200,
-      23,    23,    23,    23,   195,  -508,  -508,   216,  -508,   -30,
-    -508,  3456,   321,   113,  -508,   227,  -508,  -508,  -508,   224,
-    2491,  -508,   113,  -508,   219,   226,  -508,  3285,  -508,   343,
-    -508,  -508,  -508,  3181,  -508,  -508,   113,  -508,  -508,  -508,
-     113,   132,   247,  -508,  -508,  -508,  -508,    32,    39,  -508,
-     236,   260,  -508,   240,   246,   262,   272,   287,   278,   279,
-     282,  -508,  2097,  -508,  -508,   283,   284,   286,   298,   290,
-    2097,  2097,  -508,  1298,   608,  2156,  2156,  1561,  1561,   448,
-     448,  -508,   908,  2849,  2864,  2894,  1561,  1561,   259,   259,
-     112,   112,   112,  -508,  -508,   -70,  2181,   195,  -508,    23,
-     195,   195,   195,    31,  2097,  -508,  -508,  -508,   309,  -508,
-     322,   324,  3314,  -508,  3034,  3285,   132,  -508,  -508,  -508,
-      22,  -508,   189,  3285,   149,  -508,  -508,   312,  -508,  -508,
-     113,  1657,  -508,  -508,   234,   216,   -30,  -508,  -508,  -508,
-    -508,  -508,   314,  -508,  -508,  -508,   307,  -508,  -508,  -508,
-     319,  -508,   112,  2689,  2097,  -508,  -508,   195,   320,   308,
-    2689,  -508,   113,   323,  -508,  -508,  3344,   -15,   340,   341,
-    -508,   441,   113,  -508,  -508,  -508,  -508,   113,  2346,   113,
-     336,   347,  -508,   138,  -508,  -508,  -508,  -508,   234,  1377,
-     338,   234,  1377,   234,   149,  -508,  -508,   342,   149,   149,
-     149,    41,  -508,  3370,  -508,   332,  -508,   194,  -508,   339,
-    1745,  2634,   345,   234,  2345,   234,   234,   234,  -508,   183,
-    -508,  2097,  -508,  2097,  2689,  1377,  -508,    12,  -508,   348,
-    -508,   222,   245,   346,   313,  -508,  -508,   -15,   -27,   359,
-    3400,   358,   138,   360,   382,  3034,  -508,  -508,   354,   138,
-     138,   138,   138,     1,  -508,   234,  -508,   183,  -508,  -508,
-    -508,   138,  -508,  3285,   362,  -508,  3233,   356,   363,  -508,
-    2097,  2097,  2097,  1281,  2097,   361,    26,  -508,   138,  2706,
-    -508,   189,  -508,   234,   178,   365,  -508,   183,   181,   149,
-     367,   367,   367,  -508,  2097,  -508,  1377,  -508,  1156,  -508,
-    -508,   113,  2097,  1745,   357,   389,  2689,  -508,  -508,   234,
-     185,  -508,  -508,  -508,  -508,  -508,  -508,  -508,  -508,  -508,
-    -508,  -508,  -508,  -508,  -508,  -508,  -508,  -508,  -508,  -508,
-    -508,  -508,  -508,  -508,  -508,  -508,  -508,  -508,  -508,  -508,
-    -508,  -508,  -508,  -508,  -508,  -508,  -508,   375,   373,  -508,
-    -508,   185,   185,   204,    77,  1657,  -508,  2097,   400,  -508,
-    -508,   -26,     9,   387,  -508,  2097,  -508,   113,   510,   113,
-    -508,  -508,   510,  -508,   510,  -508,   510,   510,   510,  3430,
-    -508,   498,   415,   113,  -508,  3129,     1,  3129,  2547,  -508,
-    -508,  -508,  -508,   138,   399,   399,   399,   221,   688,  2097,
-    -508,  -508,  -508,   183,   418,  -508,    44,   138,  3129,   402,
-    3129,  3129,   112,   112,   112,   401,    13,   112,   478,  -508,
-    1473,    44,  2097,  2097,  2097,  2097,  2097,  2097,  2097,  2097,
-    2097,  2097,  2097,  2097,  2097,  2097,  2097,  2097,  2097,  2097,
-    2097,  2097,  2097,  1833,  2097,   276,   532,   416,   478,   444,
-    -508,  -508,   367,  1377,   427,   432,  -508,  -508,  -508,  -508,
-    -508,  -508,  -508,  -508,  -508,  -508,  -508,  -508,  -508,  -508,
-    -508,  -508,  -508,  -508,  -508,  -508,  -508,  -508,  -508,  -508,
-    -508,  -508,  -508,  -508,  -508,  -508,  -508,  -508,  -508,  -508,
-    -508,  -508,  -508,  -508,  -508,  -508,  -508,  -508,  -508,  -508,
-    -508,  -508,  -508,  -508,  -508,  -508,  -508,  -508,  -508,  -508,
-    -508,  -508,  -508,  -508,  -508,  -508,  -508,  -508,  -508,  -508,
-    -508,  -508,  -508,  -508,  -508,  -508,  -508,  -508,  -508,  -508,
-    -508,  -508,  -508,  -508,  -508,  -508,  -508,  -508,  -508,  -508,
-    -508,  -508,  -508,  -508,  -508,  -508,  -508,  -508,  -508,  -508,
-    -508,  -508,  -508,  -508,  -508,  -508,  -508,  -508,  -508,  -508,
-    -508,   426,  -508,   433,   449,  -508,  1921,   185,  -508,  -508,
-    -508,  -508,  2634,  1377,   431,   234,  -508,  -508,   478,  2655,
-    -508,  -508,  -508,  -508,  -508,  -508,  -508,  -508,  -508,   454,
-    -508,   455,  -508,  -508,  -508,   399,   451,   467,   459,   471,
-     688,   688,   688,   688,  1281,   688,  2834,  -508,   458,   481,
-    -508,   234,  2097,  -508,    44,   474,  2097,   465,   477,  2097,
-    -508,  -508,   503,  -508,  -508,  -508,  -508,  1298,   608,  2156,
-    2156,  1561,  1561,   448,   448,  -508,  2672,  2849,  2864,  2894,
-    1561,  1561,   259,   259,   112,   112,   112,  -508,  -508,    14,
-    2211,   473,  -508,   503,   234,  1377,   472,  -508,   478,  1031,
-    -508,  -508,  -508,  1745,  2689,   475,  -508,  -508,   503,  -508,
-     495,   496,  1377,  3129,  3129,  3129,   136,   136,   136,   136,
-     482,    18,   136,   688,   688,   688,   688,   688,   688,   688,
-     688,   688,   688,   688,   688,   688,   688,   688,   688,   688,
-     688,   688,  2009,  2097,  -508,   234,  -508,  2689,  -508,   483,
-     485,  -508,   488,   112,   490,  2097,  -508,  -508,  -508,  1377,
-    -508,   491,   478,   503,  -508,   489,   478,  -508,  -508,   492,
-     493,   494,   505,   688,  -508,  1490,  2879,  3046,  3046,  1737,
-    1737,   676,   676,  -508,  2817,  3003,  3018,  3033,   422,   422,
-     136,   136,   136,  -508,  -508,    61,  2230,  -508,  2097,  -508,
-    2097,    20,  2689,  1377,   497,   478,   503,  -508,   503,   478,
-     507,  -508,   508,   136,   688,  -508,  -508,    72,   122,  -508,
-     509,   511,   478,   503,   503,  2097,  2097,  2834,  -508,  -508,
-    -508,   478,   503,   146,   158,   503,  -508,  -508
+     136,  -547,  2122,  3147,    45,   798,  -547,  -547,  -547,  -547,
+    -547,  -547,   -56,   -40,    14,    31,    36,   -65,  -547,    41,
+      56,    62,  3257,    78,   105,   118,   -20,  -547,   133,  2122,
+    2122,  2122,  2122,  1297,  2122,  2640,  -547,   116,  -547,  -547,
+    -547,  -547,  -547,  3312,  -547,  -547,  -547,  -547,  1915,  -547,
+     887,   887,  -547,    28,  -547,   887,  -547,    79,  -547,  -547,
+    -547,  -547,  -547,    44,    69,  -547,  -547,  -547,  -547,  -547,
+    -547,  -547,    34,  -547,   141,   147,   153,   145,   173,   193,
+    -547,  -547,    77,  -547,  -547,  -547,  -547,  2374,  -547,  -547,
+    -547,  -547,  -547,  -547,  2122,  2122,  2122,  2122,  2122,  3147,
+    2122,  2122,  2122,  -547,    28,   154,    28,    28,  -547,  2122,
+    2122,  3147,  3147,  2122,   123,   123,   123,   123,   -56,   -40,
+      14,    31,    36,    41,    56,  2093,  1487,  1620,  1798,   182,
+     -74,  2640,   123,  2122,  2122,  2122,  2122,  2122,  2122,  2122,
+    2122,  2122,  2122,  2122,  2122,  2122,  2122,  2122,  2122,  2122,
+    2122,  2122,  2122,  2122,  1588,  2122,  -547,    79,  -547,  -547,
+    1829,  -547,   887,  -547,  -547,  -547,  -547,  -547,  -547,   190,
+      79,    79,    79,    79,    79,   186,  -547,  -547,   230,  -547,
+     -29,  -547,  3518,   336,    28,  -547,   246,  -547,  -547,  -547,
+     239,  2440,  -547,    28,  -547,   232,   238,  -547,  3312,  -547,
+     356,  -547,  -547,  -547,  3202,  -547,  -547,    28,  -547,  -547,
+    -547,    28,   340,   257,  -547,  -547,  -547,  -547,    44,    69,
+    -547,   242,   262,  -547,   249,   252,   258,   268,   286,   272,
+     277,   283,  -547,  2122,  -547,  -547,   289,   291,   295,   314,
+     315,  2122,  2122,  -547,  1314,  2801,  2999,  2999,   683,   683,
+     405,   405,  -547,  2287,  2816,  2831,  2956,   683,   683,   169,
+     169,   123,   123,   123,  -547,  -547,   -41,   911,   186,  -547,
+      79,   186,   186,   186,   186,     6,  2122,  -547,  -547,  -547,
+     322,  -547,   337,   338,  3342,  -547,  3092,  3312,   340,  -547,
+    -547,  -547,    17,  -547,   116,  3312,    82,  -547,  -547,   327,
+    -547,  -547,    28,  1677,  -547,  -547,   578,   230,   -29,  -547,
+    -547,  -547,  -547,  -547,   328,  -547,  -547,  -547,   333,  -547,
+    -547,  -547,   339,  -547,   123,  2640,  2122,  -547,  -547,   186,
+     342,   332,  2640,  -547,    28,   344,  -547,  -547,  3374,   306,
+     361,   366,  -547,   465,    28,  -547,  -547,  -547,  -547,    28,
+    1740,    28,   359,   369,  -547,   234,  -547,  -547,  -547,  -547,
+     578,  1394,   358,   578,  1394,   578,    82,  -547,  -547,   363,
+      82,    82,    82,    82,    52,  -547,  3414,  -547,   357,  -547,
+      83,  -547,   362,  1766,  2585,   368,   578,   578,  2257,   578,
+     578,   578,  -547,   282,  -547,  2122,  -547,  2122,  2640,  1394,
+    -547,   120,  -547,   364,  -547,   699,   721,  1313,   261,  -547,
+    -547,   306,    -9,   381,  3446,   379,   234,   380,   402,  3092,
+    -547,  -547,   378,   234,   234,   234,   234,   234,   -80,  -547,
+     578,  -547,   282,  -547,  -547,  -547,   234,  -547,  3312,   384,
+    -547,  3257,   382,   387,  -547,  2122,  2122,  2122,  1297,  2122,
+     377,    22,  -547,   234,  2657,  -547,   116,  -547,   578,   287,
+     386,  -547,   282,   150,    82,   388,   388,   388,   388,  -547,
+    2122,  -547,  1394,  -547,  1170,  -547,  -547,    28,  2122,  1766,
+     392,   397,  2640,  -547,  -547,   578,   175,   175,  -547,  -547,
+    -547,  -547,  -547,  -547,  -547,  -547,  -547,  -547,  -547,  -547,
+    -547,  -547,  -547,  -547,  -547,  -547,  -547,  -547,  -547,  -547,
+    -547,  -547,  -547,  -547,  -547,  -547,  -547,  -547,  -547,  -547,
+    -547,  -547,  -547,  -547,   389,   376,  -547,  -547,   175,   175,
+     313,   305,  1677,  -547,  2122,   400,  -547,  -547,     2,     9,
+     395,  -547,  2122,  -547,    28,   254,    28,  -547,  -547,   254,
+    -547,   254,  -547,   254,   254,   254,  3486,  -547,   518,   423,
+      28,  -547,  3147,   -80,  3147,  2497,  -547,  -547,  -547,  -547,
+     234,   407,   407,   407,   407,   142,   656,  2122,  -547,  -547,
+    -547,   282,   430,  -547,   -36,   234,  3147,   416,  3147,  3147,
+     123,   123,   123,   417,    11,   123,   491,  -547,  1491,   -36,
+    2122,  2122,  2122,  2122,  2122,  2122,  2122,  2122,  2122,  2122,
+    2122,  2122,  2122,  2122,  2122,  2122,  2122,  2122,  2122,  2122,
+    2122,  1855,  2122,   331,   539,   422,   491,   442,  -547,  -547,
+     388,  1394,   425,   429,  -547,  -547,  -547,  -547,  -547,  -547,
+    -547,  -547,  -547,  -547,  -547,  -547,  -547,  -547,  -547,  -547,
+    -547,  -547,  -547,  -547,  -547,  -547,  -547,  -547,  -547,  -547,
+    -547,  -547,  -547,  -547,  -547,  -547,  -547,  -547,  -547,  -547,
+    -547,  -547,  -547,  -547,  -547,  -547,  -547,  -547,  -547,  -547,
+    -547,  -547,  -547,  -547,  -547,  -547,  -547,  -547,  -547,  -547,
+    -547,  -547,  -547,  -547,  -547,  -547,  -547,  -547,  -547,  -547,
+    -547,  -547,  -547,  -547,  -547,  -547,  -547,  -547,  -547,  -547,
+    -547,  -547,  -547,  -547,  -547,  -547,  -547,  -547,  -547,  -547,
+    -547,  -547,  -547,  -547,  -547,  -547,  -547,  -547,  -547,  -547,
+    -547,  -547,  -547,  -547,  -547,  -547,  -547,  -547,  -547,   424,
+    -547,   432,   434,  -547,  1944,   175,  -547,  -547,  -547,  -547,
+    2585,  1394,   433,   578,  -547,  -547,   491,  2606,  -547,  -547,
+    -547,  -547,  -547,  -547,  -547,  -547,  -547,   438,  -547,   439,
+    -547,  -547,  -547,   407,   450,   460,   452,   463,   656,   656,
+     656,   656,  1297,   656,  2786,  -547,   451,   472,  -547,   578,
+    2122,  -547,   -36,   466,  2122,   457,   470,  2122,  -547,  -547,
+      19,  -547,  -547,  -547,  -547,  1314,  2801,  2999,  2999,   683,
+     683,   405,   405,  -547,  2623,  2816,  2831,  2956,   683,   683,
+     169,   169,   123,   123,   123,  -547,  -547,    38,  2207,   467,
+    -547,    19,   578,  1394,   464,  -547,   491,  1044,  -547,  -547,
+    -547,  1766,  2640,   469,  -547,  -547,    19,  -547,   489,   490,
+    1394,  3147,  3147,  3147,   137,   137,   137,   137,   474,    61,
+     137,   656,   656,   656,   656,   656,   656,   656,   656,   656,
+     656,   656,   656,   656,   656,   656,   656,   656,   656,   656,
+    2033,  2122,  -547,   578,  -547,  2640,  -547,   477,   476,  -547,
+     480,   123,  -547,   483,  2122,  -547,  -547,  -547,  1394,  -547,
+     482,   491,    19,  -547,   484,   491,  -547,  -547,   486,   493,
+     488,   494,   656,  -547,  1508,  2846,  3012,  3012,   766,   766,
+     517,   517,  -547,  2769,  2971,  2986,   603,   448,   448,   137,
+     137,   137,  -547,  -547,    71,  2237,  -547,  2122,  -547,  2122,
+      16,  2640,  1394,   502,   491,    19,  -547,    19,   491,   506,
+    -547,   508,   137,   656,  -547,  -547,   125,   130,  -547,   519,
+     520,   491,    19,    19,  2122,  2122,  2786,  -547,  -547,  -547,
+     491,    19,   143,   146,    19,  -547,  -547
 };
 
 /* YYPGOTO[NTERM-NUM].  */
 static const yytype_int16 yypgoto[] =
 {
-    -508,  -508,  -169,  -508,   160,  -508,  -508,   460,  -508,  -508,
-     -74,   218,  -508,  -508,  -508,  -109,  -185,  -508,  -508,  -508,
-    -141,  -232,   457,  -508,  -508,  -508,  -508,  -508,  -508,  -508,
-    -507,  -508,  -508,   235,  -508,  -508,  -508,   241,   303,  -293,
-    -508,  -356,  -508,    99,  -400,  -276,  -471,  -508,    68,  -269,
-    -376,  -120,   -29,   469,   225,   -28,   -84,  -508,   -78,  -508,
-    -508,  -508,   250,   -75,  -508,   -61,  -508,  -508,   325,   -11,
-     106,  -508,  -508,  -508,     2,   197,  -508,  -508,   192,  -508,
-     -44,  -508,  -439,   -79,   -20,   130,    73,    15,  -508,  -508,
-    -344,   428,  -130,    -1
+    -547,  -547,  -159,  -547,   139,  -547,  -547,   461,  -547,  -547,
+     -60,   196,  -547,  -547,  -547,  -107,  -181,  -547,  -547,  -547,
+    -136,  -220,   475,  -547,  -547,  -547,  -547,  -547,  -547,  -547,
+    -502,  -547,  -547,   247,  -547,  -547,  -547,   248,   319,  -332,
+    -547,  -351,  -547,   131,  -416,  -238,  -461,  -547,    95,  -331,
+    -313,  -110,    -5,   504,   256,   -30,   -86,  -547,   -85,  -547,
+    -547,  -547,   294,   -73,  -547,   -72,  -547,  -547,   373,   -13,
+     103,  -547,  -547,  -547,     0,    20,  -547,  -547,   222,  -547,
+     -15,  -547,  -427,   -90,   -16,   134,    70,  -546,  -547,  -547,
+    -249,   431,  -134,    -1
 };
 
 /* YYTABLE[YYPACT[STATE-NUM]].  What to do in state STATE-NUM.  If
    positive, shift that token.  If negative, reduce the rule which
    number is the opposite.  If YYTABLE_NINF, syntax error.  */
-#define YYTABLE_NINF -229
+#define YYTABLE_NINF -234
 static const yytype_int16 yytable[] =
 {
-       6,   241,   734,   213,    93,   129,   455,   190,    69,   214,
-     357,   106,   215,   130,   157,   282,   223,   224,   225,   226,
-     242,   228,   229,   230,   108,   624,   216,   574,   165,   166,
-     235,   236,   360,   169,   239,   241,   556,   267,   589,   533,
-     165,   166,    94,   564,   565,   566,   567,   165,   166,    95,
-     270,   271,   272,   273,   325,   576,   175,   619,   543,   545,
-     165,   166,   401,   402,   403,   427,   165,   166,   454,   292,
-     457,   227,   591,   170,  -228,    35,   217,  -228,   551,   241,
-      93,   741,   404,   237,   238,   165,   166,    96,   744,   219,
-     480,    97,   521,   522,   523,   458,    99,   552,   746,   460,
-     461,   462,   114,   115,   116,   117,   213,   132,   336,   568,
-     625,   823,   214,   529,   241,   215,    98,   534,   241,   241,
-     535,   165,   166,   241,   569,   100,   192,   373,   107,   216,
-     778,   590,   573,   747,   265,   171,   176,   790,   886,   361,
-     172,   141,   904,   178,   949,   173,   416,   417,   418,   327,
-     101,   575,   782,   316,   274,   328,   175,   365,   366,   367,
-     615,   112,   184,   463,   464,   861,   241,   569,   291,   175,
-     175,   175,   175,   779,   294,   410,   783,   241,   102,   217,
-      93,   620,   109,     6,   110,   945,   737,   765,   419,   111,
-     622,   796,   219,   218,   751,   156,   958,   113,   753,   368,
-     754,   784,   755,   756,   757,   180,   243,   244,   245,   246,
-     247,   248,   249,   250,   251,   252,   253,   254,   255,   256,
-     257,   258,   259,   260,   261,   262,   263,   241,   266,   451,
-     165,   166,   451,   153,   154,   155,   298,   549,   299,   300,
-     301,   838,   165,   166,   382,   161,   959,   163,   164,   182,
-     420,   241,   168,   165,   166,   421,   356,   871,   872,   873,
-     422,   369,   183,   241,   364,   451,   370,   826,   175,   186,
-     966,    42,   187,   331,   334,   188,     6,   340,     1,     2,
-       3,    93,   967,   355,   383,   616,   354,   298,   141,   299,
-     524,   525,   232,   372,    42,     6,   218,   780,   470,   471,
-     526,   527,   617,   621,   464,   526,   527,   526,   527,    52,
-     384,   616,   240,   322,   323,   537,    54,   269,   274,   538,
-     276,   893,   161,   163,   164,   168,   526,   527,   740,   280,
-     448,   283,    52,   448,   334,    93,   451,   284,   537,    54,
-     558,   289,   542,     6,   569,   766,   385,   330,   290,    10,
-     354,   386,   424,   303,   165,   166,   387,   161,   452,   161,
-     307,   452,   895,   372,   308,   241,   448,   372,   372,   372,
-     309,   531,    93,   532,   381,   469,   150,   151,   152,   477,
-     153,   154,   155,   616,   878,   936,   310,   835,   530,   938,
-     546,   547,   548,   733,   452,    42,   311,   394,   526,   527,
-     821,   312,   313,   314,   577,     6,   315,   317,   318,    93,
-     319,   424,   320,    93,   321,   585,   337,   354,   424,   424,
-     424,   424,   571,   586,    -2,   106,   530,   341,   953,   342,
-     424,   392,   954,    52,   374,   396,   391,   448,   108,   537,
-      54,   393,   395,   544,   406,   962,   407,   424,   398,   408,
-     414,   861,   415,   476,   965,   453,   530,   467,   372,   459,
-     451,   472,   479,   331,   553,   452,   555,    70,   557,   891,
-      80,   563,   477,   536,   213,   578,   581,   141,   580,    71,
-     214,   167,   735,   215,    72,   588,   899,    73,   427,   618,
-     464,   177,   179,   451,   736,    74,    75,   216,    76,   738,
-     739,    77,    78,    79,   185,   745,   759,   539,   539,   539,
-     193,   748,    80,   582,   583,   584,    81,   587,   165,   166,
-      82,   760,   569,   781,   786,   789,   331,   762,   791,   764,
-      83,   457,   231,   934,   233,   234,   741,   330,   822,   868,
-     869,   870,   107,   871,   872,   873,   476,   217,    93,   824,
-     785,   830,   787,   788,   827,   571,   828,   831,   836,    42,
-     219,   448,   424,   148,   149,   150,   151,   152,   331,   153,
-     154,   155,   530,   842,   832,   530,   424,   951,   840,   841,
-     843,   844,   573,   777,   845,   874,   875,   793,   879,   881,
-     530,   882,   884,   819,   448,   888,   892,    52,   742,   896,
-     330,   897,   898,   537,    54,   928,   903,   940,   749,   929,
-     930,   281,   931,   451,   937,   935,   939,   793,   941,   942,
-     288,   952,   452,   135,   136,   137,   138,   139,   140,   955,
-     956,   732,   559,   960,   295,   961,   837,   141,   297,   890,
-     876,   279,   330,   927,   539,   305,   306,   286,   539,   561,
-     539,   412,   539,   539,   539,   763,   562,   550,   795,   287,
-     399,   579,   731,   829,   218,   797,   798,   799,   800,   801,
-     802,   803,   804,   805,   806,   807,   808,   809,   810,   811,
-     812,   813,   814,   815,   816,   817,     0,   820,     0,     0,
-       0,     7,     8,     9,    10,   451,    11,     0,     0,     0,
-       0,     0,     0,     0,     0,   861,   469,   880,     0,     0,
-       0,     0,   451,    39,   448,    40,    41,     0,   143,   144,
-     145,   146,   147,   148,   149,   150,   151,   152,   379,   153,
-     154,   155,     0,     0,     0,     0,    47,   162,    49,     0,
-       0,   767,   452,     0,     0,     0,   850,   793,     0,    18,
-      50,    51,     0,     0,   851,     0,     0,     0,     0,   451,
-     397,     0,     0,    55,     0,     0,     0,     0,     0,     0,
-     409,     0,   768,     0,   769,   411,     0,   413,    27,     0,
-       0,     0,     0,   530,     0,   777,   777,   777,   777,     0,
-     777,   866,   867,   868,   869,   870,   448,   871,   872,   873,
-     770,     0,     0,   451,   771,   772,     0,     0,   773,   834,
-     774,     0,     0,   448,   775,   900,   901,   902,     0,     0,
-       0,     0,     0,     0,   452,     0,     0,   793,     0,   541,
-     541,   541,   477,     0,     0,     0,     0,     0,     0,     0,
-       0,   452,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,   925,     0,     0,   877,     0,     0,     0,     0,
-     448,     0,   883,     0,     0,     0,     0,     0,   777,   777,
-     777,   777,   777,   777,   777,   777,   777,   777,   777,   777,
-     777,   777,   777,   777,   777,   777,   777,     0,   452,     0,
-       0,   793,     0,     0,     0,   793,     0,     0,     0,   379,
-     846,   847,   848,   849,   448,   852,   476,     0,   947,     0,
-     948,     0,     0,     0,     0,     0,     0,     0,   777,     0,
-       0,   133,   134,   135,   136,   137,   138,   139,   140,     0,
-       0,     0,   452,     0,   793,   963,   964,   141,   793,     0,
-       0,     0,     0,     0,     0,     0,   926,     0,     0,     0,
-       0,   793,   379,     0,     0,     0,     0,     0,   932,   777,
-     793,     0,     0,     0,     0,   750,   541,   752,     0,     0,
-     541,     0,   541,     0,   541,   541,   541,     0,     0,     0,
-       0,   761,     0,   905,   906,   907,   908,   909,   910,   911,
-     912,   913,   914,   915,   916,   917,   918,   919,   920,   921,
-     922,   923,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,   324,     0,   142,   143,   144,
-     145,   146,   147,   148,   149,   150,   151,   152,     0,   153,
-     154,   155,     0,   943,   626,   627,   628,   629,   630,   631,
-     632,   633,     0,   634,   635,   636,   637,   638,   639,   640,
-     641,   642,   643,   644,     0,     0,     0,     0,     0,     0,
-     645,   646,   647,   648,   649,   650,   651,   652,   653,   654,
-     655,   656,   657,   658,   957,     0,   659,   660,   661,   662,
-     663,   664,   665,   666,   667,   668,     0,   669,     0,   670,
-     671,   672,   673,   674,   675,   676,   677,   678,   679,   680,
-     681,     0,     0,     0,   682,     0,   683,   684,   685,   686,
-     687,   688,   689,   690,   691,   692,   693,   694,   695,     0,
-     696,   697,   698,   699,   700,   701,   702,     0,   703,   704,
-     705,   706,     0,     0,     0,   707,   708,   709,   710,   711,
-     712,   713,   714,   715,   716,   717,   718,   719,   720,   721,
-     722,   723,   724,   725,   726,   727,   894,   728,   729,   626,
-     627,   628,   629,   630,   631,   632,   633,     0,   634,   635,
-     636,   637,   638,   639,   640,   641,   642,   643,   644,     0,
-       0,     0,     0,     0,     0,   645,   646,   647,   648,   649,
-     650,   651,   652,   653,   654,   655,   656,   657,   658,     0,
-       0,   659,   660,   661,   662,   663,   664,   665,   666,   667,
-     668,     0,   669,     0,   670,   671,   672,   673,   674,   675,
-     676,   677,   678,   679,   680,   681,     0,     0,     0,   682,
-       0,   683,   684,   685,   686,   687,   688,   689,   690,   691,
-     692,   693,   694,   695,     0,   696,   697,   698,   699,   700,
-     701,   702,     0,   703,   704,   705,   706,     0,     0,     0,
-     707,   708,   709,   710,   711,   712,   713,   714,   715,   716,
-     717,   718,   719,   720,   721,   722,   723,   724,   725,   726,
-     727,     0,   728,   729,     7,     8,     9,    10,     0,    11,
-     118,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       6,   214,   215,   129,    93,   224,   225,   226,   227,   106,
+     229,   230,   231,   460,   216,   217,   582,   130,   742,   236,
+     237,   191,   108,   240,   165,   166,   284,   362,   432,   576,
+     785,   459,   242,   462,   597,   463,   165,   166,   157,   465,
+     466,   467,   468,   632,   577,    69,   627,   268,   540,    99,
+     359,   243,   165,   166,   486,   487,   176,   528,   529,   530,
+     271,   272,   273,   274,   275,   242,   294,    94,   161,   228,
+     163,   164,    35,   790,   218,   168,  -233,   165,   166,  -233,
+      93,   238,   239,    95,   327,   165,   166,   220,   577,   169,
+     367,   368,   369,   170,   112,   892,   370,   558,   581,   114,
+     115,   116,   117,   563,   132,   214,   215,   752,   242,   893,
+     571,   572,   573,   574,   575,   242,   559,   242,   216,   217,
+     338,   633,   156,   584,   831,   107,   623,   754,   598,   171,
+     276,   330,   371,   630,   755,   363,   798,    96,   266,   376,
+     599,   958,   181,   318,   242,   161,   163,   164,   168,   177,
+     786,   193,   141,   745,    97,   536,   176,   550,   552,    98,
+     329,   165,   166,   895,   100,   787,   869,   242,   791,   176,
+     176,   176,   176,   176,   179,   469,   470,   242,   218,   101,
+     161,    93,   161,   804,     6,   102,   913,   414,   476,   477,
+     219,   220,   172,   293,   583,   372,   954,   173,   141,   296,
+     373,   109,   174,   244,   245,   246,   247,   248,   249,   250,
+     251,   252,   253,   254,   255,   256,   257,   258,   259,   260,
+     261,   262,   263,   264,   628,   267,   541,   456,   110,   542,
+     456,   242,   785,   785,   785,   785,   242,   785,     1,     2,
+       3,   111,   420,   421,   422,   153,   154,   155,   423,   242,
+     967,   556,   242,   187,   846,   968,   113,   773,   185,   879,
+     880,   881,   165,   166,   183,   456,   577,   774,   975,   176,
+     184,   976,   792,   629,   470,   333,   336,   233,     6,   342,
+     834,   188,   358,    93,   424,   357,   356,   150,   151,   152,
+     366,   153,   154,   155,   219,   375,   759,     6,   533,   534,
+     761,   189,   762,    42,   763,   764,   765,   241,   270,   749,
+     276,   324,   325,   165,   166,   785,   785,   785,   785,   785,
+     785,   785,   785,   785,   785,   785,   785,   785,   785,   785,
+     785,   785,   785,   785,   902,   278,   336,    93,   456,   553,
+     554,   555,    52,   788,   282,     6,   332,   425,   544,    54,
+     356,   285,   426,   286,   429,   291,   453,   427,   565,   453,
+     457,   292,    10,   457,   305,   375,   785,   309,   242,   375,
+     375,   375,   375,   384,   310,    93,   886,   311,   475,   538,
+     904,   539,   483,   312,   405,   406,   407,   300,   741,   301,
+     531,   532,   537,   313,   453,   624,   398,   315,   457,   945,
+     843,   314,   316,   947,   408,   533,   534,   785,   317,     6,
+     533,   534,   625,    93,   319,   429,   320,    93,   593,   356,
+     321,   624,   429,   429,   429,   429,   429,   579,   106,   322,
+     339,   537,   594,   585,   141,   429,   533,   534,   748,   624,
+     323,   108,   962,   343,   344,   300,   963,   301,   302,   303,
+     377,   395,   429,   482,   533,   534,   829,   432,   396,   971,
+     400,   537,   397,   375,   456,   399,   410,   453,   974,   333,
+     402,   457,   411,   412,   418,   419,   458,   869,   483,   214,
+     215,   464,   900,   473,   167,   478,   485,   560,   562,   564,
+     543,    80,   216,   217,   178,   180,   570,   456,   586,   908,
+     462,   589,   596,   744,   747,   588,   753,   186,   546,   546,
+     546,   626,   470,   194,   746,   590,   591,   592,   743,   595,
+     756,   148,   149,   150,   151,   152,   767,   153,   154,   155,
+     768,   577,   770,   333,   772,   232,   789,   234,   235,   794,
+     332,   799,   797,   749,   107,   830,   869,   943,   832,   482,
+     838,   581,   218,   835,   836,    93,   793,   839,   795,   796,
+     840,   844,   579,   848,   849,   220,   876,   877,   878,   429,
+     879,   880,   881,   850,   851,   852,   333,   853,   883,   882,
+     537,   887,   889,   537,   429,   890,   165,   166,   385,   901,
+     897,   960,   386,   453,   905,   801,   906,   907,   537,   912,
+     937,   938,   750,   939,   332,   827,   940,   944,   949,   951,
+     946,   948,   757,   950,   566,   283,   740,   456,   863,   864,
+     865,   866,   867,   868,   290,   801,   453,   961,   387,   964,
+     457,   965,   869,   874,   875,   876,   877,   878,   297,   879,
+     880,   881,   299,   281,   969,   970,   845,   332,   546,   307,
+     308,   899,   546,   884,   546,   388,   546,   546,   546,     7,
+       8,     9,    10,   936,    11,   568,   288,   569,   219,   416,
+     805,   806,   807,   808,   809,   810,   811,   812,   813,   814,
+     815,   816,   817,   818,   819,   820,   821,   822,   823,   824,
+     825,   389,   828,   803,   771,   289,   390,   587,   739,   456,
+     837,   391,   139,   140,   888,   557,     0,   165,   166,   775,
+     403,     0,   141,     0,   475,     0,   456,    18,     0,   874,
+     875,   876,   877,   878,     0,   879,   880,   881,     0,   165,
+     166,     0,     0,   382,     0,     0,     0,     0,     0,     0,
+       0,   776,     0,   777,     0,     0,   453,    27,    42,     0,
+     457,     0,   858,     0,     0,   801,     0,     0,     0,     0,
+       0,     0,     0,     0,   456,   401,   859,     0,     0,   778,
+      42,     0,     0,   779,   780,   413,     0,   781,     0,   782,
+     415,     0,   417,   783,     0,   867,   868,    52,     0,     0,
+       0,   537,     0,   544,    54,   869,     0,   545,    -2,   148,
+     149,   150,   151,   152,     0,   153,   154,   155,   456,    52,
+       0,     0,     0,     0,   842,   544,    54,     0,     0,   549,
+       0,   909,   910,   911,     0,     0,     0,     0,   453,     0,
+       0,     0,   457,     0,     0,   801,   548,   548,   548,     0,
+     483,    70,     0,     0,     0,   453,     0,     0,     0,   457,
+       0,     0,     0,    71,     0,     0,     0,     0,    72,     0,
+     885,    73,     0,     0,   934,     0,     0,   891,     0,    74,
+      75,     0,    76,     0,     0,     0,    77,    78,    79,     0,
+       0,     0,   874,   875,   876,   877,   878,    80,   879,   880,
+     881,    81,     0,   453,     0,    82,     0,   457,     0,     0,
+     801,     0,     0,     0,   801,    83,     0,     0,   382,     0,
+       0,   482,   854,   855,   856,   857,     0,   860,     0,     0,
+       0,   956,     0,   957,   133,   134,   135,   136,   137,   138,
+     139,   140,    39,     0,    40,    41,     0,   453,     0,     0,
+     141,   457,     0,   801,     0,     0,     0,   801,   972,   973,
+       0,   935,     0,     0,     0,    47,   162,    49,     0,     0,
+     801,     0,   382,     0,   941,     0,     0,     0,     0,   801,
+      50,    51,     0,     0,     0,   758,   548,   760,     0,     0,
+     548,     0,   548,    55,   548,   548,   548,     0,     0,     0,
+       0,   769,     0,     0,     0,   914,   915,   916,   917,   918,
+     919,   920,   921,   922,   923,   924,   925,   926,   927,   928,
+     929,   930,   931,   932,     0,     0,     0,     0,     0,     0,
+       0,   142,   143,   144,   145,   146,   147,   148,   149,   150,
+     151,   152,     0,   153,   154,   155,     0,     0,     0,   328,
+       0,     0,     0,     0,     0,     0,   952,   634,   635,   636,
+     637,   638,   639,   640,   641,     0,   642,   643,   644,   645,
+     646,   647,   648,   649,   650,   651,   652,     0,     0,     0,
+       0,     0,     0,   653,   654,   655,   656,   657,   658,   659,
+     660,   661,   662,   663,   664,   665,   666,   966,     0,   667,
+     668,   669,   670,   671,   672,   673,   674,   675,   676,     0,
+     677,     0,   678,   679,   680,   681,   682,   683,   684,   685,
+     686,   687,   688,   689,     0,     0,     0,   690,     0,   691,
+       0,   692,   693,   694,   695,   696,   697,   698,   699,   700,
+     701,   702,   703,     0,   704,   705,   706,   707,   708,   709,
+     710,     0,   711,   712,   713,   714,     0,     0,     0,   715,
+     716,   717,   718,   719,   720,   721,   722,   723,   724,   725,
+     726,   727,   728,   729,   730,   731,   732,   733,   734,   735,
+     903,   736,   737,   634,   635,   636,   637,   638,   639,   640,
+     641,     0,   642,   643,   644,   645,   646,   647,   648,   649,
+     650,   651,   652,     0,     0,     0,     0,     0,     0,   653,
+     654,   655,   656,   657,   658,   659,   660,   661,   662,   663,
+     664,   665,   666,     0,     0,   667,   668,   669,   670,   671,
+     672,   673,   674,   675,   676,     0,   677,     0,   678,   679,
+     680,   681,   682,   683,   684,   685,   686,   687,   688,   689,
+       0,     0,     0,   690,     0,   691,     0,   692,   693,   694,
+     695,   696,   697,   698,   699,   700,   701,   702,   703,     0,
+     704,   705,   706,   707,   708,   709,   710,     0,   711,   712,
+     713,   714,     0,     0,     0,   715,   716,   717,   718,   719,
+     720,   721,   722,   723,   724,   725,   726,   727,   728,   729,
+     730,   731,   732,   733,   734,   735,     0,   736,   737,     0,
+       7,     8,     9,    10,     0,    11,   118,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,   134,   135,   136,   137,   138,   139,   140,     0,
-       0,     0,     0,     0,     0,     0,   119,   141,   120,   121,
-      42,    43,     0,   122,    17,     0,     0,    45,     0,     0,
-       0,     0,    18,   123,     0,     0,     0,     0,     0,   124,
-     125,    49,     0,     0,     0,     0,    22,     0,     0,   950,
-       0,     0,     0,   126,   127,    25,     0,    26,    52,     0,
-       0,    27,     0,     0,    53,    54,   128,     0,     0,    56,
-     428,   429,   430,    10,     0,   431,    38,     0,     0,   432,
-       0,     0,     0,    29,     0,     0,     0,    30,    31,     0,
-       0,    32,     0,    33,     0,     0,     0,    34,   143,   144,
-     145,   146,   147,   148,   149,   150,   151,   152,     0,   153,
-     154,   155,    39,     0,    40,    41,    42,   433,     0,    44,
-     434,     0,     0,    45,     0,     0,     0,     0,   435,    46,
-       0,     0,     0,     0,     0,    47,    48,    49,     0,     0,
-       0,     0,   436,     0,     0,     0,     0,     0,     0,    50,
-      51,   437,     0,   438,    52,     0,     0,   439,     0,     0,
-      53,    54,    55,     0,     0,    56,   428,   429,   430,    10,
-       0,   431,    38,     0,     0,   794,     0,     0,     0,   440,
-       0,     0,     0,   441,     0,     0,     0,   442,     0,   443,
-       0,     0,     0,   444,   854,   855,   856,   857,   858,   859,
-     860,     0,     0,     0,    39,     0,    40,    41,    39,   861,
-      40,    41,    42,   433,     0,    44,   434,     0,     0,    45,
-       0,     0,     0,     0,   435,    46,     0,    47,   162,    49,
-       0,    47,    48,    49,     0,     0,     0,     0,   436,     0,
-       0,    50,    51,     0,     0,    50,    51,   437,     0,   438,
-      52,     0,     0,   439,    55,     0,    53,    54,    55,     0,
-       0,    56,     7,     8,     9,    10,     0,    11,    12,     0,
-     139,   140,     0,     0,     0,   440,     0,     0,     0,   441,
-     141,   109,     0,   442,     0,   443,     0,     0,     0,   444,
-     863,   864,   865,     0,     0,   866,   867,   868,   869,   870,
-       0,   871,   872,   873,    13,     0,    14,    15,     0,     0,
-       0,    16,    17,     0,     0,     0,     0,     0,     0,     0,
-      18,    19,     0,     0,     0,     0,     0,    20,    21,     0,
-       0,     0,     0,     0,    22,     0,     0,     0,     0,     0,
+       0,   165,   166,     0,     0,     0,     0,     0,   134,   135,
+     136,   137,   138,   139,   140,     0,     0,     0,     0,     0,
+       0,     0,   119,   141,   120,   121,    42,    43,     0,   122,
+      17,     0,     0,    45,     0,     0,     0,     0,    18,   123,
+       0,     0,    42,     0,     0,   124,   125,    49,     0,     0,
+       0,   959,    22,     0,     0,     0,     0,     0,     0,     0,
+     126,   127,    25,     0,    26,    52,     0,     0,    27,     0,
+       0,    53,    54,   128,     0,     0,    56,   433,   434,   435,
+      10,    52,   436,    38,     0,     0,   437,   544,    54,     0,
+      29,   551,     0,     0,    30,    31,     0,     0,    32,     0,
+      33,     0,     0,     0,    34,   143,   144,   145,   146,   147,
+     148,   149,   150,   151,   152,     0,   153,   154,   155,    39,
+       0,    40,    41,    42,   438,     0,    44,   439,     0,     0,
+      45,     0,     0,     0,     0,   440,    46,     0,     0,     0,
+       0,     0,    47,    48,    49,     0,     0,     0,     0,   441,
+       0,     0,     0,     0,     0,     0,     0,    50,    51,   442,
+       0,   443,    52,     0,     0,   444,     0,     0,    53,    54,
+      55,     0,     0,    56,   433,   434,   435,    10,     0,   436,
+      38,     0,     0,   802,     0,     0,     0,   445,     0,     0,
+       0,   446,     0,     0,     0,   447,     0,   448,     0,     0,
+       0,   449,   862,   863,   864,   865,   866,   867,   868,     0,
+       0,     0,    39,     0,    40,    41,    39,   869,    40,    41,
+      42,   438,     0,    44,   439,     0,     0,    45,     0,     0,
+       0,     0,   440,    46,     0,    47,   162,    49,     0,    47,
+      48,    49,     0,     0,     0,     0,   441,     0,     0,     0,
+      50,    51,     0,     0,    50,    51,   442,     0,   443,    52,
+       0,     0,   444,    55,     0,    53,    54,    55,     0,     0,
+      56,     7,     8,     9,    10,     0,    11,    12,     0,     0,
+       0,     0,     0,     0,   445,     0,     0,     0,   446,     0,
+     109,     0,   447,     0,   448,     0,     0,     0,   449,   871,
+     872,   873,     0,     0,   874,   875,   876,   877,   878,     0,
+     879,   880,   881,    13,     0,    14,    15,     0,     0,     0,
+      16,    17,     0,     0,     0,     0,     0,     0,     0,    18,
+      19,     0,     0,     0,     0,     0,    20,    21,     0,     0,
+       0,     0,     0,    22,     0,    39,     0,    40,    41,     0,
        0,    23,    24,    25,     0,    26,     0,     0,     0,    27,
-       7,     8,     9,    10,    28,    11,    12,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,   148,   149,   150,   151,
-     152,    29,   153,   154,   155,    30,    31,     0,     0,    32,
-       0,    33,     0,   264,     0,    34,     0,     0,     0,     0,
+       7,     8,     9,    10,    28,    11,    12,     0,    47,   162,
+      49,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,    29,     0,    50,    51,    30,    31,     0,     0,    32,
+       0,    33,     0,   265,     0,    34,    55,     0,     0,     0,
        0,     0,    13,     0,    14,    15,     0,     0,     0,    16,
       17,     0,     0,     0,     0,     0,     0,     0,    18,    19,
-       0,    39,     0,    40,    41,    20,    21,     0,   158,     0,
-       0,     0,    22,     0,     0,     0,     0,     0,   159,    23,
-      24,    25,     0,    26,    47,   160,    49,    27,     7,     8,
-       9,    10,    28,    11,    12,     0,   859,   860,    50,    51,
-       0,   380,     0,     0,     0,     0,   861,     0,     0,    29,
-       0,    55,     0,    30,    31,     0,     0,    32,     0,    33,
-       0,     0,     0,    34,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,   110,     0,    20,    21,     0,   347,   348,
+       0,     0,    22,     0,     0,     0,     0,     0,     0,     0,
+      23,    24,    25,     0,    26,     0,     0,     0,    27,     7,
+       8,     9,    10,    28,    11,    12,     0,     0,     0,     0,
+       0,     0,   383,     0,     0,    39,     0,    40,    41,     0,
+      29,     0,    44,     0,    30,    31,     0,     0,    32,     0,
+      33,     0,    46,     0,    34,     0,     0,     0,    47,    48,
+      49,    13,     0,    14,    15,     0,     0,     0,    16,    17,
+       0,     0,     0,    50,    51,     0,     0,    18,    19,     0,
+       0,     0,     0,     0,    20,    21,    55,     0,     0,    56,
+       0,    22,     0,    39,     0,    40,    41,     0,     0,    23,
+      24,    25,     0,    26,     0,     0,     0,    27,     7,     8,
+       9,    10,    28,    11,    12,     0,    47,   162,    49,     0,
+       0,   479,     0,     0,    39,     0,    40,    41,     0,    29,
+       0,    50,    51,    30,    31,     0,     0,    32,     0,    33,
+       0,   269,     0,    34,    55,     0,     0,    47,   162,    49,
       13,     0,    14,    15,     0,     0,     0,    16,    17,     0,
-       0,     0,     0,     0,     0,     0,    18,    19,     0,     0,
-       0,     0,     0,    20,    21,     0,     0,     0,     0,     0,
-      22,     0,     0,     0,     0,     0,     0,    23,    24,    25,
+       0,     0,    50,    51,     0,     0,    18,    19,     0,     0,
+       0,   113,     0,    20,    21,    55,     0,     0,     0,     0,
+      22,     0,     0,     0,     0,     0,     0,     0,    23,    24,
+      25,     0,    26,     0,     0,     0,    27,     7,     8,     9,
+      10,    28,    11,    12,     0,     0,     0,     0,     0,     0,
+      39,     0,    40,    41,     0,     0,     0,   158,    29,     0,
+       0,     0,    30,    31,     0,     0,    32,   159,    33,     0,
+     826,     0,    34,    47,   160,    49,     0,     0,     0,    13,
+       0,    14,    15,     0,     0,     0,    16,    17,    50,    51,
+       0,     0,     0,     0,     0,    18,    19,     0,     0,     0,
+       0,    55,    20,    21,     0,     0,     0,     0,     0,    22,
+       0,     0,     0,     0,     0,     0,     0,    23,    24,    25,
        0,    26,     0,     0,     0,    27,     7,     8,     9,    10,
-      28,    11,    12,     0,     0,     0,     0,     0,     0,   473,
-       0,     0,   866,   867,   868,   869,   870,    29,   871,   872,
-     873,    30,    31,     0,     0,    32,     0,    33,     0,     0,
+      28,    11,    12,     0,     0,     0,     0,     0,     0,   841,
+       0,     0,     0,     0,     0,     0,     0,    29,     0,     0,
+       0,    30,    31,     0,     0,    32,     0,    33,     0,     0,
        0,    34,     0,     0,     0,     0,     0,     0,    13,     0,
       14,    15,     0,     0,     0,    16,    17,     0,     0,     0,
        0,     0,     0,     0,    18,    19,     0,     0,     0,     0,
        0,    20,    21,     0,     0,     0,     0,     0,    22,     0,
-      39,     0,    40,    41,     0,    23,    24,    25,     0,    26,
-       0,     0,     0,    27,     7,     8,     9,    10,    28,    11,
-      12,     0,     0,    47,   162,    49,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,    29,     0,    50,    51,    30,
-      31,     0,     0,    32,     0,    33,     0,   818,     0,    34,
-      55,     0,     0,     0,     0,     0,    13,     0,    14,    15,
-       0,     0,     0,    16,    17,     0,     0,     0,     0,     0,
-       0,     0,    18,    19,     0,     0,     0,   110,     0,    20,
-      21,     0,     0,     0,     0,     0,    22,     0,    39,     0,
-      40,    41,     0,    23,    24,    25,     0,    26,     0,     0,
-       0,    27,     7,     8,     9,    10,    28,    11,    12,     0,
-       0,    47,   162,    49,     0,   833,     0,     0,     0,     0,
-       0,     0,     0,    29,     0,    50,    51,    30,    31,     0,
-       0,    32,     0,    33,     0,     0,     0,    34,    55,     0,
-       0,     0,     0,     0,    13,     0,    14,    15,     0,     0,
-       0,    16,    17,     0,     0,     0,     0,     0,     0,     0,
-      18,    19,     0,     0,     0,   113,     0,    20,    21,     0,
-       0,     0,     0,     0,    22,     0,     0,     0,     0,     0,
-       0,    23,    24,    25,     0,    26,     0,     0,     0,    27,
-       7,     8,     9,    10,    28,    11,    12,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,    29,     0,     0,     0,    30,    31,     0,     0,    32,
-       0,    33,     0,   924,     0,    34,     0,     0,     0,     0,
-       0,     0,    13,     0,    14,    15,     0,     0,     0,    16,
-      17,     0,     0,     0,     0,     0,     0,     0,    18,    19,
-       0,     0,     0,     0,     0,    20,    21,     0,     0,     0,
-       0,     0,    22,   137,   138,   139,   140,     0,     0,    23,
-      24,    25,     0,    26,     0,   141,     0,    27,     0,     0,
-       0,     0,    28,     0,   133,   134,   135,   136,   137,   138,
-     139,   140,     0,     0,     0,     0,     0,     0,     0,    29,
-     141,     0,     0,    30,    31,     0,     0,    32,     0,    33,
-       0,     0,     0,    34,   133,   134,   135,   136,   137,   138,
-     139,   140,     0,     0,     0,     0,     0,     0,     0,     0,
-     141,     0,     0,   133,   134,   135,   136,   137,   138,   139,
-     140,     0,     0,     0,     0,     0,     0,     0,     0,   141,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,   146,
-     147,   148,   149,   150,   151,   152,     0,   153,   154,   155,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     142,   143,   144,   145,   146,   147,   148,   149,   150,   151,
-     152,     0,   153,   154,   155,     0,     0,     0,   326,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     142,   143,   144,   145,   146,   147,   148,   149,   150,   151,
-     152,     0,   153,   154,   155,     0,     0,     0,   887,   142,
-     143,   144,   145,   146,   147,   148,   149,   150,   151,   152,
-       0,   153,   154,   155,   345,   346,     0,   946,   481,   482,
-     483,   484,   485,   486,   487,   488,     0,     0,     0,     0,
-       0,     0,     0,     0,   489,     0,   490,   491,   492,   493,
-     494,   495,   496,   497,   498,   499,   500,   501,     0,     0,
-       0,    39,     0,    40,    41,     0,   502,     0,    44,     0,
-       0,     0,    39,     0,    40,    41,     0,     0,    46,   158,
-       0,     0,     0,     0,    47,    48,    49,     0,     0,   159,
-     503,     0,     0,     0,     0,    47,   160,    49,    50,    51,
-       0,     0,     0,   194,   195,     0,     0,     0,     0,    50,
-      51,    55,     0,     0,    56,     0,     0,     0,     0,     0,
-     504,     0,    55,   505,     0,   506,   507,   508,   509,   510,
-     511,   512,   513,   514,   515,   516,     0,   517,   518,   196,
-      39,   519,    40,    41,    42,   197,     0,    44,     0,   102,
-       0,    45,   198,   199,   200,     0,     0,    46,     0,     0,
-       0,     0,   201,    47,    48,    49,     0,     0,   202,   194,
-     195,   203,     0,     0,     0,   204,     0,    50,    51,     0,
-     205,     0,    52,     0,     0,     0,     0,     0,   206,    54,
-      55,     0,   207,    56,   208,     0,     0,     0,     0,   209,
-       0,     0,     0,     0,     0,   196,    39,     0,    40,    41,
-      42,   285,     0,    44,     0,   210,     0,    45,   198,   199,
-     200,     0,     0,    46,     0,   194,   195,     0,   201,    47,
-      48,    49,     0,     0,   202,     0,     0,   203,     0,     0,
-       0,   204,     0,    50,    51,     0,   205,     0,    52,     0,
-       0,     0,     0,     0,   206,    54,    55,     0,   207,    56,
-     208,   196,    39,     0,    40,    41,    42,   197,     0,    44,
-       0,     0,     0,    45,   198,   199,   200,     0,     0,    46,
-       0,   210,     0,     0,   201,    47,    48,    49,     0,     0,
-     202,     0,     0,   203,     0,     0,     0,   204,     0,    50,
-      51,     0,   205,     0,    52,     0,     0,     0,     0,     0,
-     206,    54,    55,     0,   207,    56,   208,   133,   134,   135,
-     136,   137,   138,   139,   140,     0,     0,     0,     0,     0,
-       0,     0,     0,   141,     0,     0,     0,   210,   133,   134,
+       0,     0,     0,     0,     0,     0,    23,    24,    25,     0,
+      26,     0,     0,     0,    27,     7,     8,     9,    10,    28,
+      11,    12,     0,     0,     0,     0,     0,     0,    39,     0,
+      40,    41,     0,     0,     0,   158,    29,     0,     0,     0,
+      30,    31,     0,     0,    32,   159,    33,     0,   933,     0,
+      34,    47,   160,    49,     0,     0,     0,    13,     0,    14,
+      15,     0,     0,     0,    16,    17,    50,    51,     0,     0,
+       0,     0,     0,    18,    19,     0,     0,     0,     0,    55,
+      20,    21,     0,     0,     0,     0,     0,    22,     0,     0,
+       0,     0,     0,     0,     0,    23,    24,    25,     0,    26,
+       0,     0,     0,    27,     0,     0,   102,     0,    28,     0,
+     133,   134,   135,   136,   137,   138,   139,   140,     0,     0,
+       0,     0,     0,     0,     0,    29,   141,     0,     0,    30,
+      31,     0,     0,    32,     0,    33,     0,     0,     0,    34,
+     133,   134,   135,   136,   137,   138,   139,   140,     0,     0,
+       0,     0,     0,     0,     0,     0,   141,     0,     0,     0,
+     488,   489,   490,   491,   492,   493,   494,   495,     0,     0,
+       0,     0,     0,     0,     0,     0,   496,     0,   497,   498,
+     499,   500,   501,   502,   503,   504,   505,   506,   507,   508,
+     133,   134,   135,   136,   137,   138,   139,   140,   509,     0,
+       0,     0,     0,     0,     0,     0,   141,   142,   143,   144,
+     145,   146,   147,   148,   149,   150,   151,   152,     0,   153,
+     154,   155,   510,     0,     0,   896,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,   142,   143,   144,
+     145,   146,   147,   148,   149,   150,   151,   152,     0,   153,
+     154,   155,     0,   511,     0,   955,   512,     0,   513,   514,
+     515,   516,   517,   518,   519,   520,   521,   522,   523,     0,
+     524,   525,   195,   196,   526,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,   326,     0,   142,   143,   144,
+     145,   146,   147,   148,   149,   150,   151,   152,     0,   153,
+     154,   155,     0,     0,     0,     0,     0,     0,   197,    39,
+       0,    40,    41,    42,   198,     0,    44,     0,     0,     0,
+      45,   199,   200,   201,     0,     0,    46,     0,     0,     0,
+       0,   202,    47,    48,    49,     0,     0,   203,   195,   196,
+       0,   204,     0,     0,     0,   205,     0,    50,    51,     0,
+     206,     0,    52,     0,     0,     0,     0,     0,   207,    54,
+      55,     0,   208,    56,   209,     0,     0,     0,     0,   210,
+       0,     0,     0,     0,   197,    39,     0,    40,    41,    42,
+     287,     0,    44,     0,     0,   211,    45,   199,   200,   201,
+       0,     0,    46,     0,     0,   195,   196,   202,    47,    48,
+      49,     0,     0,   203,     0,     0,     0,   204,     0,     0,
+       0,   205,     0,    50,    51,     0,   206,     0,    52,     0,
+       0,     0,     0,     0,   207,    54,    55,     0,   208,    56,
+     209,   197,    39,     0,    40,    41,    42,   198,     0,    44,
+       0,     0,     0,    45,   199,   200,   201,     0,     0,    46,
+       0,   211,     0,     0,   202,    47,    48,    49,     0,     0,
+     203,     0,     0,     0,   204,     0,     0,     0,   205,     0,
+      50,    51,     0,   206,     0,    52,     0,     0,     0,     0,
+       0,   207,    54,    55,     0,   208,    56,   209,   133,   134,
      135,   136,   137,   138,   139,   140,     0,     0,     0,     0,
-       0,     0,     0,     0,   141,   133,   134,   135,   136,   137,
-     138,   139,   140,     0,     0,     0,     0,     0,     0,     0,
-       0,   141,   133,   134,   135,   136,   137,   138,   139,   140,
-       0,     0,     0,     0,     0,     0,     0,     0,   141,   592,
-     593,   594,   595,   596,   597,   598,   599,     0,     0,     0,
-       0,     0,     0,     0,     0,   600,     0,     0,     0,     0,
-     478,     0,     0,   142,   143,   144,   145,   146,   147,   148,
+       0,     0,     0,     0,   141,     0,     0,     0,   211,   133,
+     134,   135,   136,   137,   138,   139,   140,     0,     0,     0,
+       0,     0,     0,     0,     0,   141,   133,   134,   135,   136,
+     137,   138,   139,   140,     0,     0,     0,     0,     0,     0,
+       0,     0,   141,   133,   134,   135,   136,   137,   138,   139,
+     140,     0,     0,     0,     0,     0,     0,     0,     0,   141,
+     600,   601,   602,   603,   604,   605,   606,   607,     0,     0,
+       0,     0,     0,     0,     0,     0,   608,     0,     0,     0,
+       0,     0,   484,     0,     0,   142,   143,   144,   145,   146,
+     147,   148,   149,   150,   151,   152,     0,   153,   154,   155,
+       0,     0,   847,     0,     0,     0,   142,   143,   144,   145,
+     146,   147,   148,   149,   150,   151,   152,     0,   153,   154,
+     155,   894,     0,   142,   143,   144,   145,   146,   147,   148,
      149,   150,   151,   152,     0,   153,   154,   155,     0,     0,
-     839,     0,     0,     0,   142,   143,   144,   145,   146,   147,
-     148,   149,   150,   151,   152,     0,   153,   154,   155,   885,
-       0,   142,   143,   144,   145,   146,   147,   148,   149,   150,
-     151,   152,     0,   153,   154,   155,     0,     0,   142,   143,
-     144,   145,   146,   147,   148,   149,   150,   151,   152,     0,
-     153,   154,   155,     0,     0,   601,   602,   603,   604,   605,
-     606,   607,   608,   609,   610,   611,     0,   612,   613,   614,
-     853,   854,   855,   856,   857,   858,   859,   860,     0,     0,
-       0,     0,     0,     0,     0,     0,   861,   853,   854,   855,
-     856,   857,   858,   859,   860,     0,     0,     0,     0,     0,
-       0,     0,     0,   861,   135,   136,   137,   138,   139,   140,
-       0,     0,     0,     0,     0,     0,     0,     0,   141,   135,
-     136,   137,   138,   139,   140,     0,     0,     0,     0,     0,
-       0,     0,     0,   141,   855,   856,   857,   858,   859,   860,
-       0,     0,     0,     0,     0,     0,     0,     0,   861,   135,
-     136,   137,   138,   139,   140,     0,     0,     0,     0,     0,
-       0,     0,     0,   141,   944,     0,   862,   863,   864,   865,
-       0,     0,   866,   867,   868,   869,   870,     0,   871,   872,
-     873,     0,     0,   862,   863,   864,   865,     0,     0,   866,
-     867,   868,   869,   870,     0,   871,   872,   873,     0,     0,
-     144,   145,   146,   147,   148,   149,   150,   151,   152,     0,
-     153,   154,   155,     0,     0,     0,   145,   146,   147,   148,
-     149,   150,   151,   152,     0,   153,   154,   155,     0,   863,
-     864,   865,     0,     0,   866,   867,   868,   869,   870,     0,
-     871,   872,   873,     0,     0,     0,     0,   146,   147,   148,
-     149,   150,   151,   152,     0,   153,   154,   155,   855,   856,
-     857,   858,   859,   860,     0,     0,     0,     0,     0,     0,
-       0,     0,   861,   855,   856,   857,   858,   859,   860,     0,
-       0,     0,   345,   346,     0,     0,     0,   861,   855,   856,
-     857,   858,   859,   860,     0,     0,     0,     0,     0,     0,
-       0,     0,   861,   857,   858,   859,   860,     0,     0,     0,
-       0,     0,     0,     0,     0,   861,     0,     0,     0,    39,
-       0,    40,    41,   347,   348,     0,    44,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,    46,     0,     0,     0,
-       0,     0,    47,    48,    49,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   864,   865,    50,    51,   866,   867,
-     868,   869,   870,     0,   871,   872,   873,   349,     0,    55,
-     865,     0,    56,   866,   867,   868,   869,   870,    38,   871,
-     872,   873,     0,     0,     0,     0,     0,     0,   866,   867,
-     868,   869,   870,     0,   871,   872,   873,     0,     0,     0,
-       0,   866,   867,   868,   869,   870,     0,   871,   872,   873,
-      39,     0,    40,    41,    39,     0,    40,    41,    42,    43,
-       0,    44,     0,     0,     0,    45,     0,   268,     0,     0,
-      38,    46,     0,    47,   162,    49,     0,    47,    48,    49,
-       0,     0,     0,     0,     0,     0,     0,    50,    51,     0,
-       0,    50,    51,     0,     0,     0,    52,     0,     0,     0,
-      55,     0,    53,    54,    55,     0,    39,    56,    40,    41,
-      42,   293,     0,    44,     0,     0,     0,    45,     0,     0,
-       0,     0,   103,    46,     0,     0,     0,     0,     0,    47,
-      48,    49,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,    50,    51,     0,     0,     0,    52,     0,
-       0,     0,     0,     0,    53,    54,    55,     0,    39,    56,
-      40,    41,    42,     0,     0,    44,     0,     0,     0,    45,
-       0,     0,     0,     0,    38,    46,     0,     0,     0,     0,
-       0,    47,    48,    49,     0,     0,     0,     0,     0,     0,
+     142,   143,   144,   145,   146,   147,   148,   149,   150,   151,
+     152,     0,   153,   154,   155,     0,     0,   609,   610,   611,
+     612,   613,   614,   615,   616,   617,   618,   619,     0,   620,
+     621,   622,   861,   862,   863,   864,   865,   866,   867,   868,
+       0,     0,     0,     0,     0,     0,     0,     0,   869,   861,
+     862,   863,   864,   865,   866,   867,   868,     0,     0,     0,
+       0,     0,     0,     0,     0,   869,   135,   136,   137,   138,
+     139,   140,     0,     0,     0,     0,     0,     0,     0,     0,
+     141,   135,   136,   137,   138,   139,   140,     0,     0,     0,
+       0,     0,     0,     0,     0,   141,   135,   136,   137,   138,
+     139,   140,     0,     0,     0,     0,     0,     0,     0,     0,
+     141,   863,   864,   865,   866,   867,   868,     0,     0,     0,
+       0,     0,     0,     0,     0,   869,     0,   953,     0,   870,
+     871,   872,   873,     0,     0,   874,   875,   876,   877,   878,
+       0,   879,   880,   881,     0,     0,   870,   871,   872,   873,
+       0,     0,   874,   875,   876,   877,   878,     0,   879,   880,
+     881,     0,   143,   144,   145,   146,   147,   148,   149,   150,
+     151,   152,     0,   153,   154,   155,     0,     0,   144,   145,
+     146,   147,   148,   149,   150,   151,   152,     0,   153,   154,
+     155,     0,     0,     0,   145,   146,   147,   148,   149,   150,
+     151,   152,     0,   153,   154,   155,     0,   871,   872,   873,
+       0,     0,   874,   875,   876,   877,   878,     0,   879,   880,
+     881,   135,   136,   137,   138,   139,   140,     0,     0,     0,
+       0,     0,     0,     0,     0,   141,   863,   864,   865,   866,
+     867,   868,     0,     0,     0,     0,     0,     0,     0,     0,
+     869,   863,   864,   865,   866,   867,   868,     0,     0,     0,
+       0,     0,     0,     0,     0,   869,   137,   138,   139,   140,
+       0,     0,     0,     0,     0,     0,     0,     0,   141,   865,
+     866,   867,   868,     0,     0,     0,     0,     0,     0,     0,
+       0,   869,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+     146,   147,   148,   149,   150,   151,   152,     0,   153,   154,
+     155,     0,     0,   872,   873,     0,     0,   874,   875,   876,
+     877,   878,     0,   879,   880,   881,     0,     0,     0,   873,
+     347,   348,   874,   875,   876,   877,   878,     0,   879,   880,
+     881,     0,     0,   146,   147,   148,   149,   150,   151,   152,
+       0,   153,   154,   155,     0,     0,     0,     0,   874,   875,
+     876,   877,   878,     0,   879,   880,   881,    39,     0,    40,
+      41,   349,   350,     0,    44,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,    46,     0,    38,     0,     0,     0,
+      47,    48,    49,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,    50,    51,     0,     0,     0,
-      52,     0,     0,     0,     0,     0,   104,    54,    55,     0,
-      39,    56,    40,    41,    42,     0,     0,    44,     0,     0,
-       0,    45,     0,     0,     0,     0,     0,    46,     0,     0,
-       0,     0,     0,    47,    48,    49,     0,    70,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,    50,    51,    71,
-       0,     0,    52,     0,    72,     0,     0,    73,    53,    54,
-      55,     0,     0,    56,     0,    74,    75,    70,    76,     0,
-       0,    77,    78,    79,     0,     0,     0,     0,     0,    71,
-       0,     0,    80,     0,    72,     0,    81,    73,     0,     0,
-      82,     0,     0,    70,     0,    74,    75,     0,    76,     0,
-      83,    77,    78,    79,     0,    71,     0,     0,     0,     0,
-      72,     0,    80,    73,     0,     0,    81,     0,     0,   343,
-      82,    74,    75,    70,    76,     0,     0,    77,    78,    79,
-      83,     0,     0,     0,     0,    71,     0,     0,    80,     0,
-      72,     0,    81,    73,     0,     0,    82,     0,     0,   400,
-       0,    74,    75,    70,    76,     0,    83,    77,    78,    79,
-       0,     0,     0,     0,     0,    71,     0,     0,    80,     0,
-      72,     0,    81,    73,     0,   465,    82,     0,     0,    70,
-       0,    74,    75,     0,    76,     0,    83,    77,    78,    79,
-       0,    71,     0,     0,     0,     0,    72,     0,    80,    73,
-       0,     0,    81,     0,     0,   554,    82,    74,    75,     0,
-      76,     0,     0,    77,    78,    79,    83,     0,     0,     0,
-       0,     0,     0,     0,    80,     0,     0,     0,    81,     0,
-       0,     0,    82,     0,     0,   758
+       0,     0,     0,     0,     0,     0,   351,     0,    55,     0,
+       0,    56,    39,     0,    40,    41,    42,    43,     0,    44,
+       0,     0,     0,    45,     0,     0,     0,     0,     0,    46,
+       0,    38,     0,     0,     0,    47,    48,    49,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+      50,    51,     0,     0,     0,    52,     0,     0,     0,     0,
+       0,    53,    54,    55,     0,     0,    56,    39,     0,    40,
+      41,    42,   295,     0,    44,     0,     0,     0,    45,     0,
+       0,     0,     0,     0,    46,     0,   103,     0,     0,     0,
+      47,    48,    49,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,    50,    51,     0,     0,     0,
+      52,     0,     0,     0,     0,     0,    53,    54,    55,     0,
+       0,    56,    39,     0,    40,    41,    42,     0,     0,    44,
+       0,     0,     0,    45,     0,     0,     0,     0,     0,    46,
+       0,    38,     0,     0,     0,    47,    48,    49,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+      50,    51,     0,     0,     0,    52,     0,     0,     0,     0,
+       0,   104,    54,    55,     0,     0,    56,    39,     0,    40,
+      41,    42,     0,     0,    44,     0,     0,     0,    45,     0,
+       0,     0,     0,     0,    46,     0,     0,     0,     0,     0,
+      47,    48,    49,     0,     0,    70,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,    50,    51,    71,     0,     0,
+      52,     0,    72,     0,     0,    73,    53,    54,    55,     0,
+       0,    56,     0,    74,    75,     0,    76,    70,     0,     0,
+      77,    78,    79,     0,     0,     0,     0,     0,     0,    71,
+       0,    80,     0,     0,    72,    81,     0,    73,     0,    82,
+       0,     0,     0,     0,     0,    74,    75,     0,    76,    83,
+       0,     0,    77,    78,    79,     0,     0,    70,     0,     0,
+       0,     0,     0,    80,     0,     0,     0,    81,   345,    71,
+       0,    82,     0,     0,    72,     0,     0,    73,     0,     0,
+       0,    83,     0,     0,     0,    74,    75,     0,    76,    70,
+       0,     0,    77,    78,    79,     0,     0,     0,     0,     0,
+     404,    71,     0,    80,     0,     0,    72,    81,     0,    73,
+       0,    82,     0,     0,     0,     0,     0,    74,    75,     0,
+      76,    83,     0,     0,    77,    78,    79,     0,     0,    70,
+       0,     0,     0,     0,     0,    80,     0,     0,     0,    81,
+     471,    71,     0,    82,     0,     0,    72,     0,     0,    73,
+       0,     0,     0,    83,     0,     0,     0,    74,    75,     0,
+      76,    70,     0,     0,    77,    78,    79,     0,     0,     0,
+       0,     0,   561,    71,     0,    80,     0,     0,    72,    81,
+       0,    73,     0,    82,     0,     0,     0,     0,     0,    74,
+      75,     0,    76,    83,     0,     0,    77,    78,    79,     0,
+       0,     0,     0,     0,     0,     0,     0,    80,     0,     0,
+       0,    81,   766,     0,     0,    82
 };
 
 #define yypact_value_is_default(Yystate) \
-  (!!((Yystate) == (-508)))
+  (!!((Yystate) == (-547)))
 
 #define yytable_value_is_error(Yytable_value) \
   YYID (0)
 
 static const yytype_int16 yycheck[] =
 {
-       1,   105,   473,    87,     5,    33,   362,    81,     0,    87,
-     286,    22,    87,    33,    43,   184,    95,    96,    97,    98,
-     124,   100,   101,   102,    22,   464,    87,   427,     8,     9,
-     109,   110,    10,    10,   113,   105,   412,   157,    12,   395,
-       8,     9,   122,   419,   420,   421,   422,     8,     9,   122,
-     170,   171,   172,   173,   124,   431,    57,   457,   402,   403,
-       8,     9,    77,    78,    79,   358,     8,     9,   361,   199,
-     363,    99,   448,    50,   104,     2,    87,   107,   105,   105,
-      81,     4,    97,   111,   112,     8,     9,   122,   527,    87,
-     383,   122,   385,   386,   387,   364,   113,   124,   124,   368,
-     369,   370,    29,    30,    31,    32,   190,    34,   277,   108,
-     466,   618,   190,   389,   105,   190,   122,   105,   105,   105,
-     108,     8,     9,   105,   123,   122,    74,   296,    22,   190,
-     569,   105,   425,   124,   154,   112,   104,   124,   124,   117,
-     117,    29,   124,   104,   124,   122,     8,     9,    10,   269,
-     122,   427,   108,   232,   123,   124,   157,     8,     9,    10,
-     453,   113,   104,   122,   123,    29,   105,   123,   197,   170,
-     171,   172,   173,   573,   203,   344,   576,   105,   122,   190,
-     181,   457,   122,   184,   122,   124,   479,   563,    50,   122,
-     459,   591,   190,    87,   538,     6,   124,   122,   542,    50,
-     544,   577,   546,   547,   548,   107,   133,   134,   135,   136,
-     137,   138,   139,   140,   141,   142,   143,   144,   145,   146,
-     147,   148,   149,   150,   151,   152,   153,   105,   155,   359,
-       8,     9,   362,   121,   122,   123,   104,   406,   106,   107,
-     108,   748,     8,     9,    10,    48,   124,    50,    51,   122,
-     112,   105,    55,     8,     9,   117,   285,   121,   122,   123,
-     122,   112,   122,   105,   293,   395,   117,   623,   269,   107,
-     124,    49,   107,   274,   275,   107,   277,   278,   101,   102,
-     103,   282,   124,   284,    50,   107,   284,   104,    29,   106,
-     107,   108,   122,   294,    49,   296,   190,   573,   104,   105,
-     122,   123,   124,   122,   123,   122,   123,   122,   123,    87,
-      76,   107,   124,   240,   241,    93,    94,   117,   123,    97,
-     104,   828,   125,   126,   127,   128,   122,   123,   124,     8,
-     359,   104,    87,   362,   335,   336,   466,   113,    93,    94,
-     414,   122,    97,   344,   123,   124,   112,   274,   122,     6,
-     348,   117,   353,   106,     8,     9,   122,   160,   359,   162,
-     124,   362,   833,   364,   124,   105,   395,   368,   369,   370,
-     124,   391,   373,   393,   301,   376,   117,   118,   119,   380,
-     121,   122,   123,   107,   784,   892,   124,   743,   389,   896,
-      77,    78,    79,   472,   395,    49,   124,   324,   122,   123,
-     124,   114,   124,   124,   433,   406,   124,   124,   124,   410,
-     124,   412,   114,   414,   124,   443,   107,   415,   419,   420,
-     421,   422,   423,   443,     0,   436,   427,   105,   935,   105,
-     431,   124,   939,    87,   122,   127,   122,   466,   436,    93,
-      94,   122,   122,    97,   104,   952,   105,   448,   125,     8,
-     114,    29,   105,   380,   961,   117,   457,   125,   459,   117,
-     590,   122,   117,   464,   105,   466,   108,    43,   108,   825,
-      88,   117,   473,   125,   558,   113,   113,    29,   122,    55,
-     558,    53,   125,   558,    60,   124,   842,    63,   781,   124,
-     123,    63,    64,   623,   105,    71,    72,   558,    74,   124,
-     127,    77,    78,    79,    76,   105,     8,   401,   402,   403,
-      82,   124,    88,   440,   441,   442,    92,   444,     8,     9,
-      96,   106,   123,   105,   122,   124,   527,   555,    50,   557,
-     106,   824,   104,   889,   106,   107,     4,   464,   122,   117,
-     118,   119,   436,   121,   122,   123,   473,   558,   549,   105,
-     578,   125,   580,   581,   127,   556,   124,   124,   127,    49,
-     558,   590,   563,   115,   116,   117,   118,   119,   569,   121,
-     122,   123,   573,   122,   125,   576,   577,   933,   124,   124,
-     113,   122,   875,   568,   113,   127,   105,   588,   114,   124,
-     591,   114,    89,   613,   623,   122,   124,    87,   525,   124,
-     527,   106,   106,    93,    94,   122,   124,   114,   535,   124,
-     122,   183,   122,   743,   125,   124,   124,   618,   124,   114,
-     192,   124,   623,    15,    16,    17,    18,    19,    20,   122,
-     122,   471,   414,   124,   206,   124,   745,    29,   210,   824,
-     781,   181,   569,   875,   538,   217,   218,   190,   542,   414,
-     544,   348,   546,   547,   548,   556,   415,   407,   590,   190,
-     335,   436,   470,   707,   558,   592,   593,   594,   595,   596,
-     597,   598,   599,   600,   601,   602,   603,   604,   605,   606,
-     607,   608,   609,   610,   611,   612,    -1,   614,    -1,    -1,
-      -1,     3,     4,     5,     6,   825,     8,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    29,   707,   786,    -1,    -1,
-      -1,    -1,   842,    45,   743,    47,    48,    -1,   110,   111,
-     112,   113,   114,   115,   116,   117,   118,   119,   300,   121,
-     122,   123,    -1,    -1,    -1,    -1,    68,    69,    70,    -1,
-      -1,    53,   743,    -1,    -1,    -1,   774,   748,    -1,    61,
-      82,    83,    -1,    -1,   774,    -1,    -1,    -1,    -1,   889,
-     332,    -1,    -1,    95,    -1,    -1,    -1,    -1,    -1,    -1,
-     342,    -1,    84,    -1,    86,   347,    -1,   349,    90,    -1,
-      -1,    -1,    -1,   784,    -1,   770,   771,   772,   773,    -1,
-     775,   115,   116,   117,   118,   119,   825,   121,   122,   123,
-     112,    -1,    -1,   933,   116,   117,    -1,    -1,   120,   736,
-     122,    -1,    -1,   842,   126,   843,   844,   845,    -1,    -1,
-      -1,    -1,    -1,    -1,   825,    -1,    -1,   828,    -1,   401,
-     402,   403,   833,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,   842,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,   872,    -1,    -1,   782,    -1,    -1,    -1,    -1,
-     889,    -1,   789,    -1,    -1,    -1,    -1,    -1,   853,   854,
-     855,   856,   857,   858,   859,   860,   861,   862,   863,   864,
-     865,   866,   867,   868,   869,   870,   871,    -1,   889,    -1,
-      -1,   892,    -1,    -1,    -1,   896,    -1,    -1,    -1,   471,
-     770,   771,   772,   773,   933,   775,   833,    -1,   928,    -1,
-     930,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   903,    -1,
-      -1,    13,    14,    15,    16,    17,    18,    19,    20,    -1,
-      -1,    -1,   933,    -1,   935,   955,   956,    29,   939,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   873,    -1,    -1,    -1,
-      -1,   952,   524,    -1,    -1,    -1,    -1,    -1,   885,   944,
-     961,    -1,    -1,    -1,    -1,   537,   538,   539,    -1,    -1,
-     542,    -1,   544,    -1,   546,   547,   548,    -1,    -1,    -1,
-      -1,   553,    -1,   853,   854,   855,   856,   857,   858,   859,
-     860,   861,   862,   863,   864,   865,   866,   867,   868,   869,
-     870,   871,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,   107,    -1,   109,   110,   111,
-     112,   113,   114,   115,   116,   117,   118,   119,    -1,   121,
-     122,   123,    -1,   903,     3,     4,     5,     6,     7,     8,
-       9,    10,    -1,    12,    13,    14,    15,    16,    17,    18,
-      19,    20,    21,    22,    -1,    -1,    -1,    -1,    -1,    -1,
-      29,    30,    31,    32,    33,    34,    35,    36,    37,    38,
-      39,    40,    41,    42,   944,    -1,    45,    46,    47,    48,
-      49,    50,    51,    52,    53,    54,    -1,    56,    -1,    58,
-      59,    60,    61,    62,    63,    64,    65,    66,    67,    68,
-      69,    -1,    -1,    -1,    73,    -1,    75,    76,    77,    78,
-      79,    80,    81,    82,    83,    84,    85,    86,    87,    -1,
-      89,    90,    91,    92,    93,    94,    95,    -1,    97,    98,
-      99,   100,    -1,    -1,    -1,   104,   105,   106,   107,   108,
-     109,   110,   111,   112,   113,   114,   115,   116,   117,   118,
-     119,   120,   121,   122,   123,   124,   125,   126,   127,     3,
-       4,     5,     6,     7,     8,     9,    10,    -1,    12,    13,
-      14,    15,    16,    17,    18,    19,    20,    21,    22,    -1,
-      -1,    -1,    -1,    -1,    -1,    29,    30,    31,    32,    33,
-      34,    35,    36,    37,    38,    39,    40,    41,    42,    -1,
-      -1,    45,    46,    47,    48,    49,    50,    51,    52,    53,
-      54,    -1,    56,    -1,    58,    59,    60,    61,    62,    63,
-      64,    65,    66,    67,    68,    69,    -1,    -1,    -1,    73,
-      -1,    75,    76,    77,    78,    79,    80,    81,    82,    83,
-      84,    85,    86,    87,    -1,    89,    90,    91,    92,    93,
-      94,    95,    -1,    97,    98,    99,   100,    -1,    -1,    -1,
-     104,   105,   106,   107,   108,   109,   110,   111,   112,   113,
-     114,   115,   116,   117,   118,   119,   120,   121,   122,   123,
-     124,    -1,   126,   127,     3,     4,     5,     6,    -1,     8,
-       9,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       1,    87,    87,    33,     5,    95,    96,    97,    98,    22,
+     100,   101,   102,   364,    87,    87,   432,    33,   479,   109,
+     110,    81,    22,   113,     8,     9,   185,    10,   360,   109,
+     576,   363,   106,   365,    12,   366,     8,     9,    43,   370,
+     371,   372,   373,   470,   124,     0,   462,   157,   399,   114,
+     288,   125,     8,     9,   386,   387,    57,   389,   390,   391,
+     170,   171,   172,   173,   174,   106,   200,   123,    48,    99,
+      50,    51,     2,   109,    87,    55,   105,     8,     9,   108,
+      81,   111,   112,   123,   125,     8,     9,    87,   124,    10,
+       8,     9,    10,    14,   114,    76,    14,   106,   430,    29,
+      30,    31,    32,   416,    34,   191,   191,   534,   106,    90,
+     423,   424,   425,   426,   427,   106,   125,   106,   191,   191,
+     279,   472,     6,   436,   626,    22,   458,   125,   106,    50,
+     124,   125,    50,   464,   125,   118,   125,   123,   154,   298,
+     453,   125,   108,   233,   106,   125,   126,   127,   128,   105,
+     577,    74,    29,   485,   123,   393,   157,   406,   407,   123,
+     270,     8,     9,   125,   123,   581,    29,   106,   584,   170,
+     171,   172,   173,   174,   105,   123,   124,   106,   191,   123,
+     160,   182,   162,   599,   185,   123,   125,   346,   105,   106,
+      87,   191,   113,   198,   432,   113,   125,   118,    29,   204,
+     118,   123,   123,   133,   134,   135,   136,   137,   138,   139,
+     140,   141,   142,   143,   144,   145,   146,   147,   148,   149,
+     150,   151,   152,   153,   462,   155,   106,   361,   123,   109,
+     364,   106,   778,   779,   780,   781,   106,   783,   102,   103,
+     104,   123,     8,     9,    10,   122,   123,   124,    14,   106,
+     125,   410,   106,   108,   756,   125,   123,   570,   105,   122,
+     123,   124,     8,     9,   123,   399,   124,   125,   125,   270,
+     123,   125,   585,   123,   124,   276,   277,   123,   279,   280,
+     631,   108,   287,   284,    50,   286,   286,   118,   119,   120,
+     295,   122,   123,   124,   191,   296,   545,   298,   123,   124,
+     549,   108,   551,    49,   553,   554,   555,   125,   118,     4,
+     124,   241,   242,     8,     9,   861,   862,   863,   864,   865,
+     866,   867,   868,   869,   870,   871,   872,   873,   874,   875,
+     876,   877,   878,   879,   836,   105,   337,   338,   472,    78,
+      79,    80,    88,   581,     8,   346,   276,   113,    94,    95,
+     350,   105,   118,   114,   355,   123,   361,   123,   418,   364,
+     361,   123,     6,   364,   107,   366,   912,   125,   106,   370,
+     371,   372,   373,   303,   125,   376,   792,   125,   379,   395,
+     841,   397,   383,   125,    78,    79,    80,   105,   478,   107,
+     108,   109,   393,   125,   399,   108,   326,   125,   399,   901,
+     751,   115,   125,   905,    98,   123,   124,   953,   125,   410,
+     123,   124,   125,   414,   125,   416,   125,   418,   448,   419,
+     125,   108,   423,   424,   425,   426,   427,   428,   441,   115,
+     108,   432,   448,   438,    29,   436,   123,   124,   125,   108,
+     125,   441,   944,   106,   106,   105,   948,   107,   108,   109,
+     123,   123,   453,   383,   123,   124,   125,   789,   125,   961,
+     128,   462,   123,   464,   598,   123,   105,   472,   970,   470,
+     126,   472,   106,     8,   115,   106,   118,    29,   479,   565,
+     565,   118,   833,   126,    53,   123,   118,   106,   109,   109,
+     126,    89,   565,   565,    63,    64,   118,   631,   114,   850,
+     832,   114,   125,   106,   128,   123,   106,    76,   405,   406,
+     407,   125,   124,    82,   125,   445,   446,   447,   126,   449,
+     125,   116,   117,   118,   119,   120,     8,   122,   123,   124,
+     107,   124,   562,   534,   564,   104,   106,   106,   107,   123,
+     470,    50,   125,     4,   441,   123,    29,   898,   106,   479,
+     126,   883,   565,   128,   125,   556,   586,   125,   588,   589,
+     126,   128,   563,   125,   125,   565,   118,   119,   120,   570,
+     122,   123,   124,   123,   114,   123,   577,   114,   106,   128,
+     581,   115,   125,   584,   585,   115,     8,     9,    10,   125,
+     123,   942,    14,   598,   125,   596,   107,   107,   599,   125,
+     123,   125,   532,   123,   534,   621,   123,   125,   115,   115,
+     126,   125,   542,   125,   418,   184,   477,   751,    15,    16,
+      17,    18,    19,    20,   193,   626,   631,   125,    50,   123,
+     631,   123,    29,   116,   117,   118,   119,   120,   207,   122,
+     123,   124,   211,   182,   125,   125,   753,   577,   545,   218,
+     219,   832,   549,   789,   551,    77,   553,   554,   555,     3,
+       4,     5,     6,   883,     8,   418,   191,   419,   565,   350,
+     600,   601,   602,   603,   604,   605,   606,   607,   608,   609,
+     610,   611,   612,   613,   614,   615,   616,   617,   618,   619,
+     620,   113,   622,   598,   563,   191,   118,   441,   476,   833,
+     715,   123,    19,    20,   794,   411,    -1,     8,     9,    53,
+     337,    -1,    29,    -1,   715,    -1,   850,    61,    -1,   116,
+     117,   118,   119,   120,    -1,   122,   123,   124,    -1,     8,
+       9,    -1,    -1,   302,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    85,    -1,    87,    -1,    -1,   751,    91,    49,    -1,
+     751,    -1,   782,    -1,    -1,   756,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,   898,   334,   782,    -1,    -1,   113,
+      49,    -1,    -1,   117,   118,   344,    -1,   121,    -1,   123,
+     349,    -1,   351,   127,    -1,    19,    20,    88,    -1,    -1,
+      -1,   792,    -1,    94,    95,    29,    -1,    98,     0,   116,
+     117,   118,   119,   120,    -1,   122,   123,   124,   942,    88,
+      -1,    -1,    -1,    -1,   744,    94,    95,    -1,    -1,    98,
+      -1,   851,   852,   853,    -1,    -1,    -1,    -1,   833,    -1,
+      -1,    -1,   833,    -1,    -1,   836,   405,   406,   407,    -1,
+     841,    43,    -1,    -1,    -1,   850,    -1,    -1,    -1,   850,
+      -1,    -1,    -1,    55,    -1,    -1,    -1,    -1,    60,    -1,
+     790,    63,    -1,    -1,   880,    -1,    -1,   797,    -1,    71,
+      72,    -1,    74,    -1,    -1,    -1,    78,    79,    80,    -1,
+      -1,    -1,   116,   117,   118,   119,   120,    89,   122,   123,
+     124,    93,    -1,   898,    -1,    97,    -1,   898,    -1,    -1,
+     901,    -1,    -1,    -1,   905,   107,    -1,    -1,   477,    -1,
+      -1,   841,   778,   779,   780,   781,    -1,   783,    -1,    -1,
+      -1,   937,    -1,   939,    13,    14,    15,    16,    17,    18,
+      19,    20,    45,    -1,    47,    48,    -1,   942,    -1,    -1,
+      29,   942,    -1,   944,    -1,    -1,    -1,   948,   964,   965,
+      -1,   881,    -1,    -1,    -1,    68,    69,    70,    -1,    -1,
+     961,    -1,   531,    -1,   894,    -1,    -1,    -1,    -1,   970,
+      83,    84,    -1,    -1,    -1,   544,   545,   546,    -1,    -1,
+     549,    -1,   551,    96,   553,   554,   555,    -1,    -1,    -1,
+      -1,   560,    -1,    -1,    -1,   861,   862,   863,   864,   865,
+     866,   867,   868,   869,   870,   871,   872,   873,   874,   875,
+     876,   877,   878,   879,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,   110,   111,   112,   113,   114,   115,   116,   117,   118,
+     119,   120,    -1,   122,   123,   124,    -1,    -1,    -1,   128,
+      -1,    -1,    -1,    -1,    -1,    -1,   912,     3,     4,     5,
+       6,     7,     8,     9,    10,    -1,    12,    13,    14,    15,
+      16,    17,    18,    19,    20,    21,    22,    -1,    -1,    -1,
+      -1,    -1,    -1,    29,    30,    31,    32,    33,    34,    35,
+      36,    37,    38,    39,    40,    41,    42,   953,    -1,    45,
+      46,    47,    48,    49,    50,    51,    52,    53,    54,    -1,
+      56,    -1,    58,    59,    60,    61,    62,    63,    64,    65,
+      66,    67,    68,    69,    -1,    -1,    -1,    73,    -1,    75,
+      -1,    77,    78,    79,    80,    81,    82,    83,    84,    85,
+      86,    87,    88,    -1,    90,    91,    92,    93,    94,    95,
+      96,    -1,    98,    99,   100,   101,    -1,    -1,    -1,   105,
+     106,   107,   108,   109,   110,   111,   112,   113,   114,   115,
+     116,   117,   118,   119,   120,   121,   122,   123,   124,   125,
+     126,   127,   128,     3,     4,     5,     6,     7,     8,     9,
+      10,    -1,    12,    13,    14,    15,    16,    17,    18,    19,
+      20,    21,    22,    -1,    -1,    -1,    -1,    -1,    -1,    29,
+      30,    31,    32,    33,    34,    35,    36,    37,    38,    39,
+      40,    41,    42,    -1,    -1,    45,    46,    47,    48,    49,
+      50,    51,    52,    53,    54,    -1,    56,    -1,    58,    59,
+      60,    61,    62,    63,    64,    65,    66,    67,    68,    69,
+      -1,    -1,    -1,    73,    -1,    75,    -1,    77,    78,    79,
+      80,    81,    82,    83,    84,    85,    86,    87,    88,    -1,
+      90,    91,    92,    93,    94,    95,    96,    -1,    98,    99,
+     100,   101,    -1,    -1,    -1,   105,   106,   107,   108,   109,
+     110,   111,   112,   113,   114,   115,   116,   117,   118,   119,
+     120,   121,   122,   123,   124,   125,    -1,   127,   128,    -1,
+       3,     4,     5,     6,    -1,     8,     9,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    14,    15,    16,    17,    18,    19,    20,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    45,    29,    47,    48,
-      49,    50,    -1,    52,    53,    -1,    -1,    56,    -1,    -1,
-      -1,    -1,    61,    62,    -1,    -1,    -1,    -1,    -1,    68,
-      69,    70,    -1,    -1,    -1,    -1,    75,    -1,    -1,   931,
-      -1,    -1,    -1,    82,    83,    84,    -1,    86,    87,    -1,
-      -1,    90,    -1,    -1,    93,    94,    95,    -1,    -1,    98,
-       3,     4,     5,     6,    -1,     8,     9,    -1,    -1,    12,
-      -1,    -1,    -1,   112,    -1,    -1,    -1,   116,   117,    -1,
-      -1,   120,    -1,   122,    -1,    -1,    -1,   126,   110,   111,
-     112,   113,   114,   115,   116,   117,   118,   119,    -1,   121,
-     122,   123,    45,    -1,    47,    48,    49,    50,    -1,    52,
+      -1,     8,     9,    -1,    -1,    -1,    -1,    -1,    14,    15,
+      16,    17,    18,    19,    20,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    45,    29,    47,    48,    49,    50,    -1,    52,
       53,    -1,    -1,    56,    -1,    -1,    -1,    -1,    61,    62,
-      -1,    -1,    -1,    -1,    -1,    68,    69,    70,    -1,    -1,
-      -1,    -1,    75,    -1,    -1,    -1,    -1,    -1,    -1,    82,
-      83,    84,    -1,    86,    87,    -1,    -1,    90,    -1,    -1,
-      93,    94,    95,    -1,    -1,    98,     3,     4,     5,     6,
-      -1,     8,     9,    -1,    -1,    12,    -1,    -1,    -1,   112,
-      -1,    -1,    -1,   116,    -1,    -1,    -1,   120,    -1,   122,
-      -1,    -1,    -1,   126,    14,    15,    16,    17,    18,    19,
-      20,    -1,    -1,    -1,    45,    -1,    47,    48,    45,    29,
-      47,    48,    49,    50,    -1,    52,    53,    -1,    -1,    56,
-      -1,    -1,    -1,    -1,    61,    62,    -1,    68,    69,    70,
-      -1,    68,    69,    70,    -1,    -1,    -1,    -1,    75,    -1,
-      -1,    82,    83,    -1,    -1,    82,    83,    84,    -1,    86,
-      87,    -1,    -1,    90,    95,    -1,    93,    94,    95,    -1,
-      -1,    98,     3,     4,     5,     6,    -1,     8,     9,    -1,
-      19,    20,    -1,    -1,    -1,   112,    -1,    -1,    -1,   116,
-      29,   122,    -1,   120,    -1,   122,    -1,    -1,    -1,   126,
-     110,   111,   112,    -1,    -1,   115,   116,   117,   118,   119,
-      -1,   121,   122,   123,    45,    -1,    47,    48,    -1,    -1,
-      -1,    52,    53,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      61,    62,    -1,    -1,    -1,    -1,    -1,    68,    69,    -1,
-      -1,    -1,    -1,    -1,    75,    -1,    -1,    -1,    -1,    -1,
-      -1,    82,    83,    84,    -1,    86,    -1,    -1,    -1,    90,
-       3,     4,     5,     6,    95,     8,     9,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   115,   116,   117,   118,
-     119,   112,   121,   122,   123,   116,   117,    -1,    -1,   120,
-      -1,   122,    -1,   124,    -1,   126,    -1,    -1,    -1,    -1,
+      -1,    -1,    49,    -1,    -1,    68,    69,    70,    -1,    -1,
+      -1,   940,    75,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      83,    84,    85,    -1,    87,    88,    -1,    -1,    91,    -1,
+      -1,    94,    95,    96,    -1,    -1,    99,     3,     4,     5,
+       6,    88,     8,     9,    -1,    -1,    12,    94,    95,    -1,
+     113,    98,    -1,    -1,   117,   118,    -1,    -1,   121,    -1,
+     123,    -1,    -1,    -1,   127,   111,   112,   113,   114,   115,
+     116,   117,   118,   119,   120,    -1,   122,   123,   124,    45,
+      -1,    47,    48,    49,    50,    -1,    52,    53,    -1,    -1,
+      56,    -1,    -1,    -1,    -1,    61,    62,    -1,    -1,    -1,
+      -1,    -1,    68,    69,    70,    -1,    -1,    -1,    -1,    75,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    83,    84,    85,
+      -1,    87,    88,    -1,    -1,    91,    -1,    -1,    94,    95,
+      96,    -1,    -1,    99,     3,     4,     5,     6,    -1,     8,
+       9,    -1,    -1,    12,    -1,    -1,    -1,   113,    -1,    -1,
+      -1,   117,    -1,    -1,    -1,   121,    -1,   123,    -1,    -1,
+      -1,   127,    14,    15,    16,    17,    18,    19,    20,    -1,
+      -1,    -1,    45,    -1,    47,    48,    45,    29,    47,    48,
+      49,    50,    -1,    52,    53,    -1,    -1,    56,    -1,    -1,
+      -1,    -1,    61,    62,    -1,    68,    69,    70,    -1,    68,
+      69,    70,    -1,    -1,    -1,    -1,    75,    -1,    -1,    -1,
+      83,    84,    -1,    -1,    83,    84,    85,    -1,    87,    88,
+      -1,    -1,    91,    96,    -1,    94,    95,    96,    -1,    -1,
+      99,     3,     4,     5,     6,    -1,     8,     9,    -1,    -1,
+      -1,    -1,    -1,    -1,   113,    -1,    -1,    -1,   117,    -1,
+     123,    -1,   121,    -1,   123,    -1,    -1,    -1,   127,   111,
+     112,   113,    -1,    -1,   116,   117,   118,   119,   120,    -1,
+     122,   123,   124,    45,    -1,    47,    48,    -1,    -1,    -1,
+      52,    53,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    61,
+      62,    -1,    -1,    -1,    -1,    -1,    68,    69,    -1,    -1,
+      -1,    -1,    -1,    75,    -1,    45,    -1,    47,    48,    -1,
+      -1,    83,    84,    85,    -1,    87,    -1,    -1,    -1,    91,
+       3,     4,     5,     6,    96,     8,     9,    -1,    68,    69,
+      70,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,   113,    -1,    83,    84,   117,   118,    -1,    -1,   121,
+      -1,   123,    -1,   125,    -1,   127,    96,    -1,    -1,    -1,
       -1,    -1,    45,    -1,    47,    48,    -1,    -1,    -1,    52,
       53,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    61,    62,
-      -1,    45,    -1,    47,    48,    68,    69,    -1,    52,    -1,
-      -1,    -1,    75,    -1,    -1,    -1,    -1,    -1,    62,    82,
-      83,    84,    -1,    86,    68,    69,    70,    90,     3,     4,
-       5,     6,    95,     8,     9,    -1,    19,    20,    82,    83,
-      -1,   104,    -1,    -1,    -1,    -1,    29,    -1,    -1,   112,
-      -1,    95,    -1,   116,   117,    -1,    -1,   120,    -1,   122,
-      -1,    -1,    -1,   126,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   123,    -1,    68,    69,    -1,     8,     9,
+      -1,    -1,    75,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      83,    84,    85,    -1,    87,    -1,    -1,    -1,    91,     3,
+       4,     5,     6,    96,     8,     9,    -1,    -1,    -1,    -1,
+      -1,    -1,   105,    -1,    -1,    45,    -1,    47,    48,    -1,
+     113,    -1,    52,    -1,   117,   118,    -1,    -1,   121,    -1,
+     123,    -1,    62,    -1,   127,    -1,    -1,    -1,    68,    69,
+      70,    45,    -1,    47,    48,    -1,    -1,    -1,    52,    53,
+      -1,    -1,    -1,    83,    84,    -1,    -1,    61,    62,    -1,
+      -1,    -1,    -1,    -1,    68,    69,    96,    -1,    -1,    99,
+      -1,    75,    -1,    45,    -1,    47,    48,    -1,    -1,    83,
+      84,    85,    -1,    87,    -1,    -1,    -1,    91,     3,     4,
+       5,     6,    96,     8,     9,    -1,    68,    69,    70,    -1,
+      -1,   105,    -1,    -1,    45,    -1,    47,    48,    -1,   113,
+      -1,    83,    84,   117,   118,    -1,    -1,   121,    -1,   123,
+      -1,    62,    -1,   127,    96,    -1,    -1,    68,    69,    70,
       45,    -1,    47,    48,    -1,    -1,    -1,    52,    53,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    61,    62,    -1,    -1,
-      -1,    -1,    -1,    68,    69,    -1,    -1,    -1,    -1,    -1,
-      75,    -1,    -1,    -1,    -1,    -1,    -1,    82,    83,    84,
-      -1,    86,    -1,    -1,    -1,    90,     3,     4,     5,     6,
-      95,     8,     9,    -1,    -1,    -1,    -1,    -1,    -1,   104,
-      -1,    -1,   115,   116,   117,   118,   119,   112,   121,   122,
-     123,   116,   117,    -1,    -1,   120,    -1,   122,    -1,    -1,
-      -1,   126,    -1,    -1,    -1,    -1,    -1,    -1,    45,    -1,
+      -1,    -1,    83,    84,    -1,    -1,    61,    62,    -1,    -1,
+      -1,   123,    -1,    68,    69,    96,    -1,    -1,    -1,    -1,
+      75,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    83,    84,
+      85,    -1,    87,    -1,    -1,    -1,    91,     3,     4,     5,
+       6,    96,     8,     9,    -1,    -1,    -1,    -1,    -1,    -1,
+      45,    -1,    47,    48,    -1,    -1,    -1,    52,   113,    -1,
+      -1,    -1,   117,   118,    -1,    -1,   121,    62,   123,    -1,
+     125,    -1,   127,    68,    69,    70,    -1,    -1,    -1,    45,
+      -1,    47,    48,    -1,    -1,    -1,    52,    53,    83,    84,
+      -1,    -1,    -1,    -1,    -1,    61,    62,    -1,    -1,    -1,
+      -1,    96,    68,    69,    -1,    -1,    -1,    -1,    -1,    75,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    83,    84,    85,
+      -1,    87,    -1,    -1,    -1,    91,     3,     4,     5,     6,
+      96,     8,     9,    -1,    -1,    -1,    -1,    -1,    -1,   105,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,   113,    -1,    -1,
+      -1,   117,   118,    -1,    -1,   121,    -1,   123,    -1,    -1,
+      -1,   127,    -1,    -1,    -1,    -1,    -1,    -1,    45,    -1,
       47,    48,    -1,    -1,    -1,    52,    53,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    61,    62,    -1,    -1,    -1,    -1,
       -1,    68,    69,    -1,    -1,    -1,    -1,    -1,    75,    -1,
-      45,    -1,    47,    48,    -1,    82,    83,    84,    -1,    86,
-      -1,    -1,    -1,    90,     3,     4,     5,     6,    95,     8,
-       9,    -1,    -1,    68,    69,    70,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,   112,    -1,    82,    83,   116,
-     117,    -1,    -1,   120,    -1,   122,    -1,   124,    -1,   126,
-      95,    -1,    -1,    -1,    -1,    -1,    45,    -1,    47,    48,
-      -1,    -1,    -1,    52,    53,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    61,    62,    -1,    -1,    -1,   122,    -1,    68,
-      69,    -1,    -1,    -1,    -1,    -1,    75,    -1,    45,    -1,
-      47,    48,    -1,    82,    83,    84,    -1,    86,    -1,    -1,
-      -1,    90,     3,     4,     5,     6,    95,     8,     9,    -1,
-      -1,    68,    69,    70,    -1,   104,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,   112,    -1,    82,    83,   116,   117,    -1,
-      -1,   120,    -1,   122,    -1,    -1,    -1,   126,    95,    -1,
-      -1,    -1,    -1,    -1,    45,    -1,    47,    48,    -1,    -1,
-      -1,    52,    53,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      61,    62,    -1,    -1,    -1,   122,    -1,    68,    69,    -1,
-      -1,    -1,    -1,    -1,    75,    -1,    -1,    -1,    -1,    -1,
-      -1,    82,    83,    84,    -1,    86,    -1,    -1,    -1,    90,
-       3,     4,     5,     6,    95,     8,     9,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,   112,    -1,    -1,    -1,   116,   117,    -1,    -1,   120,
-      -1,   122,    -1,   124,    -1,   126,    -1,    -1,    -1,    -1,
-      -1,    -1,    45,    -1,    47,    48,    -1,    -1,    -1,    52,
-      53,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    61,    62,
-      -1,    -1,    -1,    -1,    -1,    68,    69,    -1,    -1,    -1,
-      -1,    -1,    75,    17,    18,    19,    20,    -1,    -1,    82,
-      83,    84,    -1,    86,    -1,    29,    -1,    90,    -1,    -1,
-      -1,    -1,    95,    -1,    13,    14,    15,    16,    17,    18,
-      19,    20,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   112,
-      29,    -1,    -1,   116,   117,    -1,    -1,   120,    -1,   122,
-      -1,    -1,    -1,   126,    13,    14,    15,    16,    17,    18,
-      19,    20,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      29,    -1,    -1,    13,    14,    15,    16,    17,    18,    19,
-      20,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    29,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   113,
-     114,   115,   116,   117,   118,   119,    -1,   121,   122,   123,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-     109,   110,   111,   112,   113,   114,   115,   116,   117,   118,
-     119,    -1,   121,   122,   123,    -1,    -1,    -1,   127,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-     109,   110,   111,   112,   113,   114,   115,   116,   117,   118,
-     119,    -1,   121,   122,   123,    -1,    -1,    -1,   127,   109,
-     110,   111,   112,   113,   114,   115,   116,   117,   118,   119,
-      -1,   121,   122,   123,     8,     9,    -1,   127,    13,    14,
-      15,    16,    17,    18,    19,    20,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    29,    -1,    31,    32,    33,    34,
-      35,    36,    37,    38,    39,    40,    41,    42,    -1,    -1,
-      -1,    45,    -1,    47,    48,    -1,    51,    -1,    52,    -1,
-      -1,    -1,    45,    -1,    47,    48,    -1,    -1,    62,    52,
-      -1,    -1,    -1,    -1,    68,    69,    70,    -1,    -1,    62,
-      75,    -1,    -1,    -1,    -1,    68,    69,    70,    82,    83,
-      -1,    -1,    -1,     8,     9,    -1,    -1,    -1,    -1,    82,
-      83,    95,    -1,    -1,    98,    -1,    -1,    -1,    -1,    -1,
-     105,    -1,    95,   108,    -1,   110,   111,   112,   113,   114,
-     115,   116,   117,   118,   119,   120,    -1,   122,   123,    44,
-      45,   126,    47,    48,    49,    50,    -1,    52,    -1,   122,
-      -1,    56,    57,    58,    59,    -1,    -1,    62,    -1,    -1,
-      -1,    -1,    67,    68,    69,    70,    -1,    -1,    73,     8,
-       9,    76,    -1,    -1,    -1,    80,    -1,    82,    83,    -1,
-      85,    -1,    87,    -1,    -1,    -1,    -1,    -1,    93,    94,
-      95,    -1,    97,    98,    99,    -1,    -1,    -1,    -1,   104,
-      -1,    -1,    -1,    -1,    -1,    44,    45,    -1,    47,    48,
-      49,    50,    -1,    52,    -1,   120,    -1,    56,    57,    58,
-      59,    -1,    -1,    62,    -1,     8,     9,    -1,    67,    68,
-      69,    70,    -1,    -1,    73,    -1,    -1,    76,    -1,    -1,
-      -1,    80,    -1,    82,    83,    -1,    85,    -1,    87,    -1,
-      -1,    -1,    -1,    -1,    93,    94,    95,    -1,    97,    98,
-      99,    44,    45,    -1,    47,    48,    49,    50,    -1,    52,
+      -1,    -1,    -1,    -1,    -1,    -1,    83,    84,    85,    -1,
+      87,    -1,    -1,    -1,    91,     3,     4,     5,     6,    96,
+       8,     9,    -1,    -1,    -1,    -1,    -1,    -1,    45,    -1,
+      47,    48,    -1,    -1,    -1,    52,   113,    -1,    -1,    -1,
+     117,   118,    -1,    -1,   121,    62,   123,    -1,   125,    -1,
+     127,    68,    69,    70,    -1,    -1,    -1,    45,    -1,    47,
+      48,    -1,    -1,    -1,    52,    53,    83,    84,    -1,    -1,
+      -1,    -1,    -1,    61,    62,    -1,    -1,    -1,    -1,    96,
+      68,    69,    -1,    -1,    -1,    -1,    -1,    75,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    83,    84,    85,    -1,    87,
+      -1,    -1,    -1,    91,    -1,    -1,   123,    -1,    96,    -1,
+      13,    14,    15,    16,    17,    18,    19,    20,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,   113,    29,    -1,    -1,   117,
+     118,    -1,    -1,   121,    -1,   123,    -1,    -1,    -1,   127,
+      13,    14,    15,    16,    17,    18,    19,    20,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    29,    -1,    -1,    -1,
+      13,    14,    15,    16,    17,    18,    19,    20,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    29,    -1,    31,    32,
+      33,    34,    35,    36,    37,    38,    39,    40,    41,    42,
+      13,    14,    15,    16,    17,    18,    19,    20,    51,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    29,   110,   111,   112,
+     113,   114,   115,   116,   117,   118,   119,   120,    -1,   122,
+     123,   124,    75,    -1,    -1,   128,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,   110,   111,   112,
+     113,   114,   115,   116,   117,   118,   119,   120,    -1,   122,
+     123,   124,    -1,   106,    -1,   128,   109,    -1,   111,   112,
+     113,   114,   115,   116,   117,   118,   119,   120,   121,    -1,
+     123,   124,     8,     9,   127,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,   108,    -1,   110,   111,   112,
+     113,   114,   115,   116,   117,   118,   119,   120,    -1,   122,
+     123,   124,    -1,    -1,    -1,    -1,    -1,    -1,    44,    45,
+      -1,    47,    48,    49,    50,    -1,    52,    -1,    -1,    -1,
+      56,    57,    58,    59,    -1,    -1,    62,    -1,    -1,    -1,
+      -1,    67,    68,    69,    70,    -1,    -1,    73,     8,     9,
+      -1,    77,    -1,    -1,    -1,    81,    -1,    83,    84,    -1,
+      86,    -1,    88,    -1,    -1,    -1,    -1,    -1,    94,    95,
+      96,    -1,    98,    99,   100,    -1,    -1,    -1,    -1,   105,
+      -1,    -1,    -1,    -1,    44,    45,    -1,    47,    48,    49,
+      50,    -1,    52,    -1,    -1,   121,    56,    57,    58,    59,
+      -1,    -1,    62,    -1,    -1,     8,     9,    67,    68,    69,
+      70,    -1,    -1,    73,    -1,    -1,    -1,    77,    -1,    -1,
+      -1,    81,    -1,    83,    84,    -1,    86,    -1,    88,    -1,
+      -1,    -1,    -1,    -1,    94,    95,    96,    -1,    98,    99,
+     100,    44,    45,    -1,    47,    48,    49,    50,    -1,    52,
       -1,    -1,    -1,    56,    57,    58,    59,    -1,    -1,    62,
-      -1,   120,    -1,    -1,    67,    68,    69,    70,    -1,    -1,
-      73,    -1,    -1,    76,    -1,    -1,    -1,    80,    -1,    82,
-      83,    -1,    85,    -1,    87,    -1,    -1,    -1,    -1,    -1,
-      93,    94,    95,    -1,    97,    98,    99,    13,    14,    15,
-      16,    17,    18,    19,    20,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    29,    -1,    -1,    -1,   120,    13,    14,
+      -1,   121,    -1,    -1,    67,    68,    69,    70,    -1,    -1,
+      73,    -1,    -1,    -1,    77,    -1,    -1,    -1,    81,    -1,
+      83,    84,    -1,    86,    -1,    88,    -1,    -1,    -1,    -1,
+      -1,    94,    95,    96,    -1,    98,    99,   100,    13,    14,
       15,    16,    17,    18,    19,    20,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    29,    13,    14,    15,    16,    17,
-      18,    19,    20,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    29,    13,    14,    15,    16,    17,    18,    19,    20,
+      -1,    -1,    -1,    -1,    29,    -1,    -1,    -1,   121,    13,
+      14,    15,    16,    17,    18,    19,    20,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    29,    13,    14,    15,    16,
+      17,    18,    19,    20,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    29,    13,    14,    15,    16,    17,    18,    19,
+      20,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    29,
+      13,    14,    15,    16,    17,    18,    19,    20,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    29,    -1,    -1,    -1,
+      -1,    -1,   107,    -1,    -1,   110,   111,   112,   113,   114,
+     115,   116,   117,   118,   119,   120,    -1,   122,   123,   124,
+      -1,    -1,   106,    -1,    -1,    -1,   110,   111,   112,   113,
+     114,   115,   116,   117,   118,   119,   120,    -1,   122,   123,
+     124,   108,    -1,   110,   111,   112,   113,   114,   115,   116,
+     117,   118,   119,   120,    -1,   122,   123,   124,    -1,    -1,
+     110,   111,   112,   113,   114,   115,   116,   117,   118,   119,
+     120,    -1,   122,   123,   124,    -1,    -1,   110,   111,   112,
+     113,   114,   115,   116,   117,   118,   119,   120,    -1,   122,
+     123,   124,    13,    14,    15,    16,    17,    18,    19,    20,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    29,    13,
       14,    15,    16,    17,    18,    19,    20,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    29,    -1,    -1,    -1,    -1,
-     106,    -1,    -1,   109,   110,   111,   112,   113,   114,   115,
-     116,   117,   118,   119,    -1,   121,   122,   123,    -1,    -1,
-     105,    -1,    -1,    -1,   109,   110,   111,   112,   113,   114,
-     115,   116,   117,   118,   119,    -1,   121,   122,   123,   107,
-      -1,   109,   110,   111,   112,   113,   114,   115,   116,   117,
-     118,   119,    -1,   121,   122,   123,    -1,    -1,   109,   110,
-     111,   112,   113,   114,   115,   116,   117,   118,   119,    -1,
-     121,   122,   123,    -1,    -1,   109,   110,   111,   112,   113,
-     114,   115,   116,   117,   118,   119,    -1,   121,   122,   123,
-      13,    14,    15,    16,    17,    18,    19,    20,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    29,    13,    14,    15,
-      16,    17,    18,    19,    20,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    29,    15,    16,    17,    18,    19,    20,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    29,    15,
-      16,    17,    18,    19,    20,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    29,    15,    16,    17,    18,    19,    20,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    29,    15,
-      16,    17,    18,    19,    20,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    29,   107,    -1,   109,   110,   111,   112,
-      -1,    -1,   115,   116,   117,   118,   119,    -1,   121,   122,
-     123,    -1,    -1,   109,   110,   111,   112,    -1,    -1,   115,
-     116,   117,   118,   119,    -1,   121,   122,   123,    -1,    -1,
-     111,   112,   113,   114,   115,   116,   117,   118,   119,    -1,
-     121,   122,   123,    -1,    -1,    -1,   112,   113,   114,   115,
-     116,   117,   118,   119,    -1,   121,   122,   123,    -1,   110,
-     111,   112,    -1,    -1,   115,   116,   117,   118,   119,    -1,
-     121,   122,   123,    -1,    -1,    -1,    -1,   113,   114,   115,
-     116,   117,   118,   119,    -1,   121,   122,   123,    15,    16,
-      17,    18,    19,    20,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    29,    15,    16,    17,    18,    19,    20,    -1,
-      -1,    -1,     8,     9,    -1,    -1,    -1,    29,    15,    16,
-      17,    18,    19,    20,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    29,    17,    18,    19,    20,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    29,    -1,    -1,    -1,    45,
-      -1,    47,    48,    49,    50,    -1,    52,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    62,    -1,    -1,    -1,
-      -1,    -1,    68,    69,    70,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   111,   112,    82,    83,   115,   116,
-     117,   118,   119,    -1,   121,   122,   123,    93,    -1,    95,
-     112,    -1,    98,   115,   116,   117,   118,   119,     9,   121,
-     122,   123,    -1,    -1,    -1,    -1,    -1,    -1,   115,   116,
-     117,   118,   119,    -1,   121,   122,   123,    -1,    -1,    -1,
-      -1,   115,   116,   117,   118,   119,    -1,   121,   122,   123,
-      45,    -1,    47,    48,    45,    -1,    47,    48,    49,    50,
-      -1,    52,    -1,    -1,    -1,    56,    -1,    62,    -1,    -1,
-       9,    62,    -1,    68,    69,    70,    -1,    68,    69,    70,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    82,    83,    -1,
-      -1,    82,    83,    -1,    -1,    -1,    87,    -1,    -1,    -1,
-      95,    -1,    93,    94,    95,    -1,    45,    98,    47,    48,
-      49,    50,    -1,    52,    -1,    -1,    -1,    56,    -1,    -1,
-      -1,    -1,     9,    62,    -1,    -1,    -1,    -1,    -1,    68,
-      69,    70,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    82,    83,    -1,    -1,    -1,    87,    -1,
-      -1,    -1,    -1,    -1,    93,    94,    95,    -1,    45,    98,
-      47,    48,    49,    -1,    -1,    52,    -1,    -1,    -1,    56,
-      -1,    -1,    -1,    -1,     9,    62,    -1,    -1,    -1,    -1,
-      -1,    68,    69,    70,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    82,    83,    -1,    -1,    -1,
-      87,    -1,    -1,    -1,    -1,    -1,    93,    94,    95,    -1,
-      45,    98,    47,    48,    49,    -1,    -1,    52,    -1,    -1,
-      -1,    56,    -1,    -1,    -1,    -1,    -1,    62,    -1,    -1,
-      -1,    -1,    -1,    68,    69,    70,    -1,    43,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    82,    83,    55,
-      -1,    -1,    87,    -1,    60,    -1,    -1,    63,    93,    94,
-      95,    -1,    -1,    98,    -1,    71,    72,    43,    74,    -1,
-      -1,    77,    78,    79,    -1,    -1,    -1,    -1,    -1,    55,
-      -1,    -1,    88,    -1,    60,    -1,    92,    63,    -1,    -1,
-      96,    -1,    -1,    43,    -1,    71,    72,    -1,    74,    -1,
-     106,    77,    78,    79,    -1,    55,    -1,    -1,    -1,    -1,
-      60,    -1,    88,    63,    -1,    -1,    92,    -1,    -1,   125,
-      96,    71,    72,    43,    74,    -1,    -1,    77,    78,    79,
-     106,    -1,    -1,    -1,    -1,    55,    -1,    -1,    88,    -1,
-      60,    -1,    92,    63,    -1,    -1,    96,    -1,    -1,   125,
-      -1,    71,    72,    43,    74,    -1,   106,    77,    78,    79,
-      -1,    -1,    -1,    -1,    -1,    55,    -1,    -1,    88,    -1,
-      60,    -1,    92,    63,    -1,   125,    96,    -1,    -1,    43,
-      -1,    71,    72,    -1,    74,    -1,   106,    77,    78,    79,
-      -1,    55,    -1,    -1,    -1,    -1,    60,    -1,    88,    63,
-      -1,    -1,    92,    -1,    -1,   125,    96,    71,    72,    -1,
-      74,    -1,    -1,    77,    78,    79,   106,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    88,    -1,    -1,    -1,    92,    -1,
-      -1,    -1,    96,    -1,    -1,   125
+      -1,    -1,    -1,    -1,    -1,    29,    15,    16,    17,    18,
+      19,    20,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      29,    15,    16,    17,    18,    19,    20,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    29,    15,    16,    17,    18,
+      19,    20,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      29,    15,    16,    17,    18,    19,    20,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    29,    -1,   108,    -1,   110,
+     111,   112,   113,    -1,    -1,   116,   117,   118,   119,   120,
+      -1,   122,   123,   124,    -1,    -1,   110,   111,   112,   113,
+      -1,    -1,   116,   117,   118,   119,   120,    -1,   122,   123,
+     124,    -1,   111,   112,   113,   114,   115,   116,   117,   118,
+     119,   120,    -1,   122,   123,   124,    -1,    -1,   112,   113,
+     114,   115,   116,   117,   118,   119,   120,    -1,   122,   123,
+     124,    -1,    -1,    -1,   113,   114,   115,   116,   117,   118,
+     119,   120,    -1,   122,   123,   124,    -1,   111,   112,   113,
+      -1,    -1,   116,   117,   118,   119,   120,    -1,   122,   123,
+     124,    15,    16,    17,    18,    19,    20,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    29,    15,    16,    17,    18,
+      19,    20,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      29,    15,    16,    17,    18,    19,    20,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    29,    17,    18,    19,    20,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    29,    17,
+      18,    19,    20,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    29,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     114,   115,   116,   117,   118,   119,   120,    -1,   122,   123,
+     124,    -1,    -1,   112,   113,    -1,    -1,   116,   117,   118,
+     119,   120,    -1,   122,   123,   124,    -1,    -1,    -1,   113,
+       8,     9,   116,   117,   118,   119,   120,    -1,   122,   123,
+     124,    -1,    -1,   114,   115,   116,   117,   118,   119,   120,
+      -1,   122,   123,   124,    -1,    -1,    -1,    -1,   116,   117,
+     118,   119,   120,    -1,   122,   123,   124,    45,    -1,    47,
+      48,    49,    50,    -1,    52,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    62,    -1,     9,    -1,    -1,    -1,
+      68,    69,    70,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    83,    84,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    94,    -1,    96,    -1,
+      -1,    99,    45,    -1,    47,    48,    49,    50,    -1,    52,
+      -1,    -1,    -1,    56,    -1,    -1,    -1,    -1,    -1,    62,
+      -1,     9,    -1,    -1,    -1,    68,    69,    70,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      83,    84,    -1,    -1,    -1,    88,    -1,    -1,    -1,    -1,
+      -1,    94,    95,    96,    -1,    -1,    99,    45,    -1,    47,
+      48,    49,    50,    -1,    52,    -1,    -1,    -1,    56,    -1,
+      -1,    -1,    -1,    -1,    62,    -1,     9,    -1,    -1,    -1,
+      68,    69,    70,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    83,    84,    -1,    -1,    -1,
+      88,    -1,    -1,    -1,    -1,    -1,    94,    95,    96,    -1,
+      -1,    99,    45,    -1,    47,    48,    49,    -1,    -1,    52,
+      -1,    -1,    -1,    56,    -1,    -1,    -1,    -1,    -1,    62,
+      -1,     9,    -1,    -1,    -1,    68,    69,    70,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      83,    84,    -1,    -1,    -1,    88,    -1,    -1,    -1,    -1,
+      -1,    94,    95,    96,    -1,    -1,    99,    45,    -1,    47,
+      48,    49,    -1,    -1,    52,    -1,    -1,    -1,    56,    -1,
+      -1,    -1,    -1,    -1,    62,    -1,    -1,    -1,    -1,    -1,
+      68,    69,    70,    -1,    -1,    43,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    83,    84,    55,    -1,    -1,
+      88,    -1,    60,    -1,    -1,    63,    94,    95,    96,    -1,
+      -1,    99,    -1,    71,    72,    -1,    74,    43,    -1,    -1,
+      78,    79,    80,    -1,    -1,    -1,    -1,    -1,    -1,    55,
+      -1,    89,    -1,    -1,    60,    93,    -1,    63,    -1,    97,
+      -1,    -1,    -1,    -1,    -1,    71,    72,    -1,    74,   107,
+      -1,    -1,    78,    79,    80,    -1,    -1,    43,    -1,    -1,
+      -1,    -1,    -1,    89,    -1,    -1,    -1,    93,   126,    55,
+      -1,    97,    -1,    -1,    60,    -1,    -1,    63,    -1,    -1,
+      -1,   107,    -1,    -1,    -1,    71,    72,    -1,    74,    43,
+      -1,    -1,    78,    79,    80,    -1,    -1,    -1,    -1,    -1,
+     126,    55,    -1,    89,    -1,    -1,    60,    93,    -1,    63,
+      -1,    97,    -1,    -1,    -1,    -1,    -1,    71,    72,    -1,
+      74,   107,    -1,    -1,    78,    79,    80,    -1,    -1,    43,
+      -1,    -1,    -1,    -1,    -1,    89,    -1,    -1,    -1,    93,
+     126,    55,    -1,    97,    -1,    -1,    60,    -1,    -1,    63,
+      -1,    -1,    -1,   107,    -1,    -1,    -1,    71,    72,    -1,
+      74,    43,    -1,    -1,    78,    79,    80,    -1,    -1,    -1,
+      -1,    -1,   126,    55,    -1,    89,    -1,    -1,    60,    93,
+      -1,    63,    -1,    97,    -1,    -1,    -1,    -1,    -1,    71,
+      72,    -1,    74,   107,    -1,    -1,    78,    79,    80,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    89,    -1,    -1,
+      -1,    93,   126,    -1,    -1,    97
 };
 
 /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
    symbol of state STATE-NUM.  */
 static const yytype_uint8 yystos[] =
 {
-       0,   101,   102,   103,   129,   130,   221,     3,     4,     5,
+       0,   102,   103,   104,   130,   131,   222,     3,     4,     5,
        6,     8,     9,    45,    47,    48,    52,    53,    61,    62,
-      68,    69,    75,    82,    83,    84,    86,    90,    95,   112,
-     116,   117,   120,   122,   126,   214,   215,   220,     9,    45,
+      68,    69,    75,    83,    84,    85,    87,    91,    96,   113,
+     117,   118,   121,   123,   127,   215,   216,   221,     9,    45,
       47,    48,    49,    50,    52,    56,    62,    68,    69,    70,
-      82,    83,    87,    93,    94,    95,    98,   180,   183,   184,
-     186,   191,   193,   197,   198,   202,   203,   204,   205,     0,
-      43,    55,    60,    63,    71,    72,    74,    77,    78,    79,
-      88,    92,    96,   106,   133,   135,   136,   138,   139,   140,
-     161,   199,   201,   221,   122,   122,   122,   122,   122,   113,
-     122,   122,   122,     9,    93,   182,   197,   198,   202,   122,
-     122,   122,   113,   122,   214,   214,   214,   214,     9,    45,
-      47,    48,    52,    62,    68,    69,    82,    83,    95,   183,
-     212,   214,   214,    13,    14,    15,    16,    17,    18,    19,
-      20,    29,   109,   110,   111,   112,   113,   114,   115,   116,
-     117,   118,   119,   121,   122,   123,     6,   180,    52,    62,
-      69,   203,    69,   203,   203,     8,     9,   219,   203,    10,
-      50,   112,   117,   122,   179,   221,   104,   219,   104,   219,
-     107,   137,   122,   122,   104,   219,   107,   107,   107,   162,
-     138,   145,    74,   219,     8,     9,    44,    50,    57,    58,
-      59,    67,    73,    76,    80,    85,    93,    97,    99,   104,
-     120,   150,   181,   184,   186,   191,   193,   197,   198,   202,
-     211,   212,   221,   211,   211,   211,   211,   183,   211,   211,
-     211,   219,   122,   219,   219,   211,   211,   183,   183,   211,
-     124,   105,   124,   214,   214,   214,   214,   214,   214,   214,
+      83,    84,    88,    94,    95,    96,    99,   181,   184,   185,
+     187,   192,   194,   198,   199,   203,   204,   205,   206,     0,
+      43,    55,    60,    63,    71,    72,    74,    78,    79,    80,
+      89,    93,    97,   107,   134,   136,   137,   139,   140,   141,
+     162,   200,   202,   222,   123,   123,   123,   123,   123,   114,
+     123,   123,   123,     9,    94,   183,   198,   199,   203,   123,
+     123,   123,   114,   123,   215,   215,   215,   215,     9,    45,
+      47,    48,    52,    62,    68,    69,    83,    84,    96,   184,
+     213,   215,   215,    13,    14,    15,    16,    17,    18,    19,
+      20,    29,   110,   111,   112,   113,   114,   115,   116,   117,
+     118,   119,   120,   122,   123,   124,     6,   181,    52,    62,
+      69,   204,    69,   204,   204,     8,     9,   220,   204,    10,
+      14,    50,   113,   118,   123,   180,   222,   105,   220,   105,
+     220,   108,   138,   123,   123,   105,   220,   108,   108,   108,
+     163,   139,   146,    74,   220,     8,     9,    44,    50,    57,
+      58,    59,    67,    73,    77,    81,    86,    94,    98,   100,
+     105,   121,   151,   182,   185,   187,   192,   194,   198,   199,
+     203,   212,   213,   222,   212,   212,   212,   212,   184,   212,
+     212,   212,   220,   123,   220,   220,   212,   212,   184,   184,
+     212,   125,   106,   125,   215,   215,   215,   215,   215,   215,
+     215,   215,   215,   215,   215,   215,   215,   215,   215,   215,
+     215,   215,   215,   215,   215,   125,   213,   215,   180,    62,
+     118,   180,   180,   180,   180,   180,   124,   193,   105,   186,
+     188,   136,     8,   220,   131,   105,   114,    50,   151,   182,
+     220,   123,   123,   181,   221,    50,   181,   220,   135,   220,
+     105,   107,   108,   109,   174,   107,   142,   220,   220,   125,
+     125,   125,   125,   125,   115,   125,   125,   125,   212,   125,
+     125,   125,   115,   125,   215,   215,   108,   125,   128,   180,
+     125,   211,   215,   222,   196,   197,   222,   195,   131,   108,
+     189,   190,   222,   106,   106,   126,   201,     8,     9,    49,
+      50,    94,   164,   165,   166,   167,   203,   222,   181,   174,
+     147,   152,    10,   118,   153,   143,   181,     8,     9,    10,
+      14,    50,   113,   118,   178,   222,   131,   123,   207,   208,
+     132,   133,   220,   105,   215,    10,    14,    50,    77,   113,
+     118,   123,   144,   168,   220,   123,   125,   123,   215,   123,
+     128,   220,   126,   197,   126,    78,    79,    80,    98,   191,
+     105,   106,     8,   220,   131,   220,   167,   220,   115,   106,
+       8,     9,    10,    14,    50,   113,   118,   123,   179,   222,
+     148,   149,   168,     3,     4,     5,     8,    12,    50,    53,
+      61,    75,    85,    87,    91,   113,   117,   121,   123,   127,
+     170,   171,   177,   181,   217,   218,   221,   222,   118,   168,
+     170,   145,   168,   178,   118,   178,   178,   178,   178,   123,
+     124,   126,   154,   126,   209,   222,   105,   106,   123,   105,
+     175,   176,   215,   222,   107,   118,   168,   168,    13,    14,
+      15,    16,    17,    18,    19,    20,    29,    31,    32,    33,
+      34,    35,    36,    37,    38,    39,    40,    41,    42,    51,
+      75,   106,   109,   111,   112,   113,   114,   115,   116,   117,
+     118,   119,   120,   121,   123,   124,   127,   160,   168,   168,
+     168,   108,   109,   123,   124,   173,   174,   222,   213,   213,
+     170,   106,   109,   126,    94,    98,   199,   219,   220,    98,
+     219,    98,   219,    78,    79,    80,   131,   191,   106,   125,
+     106,   126,   109,   179,   109,   139,   140,   161,   162,   166,
+     118,   179,   179,   179,   179,   179,   109,   124,   172,   222,
+     150,   168,   173,   174,   179,   181,   114,   183,   123,   114,
+     215,   215,   215,   184,   213,   215,   125,    12,   106,   179,
+      13,    14,    15,    16,    17,    18,    19,    20,    29,   110,
+     111,   112,   113,   114,   115,   116,   117,   118,   119,   120,
+     122,   123,   124,   168,   108,   125,   125,   173,   174,   123,
+     178,   157,   211,   170,     3,     4,     5,     6,     7,     8,
+       9,    10,    12,    13,    14,    15,    16,    17,    18,    19,
+      20,    21,    22,    29,    30,    31,    32,    33,    34,    35,
+      36,    37,    38,    39,    40,    41,    42,    45,    46,    47,
+      48,    49,    50,    51,    52,    53,    54,    56,    58,    59,
+      60,    61,    62,    63,    64,    65,    66,    67,    68,    69,
+      73,    75,    77,    78,    79,    80,    81,    82,    83,    84,
+      85,    86,    87,    88,    90,    91,    92,    93,    94,    95,
+      96,    98,    99,   100,   101,   105,   106,   107,   108,   109,
+     110,   111,   112,   113,   114,   115,   116,   117,   118,   119,
+     120,   121,   122,   123,   124,   125,   127,   128,   210,   207,
+     133,   212,   175,   126,   106,   168,   125,   128,   125,     4,
+     215,   169,   211,   106,   125,   125,   125,   215,   220,   219,
+     220,   219,   219,   219,   219,   219,   126,     8,   107,   220,
+     184,   172,   184,   179,   125,    53,    85,    87,   113,   117,
+     118,   121,   123,   127,   214,   216,   211,   173,   174,   106,
+     109,   173,   179,   184,   123,   184,   184,   125,   125,    50,
+     159,   222,    12,   177,   173,   215,   215,   215,   215,   215,
+     215,   215,   215,   215,   215,   215,   215,   215,   215,   215,
+     215,   215,   215,   215,   215,   215,   125,   213,   215,   125,
+     123,   159,   106,   158,   170,   128,   125,   209,   126,   125,
+     126,   105,   215,   170,   128,   144,   159,   106,   125,   125,
+     123,   114,   123,   114,   214,   214,   214,   214,   184,   213,
+     214,    13,    14,    15,    16,    17,    18,    19,    20,    29,
+     110,   111,   112,   113,   116,   117,   118,   119,   120,   122,
+     123,   124,   128,   106,   149,   215,   173,   115,   212,   125,
+     115,   215,    76,    90,   108,   125,   128,   123,   155,   145,
+     170,   125,   159,   126,   175,   125,   107,   107,   170,   184,
+     184,   184,   125,   125,   214,   214,   214,   214,   214,   214,
      214,   214,   214,   214,   214,   214,   214,   214,   214,   214,
-     214,   214,   214,   214,   124,   212,   214,   179,    62,   117,
-     179,   179,   179,   179,   123,   192,   104,   185,   187,   135,
-       8,   219,   130,   104,   113,    50,   150,   181,   219,   122,
-     122,   180,   220,    50,   180,   219,   134,   219,   104,   106,
-     107,   108,   173,   106,   141,   219,   219,   124,   124,   124,
-     124,   124,   114,   124,   124,   124,   211,   124,   124,   124,
-     114,   124,   214,   214,   107,   124,   127,   179,   124,   210,
-     214,   221,   195,   196,   221,   194,   130,   107,   188,   189,
-     221,   105,   105,   125,   200,     8,     9,    49,    50,    93,
-     163,   164,   165,   166,   202,   221,   180,   173,   146,   151,
-      10,   117,   152,   142,   180,     8,     9,    10,    50,   112,
-     117,   177,   221,   130,   122,   206,   207,   131,   132,   219,
-     104,   214,    10,    50,    76,   112,   117,   122,   143,   167,
-     219,   122,   124,   122,   214,   122,   127,   219,   125,   196,
-     125,    77,    78,    79,    97,   190,   104,   105,     8,   219,
-     130,   219,   166,   219,   114,   105,     8,     9,    10,    50,
-     112,   117,   122,   178,   221,   147,   148,   167,     3,     4,
-       5,     8,    12,    50,    53,    61,    75,    84,    86,    90,
-     112,   116,   120,   122,   126,   169,   170,   176,   180,   216,
-     217,   220,   221,   117,   167,   169,   144,   167,   177,   117,
-     177,   177,   177,   122,   123,   125,   153,   125,   208,   221,
-     104,   105,   122,   104,   174,   175,   214,   221,   106,   117,
-     167,    13,    14,    15,    16,    17,    18,    19,    20,    29,
-      31,    32,    33,    34,    35,    36,    37,    38,    39,    40,
-      41,    42,    51,    75,   105,   108,   110,   111,   112,   113,
-     114,   115,   116,   117,   118,   119,   120,   122,   123,   126,
-     159,   167,   167,   167,   107,   108,   122,   123,   172,   173,
-     221,   212,   212,   169,   105,   108,   125,    93,    97,   198,
-     218,   219,    97,   218,    97,   218,    77,    78,    79,   130,
-     190,   105,   124,   105,   125,   108,   178,   108,   138,   139,
-     160,   161,   165,   117,   178,   178,   178,   178,   108,   123,
-     171,   221,   149,   167,   172,   173,   178,   180,   113,   182,
-     122,   113,   214,   214,   214,   183,   212,   214,   124,    12,
-     105,   178,    13,    14,    15,    16,    17,    18,    19,    20,
-      29,   109,   110,   111,   112,   113,   114,   115,   116,   117,
-     118,   119,   121,   122,   123,   167,   107,   124,   124,   172,
-     173,   122,   177,   156,   210,   169,     3,     4,     5,     6,
-       7,     8,     9,    10,    12,    13,    14,    15,    16,    17,
-      18,    19,    20,    21,    22,    29,    30,    31,    32,    33,
-      34,    35,    36,    37,    38,    39,    40,    41,    42,    45,
-      46,    47,    48,    49,    50,    51,    52,    53,    54,    56,
-      58,    59,    60,    61,    62,    63,    64,    65,    66,    67,
-      68,    69,    73,    75,    76,    77,    78,    79,    80,    81,
-      82,    83,    84,    85,    86,    87,    89,    90,    91,    92,
-      93,    94,    95,    97,    98,    99,   100,   104,   105,   106,
-     107,   108,   109,   110,   111,   112,   113,   114,   115,   116,
-     117,   118,   119,   120,   121,   122,   123,   124,   126,   127,
-     209,   206,   132,   211,   174,   125,   105,   167,   124,   127,
-     124,     4,   214,   168,   210,   105,   124,   124,   124,   214,
-     219,   218,   219,   218,   218,   218,   218,   218,   125,     8,
-     106,   219,   183,   171,   183,   178,   124,    53,    84,    86,
-     112,   116,   117,   120,   122,   126,   213,   215,   210,   172,
-     173,   105,   108,   172,   178,   183,   122,   183,   183,   124,
-     124,    50,   158,   221,    12,   176,   172,   214,   214,   214,
-     214,   214,   214,   214,   214,   214,   214,   214,   214,   214,
-     214,   214,   214,   214,   214,   214,   214,   214,   124,   212,
-     214,   124,   122,   158,   105,   157,   169,   127,   124,   208,
-     125,   124,   125,   104,   214,   169,   127,   143,   158,   105,
-     124,   124,   122,   113,   122,   113,   213,   213,   213,   213,
-     183,   212,   213,    13,    14,    15,    16,    17,    18,    19,
-      20,    29,   109,   110,   111,   112,   115,   116,   117,   118,
-     119,   121,   122,   123,   127,   105,   148,   214,   172,   114,
-     211,   124,   114,   214,    89,   107,   124,   127,   122,   154,
-     144,   169,   124,   158,   125,   174,   124,   106,   106,   169,
-     183,   183,   183,   124,   124,   213,   213,   213,   213,   213,
-     213,   213,   213,   213,   213,   213,   213,   213,   213,   213,
-     213,   213,   213,   213,   124,   212,   214,   149,   122,   124,
-     122,   122,   214,   155,   169,   124,   158,   125,   158,   124,
-     114,   124,   114,   213,   107,   124,   127,   212,   212,   124,
-     219,   169,   124,   158,   158,   122,   122,   213,   124,   124,
-     124,   124,   158,   212,   212,   158,   124,   124
+     214,   214,   214,   125,   213,   215,   150,   123,   125,   123,
+     123,   215,   156,   170,   125,   159,   126,   159,   125,   115,
+     125,   115,   214,   108,   125,   128,   213,   213,   125,   220,
+     170,   125,   159,   159,   123,   123,   214,   125,   125,   125,
+     125,   159,   213,   213,   159,   125,   125
 };
 
 #define yyerrok		(yyerrstatus = 0)
@@ -3307,7 +3329,7 @@ yyreduce:
     {
         case 3:
 /* Line 1792 of yacc.c  */
-#line 385 "dtool/src/cppparser/cppBison.yxx"
+#line 386 "dtool/src/cppparser/cppBison.yxx"
     {
   current_expr = (yyvsp[(2) - (2)].u.expr);
 }
@@ -3315,7 +3337,7 @@ yyreduce:
 
   case 4:
 /* Line 1792 of yacc.c  */
-#line 389 "dtool/src/cppparser/cppBison.yxx"
+#line 390 "dtool/src/cppparser/cppBison.yxx"
     {
   current_type = (yyvsp[(2) - (2)].u.type);
 }
@@ -3323,7 +3345,7 @@ yyreduce:
 
   case 10:
 /* Line 1792 of yacc.c  */
-#line 407 "dtool/src/cppparser/cppBison.yxx"
+#line 408 "dtool/src/cppparser/cppBison.yxx"
     {
   delete (yyvsp[(3) - (4)].u.expr);
 }
@@ -3331,16 +3353,16 @@ yyreduce:
 
   case 11:
 /* Line 1792 of yacc.c  */
-#line 419 "dtool/src/cppparser/cppBison.yxx"
+#line 420 "dtool/src/cppparser/cppBison.yxx"
     {
-  push_storage_class((current_storage_class & ~CPPInstance::SC_c_binding) | 
+  push_storage_class((current_storage_class & ~CPPInstance::SC_c_binding) |
                      ((yyvsp[(1) - (2)].u.integer) & CPPInstance::SC_c_binding));
 }
     break;
 
   case 12:
 /* Line 1792 of yacc.c  */
-#line 424 "dtool/src/cppparser/cppBison.yxx"
+#line 425 "dtool/src/cppparser/cppBison.yxx"
     {
   pop_storage_class();
 }
@@ -3348,7 +3370,7 @@ yyreduce:
 
   case 20:
 /* Line 1792 of yacc.c  */
-#line 438 "dtool/src/cppparser/cppBison.yxx"
+#line 439 "dtool/src/cppparser/cppBison.yxx"
     {
   if (publish_nest_level != 0) {
     yyerror("Unclosed __begin_publish", publish_loc);
@@ -3365,7 +3387,7 @@ yyreduce:
 
   case 21:
 /* Line 1792 of yacc.c  */
-#line 451 "dtool/src/cppparser/cppBison.yxx"
+#line 452 "dtool/src/cppparser/cppBison.yxx"
     {
   if (publish_nest_level != 1) {
     yyerror("Unmatched __end_publish", (yylsp[(1) - (1)]));
@@ -3378,7 +3400,7 @@ yyreduce:
 
   case 22:
 /* Line 1792 of yacc.c  */
-#line 460 "dtool/src/cppparser/cppBison.yxx"
+#line 461 "dtool/src/cppparser/cppBison.yxx"
     {
   current_scope->set_current_vis(V_published);
 }
@@ -3386,7 +3408,7 @@ yyreduce:
 
   case 23:
 /* Line 1792 of yacc.c  */
-#line 464 "dtool/src/cppparser/cppBison.yxx"
+#line 465 "dtool/src/cppparser/cppBison.yxx"
     {
   if (publish_nest_level > 0) {
     current_scope->set_current_vis(V_published);
@@ -3398,7 +3420,7 @@ yyreduce:
 
   case 24:
 /* Line 1792 of yacc.c  */
-#line 472 "dtool/src/cppparser/cppBison.yxx"
+#line 473 "dtool/src/cppparser/cppBison.yxx"
     {
   current_scope->set_current_vis(V_protected);
 }
@@ -3406,7 +3428,7 @@ yyreduce:
 
   case 25:
 /* Line 1792 of yacc.c  */
-#line 476 "dtool/src/cppparser/cppBison.yxx"
+#line 477 "dtool/src/cppparser/cppBison.yxx"
     {
   current_scope->set_current_vis(V_private);
 }
@@ -3414,7 +3436,7 @@ yyreduce:
 
   case 26:
 /* Line 1792 of yacc.c  */
-#line 480 "dtool/src/cppparser/cppBison.yxx"
+#line 481 "dtool/src/cppparser/cppBison.yxx"
     {
 
   CPPDeclaration *getter = (yyvsp[(5) - (7)].u.identifier)->find_symbol(current_scope, global_scope, current_lexer);
@@ -3429,7 +3451,7 @@ yyreduce:
 
   case 27:
 /* Line 1792 of yacc.c  */
-#line 491 "dtool/src/cppparser/cppBison.yxx"
+#line 492 "dtool/src/cppparser/cppBison.yxx"
     {
   CPPDeclaration *getter = (yyvsp[(5) - (9)].u.identifier)->find_symbol(current_scope, global_scope, current_lexer);
   if (getter == (CPPDeclaration *)NULL || getter->get_subtype() != CPPDeclaration::ST_function_group) {
@@ -3450,7 +3472,7 @@ yyreduce:
 
   case 28:
 /* Line 1792 of yacc.c  */
-#line 508 "dtool/src/cppparser/cppBison.yxx"
+#line 509 "dtool/src/cppparser/cppBison.yxx"
     {
   CPPMakeSeq *make_seq = new CPPMakeSeq((yyvsp[(3) - (9)].u.identifier)->get_simple_name(), (yyvsp[(5) - (9)].u.identifier)->get_simple_name(), (yyvsp[(7) - (9)].u.identifier)->get_simple_name(), (yylsp[(1) - (9)]).file);
   current_scope->add_declaration(make_seq, global_scope, current_lexer, (yylsp[(1) - (9)]));
@@ -3459,7 +3481,7 @@ yyreduce:
 
   case 29:
 /* Line 1792 of yacc.c  */
-#line 516 "dtool/src/cppparser/cppBison.yxx"
+#line 517 "dtool/src/cppparser/cppBison.yxx"
     {
   CPPScope *new_scope = new CPPScope(current_scope, CPPNameComponent("temp"),
                                      V_public);
@@ -3469,7 +3491,7 @@ yyreduce:
 
   case 30:
 /* Line 1792 of yacc.c  */
-#line 522 "dtool/src/cppparser/cppBison.yxx"
+#line 523 "dtool/src/cppparser/cppBison.yxx"
     {
   delete current_scope;
   pop_scope();
@@ -3478,7 +3500,7 @@ yyreduce:
 
   case 31:
 /* Line 1792 of yacc.c  */
-#line 531 "dtool/src/cppparser/cppBison.yxx"
+#line 532 "dtool/src/cppparser/cppBison.yxx"
     {
   (yyval.u.integer) = 0;
 }
@@ -3486,7 +3508,7 @@ yyreduce:
 
   case 32:
 /* Line 1792 of yacc.c  */
-#line 535 "dtool/src/cppparser/cppBison.yxx"
+#line 536 "dtool/src/cppparser/cppBison.yxx"
     {
   (yyval.u.integer) = (yyvsp[(1) - (2)].u.integer) | (int)CPPInstance::SC_extern;
 }
@@ -3494,7 +3516,7 @@ yyreduce:
 
   case 33:
 /* Line 1792 of yacc.c  */
-#line 539 "dtool/src/cppparser/cppBison.yxx"
+#line 540 "dtool/src/cppparser/cppBison.yxx"
     {
   (yyval.u.integer) = (yyvsp[(1) - (3)].u.integer) | (int)CPPInstance::SC_extern;
   if ((yyvsp[(3) - (3)].str) == "C") {
@@ -3509,7 +3531,7 @@ yyreduce:
 
   case 34:
 /* Line 1792 of yacc.c  */
-#line 550 "dtool/src/cppparser/cppBison.yxx"
+#line 551 "dtool/src/cppparser/cppBison.yxx"
     {
   (yyval.u.integer) = (yyvsp[(1) - (2)].u.integer) | (int)CPPInstance::SC_static;
 }
@@ -3517,7 +3539,7 @@ yyreduce:
 
   case 35:
 /* Line 1792 of yacc.c  */
-#line 554 "dtool/src/cppparser/cppBison.yxx"
+#line 555 "dtool/src/cppparser/cppBison.yxx"
     {
   (yyval.u.integer) = (yyvsp[(1) - (2)].u.integer) | (int)CPPInstance::SC_inline;
 }
@@ -3525,7 +3547,7 @@ yyreduce:
 
   case 36:
 /* Line 1792 of yacc.c  */
-#line 558 "dtool/src/cppparser/cppBison.yxx"
+#line 559 "dtool/src/cppparser/cppBison.yxx"
     {
   (yyval.u.integer) = (yyvsp[(1) - (2)].u.integer) | (int)CPPInstance::SC_virtual;
 }
@@ -3533,7 +3555,7 @@ yyreduce:
 
   case 37:
 /* Line 1792 of yacc.c  */
-#line 562 "dtool/src/cppparser/cppBison.yxx"
+#line 563 "dtool/src/cppparser/cppBison.yxx"
     {
   (yyval.u.integer) = (yyvsp[(1) - (2)].u.integer) | (int)CPPInstance::SC_explicit;
 }
@@ -3541,7 +3563,7 @@ yyreduce:
 
   case 38:
 /* Line 1792 of yacc.c  */
-#line 566 "dtool/src/cppparser/cppBison.yxx"
+#line 567 "dtool/src/cppparser/cppBison.yxx"
     {
   (yyval.u.integer) = (yyvsp[(1) - (2)].u.integer) | (int)CPPInstance::SC_volatile;
 }
@@ -3549,7 +3571,7 @@ yyreduce:
 
   case 39:
 /* Line 1792 of yacc.c  */
-#line 570 "dtool/src/cppparser/cppBison.yxx"
+#line 571 "dtool/src/cppparser/cppBison.yxx"
     {
   (yyval.u.integer) = (yyvsp[(1) - (2)].u.integer) | (int)CPPInstance::SC_mutable;
 }
@@ -3557,7 +3579,7 @@ yyreduce:
 
   case 40:
 /* Line 1792 of yacc.c  */
-#line 574 "dtool/src/cppparser/cppBison.yxx"
+#line 575 "dtool/src/cppparser/cppBison.yxx"
     {
   (yyval.u.integer) = (yyvsp[(1) - (2)].u.integer) | (int)CPPInstance::SC_register;
 }
@@ -3565,7 +3587,7 @@ yyreduce:
 
   case 41:
 /* Line 1792 of yacc.c  */
-#line 578 "dtool/src/cppparser/cppBison.yxx"
+#line 579 "dtool/src/cppparser/cppBison.yxx"
     {
   (yyval.u.integer) = (yyvsp[(1) - (2)].u.integer) | (int)CPPInstance::SC_blocking;
 }
@@ -3573,7 +3595,7 @@ yyreduce:
 
   case 42:
 /* Line 1792 of yacc.c  */
-#line 582 "dtool/src/cppparser/cppBison.yxx"
+#line 583 "dtool/src/cppparser/cppBison.yxx"
     {
   (yyval.u.integer) = (yyvsp[(1) - (2)].u.integer) | (int)CPPInstance::SC_extension;
 }
@@ -3581,7 +3603,7 @@ yyreduce:
 
   case 43:
 /* Line 1792 of yacc.c  */
-#line 589 "dtool/src/cppparser/cppBison.yxx"
+#line 590 "dtool/src/cppparser/cppBison.yxx"
     {
   /* multiple_var_declaration adds itself to the scope. */
 }
@@ -3589,7 +3611,7 @@ yyreduce:
 
   case 44:
 /* Line 1792 of yacc.c  */
-#line 593 "dtool/src/cppparser/cppBison.yxx"
+#line 594 "dtool/src/cppparser/cppBison.yxx"
     {
   // We don't really care about the storage class here.  In fact, it's
   // not actually legal to define a class or struct using a particular
@@ -3602,7 +3624,7 @@ yyreduce:
 
   case 45:
 /* Line 1792 of yacc.c  */
-#line 602 "dtool/src/cppparser/cppBison.yxx"
+#line 603 "dtool/src/cppparser/cppBison.yxx"
     {
   if ((yyvsp[(2) - (3)].u.instance) != (CPPInstance *)NULL) {
     (yyvsp[(2) - (3)].u.instance)->_storage_class |= (current_storage_class | (yyvsp[(1) - (3)].u.integer));
@@ -3614,7 +3636,7 @@ yyreduce:
 
   case 46:
 /* Line 1792 of yacc.c  */
-#line 613 "dtool/src/cppparser/cppBison.yxx"
+#line 614 "dtool/src/cppparser/cppBison.yxx"
     {
   // We don't need to push/pop type, because we can't nest
   // multiple_var_declarations.
@@ -3629,7 +3651,7 @@ yyreduce:
 
   case 47:
 /* Line 1792 of yacc.c  */
-#line 624 "dtool/src/cppparser/cppBison.yxx"
+#line 625 "dtool/src/cppparser/cppBison.yxx"
     {
   pop_storage_class();
 }
@@ -3637,7 +3659,7 @@ yyreduce:
 
   case 48:
 /* Line 1792 of yacc.c  */
-#line 628 "dtool/src/cppparser/cppBison.yxx"
+#line 629 "dtool/src/cppparser/cppBison.yxx"
     {
   // We don't need to push/pop type, because we can't nest
   // multiple_var_declarations.
@@ -3648,7 +3670,7 @@ yyreduce:
 
   case 49:
 /* Line 1792 of yacc.c  */
-#line 635 "dtool/src/cppparser/cppBison.yxx"
+#line 636 "dtool/src/cppparser/cppBison.yxx"
     {
   pop_storage_class();
 }
@@ -3656,7 +3678,7 @@ yyreduce:
 
   case 50:
 /* Line 1792 of yacc.c  */
-#line 646 "dtool/src/cppparser/cppBison.yxx"
+#line 647 "dtool/src/cppparser/cppBison.yxx"
     {
   CPPInstance *inst = new CPPInstance(current_type, (yyvsp[(1) - (2)].u.inst_ident),
                                       current_storage_class,
@@ -3668,7 +3690,7 @@ yyreduce:
 
   case 51:
 /* Line 1792 of yacc.c  */
-#line 654 "dtool/src/cppparser/cppBison.yxx"
+#line 655 "dtool/src/cppparser/cppBison.yxx"
     {
   CPPInstance *inst = new CPPInstance(current_type, (yyvsp[(1) - (4)].u.inst_ident),
                                       current_storage_class,
@@ -3680,7 +3702,7 @@ yyreduce:
 
   case 52:
 /* Line 1792 of yacc.c  */
-#line 665 "dtool/src/cppparser/cppBison.yxx"
+#line 666 "dtool/src/cppparser/cppBison.yxx"
     {
   (yyvsp[(1) - (2)].u.inst_ident)->add_modifier(IIT_const);
   CPPInstance *inst = new CPPInstance(current_type, (yyvsp[(1) - (2)].u.inst_ident),
@@ -3693,7 +3715,7 @@ yyreduce:
 
   case 53:
 /* Line 1792 of yacc.c  */
-#line 674 "dtool/src/cppparser/cppBison.yxx"
+#line 675 "dtool/src/cppparser/cppBison.yxx"
     {
   (yyvsp[(1) - (4)].u.inst_ident)->add_modifier(IIT_const);
   CPPInstance *inst = new CPPInstance(current_type, (yyvsp[(1) - (4)].u.inst_ident),
@@ -3706,7 +3728,7 @@ yyreduce:
 
   case 54:
 /* Line 1792 of yacc.c  */
-#line 687 "dtool/src/cppparser/cppBison.yxx"
+#line 688 "dtool/src/cppparser/cppBison.yxx"
     {
   // We don't need to push/pop type, because we can't nest
   // multiple_var_declarations.
@@ -3721,7 +3743,7 @@ yyreduce:
 
   case 55:
 /* Line 1792 of yacc.c  */
-#line 698 "dtool/src/cppparser/cppBison.yxx"
+#line 699 "dtool/src/cppparser/cppBison.yxx"
     {
   pop_storage_class();
 }
@@ -3729,7 +3751,7 @@ yyreduce:
 
   case 56:
 /* Line 1792 of yacc.c  */
-#line 702 "dtool/src/cppparser/cppBison.yxx"
+#line 703 "dtool/src/cppparser/cppBison.yxx"
     {
   // We don't need to push/pop type, because we can't nest
   // multiple_var_declarations.
@@ -3740,7 +3762,7 @@ yyreduce:
 
   case 57:
 /* Line 1792 of yacc.c  */
-#line 709 "dtool/src/cppparser/cppBison.yxx"
+#line 710 "dtool/src/cppparser/cppBison.yxx"
     {
   pop_storage_class();
 }
@@ -3748,7 +3770,7 @@ yyreduce:
 
   case 58:
 /* Line 1792 of yacc.c  */
-#line 713 "dtool/src/cppparser/cppBison.yxx"
+#line 714 "dtool/src/cppparser/cppBison.yxx"
     {
   if ((yyvsp[(2) - (3)].u.instance) != (CPPDeclaration *)NULL) {
     CPPInstance *inst = (yyvsp[(2) - (3)].u.instance)->as_instance();
@@ -3763,7 +3785,7 @@ yyreduce:
 
   case 59:
 /* Line 1792 of yacc.c  */
-#line 727 "dtool/src/cppparser/cppBison.yxx"
+#line 728 "dtool/src/cppparser/cppBison.yxx"
     {
   CPPInstance *inst = new CPPInstance(current_type, (yyvsp[(1) - (2)].u.inst_ident),
                                       current_storage_class,
@@ -3775,7 +3797,7 @@ yyreduce:
 
   case 60:
 /* Line 1792 of yacc.c  */
-#line 735 "dtool/src/cppparser/cppBison.yxx"
+#line 736 "dtool/src/cppparser/cppBison.yxx"
     {
   CPPInstance *inst = new CPPInstance(current_type, (yyvsp[(1) - (4)].u.inst_ident),
                                       current_storage_class,
@@ -3787,7 +3809,7 @@ yyreduce:
 
   case 61:
 /* Line 1792 of yacc.c  */
-#line 746 "dtool/src/cppparser/cppBison.yxx"
+#line 747 "dtool/src/cppparser/cppBison.yxx"
     {
   (yyvsp[(1) - (2)].u.inst_ident)->add_modifier(IIT_const);
   CPPInstance *inst = new CPPInstance(current_type, (yyvsp[(1) - (2)].u.inst_ident),
@@ -3800,7 +3822,7 @@ yyreduce:
 
   case 62:
 /* Line 1792 of yacc.c  */
-#line 755 "dtool/src/cppparser/cppBison.yxx"
+#line 756 "dtool/src/cppparser/cppBison.yxx"
     {
   (yyvsp[(1) - (4)].u.inst_ident)->add_modifier(IIT_const);
   CPPInstance *inst = new CPPInstance(current_type, (yyvsp[(1) - (4)].u.inst_ident),
@@ -3813,7 +3835,7 @@ yyreduce:
 
   case 63:
 /* Line 1792 of yacc.c  */
-#line 769 "dtool/src/cppparser/cppBison.yxx"
+#line 770 "dtool/src/cppparser/cppBison.yxx"
     {
   push_scope((yyvsp[(1) - (2)].u.identifier)->get_scope(current_scope, global_scope));
 }
@@ -3821,7 +3843,7 @@ yyreduce:
 
   case 64:
 /* Line 1792 of yacc.c  */
-#line 773 "dtool/src/cppparser/cppBison.yxx"
+#line 774 "dtool/src/cppparser/cppBison.yxx"
     {
   pop_scope();
   CPPType *type;
@@ -3843,7 +3865,7 @@ yyreduce:
 
   case 65:
 /* Line 1792 of yacc.c  */
-#line 791 "dtool/src/cppparser/cppBison.yxx"
+#line 792 "dtool/src/cppparser/cppBison.yxx"
     {
   push_scope((yyvsp[(1) - (2)].u.identifier)->get_scope(current_scope, global_scope));
 }
@@ -3851,7 +3873,7 @@ yyreduce:
 
   case 66:
 /* Line 1792 of yacc.c  */
-#line 795 "dtool/src/cppparser/cppBison.yxx"
+#line 796 "dtool/src/cppparser/cppBison.yxx"
     {
   pop_scope();
   CPPType *type;
@@ -3873,7 +3895,7 @@ yyreduce:
 
   case 67:
 /* Line 1792 of yacc.c  */
-#line 815 "dtool/src/cppparser/cppBison.yxx"
+#line 816 "dtool/src/cppparser/cppBison.yxx"
     {
   push_scope((yyvsp[(2) - (3)].u.identifier)->get_scope(current_scope, global_scope));
 }
@@ -3881,19 +3903,19 @@ yyreduce:
 
   case 68:
 /* Line 1792 of yacc.c  */
-#line 819 "dtool/src/cppparser/cppBison.yxx"
+#line 820 "dtool/src/cppparser/cppBison.yxx"
     {
   pop_scope();
   if ((yyvsp[(2) - (7)].u.identifier)->is_scoped()) {
     yyerror("Invalid destructor name: ~" + (yyvsp[(2) - (7)].u.identifier)->get_fully_scoped_name(), (yylsp[(2) - (7)]));
   } else {
-    CPPIdentifier *ident = 
+    CPPIdentifier *ident =
       new CPPIdentifier("~" + (yyvsp[(2) - (7)].u.identifier)->get_simple_name(), (yylsp[(2) - (7)]).file);
     delete (yyvsp[(2) - (7)].u.identifier);
 
     CPPType *type;
     type = new CPPSimpleType(CPPSimpleType::T_void);
-    
+
     CPPInstanceIdentifier *ii = new CPPInstanceIdentifier(ident);
     ii->add_func_modifier((yyvsp[(5) - (7)].u.param_list), (yyvsp[(7) - (7)].u.integer));
 
@@ -3904,7 +3926,7 @@ yyreduce:
 
   case 69:
 /* Line 1792 of yacc.c  */
-#line 845 "dtool/src/cppparser/cppBison.yxx"
+#line 846 "dtool/src/cppparser/cppBison.yxx"
     {
   push_scope((yyvsp[(4) - (6)].u.inst_ident)->get_scope(current_scope, global_scope));
 }
@@ -3912,7 +3934,7 @@ yyreduce:
 
   case 70:
 /* Line 1792 of yacc.c  */
-#line 849 "dtool/src/cppparser/cppBison.yxx"
+#line 850 "dtool/src/cppparser/cppBison.yxx"
     {
   pop_scope();
   CPPType *type = (yyvsp[(1) - (10)].u.identifier)->find_type(current_scope, global_scope, false, current_lexer);
@@ -3927,7 +3949,7 @@ yyreduce:
 
   case 71:
 /* Line 1792 of yacc.c  */
-#line 860 "dtool/src/cppparser/cppBison.yxx"
+#line 861 "dtool/src/cppparser/cppBison.yxx"
     {
   push_scope((yyvsp[(5) - (7)].u.inst_ident)->get_scope(current_scope, global_scope));
 }
@@ -3935,7 +3957,7 @@ yyreduce:
 
   case 72:
 /* Line 1792 of yacc.c  */
-#line 864 "dtool/src/cppparser/cppBison.yxx"
+#line 865 "dtool/src/cppparser/cppBison.yxx"
     {
   pop_scope();
   CPPType *type = (yyvsp[(1) - (11)].u.identifier)->find_type(current_scope, global_scope, false, current_lexer);
@@ -3950,7 +3972,7 @@ yyreduce:
 
   case 73:
 /* Line 1792 of yacc.c  */
-#line 877 "dtool/src/cppparser/cppBison.yxx"
+#line 878 "dtool/src/cppparser/cppBison.yxx"
     {
   if ((yyvsp[(1) - (4)].u.identifier) != NULL) {
     push_scope((yyvsp[(1) - (4)].u.identifier)->get_scope(current_scope, global_scope));
@@ -3960,7 +3982,7 @@ yyreduce:
 
   case 74:
 /* Line 1792 of yacc.c  */
-#line 883 "dtool/src/cppparser/cppBison.yxx"
+#line 884 "dtool/src/cppparser/cppBison.yxx"
     {
   if ((yyvsp[(1) - (8)].u.identifier) != NULL) {
     pop_scope();
@@ -3989,7 +4011,7 @@ yyreduce:
 
   case 75:
 /* Line 1792 of yacc.c  */
-#line 908 "dtool/src/cppparser/cppBison.yxx"
+#line 909 "dtool/src/cppparser/cppBison.yxx"
     {
   if ((yyvsp[(1) - (5)].u.identifier) != NULL) {
     push_scope((yyvsp[(1) - (5)].u.identifier)->get_scope(current_scope, global_scope));
@@ -3999,7 +4021,7 @@ yyreduce:
 
   case 76:
 /* Line 1792 of yacc.c  */
-#line 914 "dtool/src/cppparser/cppBison.yxx"
+#line 915 "dtool/src/cppparser/cppBison.yxx"
     {
   if ((yyvsp[(1) - (9)].u.identifier) != NULL) {
     pop_scope();
@@ -4019,9 +4041,9 @@ yyreduce:
 
   case 77:
 /* Line 1792 of yacc.c  */
-#line 934 "dtool/src/cppparser/cppBison.yxx"
+#line 935 "dtool/src/cppparser/cppBison.yxx"
     {
-  CPPDeclaration *decl = 
+  CPPDeclaration *decl =
     (yyvsp[(1) - (1)].u.identifier)->find_symbol(current_scope, global_scope, current_lexer);
   if (decl != (CPPDeclaration *)NULL) {
     (yyval.u.instance) = decl->as_instance();
@@ -4033,7 +4055,7 @@ yyreduce:
 
   case 78:
 /* Line 1792 of yacc.c  */
-#line 947 "dtool/src/cppparser/cppBison.yxx"
+#line 948 "dtool/src/cppparser/cppBison.yxx"
     {
   (yyval.u.integer) = 0;
 }
@@ -4041,7 +4063,7 @@ yyreduce:
 
   case 79:
 /* Line 1792 of yacc.c  */
-#line 951 "dtool/src/cppparser/cppBison.yxx"
+#line 952 "dtool/src/cppparser/cppBison.yxx"
     {
   (yyval.u.integer) = (int)CPPFunctionType::F_const_method;
 }
@@ -4049,351 +4071,359 @@ yyreduce:
 
   case 80:
 /* Line 1792 of yacc.c  */
-#line 955 "dtool/src/cppparser/cppBison.yxx"
+#line 956 "dtool/src/cppparser/cppBison.yxx"
     {
-  (yyval.u.integer) = (yyvsp[(1) - (4)].u.integer);
+  (yyval.u.integer) = (int)CPPFunctionType::F_noexcept;
 }
     break;
 
   case 81:
 /* Line 1792 of yacc.c  */
-#line 959 "dtool/src/cppparser/cppBison.yxx"
+#line 960 "dtool/src/cppparser/cppBison.yxx"
     {
-  (yyval.u.integer) = (yyvsp[(1) - (5)].u.integer);
+  (yyval.u.integer) = (yyvsp[(1) - (4)].u.integer);
 }
     break;
 
   case 82:
 /* Line 1792 of yacc.c  */
-#line 966 "dtool/src/cppparser/cppBison.yxx"
+#line 964 "dtool/src/cppparser/cppBison.yxx"
     {
-  (yyval.str) = "!";
+  (yyval.u.integer) = (yyvsp[(1) - (5)].u.integer);
 }
     break;
 
   case 83:
 /* Line 1792 of yacc.c  */
-#line 970 "dtool/src/cppparser/cppBison.yxx"
+#line 971 "dtool/src/cppparser/cppBison.yxx"
     {
-  (yyval.str) = "~";
+  (yyval.str) = "!";
 }
     break;
 
   case 84:
 /* Line 1792 of yacc.c  */
-#line 974 "dtool/src/cppparser/cppBison.yxx"
+#line 975 "dtool/src/cppparser/cppBison.yxx"
     {
-  (yyval.str) = "*";
+  (yyval.str) = "~";
 }
     break;
 
   case 85:
 /* Line 1792 of yacc.c  */
-#line 978 "dtool/src/cppparser/cppBison.yxx"
+#line 979 "dtool/src/cppparser/cppBison.yxx"
     {
-  (yyval.str) = "/";
+  (yyval.str) = "*";
 }
     break;
 
   case 86:
 /* Line 1792 of yacc.c  */
-#line 982 "dtool/src/cppparser/cppBison.yxx"
+#line 983 "dtool/src/cppparser/cppBison.yxx"
     {
-  (yyval.str) = "%";
+  (yyval.str) = "/";
 }
     break;
 
   case 87:
 /* Line 1792 of yacc.c  */
-#line 986 "dtool/src/cppparser/cppBison.yxx"
+#line 987 "dtool/src/cppparser/cppBison.yxx"
     {
-  (yyval.str) = "+";
+  (yyval.str) = "%";
 }
     break;
 
   case 88:
 /* Line 1792 of yacc.c  */
-#line 990 "dtool/src/cppparser/cppBison.yxx"
+#line 991 "dtool/src/cppparser/cppBison.yxx"
     {
-  (yyval.str) = "-";
+  (yyval.str) = "+";
 }
     break;
 
   case 89:
 /* Line 1792 of yacc.c  */
-#line 994 "dtool/src/cppparser/cppBison.yxx"
+#line 995 "dtool/src/cppparser/cppBison.yxx"
     {
-  (yyval.str) = "|";
+  (yyval.str) = "-";
 }
     break;
 
   case 90:
 /* Line 1792 of yacc.c  */
-#line 998 "dtool/src/cppparser/cppBison.yxx"
+#line 999 "dtool/src/cppparser/cppBison.yxx"
     {
-  (yyval.str) = "&";
+  (yyval.str) = "|";
 }
     break;
 
   case 91:
 /* Line 1792 of yacc.c  */
-#line 1002 "dtool/src/cppparser/cppBison.yxx"
+#line 1003 "dtool/src/cppparser/cppBison.yxx"
     {
-  (yyval.str) = "^";
+  (yyval.str) = "&";
 }
     break;
 
   case 92:
 /* Line 1792 of yacc.c  */
-#line 1006 "dtool/src/cppparser/cppBison.yxx"
+#line 1007 "dtool/src/cppparser/cppBison.yxx"
     {
-  (yyval.str) = "||";
+  (yyval.str) = "^";
 }
     break;
 
   case 93:
 /* Line 1792 of yacc.c  */
-#line 1010 "dtool/src/cppparser/cppBison.yxx"
+#line 1011 "dtool/src/cppparser/cppBison.yxx"
     {
-  (yyval.str) = "&&";
+  (yyval.str) = "||";
 }
     break;
 
   case 94:
 /* Line 1792 of yacc.c  */
-#line 1014 "dtool/src/cppparser/cppBison.yxx"
+#line 1015 "dtool/src/cppparser/cppBison.yxx"
     {
-  (yyval.str) = "==";
+  (yyval.str) = "&&";
 }
     break;
 
   case 95:
 /* Line 1792 of yacc.c  */
-#line 1018 "dtool/src/cppparser/cppBison.yxx"
+#line 1019 "dtool/src/cppparser/cppBison.yxx"
     {
-  (yyval.str) = "!=";
+  (yyval.str) = "==";
 }
     break;
 
   case 96:
 /* Line 1792 of yacc.c  */
-#line 1022 "dtool/src/cppparser/cppBison.yxx"
+#line 1023 "dtool/src/cppparser/cppBison.yxx"
     {
-  (yyval.str) = "<=";
+  (yyval.str) = "!=";
 }
     break;
 
   case 97:
 /* Line 1792 of yacc.c  */
-#line 1026 "dtool/src/cppparser/cppBison.yxx"
+#line 1027 "dtool/src/cppparser/cppBison.yxx"
     {
-  (yyval.str) = ">=";
+  (yyval.str) = "<=";
 }
     break;
 
   case 98:
 /* Line 1792 of yacc.c  */
-#line 1030 "dtool/src/cppparser/cppBison.yxx"
+#line 1031 "dtool/src/cppparser/cppBison.yxx"
     {
-  (yyval.str) = "<";
+  (yyval.str) = ">=";
 }
     break;
 
   case 99:
 /* Line 1792 of yacc.c  */
-#line 1034 "dtool/src/cppparser/cppBison.yxx"
+#line 1035 "dtool/src/cppparser/cppBison.yxx"
     {
-  (yyval.str) = ">";
+  (yyval.str) = "<";
 }
     break;
 
   case 100:
 /* Line 1792 of yacc.c  */
-#line 1038 "dtool/src/cppparser/cppBison.yxx"
+#line 1039 "dtool/src/cppparser/cppBison.yxx"
     {
-  (yyval.str) = "<<";
+  (yyval.str) = ">";
 }
     break;
 
   case 101:
 /* Line 1792 of yacc.c  */
-#line 1042 "dtool/src/cppparser/cppBison.yxx"
+#line 1043 "dtool/src/cppparser/cppBison.yxx"
     {
-  (yyval.str) = ">>";
+  (yyval.str) = "<<";
 }
     break;
 
   case 102:
 /* Line 1792 of yacc.c  */
-#line 1046 "dtool/src/cppparser/cppBison.yxx"
+#line 1047 "dtool/src/cppparser/cppBison.yxx"
     {
-  (yyval.str) = "=";
+  (yyval.str) = ">>";
 }
     break;
 
   case 103:
 /* Line 1792 of yacc.c  */
-#line 1050 "dtool/src/cppparser/cppBison.yxx"
+#line 1051 "dtool/src/cppparser/cppBison.yxx"
     {
-  (yyval.str) = ",";
+  (yyval.str) = "=";
 }
     break;
 
   case 104:
 /* Line 1792 of yacc.c  */
-#line 1054 "dtool/src/cppparser/cppBison.yxx"
+#line 1055 "dtool/src/cppparser/cppBison.yxx"
     {
-  (yyval.str) = "++";
+  (yyval.str) = ",";
 }
     break;
 
   case 105:
 /* Line 1792 of yacc.c  */
-#line 1058 "dtool/src/cppparser/cppBison.yxx"
+#line 1059 "dtool/src/cppparser/cppBison.yxx"
     {
-  (yyval.str) = "--";
+  (yyval.str) = "++";
 }
     break;
 
   case 106:
 /* Line 1792 of yacc.c  */
-#line 1062 "dtool/src/cppparser/cppBison.yxx"
+#line 1063 "dtool/src/cppparser/cppBison.yxx"
     {
-  (yyval.str) = "*=";
+  (yyval.str) = "--";
 }
     break;
 
   case 107:
 /* Line 1792 of yacc.c  */
-#line 1066 "dtool/src/cppparser/cppBison.yxx"
+#line 1067 "dtool/src/cppparser/cppBison.yxx"
     {
-  (yyval.str) = "/=";
+  (yyval.str) = "*=";
 }
     break;
 
   case 108:
 /* Line 1792 of yacc.c  */
-#line 1070 "dtool/src/cppparser/cppBison.yxx"
+#line 1071 "dtool/src/cppparser/cppBison.yxx"
     {
-  (yyval.str) = "%=";
+  (yyval.str) = "/=";
 }
     break;
 
   case 109:
 /* Line 1792 of yacc.c  */
-#line 1074 "dtool/src/cppparser/cppBison.yxx"
+#line 1075 "dtool/src/cppparser/cppBison.yxx"
     {
-  (yyval.str) = "+=";
+  (yyval.str) = "%=";
 }
     break;
 
   case 110:
 /* Line 1792 of yacc.c  */
-#line 1078 "dtool/src/cppparser/cppBison.yxx"
+#line 1079 "dtool/src/cppparser/cppBison.yxx"
     {
-  (yyval.str) = "-=";
+  (yyval.str) = "+=";
 }
     break;
 
   case 111:
 /* Line 1792 of yacc.c  */
-#line 1082 "dtool/src/cppparser/cppBison.yxx"
+#line 1083 "dtool/src/cppparser/cppBison.yxx"
     {
-  (yyval.str) = "|=";
+  (yyval.str) = "-=";
 }
     break;
 
   case 112:
 /* Line 1792 of yacc.c  */
-#line 1086 "dtool/src/cppparser/cppBison.yxx"
+#line 1087 "dtool/src/cppparser/cppBison.yxx"
     {
-  (yyval.str) = "&=";
+  (yyval.str) = "|=";
 }
     break;
 
   case 113:
 /* Line 1792 of yacc.c  */
-#line 1090 "dtool/src/cppparser/cppBison.yxx"
+#line 1091 "dtool/src/cppparser/cppBison.yxx"
     {
-  (yyval.str) = "^=";
+  (yyval.str) = "&=";
 }
     break;
 
   case 114:
 /* Line 1792 of yacc.c  */
-#line 1094 "dtool/src/cppparser/cppBison.yxx"
+#line 1095 "dtool/src/cppparser/cppBison.yxx"
     {
-  (yyval.str) = "<<=";
+  (yyval.str) = "^=";
 }
     break;
 
   case 115:
 /* Line 1792 of yacc.c  */
-#line 1098 "dtool/src/cppparser/cppBison.yxx"
+#line 1099 "dtool/src/cppparser/cppBison.yxx"
     {
-  (yyval.str) = ">>=";
+  (yyval.str) = "<<=";
 }
     break;
 
   case 116:
 /* Line 1792 of yacc.c  */
-#line 1102 "dtool/src/cppparser/cppBison.yxx"
+#line 1103 "dtool/src/cppparser/cppBison.yxx"
     {
-  (yyval.str) = "->";
+  (yyval.str) = ">>=";
 }
     break;
 
   case 117:
 /* Line 1792 of yacc.c  */
-#line 1106 "dtool/src/cppparser/cppBison.yxx"
+#line 1107 "dtool/src/cppparser/cppBison.yxx"
     {
-  (yyval.str) = "[]";
+  (yyval.str) = "->";
 }
     break;
 
   case 118:
 /* Line 1792 of yacc.c  */
-#line 1110 "dtool/src/cppparser/cppBison.yxx"
+#line 1111 "dtool/src/cppparser/cppBison.yxx"
     {
-  (yyval.str) = "()";
+  (yyval.str) = "[]";
 }
     break;
 
   case 119:
 /* Line 1792 of yacc.c  */
-#line 1114 "dtool/src/cppparser/cppBison.yxx"
+#line 1115 "dtool/src/cppparser/cppBison.yxx"
     {
-  (yyval.str) = "new";
+  (yyval.str) = "()";
 }
     break;
 
   case 120:
 /* Line 1792 of yacc.c  */
-#line 1118 "dtool/src/cppparser/cppBison.yxx"
+#line 1119 "dtool/src/cppparser/cppBison.yxx"
+    {
+  (yyval.str) = "new";
+}
+    break;
+
+  case 121:
+/* Line 1792 of yacc.c  */
+#line 1123 "dtool/src/cppparser/cppBison.yxx"
     {
   (yyval.str) = "delete";
 }
     break;
 
-  case 123:
+  case 124:
 /* Line 1792 of yacc.c  */
-#line 1130 "dtool/src/cppparser/cppBison.yxx"
+#line 1135 "dtool/src/cppparser/cppBison.yxx"
     {
   push_scope(new CPPTemplateScope(current_scope));
 }
     break;
 
-  case 124:
+  case 125:
 /* Line 1792 of yacc.c  */
-#line 1134 "dtool/src/cppparser/cppBison.yxx"
+#line 1139 "dtool/src/cppparser/cppBison.yxx"
     {
   pop_scope();
 }
     break;
 
-  case 127:
+  case 128:
 /* Line 1792 of yacc.c  */
-#line 1146 "dtool/src/cppparser/cppBison.yxx"
+#line 1151 "dtool/src/cppparser/cppBison.yxx"
     {
   CPPTemplateScope *ts = current_scope->as_template_scope();
   assert(ts != NULL);
@@ -4401,9 +4431,9 @@ yyreduce:
 }
     break;
 
-  case 128:
+  case 129:
 /* Line 1792 of yacc.c  */
-#line 1152 "dtool/src/cppparser/cppBison.yxx"
+#line 1157 "dtool/src/cppparser/cppBison.yxx"
     {
   CPPTemplateScope *ts = current_scope->as_template_scope();
   assert(ts != NULL);
@@ -4411,41 +4441,41 @@ yyreduce:
 }
     break;
 
-  case 129:
-/* Line 1792 of yacc.c  */
-#line 1161 "dtool/src/cppparser/cppBison.yxx"
-    {
-  (yyval.u.decl) = CPPType::new_type(new CPPClassTemplateParameter((yyvsp[(2) - (2)].u.identifier)));
-}
-    break;
-
   case 130:
 /* Line 1792 of yacc.c  */
-#line 1165 "dtool/src/cppparser/cppBison.yxx"
+#line 1166 "dtool/src/cppparser/cppBison.yxx"
     {
-  (yyval.u.decl) = CPPType::new_type(new CPPClassTemplateParameter((yyvsp[(2) - (4)].u.identifier), (yyvsp[(4) - (4)].u.type)));
+  (yyval.u.decl) = CPPType::new_type(new CPPClassTemplateParameter((yyvsp[(2) - (2)].u.identifier)));
 }
     break;
 
   case 131:
 /* Line 1792 of yacc.c  */
-#line 1169 "dtool/src/cppparser/cppBison.yxx"
-    {
-  (yyval.u.decl) = CPPType::new_type(new CPPClassTemplateParameter((yyvsp[(2) - (2)].u.identifier)));
-}
-    break;
-
-  case 132:
-/* Line 1792 of yacc.c  */
-#line 1173 "dtool/src/cppparser/cppBison.yxx"
+#line 1170 "dtool/src/cppparser/cppBison.yxx"
     {
   (yyval.u.decl) = CPPType::new_type(new CPPClassTemplateParameter((yyvsp[(2) - (4)].u.identifier), (yyvsp[(4) - (4)].u.type)));
 }
     break;
 
+  case 132:
+/* Line 1792 of yacc.c  */
+#line 1174 "dtool/src/cppparser/cppBison.yxx"
+    {
+  (yyval.u.decl) = CPPType::new_type(new CPPClassTemplateParameter((yyvsp[(2) - (2)].u.identifier)));
+}
+    break;
+
   case 133:
 /* Line 1792 of yacc.c  */
-#line 1177 "dtool/src/cppparser/cppBison.yxx"
+#line 1178 "dtool/src/cppparser/cppBison.yxx"
+    {
+  (yyval.u.decl) = CPPType::new_type(new CPPClassTemplateParameter((yyvsp[(2) - (4)].u.identifier), (yyvsp[(4) - (4)].u.type)));
+}
+    break;
+
+  case 134:
+/* Line 1792 of yacc.c  */
+#line 1182 "dtool/src/cppparser/cppBison.yxx"
     {
   CPPInstance *inst = new CPPInstance((yyvsp[(1) - (3)].u.type), (yyvsp[(2) - (3)].u.inst_ident), 0, (yylsp[(2) - (3)]).file);
   inst->set_initializer((yyvsp[(3) - (3)].u.expr));
@@ -4453,9 +4483,9 @@ yyreduce:
 }
     break;
 
-  case 134:
+  case 135:
 /* Line 1792 of yacc.c  */
-#line 1183 "dtool/src/cppparser/cppBison.yxx"
+#line 1188 "dtool/src/cppparser/cppBison.yxx"
     {
   (yyvsp[(3) - (4)].u.inst_ident)->add_modifier(IIT_const);
   CPPInstance *inst = new CPPInstance((yyvsp[(2) - (4)].u.type), (yyvsp[(3) - (4)].u.inst_ident), 0, (yylsp[(3) - (4)]).file);
@@ -4464,20 +4494,11 @@ yyreduce:
 }
     break;
 
-  case 135:
-/* Line 1792 of yacc.c  */
-#line 1193 "dtool/src/cppparser/cppBison.yxx"
-    {
-  (yyval.u.type) = CPPType::new_type((yyvsp[(1) - (1)].u.simple_type));
-}
-    break;
-
   case 136:
 /* Line 1792 of yacc.c  */
-#line 1197 "dtool/src/cppparser/cppBison.yxx"
+#line 1198 "dtool/src/cppparser/cppBison.yxx"
     {
-  yywarning("Not a type: " + (yyvsp[(1) - (1)].u.identifier)->get_fully_scoped_name(), (yylsp[(1) - (1)]));
-  (yyval.u.type) = CPPType::new_type(new CPPSimpleType(CPPSimpleType::T_unknown));
+  (yyval.u.type) = CPPType::new_type((yyvsp[(1) - (1)].u.simple_type));
 }
     break;
 
@@ -4485,22 +4506,31 @@ yyreduce:
 /* Line 1792 of yacc.c  */
 #line 1202 "dtool/src/cppparser/cppBison.yxx"
     {
-  (yyval.u.type) = (yyvsp[(1) - (1)].u.identifier)->find_type(current_scope, global_scope, false, current_lexer);
-  assert((yyval.u.type) != NULL);
+  yywarning("Not a type: " + (yyvsp[(1) - (1)].u.identifier)->get_fully_scoped_name(), (yylsp[(1) - (1)]));
+  (yyval.u.type) = CPPType::new_type(new CPPSimpleType(CPPSimpleType::T_unknown));
 }
     break;
 
   case 138:
 /* Line 1792 of yacc.c  */
-#line 1211 "dtool/src/cppparser/cppBison.yxx"
+#line 1207 "dtool/src/cppparser/cppBison.yxx"
     {
-  (yyval.u.inst_ident) = new CPPInstanceIdentifier((yyvsp[(1) - (1)].u.identifier));
+  (yyval.u.type) = (yyvsp[(1) - (1)].u.identifier)->find_type(current_scope, global_scope, false, current_lexer);
+  assert((yyval.u.type) != NULL);
 }
     break;
 
   case 139:
 /* Line 1792 of yacc.c  */
-#line 1215 "dtool/src/cppparser/cppBison.yxx"
+#line 1216 "dtool/src/cppparser/cppBison.yxx"
+    {
+  (yyval.u.inst_ident) = new CPPInstanceIdentifier((yyvsp[(1) - (1)].u.identifier));
+}
+    break;
+
+  case 140:
+/* Line 1792 of yacc.c  */
+#line 1220 "dtool/src/cppparser/cppBison.yxx"
     {
   // For an operator function.  We implement this simply by building a
   // ficticious name for the function; in other respects it's just
@@ -4516,21 +4546,12 @@ yyreduce:
 }
     break;
 
-  case 140:
-/* Line 1792 of yacc.c  */
-#line 1229 "dtool/src/cppparser/cppBison.yxx"
-    {
-  (yyval.u.inst_ident) = (yyvsp[(2) - (2)].u.inst_ident);
-  (yyval.u.inst_ident)->add_modifier(IIT_const);
-}
-    break;
-
   case 141:
 /* Line 1792 of yacc.c  */
 #line 1234 "dtool/src/cppparser/cppBison.yxx"
     {
   (yyval.u.inst_ident) = (yyvsp[(2) - (2)].u.inst_ident);
-  (yyval.u.inst_ident)->add_modifier(IIT_pointer);
+  (yyval.u.inst_ident)->add_modifier(IIT_const);
 }
     break;
 
@@ -4539,7 +4560,7 @@ yyreduce:
 #line 1239 "dtool/src/cppparser/cppBison.yxx"
     {
   (yyval.u.inst_ident) = (yyvsp[(2) - (2)].u.inst_ident);
-  (yyval.u.inst_ident)->add_modifier(IIT_reference);
+  (yyval.u.inst_ident)->add_modifier(IIT_pointer);
 }
     break;
 
@@ -4547,8 +4568,8 @@ yyreduce:
 /* Line 1792 of yacc.c  */
 #line 1244 "dtool/src/cppparser/cppBison.yxx"
     {
-  (yyval.u.inst_ident) = (yyvsp[(3) - (3)].u.inst_ident);
-  (yyval.u.inst_ident)->add_scoped_pointer_modifier((yyvsp[(1) - (3)].u.identifier));
+  (yyval.u.inst_ident) = (yyvsp[(2) - (2)].u.inst_ident);
+  (yyval.u.inst_ident)->add_modifier(IIT_reference);
 }
     break;
 
@@ -4556,8 +4577,8 @@ yyreduce:
 /* Line 1792 of yacc.c  */
 #line 1249 "dtool/src/cppparser/cppBison.yxx"
     {
-  (yyval.u.inst_ident) = (yyvsp[(1) - (4)].u.inst_ident);
-  (yyval.u.inst_ident)->add_array_modifier((yyvsp[(3) - (4)].u.expr));
+  (yyval.u.inst_ident) = (yyvsp[(2) - (2)].u.inst_ident);
+  (yyval.u.inst_ident)->add_modifier(IIT_rvalue_reference);
 }
     break;
 
@@ -4565,8 +4586,8 @@ yyreduce:
 /* Line 1792 of yacc.c  */
 #line 1254 "dtool/src/cppparser/cppBison.yxx"
     {
-  // bitfield definition.  We ignore the bitfield for now.
-  (yyval.u.inst_ident) = (yyvsp[(1) - (3)].u.inst_ident);
+  (yyval.u.inst_ident) = (yyvsp[(3) - (3)].u.inst_ident);
+  (yyval.u.inst_ident)->add_scoped_pointer_modifier((yyvsp[(1) - (3)].u.identifier));
 }
     break;
 
@@ -4574,8 +4595,8 @@ yyreduce:
 /* Line 1792 of yacc.c  */
 #line 1259 "dtool/src/cppparser/cppBison.yxx"
     {
-  (yyval.u.inst_ident) = (yyvsp[(2) - (3)].u.inst_ident);
-  (yyval.u.inst_ident)->add_modifier(IIT_paren);
+  (yyval.u.inst_ident) = (yyvsp[(1) - (4)].u.inst_ident);
+  (yyval.u.inst_ident)->add_array_modifier((yyvsp[(3) - (4)].u.expr));
 }
     break;
 
@@ -4583,13 +4604,31 @@ yyreduce:
 /* Line 1792 of yacc.c  */
 #line 1264 "dtool/src/cppparser/cppBison.yxx"
     {
-  push_scope((yyvsp[(1) - (2)].u.inst_ident)->get_scope(current_scope, global_scope));
+  // bitfield definition.  We ignore the bitfield for now.
+  (yyval.u.inst_ident) = (yyvsp[(1) - (3)].u.inst_ident);
 }
     break;
 
   case 148:
 /* Line 1792 of yacc.c  */
-#line 1268 "dtool/src/cppparser/cppBison.yxx"
+#line 1269 "dtool/src/cppparser/cppBison.yxx"
+    {
+  (yyval.u.inst_ident) = (yyvsp[(2) - (3)].u.inst_ident);
+  (yyval.u.inst_ident)->add_modifier(IIT_paren);
+}
+    break;
+
+  case 149:
+/* Line 1792 of yacc.c  */
+#line 1274 "dtool/src/cppparser/cppBison.yxx"
+    {
+  push_scope((yyvsp[(1) - (2)].u.inst_ident)->get_scope(current_scope, global_scope));
+}
+    break;
+
+  case 150:
+/* Line 1792 of yacc.c  */
+#line 1278 "dtool/src/cppparser/cppBison.yxx"
     {
   pop_scope();
   (yyval.u.inst_ident) = (yyvsp[(1) - (6)].u.inst_ident);
@@ -4605,86 +4644,70 @@ yyreduce:
 }
     break;
 
-  case 149:
-/* Line 1792 of yacc.c  */
-#line 1286 "dtool/src/cppparser/cppBison.yxx"
-    {
-  (yyval.u.param_list) = new CPPParameterList;
-}
-    break;
-
-  case 150:
-/* Line 1792 of yacc.c  */
-#line 1290 "dtool/src/cppparser/cppBison.yxx"
-    {
-  (yyval.u.param_list) = new CPPParameterList;
-  (yyval.u.param_list)->_includes_ellipsis = true;
-}
-    break;
-
   case 151:
 /* Line 1792 of yacc.c  */
-#line 1295 "dtool/src/cppparser/cppBison.yxx"
+#line 1296 "dtool/src/cppparser/cppBison.yxx"
     {
-  (yyval.u.param_list) = (yyvsp[(1) - (1)].u.param_list);
+  (yyval.u.param_list) = new CPPParameterList;
 }
     break;
 
   case 152:
 /* Line 1792 of yacc.c  */
-#line 1299 "dtool/src/cppparser/cppBison.yxx"
+#line 1300 "dtool/src/cppparser/cppBison.yxx"
     {
-  (yyval.u.param_list) = (yyvsp[(1) - (3)].u.param_list);
+  (yyval.u.param_list) = new CPPParameterList;
   (yyval.u.param_list)->_includes_ellipsis = true;
 }
     break;
 
   case 153:
 /* Line 1792 of yacc.c  */
-#line 1304 "dtool/src/cppparser/cppBison.yxx"
+#line 1305 "dtool/src/cppparser/cppBison.yxx"
+    {
+  (yyval.u.param_list) = (yyvsp[(1) - (1)].u.param_list);
+}
+    break;
+
+  case 154:
+/* Line 1792 of yacc.c  */
+#line 1309 "dtool/src/cppparser/cppBison.yxx"
+    {
+  (yyval.u.param_list) = (yyvsp[(1) - (3)].u.param_list);
+  (yyval.u.param_list)->_includes_ellipsis = true;
+}
+    break;
+
+  case 155:
+/* Line 1792 of yacc.c  */
+#line 1314 "dtool/src/cppparser/cppBison.yxx"
     {
   (yyval.u.param_list) = (yyvsp[(1) - (2)].u.param_list);
   (yyval.u.param_list)->_includes_ellipsis = true;
 }
     break;
 
-  case 154:
+  case 156:
 /* Line 1792 of yacc.c  */
-#line 1312 "dtool/src/cppparser/cppBison.yxx"
+#line 1322 "dtool/src/cppparser/cppBison.yxx"
     {
   (yyval.u.param_list) = new CPPParameterList;
   (yyval.u.param_list)->_parameters.push_back((yyvsp[(1) - (1)].u.instance));
 }
     break;
 
-  case 155:
+  case 157:
 /* Line 1792 of yacc.c  */
-#line 1317 "dtool/src/cppparser/cppBison.yxx"
+#line 1327 "dtool/src/cppparser/cppBison.yxx"
     {
   (yyval.u.param_list) = (yyvsp[(1) - (3)].u.param_list);
   (yyval.u.param_list)->_parameters.push_back((yyvsp[(3) - (3)].u.instance));
 }
     break;
 
-  case 156:
-/* Line 1792 of yacc.c  */
-#line 1325 "dtool/src/cppparser/cppBison.yxx"
-    {
-  (yyval.u.expr) = (CPPExpression *)NULL;
-}
-    break;
-
-  case 157:
-/* Line 1792 of yacc.c  */
-#line 1329 "dtool/src/cppparser/cppBison.yxx"
-    {
-  (yyval.u.expr) = (yyvsp[(2) - (2)].u.expr);
-}
-    break;
-
   case 158:
 /* Line 1792 of yacc.c  */
-#line 1336 "dtool/src/cppparser/cppBison.yxx"
+#line 1335 "dtool/src/cppparser/cppBison.yxx"
     {
   (yyval.u.expr) = (CPPExpression *)NULL;
 }
@@ -4692,7 +4715,7 @@ yyreduce:
 
   case 159:
 /* Line 1792 of yacc.c  */
-#line 1340 "dtool/src/cppparser/cppBison.yxx"
+#line 1339 "dtool/src/cppparser/cppBison.yxx"
     {
   (yyval.u.expr) = (yyvsp[(2) - (2)].u.expr);
 }
@@ -4700,7 +4723,7 @@ yyreduce:
 
   case 160:
 /* Line 1792 of yacc.c  */
-#line 1347 "dtool/src/cppparser/cppBison.yxx"
+#line 1346 "dtool/src/cppparser/cppBison.yxx"
     {
   (yyval.u.expr) = (CPPExpression *)NULL;
 }
@@ -4708,15 +4731,15 @@ yyreduce:
 
   case 161:
 /* Line 1792 of yacc.c  */
-#line 1351 "dtool/src/cppparser/cppBison.yxx"
+#line 1350 "dtool/src/cppparser/cppBison.yxx"
     {
-  (yyval.u.expr) = (CPPExpression *)NULL;
+  (yyval.u.expr) = (yyvsp[(2) - (2)].u.expr);
 }
     break;
 
   case 162:
 /* Line 1792 of yacc.c  */
-#line 1355 "dtool/src/cppparser/cppBison.yxx"
+#line 1357 "dtool/src/cppparser/cppBison.yxx"
     {
   (yyval.u.expr) = (CPPExpression *)NULL;
 }
@@ -4724,39 +4747,55 @@ yyreduce:
 
   case 163:
 /* Line 1792 of yacc.c  */
-#line 1359 "dtool/src/cppparser/cppBison.yxx"
-    {
-  (yyval.u.expr) = (yyvsp[(2) - (3)].u.expr);
-}
-    break;
-
-  case 164:
-/* Line 1792 of yacc.c  */
-#line 1363 "dtool/src/cppparser/cppBison.yxx"
+#line 1361 "dtool/src/cppparser/cppBison.yxx"
     {
   (yyval.u.expr) = (CPPExpression *)NULL;
 }
     break;
 
-  case 168:
+  case 164:
 /* Line 1792 of yacc.c  */
-#line 1376 "dtool/src/cppparser/cppBison.yxx"
+#line 1365 "dtool/src/cppparser/cppBison.yxx"
+    {
+  (yyval.u.expr) = (CPPExpression *)NULL;
+}
+    break;
+
+  case 165:
+/* Line 1792 of yacc.c  */
+#line 1369 "dtool/src/cppparser/cppBison.yxx"
+    {
+  (yyval.u.expr) = (yyvsp[(2) - (3)].u.expr);
+}
+    break;
+
+  case 166:
+/* Line 1792 of yacc.c  */
+#line 1373 "dtool/src/cppparser/cppBison.yxx"
+    {
+  (yyval.u.expr) = (CPPExpression *)NULL;
+}
+    break;
+
+  case 170:
+/* Line 1792 of yacc.c  */
+#line 1386 "dtool/src/cppparser/cppBison.yxx"
     {
 }
     break;
 
-  case 172:
+  case 174:
 /* Line 1792 of yacc.c  */
-#line 1385 "dtool/src/cppparser/cppBison.yxx"
+#line 1395 "dtool/src/cppparser/cppBison.yxx"
     {
   (yyval.u.instance) = new CPPInstance((yyvsp[(1) - (3)].u.type), (yyvsp[(2) - (3)].u.inst_ident), 0, (yylsp[(2) - (3)]).file);
   (yyval.u.instance)->set_initializer((yyvsp[(3) - (3)].u.expr));
 }
     break;
 
-  case 173:
+  case 175:
 /* Line 1792 of yacc.c  */
-#line 1390 "dtool/src/cppparser/cppBison.yxx"
+#line 1400 "dtool/src/cppparser/cppBison.yxx"
     {
   yywarning("Not a type: " + (yyvsp[(1) - (3)].u.identifier)->get_fully_scoped_name(), (yylsp[(1) - (3)]));
   CPPType *type =
@@ -4766,9 +4805,9 @@ yyreduce:
 }
     break;
 
-  case 174:
+  case 176:
 /* Line 1792 of yacc.c  */
-#line 1398 "dtool/src/cppparser/cppBison.yxx"
+#line 1408 "dtool/src/cppparser/cppBison.yxx"
     {
   (yyvsp[(3) - (4)].u.inst_ident)->add_modifier(IIT_const);
   (yyval.u.instance) = new CPPInstance((yyvsp[(2) - (4)].u.type), (yyvsp[(3) - (4)].u.inst_ident), 0, (yylsp[(3) - (4)]).file);
@@ -4776,9 +4815,9 @@ yyreduce:
 }
     break;
 
-  case 175:
+  case 177:
 /* Line 1792 of yacc.c  */
-#line 1404 "dtool/src/cppparser/cppBison.yxx"
+#line 1414 "dtool/src/cppparser/cppBison.yxx"
     {
   CPPType *type =
     CPPType::new_type(new CPPSimpleType(CPPSimpleType::T_parameter));
@@ -4787,45 +4826,27 @@ yyreduce:
 }
     break;
 
-  case 176:
+  case 178:
 /* Line 1792 of yacc.c  */
-#line 1414 "dtool/src/cppparser/cppBison.yxx"
+#line 1424 "dtool/src/cppparser/cppBison.yxx"
     {
   (yyval.u.inst_ident) = new CPPInstanceIdentifier((CPPIdentifier *)NULL);
 }
     break;
 
-  case 177:
-/* Line 1792 of yacc.c  */
-#line 1418 "dtool/src/cppparser/cppBison.yxx"
-    {
-  (yyval.u.inst_ident) = new CPPInstanceIdentifier((yyvsp[(1) - (1)].u.identifier));
-}
-    break;
-
-  case 178:
-/* Line 1792 of yacc.c  */
-#line 1422 "dtool/src/cppparser/cppBison.yxx"
-    {
-  (yyval.u.inst_ident) = new CPPInstanceIdentifier((yyvsp[(1) - (1)].u.identifier));
-}
-    break;
-
   case 179:
 /* Line 1792 of yacc.c  */
-#line 1426 "dtool/src/cppparser/cppBison.yxx"
+#line 1428 "dtool/src/cppparser/cppBison.yxx"
     {
-  (yyval.u.inst_ident) = (yyvsp[(2) - (2)].u.inst_ident);
-  (yyval.u.inst_ident)->add_modifier(IIT_const);
+  (yyval.u.inst_ident) = new CPPInstanceIdentifier((yyvsp[(1) - (1)].u.identifier));
 }
     break;
 
   case 180:
 /* Line 1792 of yacc.c  */
-#line 1431 "dtool/src/cppparser/cppBison.yxx"
+#line 1432 "dtool/src/cppparser/cppBison.yxx"
     {
-  (yyval.u.inst_ident) = (yyvsp[(2) - (2)].u.inst_ident);
-  (yyval.u.inst_ident)->add_modifier(IIT_pointer);
+  (yyval.u.inst_ident) = new CPPInstanceIdentifier((yyvsp[(1) - (1)].u.identifier));
 }
     break;
 
@@ -4834,7 +4855,7 @@ yyreduce:
 #line 1436 "dtool/src/cppparser/cppBison.yxx"
     {
   (yyval.u.inst_ident) = (yyvsp[(2) - (2)].u.inst_ident);
-  (yyval.u.inst_ident)->add_modifier(IIT_reference);
+  (yyval.u.inst_ident)->add_modifier(IIT_const);
 }
     break;
 
@@ -4842,8 +4863,8 @@ yyreduce:
 /* Line 1792 of yacc.c  */
 #line 1441 "dtool/src/cppparser/cppBison.yxx"
     {
-  (yyval.u.inst_ident) = (yyvsp[(3) - (3)].u.inst_ident);
-  (yyval.u.inst_ident)->add_scoped_pointer_modifier((yyvsp[(1) - (3)].u.identifier));
+  (yyval.u.inst_ident) = (yyvsp[(2) - (2)].u.inst_ident);
+  (yyval.u.inst_ident)->add_modifier(IIT_pointer);
 }
     break;
 
@@ -4851,59 +4872,59 @@ yyreduce:
 /* Line 1792 of yacc.c  */
 #line 1446 "dtool/src/cppparser/cppBison.yxx"
     {
-  (yyval.u.inst_ident) = (yyvsp[(1) - (4)].u.inst_ident);
-  (yyval.u.inst_ident)->add_array_modifier((yyvsp[(3) - (4)].u.expr));
+  (yyval.u.inst_ident) = (yyvsp[(2) - (2)].u.inst_ident);
+  (yyval.u.inst_ident)->add_modifier(IIT_reference);
 }
     break;
 
   case 184:
 /* Line 1792 of yacc.c  */
-#line 1454 "dtool/src/cppparser/cppBison.yxx"
+#line 1451 "dtool/src/cppparser/cppBison.yxx"
     {
-  (yyval.u.inst_ident) = new CPPInstanceIdentifier((CPPIdentifier *)NULL);
+  (yyval.u.inst_ident) = (yyvsp[(2) - (2)].u.inst_ident);
+  (yyval.u.inst_ident)->add_modifier(IIT_rvalue_reference);
 }
     break;
 
   case 185:
 /* Line 1792 of yacc.c  */
-#line 1458 "dtool/src/cppparser/cppBison.yxx"
+#line 1456 "dtool/src/cppparser/cppBison.yxx"
     {
-  (yyval.u.inst_ident) = new CPPInstanceIdentifier((yyvsp[(1) - (1)].u.identifier));
+  (yyval.u.inst_ident) = (yyvsp[(3) - (3)].u.inst_ident);
+  (yyval.u.inst_ident)->add_scoped_pointer_modifier((yyvsp[(1) - (3)].u.identifier));
 }
     break;
 
   case 186:
 /* Line 1792 of yacc.c  */
-#line 1462 "dtool/src/cppparser/cppBison.yxx"
+#line 1461 "dtool/src/cppparser/cppBison.yxx"
     {
-  (yyval.u.inst_ident) = new CPPInstanceIdentifier((yyvsp[(1) - (1)].u.identifier));
+  (yyval.u.inst_ident) = (yyvsp[(1) - (4)].u.inst_ident);
+  (yyval.u.inst_ident)->add_array_modifier((yyvsp[(3) - (4)].u.expr));
 }
     break;
 
   case 187:
 /* Line 1792 of yacc.c  */
-#line 1466 "dtool/src/cppparser/cppBison.yxx"
+#line 1469 "dtool/src/cppparser/cppBison.yxx"
     {
-  (yyval.u.inst_ident) = (yyvsp[(2) - (2)].u.inst_ident);
-  (yyval.u.inst_ident)->add_modifier(IIT_const);
+  (yyval.u.inst_ident) = new CPPInstanceIdentifier((CPPIdentifier *)NULL);
 }
     break;
 
   case 188:
 /* Line 1792 of yacc.c  */
-#line 1471 "dtool/src/cppparser/cppBison.yxx"
+#line 1473 "dtool/src/cppparser/cppBison.yxx"
     {
-  (yyval.u.inst_ident) = (yyvsp[(2) - (2)].u.inst_ident);
-  (yyval.u.inst_ident)->add_modifier(IIT_pointer);
+  (yyval.u.inst_ident) = new CPPInstanceIdentifier((yyvsp[(1) - (1)].u.identifier));
 }
     break;
 
   case 189:
 /* Line 1792 of yacc.c  */
-#line 1476 "dtool/src/cppparser/cppBison.yxx"
+#line 1477 "dtool/src/cppparser/cppBison.yxx"
     {
-  (yyval.u.inst_ident) = (yyvsp[(2) - (2)].u.inst_ident);
-  (yyval.u.inst_ident)->add_modifier(IIT_reference);
+  (yyval.u.inst_ident) = new CPPInstanceIdentifier((yyvsp[(1) - (1)].u.identifier));
 }
     break;
 
@@ -4911,8 +4932,8 @@ yyreduce:
 /* Line 1792 of yacc.c  */
 #line 1481 "dtool/src/cppparser/cppBison.yxx"
     {
-  (yyval.u.inst_ident) = (yyvsp[(3) - (3)].u.inst_ident);
-  (yyval.u.inst_ident)->add_scoped_pointer_modifier((yyvsp[(1) - (3)].u.identifier));
+  (yyval.u.inst_ident) = (yyvsp[(2) - (2)].u.inst_ident);
+  (yyval.u.inst_ident)->add_modifier(IIT_const);
 }
     break;
 
@@ -4920,8 +4941,8 @@ yyreduce:
 /* Line 1792 of yacc.c  */
 #line 1486 "dtool/src/cppparser/cppBison.yxx"
     {
-  (yyval.u.inst_ident) = (yyvsp[(1) - (4)].u.inst_ident);
-  (yyval.u.inst_ident)->add_array_modifier((yyvsp[(3) - (4)].u.expr));
+  (yyval.u.inst_ident) = (yyvsp[(2) - (2)].u.inst_ident);
+  (yyval.u.inst_ident)->add_modifier(IIT_pointer);
 }
     break;
 
@@ -4929,62 +4950,62 @@ yyreduce:
 /* Line 1792 of yacc.c  */
 #line 1491 "dtool/src/cppparser/cppBison.yxx"
     {
+  (yyval.u.inst_ident) = (yyvsp[(2) - (2)].u.inst_ident);
+  (yyval.u.inst_ident)->add_modifier(IIT_reference);
+}
+    break;
+
+  case 193:
+/* Line 1792 of yacc.c  */
+#line 1496 "dtool/src/cppparser/cppBison.yxx"
+    {
+  (yyval.u.inst_ident) = (yyvsp[(2) - (2)].u.inst_ident);
+  (yyval.u.inst_ident)->add_modifier(IIT_rvalue_reference);
+}
+    break;
+
+  case 194:
+/* Line 1792 of yacc.c  */
+#line 1501 "dtool/src/cppparser/cppBison.yxx"
+    {
+  (yyval.u.inst_ident) = (yyvsp[(3) - (3)].u.inst_ident);
+  (yyval.u.inst_ident)->add_scoped_pointer_modifier((yyvsp[(1) - (3)].u.identifier));
+}
+    break;
+
+  case 195:
+/* Line 1792 of yacc.c  */
+#line 1506 "dtool/src/cppparser/cppBison.yxx"
+    {
+  (yyval.u.inst_ident) = (yyvsp[(1) - (4)].u.inst_ident);
+  (yyval.u.inst_ident)->add_array_modifier((yyvsp[(3) - (4)].u.expr));
+}
+    break;
+
+  case 196:
+/* Line 1792 of yacc.c  */
+#line 1511 "dtool/src/cppparser/cppBison.yxx"
+    {
   (yyval.u.inst_ident) = (yyvsp[(2) - (7)].u.inst_ident);
   (yyval.u.inst_ident)->add_modifier(IIT_paren);
   (yyval.u.inst_ident)->add_func_modifier((yyvsp[(5) - (7)].u.param_list), (yyvsp[(7) - (7)].u.integer));
 }
     break;
 
-  case 193:
+  case 197:
 /* Line 1792 of yacc.c  */
-#line 1497 "dtool/src/cppparser/cppBison.yxx"
+#line 1517 "dtool/src/cppparser/cppBison.yxx"
     {
   (yyval.u.inst_ident) = (yyvsp[(2) - (3)].u.inst_ident);
   (yyval.u.inst_ident)->add_modifier(IIT_paren);
 }
     break;
 
-  case 194:
-/* Line 1792 of yacc.c  */
-#line 1505 "dtool/src/cppparser/cppBison.yxx"
-    {
-  (yyval.u.inst_ident) = new CPPInstanceIdentifier((CPPIdentifier *)NULL);
-}
-    break;
-
-  case 195:
-/* Line 1792 of yacc.c  */
-#line 1509 "dtool/src/cppparser/cppBison.yxx"
-    {
-  (yyval.u.inst_ident) = (yyvsp[(2) - (2)].u.inst_ident);
-  (yyval.u.inst_ident)->add_modifier(IIT_const);
-}
-    break;
-
-  case 196:
-/* Line 1792 of yacc.c  */
-#line 1514 "dtool/src/cppparser/cppBison.yxx"
-    {
-  (yyval.u.inst_ident) = (yyvsp[(2) - (2)].u.inst_ident);
-  (yyval.u.inst_ident)->add_modifier(IIT_pointer);
-}
-    break;
-
-  case 197:
-/* Line 1792 of yacc.c  */
-#line 1519 "dtool/src/cppparser/cppBison.yxx"
-    {
-  (yyval.u.inst_ident) = (yyvsp[(2) - (2)].u.inst_ident);
-  (yyval.u.inst_ident)->add_modifier(IIT_reference);
-}
-    break;
-
   case 198:
 /* Line 1792 of yacc.c  */
-#line 1524 "dtool/src/cppparser/cppBison.yxx"
+#line 1525 "dtool/src/cppparser/cppBison.yxx"
     {
-  (yyval.u.inst_ident) = (yyvsp[(3) - (3)].u.inst_ident);
-  (yyval.u.inst_ident)->add_scoped_pointer_modifier((yyvsp[(1) - (3)].u.identifier));
+  (yyval.u.inst_ident) = new CPPInstanceIdentifier((CPPIdentifier *)NULL);
 }
     break;
 
@@ -4992,8 +5013,8 @@ yyreduce:
 /* Line 1792 of yacc.c  */
 #line 1529 "dtool/src/cppparser/cppBison.yxx"
     {
-  (yyval.u.inst_ident) = (yyvsp[(1) - (4)].u.inst_ident);
-  (yyval.u.inst_ident)->add_array_modifier((yyvsp[(3) - (4)].u.expr));
+  (yyval.u.inst_ident) = (yyvsp[(2) - (2)].u.inst_ident);
+  (yyval.u.inst_ident)->add_modifier(IIT_const);
 }
     break;
 
@@ -5001,260 +5022,285 @@ yyreduce:
 /* Line 1792 of yacc.c  */
 #line 1534 "dtool/src/cppparser/cppBison.yxx"
     {
+  (yyval.u.inst_ident) = (yyvsp[(2) - (2)].u.inst_ident);
+  (yyval.u.inst_ident)->add_modifier(IIT_pointer);
+}
+    break;
+
+  case 201:
+/* Line 1792 of yacc.c  */
+#line 1539 "dtool/src/cppparser/cppBison.yxx"
+    {
+  (yyval.u.inst_ident) = (yyvsp[(2) - (2)].u.inst_ident);
+  (yyval.u.inst_ident)->add_modifier(IIT_reference);
+}
+    break;
+
+  case 202:
+/* Line 1792 of yacc.c  */
+#line 1544 "dtool/src/cppparser/cppBison.yxx"
+    {
+  (yyval.u.inst_ident) = (yyvsp[(2) - (2)].u.inst_ident);
+  (yyval.u.inst_ident)->add_modifier(IIT_rvalue_reference);
+}
+    break;
+
+  case 203:
+/* Line 1792 of yacc.c  */
+#line 1549 "dtool/src/cppparser/cppBison.yxx"
+    {
+  (yyval.u.inst_ident) = (yyvsp[(3) - (3)].u.inst_ident);
+  (yyval.u.inst_ident)->add_scoped_pointer_modifier((yyvsp[(1) - (3)].u.identifier));
+}
+    break;
+
+  case 204:
+/* Line 1792 of yacc.c  */
+#line 1554 "dtool/src/cppparser/cppBison.yxx"
+    {
+  (yyval.u.inst_ident) = (yyvsp[(1) - (4)].u.inst_ident);
+  (yyval.u.inst_ident)->add_array_modifier((yyvsp[(3) - (4)].u.expr));
+}
+    break;
+
+  case 205:
+/* Line 1792 of yacc.c  */
+#line 1559 "dtool/src/cppparser/cppBison.yxx"
+    {
   (yyval.u.inst_ident) = (yyvsp[(2) - (7)].u.inst_ident);
   (yyval.u.inst_ident)->add_modifier(IIT_paren);
   (yyval.u.inst_ident)->add_func_modifier((yyvsp[(5) - (7)].u.param_list), (yyvsp[(7) - (7)].u.integer));
 }
     break;
 
-  case 201:
+  case 206:
 /* Line 1792 of yacc.c  */
-#line 1543 "dtool/src/cppparser/cppBison.yxx"
+#line 1568 "dtool/src/cppparser/cppBison.yxx"
     {
   (yyval.u.type) = CPPType::new_type((yyvsp[(1) - (1)].u.simple_type));
 }
     break;
 
-  case 202:
+  case 207:
 /* Line 1792 of yacc.c  */
-#line 1547 "dtool/src/cppparser/cppBison.yxx"
+#line 1572 "dtool/src/cppparser/cppBison.yxx"
     {
   (yyval.u.type) = (yyvsp[(1) - (1)].u.identifier)->find_type(current_scope, global_scope, false, current_lexer);
   assert((yyval.u.type) != NULL);
 }
     break;
 
-  case 203:
+  case 208:
 /* Line 1792 of yacc.c  */
-#line 1552 "dtool/src/cppparser/cppBison.yxx"
+#line 1577 "dtool/src/cppparser/cppBison.yxx"
     {
   (yyval.u.type) = CPPType::new_type(new CPPTBDType((yyvsp[(2) - (2)].u.identifier)));
 }
     break;
 
-  case 204:
-/* Line 1792 of yacc.c  */
-#line 1556 "dtool/src/cppparser/cppBison.yxx"
-    {
-  (yyval.u.type) = CPPType::new_type((yyvsp[(1) - (1)].u.struct_type));
-}
-    break;
-
-  case 205:
-/* Line 1792 of yacc.c  */
-#line 1560 "dtool/src/cppparser/cppBison.yxx"
-    {
-  (yyval.u.type) = CPPType::new_type((yyvsp[(1) - (1)].u.struct_type));
-}
-    break;
-
-  case 206:
-/* Line 1792 of yacc.c  */
-#line 1564 "dtool/src/cppparser/cppBison.yxx"
-    {
-  (yyval.u.type) = CPPType::new_type((yyvsp[(1) - (1)].u.enum_type));
-}
-    break;
-
-  case 207:
-/* Line 1792 of yacc.c  */
-#line 1568 "dtool/src/cppparser/cppBison.yxx"
-    {
-  (yyval.u.type) = CPPType::new_type((yyvsp[(1) - (1)].u.enum_type));
-}
-    break;
-
-  case 208:
-/* Line 1792 of yacc.c  */
-#line 1572 "dtool/src/cppparser/cppBison.yxx"
-    {
-  CPPType *type = (yyvsp[(2) - (2)].u.identifier)->find_type(current_scope, global_scope, false, current_lexer);
-  if (type != NULL) {
-    (yyval.u.type) = type;
-  } else {
-    CPPExtensionType *et = 
-      CPPType::new_type(new CPPExtensionType((yyvsp[(1) - (2)].u.extension_enum), (yyvsp[(2) - (2)].u.identifier), current_scope, (yylsp[(1) - (2)]).file))
-      ->as_extension_type();
-    CPPScope *scope = (yyvsp[(2) - (2)].u.identifier)->get_scope(current_scope, global_scope);
-    if (scope != NULL) {
-      scope->define_extension_type(et);
-    }
-    (yyval.u.type) = et;
-  }
-}
-    break;
-
   case 209:
 /* Line 1792 of yacc.c  */
-#line 1588 "dtool/src/cppparser/cppBison.yxx"
+#line 1581 "dtool/src/cppparser/cppBison.yxx"
     {
-  CPPType *type = (yyvsp[(2) - (2)].u.identifier)->find_type(current_scope, global_scope, false, current_lexer);
-  if (type != NULL) {
-    (yyval.u.type) = type;
-  } else {
-    CPPExtensionType *et = 
-      CPPType::new_type(new CPPExtensionType((yyvsp[(1) - (2)].u.extension_enum), (yyvsp[(2) - (2)].u.identifier), current_scope, (yylsp[(1) - (2)]).file))
-      ->as_extension_type();
-    CPPScope *scope = (yyvsp[(2) - (2)].u.identifier)->get_scope(current_scope, global_scope);
-    if (scope != NULL) {
-      scope->define_extension_type(et);
-    }
-    (yyval.u.type) = et;
-  }
+  (yyval.u.type) = CPPType::new_type((yyvsp[(1) - (1)].u.struct_type));
 }
     break;
 
   case 210:
 /* Line 1792 of yacc.c  */
-#line 1607 "dtool/src/cppparser/cppBison.yxx"
+#line 1585 "dtool/src/cppparser/cppBison.yxx"
     {
-  (yyval.u.decl) = CPPType::new_type((yyvsp[(1) - (1)].u.simple_type));
+  (yyval.u.type) = CPPType::new_type((yyvsp[(1) - (1)].u.struct_type));
 }
     break;
 
   case 211:
 /* Line 1792 of yacc.c  */
-#line 1611 "dtool/src/cppparser/cppBison.yxx"
+#line 1589 "dtool/src/cppparser/cppBison.yxx"
+    {
+  (yyval.u.type) = CPPType::new_type((yyvsp[(1) - (1)].u.enum_type));
+}
+    break;
+
+  case 212:
+/* Line 1792 of yacc.c  */
+#line 1593 "dtool/src/cppparser/cppBison.yxx"
+    {
+  (yyval.u.type) = CPPType::new_type((yyvsp[(1) - (1)].u.enum_type));
+}
+    break;
+
+  case 213:
+/* Line 1792 of yacc.c  */
+#line 1597 "dtool/src/cppparser/cppBison.yxx"
+    {
+  CPPType *type = (yyvsp[(2) - (2)].u.identifier)->find_type(current_scope, global_scope, false, current_lexer);
+  if (type != NULL) {
+    (yyval.u.type) = type;
+  } else {
+    CPPExtensionType *et =
+      CPPType::new_type(new CPPExtensionType((yyvsp[(1) - (2)].u.extension_enum), (yyvsp[(2) - (2)].u.identifier), current_scope, (yylsp[(1) - (2)]).file))
+      ->as_extension_type();
+    CPPScope *scope = (yyvsp[(2) - (2)].u.identifier)->get_scope(current_scope, global_scope);
+    if (scope != NULL) {
+      scope->define_extension_type(et);
+    }
+    (yyval.u.type) = et;
+  }
+}
+    break;
+
+  case 214:
+/* Line 1792 of yacc.c  */
+#line 1613 "dtool/src/cppparser/cppBison.yxx"
+    {
+  CPPType *type = (yyvsp[(2) - (2)].u.identifier)->find_type(current_scope, global_scope, false, current_lexer);
+  if (type != NULL) {
+    (yyval.u.type) = type;
+  } else {
+    CPPExtensionType *et =
+      CPPType::new_type(new CPPExtensionType((yyvsp[(1) - (2)].u.extension_enum), (yyvsp[(2) - (2)].u.identifier), current_scope, (yylsp[(1) - (2)]).file))
+      ->as_extension_type();
+    CPPScope *scope = (yyvsp[(2) - (2)].u.identifier)->get_scope(current_scope, global_scope);
+    if (scope != NULL) {
+      scope->define_extension_type(et);
+    }
+    (yyval.u.type) = et;
+  }
+}
+    break;
+
+  case 215:
+/* Line 1792 of yacc.c  */
+#line 1632 "dtool/src/cppparser/cppBison.yxx"
+    {
+  (yyval.u.decl) = CPPType::new_type((yyvsp[(1) - (1)].u.simple_type));
+}
+    break;
+
+  case 216:
+/* Line 1792 of yacc.c  */
+#line 1636 "dtool/src/cppparser/cppBison.yxx"
     {
   (yyval.u.decl) = (yyvsp[(1) - (1)].u.identifier)->find_type(current_scope, global_scope, false, current_lexer);
   assert((yyval.u.decl) != NULL);
 }
     break;
 
-  case 212:
+  case 217:
 /* Line 1792 of yacc.c  */
-#line 1616 "dtool/src/cppparser/cppBison.yxx"
+#line 1641 "dtool/src/cppparser/cppBison.yxx"
     {
   (yyval.u.decl) = CPPType::new_type(new CPPTBDType((yyvsp[(2) - (2)].u.identifier)));
 }
     break;
 
-  case 213:
+  case 218:
 /* Line 1792 of yacc.c  */
-#line 1620 "dtool/src/cppparser/cppBison.yxx"
+#line 1645 "dtool/src/cppparser/cppBison.yxx"
     {
   (yyval.u.decl) = CPPType::new_type((yyvsp[(1) - (1)].u.struct_type));
 }
     break;
 
-  case 214:
+  case 219:
 /* Line 1792 of yacc.c  */
-#line 1624 "dtool/src/cppparser/cppBison.yxx"
+#line 1649 "dtool/src/cppparser/cppBison.yxx"
     {
   (yyval.u.decl) = new CPPTypeDeclaration(CPPType::new_type((yyvsp[(1) - (1)].u.struct_type)));
 }
     break;
 
-  case 215:
+  case 220:
 /* Line 1792 of yacc.c  */
-#line 1628 "dtool/src/cppparser/cppBison.yxx"
+#line 1653 "dtool/src/cppparser/cppBison.yxx"
     {
   (yyval.u.decl) = CPPType::new_type((yyvsp[(1) - (1)].u.enum_type));
 }
     break;
 
-  case 216:
+  case 221:
 /* Line 1792 of yacc.c  */
-#line 1632 "dtool/src/cppparser/cppBison.yxx"
+#line 1657 "dtool/src/cppparser/cppBison.yxx"
     {
   (yyval.u.decl) = new CPPTypeDeclaration(CPPType::new_type((yyvsp[(1) - (1)].u.enum_type)));
 }
     break;
 
-  case 217:
-/* Line 1792 of yacc.c  */
-#line 1636 "dtool/src/cppparser/cppBison.yxx"
-    {
-  CPPType *type = (yyvsp[(2) - (2)].u.identifier)->find_type(current_scope, global_scope, false, current_lexer);
-  if (type != NULL) {
-    (yyval.u.decl) = type;
-  } else {
-    CPPExtensionType *et = 
-      CPPType::new_type(new CPPExtensionType((yyvsp[(1) - (2)].u.extension_enum), (yyvsp[(2) - (2)].u.identifier), current_scope, (yylsp[(1) - (2)]).file))
-      ->as_extension_type();
-    CPPScope *scope = (yyvsp[(2) - (2)].u.identifier)->get_scope(current_scope, global_scope);
-    if (scope != NULL) {
-      scope->define_extension_type(et);
-    }
-    (yyval.u.decl) = et;
-  }
-}
-    break;
-
-  case 218:
-/* Line 1792 of yacc.c  */
-#line 1652 "dtool/src/cppparser/cppBison.yxx"
-    {
-  CPPType *type = (yyvsp[(2) - (2)].u.identifier)->find_type(current_scope, global_scope, false, current_lexer);
-  if (type != NULL) {
-    (yyval.u.decl) = type;
-  } else {
-    CPPExtensionType *et = 
-      CPPType::new_type(new CPPExtensionType((yyvsp[(1) - (2)].u.extension_enum), (yyvsp[(2) - (2)].u.identifier), current_scope, (yylsp[(1) - (2)]).file))
-      ->as_extension_type();
-    CPPScope *scope = (yyvsp[(2) - (2)].u.identifier)->get_scope(current_scope, global_scope);
-    if (scope != NULL) {
-      scope->define_extension_type(et);
-    }
-    (yyval.u.decl) = et;
-  }
-}
-    break;
-
-  case 219:
-/* Line 1792 of yacc.c  */
-#line 1671 "dtool/src/cppparser/cppBison.yxx"
-    {
-  (yyval.u.type) = CPPType::new_type((yyvsp[(1) - (1)].u.simple_type));
-}
-    break;
-
-  case 220:
-/* Line 1792 of yacc.c  */
-#line 1675 "dtool/src/cppparser/cppBison.yxx"
-    {
-  (yyval.u.type) = (yyvsp[(1) - (1)].u.identifier)->find_type(current_scope, global_scope, false, current_lexer);
-  assert((yyval.u.type) != NULL);
-}
-    break;
-
-  case 221:
-/* Line 1792 of yacc.c  */
-#line 1680 "dtool/src/cppparser/cppBison.yxx"
-    {
-  (yyval.u.type) = CPPType::new_type(new CPPTBDType((yyvsp[(2) - (2)].u.identifier)));
-}
-    break;
-
   case 222:
 /* Line 1792 of yacc.c  */
-#line 1684 "dtool/src/cppparser/cppBison.yxx"
+#line 1661 "dtool/src/cppparser/cppBison.yxx"
     {
   CPPType *type = (yyvsp[(2) - (2)].u.identifier)->find_type(current_scope, global_scope, false, current_lexer);
   if (type != NULL) {
-    (yyval.u.type) = type;
+    (yyval.u.decl) = type;
   } else {
-    CPPExtensionType *et = 
+    CPPExtensionType *et =
       CPPType::new_type(new CPPExtensionType((yyvsp[(1) - (2)].u.extension_enum), (yyvsp[(2) - (2)].u.identifier), current_scope, (yylsp[(1) - (2)]).file))
       ->as_extension_type();
     CPPScope *scope = (yyvsp[(2) - (2)].u.identifier)->get_scope(current_scope, global_scope);
     if (scope != NULL) {
       scope->define_extension_type(et);
     }
-    (yyval.u.type) = et;
+    (yyval.u.decl) = et;
   }
 }
     break;
 
   case 223:
 /* Line 1792 of yacc.c  */
+#line 1677 "dtool/src/cppparser/cppBison.yxx"
+    {
+  CPPType *type = (yyvsp[(2) - (2)].u.identifier)->find_type(current_scope, global_scope, false, current_lexer);
+  if (type != NULL) {
+    (yyval.u.decl) = type;
+  } else {
+    CPPExtensionType *et =
+      CPPType::new_type(new CPPExtensionType((yyvsp[(1) - (2)].u.extension_enum), (yyvsp[(2) - (2)].u.identifier), current_scope, (yylsp[(1) - (2)]).file))
+      ->as_extension_type();
+    CPPScope *scope = (yyvsp[(2) - (2)].u.identifier)->get_scope(current_scope, global_scope);
+    if (scope != NULL) {
+      scope->define_extension_type(et);
+    }
+    (yyval.u.decl) = et;
+  }
+}
+    break;
+
+  case 224:
+/* Line 1792 of yacc.c  */
+#line 1696 "dtool/src/cppparser/cppBison.yxx"
+    {
+  (yyval.u.type) = CPPType::new_type((yyvsp[(1) - (1)].u.simple_type));
+}
+    break;
+
+  case 225:
+/* Line 1792 of yacc.c  */
 #line 1700 "dtool/src/cppparser/cppBison.yxx"
     {
+  (yyval.u.type) = (yyvsp[(1) - (1)].u.identifier)->find_type(current_scope, global_scope, false, current_lexer);
+  assert((yyval.u.type) != NULL);
+}
+    break;
+
+  case 226:
+/* Line 1792 of yacc.c  */
+#line 1705 "dtool/src/cppparser/cppBison.yxx"
+    {
+  (yyval.u.type) = CPPType::new_type(new CPPTBDType((yyvsp[(2) - (2)].u.identifier)));
+}
+    break;
+
+  case 227:
+/* Line 1792 of yacc.c  */
+#line 1709 "dtool/src/cppparser/cppBison.yxx"
+    {
   CPPType *type = (yyvsp[(2) - (2)].u.identifier)->find_type(current_scope, global_scope, false, current_lexer);
   if (type != NULL) {
     (yyval.u.type) = type;
   } else {
-    CPPExtensionType *et = 
+    CPPExtensionType *et =
       CPPType::new_type(new CPPExtensionType((yyvsp[(1) - (2)].u.extension_enum), (yyvsp[(2) - (2)].u.identifier), current_scope, (yylsp[(1) - (2)]).file))
       ->as_extension_type();
     CPPScope *scope = (yyvsp[(2) - (2)].u.identifier)->get_scope(current_scope, global_scope);
@@ -5266,9 +5312,29 @@ yyreduce:
 }
     break;
 
-  case 224:
+  case 228:
 /* Line 1792 of yacc.c  */
-#line 1719 "dtool/src/cppparser/cppBison.yxx"
+#line 1725 "dtool/src/cppparser/cppBison.yxx"
+    {
+  CPPType *type = (yyvsp[(2) - (2)].u.identifier)->find_type(current_scope, global_scope, false, current_lexer);
+  if (type != NULL) {
+    (yyval.u.type) = type;
+  } else {
+    CPPExtensionType *et =
+      CPPType::new_type(new CPPExtensionType((yyvsp[(1) - (2)].u.extension_enum), (yyvsp[(2) - (2)].u.identifier), current_scope, (yylsp[(1) - (2)]).file))
+      ->as_extension_type();
+    CPPScope *scope = (yyvsp[(2) - (2)].u.identifier)->get_scope(current_scope, global_scope);
+    if (scope != NULL) {
+      scope->define_extension_type(et);
+    }
+    (yyval.u.type) = et;
+  }
+}
+    break;
+
+  case 229:
+/* Line 1792 of yacc.c  */
+#line 1744 "dtool/src/cppparser/cppBison.yxx"
     {
   CPPInstance *inst = new CPPInstance((yyvsp[(1) - (2)].u.type), (yyvsp[(2) - (2)].u.inst_ident), 0, (yylsp[(1) - (2)]).file);
   (yyval.u.type) = inst->_type;
@@ -5276,9 +5342,9 @@ yyreduce:
 }
     break;
 
-  case 225:
+  case 230:
 /* Line 1792 of yacc.c  */
-#line 1725 "dtool/src/cppparser/cppBison.yxx"
+#line 1750 "dtool/src/cppparser/cppBison.yxx"
     {
   (yyvsp[(3) - (3)].u.inst_ident)->add_modifier(IIT_const);
   CPPInstance *inst = new CPPInstance((yyvsp[(2) - (3)].u.type), (yyvsp[(3) - (3)].u.inst_ident), 0, (yylsp[(1) - (3)]).file);
@@ -5287,13 +5353,13 @@ yyreduce:
 }
     break;
 
-  case 226:
+  case 231:
 /* Line 1792 of yacc.c  */
-#line 1735 "dtool/src/cppparser/cppBison.yxx"
+#line 1760 "dtool/src/cppparser/cppBison.yxx"
     {
-  CPPVisibility starting_vis = 
+  CPPVisibility starting_vis =
   ((yyvsp[(1) - (2)].u.extension_enum) == CPPExtensionType::T_class) ? V_private : V_public;
-  
+
   CPPScope *new_scope = new CPPScope(current_scope, CPPNameComponent("anon"),
                                      starting_vis);
   CPPStructType *st = new CPPStructType((yyvsp[(1) - (2)].u.extension_enum), NULL, current_scope,
@@ -5305,9 +5371,9 @@ yyreduce:
 }
     break;
 
-  case 227:
+  case 232:
 /* Line 1792 of yacc.c  */
-#line 1749 "dtool/src/cppparser/cppBison.yxx"
+#line 1774 "dtool/src/cppparser/cppBison.yxx"
     {
   (yyval.u.struct_type) = current_struct;
   current_struct->_incomplete = false;
@@ -5316,11 +5382,11 @@ yyreduce:
 }
     break;
 
-  case 228:
+  case 233:
 /* Line 1792 of yacc.c  */
-#line 1759 "dtool/src/cppparser/cppBison.yxx"
+#line 1784 "dtool/src/cppparser/cppBison.yxx"
     {
-  CPPVisibility starting_vis = 
+  CPPVisibility starting_vis =
   ((yyvsp[(1) - (2)].u.extension_enum) == CPPExtensionType::T_class) ? V_private : V_public;
 
   CPPScope *scope = (yyvsp[(2) - (2)].u.identifier)->get_scope(current_scope, global_scope, current_lexer);
@@ -5334,15 +5400,15 @@ yyreduce:
                                         new_scope, (yylsp[(1) - (2)]).file);
   new_scope->set_struct_type(st);
   current_scope->define_extension_type(st);
-  
+
   push_scope(new_scope);
   push_struct(st);
 }
     break;
 
-  case 229:
+  case 234:
 /* Line 1792 of yacc.c  */
-#line 1779 "dtool/src/cppparser/cppBison.yxx"
+#line 1804 "dtool/src/cppparser/cppBison.yxx"
     {
   (yyval.u.struct_type) = current_struct;
   current_struct->_incomplete = false;
@@ -5351,109 +5417,75 @@ yyreduce:
 }
     break;
 
-  case 234:
+  case 239:
 /* Line 1792 of yacc.c  */
-#line 1799 "dtool/src/cppparser/cppBison.yxx"
+#line 1824 "dtool/src/cppparser/cppBison.yxx"
     {
   current_struct->append_derivation((yyvsp[(2) - (2)].u.type), V_public, false);
 }
     break;
 
-  case 235:
+  case 240:
 /* Line 1792 of yacc.c  */
-#line 1803 "dtool/src/cppparser/cppBison.yxx"
+#line 1828 "dtool/src/cppparser/cppBison.yxx"
     {
   current_struct->append_derivation((yyvsp[(2) - (2)].u.type), V_protected, false);
 }
     break;
 
-  case 236:
+  case 241:
 /* Line 1792 of yacc.c  */
-#line 1807 "dtool/src/cppparser/cppBison.yxx"
+#line 1832 "dtool/src/cppparser/cppBison.yxx"
     {
   current_struct->append_derivation((yyvsp[(2) - (2)].u.type), V_private, false);
 }
     break;
 
-  case 237:
-/* Line 1792 of yacc.c  */
-#line 1811 "dtool/src/cppparser/cppBison.yxx"
-    {
-  current_struct->append_derivation((yyvsp[(3) - (3)].u.type), V_public, true);
-}
-    break;
-
-  case 238:
-/* Line 1792 of yacc.c  */
-#line 1815 "dtool/src/cppparser/cppBison.yxx"
-    {
-  current_struct->append_derivation((yyvsp[(3) - (3)].u.type), V_protected, true);
-}
-    break;
-
-  case 239:
-/* Line 1792 of yacc.c  */
-#line 1819 "dtool/src/cppparser/cppBison.yxx"
-    {
-  current_struct->append_derivation((yyvsp[(3) - (3)].u.type), V_private, true);
-}
-    break;
-
-  case 240:
-/* Line 1792 of yacc.c  */
-#line 1823 "dtool/src/cppparser/cppBison.yxx"
-    {
-  current_struct->append_derivation((yyvsp[(3) - (3)].u.type), V_public, true);
-}
-    break;
-
-  case 241:
-/* Line 1792 of yacc.c  */
-#line 1827 "dtool/src/cppparser/cppBison.yxx"
-    {
-  current_struct->append_derivation((yyvsp[(3) - (3)].u.type), V_protected, true);
-}
-    break;
-
   case 242:
 /* Line 1792 of yacc.c  */
-#line 1831 "dtool/src/cppparser/cppBison.yxx"
+#line 1836 "dtool/src/cppparser/cppBison.yxx"
     {
-  current_struct->append_derivation((yyvsp[(3) - (3)].u.type), V_private, true);
+  current_struct->append_derivation((yyvsp[(3) - (3)].u.type), V_public, true);
 }
     break;
 
   case 243:
 /* Line 1792 of yacc.c  */
-#line 1838 "dtool/src/cppparser/cppBison.yxx"
+#line 1840 "dtool/src/cppparser/cppBison.yxx"
     {
-  current_enum = new CPPEnumType(NULL, current_scope, (yylsp[(1) - (2)]).file);
+  current_struct->append_derivation((yyvsp[(3) - (3)].u.type), V_protected, true);
 }
     break;
 
   case 244:
 /* Line 1792 of yacc.c  */
-#line 1842 "dtool/src/cppparser/cppBison.yxx"
+#line 1844 "dtool/src/cppparser/cppBison.yxx"
     {
-  (yyval.u.enum_type) = current_enum;
-  current_enum = NULL;
+  current_struct->append_derivation((yyvsp[(3) - (3)].u.type), V_private, true);
 }
     break;
 
   case 245:
 /* Line 1792 of yacc.c  */
-#line 1850 "dtool/src/cppparser/cppBison.yxx"
+#line 1848 "dtool/src/cppparser/cppBison.yxx"
     {
-  current_enum = new CPPEnumType((yyvsp[(2) - (3)].u.identifier), current_scope, (yylsp[(1) - (3)]).file);
+  current_struct->append_derivation((yyvsp[(3) - (3)].u.type), V_public, true);
 }
     break;
 
   case 246:
 /* Line 1792 of yacc.c  */
-#line 1854 "dtool/src/cppparser/cppBison.yxx"
+#line 1852 "dtool/src/cppparser/cppBison.yxx"
     {
-  (yyval.u.enum_type) = current_enum;
-  current_enum = NULL;
+  current_struct->append_derivation((yyvsp[(3) - (3)].u.type), V_protected, true);
+}
+    break;
+
+  case 247:
+/* Line 1792 of yacc.c  */
+#line 1856 "dtool/src/cppparser/cppBison.yxx"
+    {
+  current_struct->append_derivation((yyvsp[(3) - (3)].u.type), V_private, true);
 }
     break;
 
@@ -5461,15 +5493,49 @@ yyreduce:
 /* Line 1792 of yacc.c  */
 #line 1863 "dtool/src/cppparser/cppBison.yxx"
     {
+  current_enum = new CPPEnumType(NULL, current_scope, (yylsp[(1) - (2)]).file);
+}
+    break;
+
+  case 249:
+/* Line 1792 of yacc.c  */
+#line 1867 "dtool/src/cppparser/cppBison.yxx"
+    {
+  (yyval.u.enum_type) = current_enum;
+  current_enum = NULL;
+}
+    break;
+
+  case 250:
+/* Line 1792 of yacc.c  */
+#line 1875 "dtool/src/cppparser/cppBison.yxx"
+    {
+  current_enum = new CPPEnumType((yyvsp[(2) - (3)].u.identifier), current_scope, (yylsp[(1) - (3)]).file);
+}
+    break;
+
+  case 251:
+/* Line 1792 of yacc.c  */
+#line 1879 "dtool/src/cppparser/cppBison.yxx"
+    {
+  (yyval.u.enum_type) = current_enum;
+  current_enum = NULL;
+}
+    break;
+
+  case 253:
+/* Line 1792 of yacc.c  */
+#line 1888 "dtool/src/cppparser/cppBison.yxx"
+    {
   assert(current_enum != NULL);
   CPPInstance *inst = current_enum->add_element((yyvsp[(2) - (3)].u.identifier)->get_simple_name());
   current_scope->add_enum_value(inst, current_lexer, (yylsp[(2) - (3)]));
 }
     break;
 
-  case 249:
+  case 254:
 /* Line 1792 of yacc.c  */
-#line 1869 "dtool/src/cppparser/cppBison.yxx"
+#line 1894 "dtool/src/cppparser/cppBison.yxx"
     {
   assert(current_enum != NULL);
   CPPInstance *inst = current_enum->add_element((yyvsp[(2) - (5)].u.identifier)->get_simple_name(), (yyvsp[(4) - (5)].u.expr));
@@ -5477,9 +5543,9 @@ yyreduce:
 }
     break;
 
-  case 251:
+  case 256:
 /* Line 1792 of yacc.c  */
-#line 1878 "dtool/src/cppparser/cppBison.yxx"
+#line 1903 "dtool/src/cppparser/cppBison.yxx"
     {
   assert(current_enum != NULL);
   CPPInstance *inst = current_enum->add_element((yyvsp[(2) - (2)].u.identifier)->get_simple_name());
@@ -5487,9 +5553,9 @@ yyreduce:
 }
     break;
 
-  case 252:
+  case 257:
 /* Line 1792 of yacc.c  */
-#line 1884 "dtool/src/cppparser/cppBison.yxx"
+#line 1909 "dtool/src/cppparser/cppBison.yxx"
     {
   assert(current_enum != NULL);
   CPPInstance *inst = current_enum->add_element((yyvsp[(2) - (4)].u.identifier)->get_simple_name(), (yyvsp[(4) - (4)].u.expr));
@@ -5497,46 +5563,46 @@ yyreduce:
 }
     break;
 
-  case 253:
+  case 258:
 /* Line 1792 of yacc.c  */
-#line 1893 "dtool/src/cppparser/cppBison.yxx"
+#line 1918 "dtool/src/cppparser/cppBison.yxx"
     {
   (yyval.u.extension_enum) = CPPExtensionType::T_enum;
 }
     break;
 
-  case 254:
+  case 259:
 /* Line 1792 of yacc.c  */
-#line 1900 "dtool/src/cppparser/cppBison.yxx"
+#line 1925 "dtool/src/cppparser/cppBison.yxx"
     {
   (yyval.u.extension_enum) = CPPExtensionType::T_class;
 }
     break;
 
-  case 255:
+  case 260:
 /* Line 1792 of yacc.c  */
-#line 1904 "dtool/src/cppparser/cppBison.yxx"
+#line 1929 "dtool/src/cppparser/cppBison.yxx"
     {
   (yyval.u.extension_enum) = CPPExtensionType::T_struct;
 }
     break;
 
-  case 256:
+  case 261:
 /* Line 1792 of yacc.c  */
-#line 1908 "dtool/src/cppparser/cppBison.yxx"
+#line 1933 "dtool/src/cppparser/cppBison.yxx"
     {
   (yyval.u.extension_enum) = CPPExtensionType::T_union;
 }
     break;
 
-  case 257:
+  case 262:
 /* Line 1792 of yacc.c  */
-#line 1915 "dtool/src/cppparser/cppBison.yxx"
+#line 1940 "dtool/src/cppparser/cppBison.yxx"
     {
   CPPScope *scope = (yyvsp[(2) - (3)].u.identifier)->find_scope(current_scope, global_scope, current_lexer);
   if (scope == NULL) {
     // This must be a new namespace declaration.
-    CPPScope *parent_scope = 
+    CPPScope *parent_scope =
       (yyvsp[(2) - (3)].u.identifier)->get_scope(current_scope, global_scope, current_lexer);
     if (parent_scope == NULL) {
       parent_scope = current_scope;
@@ -5551,17 +5617,17 @@ yyreduce:
 }
     break;
 
-  case 258:
+  case 263:
 /* Line 1792 of yacc.c  */
-#line 1933 "dtool/src/cppparser/cppBison.yxx"
+#line 1958 "dtool/src/cppparser/cppBison.yxx"
     {
   pop_scope();
 }
     break;
 
-  case 260:
+  case 265:
 /* Line 1792 of yacc.c  */
-#line 1941 "dtool/src/cppparser/cppBison.yxx"
+#line 1966 "dtool/src/cppparser/cppBison.yxx"
     {
   CPPUsing *using_decl = new CPPUsing((yyvsp[(2) - (2)].u.identifier), false, (yylsp[(1) - (2)]).file);
   current_scope->add_declaration(using_decl, global_scope, current_lexer, (yylsp[(1) - (2)]));
@@ -5569,9 +5635,9 @@ yyreduce:
 }
     break;
 
-  case 261:
+  case 266:
 /* Line 1792 of yacc.c  */
-#line 1947 "dtool/src/cppparser/cppBison.yxx"
+#line 1972 "dtool/src/cppparser/cppBison.yxx"
     {
   CPPUsing *using_decl = new CPPUsing((yyvsp[(3) - (3)].u.identifier), true, (yylsp[(1) - (3)]).file);
   current_scope->add_declaration(using_decl, global_scope, current_lexer, (yylsp[(1) - (3)]));
@@ -5579,72 +5645,27 @@ yyreduce:
 }
     break;
 
-  case 265:
+  case 270:
 /* Line 1792 of yacc.c  */
-#line 1962 "dtool/src/cppparser/cppBison.yxx"
+#line 1987 "dtool/src/cppparser/cppBison.yxx"
     {
   (yyval.u.simple_type) = new CPPSimpleType(CPPSimpleType::T_bool);
 }
     break;
 
-  case 266:
+  case 271:
 /* Line 1792 of yacc.c  */
-#line 1966 "dtool/src/cppparser/cppBison.yxx"
+#line 1991 "dtool/src/cppparser/cppBison.yxx"
     {
   (yyval.u.simple_type) = new CPPSimpleType(CPPSimpleType::T_char);
 }
     break;
 
-  case 267:
-/* Line 1792 of yacc.c  */
-#line 1970 "dtool/src/cppparser/cppBison.yxx"
-    {
-  (yyval.u.simple_type) = new CPPSimpleType(CPPSimpleType::T_wchar_t);
-}
-    break;
-
-  case 268:
-/* Line 1792 of yacc.c  */
-#line 1974 "dtool/src/cppparser/cppBison.yxx"
-    {
-  (yyval.u.simple_type) = new CPPSimpleType(CPPSimpleType::T_int,
-                         CPPSimpleType::F_short);
-}
-    break;
-
-  case 269:
-/* Line 1792 of yacc.c  */
-#line 1979 "dtool/src/cppparser/cppBison.yxx"
-    {
-  (yyval.u.simple_type) = new CPPSimpleType(CPPSimpleType::T_int,
-                         CPPSimpleType::F_long);
-}
-    break;
-
-  case 270:
-/* Line 1792 of yacc.c  */
-#line 1984 "dtool/src/cppparser/cppBison.yxx"
-    {
-  (yyval.u.simple_type) = new CPPSimpleType(CPPSimpleType::T_int,
-                         CPPSimpleType::F_longlong);
-}
-    break;
-
-  case 271:
-/* Line 1792 of yacc.c  */
-#line 1989 "dtool/src/cppparser/cppBison.yxx"
-    {
-  (yyval.u.simple_type) = new CPPSimpleType(CPPSimpleType::T_int,
-                         CPPSimpleType::F_unsigned);
-}
-    break;
-
   case 272:
 /* Line 1792 of yacc.c  */
-#line 1994 "dtool/src/cppparser/cppBison.yxx"
+#line 1995 "dtool/src/cppparser/cppBison.yxx"
     {
-  (yyval.u.simple_type) = new CPPSimpleType(CPPSimpleType::T_int,
-                         CPPSimpleType::F_signed);
+  (yyval.u.simple_type) = new CPPSimpleType(CPPSimpleType::T_wchar_t);
 }
     break;
 
@@ -5652,22 +5673,67 @@ yyreduce:
 /* Line 1792 of yacc.c  */
 #line 1999 "dtool/src/cppparser/cppBison.yxx"
     {
-  (yyval.u.simple_type) = new CPPSimpleType(CPPSimpleType::T_int);
+  (yyval.u.simple_type) = new CPPSimpleType(CPPSimpleType::T_int,
+                         CPPSimpleType::F_short);
 }
     break;
 
   case 274:
 /* Line 1792 of yacc.c  */
-#line 2003 "dtool/src/cppparser/cppBison.yxx"
+#line 2004 "dtool/src/cppparser/cppBison.yxx"
+    {
+  (yyval.u.simple_type) = new CPPSimpleType(CPPSimpleType::T_int,
+                         CPPSimpleType::F_long);
+}
+    break;
+
+  case 275:
+/* Line 1792 of yacc.c  */
+#line 2009 "dtool/src/cppparser/cppBison.yxx"
+    {
+  (yyval.u.simple_type) = new CPPSimpleType(CPPSimpleType::T_int,
+                         CPPSimpleType::F_longlong);
+}
+    break;
+
+  case 276:
+/* Line 1792 of yacc.c  */
+#line 2014 "dtool/src/cppparser/cppBison.yxx"
+    {
+  (yyval.u.simple_type) = new CPPSimpleType(CPPSimpleType::T_int,
+                         CPPSimpleType::F_unsigned);
+}
+    break;
+
+  case 277:
+/* Line 1792 of yacc.c  */
+#line 2019 "dtool/src/cppparser/cppBison.yxx"
+    {
+  (yyval.u.simple_type) = new CPPSimpleType(CPPSimpleType::T_int,
+                         CPPSimpleType::F_signed);
+}
+    break;
+
+  case 278:
+/* Line 1792 of yacc.c  */
+#line 2024 "dtool/src/cppparser/cppBison.yxx"
+    {
+  (yyval.u.simple_type) = new CPPSimpleType(CPPSimpleType::T_int);
+}
+    break;
+
+  case 279:
+/* Line 1792 of yacc.c  */
+#line 2028 "dtool/src/cppparser/cppBison.yxx"
     {
   (yyval.u.simple_type) = (yyvsp[(2) - (2)].u.simple_type);
   (yyval.u.simple_type)->_flags |= CPPSimpleType::F_short;
 }
     break;
 
-  case 275:
+  case 280:
 /* Line 1792 of yacc.c  */
-#line 2008 "dtool/src/cppparser/cppBison.yxx"
+#line 2033 "dtool/src/cppparser/cppBison.yxx"
     {
   (yyval.u.simple_type) = (yyvsp[(2) - (2)].u.simple_type);
   if ((yyval.u.simple_type)->_flags & CPPSimpleType::F_long) {
@@ -5678,205 +5744,165 @@ yyreduce:
 }
     break;
 
-  case 276:
+  case 281:
 /* Line 1792 of yacc.c  */
-#line 2017 "dtool/src/cppparser/cppBison.yxx"
+#line 2042 "dtool/src/cppparser/cppBison.yxx"
     {
   (yyval.u.simple_type) = (yyvsp[(2) - (2)].u.simple_type);
   (yyval.u.simple_type)->_flags |= CPPSimpleType::F_unsigned;
 }
     break;
 
-  case 277:
+  case 282:
 /* Line 1792 of yacc.c  */
-#line 2022 "dtool/src/cppparser/cppBison.yxx"
+#line 2047 "dtool/src/cppparser/cppBison.yxx"
     {
   (yyval.u.simple_type) = (yyvsp[(2) - (2)].u.simple_type);
   (yyval.u.simple_type)->_flags |= CPPSimpleType::F_signed;
 }
     break;
 
-  case 278:
+  case 283:
 /* Line 1792 of yacc.c  */
-#line 2030 "dtool/src/cppparser/cppBison.yxx"
+#line 2055 "dtool/src/cppparser/cppBison.yxx"
     {
   (yyval.u.simple_type) = new CPPSimpleType(CPPSimpleType::T_float);
 }
     break;
 
-  case 279:
+  case 284:
 /* Line 1792 of yacc.c  */
-#line 2034 "dtool/src/cppparser/cppBison.yxx"
+#line 2059 "dtool/src/cppparser/cppBison.yxx"
     {
   (yyval.u.simple_type) = new CPPSimpleType(CPPSimpleType::T_float,
                          CPPSimpleType::F_long);
 }
     break;
 
-  case 280:
+  case 285:
 /* Line 1792 of yacc.c  */
-#line 2039 "dtool/src/cppparser/cppBison.yxx"
+#line 2064 "dtool/src/cppparser/cppBison.yxx"
     {
   (yyval.u.simple_type) = new CPPSimpleType(CPPSimpleType::T_double);
 }
     break;
 
-  case 281:
+  case 286:
 /* Line 1792 of yacc.c  */
-#line 2043 "dtool/src/cppparser/cppBison.yxx"
+#line 2068 "dtool/src/cppparser/cppBison.yxx"
     {
   (yyval.u.simple_type) = new CPPSimpleType(CPPSimpleType::T_float,
                          CPPSimpleType::F_longlong);
 }
     break;
 
-  case 282:
+  case 287:
 /* Line 1792 of yacc.c  */
-#line 2048 "dtool/src/cppparser/cppBison.yxx"
+#line 2073 "dtool/src/cppparser/cppBison.yxx"
     {
   (yyval.u.simple_type) = new CPPSimpleType(CPPSimpleType::T_double,
                          CPPSimpleType::F_long);
 }
     break;
 
-  case 283:
-/* Line 1792 of yacc.c  */
-#line 2056 "dtool/src/cppparser/cppBison.yxx"
-    {
-  (yyval.u.simple_type) = new CPPSimpleType(CPPSimpleType::T_void);
-}
-    break;
-
-  case 284:
-/* Line 1792 of yacc.c  */
-#line 2065 "dtool/src/cppparser/cppBison.yxx"
-    {
-  current_lexer->_resolve_identifiers = false;
-}
-    break;
-
-  case 285:
-/* Line 1792 of yacc.c  */
-#line 2069 "dtool/src/cppparser/cppBison.yxx"
-    {
-  current_lexer->_resolve_identifiers = true;
-}
-    break;
-
   case 288:
 /* Line 1792 of yacc.c  */
 #line 2081 "dtool/src/cppparser/cppBison.yxx"
     {
+  (yyval.u.simple_type) = new CPPSimpleType(CPPSimpleType::T_void);
 }
     break;
 
   case 289:
 /* Line 1792 of yacc.c  */
-#line 2084 "dtool/src/cppparser/cppBison.yxx"
+#line 2090 "dtool/src/cppparser/cppBison.yxx"
     {
+  current_lexer->_resolve_identifiers = false;
 }
     break;
 
   case 290:
 /* Line 1792 of yacc.c  */
-#line 2087 "dtool/src/cppparser/cppBison.yxx"
-    {
-}
-    break;
-
-  case 291:
-/* Line 1792 of yacc.c  */
-#line 2090 "dtool/src/cppparser/cppBison.yxx"
-    {
-}
-    break;
-
-  case 292:
-/* Line 1792 of yacc.c  */
-#line 2093 "dtool/src/cppparser/cppBison.yxx"
+#line 2094 "dtool/src/cppparser/cppBison.yxx"
     {
+  current_lexer->_resolve_identifiers = true;
 }
     break;
 
   case 293:
 /* Line 1792 of yacc.c  */
-#line 2096 "dtool/src/cppparser/cppBison.yxx"
+#line 2106 "dtool/src/cppparser/cppBison.yxx"
     {
 }
     break;
 
   case 294:
 /* Line 1792 of yacc.c  */
-#line 2099 "dtool/src/cppparser/cppBison.yxx"
+#line 2109 "dtool/src/cppparser/cppBison.yxx"
     {
 }
     break;
 
   case 295:
 /* Line 1792 of yacc.c  */
-#line 2102 "dtool/src/cppparser/cppBison.yxx"
+#line 2112 "dtool/src/cppparser/cppBison.yxx"
     {
 }
     break;
 
-  case 368:
+  case 296:
 /* Line 1792 of yacc.c  */
-#line 2122 "dtool/src/cppparser/cppBison.yxx"
+#line 2115 "dtool/src/cppparser/cppBison.yxx"
     {
 }
     break;
 
-  case 392:
+  case 297:
 /* Line 1792 of yacc.c  */
-#line 2131 "dtool/src/cppparser/cppBison.yxx"
+#line 2118 "dtool/src/cppparser/cppBison.yxx"
     {
-  (yyval.u.expr) = (CPPExpression *)NULL;
 }
     break;
 
-  case 393:
+  case 298:
 /* Line 1792 of yacc.c  */
-#line 2135 "dtool/src/cppparser/cppBison.yxx"
+#line 2121 "dtool/src/cppparser/cppBison.yxx"
     {
-  (yyval.u.expr) = (yyvsp[(1) - (1)].u.expr);
 }
     break;
 
-  case 394:
+  case 299:
 /* Line 1792 of yacc.c  */
-#line 2142 "dtool/src/cppparser/cppBison.yxx"
+#line 2124 "dtool/src/cppparser/cppBison.yxx"
     {
-  (yyval.u.expr) = (CPPExpression *)NULL;
 }
     break;
 
-  case 395:
+  case 300:
 /* Line 1792 of yacc.c  */
-#line 2146 "dtool/src/cppparser/cppBison.yxx"
+#line 2127 "dtool/src/cppparser/cppBison.yxx"
     {
-  (yyval.u.expr) = (yyvsp[(1) - (1)].u.expr);
 }
     break;
 
-  case 396:
+  case 373:
 /* Line 1792 of yacc.c  */
-#line 2153 "dtool/src/cppparser/cppBison.yxx"
+#line 2147 "dtool/src/cppparser/cppBison.yxx"
     {
-  (yyval.u.expr) = (yyvsp[(1) - (1)].u.expr);
 }
     break;
 
   case 397:
 /* Line 1792 of yacc.c  */
-#line 2157 "dtool/src/cppparser/cppBison.yxx"
+#line 2156 "dtool/src/cppparser/cppBison.yxx"
     {
-  (yyval.u.expr) = new CPPExpression(',', (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr));
+  (yyval.u.expr) = (CPPExpression *)NULL;
 }
     break;
 
   case 398:
 /* Line 1792 of yacc.c  */
-#line 2164 "dtool/src/cppparser/cppBison.yxx"
+#line 2160 "dtool/src/cppparser/cppBison.yxx"
     {
   (yyval.u.expr) = (yyvsp[(1) - (1)].u.expr);
 }
@@ -5884,55 +5910,95 @@ yyreduce:
 
   case 399:
 /* Line 1792 of yacc.c  */
-#line 2168 "dtool/src/cppparser/cppBison.yxx"
+#line 2167 "dtool/src/cppparser/cppBison.yxx"
     {
-  (yyval.u.expr) = new CPPExpression(CPPExpression::typecast_op((yyvsp[(2) - (4)].u.type), (yyvsp[(4) - (4)].u.expr)));
+  (yyval.u.expr) = (CPPExpression *)NULL;
 }
     break;
 
   case 400:
 /* Line 1792 of yacc.c  */
-#line 2172 "dtool/src/cppparser/cppBison.yxx"
+#line 2171 "dtool/src/cppparser/cppBison.yxx"
     {
-  (yyval.u.expr) = new CPPExpression(CPPExpression::typecast_op((yyvsp[(3) - (7)].u.type), (yyvsp[(6) - (7)].u.expr)));
+  (yyval.u.expr) = (yyvsp[(1) - (1)].u.expr);
 }
     break;
 
   case 401:
 /* Line 1792 of yacc.c  */
-#line 2176 "dtool/src/cppparser/cppBison.yxx"
+#line 2178 "dtool/src/cppparser/cppBison.yxx"
     {
-  (yyval.u.expr) = new CPPExpression(CPPExpression::typecast_op((yyvsp[(3) - (7)].u.type), (yyvsp[(6) - (7)].u.expr)));
+  (yyval.u.expr) = (yyvsp[(1) - (1)].u.expr);
 }
     break;
 
   case 402:
 /* Line 1792 of yacc.c  */
-#line 2180 "dtool/src/cppparser/cppBison.yxx"
+#line 2182 "dtool/src/cppparser/cppBison.yxx"
     {
-  (yyval.u.expr) = new CPPExpression(CPPExpression::sizeof_func((yyvsp[(3) - (4)].u.type)));
+  (yyval.u.expr) = new CPPExpression(',', (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr));
 }
     break;
 
   case 403:
 /* Line 1792 of yacc.c  */
-#line 2184 "dtool/src/cppparser/cppBison.yxx"
+#line 2189 "dtool/src/cppparser/cppBison.yxx"
     {
-  (yyval.u.expr) = new CPPExpression(UNARY_NOT, (yyvsp[(2) - (2)].u.expr));
+  (yyval.u.expr) = (yyvsp[(1) - (1)].u.expr);
 }
     break;
 
   case 404:
 /* Line 1792 of yacc.c  */
-#line 2188 "dtool/src/cppparser/cppBison.yxx"
+#line 2193 "dtool/src/cppparser/cppBison.yxx"
     {
-  (yyval.u.expr) = new CPPExpression(UNARY_NEGATE, (yyvsp[(2) - (2)].u.expr));
+  (yyval.u.expr) = new CPPExpression(CPPExpression::typecast_op((yyvsp[(2) - (4)].u.type), (yyvsp[(4) - (4)].u.expr)));
 }
     break;
 
   case 405:
 /* Line 1792 of yacc.c  */
-#line 2192 "dtool/src/cppparser/cppBison.yxx"
+#line 2197 "dtool/src/cppparser/cppBison.yxx"
+    {
+  (yyval.u.expr) = new CPPExpression(CPPExpression::typecast_op((yyvsp[(3) - (7)].u.type), (yyvsp[(6) - (7)].u.expr)));
+}
+    break;
+
+  case 406:
+/* Line 1792 of yacc.c  */
+#line 2201 "dtool/src/cppparser/cppBison.yxx"
+    {
+  (yyval.u.expr) = new CPPExpression(CPPExpression::typecast_op((yyvsp[(3) - (7)].u.type), (yyvsp[(6) - (7)].u.expr)));
+}
+    break;
+
+  case 407:
+/* Line 1792 of yacc.c  */
+#line 2205 "dtool/src/cppparser/cppBison.yxx"
+    {
+  (yyval.u.expr) = new CPPExpression(CPPExpression::sizeof_func((yyvsp[(3) - (4)].u.type)));
+}
+    break;
+
+  case 408:
+/* Line 1792 of yacc.c  */
+#line 2209 "dtool/src/cppparser/cppBison.yxx"
+    {
+  (yyval.u.expr) = new CPPExpression(UNARY_NOT, (yyvsp[(2) - (2)].u.expr));
+}
+    break;
+
+  case 409:
+/* Line 1792 of yacc.c  */
+#line 2213 "dtool/src/cppparser/cppBison.yxx"
+    {
+  (yyval.u.expr) = new CPPExpression(UNARY_NEGATE, (yyvsp[(2) - (2)].u.expr));
+}
+    break;
+
+  case 410:
+/* Line 1792 of yacc.c  */
+#line 2217 "dtool/src/cppparser/cppBison.yxx"
     {
   if ((yyvsp[(2) - (2)].u.expr)->_type == CPPExpression::T_integer) {
     (yyval.u.expr) = (yyvsp[(2) - (2)].u.expr);
@@ -5946,241 +6012,241 @@ yyreduce:
 }
     break;
 
-  case 406:
+  case 411:
 /* Line 1792 of yacc.c  */
-#line 2204 "dtool/src/cppparser/cppBison.yxx"
+#line 2229 "dtool/src/cppparser/cppBison.yxx"
     {
   (yyval.u.expr) = new CPPExpression(UNARY_STAR, (yyvsp[(2) - (2)].u.expr));
 }
     break;
 
-  case 407:
+  case 412:
 /* Line 1792 of yacc.c  */
-#line 2208 "dtool/src/cppparser/cppBison.yxx"
+#line 2233 "dtool/src/cppparser/cppBison.yxx"
     {
   (yyval.u.expr) = new CPPExpression(UNARY_REF, (yyvsp[(2) - (2)].u.expr));
 }
     break;
 
-  case 408:
+  case 413:
 /* Line 1792 of yacc.c  */
-#line 2212 "dtool/src/cppparser/cppBison.yxx"
+#line 2237 "dtool/src/cppparser/cppBison.yxx"
     {
   (yyval.u.expr) = new CPPExpression('*', (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr));
 }
     break;
 
-  case 409:
+  case 414:
 /* Line 1792 of yacc.c  */
-#line 2216 "dtool/src/cppparser/cppBison.yxx"
+#line 2241 "dtool/src/cppparser/cppBison.yxx"
     {
   (yyval.u.expr) = new CPPExpression('/', (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr));
 }
     break;
 
-  case 410:
+  case 415:
 /* Line 1792 of yacc.c  */
-#line 2220 "dtool/src/cppparser/cppBison.yxx"
+#line 2245 "dtool/src/cppparser/cppBison.yxx"
     {
   (yyval.u.expr) = new CPPExpression('%', (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr));
 }
     break;
 
-  case 411:
+  case 416:
 /* Line 1792 of yacc.c  */
-#line 2224 "dtool/src/cppparser/cppBison.yxx"
+#line 2249 "dtool/src/cppparser/cppBison.yxx"
     {
   (yyval.u.expr) = new CPPExpression('+', (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr));
 }
     break;
 
-  case 412:
+  case 417:
 /* Line 1792 of yacc.c  */
-#line 2228 "dtool/src/cppparser/cppBison.yxx"
+#line 2253 "dtool/src/cppparser/cppBison.yxx"
     {
   (yyval.u.expr) = new CPPExpression('-', (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr));
 }
     break;
 
-  case 413:
+  case 418:
 /* Line 1792 of yacc.c  */
-#line 2232 "dtool/src/cppparser/cppBison.yxx"
+#line 2257 "dtool/src/cppparser/cppBison.yxx"
     {
   (yyval.u.expr) = new CPPExpression('|', (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr));
 }
     break;
 
-  case 414:
+  case 419:
 /* Line 1792 of yacc.c  */
-#line 2236 "dtool/src/cppparser/cppBison.yxx"
+#line 2261 "dtool/src/cppparser/cppBison.yxx"
     {
   (yyval.u.expr) = new CPPExpression('^', (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr));
 }
     break;
 
-  case 415:
+  case 420:
 /* Line 1792 of yacc.c  */
-#line 2240 "dtool/src/cppparser/cppBison.yxx"
+#line 2265 "dtool/src/cppparser/cppBison.yxx"
     {
   (yyval.u.expr) = new CPPExpression('&', (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr));
 }
     break;
 
-  case 416:
+  case 421:
 /* Line 1792 of yacc.c  */
-#line 2244 "dtool/src/cppparser/cppBison.yxx"
+#line 2269 "dtool/src/cppparser/cppBison.yxx"
     {
   (yyval.u.expr) = new CPPExpression(OROR, (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr));
 }
     break;
 
-  case 417:
+  case 422:
 /* Line 1792 of yacc.c  */
-#line 2248 "dtool/src/cppparser/cppBison.yxx"
+#line 2273 "dtool/src/cppparser/cppBison.yxx"
     {
   (yyval.u.expr) = new CPPExpression(ANDAND, (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr));
 }
     break;
 
-  case 418:
+  case 423:
 /* Line 1792 of yacc.c  */
-#line 2252 "dtool/src/cppparser/cppBison.yxx"
+#line 2277 "dtool/src/cppparser/cppBison.yxx"
     {
   (yyval.u.expr) = new CPPExpression(EQCOMPARE, (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr));
 }
     break;
 
-  case 419:
+  case 424:
 /* Line 1792 of yacc.c  */
-#line 2256 "dtool/src/cppparser/cppBison.yxx"
+#line 2281 "dtool/src/cppparser/cppBison.yxx"
     {
   (yyval.u.expr) = new CPPExpression(NECOMPARE, (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr));
 }
     break;
 
-  case 420:
+  case 425:
 /* Line 1792 of yacc.c  */
-#line 2260 "dtool/src/cppparser/cppBison.yxx"
+#line 2285 "dtool/src/cppparser/cppBison.yxx"
     {
   (yyval.u.expr) = new CPPExpression(LECOMPARE, (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr));
 }
     break;
 
-  case 421:
+  case 426:
 /* Line 1792 of yacc.c  */
-#line 2264 "dtool/src/cppparser/cppBison.yxx"
+#line 2289 "dtool/src/cppparser/cppBison.yxx"
     {
   (yyval.u.expr) = new CPPExpression(GECOMPARE, (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr));
 }
     break;
 
-  case 422:
+  case 427:
 /* Line 1792 of yacc.c  */
-#line 2268 "dtool/src/cppparser/cppBison.yxx"
+#line 2293 "dtool/src/cppparser/cppBison.yxx"
     {
   (yyval.u.expr) = new CPPExpression(LSHIFT, (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr));
 }
     break;
 
-  case 423:
+  case 428:
 /* Line 1792 of yacc.c  */
-#line 2272 "dtool/src/cppparser/cppBison.yxx"
+#line 2297 "dtool/src/cppparser/cppBison.yxx"
     {
   (yyval.u.expr) = new CPPExpression(RSHIFT, (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr));
 }
     break;
 
-  case 424:
+  case 429:
 /* Line 1792 of yacc.c  */
-#line 2276 "dtool/src/cppparser/cppBison.yxx"
+#line 2301 "dtool/src/cppparser/cppBison.yxx"
     {
   (yyval.u.expr) = new CPPExpression('?', (yyvsp[(1) - (5)].u.expr), (yyvsp[(3) - (5)].u.expr), (yyvsp[(5) - (5)].u.expr));
 }
     break;
 
-  case 425:
+  case 430:
 /* Line 1792 of yacc.c  */
-#line 2280 "dtool/src/cppparser/cppBison.yxx"
+#line 2305 "dtool/src/cppparser/cppBison.yxx"
     {
   (yyval.u.expr) = new CPPExpression('[', (yyvsp[(1) - (4)].u.expr), (yyvsp[(3) - (4)].u.expr));
 }
     break;
 
-  case 426:
+  case 431:
 /* Line 1792 of yacc.c  */
-#line 2284 "dtool/src/cppparser/cppBison.yxx"
+#line 2309 "dtool/src/cppparser/cppBison.yxx"
     {
   (yyval.u.expr) = new CPPExpression('f', (yyvsp[(1) - (4)].u.expr), (yyvsp[(3) - (4)].u.expr));
 }
     break;
 
-  case 427:
+  case 432:
 /* Line 1792 of yacc.c  */
-#line 2288 "dtool/src/cppparser/cppBison.yxx"
+#line 2313 "dtool/src/cppparser/cppBison.yxx"
     {
   (yyval.u.expr) = new CPPExpression('f', (yyvsp[(1) - (3)].u.expr));
 }
     break;
 
-  case 428:
+  case 433:
 /* Line 1792 of yacc.c  */
-#line 2292 "dtool/src/cppparser/cppBison.yxx"
+#line 2317 "dtool/src/cppparser/cppBison.yxx"
     {
   (yyval.u.expr) = new CPPExpression('.', (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr));
 }
     break;
 
-  case 429:
+  case 434:
 /* Line 1792 of yacc.c  */
-#line 2296 "dtool/src/cppparser/cppBison.yxx"
+#line 2321 "dtool/src/cppparser/cppBison.yxx"
     {
   (yyval.u.expr) = new CPPExpression(POINTSAT, (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr));
 }
     break;
 
-  case 430:
+  case 435:
 /* Line 1792 of yacc.c  */
-#line 2300 "dtool/src/cppparser/cppBison.yxx"
+#line 2325 "dtool/src/cppparser/cppBison.yxx"
     {
   (yyval.u.expr) = (yyvsp[(2) - (3)].u.expr);
 }
     break;
 
-  case 431:
+  case 436:
 /* Line 1792 of yacc.c  */
-#line 2308 "dtool/src/cppparser/cppBison.yxx"
+#line 2333 "dtool/src/cppparser/cppBison.yxx"
     {
   (yyval.u.expr) = (yyvsp[(1) - (1)].u.expr);
 }
     break;
 
-  case 432:
+  case 437:
 /* Line 1792 of yacc.c  */
-#line 2312 "dtool/src/cppparser/cppBison.yxx"
+#line 2337 "dtool/src/cppparser/cppBison.yxx"
     {
   (yyval.u.expr) = new CPPExpression(CPPExpression::typecast_op((yyvsp[(2) - (4)].u.type), (yyvsp[(4) - (4)].u.expr)));
 }
     break;
 
-  case 433:
+  case 438:
 /* Line 1792 of yacc.c  */
-#line 2316 "dtool/src/cppparser/cppBison.yxx"
+#line 2341 "dtool/src/cppparser/cppBison.yxx"
     {
   (yyval.u.expr) = new CPPExpression(CPPExpression::typecast_op((yyvsp[(3) - (7)].u.type), (yyvsp[(6) - (7)].u.expr)));
 }
     break;
 
-  case 434:
+  case 439:
 /* Line 1792 of yacc.c  */
-#line 2320 "dtool/src/cppparser/cppBison.yxx"
+#line 2345 "dtool/src/cppparser/cppBison.yxx"
     {
   (yyval.u.expr) = new CPPExpression(CPPExpression::typecast_op((yyvsp[(3) - (7)].u.type), (yyvsp[(6) - (7)].u.expr)));
 }
     break;
 
-  case 435:
+  case 440:
 /* Line 1792 of yacc.c  */
-#line 2324 "dtool/src/cppparser/cppBison.yxx"
+#line 2349 "dtool/src/cppparser/cppBison.yxx"
     {
   // A constructor call.
   CPPType *type = (yyvsp[(1) - (4)].u.identifier)->find_type(current_scope, global_scope, false, current_lexer);
@@ -6189,513 +6255,153 @@ yyreduce:
 }
     break;
 
-  case 436:
-/* Line 1792 of yacc.c  */
-#line 2331 "dtool/src/cppparser/cppBison.yxx"
-    {
-  CPPType *type = 
-    CPPType::new_type(new CPPSimpleType(CPPSimpleType::T_int));
-  (yyval.u.expr) = new CPPExpression(CPPExpression::construct_op(type, (yyvsp[(3) - (4)].u.expr)));
-}
-    break;
-
-  case 437:
-/* Line 1792 of yacc.c  */
-#line 2337 "dtool/src/cppparser/cppBison.yxx"
-    {
-  CPPType *type = 
-    CPPType::new_type(new CPPSimpleType(CPPSimpleType::T_char));
-  (yyval.u.expr) = new CPPExpression(CPPExpression::construct_op(type, (yyvsp[(3) - (4)].u.expr)));
-}
-    break;
-
-  case 438:
-/* Line 1792 of yacc.c  */
-#line 2343 "dtool/src/cppparser/cppBison.yxx"
-    {
-  CPPType *type = 
-    CPPType::new_type(new CPPSimpleType(CPPSimpleType::T_wchar_t));
-  (yyval.u.expr) = new CPPExpression(CPPExpression::construct_op(type, (yyvsp[(3) - (4)].u.expr)));
-}
-    break;
-
-  case 439:
-/* Line 1792 of yacc.c  */
-#line 2349 "dtool/src/cppparser/cppBison.yxx"
-    {
-  CPPType *type = 
-    CPPType::new_type(new CPPSimpleType(CPPSimpleType::T_bool));
-  (yyval.u.expr) = new CPPExpression(CPPExpression::construct_op(type, (yyvsp[(3) - (4)].u.expr)));
-}
-    break;
-
-  case 440:
-/* Line 1792 of yacc.c  */
-#line 2355 "dtool/src/cppparser/cppBison.yxx"
-    {
-  CPPType *type = 
-    CPPType::new_type(new CPPSimpleType(CPPSimpleType::T_int,
-                                        CPPSimpleType::F_short));
-  (yyval.u.expr) = new CPPExpression(CPPExpression::construct_op(type, (yyvsp[(3) - (4)].u.expr)));
-}
-    break;
-
   case 441:
 /* Line 1792 of yacc.c  */
-#line 2362 "dtool/src/cppparser/cppBison.yxx"
+#line 2356 "dtool/src/cppparser/cppBison.yxx"
     {
-  CPPType *type = 
-    CPPType::new_type(new CPPSimpleType(CPPSimpleType::T_int,
-                                        CPPSimpleType::F_long));
+  CPPType *type =
+    CPPType::new_type(new CPPSimpleType(CPPSimpleType::T_int));
   (yyval.u.expr) = new CPPExpression(CPPExpression::construct_op(type, (yyvsp[(3) - (4)].u.expr)));
 }
     break;
 
   case 442:
 /* Line 1792 of yacc.c  */
-#line 2369 "dtool/src/cppparser/cppBison.yxx"
+#line 2362 "dtool/src/cppparser/cppBison.yxx"
     {
-  CPPType *type = 
-    CPPType::new_type(new CPPSimpleType(CPPSimpleType::T_int,
-                                        CPPSimpleType::F_unsigned));
+  CPPType *type =
+    CPPType::new_type(new CPPSimpleType(CPPSimpleType::T_char));
   (yyval.u.expr) = new CPPExpression(CPPExpression::construct_op(type, (yyvsp[(3) - (4)].u.expr)));
 }
     break;
 
   case 443:
 /* Line 1792 of yacc.c  */
-#line 2376 "dtool/src/cppparser/cppBison.yxx"
+#line 2368 "dtool/src/cppparser/cppBison.yxx"
     {
-  CPPType *type = 
-    CPPType::new_type(new CPPSimpleType(CPPSimpleType::T_int,
-                                        CPPSimpleType::F_signed));
+  CPPType *type =
+    CPPType::new_type(new CPPSimpleType(CPPSimpleType::T_wchar_t));
   (yyval.u.expr) = new CPPExpression(CPPExpression::construct_op(type, (yyvsp[(3) - (4)].u.expr)));
 }
     break;
 
   case 444:
 /* Line 1792 of yacc.c  */
-#line 2383 "dtool/src/cppparser/cppBison.yxx"
+#line 2374 "dtool/src/cppparser/cppBison.yxx"
     {
-  CPPType *type = 
-    CPPType::new_type(new CPPSimpleType(CPPSimpleType::T_float));
+  CPPType *type =
+    CPPType::new_type(new CPPSimpleType(CPPSimpleType::T_bool));
   (yyval.u.expr) = new CPPExpression(CPPExpression::construct_op(type, (yyvsp[(3) - (4)].u.expr)));
 }
     break;
 
   case 445:
 /* Line 1792 of yacc.c  */
-#line 2389 "dtool/src/cppparser/cppBison.yxx"
+#line 2380 "dtool/src/cppparser/cppBison.yxx"
     {
-  CPPType *type = 
-    CPPType::new_type(new CPPSimpleType(CPPSimpleType::T_double));
+  CPPType *type =
+    CPPType::new_type(new CPPSimpleType(CPPSimpleType::T_int,
+                                        CPPSimpleType::F_short));
   (yyval.u.expr) = new CPPExpression(CPPExpression::construct_op(type, (yyvsp[(3) - (4)].u.expr)));
 }
     break;
 
   case 446:
 /* Line 1792 of yacc.c  */
-#line 2395 "dtool/src/cppparser/cppBison.yxx"
+#line 2387 "dtool/src/cppparser/cppBison.yxx"
     {
-  (yyval.u.expr) = new CPPExpression(CPPExpression::sizeof_func((yyvsp[(3) - (4)].u.type)));
+  CPPType *type =
+    CPPType::new_type(new CPPSimpleType(CPPSimpleType::T_int,
+                                        CPPSimpleType::F_long));
+  (yyval.u.expr) = new CPPExpression(CPPExpression::construct_op(type, (yyvsp[(3) - (4)].u.expr)));
 }
     break;
 
   case 447:
 /* Line 1792 of yacc.c  */
-#line 2399 "dtool/src/cppparser/cppBison.yxx"
+#line 2394 "dtool/src/cppparser/cppBison.yxx"
     {
-  (yyval.u.expr) = new CPPExpression(CPPExpression::new_op((yyvsp[(2) - (2)].u.type)));
+  CPPType *type =
+    CPPType::new_type(new CPPSimpleType(CPPSimpleType::T_int,
+                                        CPPSimpleType::F_unsigned));
+  (yyval.u.expr) = new CPPExpression(CPPExpression::construct_op(type, (yyvsp[(3) - (4)].u.expr)));
 }
     break;
 
   case 448:
 /* Line 1792 of yacc.c  */
-#line 2403 "dtool/src/cppparser/cppBison.yxx"
+#line 2401 "dtool/src/cppparser/cppBison.yxx"
     {
-  (yyval.u.expr) = new CPPExpression(CPPExpression::new_op((yyvsp[(2) - (5)].u.type), (yyvsp[(4) - (5)].u.expr)));
+  CPPType *type =
+    CPPType::new_type(new CPPSimpleType(CPPSimpleType::T_int,
+                                        CPPSimpleType::F_signed));
+  (yyval.u.expr) = new CPPExpression(CPPExpression::construct_op(type, (yyvsp[(3) - (4)].u.expr)));
 }
     break;
 
   case 449:
 /* Line 1792 of yacc.c  */
-#line 2407 "dtool/src/cppparser/cppBison.yxx"
+#line 2408 "dtool/src/cppparser/cppBison.yxx"
     {
-  (yyval.u.expr) = new CPPExpression(UNARY_NOT, (yyvsp[(2) - (2)].u.expr));
+  CPPType *type =
+    CPPType::new_type(new CPPSimpleType(CPPSimpleType::T_float));
+  (yyval.u.expr) = new CPPExpression(CPPExpression::construct_op(type, (yyvsp[(3) - (4)].u.expr)));
 }
     break;
 
   case 450:
 /* Line 1792 of yacc.c  */
-#line 2411 "dtool/src/cppparser/cppBison.yxx"
+#line 2414 "dtool/src/cppparser/cppBison.yxx"
     {
-  (yyval.u.expr) = new CPPExpression(UNARY_NEGATE, (yyvsp[(2) - (2)].u.expr));
+  CPPType *type =
+    CPPType::new_type(new CPPSimpleType(CPPSimpleType::T_double));
+  (yyval.u.expr) = new CPPExpression(CPPExpression::construct_op(type, (yyvsp[(3) - (4)].u.expr)));
 }
     break;
 
   case 451:
 /* Line 1792 of yacc.c  */
-#line 2415 "dtool/src/cppparser/cppBison.yxx"
-    {
-  if ((yyvsp[(2) - (2)].u.expr)->_type == CPPExpression::T_integer) {
-    (yyval.u.expr) = (yyvsp[(2) - (2)].u.expr);
-    (yyval.u.expr)->_u._integer = -(yyval.u.expr)->_u._integer;
-  } else if ((yyvsp[(2) - (2)].u.expr)->_type == CPPExpression::T_real) {
-    (yyval.u.expr) = (yyvsp[(2) - (2)].u.expr);
-    (yyval.u.expr)->_u._real = -(yyval.u.expr)->_u._real;
-  } else {
-    (yyval.u.expr) = new CPPExpression(UNARY_MINUS, (yyvsp[(2) - (2)].u.expr));
-  }
-}
-    break;
-
-  case 452:
-/* Line 1792 of yacc.c  */
-#line 2427 "dtool/src/cppparser/cppBison.yxx"
-    {
-  (yyval.u.expr) = new CPPExpression(UNARY_STAR, (yyvsp[(2) - (2)].u.expr));
-}
-    break;
-
-  case 453:
-/* Line 1792 of yacc.c  */
-#line 2431 "dtool/src/cppparser/cppBison.yxx"
-    {
-  (yyval.u.expr) = new CPPExpression(UNARY_REF, (yyvsp[(2) - (2)].u.expr));
-}
-    break;
-
-  case 454:
-/* Line 1792 of yacc.c  */
-#line 2435 "dtool/src/cppparser/cppBison.yxx"
-    {
-  (yyval.u.expr) = new CPPExpression('*', (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr));
-}
-    break;
-
-  case 455:
-/* Line 1792 of yacc.c  */
-#line 2439 "dtool/src/cppparser/cppBison.yxx"
-    {
-  (yyval.u.expr) = new CPPExpression('/', (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr));
-}
-    break;
-
-  case 456:
-/* Line 1792 of yacc.c  */
-#line 2443 "dtool/src/cppparser/cppBison.yxx"
-    {
-  (yyval.u.expr) = new CPPExpression('%', (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr));
-}
-    break;
-
-  case 457:
-/* Line 1792 of yacc.c  */
-#line 2447 "dtool/src/cppparser/cppBison.yxx"
-    {
-  (yyval.u.expr) = new CPPExpression('+', (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr));
-}
-    break;
-
-  case 458:
-/* Line 1792 of yacc.c  */
-#line 2451 "dtool/src/cppparser/cppBison.yxx"
-    {
-  (yyval.u.expr) = new CPPExpression('-', (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr));
-}
-    break;
-
-  case 459:
-/* Line 1792 of yacc.c  */
-#line 2455 "dtool/src/cppparser/cppBison.yxx"
-    {
-  (yyval.u.expr) = new CPPExpression('|', (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr));
-}
-    break;
-
-  case 460:
-/* Line 1792 of yacc.c  */
-#line 2459 "dtool/src/cppparser/cppBison.yxx"
-    {
-  (yyval.u.expr) = new CPPExpression('^', (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr));
-}
-    break;
-
-  case 461:
-/* Line 1792 of yacc.c  */
-#line 2463 "dtool/src/cppparser/cppBison.yxx"
-    {
-  (yyval.u.expr) = new CPPExpression('&', (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr));
-}
-    break;
-
-  case 462:
-/* Line 1792 of yacc.c  */
-#line 2467 "dtool/src/cppparser/cppBison.yxx"
-    {
-  (yyval.u.expr) = new CPPExpression(OROR, (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr));
-}
-    break;
-
-  case 463:
-/* Line 1792 of yacc.c  */
-#line 2471 "dtool/src/cppparser/cppBison.yxx"
-    {
-  (yyval.u.expr) = new CPPExpression(ANDAND, (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr));
-}
-    break;
-
-  case 464:
-/* Line 1792 of yacc.c  */
-#line 2475 "dtool/src/cppparser/cppBison.yxx"
-    {
-  (yyval.u.expr) = new CPPExpression(EQCOMPARE, (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr));
-}
-    break;
-
-  case 465:
-/* Line 1792 of yacc.c  */
-#line 2479 "dtool/src/cppparser/cppBison.yxx"
-    {
-  (yyval.u.expr) = new CPPExpression(NECOMPARE, (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr));
-}
-    break;
-
-  case 466:
-/* Line 1792 of yacc.c  */
-#line 2483 "dtool/src/cppparser/cppBison.yxx"
-    {
-  (yyval.u.expr) = new CPPExpression(LECOMPARE, (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr));
-}
-    break;
-
-  case 467:
-/* Line 1792 of yacc.c  */
-#line 2487 "dtool/src/cppparser/cppBison.yxx"
-    {
-  (yyval.u.expr) = new CPPExpression(GECOMPARE, (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr));
-}
-    break;
-
-  case 468:
-/* Line 1792 of yacc.c  */
-#line 2491 "dtool/src/cppparser/cppBison.yxx"
-    {
-  (yyval.u.expr) = new CPPExpression('<', (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr));
-}
-    break;
-
-  case 469:
-/* Line 1792 of yacc.c  */
-#line 2495 "dtool/src/cppparser/cppBison.yxx"
-    {
-  (yyval.u.expr) = new CPPExpression('>', (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr));
-}
-    break;
-
-  case 470:
-/* Line 1792 of yacc.c  */
-#line 2499 "dtool/src/cppparser/cppBison.yxx"
-    {
-  (yyval.u.expr) = new CPPExpression(LSHIFT, (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr));
-}
-    break;
-
-  case 471:
-/* Line 1792 of yacc.c  */
-#line 2503 "dtool/src/cppparser/cppBison.yxx"
-    {
-  (yyval.u.expr) = new CPPExpression(RSHIFT, (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr));
-}
-    break;
-
-  case 472:
-/* Line 1792 of yacc.c  */
-#line 2507 "dtool/src/cppparser/cppBison.yxx"
-    {
-  (yyval.u.expr) = new CPPExpression('?', (yyvsp[(1) - (5)].u.expr), (yyvsp[(3) - (5)].u.expr), (yyvsp[(5) - (5)].u.expr));
-}
-    break;
-
-  case 473:
-/* Line 1792 of yacc.c  */
-#line 2511 "dtool/src/cppparser/cppBison.yxx"
-    {
-  (yyval.u.expr) = new CPPExpression('[', (yyvsp[(1) - (4)].u.expr), (yyvsp[(3) - (4)].u.expr));
-}
-    break;
-
-  case 474:
-/* Line 1792 of yacc.c  */
-#line 2515 "dtool/src/cppparser/cppBison.yxx"
-    {
-  (yyval.u.expr) = new CPPExpression('f', (yyvsp[(1) - (4)].u.expr), (yyvsp[(3) - (4)].u.expr));
-}
-    break;
-
-  case 475:
-/* Line 1792 of yacc.c  */
-#line 2519 "dtool/src/cppparser/cppBison.yxx"
-    {
-  (yyval.u.expr) = new CPPExpression('f', (yyvsp[(1) - (3)].u.expr));
-}
-    break;
-
-  case 476:
-/* Line 1792 of yacc.c  */
-#line 2523 "dtool/src/cppparser/cppBison.yxx"
-    {
-  (yyval.u.expr) = new CPPExpression('.', (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr));
-}
-    break;
-
-  case 477:
-/* Line 1792 of yacc.c  */
-#line 2527 "dtool/src/cppparser/cppBison.yxx"
-    {
-  (yyval.u.expr) = new CPPExpression(POINTSAT, (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr));
-}
-    break;
-
-  case 478:
-/* Line 1792 of yacc.c  */
-#line 2531 "dtool/src/cppparser/cppBison.yxx"
-    {
-  (yyval.u.expr) = (yyvsp[(2) - (3)].u.expr);
-}
-    break;
-
-  case 479:
-/* Line 1792 of yacc.c  */
-#line 2538 "dtool/src/cppparser/cppBison.yxx"
-    {
-  (yyval.u.expr) = new CPPExpression((yyvsp[(1) - (1)].u.integer));
-}
-    break;
-
-  case 480:
-/* Line 1792 of yacc.c  */
-#line 2542 "dtool/src/cppparser/cppBison.yxx"
-    {
-  (yyval.u.expr) = new CPPExpression(true);
-}
-    break;
-
-  case 481:
-/* Line 1792 of yacc.c  */
-#line 2546 "dtool/src/cppparser/cppBison.yxx"
-    {
-  (yyval.u.expr) = new CPPExpression(false);
-}
-    break;
-
-  case 482:
-/* Line 1792 of yacc.c  */
-#line 2550 "dtool/src/cppparser/cppBison.yxx"
-    {
-  (yyval.u.expr) = new CPPExpression((yyvsp[(1) - (1)].u.integer));
-}
-    break;
-
-  case 483:
-/* Line 1792 of yacc.c  */
-#line 2554 "dtool/src/cppparser/cppBison.yxx"
-    {
-  (yyval.u.expr) = new CPPExpression((yyvsp[(1) - (1)].u.real));
-}
-    break;
-
-  case 484:
-/* Line 1792 of yacc.c  */
-#line 2558 "dtool/src/cppparser/cppBison.yxx"
-    {
-  (yyval.u.expr) = new CPPExpression((yyvsp[(1) - (1)].str));
-}
-    break;
-
-  case 485:
-/* Line 1792 of yacc.c  */
-#line 2562 "dtool/src/cppparser/cppBison.yxx"
-    {
-  (yyval.u.expr) = new CPPExpression((yyvsp[(1) - (1)].u.identifier), current_scope, global_scope, current_lexer);
-}
-    break;
-
-  case 486:
-/* Line 1792 of yacc.c  */
-#line 2576 "dtool/src/cppparser/cppBison.yxx"
-    {
-  (yyval.u.expr) = (yyvsp[(1) - (1)].u.expr);
-}
-    break;
-
-  case 487:
-/* Line 1792 of yacc.c  */
-#line 2580 "dtool/src/cppparser/cppBison.yxx"
-    {
-  (yyval.u.expr) = new CPPExpression(CPPExpression::typecast_op((yyvsp[(2) - (4)].u.type), (yyvsp[(4) - (4)].u.expr)));
-}
-    break;
-
-  case 488:
-/* Line 1792 of yacc.c  */
-#line 2584 "dtool/src/cppparser/cppBison.yxx"
-    {
-  (yyval.u.expr) = new CPPExpression(CPPExpression::typecast_op((yyvsp[(3) - (7)].u.type), (yyvsp[(6) - (7)].u.expr)));
-}
-    break;
-
-  case 489:
-/* Line 1792 of yacc.c  */
-#line 2588 "dtool/src/cppparser/cppBison.yxx"
-    {
-  (yyval.u.expr) = new CPPExpression(CPPExpression::typecast_op((yyvsp[(3) - (7)].u.type), (yyvsp[(6) - (7)].u.expr)));
-}
-    break;
-
-  case 490:
-/* Line 1792 of yacc.c  */
-#line 2592 "dtool/src/cppparser/cppBison.yxx"
+#line 2420 "dtool/src/cppparser/cppBison.yxx"
     {
   (yyval.u.expr) = new CPPExpression(CPPExpression::sizeof_func((yyvsp[(3) - (4)].u.type)));
 }
     break;
 
-  case 491:
+  case 452:
 /* Line 1792 of yacc.c  */
-#line 2596 "dtool/src/cppparser/cppBison.yxx"
+#line 2424 "dtool/src/cppparser/cppBison.yxx"
     {
   (yyval.u.expr) = new CPPExpression(CPPExpression::new_op((yyvsp[(2) - (2)].u.type)));
 }
     break;
 
-  case 492:
+  case 453:
 /* Line 1792 of yacc.c  */
-#line 2600 "dtool/src/cppparser/cppBison.yxx"
+#line 2428 "dtool/src/cppparser/cppBison.yxx"
     {
   (yyval.u.expr) = new CPPExpression(CPPExpression::new_op((yyvsp[(2) - (5)].u.type), (yyvsp[(4) - (5)].u.expr)));
 }
     break;
 
-  case 493:
+  case 454:
 /* Line 1792 of yacc.c  */
-#line 2604 "dtool/src/cppparser/cppBison.yxx"
+#line 2432 "dtool/src/cppparser/cppBison.yxx"
     {
   (yyval.u.expr) = new CPPExpression(UNARY_NOT, (yyvsp[(2) - (2)].u.expr));
 }
     break;
 
-  case 494:
+  case 455:
 /* Line 1792 of yacc.c  */
-#line 2608 "dtool/src/cppparser/cppBison.yxx"
+#line 2436 "dtool/src/cppparser/cppBison.yxx"
     {
   (yyval.u.expr) = new CPPExpression(UNARY_NEGATE, (yyvsp[(2) - (2)].u.expr));
 }
     break;
 
-  case 495:
+  case 456:
 /* Line 1792 of yacc.c  */
-#line 2612 "dtool/src/cppparser/cppBison.yxx"
+#line 2440 "dtool/src/cppparser/cppBison.yxx"
     {
   if ((yyvsp[(2) - (2)].u.expr)->_type == CPPExpression::T_integer) {
     (yyval.u.expr) = (yyvsp[(2) - (2)].u.expr);
@@ -6709,265 +6415,625 @@ yyreduce:
 }
     break;
 
-  case 496:
+  case 457:
 /* Line 1792 of yacc.c  */
-#line 2624 "dtool/src/cppparser/cppBison.yxx"
+#line 2452 "dtool/src/cppparser/cppBison.yxx"
+    {
+  (yyval.u.expr) = new CPPExpression(UNARY_STAR, (yyvsp[(2) - (2)].u.expr));
+}
+    break;
+
+  case 458:
+/* Line 1792 of yacc.c  */
+#line 2456 "dtool/src/cppparser/cppBison.yxx"
     {
   (yyval.u.expr) = new CPPExpression(UNARY_REF, (yyvsp[(2) - (2)].u.expr));
 }
     break;
 
-  case 497:
+  case 459:
 /* Line 1792 of yacc.c  */
-#line 2628 "dtool/src/cppparser/cppBison.yxx"
+#line 2460 "dtool/src/cppparser/cppBison.yxx"
     {
   (yyval.u.expr) = new CPPExpression('*', (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr));
 }
     break;
 
-  case 498:
+  case 460:
 /* Line 1792 of yacc.c  */
-#line 2632 "dtool/src/cppparser/cppBison.yxx"
+#line 2464 "dtool/src/cppparser/cppBison.yxx"
     {
   (yyval.u.expr) = new CPPExpression('/', (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr));
 }
     break;
 
-  case 499:
+  case 461:
 /* Line 1792 of yacc.c  */
-#line 2636 "dtool/src/cppparser/cppBison.yxx"
+#line 2468 "dtool/src/cppparser/cppBison.yxx"
     {
   (yyval.u.expr) = new CPPExpression('%', (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr));
 }
     break;
 
-  case 500:
+  case 462:
 /* Line 1792 of yacc.c  */
-#line 2640 "dtool/src/cppparser/cppBison.yxx"
+#line 2472 "dtool/src/cppparser/cppBison.yxx"
     {
   (yyval.u.expr) = new CPPExpression('+', (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr));
 }
     break;
 
-  case 501:
+  case 463:
 /* Line 1792 of yacc.c  */
-#line 2644 "dtool/src/cppparser/cppBison.yxx"
+#line 2476 "dtool/src/cppparser/cppBison.yxx"
     {
   (yyval.u.expr) = new CPPExpression('-', (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr));
 }
     break;
 
-  case 502:
+  case 464:
 /* Line 1792 of yacc.c  */
-#line 2648 "dtool/src/cppparser/cppBison.yxx"
+#line 2480 "dtool/src/cppparser/cppBison.yxx"
     {
   (yyval.u.expr) = new CPPExpression('|', (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr));
 }
     break;
 
-  case 503:
+  case 465:
 /* Line 1792 of yacc.c  */
-#line 2652 "dtool/src/cppparser/cppBison.yxx"
+#line 2484 "dtool/src/cppparser/cppBison.yxx"
     {
   (yyval.u.expr) = new CPPExpression('^', (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr));
 }
     break;
 
-  case 504:
+  case 466:
 /* Line 1792 of yacc.c  */
-#line 2656 "dtool/src/cppparser/cppBison.yxx"
+#line 2488 "dtool/src/cppparser/cppBison.yxx"
     {
   (yyval.u.expr) = new CPPExpression('&', (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr));
 }
     break;
 
-  case 505:
+  case 467:
 /* Line 1792 of yacc.c  */
-#line 2660 "dtool/src/cppparser/cppBison.yxx"
+#line 2492 "dtool/src/cppparser/cppBison.yxx"
     {
   (yyval.u.expr) = new CPPExpression(OROR, (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr));
 }
     break;
 
-  case 506:
+  case 468:
 /* Line 1792 of yacc.c  */
-#line 2664 "dtool/src/cppparser/cppBison.yxx"
+#line 2496 "dtool/src/cppparser/cppBison.yxx"
     {
   (yyval.u.expr) = new CPPExpression(ANDAND, (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr));
 }
     break;
 
-  case 507:
+  case 469:
 /* Line 1792 of yacc.c  */
-#line 2668 "dtool/src/cppparser/cppBison.yxx"
+#line 2500 "dtool/src/cppparser/cppBison.yxx"
     {
   (yyval.u.expr) = new CPPExpression(EQCOMPARE, (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr));
 }
     break;
 
-  case 508:
+  case 470:
 /* Line 1792 of yacc.c  */
-#line 2672 "dtool/src/cppparser/cppBison.yxx"
+#line 2504 "dtool/src/cppparser/cppBison.yxx"
     {
   (yyval.u.expr) = new CPPExpression(NECOMPARE, (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr));
 }
     break;
 
-  case 509:
+  case 471:
 /* Line 1792 of yacc.c  */
-#line 2676 "dtool/src/cppparser/cppBison.yxx"
+#line 2508 "dtool/src/cppparser/cppBison.yxx"
     {
   (yyval.u.expr) = new CPPExpression(LECOMPARE, (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr));
 }
     break;
 
-  case 510:
+  case 472:
 /* Line 1792 of yacc.c  */
-#line 2680 "dtool/src/cppparser/cppBison.yxx"
+#line 2512 "dtool/src/cppparser/cppBison.yxx"
     {
   (yyval.u.expr) = new CPPExpression(GECOMPARE, (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr));
 }
     break;
 
-  case 511:
+  case 473:
 /* Line 1792 of yacc.c  */
-#line 2684 "dtool/src/cppparser/cppBison.yxx"
+#line 2516 "dtool/src/cppparser/cppBison.yxx"
     {
   (yyval.u.expr) = new CPPExpression('<', (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr));
 }
     break;
 
-  case 512:
+  case 474:
 /* Line 1792 of yacc.c  */
-#line 2688 "dtool/src/cppparser/cppBison.yxx"
+#line 2520 "dtool/src/cppparser/cppBison.yxx"
     {
   (yyval.u.expr) = new CPPExpression('>', (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr));
 }
     break;
 
-  case 513:
+  case 475:
 /* Line 1792 of yacc.c  */
-#line 2692 "dtool/src/cppparser/cppBison.yxx"
+#line 2524 "dtool/src/cppparser/cppBison.yxx"
     {
   (yyval.u.expr) = new CPPExpression(LSHIFT, (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr));
 }
     break;
 
-  case 514:
+  case 476:
 /* Line 1792 of yacc.c  */
-#line 2696 "dtool/src/cppparser/cppBison.yxx"
+#line 2528 "dtool/src/cppparser/cppBison.yxx"
     {
   (yyval.u.expr) = new CPPExpression(RSHIFT, (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr));
 }
     break;
 
-  case 515:
+  case 477:
 /* Line 1792 of yacc.c  */
-#line 2700 "dtool/src/cppparser/cppBison.yxx"
+#line 2532 "dtool/src/cppparser/cppBison.yxx"
     {
   (yyval.u.expr) = new CPPExpression('?', (yyvsp[(1) - (5)].u.expr), (yyvsp[(3) - (5)].u.expr), (yyvsp[(5) - (5)].u.expr));
 }
     break;
 
-  case 516:
+  case 478:
 /* Line 1792 of yacc.c  */
-#line 2704 "dtool/src/cppparser/cppBison.yxx"
+#line 2536 "dtool/src/cppparser/cppBison.yxx"
     {
   (yyval.u.expr) = new CPPExpression('[', (yyvsp[(1) - (4)].u.expr), (yyvsp[(3) - (4)].u.expr));
 }
     break;
 
-  case 517:
+  case 479:
 /* Line 1792 of yacc.c  */
-#line 2708 "dtool/src/cppparser/cppBison.yxx"
+#line 2540 "dtool/src/cppparser/cppBison.yxx"
     {
   (yyval.u.expr) = new CPPExpression('f', (yyvsp[(1) - (4)].u.expr), (yyvsp[(3) - (4)].u.expr));
 }
     break;
 
-  case 518:
+  case 480:
 /* Line 1792 of yacc.c  */
-#line 2712 "dtool/src/cppparser/cppBison.yxx"
+#line 2544 "dtool/src/cppparser/cppBison.yxx"
     {
   (yyval.u.expr) = new CPPExpression('f', (yyvsp[(1) - (3)].u.expr));
 }
     break;
 
-  case 519:
+  case 481:
 /* Line 1792 of yacc.c  */
-#line 2716 "dtool/src/cppparser/cppBison.yxx"
+#line 2548 "dtool/src/cppparser/cppBison.yxx"
     {
   (yyval.u.expr) = new CPPExpression('.', (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr));
 }
     break;
 
-  case 520:
+  case 482:
 /* Line 1792 of yacc.c  */
-#line 2720 "dtool/src/cppparser/cppBison.yxx"
+#line 2552 "dtool/src/cppparser/cppBison.yxx"
     {
   (yyval.u.expr) = new CPPExpression(POINTSAT, (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr));
 }
     break;
 
-  case 521:
+  case 483:
 /* Line 1792 of yacc.c  */
-#line 2724 "dtool/src/cppparser/cppBison.yxx"
+#line 2556 "dtool/src/cppparser/cppBison.yxx"
     {
   (yyval.u.expr) = (yyvsp[(2) - (3)].u.expr);
 }
     break;
 
-  case 522:
+  case 484:
 /* Line 1792 of yacc.c  */
-#line 2731 "dtool/src/cppparser/cppBison.yxx"
+#line 2563 "dtool/src/cppparser/cppBison.yxx"
     {
   (yyval.u.expr) = new CPPExpression((yyvsp[(1) - (1)].u.integer));
 }
     break;
 
-  case 523:
+  case 485:
 /* Line 1792 of yacc.c  */
-#line 2735 "dtool/src/cppparser/cppBison.yxx"
+#line 2567 "dtool/src/cppparser/cppBison.yxx"
     {
   (yyval.u.expr) = new CPPExpression(true);
 }
     break;
 
-  case 524:
+  case 486:
 /* Line 1792 of yacc.c  */
-#line 2739 "dtool/src/cppparser/cppBison.yxx"
+#line 2571 "dtool/src/cppparser/cppBison.yxx"
     {
   (yyval.u.expr) = new CPPExpression(false);
 }
     break;
 
-  case 525:
+  case 487:
 /* Line 1792 of yacc.c  */
-#line 2743 "dtool/src/cppparser/cppBison.yxx"
+#line 2575 "dtool/src/cppparser/cppBison.yxx"
     {
   (yyval.u.expr) = new CPPExpression((yyvsp[(1) - (1)].u.integer));
 }
     break;
 
-  case 526:
+  case 488:
 /* Line 1792 of yacc.c  */
-#line 2747 "dtool/src/cppparser/cppBison.yxx"
+#line 2579 "dtool/src/cppparser/cppBison.yxx"
     {
   (yyval.u.expr) = new CPPExpression((yyvsp[(1) - (1)].u.real));
 }
     break;
 
-  case 527:
+  case 489:
 /* Line 1792 of yacc.c  */
-#line 2751 "dtool/src/cppparser/cppBison.yxx"
+#line 2583 "dtool/src/cppparser/cppBison.yxx"
     {
   (yyval.u.expr) = new CPPExpression((yyvsp[(1) - (1)].str));
 }
     break;
 
+  case 490:
+/* Line 1792 of yacc.c  */
+#line 2587 "dtool/src/cppparser/cppBison.yxx"
+    {
+  (yyval.u.expr) = new CPPExpression((yyvsp[(1) - (1)].u.identifier), current_scope, global_scope, current_lexer);
+}
+    break;
+
+  case 491:
+/* Line 1792 of yacc.c  */
+#line 2601 "dtool/src/cppparser/cppBison.yxx"
+    {
+  (yyval.u.expr) = (yyvsp[(1) - (1)].u.expr);
+}
+    break;
+
+  case 492:
+/* Line 1792 of yacc.c  */
+#line 2605 "dtool/src/cppparser/cppBison.yxx"
+    {
+  (yyval.u.expr) = new CPPExpression(CPPExpression::typecast_op((yyvsp[(2) - (4)].u.type), (yyvsp[(4) - (4)].u.expr)));
+}
+    break;
+
+  case 493:
+/* Line 1792 of yacc.c  */
+#line 2609 "dtool/src/cppparser/cppBison.yxx"
+    {
+  (yyval.u.expr) = new CPPExpression(CPPExpression::typecast_op((yyvsp[(3) - (7)].u.type), (yyvsp[(6) - (7)].u.expr)));
+}
+    break;
+
+  case 494:
+/* Line 1792 of yacc.c  */
+#line 2613 "dtool/src/cppparser/cppBison.yxx"
+    {
+  (yyval.u.expr) = new CPPExpression(CPPExpression::typecast_op((yyvsp[(3) - (7)].u.type), (yyvsp[(6) - (7)].u.expr)));
+}
+    break;
+
+  case 495:
+/* Line 1792 of yacc.c  */
+#line 2617 "dtool/src/cppparser/cppBison.yxx"
+    {
+  (yyval.u.expr) = new CPPExpression(CPPExpression::sizeof_func((yyvsp[(3) - (4)].u.type)));
+}
+    break;
+
+  case 496:
+/* Line 1792 of yacc.c  */
+#line 2621 "dtool/src/cppparser/cppBison.yxx"
+    {
+  (yyval.u.expr) = new CPPExpression(CPPExpression::new_op((yyvsp[(2) - (2)].u.type)));
+}
+    break;
+
+  case 497:
+/* Line 1792 of yacc.c  */
+#line 2625 "dtool/src/cppparser/cppBison.yxx"
+    {
+  (yyval.u.expr) = new CPPExpression(CPPExpression::new_op((yyvsp[(2) - (5)].u.type), (yyvsp[(4) - (5)].u.expr)));
+}
+    break;
+
+  case 498:
+/* Line 1792 of yacc.c  */
+#line 2629 "dtool/src/cppparser/cppBison.yxx"
+    {
+  (yyval.u.expr) = new CPPExpression(UNARY_NOT, (yyvsp[(2) - (2)].u.expr));
+}
+    break;
+
+  case 499:
+/* Line 1792 of yacc.c  */
+#line 2633 "dtool/src/cppparser/cppBison.yxx"
+    {
+  (yyval.u.expr) = new CPPExpression(UNARY_NEGATE, (yyvsp[(2) - (2)].u.expr));
+}
+    break;
+
+  case 500:
+/* Line 1792 of yacc.c  */
+#line 2637 "dtool/src/cppparser/cppBison.yxx"
+    {
+  if ((yyvsp[(2) - (2)].u.expr)->_type == CPPExpression::T_integer) {
+    (yyval.u.expr) = (yyvsp[(2) - (2)].u.expr);
+    (yyval.u.expr)->_u._integer = -(yyval.u.expr)->_u._integer;
+  } else if ((yyvsp[(2) - (2)].u.expr)->_type == CPPExpression::T_real) {
+    (yyval.u.expr) = (yyvsp[(2) - (2)].u.expr);
+    (yyval.u.expr)->_u._real = -(yyval.u.expr)->_u._real;
+  } else {
+    (yyval.u.expr) = new CPPExpression(UNARY_MINUS, (yyvsp[(2) - (2)].u.expr));
+  }
+}
+    break;
+
+  case 501:
+/* Line 1792 of yacc.c  */
+#line 2649 "dtool/src/cppparser/cppBison.yxx"
+    {
+  (yyval.u.expr) = new CPPExpression(UNARY_REF, (yyvsp[(2) - (2)].u.expr));
+}
+    break;
+
+  case 502:
+/* Line 1792 of yacc.c  */
+#line 2653 "dtool/src/cppparser/cppBison.yxx"
+    {
+  (yyval.u.expr) = new CPPExpression('*', (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr));
+}
+    break;
+
+  case 503:
+/* Line 1792 of yacc.c  */
+#line 2657 "dtool/src/cppparser/cppBison.yxx"
+    {
+  (yyval.u.expr) = new CPPExpression('/', (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr));
+}
+    break;
+
+  case 504:
+/* Line 1792 of yacc.c  */
+#line 2661 "dtool/src/cppparser/cppBison.yxx"
+    {
+  (yyval.u.expr) = new CPPExpression('%', (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr));
+}
+    break;
+
+  case 505:
+/* Line 1792 of yacc.c  */
+#line 2665 "dtool/src/cppparser/cppBison.yxx"
+    {
+  (yyval.u.expr) = new CPPExpression('+', (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr));
+}
+    break;
+
+  case 506:
+/* Line 1792 of yacc.c  */
+#line 2669 "dtool/src/cppparser/cppBison.yxx"
+    {
+  (yyval.u.expr) = new CPPExpression('-', (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr));
+}
+    break;
+
+  case 507:
+/* Line 1792 of yacc.c  */
+#line 2673 "dtool/src/cppparser/cppBison.yxx"
+    {
+  (yyval.u.expr) = new CPPExpression('|', (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr));
+}
+    break;
+
+  case 508:
+/* Line 1792 of yacc.c  */
+#line 2677 "dtool/src/cppparser/cppBison.yxx"
+    {
+  (yyval.u.expr) = new CPPExpression('^', (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr));
+}
+    break;
+
+  case 509:
+/* Line 1792 of yacc.c  */
+#line 2681 "dtool/src/cppparser/cppBison.yxx"
+    {
+  (yyval.u.expr) = new CPPExpression('&', (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr));
+}
+    break;
+
+  case 510:
+/* Line 1792 of yacc.c  */
+#line 2685 "dtool/src/cppparser/cppBison.yxx"
+    {
+  (yyval.u.expr) = new CPPExpression(OROR, (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr));
+}
+    break;
+
+  case 511:
+/* Line 1792 of yacc.c  */
+#line 2689 "dtool/src/cppparser/cppBison.yxx"
+    {
+  (yyval.u.expr) = new CPPExpression(ANDAND, (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr));
+}
+    break;
+
+  case 512:
+/* Line 1792 of yacc.c  */
+#line 2693 "dtool/src/cppparser/cppBison.yxx"
+    {
+  (yyval.u.expr) = new CPPExpression(EQCOMPARE, (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr));
+}
+    break;
+
+  case 513:
+/* Line 1792 of yacc.c  */
+#line 2697 "dtool/src/cppparser/cppBison.yxx"
+    {
+  (yyval.u.expr) = new CPPExpression(NECOMPARE, (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr));
+}
+    break;
+
+  case 514:
+/* Line 1792 of yacc.c  */
+#line 2701 "dtool/src/cppparser/cppBison.yxx"
+    {
+  (yyval.u.expr) = new CPPExpression(LECOMPARE, (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr));
+}
+    break;
+
+  case 515:
+/* Line 1792 of yacc.c  */
+#line 2705 "dtool/src/cppparser/cppBison.yxx"
+    {
+  (yyval.u.expr) = new CPPExpression(GECOMPARE, (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr));
+}
+    break;
+
+  case 516:
+/* Line 1792 of yacc.c  */
+#line 2709 "dtool/src/cppparser/cppBison.yxx"
+    {
+  (yyval.u.expr) = new CPPExpression('<', (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr));
+}
+    break;
+
+  case 517:
+/* Line 1792 of yacc.c  */
+#line 2713 "dtool/src/cppparser/cppBison.yxx"
+    {
+  (yyval.u.expr) = new CPPExpression('>', (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr));
+}
+    break;
+
+  case 518:
+/* Line 1792 of yacc.c  */
+#line 2717 "dtool/src/cppparser/cppBison.yxx"
+    {
+  (yyval.u.expr) = new CPPExpression(LSHIFT, (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr));
+}
+    break;
+
+  case 519:
+/* Line 1792 of yacc.c  */
+#line 2721 "dtool/src/cppparser/cppBison.yxx"
+    {
+  (yyval.u.expr) = new CPPExpression(RSHIFT, (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr));
+}
+    break;
+
+  case 520:
+/* Line 1792 of yacc.c  */
+#line 2725 "dtool/src/cppparser/cppBison.yxx"
+    {
+  (yyval.u.expr) = new CPPExpression('?', (yyvsp[(1) - (5)].u.expr), (yyvsp[(3) - (5)].u.expr), (yyvsp[(5) - (5)].u.expr));
+}
+    break;
+
+  case 521:
+/* Line 1792 of yacc.c  */
+#line 2729 "dtool/src/cppparser/cppBison.yxx"
+    {
+  (yyval.u.expr) = new CPPExpression('[', (yyvsp[(1) - (4)].u.expr), (yyvsp[(3) - (4)].u.expr));
+}
+    break;
+
+  case 522:
+/* Line 1792 of yacc.c  */
+#line 2733 "dtool/src/cppparser/cppBison.yxx"
+    {
+  (yyval.u.expr) = new CPPExpression('f', (yyvsp[(1) - (4)].u.expr), (yyvsp[(3) - (4)].u.expr));
+}
+    break;
+
+  case 523:
+/* Line 1792 of yacc.c  */
+#line 2737 "dtool/src/cppparser/cppBison.yxx"
+    {
+  (yyval.u.expr) = new CPPExpression('f', (yyvsp[(1) - (3)].u.expr));
+}
+    break;
+
+  case 524:
+/* Line 1792 of yacc.c  */
+#line 2741 "dtool/src/cppparser/cppBison.yxx"
+    {
+  (yyval.u.expr) = new CPPExpression('.', (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr));
+}
+    break;
+
+  case 525:
+/* Line 1792 of yacc.c  */
+#line 2745 "dtool/src/cppparser/cppBison.yxx"
+    {
+  (yyval.u.expr) = new CPPExpression(POINTSAT, (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr));
+}
+    break;
+
+  case 526:
+/* Line 1792 of yacc.c  */
+#line 2749 "dtool/src/cppparser/cppBison.yxx"
+    {
+  (yyval.u.expr) = (yyvsp[(2) - (3)].u.expr);
+}
+    break;
+
+  case 527:
+/* Line 1792 of yacc.c  */
+#line 2756 "dtool/src/cppparser/cppBison.yxx"
+    {
+  (yyval.u.expr) = new CPPExpression((yyvsp[(1) - (1)].u.integer));
+}
+    break;
+
   case 528:
 /* Line 1792 of yacc.c  */
-#line 2758 "dtool/src/cppparser/cppBison.yxx"
+#line 2760 "dtool/src/cppparser/cppBison.yxx"
+    {
+  (yyval.u.expr) = new CPPExpression(true);
+}
+    break;
+
+  case 529:
+/* Line 1792 of yacc.c  */
+#line 2764 "dtool/src/cppparser/cppBison.yxx"
+    {
+  (yyval.u.expr) = new CPPExpression(false);
+}
+    break;
+
+  case 530:
+/* Line 1792 of yacc.c  */
+#line 2768 "dtool/src/cppparser/cppBison.yxx"
+    {
+  (yyval.u.expr) = new CPPExpression((yyvsp[(1) - (1)].u.integer));
+}
+    break;
+
+  case 531:
+/* Line 1792 of yacc.c  */
+#line 2772 "dtool/src/cppparser/cppBison.yxx"
+    {
+  (yyval.u.expr) = new CPPExpression((yyvsp[(1) - (1)].u.real));
+}
+    break;
+
+  case 532:
+/* Line 1792 of yacc.c  */
+#line 2776 "dtool/src/cppparser/cppBison.yxx"
+    {
+  (yyval.u.expr) = new CPPExpression((yyvsp[(1) - (1)].str));
+}
+    break;
+
+  case 533:
+/* Line 1792 of yacc.c  */
+#line 2783 "dtool/src/cppparser/cppBison.yxx"
     {
   CPPType *type = (yyvsp[(1) - (1)].u.identifier)->find_type(current_scope, global_scope, true);
   if (type == NULL) {
@@ -6977,9 +7043,9 @@ yyreduce:
 }
     break;
 
-  case 529:
+  case 534:
 /* Line 1792 of yacc.c  */
-#line 2766 "dtool/src/cppparser/cppBison.yxx"
+#line 2791 "dtool/src/cppparser/cppBison.yxx"
     {
   CPPType *type = (yyvsp[(2) - (2)].u.identifier)->find_type(current_scope, global_scope, true, current_lexer);
   if (type == NULL) {
@@ -6989,41 +7055,41 @@ yyreduce:
 }
     break;
 
-  case 530:
+  case 535:
 /* Line 1792 of yacc.c  */
-#line 2774 "dtool/src/cppparser/cppBison.yxx"
+#line 2799 "dtool/src/cppparser/cppBison.yxx"
     {
   (yyval.u.type) = CPPType::new_type(new CPPTBDType((yyvsp[(2) - (2)].u.identifier)));
 }
     break;
 
-  case 531:
+  case 536:
 /* Line 1792 of yacc.c  */
-#line 2797 "dtool/src/cppparser/cppBison.yxx"
+#line 2822 "dtool/src/cppparser/cppBison.yxx"
     {
   (yyval.u.identifier) = (yyvsp[(1) - (1)].u.identifier);
 }
     break;
 
-  case 532:
+  case 537:
 /* Line 1792 of yacc.c  */
-#line 2801 "dtool/src/cppparser/cppBison.yxx"
+#line 2826 "dtool/src/cppparser/cppBison.yxx"
     {
   (yyval.u.identifier) = (yyvsp[(1) - (1)].u.identifier);
 }
     break;
 
-  case 533:
+  case 538:
 /* Line 1792 of yacc.c  */
-#line 2808 "dtool/src/cppparser/cppBison.yxx"
+#line 2833 "dtool/src/cppparser/cppBison.yxx"
     {
   (yyval.str) = (yyvsp[(1) - (1)].str);
 }
     break;
 
-  case 534:
+  case 539:
 /* Line 1792 of yacc.c  */
-#line 2812 "dtool/src/cppparser/cppBison.yxx"
+#line 2837 "dtool/src/cppparser/cppBison.yxx"
     {
   (yyval.str) = (yyvsp[(1) - (2)].str) + (yyvsp[(2) - (2)].str);
 }
@@ -7031,7 +7097,7 @@ yyreduce:
 
 
 /* Line 1792 of yacc.c  */
-#line 7035 "built/tmp/cppBison.yxx.c"
+#line 7101 "built/tmp/cppBison.yxx.c"
       default: break;
     }
   /* User semantic actions sometimes alter yychar, and that requires
diff --git a/dtool/src/cppparser/cppBison.h.prebuilt b/dtool/src/cppparser/cppBison.h.prebuilt
index 98ec997d2e..76c7a5223f 100644
--- a/dtool/src/cppparser/cppBison.h.prebuilt
+++ b/dtool/src/cppparser/cppBison.h.prebuilt
@@ -119,34 +119,35 @@ extern int cppyydebug;
      KW_MUTABLE = 328,
      KW_NAMESPACE = 329,
      KW_NEW = 330,
-     KW_OPERATOR = 331,
-     KW_PRIVATE = 332,
-     KW_PROTECTED = 333,
-     KW_PUBLIC = 334,
-     KW_REGISTER = 335,
-     KW_RETURN = 336,
-     KW_SHORT = 337,
-     KW_SIGNED = 338,
-     KW_SIZEOF = 339,
-     KW_STATIC = 340,
-     KW_STATIC_CAST = 341,
-     KW_STRUCT = 342,
-     KW_TEMPLATE = 343,
-     KW_THROW = 344,
-     KW_TRUE = 345,
-     KW_TRY = 346,
-     KW_TYPEDEF = 347,
-     KW_TYPENAME = 348,
-     KW_UNION = 349,
-     KW_UNSIGNED = 350,
-     KW_USING = 351,
-     KW_VIRTUAL = 352,
-     KW_VOID = 353,
-     KW_VOLATILE = 354,
-     KW_WHILE = 355,
-     START_CPP = 356,
-     START_CONST_EXPR = 357,
-     START_TYPE = 358
+     KW_NOEXCEPT = 331,
+     KW_OPERATOR = 332,
+     KW_PRIVATE = 333,
+     KW_PROTECTED = 334,
+     KW_PUBLIC = 335,
+     KW_REGISTER = 336,
+     KW_RETURN = 337,
+     KW_SHORT = 338,
+     KW_SIGNED = 339,
+     KW_SIZEOF = 340,
+     KW_STATIC = 341,
+     KW_STATIC_CAST = 342,
+     KW_STRUCT = 343,
+     KW_TEMPLATE = 344,
+     KW_THROW = 345,
+     KW_TRUE = 346,
+     KW_TRY = 347,
+     KW_TYPEDEF = 348,
+     KW_TYPENAME = 349,
+     KW_UNION = 350,
+     KW_UNSIGNED = 351,
+     KW_USING = 352,
+     KW_VIRTUAL = 353,
+     KW_VOID = 354,
+     KW_VOLATILE = 355,
+     KW_WHILE = 356,
+     START_CPP = 357,
+     START_CONST_EXPR = 358,
+     START_TYPE = 359
    };
 #endif
 /* Tokens.  */
@@ -223,34 +224,35 @@ extern int cppyydebug;
 #define KW_MUTABLE 328
 #define KW_NAMESPACE 329
 #define KW_NEW 330
-#define KW_OPERATOR 331
-#define KW_PRIVATE 332
-#define KW_PROTECTED 333
-#define KW_PUBLIC 334
-#define KW_REGISTER 335
-#define KW_RETURN 336
-#define KW_SHORT 337
-#define KW_SIGNED 338
-#define KW_SIZEOF 339
-#define KW_STATIC 340
-#define KW_STATIC_CAST 341
-#define KW_STRUCT 342
-#define KW_TEMPLATE 343
-#define KW_THROW 344
-#define KW_TRUE 345
-#define KW_TRY 346
-#define KW_TYPEDEF 347
-#define KW_TYPENAME 348
-#define KW_UNION 349
-#define KW_UNSIGNED 350
-#define KW_USING 351
-#define KW_VIRTUAL 352
-#define KW_VOID 353
-#define KW_VOLATILE 354
-#define KW_WHILE 355
-#define START_CPP 356
-#define START_CONST_EXPR 357
-#define START_TYPE 358
+#define KW_NOEXCEPT 331
+#define KW_OPERATOR 332
+#define KW_PRIVATE 333
+#define KW_PROTECTED 334
+#define KW_PUBLIC 335
+#define KW_REGISTER 336
+#define KW_RETURN 337
+#define KW_SHORT 338
+#define KW_SIGNED 339
+#define KW_SIZEOF 340
+#define KW_STATIC 341
+#define KW_STATIC_CAST 342
+#define KW_STRUCT 343
+#define KW_TEMPLATE 344
+#define KW_THROW 345
+#define KW_TRUE 346
+#define KW_TRY 347
+#define KW_TYPEDEF 348
+#define KW_TYPENAME 349
+#define KW_UNION 350
+#define KW_UNSIGNED 351
+#define KW_USING 352
+#define KW_VIRTUAL 353
+#define KW_VOID 354
+#define KW_VOLATILE 355
+#define KW_WHILE 356
+#define START_CPP 357
+#define START_CONST_EXPR 358
+#define START_TYPE 359
 
 
 
diff --git a/dtool/src/cppparser/cppBison.yxx b/dtool/src/cppparser/cppBison.yxx
index 238c4f578b..80d78fe184 100644
--- a/dtool/src/cppparser/cppBison.yxx
+++ b/dtool/src/cppparser/cppBison.yxx
@@ -1,6 +1,6 @@
 // Filename: cppBison.y
 // Created by:  drose (16Jan99)
-// 
+//
 ////////////////////////////////////////////////////////////////////
 
 %{
@@ -38,7 +38,7 @@ CPPScope *current_scope = NULL;
 CPPScope *global_scope = NULL;
 CPPPreprocessor *current_lexer = NULL;
 
-static CPPStructType *current_struct = NULL; 
+static CPPStructType *current_struct = NULL;
 static CPPEnumType *current_enum = NULL;
 static int current_storage_class = 0;
 static CPPType *current_type = NULL;
@@ -98,7 +98,7 @@ parse_cpp(CPPParser *cp) {
   current_scope = old_scope;
   global_scope = old_global_scope;
   current_lexer = old_lexer;
-    
+
 }
 
 CPPExpression *
@@ -140,7 +140,7 @@ parse_type(CPPPreprocessor *pp, CPPScope *new_current_scope,
   yyparse();
 
   CPPType *result = current_type;
-  
+
   current_scope = old_scope;
   global_scope = old_global_scope;
   current_lexer = old_lexer;
@@ -223,8 +223,8 @@ pop_struct() {
 %token UNARY_REF
 %token POINTSAT
 %token SCOPE
-%token PLUSPLUS 
-%token MINUSMINUS 
+%token PLUSPLUS
+%token MINUSMINUS
 %token TIMESEQUAL
 %token DIVIDEEQUAL
 %token MODEQUAL
@@ -242,14 +242,14 @@ pop_struct() {
 %token KW_CATCH
 %token KW_CHAR
 %token KW_WCHAR_T
-%token KW_CLASS 
-%token KW_CONST 
+%token KW_CLASS
+%token KW_CONST
 %token KW_DELETE
 %token KW_DOUBLE
 %token KW_DYNAMIC_CAST
 %token KW_ELSE
-%token KW_END_PUBLISH 
-%token KW_ENUM 
+%token KW_END_PUBLISH
+%token KW_ENUM
 %token KW_EXTENSION
 %token KW_EXTERN
 %token KW_EXPLICIT
@@ -269,6 +269,7 @@ pop_struct() {
 %token KW_MUTABLE
 %token KW_NAMESPACE
 %token KW_NEW
+%token KW_NOEXCEPT
 %token KW_OPERATOR
 %token KW_PRIVATE
 %token KW_PROTECTED
@@ -280,14 +281,14 @@ pop_struct() {
 %token KW_SIZEOF
 %token KW_STATIC
 %token KW_STATIC_CAST
-%token KW_STRUCT 
+%token KW_STRUCT
 %token KW_TEMPLATE
 %token KW_THROW
 %token KW_TRUE
 %token KW_TRY
-%token KW_TYPEDEF 
+%token KW_TYPEDEF
 %token KW_TYPENAME
-%token KW_UNION 
+%token KW_UNION
 %token KW_UNSIGNED
 %token KW_USING
 %token KW_VIRTUAL
@@ -417,7 +418,7 @@ constructor_init:
 extern_c:
         storage_class '{'
 {
-  push_storage_class((current_storage_class & ~CPPInstance::SC_c_binding) | 
+  push_storage_class((current_storage_class & ~CPPInstance::SC_c_binding) |
                      ($1 & CPPInstance::SC_c_binding));
 }
         cpp '}'
@@ -434,7 +435,7 @@ declaration:
         | using_declaration
         | friend_declaration
         | KW_TYPEDEF typedef_declaration
-        | KW_BEGIN_PUBLISH 
+        | KW_BEGIN_PUBLISH
 {
   if (publish_nest_level != 0) {
     yyerror("Unclosed __begin_publish", publish_loc);
@@ -447,7 +448,7 @@ declaration:
   publish_nest_level++;
   current_scope->set_current_vis(V_published);
 }
-        | KW_END_PUBLISH 
+        | KW_END_PUBLISH
 {
   if (publish_nest_level != 1) {
     yyerror("Unmatched __end_publish", @1);
@@ -765,7 +766,7 @@ typedef_const_instance_identifiers:
 function_prototype:
 
 /* Functions with implicit return types, and constructors */
-        IDENTIFIER '(' 
+        IDENTIFIER '('
 {
   push_scope($1->get_scope(current_scope, global_scope));
 }
@@ -821,13 +822,13 @@ function_prototype:
   if ($2->is_scoped()) {
     yyerror("Invalid destructor name: ~" + $2->get_fully_scoped_name(), @2);
   } else {
-    CPPIdentifier *ident = 
+    CPPIdentifier *ident =
       new CPPIdentifier("~" + $2->get_simple_name(), @2.file);
     delete $2;
 
     CPPType *type;
     type = new CPPSimpleType(CPPSimpleType::T_void);
-    
+
     CPPInstanceIdentifier *ii = new CPPInstanceIdentifier(ident);
     ii->add_func_modifier($5, $7);
 
@@ -932,7 +933,7 @@ function_prototype:
    avoid shift/reduce conflicts. */
         | IDENTIFIER
 {
-  CPPDeclaration *decl = 
+  CPPDeclaration *decl =
     $1->find_symbol(current_scope, global_scope, current_lexer);
   if (decl != (CPPDeclaration *)NULL) {
     $$ = decl->as_instance();
@@ -950,6 +951,10 @@ function_post:
         | KW_CONST
 {
   $$ = (int)CPPFunctionType::F_const_method;
+}
+        | function_post KW_NOEXCEPT
+{
+  $$ = (int)CPPFunctionType::F_noexcept;
 }
         | function_post KW_THROW '(' ')'
 {
@@ -1239,6 +1244,11 @@ instance_identifier:
 {
   $$ = $2;
   $$->add_modifier(IIT_reference);
+}
+        | ANDAND instance_identifier  %prec UNARY
+{
+  $$ = $2;
+  $$->add_modifier(IIT_rvalue_reference);
 }
         | SCOPING '*' instance_identifier  %prec UNARY
 {
@@ -1436,6 +1446,11 @@ not_paren_formal_parameter_identifier:
 {
   $$ = $2;
   $$->add_modifier(IIT_reference);
+}
+        | ANDAND not_paren_formal_parameter_identifier  %prec UNARY
+{
+  $$ = $2;
+  $$->add_modifier(IIT_rvalue_reference);
 }
         | SCOPING '*' not_paren_formal_parameter_identifier  %prec UNARY
 {
@@ -1476,6 +1491,11 @@ formal_parameter_identifier:
 {
   $$ = $2;
   $$->add_modifier(IIT_reference);
+}
+        | ANDAND formal_parameter_identifier  %prec UNARY
+{
+  $$ = $2;
+  $$->add_modifier(IIT_rvalue_reference);
 }
         | SCOPING '*' formal_parameter_identifier  %prec UNARY
 {
@@ -1519,6 +1539,11 @@ empty_instance_identifier:
 {
   $$ = $2;
   $$->add_modifier(IIT_reference);
+}
+        | ANDAND empty_instance_identifier  %prec UNARY
+{
+  $$ = $2;
+  $$->add_modifier(IIT_rvalue_reference);
 }
         | SCOPING '*' empty_instance_identifier  %prec UNARY
 {
@@ -1574,7 +1599,7 @@ type:
   if (type != NULL) {
     $$ = type;
   } else {
-    CPPExtensionType *et = 
+    CPPExtensionType *et =
       CPPType::new_type(new CPPExtensionType($1, $2, current_scope, @1.file))
       ->as_extension_type();
     CPPScope *scope = $2->get_scope(current_scope, global_scope);
@@ -1590,7 +1615,7 @@ type:
   if (type != NULL) {
     $$ = type;
   } else {
-    CPPExtensionType *et = 
+    CPPExtensionType *et =
       CPPType::new_type(new CPPExtensionType($1, $2, current_scope, @1.file))
       ->as_extension_type();
     CPPScope *scope = $2->get_scope(current_scope, global_scope);
@@ -1638,7 +1663,7 @@ type_decl:
   if (type != NULL) {
     $$ = type;
   } else {
-    CPPExtensionType *et = 
+    CPPExtensionType *et =
       CPPType::new_type(new CPPExtensionType($1, $2, current_scope, @1.file))
       ->as_extension_type();
     CPPScope *scope = $2->get_scope(current_scope, global_scope);
@@ -1654,7 +1679,7 @@ type_decl:
   if (type != NULL) {
     $$ = type;
   } else {
-    CPPExtensionType *et = 
+    CPPExtensionType *et =
       CPPType::new_type(new CPPExtensionType($1, $2, current_scope, @1.file))
       ->as_extension_type();
     CPPScope *scope = $2->get_scope(current_scope, global_scope);
@@ -1686,7 +1711,7 @@ predefined_type:
   if (type != NULL) {
     $$ = type;
   } else {
-    CPPExtensionType *et = 
+    CPPExtensionType *et =
       CPPType::new_type(new CPPExtensionType($1, $2, current_scope, @1.file))
       ->as_extension_type();
     CPPScope *scope = $2->get_scope(current_scope, global_scope);
@@ -1702,7 +1727,7 @@ predefined_type:
   if (type != NULL) {
     $$ = type;
   } else {
-    CPPExtensionType *et = 
+    CPPExtensionType *et =
       CPPType::new_type(new CPPExtensionType($1, $2, current_scope, @1.file))
       ->as_extension_type();
     CPPScope *scope = $2->get_scope(current_scope, global_scope);
@@ -1733,9 +1758,9 @@ full_type:
 anonymous_struct:
         struct_keyword '{'
 {
-  CPPVisibility starting_vis = 
+  CPPVisibility starting_vis =
   ($1 == CPPExtensionType::T_class) ? V_private : V_public;
-  
+
   CPPScope *new_scope = new CPPScope(current_scope, CPPNameComponent("anon"),
                                      starting_vis);
   CPPStructType *st = new CPPStructType($1, NULL, current_scope,
@@ -1757,7 +1782,7 @@ anonymous_struct:
 named_struct:
         struct_keyword name
 {
-  CPPVisibility starting_vis = 
+  CPPVisibility starting_vis =
   ($1 == CPPExtensionType::T_class) ? V_private : V_public;
 
   CPPScope *scope = $2->get_scope(current_scope, global_scope, current_lexer);
@@ -1771,7 +1796,7 @@ named_struct:
                                         new_scope, @1.file);
   new_scope->set_struct_type(st);
   current_scope->define_extension_type(st);
-  
+
   push_scope(new_scope);
   push_struct(st);
 }
@@ -1916,7 +1941,7 @@ namespace_declaration:
   CPPScope *scope = $2->find_scope(current_scope, global_scope, current_lexer);
   if (scope == NULL) {
     // This must be a new namespace declaration.
-    CPPScope *parent_scope = 
+    CPPScope *parent_scope =
       $2->get_scope(current_scope, global_scope, current_lexer);
     if (parent_scope == NULL) {
       parent_scope = current_scope;
@@ -2104,13 +2129,13 @@ element:
         | ELLIPSIS | OROR | ANDAND
         | EQCOMPARE | NECOMPARE | LECOMPARE | GECOMPARE
         | LSHIFT | RSHIFT | POINTSAT_STAR | DOT_STAR | POINTSAT
-        | SCOPE | PLUSPLUS | MINUSMINUS 
+        | SCOPE | PLUSPLUS | MINUSMINUS
         | TIMESEQUAL | DIVIDEEQUAL | MODEQUAL | PLUSEQUAL | MINUSEQUAL
         | OREQUAL | ANDEQUAL | XOREQUAL | LSHIFTEQUAL | RSHIFTEQUAL
         | KW_BOOL | KW_CATCH | KW_CHAR | KW_WCHAR_T | KW_CLASS | KW_CONST
         | KW_DELETE | KW_DOUBLE | KW_DYNAMIC_CAST | KW_ELSE | KW_ENUM
         | KW_EXTERN | KW_EXPLICIT | KW_FALSE
-        | KW_FLOAT | KW_FRIEND | KW_FOR | KW_GOTO 
+        | KW_FLOAT | KW_FRIEND | KW_FOR | KW_GOTO
         | KW_IF | KW_INLINE | KW_INT
         | KW_LONG | KW_MUTABLE | KW_NEW | KW_PRIVATE | KW_PROTECTED
         | KW_PUBLIC | KW_PUBLISHED | KW_REGISTER | KW_RETURN
@@ -2329,65 +2354,65 @@ const_expr:
 }
         | KW_INT '(' optional_const_expr_comma ')'
 {
-  CPPType *type = 
+  CPPType *type =
     CPPType::new_type(new CPPSimpleType(CPPSimpleType::T_int));
   $$ = new CPPExpression(CPPExpression::construct_op(type, $3));
 }
         | KW_CHAR '(' optional_const_expr_comma ')'
 {
-  CPPType *type = 
+  CPPType *type =
     CPPType::new_type(new CPPSimpleType(CPPSimpleType::T_char));
   $$ = new CPPExpression(CPPExpression::construct_op(type, $3));
 }
         | KW_WCHAR_T '(' optional_const_expr_comma ')'
 {
-  CPPType *type = 
+  CPPType *type =
     CPPType::new_type(new CPPSimpleType(CPPSimpleType::T_wchar_t));
   $$ = new CPPExpression(CPPExpression::construct_op(type, $3));
 }
         | KW_BOOL '(' optional_const_expr_comma ')'
 {
-  CPPType *type = 
+  CPPType *type =
     CPPType::new_type(new CPPSimpleType(CPPSimpleType::T_bool));
   $$ = new CPPExpression(CPPExpression::construct_op(type, $3));
 }
         | KW_SHORT '(' optional_const_expr_comma ')'
 {
-  CPPType *type = 
+  CPPType *type =
     CPPType::new_type(new CPPSimpleType(CPPSimpleType::T_int,
                                         CPPSimpleType::F_short));
   $$ = new CPPExpression(CPPExpression::construct_op(type, $3));
 }
         | KW_LONG '(' optional_const_expr_comma ')'
 {
-  CPPType *type = 
+  CPPType *type =
     CPPType::new_type(new CPPSimpleType(CPPSimpleType::T_int,
                                         CPPSimpleType::F_long));
   $$ = new CPPExpression(CPPExpression::construct_op(type, $3));
 }
         | KW_UNSIGNED '(' optional_const_expr_comma ')'
 {
-  CPPType *type = 
+  CPPType *type =
     CPPType::new_type(new CPPSimpleType(CPPSimpleType::T_int,
                                         CPPSimpleType::F_unsigned));
   $$ = new CPPExpression(CPPExpression::construct_op(type, $3));
 }
         | KW_SIGNED '(' optional_const_expr_comma ')'
 {
-  CPPType *type = 
+  CPPType *type =
     CPPType::new_type(new CPPSimpleType(CPPSimpleType::T_int,
                                         CPPSimpleType::F_signed));
   $$ = new CPPExpression(CPPExpression::construct_op(type, $3));
 }
         | KW_FLOAT '(' optional_const_expr_comma ')'
 {
-  CPPType *type = 
+  CPPType *type =
     CPPType::new_type(new CPPSimpleType(CPPSimpleType::T_float));
   $$ = new CPPExpression(CPPExpression::construct_op(type, $3));
 }
         | KW_DOUBLE '(' optional_const_expr_comma ')'
 {
-  CPPType *type = 
+  CPPType *type =
     CPPType::new_type(new CPPSimpleType(CPPSimpleType::T_double));
   $$ = new CPPExpression(CPPExpression::construct_op(type, $3));
 }
diff --git a/dtool/src/cppparser/cppFunctionType.cxx b/dtool/src/cppparser/cppFunctionType.cxx
index 8625f7e721..515729cf39 100644
--- a/dtool/src/cppparser/cppFunctionType.cxx
+++ b/dtool/src/cppparser/cppFunctionType.cxx
@@ -243,6 +243,9 @@ output_instance(ostream &out, int indent_level, CPPScope *scope,
   if (_flags & F_const_method) {
     out << " const";
   }
+  if (_flags & F_noexcept) {
+    out << " noexcept";
+  }
 }
 
 ////////////////////////////////////////////////////////////////////
diff --git a/dtool/src/cppparser/cppFunctionType.h b/dtool/src/cppparser/cppFunctionType.h
index 021aeba5ce..b728fa7b22 100644
--- a/dtool/src/cppparser/cppFunctionType.h
+++ b/dtool/src/cppparser/cppFunctionType.h
@@ -36,6 +36,7 @@ public:
     F_method_pointer    = 0x10,
     F_unary_op          = 0x20,
     F_operator          = 0x40,
+    F_noexcept          = 0x80,
   };
 
   CPPFunctionType(CPPType *return_type, CPPParameterList *parameters,
diff --git a/dtool/src/cppparser/cppInstanceIdentifier.cxx b/dtool/src/cppparser/cppInstanceIdentifier.cxx
index 8db68d389d..7cd3c67283 100644
--- a/dtool/src/cppparser/cppInstanceIdentifier.cxx
+++ b/dtool/src/cppparser/cppInstanceIdentifier.cxx
@@ -133,7 +133,7 @@ add_func_modifier(CPPParameterList *params, int flags) {
   // function, check if the parameter list is empty.  If it is, this
   // is really a unary operator, so set the unary_op flag.  Operators
   // () and [] are never considered unary operators.
-  if (_ident != NULL && 
+  if (_ident != NULL &&
       _ident->get_simple_name().substr(0, 9) == "operator ") {
 
     if (_ident->get_simple_name() != string("operator ()") &&
@@ -245,7 +245,13 @@ r_unroll_type(CPPType *start_type,
     break;
 
   case IIT_reference:
-    result = new CPPReferenceType(r_unroll_type(start_type, mi));
+    result = new CPPReferenceType(r_unroll_type(start_type, mi),
+                                  CPPReferenceType::VC_lvalue);
+    break;
+
+  case IIT_rvalue_reference:
+    result = new CPPReferenceType(r_unroll_type(start_type, mi),
+                                  CPPReferenceType::VC_rvalue);
     break;
 
   case IIT_scoped_pointer:
diff --git a/dtool/src/cppparser/cppInstanceIdentifier.h b/dtool/src/cppparser/cppInstanceIdentifier.h
index 7662292c12..b906a4f386 100644
--- a/dtool/src/cppparser/cppInstanceIdentifier.h
+++ b/dtool/src/cppparser/cppInstanceIdentifier.h
@@ -32,6 +32,7 @@ class CPPPreprocessor;
 enum CPPInstanceIdentifierType {
   IIT_pointer,
   IIT_reference,
+  IIT_rvalue_reference,
   IIT_scoped_pointer,
   IIT_array,
   IIT_const,
diff --git a/dtool/src/cppparser/cppPreprocessor.cxx b/dtool/src/cppparser/cppPreprocessor.cxx
index 474063e4a7..591f856da6 100644
--- a/dtool/src/cppparser/cppPreprocessor.cxx
+++ b/dtool/src/cppparser/cppPreprocessor.cxx
@@ -824,6 +824,8 @@ internal_get_next_token() {
     }
     if (next_c == '<') return CPPToken(LSHIFT, first_line, first_col, first_file);
     if (next_c == '=') return CPPToken(LECOMPARE, first_line, first_col, first_file);
+    if (next_c == ':') return CPPToken('[', first_line, first_col, first_file);
+    if (next_c == '%') return CPPToken('{', first_line, first_col, first_file);
     break;
 
   case '>':
@@ -867,6 +869,7 @@ internal_get_next_token() {
 
   case ':':
     if (next_c == ':') return CPPToken(SCOPE, first_line, first_col, first_file);
+    if (next_c == '>') return CPPToken(']', first_line, first_col, first_file);
     break;
 
   case '*':
@@ -879,6 +882,7 @@ internal_get_next_token() {
 
   case '%':
     if (next_c == '=') return CPPToken(MODEQUAL, first_line, first_col, first_file);
+    if (next_c == '>') return CPPToken('}', first_line, first_col, first_file);
     break;
   }
 
@@ -1411,7 +1415,7 @@ handle_include_directive(const string &args, int first_line,
       found_file = true;
       source = CPPFile::S_local;
     }
-    
+
     // Search the same directory as the includer.
     if (!angle_quotes && !found_file) {
       Filename match(get_file()._filename.get_dirname(), filename);
@@ -1439,7 +1443,7 @@ handle_include_directive(const string &args, int first_line,
         }
       }
     }
-    
+
     if (!found_file) {
       warning("Cannot find " + filename.get_fullpath(),
               first_line, first_col, first_file);
@@ -2031,6 +2035,7 @@ check_keyword(const string &name) {
   if (name == "__make_seq") return KW_MAKE_SEQ;
   if (name == "mutable") return KW_MUTABLE;
   if (name == "namespace") return KW_NAMESPACE;
+  if (name == "noexcept") return KW_NOEXCEPT;
   if (name == "new") return KW_NEW;
   if (name == "operator") return KW_OPERATOR;
   if (name == "private") return KW_PRIVATE;
@@ -2058,6 +2063,19 @@ check_keyword(const string &name) {
   if (name == "volatile") return KW_VOLATILE;
   if (name == "while") return KW_WHILE;
 
+  // These are alternative ways to refer to built-in operators.
+  if (name == "and") return ANDAND;
+  if (name == "and_eq") return ANDEQUAL;
+  if (name == "bitand") return '&';
+  if (name == "bitor") return '|';
+  if (name == "compl") return '~';
+  if (name == "not") return '!';
+  if (name == "not_eq") return NECOMPARE;
+  if (name == "or") return OROR;
+  if (name == "or_eq") return OREQUAL;
+  if (name == "xor") return '^';
+  if (name == "xor_eq") return XOREQUAL;
+
   if (!cpp_longlong_keyword.empty() && name == cpp_longlong_keyword) {
     return KW_LONGLONG;
   }
diff --git a/dtool/src/cppparser/cppReferenceType.cxx b/dtool/src/cppparser/cppReferenceType.cxx
index 7438dfe89f..40d6e987da 100644
--- a/dtool/src/cppparser/cppReferenceType.cxx
+++ b/dtool/src/cppparser/cppReferenceType.cxx
@@ -21,9 +21,10 @@
 //  Description:
 ////////////////////////////////////////////////////////////////////
 CPPReferenceType::
-CPPReferenceType(CPPType *pointing_at) :
+CPPReferenceType(CPPType *pointing_at, ValueCategory vcat) :
   CPPType(CPPFile()),
-  _pointing_at(pointing_at)
+  _pointing_at(pointing_at),
+  _value_category(vcat)
 {
 }
 
@@ -146,8 +147,14 @@ void CPPReferenceType::
 output_instance(ostream &out, int indent_level, CPPScope *scope,
                 bool complete, const string &prename,
                 const string &name) const {
-  _pointing_at->output_instance(out, indent_level, scope, complete,
-                                "&" + prename, name);
+
+  if (_value_category == VC_rvalue) {
+    _pointing_at->output_instance(out, indent_level, scope, complete,
+                                  "&&" + prename, name);
+  } else {
+    _pointing_at->output_instance(out, indent_level, scope, complete,
+                                  "&" + prename, name);
+  }
 }
 
 ////////////////////////////////////////////////////////////////////
@@ -182,7 +189,8 @@ is_equal(const CPPDeclaration *other) const {
   const CPPReferenceType *ot = ((CPPDeclaration *)other)->as_reference_type();
   assert(ot != NULL);
 
-  return _pointing_at == ot->_pointing_at;
+  return (_pointing_at == ot->_pointing_at) &&
+         (_value_category == ot->_value_category);
 }
 
 
@@ -198,5 +206,9 @@ is_less(const CPPDeclaration *other) const {
   const CPPReferenceType *ot = ((CPPDeclaration *)other)->as_reference_type();
   assert(ot != NULL);
 
+  if (_value_category != ot->_value_category) {
+    return (_value_category < ot->_value_category);
+  }
+
   return _pointing_at < ot->_pointing_at;
 }
diff --git a/dtool/src/cppparser/cppReferenceType.h b/dtool/src/cppparser/cppReferenceType.h
index 300db0035c..3bf292841e 100644
--- a/dtool/src/cppparser/cppReferenceType.h
+++ b/dtool/src/cppparser/cppReferenceType.h
@@ -21,13 +21,22 @@
 
 ///////////////////////////////////////////////////////////////////
 //       Class : CPPReferenceType
-// Description :
+// Description : Either an lvalue- or rvalue-reference.
 ////////////////////////////////////////////////////////////////////
 class CPPReferenceType : public CPPType {
 public:
-  CPPReferenceType(CPPType *pointing_at);
+  enum ValueCategory {
+    VC_lvalue,
+    VC_rvalue
+  };
+
+  CPPReferenceType(CPPType *pointing_at, ValueCategory vcat=VC_lvalue);
 
   CPPType *_pointing_at;
+  ValueCategory _value_category;
+
+  inline bool is_lvalue() const;
+  inline bool is_rvalue() const;
 
   virtual bool is_fully_specified() const;
   virtual CPPDeclaration *substitute_decl(SubstDecl &subst,
diff --git a/dtool/src/dtoolbase/atomicAdjustWin32Impl.h b/dtool/src/dtoolbase/atomicAdjustWin32Impl.h
index a7844da3f0..2ead06d0fe 100644
--- a/dtool/src/dtoolbase/atomicAdjustWin32Impl.h
+++ b/dtool/src/dtoolbase/atomicAdjustWin32Impl.h
@@ -21,7 +21,10 @@
 #ifdef WIN32_VC
 
 #include "numeric_types.h"
-#define WIN32_LEAN_AND_MEAN
+
+#ifndef WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN 1
+#endif
 #include <windows.h>
 
 ////////////////////////////////////////////////////////////////////
diff --git a/dtool/src/dtoolbase/cmath.I b/dtool/src/dtoolbase/cmath.I
index 194e6d24cf..03b03f5640 100644
--- a/dtool/src/dtoolbase/cmath.I
+++ b/dtool/src/dtoolbase/cmath.I
@@ -358,26 +358,68 @@ cpow(int x, int y) {
   }
 }
 
+////////////////////////////////////////////////////////////////////
+//     Function: cnan
+//  Description:
+////////////////////////////////////////////////////////////////////
+INLINE bool
+cnan(float v) {
+#if __FINITE_MATH_ONLY__
+  // GCC's isnan breaks when using -ffast-math.
+  union { float f; uint32_t x; } u = { v };
+  return ((u.x << 1) > 0xff000000u);
+#elif !defined(_WIN32)
+  return std::isnan(v);
+#else
+  return (_isnan(v) != 0);
+#endif
+}
+
 ////////////////////////////////////////////////////////////////////
 //     Function: cnan
 //  Description:
 ////////////////////////////////////////////////////////////////////
 INLINE bool
 cnan(double v) {
-#ifndef _WIN32
+#if __FINITE_MATH_ONLY__
+  // GCC's isnan breaks when using -ffast-math.
+  union { double d; uint64_t x; } u = { v };
+  return ((u.x << 1) > 0xff70000000000000ull);
+#elif !defined(_WIN32)
   return std::isnan(v);
 #else
   return (_isnan(v) != 0);
 #endif
 }
 
+////////////////////////////////////////////////////////////////////
+//     Function: cinf
+//  Description:
+////////////////////////////////////////////////////////////////////
+INLINE bool
+cinf(float v) {
+#if __FINITE_MATH_ONLY__
+  // GCC's isinf breaks when using -ffast-math.
+  union { float f; uint32_t x; } u = { v };
+  return ((u.x << 1) == 0xff000000u);
+#elif !defined(_WIN32)
+  return std::isinf(v);
+#else
+  return (_isnan(v) == 0 && _finite(v) == 0);
+#endif
+}
+
 ////////////////////////////////////////////////////////////////////
 //     Function: cinf
 //  Description:
 ////////////////////////////////////////////////////////////////////
 INLINE bool
 cinf(double v) {
-#ifndef _WIN32
+#if __FINITE_MATH_ONLY__
+  // GCC's isinf breaks when using -ffast-math.
+  union { double d; uint64_t x; } u = { v };
+  return ((u.x << 1) == 0xff70000000000000ull);
+#elif !defined(_WIN32)
   return std::isinf(v);
 #else
   return (_isnan(v) == 0 && _finite(v) == 0);
diff --git a/dtool/src/dtoolbase/cmath.h b/dtool/src/dtoolbase/cmath.h
index 6e5c1ef8e8..42d83f77d5 100644
--- a/dtool/src/dtoolbase/cmath.h
+++ b/dtool/src/dtoolbase/cmath.h
@@ -61,9 +61,11 @@ INLINE int cpow(int x, int y);
 
 // Returns true if the number is NaN, false if it's a genuine number
 // or infinity.
+INLINE bool cnan(float v);
 INLINE bool cnan(double v);
 
 // Returns true if the number is infinity.
+INLINE bool cinf(float v);
 INLINE bool cinf(double v);
 
 // Return NaN and infinity, respectively.
diff --git a/dtool/src/dtoolbase/deletedBufferChain.I b/dtool/src/dtoolbase/deletedBufferChain.I
index 683b5b285e..d9514929c5 100644
--- a/dtool/src/dtoolbase/deletedBufferChain.I
+++ b/dtool/src/dtoolbase/deletedBufferChain.I
@@ -59,7 +59,7 @@ node_to_buffer(DeletedBufferChain::ObjectNode *node) {
 #if defined(USE_DELETEDCHAINFLAG) && defined(USE_DELETED_CHAIN)
   // In development mode, we increment the pointer so that the
   // returned data does not overlap our _flag member.
-  return (void *)(((char *)node) + get_flag_reserved_bytes());
+  return (void *)(((char *)node) + flag_reserved_bytes);
 #else
   return (void *)node;
 #endif  // NDEBUG
@@ -75,33 +75,8 @@ buffer_to_node(void *ptr) {
 #if defined(USE_DELETEDCHAINFLAG) && defined(USE_DELETED_CHAIN)
   // In development mode, we decrement the pointer to undo the
   // increment we did above.
-  return (ObjectNode *)(((char *)ptr) - get_flag_reserved_bytes());
+  return (ObjectNode *)(((char *)ptr) - flag_reserved_bytes);
 #else
   return (ObjectNode *)ptr;
 #endif  // NDEBUG
 }
-
-////////////////////////////////////////////////////////////////////
-//     Function: DeletedBufferChain::get_flag_reserved_bytes
-//       Access: Private, Static
-//  Description: Returns the number of extra bytes reserved at the
-//               beginning of each buffer for the _flag member.
-////////////////////////////////////////////////////////////////////
-INLINE size_t DeletedBufferChain::
-get_flag_reserved_bytes() {
-#ifndef USE_DELETEDCHAINFLAG
-  // Without DELETEDCHAINFLAG, we don't even store the _flag member at
-  // all, and this method is never called.
-  static const size_t flag_reserved_bytes = 0;
-
-#elif defined(LINMATH_ALIGN)
-  // With SSE2 alignment, we need all 16 bytes to preserve alignment.
-  static const size_t flag_reserved_bytes = 16;
-
-#else
-  // Otherwise, we only need enough space for the Integer itself.
-  static const size_t flag_reserved_bytes = sizeof(AtomicAdjust::Integer);
-#endif  // USE_DELETEDCHAINFLAG
-
-  return flag_reserved_bytes;
-}
diff --git a/dtool/src/dtoolbase/deletedBufferChain.cxx b/dtool/src/dtoolbase/deletedBufferChain.cxx
index 33e5672949..d02f10ead0 100644
--- a/dtool/src/dtoolbase/deletedBufferChain.cxx
+++ b/dtool/src/dtoolbase/deletedBufferChain.cxx
@@ -25,17 +25,10 @@ DeletedBufferChain::
 DeletedBufferChain(size_t buffer_size) {
   _deleted_chain = NULL;
   _buffer_size = buffer_size;
-  _alloc_size = _buffer_size;
-
-#ifdef USE_DELETEDCHAINFLAG
-  // In development mode, we also need to reserve space for _flag.
-  _alloc_size += get_flag_reserved_bytes();
-#endif  // USE_DELETEDCHAINFLAG
 
   // We must allocate at least this much space for bookkeeping
   // reasons.
   _buffer_size = max(_buffer_size, sizeof(ObjectNode));
-  _alloc_size = max(_alloc_size, sizeof(ObjectNode));
 }
 
 ////////////////////////////////////////////////////////////////////
@@ -51,6 +44,9 @@ allocate(size_t size, TypeHandle type_handle) {
   //TAU_PROFILE("void *DeletedBufferChain::allocate(size_t, TypeHandle)", " ", TAU_USER);
   assert(size <= _buffer_size);
 
+  // Determine how much space to allocate.
+  const size_t alloc_size = _buffer_size + flag_reserved_bytes;
+
   ObjectNode *obj;
 
   _lock.acquire();
@@ -67,8 +63,8 @@ allocate(size_t size, TypeHandle type_handle) {
     void *ptr = node_to_buffer(obj);
 
 #ifdef DO_MEMORY_USAGE
-    //    type_handle.dec_memory_usage(TypeHandle::MC_deleted_chain_inactive, _alloc_size);
-    type_handle.inc_memory_usage(TypeHandle::MC_deleted_chain_active, _alloc_size);
+    //    type_handle.dec_memory_usage(TypeHandle::MC_deleted_chain_inactive, alloc_size);
+    type_handle.inc_memory_usage(TypeHandle::MC_deleted_chain_active, alloc_size);
 #endif  // DO_MEMORY_USAGE
 
     return ptr;
@@ -78,7 +74,7 @@ allocate(size_t size, TypeHandle type_handle) {
   // If we get here, the deleted_chain is empty; we have to allocate a
   // new object from the system pool.
 
-  obj = (ObjectNode *)NeverFreeMemory::alloc(_alloc_size);
+  obj = (ObjectNode *)NeverFreeMemory::alloc(alloc_size);
 
 #ifdef USE_DELETEDCHAINFLAG
   obj->_flag = DCF_alive;
@@ -87,7 +83,7 @@ allocate(size_t size, TypeHandle type_handle) {
   void *ptr = node_to_buffer(obj);
 
 #ifdef DO_MEMORY_USAGE
-  type_handle.inc_memory_usage(TypeHandle::MC_deleted_chain_active, _alloc_size);
+  type_handle.inc_memory_usage(TypeHandle::MC_deleted_chain_active, alloc_size);
 #endif  // DO_MEMORY_USAGE
 
   return ptr;
@@ -110,8 +106,10 @@ deallocate(void *ptr, TypeHandle type_handle) {
   assert(ptr != (void *)NULL);
 
 #ifdef DO_MEMORY_USAGE
-  type_handle.dec_memory_usage(TypeHandle::MC_deleted_chain_active, _alloc_size);
-  //  type_handle.inc_memory_usage(TypeHandle::MC_deleted_chain_inactive, _alloc_size);
+  type_handle.dec_memory_usage(TypeHandle::MC_deleted_chain_active,
+                               _buffer_size + flag_reserved_bytes);
+  //  type_handle.inc_memory_usage(TypeHandle::MC_deleted_chain_inactive,
+  //                               _buffer_size + flag_reserved_bytes);
 
 #endif  // DO_MEMORY_USAGE
 
diff --git a/dtool/src/dtoolbase/deletedBufferChain.h b/dtool/src/dtoolbase/deletedBufferChain.h
index 07825423ed..301ee5d297 100644
--- a/dtool/src/dtoolbase/deletedBufferChain.h
+++ b/dtool/src/dtoolbase/deletedBufferChain.h
@@ -93,13 +93,24 @@ private:
 
   static INLINE void *node_to_buffer(ObjectNode *node);
   static INLINE ObjectNode *buffer_to_node(void *buffer);
-  static INLINE size_t get_flag_reserved_bytes();
 
   ObjectNode *_deleted_chain;
   
   MutexImpl _lock;
   size_t _buffer_size;
-  size_t _alloc_size;
+
+#ifndef USE_DELETEDCHAINFLAG
+  // Without DELETEDCHAINFLAG, we don't even store the _flag member at all.
+  static const size_t flag_reserved_bytes = 0;
+
+#elif defined(LINMATH_ALIGN)
+  // With SSE2 alignment, we need all 16 bytes to preserve alignment.
+  static const size_t flag_reserved_bytes = 16;
+
+#else
+  // Otherwise, we only need enough space for the Integer itself.
+  static const size_t flag_reserved_bytes = sizeof(AtomicAdjust::Integer);
+#endif  // USE_DELETEDCHAINFLAG
 
   friend class MemoryHook;
 };
diff --git a/dtool/src/dtoolbase/dlmalloc.h b/dtool/src/dtoolbase/dlmalloc.h
index 1bb3ed8abc..c79fb95e76 100644
--- a/dtool/src/dtoolbase/dlmalloc.h
+++ b/dtool/src/dtoolbase/dlmalloc.h
@@ -148,10 +148,15 @@ void* dlvalloc(size_t);
 */
 int dlmallopt(int, int);
 
+#ifndef M_TRIM_THRESHOLD
 #define M_TRIM_THRESHOLD     (-1)
+#endif
+#ifndef M_GRANULARITY
 #define M_GRANULARITY        (-2)
+#endif
+#ifndef M_MMAP_THRESHOLD
 #define M_MMAP_THRESHOLD     (-3)
-
+#endif
 
 /*
   malloc_footprint();
diff --git a/dtool/src/dtoolbase/dlmalloc_src.cxx b/dtool/src/dtoolbase/dlmalloc_src.cxx
index 93e843ea75..4e21f4c914 100644
--- a/dtool/src/dtoolbase/dlmalloc_src.cxx
+++ b/dtool/src/dtoolbase/dlmalloc_src.cxx
@@ -462,7 +462,9 @@ DEFAULT_MMAP_THRESHOLD       default: 256K
 #endif  /* _WIN32 */
 #endif  /* WIN32 */
 #ifdef WIN32
-#define WIN32_LEAN_AND_MEAN
+#ifndef WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN 1
+#endif
 #include <windows.h>
 #define HAVE_MMAP 1
 #define HAVE_MORECORE 0
@@ -597,9 +599,15 @@ DEFAULT_MMAP_THRESHOLD       default: 256K
   malloc does support the following options.
 */
 
+#ifndef M_TRIM_THRESHOLD
 #define M_TRIM_THRESHOLD     (-1)
+#endif
+#ifndef M_GRANULARITY
 #define M_GRANULARITY        (-2)
+#endif
+#ifndef M_MMAP_THRESHOLD
 #define M_MMAP_THRESHOLD     (-3)
+#endif
 
 /* ------------------------ Mallinfo declarations ------------------------ */
 
diff --git a/dtool/src/dtoolbase/dtoolbase.h b/dtool/src/dtoolbase/dtoolbase.h
index 81829bb3e0..7a4fb2445b 100644
--- a/dtool/src/dtoolbase/dtoolbase.h
+++ b/dtool/src/dtoolbase/dtoolbase.h
@@ -103,6 +103,15 @@
 #endif
 #endif
 
+// This is a workaround for a glibc bug that is triggered by
+// clang when compiling with -ffast-math.
+#ifdef __clang__
+#include <sys/cdefs.h>
+#ifndef __extern_always_inline
+#define __extern_always_inline extern __always_inline
+#endif
+#endif
+
 #ifdef HAVE_PYTHON
 #undef _POSIX_C_SOURCE
 #undef _XOPEN_SOURCE
diff --git a/dtool/src/dtoolbase/dtoolbase_cc.h b/dtool/src/dtoolbase/dtoolbase_cc.h
index 94891de299..cb6f1db130 100644
--- a/dtool/src/dtoolbase/dtoolbase_cc.h
+++ b/dtool/src/dtoolbase/dtoolbase_cc.h
@@ -34,6 +34,10 @@ using namespace std;
 #define INLINE inline
 #define TYPENAME typename
 #define CONSTEXPR
+#define NOEXCEPT noexcept
+#define FINAL
+#define OVERRIDE
+#define MOVE(x) x
 
 #define EXPORT_TEMPLATE_CLASS(expcl, exptp, classname)
 
@@ -120,16 +124,54 @@ typedef ios::seekdir ios_seekdir;
 #define INLINE inline
 #endif
 
+// Determine the availability of C++11 features.
 #if defined(__has_extension) // Clang magic.
-#if __has_extension(cxx_constexpr)
-#define CONSTEXPR constexpr
-#else
-#define CONSTEXPR INLINE
-#endif
+#  if __has_extension(cxx_constexpr)
+#    define CONSTEXPR constexpr
+#  else
+#    define CONSTEXPR INLINE
+#  endif
+#  if __has_extension(cxx_noexcept)
+#    define NOEXCEPT noexcept
+#  else
+#    define NOEXCEPT
+#  endif
+#  if __has_extension(cxx_rvalue_references) && (__cplusplus >= 201103L)
+#    define USE_MOVE_SEMANTICS
+#    define MOVE(x) move(x)
+#  else
+#    define MOVE(x) x
+#  endif
+#  if __has_extension(cxx_override_control) && (__cplusplus >= 201103L)
+#    define FINAL final
+#    define OVERRIDE override
+#  else
+#    define FINAL
+#    define OVERRIDE
+#  endif
 #elif defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)) && (__cplusplus >= 201103L)
-#define CONSTEXPR constexpr
+// noexcept was introduced in GCC 4.6, constexpr in GCC 4.7, rvalue refs in
+// GCC 4.3.  However, GCC only started defining __cplusplus properly in 4.7.
+#  define CONSTEXPR constexpr
+#  define NOEXCEPT noexcept
+#  define USE_MOVE_SEMANTICS
+#  define FINAL final
+#  define OVERRIDE override
+#  define MOVE(x) move(x)
+#elif defined(_MSC_VER) && _MSC_VER >= 1600
+// MSVC 2010 has move semantics.  Not much else.
+#  define CONSTEXPR INLINE
+#  define NOEXCEPT throw()
+#  define USE_MOVE_SEMANTICS
+#  define FINAL
+#  define OVERRIDE
+#  define MOVE(x) move(x)
 #else
-#define CONSTEXPR INLINE
+#  define CONSTEXPR INLINE
+#  define NOEXCEPT
+#  define FINAL
+#  define OVERRIDE
+#  define MOVE(x) x
 #endif
 
 #if defined(WIN32_VC) && !defined(LINK_ALL_STATIC) && defined(EXPORT_TEMPLATES)
@@ -209,7 +251,7 @@ public:
   TauProfile(void *&tautimer, char *name, char *type, int group, char *group_name) {
     Tau_profile_c_timer(&tautimer, name, type, group, group_name);
     _tautimer = tautimer;
-    TAU_PROFILE_START(_tautimer); 
+    TAU_PROFILE_START(_tautimer);
   }
   ~TauProfile() {
     if (!__tau_shutdown) {
@@ -233,16 +275,5 @@ private:
 
 #endif  // USE_TAU
 
-// Macros from hell.
-#define EXT_METHOD(cl, m) Extension<cl>::m()
-#define EXT_METHOD_ARGS(cl, m, ...) Extension<cl>::m(__VA_ARGS__)
-#define EXT_CONST_METHOD(cl, m) Extension<cl>::m() const
-#define EXT_CONST_METHOD_ARGS(cl, m, ...) Extension<cl>::m(__VA_ARGS__) const
-#define EXT_NESTED_METHOD(cl1, cl2, m) Extension<cl1::cl2>::m()
-#define EXT_NESTED_METHOD_ARGS(cl1, cl2, m, ...) Extension<cl1::cl2>::m(__VA_ARGS__)
-#define EXT_NESTED_CONST_METHOD(cl1, cl2, m) Extension<cl1::cl2>::m() const
-#define EXT_NESTED_CONST_METHOD_ARGS(cl1, cl2, m, ...) Extension<cl1::cl2>::m(__VA_ARGS__) const
-#define CALL_EXT_METHOD(cl, m, obj, ...) invoke_extension(obj).m(__VA_ARGS__)
-
 #endif  //  __cplusplus
 #endif
diff --git a/dtool/src/dtoolbase/memoryHook.cxx b/dtool/src/dtoolbase/memoryHook.cxx
index 567097e213..b132ed5754 100644
--- a/dtool/src/dtoolbase/memoryHook.cxx
+++ b/dtool/src/dtoolbase/memoryHook.cxx
@@ -19,7 +19,9 @@
 #ifdef WIN32
 
 // Windows case.
-#define WIN32_LEAN_AND_MEAN
+#ifndef WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN 1
+#endif
 #include <windows.h>
 
 #else
diff --git a/dtool/src/dtoolbase/mutexWin32Impl.h b/dtool/src/dtoolbase/mutexWin32Impl.h
index 5513d120a8..1c66583a9c 100644
--- a/dtool/src/dtoolbase/mutexWin32Impl.h
+++ b/dtool/src/dtoolbase/mutexWin32Impl.h
@@ -19,7 +19,9 @@
 #include "selectThreadImpl.h"
 
 #ifdef WIN32_VC
-#define WIN32_LEAN_AND_MEAN
+#ifndef WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN 1
+#endif
 #include <windows.h>
 
 ////////////////////////////////////////////////////////////////////
diff --git a/dtool/src/dtoolbase/ptmalloc2_smp_src.cxx b/dtool/src/dtoolbase/ptmalloc2_smp_src.cxx
index 1de71ccb98..7ecfde41f1 100644
--- a/dtool/src/dtoolbase/ptmalloc2_smp_src.cxx
+++ b/dtool/src/dtoolbase/ptmalloc2_smp_src.cxx
@@ -482,7 +482,9 @@ int tsd_key_next;
 #elif defined(WIN32)
 /* Win32 emulation */
 
-#define WIN32_LEAN_AND_MEAN
+#ifndef WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN 1
+#endif
 #define _WIN32_WINNT 0x600
 #include <windows.h>
 
diff --git a/dtool/src/dtoolbase/stl_compares.I b/dtool/src/dtoolbase/stl_compares.I
index 002db30aca..31ac164cad 100644
--- a/dtool/src/dtoolbase/stl_compares.I
+++ b/dtool/src/dtoolbase/stl_compares.I
@@ -234,3 +234,25 @@ INLINE size_t indirect_method_hash<Key, Compare>::
 operator () (const Key &key) const {
   return (*key).get_hash();
 }
+
+////////////////////////////////////////////////////////////////////
+//     Function: indirect_equals_hash::operator ()
+//       Access: Public
+//  Description: Calls the Key's get_hash() method.
+////////////////////////////////////////////////////////////////////
+template<class Key>
+INLINE size_t indirect_equals_hash<Key>::
+operator () (const Key &key) const {
+  return (*key).get_hash();
+}
+
+////////////////////////////////////////////////////////////////////
+//     Function: indirect_equals_hash::is_equal
+//       Access: Public
+//  Description: Returns true if a is equal to b, false otherwise.
+////////////////////////////////////////////////////////////////////
+template<class Key>
+INLINE bool indirect_equals_hash<Key>::
+is_equal(const Key &a, const Key &b) const {
+  return (a == b || (*a) == (*b));
+}
diff --git a/dtool/src/dtoolbase/stl_compares.h b/dtool/src/dtoolbase/stl_compares.h
index ff298db9d1..806f3722ff 100644
--- a/dtool/src/dtoolbase/stl_compares.h
+++ b/dtool/src/dtoolbase/stl_compares.h
@@ -33,7 +33,6 @@ public:
   }
 };
 
-
 #else
 
 #include <map>  // for less
@@ -212,6 +211,23 @@ public:
   }
 };
 
+////////////////////////////////////////////////////////////////////
+//       Class : indirect_equals_hash
+// Description : An STL function object class, this is intended to be
+//               used on any ordered collection of pointers to classes
+//               that contain an operator ==() method.  It defines
+//               the equality of the pointers via operator ==().
+//
+//               Since it doesn't define the ordering of the pointers,
+//               it can only be used with hash containers.
+////////////////////////////////////////////////////////////////////
+template<class Key>
+class indirect_equals_hash {
+public:
+  INLINE size_t operator () (const Key &key) const;
+  INLINE bool is_equal(const Key &a, const Key &b) const;
+};
+
 #include "stl_compares.I"
 
 typedef floating_point_hash<float> float_hash;
@@ -234,5 +250,3 @@ class indirect_compare_names_hash : public indirect_method_hash<Key, indirect_co
 };
 
 #endif
-
-
diff --git a/dtool/src/dtoolbase/typeHandle.h b/dtool/src/dtoolbase/typeHandle.h
index 8a92461177..464fab66d6 100644
--- a/dtool/src/dtoolbase/typeHandle.h
+++ b/dtool/src/dtoolbase/typeHandle.h
@@ -16,7 +16,6 @@
 #define TYPEHANDLE_H
 
 #include "dtoolbase.h"
-#include "typeRegistry.h"
 
 #include <set>
 
@@ -152,7 +151,7 @@ private:
   int _index;
   static TypeHandle _none;
 
-friend class TypeRegistry;
+  friend class TypeRegistry;
 };
 
 
diff --git a/dtool/src/dtoolbase/typeRegistry.I b/dtool/src/dtoolbase/typeRegistry.I
index 45e535aa84..21f15f1f1d 100644
--- a/dtool/src/dtoolbase/typeRegistry.I
+++ b/dtool/src/dtoolbase/typeRegistry.I
@@ -39,3 +39,30 @@ init_lock() {
     _lock = new MutexImpl;
   }
 }
+
+////////////////////////////////////////////////////////////////////
+//     Function: TypeRegistry::look_up
+//       Access: Private
+//  Description: Returns the TypeRegistryNode associated with the
+//               indicated TypeHandle.  If there is no associated
+//               TypeRegistryNode, reports an error condition and
+//               returns NULL.
+//
+//               The associated TypedObject pointer is the pointer to
+//               the object that owns the handle, if available.  It is
+//               only used in an error condition, if for some reason
+//               the handle was uninitialized.
+//
+//               Assumes the lock is already held.
+////////////////////////////////////////////////////////////////////
+INLINE TypeRegistryNode *TypeRegistry::
+look_up(TypeHandle handle, TypedObject *object) const {
+#ifndef NDEBUG
+  if (handle._index >= (int)_handle_registry.size() ||
+      handle._index <= 0) {
+    // Invalid or uninitialized type handle.
+    return look_up_invalid(handle, object);
+  }
+#endif
+  return _handle_registry[handle._index];
+}
diff --git a/dtool/src/dtoolbase/typeRegistry.cxx b/dtool/src/dtoolbase/typeRegistry.cxx
index 4b61ec56a2..f88f923f04 100644
--- a/dtool/src/dtoolbase/typeRegistry.cxx
+++ b/dtool/src/dtoolbase/typeRegistry.cxx
@@ -498,7 +498,7 @@ get_parent_towards(TypeHandle child, TypeHandle base,
   TypeHandle handle;
   const TypeRegistryNode *child_node = look_up(child, child_object);
   const TypeRegistryNode *base_node = look_up(base, NULL);
-  assert(child_node != (TypeRegistryNode *)NULL && 
+  assert(child_node != (TypeRegistryNode *)NULL &&
          base_node != (TypeRegistryNode *)NULL);
   freshen_derivations();
   handle = TypeRegistryNode::get_parent_towards(child_node, base_node);
@@ -688,22 +688,17 @@ write_node(ostream &out, int indent_level, const TypeRegistryNode *node) const {
 }
 
 ////////////////////////////////////////////////////////////////////
-//     Function: TypeRegistry::look_up
+//     Function: TypeRegistry::look_up_invalid
 //       Access: Private
-//  Description: Returns the TypeRegistryNode associated with the
-//               indicated TypeHandle.  If there is no associated
-//               TypeRegistryNode, reports an error condition and
-//               returns NULL.
-//
-//               The associated TypedObject pointer is the pointer to
-//               the object that owns the handle, if available.  It is
-//               only used in an error condition, if for some reason
-//               the handle was uninitialized.
+//  Description: Called by look_up when it detects an invalid
+//               TypeHandle pointer.  In non-release builds, this
+//               method will do what it can to recover from this
+//               and initialize the type anyway.
 //
 //               Assumes the lock is already held.
 ////////////////////////////////////////////////////////////////////
 TypeRegistryNode *TypeRegistry::
-look_up(TypeHandle handle, TypedObject *object) const {
+look_up_invalid(TypeHandle handle, TypedObject *object) const {
 #ifndef NDEBUG
   if (handle._index == 0) {
     // The TypeHandle is unregistered.  This is an error condition.
diff --git a/dtool/src/dtoolbase/typeRegistry.h b/dtool/src/dtoolbase/typeRegistry.h
index 10efa40cad..85e071bf0d 100644
--- a/dtool/src/dtoolbase/typeRegistry.h
+++ b/dtool/src/dtoolbase/typeRegistry.h
@@ -88,7 +88,8 @@ private:
   TypeRegistry();
 
   static void init_global_pointer();
-  TypeRegistryNode *look_up(TypeHandle type, TypedObject *object) const;
+  INLINE TypeRegistryNode *look_up(TypeHandle type, TypedObject *object) const;
+  TypeRegistryNode *look_up_invalid(TypeHandle type, TypedObject *object) const;
 
   INLINE void freshen_derivations();
   void rebuild_derivations();
@@ -120,6 +121,8 @@ private:
 // Helper function to allow for "C" interaction into the type system
 extern "C" EXPCL_DTOOL  int get_best_parent_from_Set(int id, const std::set<int> &this_set);
 
+#include "typeHandle.h"
+
 #include "typeRegistry.I"
 
 #endif
diff --git a/dtool/src/dtoolbase/typeRegistryNode.cxx b/dtool/src/dtoolbase/typeRegistryNode.cxx
index 2a5860e834..09e36a7ceb 100644
--- a/dtool/src/dtoolbase/typeRegistryNode.cxx
+++ b/dtool/src/dtoolbase/typeRegistryNode.cxx
@@ -48,11 +48,6 @@ is_derived_from(const TypeRegistryNode *child, const TypeRegistryNode *base) {
   // code.  Therefore, we go through some pains to make this function
   // as efficient as possible.
 
-  // (Actually, it appears that the function is not called as often as
-  // I'd first thought, and it wasn't really all that expensive to
-  // begin with.  So much of this complexity is of limited usefulness.
-  // Oh well.)
-
   // First, compare the subtree tops.  If they are the same, then this
   // node and the base node are within the same single-inheritance
   // subtree, and we can use our bitmask trick to determine the
diff --git a/dtool/src/dtoolutil/executionEnvironment.cxx b/dtool/src/dtoolutil/executionEnvironment.cxx
index 2d970c789e..059bce8fcd 100644
--- a/dtool/src/dtoolutil/executionEnvironment.cxx
+++ b/dtool/src/dtoolutil/executionEnvironment.cxx
@@ -55,15 +55,17 @@
 #ifdef IS_FREEBSD
 extern char **environ;
 
-// For Link_map and dlinfo.
-#include <link.h>
-#include <dlfcn.h>
-
 // This is for sysctl.
 #include <sys/types.h>
 #include <sys/sysctl.h>
 #endif
 
+#if defined(IS_LINUX) || defined(IS_OSX)
+// For link_map and dlinfo.
+#include <link.h>
+#include <dlfcn.h>
+#endif
+
 #ifdef HAVE_PYTHON
 #include "Python.h"
 #endif
@@ -507,7 +509,7 @@ ns_get_binary_name() const {
 ////////////////////////////////////////////////////////////////////
 //     Function: ExecutionEnvironment::ns_get_dtool_name
 //       Access: Private
-//  Description: Returns the name of the libdtool DLL that
+//  Description: Returns the name of the libp3dtool DLL that
 //               is used in this program, if it can be determined.  The
 //               nonstatic implementation.
 ////////////////////////////////////////////////////////////////////
@@ -646,14 +648,34 @@ read_args() {
       const char *buffer = _dyld_get_image_name(i);
       const char *tail = strrchr(buffer, '/');
       if (tail && (strcmp(tail, "/libp3dtool." PANDA_ABI_VERSION_STR ".dylib") == 0
-                || strcmp(tail, "/libp3dtool.dylib") == 0
-                || strcmp(tail, "/libdtool.dylib") == 0)) {
+                || strcmp(tail, "/libp3dtool.dylib") == 0)) {
         _dtool_name = buffer;
       }
     }
   }
 #endif
 
+#if defined(IS_FREEBSD) || defined(IS_LINUX)
+  // FreeBSD and Linux have a function to get the origin of a loaded library.
+
+  char origin[PATH_MAX + 1];
+
+  if (_dtool_name.empty()) {
+    void *dtool_handle = dlopen("libp3dtool.so." PANDA_ABI_VERSION_STR, RTLD_NOW | RTLD_NOLOAD);
+    if (dtool_handle != NULL && dlinfo(dtool_handle, RTLD_DI_ORIGIN, origin) != -1) {
+      _dtool_name = origin;
+      _dtool_name += "/libp3dtool.so." PANDA_ABI_VERSION_STR;
+    } else {
+      // Try the version of libp3dtool.so without ABI suffix.
+      dtool_handle = dlopen("libp3dtool.so", RTLD_NOW | RTLD_NOLOAD);
+      if (dtool_handle != NULL && dlinfo(dtool_handle, RTLD_DI_ORIGIN, origin) != -1) {
+        _dtool_name = origin;
+        _dtool_name += "/libp3dtool.so";
+      }
+    }
+  }
+#endif
+
 #if defined(IS_FREEBSD)
   // On FreeBSD, we can use dlinfo to get the linked libraries.
 
@@ -665,8 +687,7 @@ read_args() {
       char *tail = strrchr(map->l_name, '/');
       char *head = strchr(map->l_name, '/');
       if (tail && head && (strcmp(tail, "/libp3dtool.so." PANDA_ABI_VERSION_STR) == 0
-                        || strcmp(tail, "/libp3dtool.so") == 0
-                        || strcmp(tail, "/libdtool.so") == 0)) {
+                        || strcmp(tail, "/libp3dtool.so") == 0)) {
         _dtool_name = head;
       }
       map = map->l_next;
@@ -690,8 +711,7 @@ read_args() {
       char *tail = strrchr(buffer, '/');
       char *head = strchr(buffer, '/');
       if (tail && head && (strcmp(tail, "/libp3dtool.so." PANDA_ABI_VERSION_STR) == 0
-                        || strcmp(tail, "/libp3dtool.so") == 0
-                        || strcmp(tail, "/libdtool.so") == 0)) {
+                        || strcmp(tail, "/libp3dtool.so") == 0)) {
         _dtool_name = head;
       }
     }
diff --git a/dtool/src/dtoolutil/pandaFileStreamBuf.h b/dtool/src/dtoolutil/pandaFileStreamBuf.h
index 4421251afd..0561c3bcba 100644
--- a/dtool/src/dtoolutil/pandaFileStreamBuf.h
+++ b/dtool/src/dtoolutil/pandaFileStreamBuf.h
@@ -20,7 +20,9 @@
 #ifdef USE_PANDAFILESTREAM
 
 #if defined(_WIN32)
-#define WIN32_LEAN_AND_MEAN
+#ifndef WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN 1
+#endif
 #include <windows.h>
 #endif
 
diff --git a/dtool/src/dtoolutil/pfstreamBuf.h b/dtool/src/dtoolutil/pfstreamBuf.h
index 02243f0af6..5e35723997 100644
--- a/dtool/src/dtoolutil/pfstreamBuf.h
+++ b/dtool/src/dtoolutil/pfstreamBuf.h
@@ -28,7 +28,9 @@
 #endif
 
 #ifdef WIN_PIPE_CALLS
-#define WIN32_LEAN_AND_MEAN
+#ifndef WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN 1
+#endif
 #include <windows.h>
 
 #else  // WIN_PIPE_CALLS
diff --git a/dtool/src/interrogate/functionRemap.cxx b/dtool/src/interrogate/functionRemap.cxx
index bc4da08534..f30edfd2e5 100644
--- a/dtool/src/interrogate/functionRemap.cxx
+++ b/dtool/src/interrogate/functionRemap.cxx
@@ -162,6 +162,18 @@ call_function(ostream &out, int indent_level, bool convert_result,
     string defconstruct = builder.in_defconstruct(_cpptype->get_local_name(&parser));
     if (pexprs.empty() && !defconstruct.empty()) {
       return_expr = defconstruct;
+    } else if (_extension) {
+      // Extension constructors are a special case.  We assume there is a
+      // default constructor for the class, and the actual construction is
+      // done by an __init__ method.
+      InterfaceMaker::indent(out, indent_level);
+      _return_type->get_new_type()->output_instance(out, "result", &parser);
+      out << " = new " << _cpptype->get_local_name(&parser) << ";\n";
+
+      InterfaceMaker::indent(out, indent_level)
+        << get_call_str("result", pexprs) << ";\n";
+
+      return_expr = "result";
     } else {
       return_expr = "new " + get_call_str(container, pexprs);
     }
@@ -330,7 +342,7 @@ make_wrapper_entry(FunctionIndex function_index) {
       // understands that if the destructor function is zero, it
       // should use the regular class destructor.
 
-      //          nout << "Warning!  Destructor for " 
+      //          nout << "Warning!  Destructor for "
       //               << *_return_type->get_orig_type()
       //               << " is unavailable.\n"
       //               << "  Cannot manage return value for:\n  "
@@ -386,11 +398,13 @@ get_call_str(const string &container, const vector_string &pexprs) const {
         call << "Extension<" << _cpptype->get_local_name(&parser) << ">::";
       }
 
-      call << _cppfunc->get_local_name();
-      call << "(";
-
+      if (_type == T_constructor) {
+        // Constructor extensions are named __init__, by convention.
+        call << "__init__";
+      } else {
+        call << _cppfunc->get_local_name();
+      }
     } else {
-
       if (_type == T_constructor) {
         // Constructors are called differently.
         call << _cpptype->get_local_name(&parser);
@@ -403,9 +417,8 @@ get_call_str(const string &container, const vector_string &pexprs) const {
       } else {
         call << _cppfunc->get_local_name(&parser);
       }
-
-      call << "(";
     }
+    call << "(";
 
     if (_flags & F_explicit_self) {
       // Pass on the PyObject * that we stripped off above.
@@ -639,7 +652,7 @@ setup_properties(const InterrogateFunction &ifunc, InterfaceMaker *interface_mak
   }
 
   if (_has_this || _type == T_constructor) {
-    if (_parameters.size() > first_param && _parameters[first_param]._name == "self" &&
+    if (_parameters.size() > (size_t)first_param && _parameters[first_param]._name == "self" &&
         TypeManager::is_pointer_to_PyObject(_parameters[first_param]._remap->get_orig_type())) {
       // Here's a special case.  If the first parameter of a nonstatic
       // method is a PyObject * called "self", then we will
diff --git a/dtool/src/interrogate/interfaceMakerPythonNative.cxx b/dtool/src/interrogate/interfaceMakerPythonNative.cxx
old mode 100755
new mode 100644
index b37c088bb0..5bb52227ca
--- a/dtool/src/interrogate/interfaceMakerPythonNative.cxx
+++ b/dtool/src/interrogate/interfaceMakerPythonNative.cxx
@@ -3121,7 +3121,7 @@ write_function_instance(ostream &out, InterfaceMaker::Object *obj,
                          " wchar_t *" + param_name + "_str = (wchar_t *)alloca(sizeof(wchar_t) * " + param_name + "_len);"
                          " PyUnicode_AsWideChar(" + param_name + ", " + param_name + "_str, " + param_name + "_len);";
 
-        pexpr_string = "basic_string<wchar_t>(" +
+        pexpr_string = "std::wstring(" +
           param_name + "_str, " +
           param_name + "_len)";
 
@@ -3140,7 +3140,7 @@ write_function_instance(ostream &out, InterfaceMaker::Object *obj,
                          " wchar_t *" + param_name + "_str = (wchar_t *)alloca(sizeof(wchar_t) * " + param_name + "_len);"
                          " PyUnicode_AsWideChar(" + param_name + ", " + param_name + "_str, " + param_name + "_len);";
 
-        pexpr_string = "&basic_string<wchar_t>(" +
+        pexpr_string = "&std::wstring(" +
           param_name + "_str, " +
           param_name + "_len)";
 
@@ -3169,11 +3169,11 @@ write_function_instance(ostream &out, InterfaceMaker::Object *obj,
         }
 
         if (TypeManager::is_const_ptr_to_basic_string_char(orig_type)) {
-          pexpr_string = "&basic_string<char>(" +
+          pexpr_string = "&std::string(" +
             param_name + "_str, " +
             param_name + "_len)";
         } else {
-          pexpr_string = "basic_string<char>(" +
+          pexpr_string = "std::string(" +
             param_name + "_str, " +
             param_name + "_len)";
         }
diff --git a/dtool/src/interrogate/interfaceMakerPythonNative.h b/dtool/src/interrogate/interfaceMakerPythonNative.h
old mode 100755
new mode 100644
diff --git a/dtool/src/interrogate/interrogateBuilder.cxx b/dtool/src/interrogate/interrogateBuilder.cxx
index a752e2b67c..c46b9f9c1c 100644
--- a/dtool/src/interrogate/interrogateBuilder.cxx
+++ b/dtool/src/interrogate/interrogateBuilder.cxx
@@ -214,6 +214,22 @@ do_command(const string &command, const string &params) {
   } else if (command == "noinclude") {
     insert_param_list(_noinclude, params);
 
+  } else if (command == "forceinclude") {
+    size_t nchars = params.size();
+    if (nchars >= 2 && params[0] == '"' && params[nchars-1] == '"') {
+      string incfile = params.substr(1, nchars - 2);
+      _include_files[incfile] = '"';
+
+    } else if (nchars >= 2 && params[0] == '<' && params[nchars-1] == '>') {
+      string incfile = params.substr(1, nchars - 2);
+      _include_files[incfile] = '<';
+
+    } else {
+      nout << "Ignoring invalid forceinclude " << params << "\n"
+              "Expected to be in one of the following forms:\n"
+              "  forceinclude \"file.h\"\n"
+              "  forceinclude <file.h>\n";
+    }
   } else {
     nout << "Ignoring " << command << " " << params << "\n";
   }
diff --git a/dtool/src/interrogate/interrogate_module.cxx b/dtool/src/interrogate/interrogate_module.cxx
index fb25057007..9292f04b02 100644
--- a/dtool/src/interrogate/interrogate_module.cxx
+++ b/dtool/src/interrogate/interrogate_module.cxx
@@ -112,7 +112,7 @@ int write_python_table_native(ostream &out) {
   pset<std::string >::iterator ii;
   for(ii = libraries.begin(); ii != libraries.end(); ii++) {
     printf("Referencing Library %s\n", (*ii).c_str());
-    out << "IMPORT_THIS LibraryDef " << *ii << "_moddef;\n";
+    out << "extern LibraryDef " << *ii << "_moddef;\n";
   }
 
   out << "\n"
diff --git a/dtool/src/prc/configFlags.cxx b/dtool/src/prc/configFlags.cxx
index 440f1cfc6b..233fa5d307 100644
--- a/dtool/src/prc/configFlags.cxx
+++ b/dtool/src/prc/configFlags.cxx
@@ -52,6 +52,9 @@ operator << (ostream &out, ConfigFlags::ValueType type) {
 
   case ConfigFlags::VT_int64:
     return out << "int64";
+
+  case ConfigFlags::VT_color:
+    return out << "color";
   }
 
   return out << "**invalid(" << (int)type << ")**";
diff --git a/dtool/src/prc/configFlags.h b/dtool/src/prc/configFlags.h
index 14afb83744..a90bdc1f33 100644
--- a/dtool/src/prc/configFlags.h
+++ b/dtool/src/prc/configFlags.h
@@ -39,6 +39,7 @@ PUBLISHED:
     VT_enum,
     VT_search_path,
     VT_int64,
+    VT_color,
   };
 
   enum VariableFlags {
@@ -75,4 +76,3 @@ ostream &operator << (ostream &out, ConfigFlags::ValueType type);
 #include "configFlags.I"
 
 #endif
-
diff --git a/dtool/src/pystub/pystub.cxx b/dtool/src/pystub/pystub.cxx
index 116da89ee7..305eabd596 100644
--- a/dtool/src/pystub/pystub.cxx
+++ b/dtool/src/pystub/pystub.cxx
@@ -192,6 +192,7 @@ extern "C" {
   EXPCL_PYSTUB extern void *PyExc_SystemExit;
   EXPCL_PYSTUB extern void *PyExc_TypeError;
   EXPCL_PYSTUB extern void *PyExc_ValueError;
+  EXPCL_PYSTUB extern void *_Py_FalseStruct;
   EXPCL_PYSTUB extern void *_Py_NoneStruct;
   EXPCL_PYSTUB extern void *_Py_NotImplementedStruct;
   EXPCL_PYSTUB extern void *_Py_TrueStruct;
@@ -381,6 +382,7 @@ void *PyExc_StopIteration = (void *)NULL;
 void *PyExc_SystemExit = (void *)NULL;
 void *PyExc_TypeError = (void *)NULL;
 void *PyExc_ValueError = (void *)NULL;
+void *_Py_FalseStruct = (void *)NULL;
 void *_Py_NoneStruct = (void *)NULL;
 void *_Py_NotImplementedStruct = (void *)NULL;
 void *_Py_TrueStruct = (void *)NULL;
diff --git a/makepanda/config.in b/makepanda/config.in
index 2e441d0d92..9b0943918d 100755
--- a/makepanda/config.in
+++ b/makepanda/config.in
@@ -14,7 +14,6 @@
 
 load-display pandagl
 #load-display pandadx9
-#load-display pandadx8
 #load-display pandagles
 #load-display p3tinydisplay
 
diff --git a/makepanda/installpanda.py b/makepanda/installpanda.py
index 20f4fd2773..b1804942d8 100644
--- a/makepanda/installpanda.py
+++ b/makepanda/installpanda.py
@@ -12,11 +12,16 @@
 #
 ########################################################################
 
-import os, sys, platform, compileall
+import os, sys, platform
 from distutils.sysconfig import get_python_lib
 from optparse import OptionParser
 from makepandacore import *
 
+def python_sitepackages_path():
+    from distutils.sysconfig import get_python_lib
+    return get_python_lib(1)
+PYTHON_SITEPACKAGES=python_sitepackages_path()
+
 MIME_INFO = (
   ("egg", "model/x-egg", "EGG model file", "pview"),
   ("bam", "model/x-bam", "Panda3D binary model file", "pview"),
@@ -201,9 +206,9 @@ def InstallPanda(destdir="", prefix="/usr", outputdir="built", libdir=GetLibDir(
     WriteKeysFile(destdir+prefix+"/share/mime-info/panda3d.keys", MIME_INFO)
     WriteMimeXMLFile(destdir+prefix+"/share/mime/packages/panda3d.xml", MIME_INFO)
     WriteApplicationsFile(destdir+prefix+"/share/application-registry/panda3d.applications", APP_INFO, MIME_INFO)
-    oscmd("cp makepanda/pview.desktop           "+destdir+prefix+"/share/applications/pview.desktop")
-    oscmd("cp doc/LICENSE                       "+destdir+prefix+"/share/panda3d/LICENSE")
-    oscmd("cp doc/LICENSE                       "+destdir+prefix+"/include/panda3d/LICENSE")
+    if os.path.isfile(outputdir+"/bin/pview"):
+        oscmd("cp makepanda/pview.desktop "+destdir+prefix+"/share/applications/pview.desktop")
+
     oscmd("cp doc/ReleaseNotes                  "+destdir+prefix+"/share/panda3d/ReleaseNotes")
     oscmd("echo '"+prefix+"/share/panda3d' >    "+destdir+PPATH+"/panda3d.pth")
     oscmd("echo '"+libdir+"/panda3d'>>   "+destdir+PPATH+"/panda3d.pth")
@@ -211,22 +216,17 @@ def InstallPanda(destdir="", prefix="/usr", outputdir="built", libdir=GetLibDir(
         oscmd("echo '"+libdir+"/panda3d'>    "+destdir+"/usr/local/libdata/ldconfig/panda3d")
     else:
         oscmd("echo '"+libdir+"/panda3d'>    "+destdir+"/etc/ld.so.conf.d/panda3d.conf")
-        oscmd("chmod +x "+destdir+"/etc/ld.so.conf.d/panda3d.conf")
+
     oscmd("cp "+outputdir+"/bin/*               "+destdir+prefix+"/bin/")
     for base in os.listdir(outputdir+"/lib"):
         if (not base.endswith(".a")) or base == "libp3pystub.a":
             # We really need to specify -R in order not to follow symlinks on non-GNU
             oscmd("cp -R -P "+outputdir+"/lib/"+base+" "+destdir+libdir+"/panda3d/"+base)
-    # rpmlint doesn't like it if we compile pyc.
-    #for base in os.listdir(destdir+prefix+"/share/panda3d/direct"):
-    #    if ((base != "extensions") and (base != "extensions_native")):
-    #        compileall.compile_dir(destdir+prefix+"/share/panda3d/direct/"+base)
-    #compileall.compile_dir(destdir+prefix+"/share/panda3d/Pmw")
 
-    DeleteCVS(destdir+prefix+"/share/panda3d")
+    DeleteVCS(destdir+prefix+"/share/panda3d")
     DeleteBuildFiles(destdir+prefix+"/share/panda3d")
     DeleteEmptyDirs(destdir+prefix+"/share/panda3d")
-    DeleteCVS(destdir+prefix+"/include/panda3d")
+    DeleteVCS(destdir+prefix+"/include/panda3d")
     DeleteBuildFiles(destdir+prefix+"/include/panda3d")
     DeleteEmptyDirs(destdir+prefix+"/include/panda3d")
 
diff --git a/makepanda/makepanda.py b/makepanda/makepanda.py
index d58e235a6d..b83bf5213c 100755
--- a/makepanda/makepanda.py
+++ b/makepanda/makepanda.py
@@ -68,7 +68,7 @@ COREAPI_VERSION=None
 PLUGIN_VERSION=None
 OSXTARGET=None
 UNIVERSAL=False
-HOST_URL="https://runtime.panda3d.org/"
+HOST_URL=None
 global STRDXSDKVERSION, STRMSPLATFORMVERSION, BOOUSEINTELCOMPILER
 STRDXSDKVERSION = 'default'
 STRMSPLATFORMVERSION = 'default'
@@ -429,11 +429,16 @@ SdkAutoDisablePhysX()
 SdkAutoDisableSpeedTree()
 
 if (RTDIST and DISTRIBUTOR == "cmu"):
+    HOST_URL = "https://runtime.panda3d.org/"
+
     if (RTDIST_VERSION == "cmu_1.7" and SDK["PYTHONVERSION"] != "python2.6"):
         exit("The CMU 1.7 runtime distribution must be built against Python 2.6!")
     elif (RTDIST_VERSION == "cmu_1.8" and SDK["PYTHONVERSION"] != "python2.7"):
         exit("The CMU 1.8 runtime distribution must be built against Python 2.7!")
 
+elif RTDIST and not HOST_URL:
+    exit("You must specify a host URL when building the rtdist!")
+
 ########################################################################
 ##
 ## Choose a Compiler.
@@ -970,7 +975,15 @@ def CompileCxx(obj,src,opts):
             if ("BIGOBJ" in opts) or GetTargetArch() == 'x64':
                 cmd += " /bigobj"
 
-            cmd += " /EHa /Zm300 /DWIN32_VC /DWIN32"
+            cmd += " /Zm300 /DWIN32_VC /DWIN32"
+            if 'EXCEPTIONS' in opts:
+                cmd += " /EHsc"
+            else:
+                cmd += " -D_HAS_EXCEPTIONS=0"
+
+            if 'RTTI' not in opts:
+                 cmd += " /GR-"
+
             if GetTargetArch() == 'x64':
                 cmd += " /DWIN64_VC /DWIN64"
 
@@ -1094,6 +1107,8 @@ def CompileCxx(obj,src,opts):
         arch = GetTargetArch()
 
         if GetTarget() == "android":
+            # Most of the specific optimization flags here were
+            # just copied from the default Android Makefiles.
             cmd += ' -I%s/include' % (SDK["ANDROID_STL"])
             cmd += ' -I%s/libs/%s/include' % (SDK["ANDROID_STL"], SDK["ANDROID_ABI"])
             cmd += ' -ffunction-sections -funwind-tables'
@@ -1108,8 +1123,6 @@ def CompileCxx(obj,src,opts):
                 cmd += ' -fno-inline-functions-called-once -fgcse-after-reload'
                 cmd += ' -frerun-cse-after-loop -frename-registers'
 
-            if not src.endswith(".c"):
-                cmd += " -fno-exceptions -fno-rtti"
             cmd += " -Wa,--noexecstack"
 
             # Now add specific release/debug flags.
@@ -1135,9 +1148,27 @@ def CompileCxx(obj,src,opts):
         else:
             cmd += " -pthread"
 
+        if not src.endswith(".c"):
+            # We don't use exceptions for most modules.
+            if 'EXCEPTIONS' in opts:
+                cmd += " -fexceptions"
+            else:
+                cmd += " -fno-exceptions"
+
+            if 'RTTI' not in opts:
+                # We always disable RTTI on Android for memory usage reasons.
+                if optlevel >= 4 or GetTarget() == "android":
+                    cmd += " -fno-rtti"
+
         if PkgSkip("SSE2") == 0 and not arch.startswith("arm"):
             cmd += " -msse2"
 
+        if optlevel >= 3:
+            cmd += " -ffast-math"
+        if optlevel == 3:
+            # Fast math is nice, but we'd like to see NaN in dev builds.
+            cmd += " -fno-finite-math-only"
+
         if (optlevel==1): cmd += " -ggdb -D_DEBUG"
         if (optlevel==2): cmd += " -O1 -D_DEBUG"
         if (optlevel==3): cmd += " -O2"
@@ -1272,8 +1303,8 @@ def CompileIgate(woutd,wsrc,opts):
         if (opt=="ALWAYS") or (opt in opts):
             cmd += ' -D' + var + '=' + val
 
-    building = GetValueOption(opts, "BUILDING:")
-    if (building): cmd += " -DBUILDING_"+building
+    #building = GetValueOption(opts, "BUILDING:")
+    #if (building): cmd += " -DBUILDING_"+building
     cmd += ' -module ' + module + ' -library ' + library
     for x in wsrc:
         if (x.startswith("/")):
@@ -1498,6 +1529,10 @@ def CompileLink(dll, obj, opts):
             else:
                 cmd = cxx + ' -shared'
                 if ("MODULE" not in opts): cmd += " -Wl,-soname=" + os.path.basename(dll)
+                if GetOrigExt(dll) == ".pyd" and not os.path.basename(dll).startswith('core'):
+                    # Tell the other libraries where to find core.so.
+                    # Not sure if this is the best way to do that, but it works.
+                    cmd += " -Wl,-rpath '-Wl,$ORIGIN'"
                 cmd += ' -o ' + dll + ' -L' + GetOutputDir() + '/lib -L' + GetOutputDir() + '/tmp'
 
         for x in obj:
@@ -1554,8 +1589,8 @@ def CompileLink(dll, obj, opts):
             CopyFile(new_path, dll)
             oscmd('%s --strip-unneeded %s' % (GetStrip(), BracketNameWithQuotes(new_path)))
 
-        elif (GetOrigExt(dll)==".exe" and GetOptimizeOption(opts)==4 and "NOSTRIP" not in opts):
-            oscmd(GetStrip() + " -x " + BracketNameWithQuotes(dll))
+        elif (GetOptimizeOption(opts)==4 and GetTarget() == 'linux'):
+            oscmd(GetStrip() + " --strip-unneeded " + BracketNameWithQuotes(dll))
 
         os.system("chmod +x " + BracketNameWithQuotes(dll))
 
@@ -1927,13 +1962,9 @@ DTOOL_CONFIG=[
     ("USE_PANDAFILESTREAM",            '1',                      '1'),
     ("USE_DELETED_CHAIN",              '1',                      '1'),
     ("HAVE_WIN_TOUCHINPUT",            'UNDEF',                  'UNDEF'),
-    ("HAVE_GL",                        '1',                      'UNDEF'),
-    ("HAVE_GLES",                      'UNDEF',                  'UNDEF'),
-    ("HAVE_GLES2",                     'UNDEF',                  'UNDEF'),
     ("HAVE_GLX",                       'UNDEF',                  '1'),
     ("HAVE_EGL",                       'UNDEF',                  'UNDEF'),
     ("HAVE_WGL",                       '1',                      'UNDEF'),
-    ("HAVE_DX8",                       'UNDEF',                  'UNDEF'),
     ("HAVE_DX9",                       'UNDEF',                  'UNDEF'),
     ("HAVE_CHROMIUM",                  'UNDEF',                  'UNDEF'),
     ("HAVE_THREADS",                   '1',                      '1'),
@@ -1946,7 +1977,7 @@ DTOOL_CONFIG=[
     ("DO_PSTATS",                      'UNDEF',                  'UNDEF'),
     ("DO_DCAST",                       'UNDEF',                  'UNDEF'),
     ("DO_COLLISION_RECORDING",         'UNDEF',                  'UNDEF'),
-    ("SUPPORT_IMMEDIATE_MODE",         '1',                      '1'),
+    ("SUPPORT_IMMEDIATE_MODE",         'UNDEF',                  'UNDEF'),
     ("TRACK_IN_INTERPRETER",           'UNDEF',                  'UNDEF'),
     ("DO_MEMORY_USAGE",                'UNDEF',                  'UNDEF'),
     ("DO_PIPELINING",                  '1',                      '1'),
@@ -2030,11 +2061,8 @@ DTOOL_CONFIG=[
     ("HAVE_BMP",                       '1',                      '1'),
     ("HAVE_PNM",                       '1',                      '1'),
     ("HAVE_VORBIS",                    'UNDEF',                  'UNDEF'),
-    ("HAVE_FMODEX",                    'UNDEF',                  'UNDEF'),
-    ("HAVE_OPENAL",                    'UNDEF',                  'UNDEF'),
     ("HAVE_NVIDIACG",                  'UNDEF',                  'UNDEF'),
     ("HAVE_FREETYPE",                  'UNDEF',                  'UNDEF'),
-    ("HAVE_SPEEDTREE",                 'UNDEF',                  'UNDEF'),
     ("HAVE_FFTW",                      'UNDEF',                  'UNDEF'),
     ("HAVE_OPENSSL",                   'UNDEF',                  'UNDEF'),
     ("HAVE_NET",                       'UNDEF',                  'UNDEF'),
@@ -2046,7 +2074,6 @@ DTOOL_CONFIG=[
     ("HAVE_SWSCALE",                   'UNDEF',                  'UNDEF'),
     ("HAVE_SWRESAMPLE",                'UNDEF',                  'UNDEF'),
     ("HAVE_ARTOOLKIT",                 'UNDEF',                  'UNDEF'),
-    ("HAVE_ODE",                       'UNDEF',                  'UNDEF'),
     ("HAVE_OPENCV",                    'UNDEF',                  'UNDEF'),
     ("HAVE_DIRECTCAM",                 'UNDEF',                  'UNDEF'),
     ("HAVE_SQUISH",                    'UNDEF',                  'UNDEF'),
@@ -2186,6 +2213,10 @@ def WriteConfigSettings():
     if (GetOptimize() >= 4):
         dtool_config["PRC_SAVE_DESCRIPTIONS"] = 'UNDEF'
 
+    if (GetOptimize() >= 4):
+        # Disable RTTI on release builds.
+        dtool_config["HAVE_RTTI"] = 'UNDEF'
+
     # Now that we have OS_SIMPLE_THREADS, we can support
     # SIMPLE_THREADS on exotic architectures like win64, so we no
     # longer need to disable it for this platform.
@@ -2194,7 +2225,8 @@ def WriteConfigSettings():
 
     if (RTDIST or RUNTIME):
         prc_parameters["DEFAULT_PRC_DIR"] = '""'
-        plugin_config["PANDA_PACKAGE_HOST_URL"] = HOST_URL
+        if HOST_URL:
+            plugin_config["PANDA_PACKAGE_HOST_URL"] = HOST_URL
         #plugin_config["P3D_PLUGIN_LOG_DIRECTORY"] = ""
         plugin_config["P3D_PLUGIN_LOG_BASENAME1"] = ""
         plugin_config["P3D_PLUGIN_LOG_BASENAME2"] = ""
@@ -2404,7 +2436,7 @@ def CreatePandaVersionFiles():
     pandaversion_h = pandaversion_h.replace("$DISTRIBUTOR",DISTRIBUTOR)
     pandaversion_h = pandaversion_h.replace("$RTDIST_VERSION",RTDIST_VERSION)
     pandaversion_h = pandaversion_h.replace("$COREAPI_VERSION",COREAPI_VERSION)
-    pandaversion_h = pandaversion_h.replace("$HOST_URL",HOST_URL)
+    pandaversion_h = pandaversion_h.replace("$HOST_URL",(HOST_URL or ""))
     if (DISTRIBUTOR == "cmu"):
         pandaversion_h += "\n#define PANDA_OFFICIAL_VERSION\n"
     else:
@@ -2491,7 +2523,6 @@ if (GetTarget() == 'windows'):
     configprc = configprc.replace("$HOME/.panda3d", "$USER_APPDATA/Panda3D-%s" % MAJOR_VERSION)
 else:
     configprc = configprc.replace("aux-display pandadx9", "")
-    configprc = configprc.replace("aux-display pandadx8", "")
 
 if (GetTarget() == 'darwin'):
     configprc = configprc.replace(".panda3d/cache", "Library/Caches/Panda3D-%s" % MAJOR_VERSION)
@@ -2583,7 +2614,7 @@ CopyFile(GetOutputDir()+'/include/parser-inc/glew/','dtool/src/parser-inc/glew.h
 CopyFile(GetOutputDir()+'/include/parser-inc/Eigen/','dtool/src/parser-inc/Dense')
 CopyFile(GetOutputDir()+'/include/parser-inc/Eigen/','dtool/src/parser-inc/StdVector')
 CopyFile(GetOutputDir()+'/include/parser-inc/Rocket/Core/','dtool/src/parser-inc/RenderInterface.h')
-DeleteCVS(GetOutputDir()+'/include/parser-inc')
+DeleteVCS(GetOutputDir()+'/include/parser-inc')
 
 ########################################################################
 #
@@ -2663,8 +2694,6 @@ CopyAllHeaders('panda/src/audiotraits')
 CopyAllHeaders('panda/src/distort')
 CopyAllHeaders('panda/src/downloadertools')
 CopyAllHeaders('panda/src/windisplay')
-CopyAllHeaders('panda/src/dxgsg8')
-CopyAllHeaders('panda/metalibs/pandadx8')
 CopyAllHeaders('panda/src/dxgsg9')
 CopyAllHeaders('panda/metalibs/pandadx9')
 CopyAllHeaders('panda/src/egg')
@@ -2921,6 +2950,7 @@ TargetAdd('libp3dtoolconfig.dll', input='libp3dtool.dll')
 TargetAdd('libp3dtoolconfig.dll', opts=['ADVAPI', 'OPENSSL', 'WINGDI', 'WINUSER'])
 
 if not PkgSkip("PYTHON"):
+  OPTS=['DIR:dtool/metalibs/dtoolconfig']
   TargetAdd('dtoolconfig_pydtool.obj', opts=OPTS, input="pydtool.cxx")
   TargetAdd('dtoolconfig.pyd', input='dtoolconfig_pydtool.obj')
   TargetAdd('dtoolconfig.pyd', input='libp3dtoolconfig.dll')
@@ -3000,11 +3030,13 @@ TargetAdd('p3pandabase_pandabase.obj', opts=OPTS, input='pandabase.cxx')
 OPTS=['DIR:panda/src/express', 'BUILDING:PANDAEXPRESS', 'OPENSSL', 'ZLIB']
 TargetAdd('p3express_composite1.obj', opts=OPTS, input='p3express_composite1.cxx')
 TargetAdd('p3express_composite2.obj', opts=OPTS, input='p3express_composite2.cxx')
-TargetAdd('p3express_ext_composite.obj', opts=OPTS, input='p3express_ext_composite.cxx')
+
+OPTS=['DIR:panda/src/express', 'OPENSSL', 'ZLIB']
 IGATEFILES=GetDirectoryContents('panda/src/express', ["*.h", "*_composite*.cxx"])
 TargetAdd('libp3express.in', opts=OPTS, input=IGATEFILES)
 TargetAdd('libp3express.in', opts=['IMOD:panda3d.core', 'ILIB:libp3express', 'SRCDIR:panda/src/express'])
 TargetAdd('libp3express_igate.obj', input='libp3express.in', opts=["DEPENDENCYONLY"])
+TargetAdd('p3express_ext_composite.obj', opts=OPTS, input='p3express_ext_composite.cxx')
 
 #
 # DIRECTORY: panda/src/downloader/
@@ -3013,6 +3045,8 @@ TargetAdd('libp3express_igate.obj', input='libp3express.in', opts=["DEPENDENCYON
 OPTS=['DIR:panda/src/downloader', 'BUILDING:PANDAEXPRESS', 'OPENSSL', 'ZLIB']
 TargetAdd('p3downloader_composite1.obj', opts=OPTS, input='p3downloader_composite1.cxx')
 TargetAdd('p3downloader_composite2.obj', opts=OPTS, input='p3downloader_composite2.cxx')
+
+OPTS=['DIR:panda/src/downloader', 'OPENSSL', 'ZLIB']
 IGATEFILES=GetDirectoryContents('panda/src/downloader', ["*.h", "*_composite*.cxx"])
 TargetAdd('libp3downloader.in', opts=OPTS, input=IGATEFILES)
 TargetAdd('libp3downloader.in', opts=['IMOD:panda3d.core', 'ILIB:libp3downloader', 'SRCDIR:panda/src/downloader'])
@@ -3027,11 +3061,8 @@ TargetAdd('pandaexpress_pandaexpress.obj', opts=OPTS, input='pandaexpress.cxx')
 TargetAdd('libpandaexpress.dll', input='pandaexpress_pandaexpress.obj')
 TargetAdd('libpandaexpress.dll', input='p3downloader_composite1.obj')
 TargetAdd('libpandaexpress.dll', input='p3downloader_composite2.obj')
-TargetAdd('libpandaexpress.dll', input='libp3downloader_igate.obj')
 TargetAdd('libpandaexpress.dll', input='p3express_composite1.obj')
 TargetAdd('libpandaexpress.dll', input='p3express_composite2.obj')
-TargetAdd('libpandaexpress.dll', input='p3express_ext_composite.obj')
-TargetAdd('libpandaexpress.dll', input='libp3express_igate.obj')
 TargetAdd('libpandaexpress.dll', input='p3pandabase_pandabase.obj')
 TargetAdd('libpandaexpress.dll', input=COMMON_DTOOL_LIBS)
 TargetAdd('libpandaexpress.dll', opts=['ADVAPI', 'WINSOCK2',  'OPENSSL', 'ZLIB', 'WINGDI', 'WINUSER'])
@@ -3045,6 +3076,8 @@ if (not RUNTIME):
   TargetAdd('p3pipeline_composite1.obj', opts=OPTS, input='p3pipeline_composite1.cxx')
   TargetAdd('p3pipeline_composite2.obj', opts=OPTS, input='p3pipeline_composite2.cxx')
   TargetAdd('p3pipeline_contextSwitch.obj', opts=OPTS, input='contextSwitch.c')
+
+  OPTS=['DIR:panda/src/pipeline']
   IGATEFILES=GetDirectoryContents('panda/src/pipeline', ["*.h", "*_composite*.cxx"])
   TargetAdd('libp3pipeline.in', opts=OPTS, input=IGATEFILES)
   TargetAdd('libp3pipeline.in', opts=['IMOD:panda3d.core', 'ILIB:libp3pipeline', 'SRCDIR:panda/src/pipeline'])
@@ -3058,6 +3091,8 @@ if (not RUNTIME):
   OPTS=['DIR:panda/src/linmath', 'BUILDING:PANDA']
   TargetAdd('p3linmath_composite1.obj', opts=OPTS, input='p3linmath_composite1.cxx')
   TargetAdd('p3linmath_composite2.obj', opts=OPTS, input='p3linmath_composite2.cxx')
+
+  OPTS=['DIR:panda/src/linmath']
   IGATEFILES=GetDirectoryContents('panda/src/linmath', ["*.h", "*_composite*.cxx"])
   for ifile in IGATEFILES[:]:
       if "_src." in ifile:
@@ -3077,12 +3112,15 @@ if (not RUNTIME):
   OPTS=['DIR:panda/src/putil', 'BUILDING:PANDA',  'ZLIB']
   TargetAdd('p3putil_composite1.obj', opts=OPTS, input='p3putil_composite1.cxx')
   TargetAdd('p3putil_composite2.obj', opts=OPTS, input='p3putil_composite2.cxx')
+
+  OPTS=['DIR:panda/src/putil', 'ZLIB']
   IGATEFILES=GetDirectoryContents('panda/src/putil', ["*.h", "*_composite*.cxx"])
   IGATEFILES.remove("test_bam.h")
   TargetAdd('libp3putil.in', opts=OPTS, input=IGATEFILES)
   TargetAdd('libp3putil.in', opts=['IMOD:panda3d.core', 'ILIB:libp3putil', 'SRCDIR:panda/src/putil'])
   TargetAdd('libp3putil_igate.obj', input='libp3putil.in', opts=["DEPENDENCYONLY"])
   TargetAdd('p3putil_typedWritable_ext.obj', opts=OPTS, input='typedWritable_ext.cxx')
+  TargetAdd('p3putil_pythonCallbackObject.obj', opts=OPTS, input='pythonCallbackObject.cxx')
 
 #
 # DIRECTORY: panda/src/audio/
@@ -3091,6 +3129,8 @@ if (not RUNTIME):
 if (not RUNTIME):
   OPTS=['DIR:panda/src/audio', 'BUILDING:PANDA']
   TargetAdd('p3audio_composite1.obj', opts=OPTS, input='p3audio_composite1.cxx')
+
+  OPTS=['DIR:panda/src/audio']
   IGATEFILES=["audio.h"]
   TargetAdd('libp3audio.in', opts=OPTS, input=IGATEFILES)
   TargetAdd('libp3audio.in', opts=['IMOD:panda3d.core', 'ILIB:libp3audio', 'SRCDIR:panda/src/audio'])
@@ -3104,6 +3144,9 @@ if (not RUNTIME):
   OPTS=['DIR:panda/src/event', 'BUILDING:PANDA']
   TargetAdd('p3event_composite1.obj', opts=OPTS, input='p3event_composite1.cxx')
   TargetAdd('p3event_composite2.obj', opts=OPTS, input='p3event_composite2.cxx')
+
+  OPTS=['DIR:panda/src/event']
+  TargetAdd('p3event_pythonTask.obj', opts=OPTS, input='pythonTask.cxx')
   IGATEFILES=GetDirectoryContents('panda/src/event', ["*.h", "*_composite*.cxx"])
   TargetAdd('libp3event.in', opts=OPTS, input=IGATEFILES)
   TargetAdd('libp3event.in', opts=['IMOD:panda3d.core', 'ILIB:libp3event', 'SRCDIR:panda/src/event'])
@@ -3117,7 +3160,12 @@ if (not RUNTIME):
   OPTS=['DIR:panda/src/mathutil', 'BUILDING:PANDA', 'FFTW']
   TargetAdd('p3mathutil_composite1.obj', opts=OPTS, input='p3mathutil_composite1.cxx')
   TargetAdd('p3mathutil_composite2.obj', opts=OPTS, input='p3mathutil_composite2.cxx')
+
+  OPTS=['DIR:panda/src/mathutil', 'FFTW']
   IGATEFILES=GetDirectoryContents('panda/src/mathutil', ["*.h", "*_composite*.cxx"])
+  for ifile in IGATEFILES[:]:
+      if "_src." in ifile:
+          IGATEFILES.remove(ifile)
   TargetAdd('libp3mathutil.in', opts=OPTS, input=IGATEFILES)
   TargetAdd('libp3mathutil.in', opts=['IMOD:panda3d.core', 'ILIB:libp3mathutil', 'SRCDIR:panda/src/mathutil'])
   TargetAdd('libp3mathutil_igate.obj', input='libp3mathutil.in', opts=["DEPENDENCYONLY"])
@@ -3129,6 +3177,8 @@ if (not RUNTIME):
 if (not RUNTIME):
   OPTS=['DIR:panda/src/gsgbase', 'BUILDING:PANDA']
   TargetAdd('p3gsgbase_composite1.obj', opts=OPTS, input='p3gsgbase_composite1.cxx')
+
+  OPTS=['DIR:panda/src/gsgbase']
   IGATEFILES=GetDirectoryContents('panda/src/gsgbase', ["*.h", "*_composite*.cxx"])
   TargetAdd('libp3gsgbase.in', opts=OPTS, input=IGATEFILES)
   TargetAdd('libp3gsgbase.in', opts=['IMOD:panda3d.core', 'ILIB:libp3gsgbase', 'SRCDIR:panda/src/gsgbase'])
@@ -3142,6 +3192,8 @@ if (not RUNTIME):
   OPTS=['DIR:panda/src/pnmimage', 'BUILDING:PANDA',  'ZLIB']
   TargetAdd('p3pnmimage_composite1.obj', opts=OPTS, input='p3pnmimage_composite1.cxx')
   TargetAdd('p3pnmimage_composite2.obj', opts=OPTS, input='p3pnmimage_composite2.cxx')
+
+  OPTS=['DIR:panda/src/pnmimage', 'ZLIB']
   IGATEFILES=GetDirectoryContents('panda/src/pnmimage', ["*.h", "*_composite*.cxx"])
   TargetAdd('libp3pnmimage.in', opts=OPTS, input=IGATEFILES)
   TargetAdd('libp3pnmimage.in', opts=['IMOD:panda3d.core', 'ILIB:libp3pnmimage', 'SRCDIR:panda/src/pnmimage'])
@@ -3155,6 +3207,8 @@ if (not RUNTIME):
 if (not RUNTIME):
   OPTS=['DIR:panda/src/nativenet', 'OPENSSL', 'BUILDING:PANDA']
   TargetAdd('p3nativenet_composite1.obj', opts=OPTS, input='p3nativenet_composite1.cxx')
+
+  OPTS=['DIR:panda/src/nativenet', 'OPENSSL']
   IGATEFILES=GetDirectoryContents('panda/src/nativenet', ["*.h", "*_composite*.cxx"])
   TargetAdd('libp3nativenet.in', opts=OPTS, input=IGATEFILES)
   TargetAdd('libp3nativenet.in', opts=['IMOD:panda3d.core', 'ILIB:libp3nativenet', 'SRCDIR:panda/src/nativenet'])
@@ -3168,6 +3222,8 @@ if (not RUNTIME):
   OPTS=['DIR:panda/src/net', 'BUILDING:PANDA']
   TargetAdd('p3net_composite1.obj', opts=OPTS, input='p3net_composite1.cxx')
   TargetAdd('p3net_composite2.obj', opts=OPTS, input='p3net_composite2.cxx')
+
+  OPTS=['DIR:panda/src/net']
   IGATEFILES=GetDirectoryContents('panda/src/net', ["*.h", "*_composite*.cxx"])
   IGATEFILES.remove("datagram_ui.h")
   TargetAdd('libp3net.in', opts=OPTS, input=IGATEFILES)
@@ -3182,6 +3238,8 @@ if (not RUNTIME):
   OPTS=['DIR:panda/src/pstatclient', 'BUILDING:PANDA']
   TargetAdd('p3pstatclient_composite1.obj', opts=OPTS, input='p3pstatclient_composite1.cxx')
   TargetAdd('p3pstatclient_composite2.obj', opts=OPTS, input='p3pstatclient_composite2.cxx')
+
+  OPTS=['DIR:panda/src/pstatclient']
   IGATEFILES=GetDirectoryContents('panda/src/pstatclient', ["*.h", "*_composite*.cxx"])
   TargetAdd('libp3pstatclient.in', opts=OPTS, input=IGATEFILES)
   TargetAdd('libp3pstatclient.in', opts=['IMOD:panda3d.core', 'ILIB:libp3pstatclient', 'SRCDIR:panda/src/pstatclient'])
@@ -3192,25 +3250,28 @@ if (not RUNTIME):
 #
 
 if (not RUNTIME):
-  OPTS=['DIR:panda/src/gobj', 'BUILDING:PANDA',  'NVIDIACG', 'ZLIB', 'SQUISH', "BIGOBJ"]
+  OPTS=['DIR:panda/src/gobj', 'BUILDING:PANDA',  'NVIDIACG', 'ZLIB', 'SQUISH']
   TargetAdd('p3gobj_composite1.obj', opts=OPTS, input='p3gobj_composite1.cxx')
   TargetAdd('p3gobj_composite2.obj', opts=OPTS, input='p3gobj_composite2.cxx')
+
+  OPTS=['DIR:panda/src/gobj', 'NVIDIACG', 'ZLIB', 'SQUISH']
   IGATEFILES=GetDirectoryContents('panda/src/gobj', ["*.h", "*_composite*.cxx"])
   if ("cgfx_states.h" in IGATEFILES): IGATEFILES.remove("cgfx_states.h")
   TargetAdd('libp3gobj.in', opts=OPTS, input=IGATEFILES)
   TargetAdd('libp3gobj.in', opts=['IMOD:panda3d.core', 'ILIB:libp3gobj', 'SRCDIR:panda/src/gobj'])
   TargetAdd('libp3gobj_igate.obj', input='libp3gobj.in', opts=["DEPENDENCYONLY"])
-  TargetAdd('p3gobj_geomVertexArrayData_ext.obj', opts=OPTS, input='geomVertexArrayData_ext.cxx')
-  TargetAdd('p3gobj_internalName_ext.obj', opts=OPTS, input='internalName_ext.cxx')
+  TargetAdd('p3gobj_ext_composite.obj', opts=OPTS, input='p3gobj_ext_composite.cxx')
 
 #
 # DIRECTORY: panda/src/pgraphnodes/
 #
 
 if (not RUNTIME):
-  OPTS=['DIR:panda/src/pgraphnodes', 'BUILDING:PANDA', "BIGOBJ"]
+  OPTS=['DIR:panda/src/pgraphnodes', 'BUILDING:PANDA']
   TargetAdd('p3pgraphnodes_composite1.obj', opts=OPTS, input='p3pgraphnodes_composite1.cxx')
   TargetAdd('p3pgraphnodes_composite2.obj', opts=OPTS, input='p3pgraphnodes_composite2.cxx')
+
+  OPTS=['DIR:panda/src/pgraphnodes']
   IGATEFILES=GetDirectoryContents('panda/src/pgraphnodes', ["*.h", "*_composite*.cxx"])
   TargetAdd('libp3pgraphnodes.in', opts=OPTS, input=IGATEFILES)
   TargetAdd('libp3pgraphnodes.in', opts=['IMOD:panda3d.core', 'ILIB:libp3pgraphnodes', 'SRCDIR:panda/src/pgraphnodes'])
@@ -3221,12 +3282,14 @@ if (not RUNTIME):
 #
 
 if (not RUNTIME):
-  OPTS=['DIR:panda/src/pgraph', 'BUILDING:PANDA','BIGOBJ']
+  OPTS=['DIR:panda/src/pgraph', 'BUILDING:PANDA']
   TargetAdd('p3pgraph_nodePath.obj', opts=OPTS, input='nodePath.cxx')
   TargetAdd('p3pgraph_composite1.obj', opts=OPTS, input='p3pgraph_composite1.cxx')
   TargetAdd('p3pgraph_composite2.obj', opts=OPTS, input='p3pgraph_composite2.cxx')
   TargetAdd('p3pgraph_composite3.obj', opts=OPTS, input='p3pgraph_composite3.cxx')
   TargetAdd('p3pgraph_composite4.obj', opts=OPTS, input='p3pgraph_composite4.cxx')
+
+  OPTS=['DIR:panda/src/pgraph']
   IGATEFILES=GetDirectoryContents('panda/src/pgraph', ["*.h", "nodePath.cxx", "*_composite*.cxx"])
   TargetAdd('libp3pgraph.in', opts=OPTS, input=IGATEFILES)
   TargetAdd('libp3pgraph.in', opts=['IMOD:panda3d.core', 'ILIB:libp3pgraph', 'SRCDIR:panda/src/pgraph'])
@@ -3238,9 +3301,11 @@ if (not RUNTIME):
 #
 
 if (not RUNTIME):
-  OPTS=['DIR:panda/src/cull', 'BUILDING:PANDA', 'BIGOBJ']
+  OPTS=['DIR:panda/src/cull', 'BUILDING:PANDA']
   TargetAdd('p3cull_composite1.obj', opts=OPTS, input='p3cull_composite1.cxx')
   TargetAdd('p3cull_composite2.obj', opts=OPTS, input='p3cull_composite2.cxx')
+
+  OPTS=['DIR:panda/src/cull']
   IGATEFILES=GetDirectoryContents('panda/src/cull', ["*.h", "*_composite*.cxx"])
   TargetAdd('libp3cull.in', opts=OPTS, input=IGATEFILES)
   TargetAdd('libp3cull.in', opts=['IMOD:panda3d.core', 'ILIB:libp3cull', 'SRCDIR:panda/src/cull'])
@@ -3251,9 +3316,11 @@ if (not RUNTIME):
 #
 
 if (not RUNTIME):
-  OPTS=['DIR:panda/src/chan', 'BUILDING:PANDA', 'BIGOBJ']
+  OPTS=['DIR:panda/src/chan', 'BUILDING:PANDA']
   TargetAdd('p3chan_composite1.obj', opts=OPTS, input='p3chan_composite1.cxx')
   TargetAdd('p3chan_composite2.obj', opts=OPTS, input='p3chan_composite2.cxx')
+
+  OPTS=['DIR:panda/src/chan']
   IGATEFILES=GetDirectoryContents('panda/src/chan', ["*.h", "*_composite*.cxx"])
   IGATEFILES.remove('movingPart.h')
   IGATEFILES.remove('animChannelFixed.h')
@@ -3266,9 +3333,11 @@ if (not RUNTIME):
 #
 
 if (not RUNTIME):
-  OPTS=['DIR:panda/src/char', 'BUILDING:PANDA', 'BIGOBJ']
+  OPTS=['DIR:panda/src/char', 'BUILDING:PANDA']
   TargetAdd('p3char_composite1.obj', opts=OPTS, input='p3char_composite1.cxx')
   TargetAdd('p3char_composite2.obj', opts=OPTS, input='p3char_composite2.cxx')
+
+  OPTS=['DIR:panda/src/char']
   IGATEFILES=GetDirectoryContents('panda/src/char', ["*.h", "*_composite*.cxx"])
   TargetAdd('libp3char.in', opts=OPTS, input=IGATEFILES)
   TargetAdd('libp3char.in', opts=['IMOD:panda3d.core', 'ILIB:libp3char', 'SRCDIR:panda/src/char'])
@@ -3282,6 +3351,8 @@ if (not RUNTIME):
   OPTS=['DIR:panda/src/dgraph', 'BUILDING:PANDA']
   TargetAdd('p3dgraph_composite1.obj', opts=OPTS, input='p3dgraph_composite1.cxx')
   TargetAdd('p3dgraph_composite2.obj', opts=OPTS, input='p3dgraph_composite2.cxx')
+
+  OPTS=['DIR:panda/src/dgraph']
   IGATEFILES=GetDirectoryContents('panda/src/dgraph', ["*.h", "*_composite*.cxx"])
   TargetAdd('libp3dgraph.in', opts=OPTS, input=IGATEFILES)
   TargetAdd('libp3dgraph.in', opts=['IMOD:panda3d.core', 'ILIB:libp3dgraph', 'SRCDIR:panda/src/dgraph'])
@@ -3292,9 +3363,11 @@ if (not RUNTIME):
 #
 
 if (not RUNTIME):
-  OPTS=['DIR:panda/src/display', 'BUILDING:PANDA', 'BIGOBJ']
+  OPTS=['DIR:panda/src/display', 'BUILDING:PANDA']
   TargetAdd('p3display_composite1.obj', opts=OPTS, input='p3display_composite1.cxx')
   TargetAdd('p3display_composite2.obj', opts=OPTS, input='p3display_composite2.cxx')
+
+  OPTS=['DIR:panda/src/display']
   IGATEFILES=GetDirectoryContents('panda/src/display', ["*.h", "*_composite*.cxx"])
   IGATEFILES.remove("renderBuffer.h")
   TargetAdd('libp3display.in', opts=OPTS, input=IGATEFILES)
@@ -3302,6 +3375,7 @@ if (not RUNTIME):
   TargetAdd('libp3display_igate.obj', input='libp3display.in', opts=["DEPENDENCYONLY"])
   TargetAdd('p3display_graphicsStateGuardian_ext.obj', opts=OPTS, input='graphicsStateGuardian_ext.cxx')
   TargetAdd('p3display_graphicsWindow_ext.obj', opts=OPTS, input='graphicsWindow_ext.cxx')
+  TargetAdd('p3display_pythonGraphicsWindowProc.obj', opts=OPTS, input='pythonGraphicsWindowProc.cxx')
 
   if RTDIST and GetTarget() == 'darwin':
     OPTS=['DIR:panda/src/display']
@@ -3313,9 +3387,11 @@ if (not RUNTIME):
 #
 
 if (not RUNTIME):
-  OPTS=['DIR:panda/src/device', 'BUILDING:PANDA', 'BIGOBJ']
+  OPTS=['DIR:panda/src/device', 'BUILDING:PANDA']
   TargetAdd('p3device_composite1.obj', opts=OPTS, input='p3device_composite1.cxx')
   TargetAdd('p3device_composite2.obj', opts=OPTS, input='p3device_composite2.cxx')
+
+  OPTS=['DIR:panda/src/device']
   IGATEFILES=GetDirectoryContents('panda/src/device', ["*.h", "*_composite*.cxx"])
   TargetAdd('libp3device.in', opts=OPTS, input=IGATEFILES)
   TargetAdd('libp3device.in', opts=['IMOD:panda3d.core', 'ILIB:libp3device', 'SRCDIR:panda/src/device'])
@@ -3328,6 +3404,8 @@ if (not RUNTIME):
 if (PkgSkip("FREETYPE")==0 and not RUNTIME):
   OPTS=['DIR:panda/src/pnmtext', 'BUILDING:PANDA',  'FREETYPE']
   TargetAdd('p3pnmtext_composite1.obj', opts=OPTS, input='p3pnmtext_composite1.cxx')
+
+  OPTS=['DIR:panda/src/pnmtext', 'FREETYPE']
   IGATEFILES=GetDirectoryContents('panda/src/pnmtext', ["*.h", "*_composite*.cxx"])
   TargetAdd('libp3pnmtext.in', opts=OPTS, input=IGATEFILES)
   TargetAdd('libp3pnmtext.in', opts=['IMOD:panda3d.core', 'ILIB:libp3pnmtext', 'SRCDIR:panda/src/pnmtext'])
@@ -3338,9 +3416,11 @@ if (PkgSkip("FREETYPE")==0 and not RUNTIME):
 #
 
 if (not RUNTIME):
-  OPTS=['DIR:panda/src/text', 'BUILDING:PANDA', 'ZLIB',  'FREETYPE', 'BIGOBJ']
+  OPTS=['DIR:panda/src/text', 'BUILDING:PANDA', 'ZLIB',  'FREETYPE']
   TargetAdd('p3text_composite1.obj', opts=OPTS, input='p3text_composite1.cxx')
   TargetAdd('p3text_composite2.obj', opts=OPTS, input='p3text_composite2.cxx')
+
+  OPTS=['DIR:panda/src/text', 'ZLIB', 'FREETYPE']
   IGATEFILES=GetDirectoryContents('panda/src/text', ["*.h", "*_composite*.cxx"])
   TargetAdd('libp3text.in', opts=OPTS, input=IGATEFILES)
   TargetAdd('libp3text.in', opts=['IMOD:panda3d.core', 'ILIB:libp3text', 'SRCDIR:panda/src/text'])
@@ -3353,6 +3433,8 @@ if (not RUNTIME):
 if (not RUNTIME):
   OPTS=['DIR:panda/src/movies', 'BUILDING:PANDA', 'VORBIS']
   TargetAdd('p3movies_composite1.obj', opts=OPTS, input='p3movies_composite1.cxx')
+
+  OPTS=['DIR:panda/src/movies', 'VORBIS']
   IGATEFILES=GetDirectoryContents('panda/src/movies', ["*.h", "*_composite*.cxx"])
   TargetAdd('libp3movies.in', opts=OPTS, input=IGATEFILES)
   TargetAdd('libp3movies.in', opts=['IMOD:panda3d.core', 'ILIB:libp3movies', 'SRCDIR:panda/src/movies'])
@@ -3363,10 +3445,12 @@ if (not RUNTIME):
 #
 
 if (not RUNTIME):
-  OPTS=['DIR:panda/src/grutil', 'BUILDING:PANDA', 'BIGOBJ']
+  OPTS=['DIR:panda/src/grutil', 'BUILDING:PANDA']
   TargetAdd('p3grutil_multitexReducer.obj', opts=OPTS, input='multitexReducer.cxx')
   TargetAdd('p3grutil_composite1.obj', opts=OPTS, input='p3grutil_composite1.cxx')
   TargetAdd('p3grutil_composite2.obj', opts=OPTS, input='p3grutil_composite2.cxx')
+
+  OPTS=['DIR:panda/src/grutil']
   IGATEFILES=GetDirectoryContents('panda/src/grutil', ["*.h", "*_composite*.cxx"])
   if 'convexHull.h' in IGATEFILES: IGATEFILES.remove('convexHull.h')
   TargetAdd('libp3grutil.in', opts=OPTS, input=IGATEFILES)
@@ -3378,9 +3462,11 @@ if (not RUNTIME):
 #
 
 if (not RUNTIME):
-  OPTS=['DIR:panda/src/tform', 'BUILDING:PANDA', 'BIGOBJ']
+  OPTS=['DIR:panda/src/tform', 'BUILDING:PANDA']
   TargetAdd('p3tform_composite1.obj', opts=OPTS, input='p3tform_composite1.cxx')
   TargetAdd('p3tform_composite2.obj', opts=OPTS, input='p3tform_composite2.cxx')
+
+  OPTS=['DIR:panda/src/tform']
   IGATEFILES=GetDirectoryContents('panda/src/tform', ["*.h", "*_composite*.cxx"])
   TargetAdd('libp3tform.in', opts=OPTS, input=IGATEFILES)
   TargetAdd('libp3tform.in', opts=['IMOD:panda3d.core', 'ILIB:libp3tform', 'SRCDIR:panda/src/tform'])
@@ -3391,9 +3477,11 @@ if (not RUNTIME):
 #
 
 if (not RUNTIME):
-  OPTS=['DIR:panda/src/collide', 'BUILDING:PANDA', 'BIGOBJ']
+  OPTS=['DIR:panda/src/collide', 'BUILDING:PANDA']
   TargetAdd('p3collide_composite1.obj', opts=OPTS, input='p3collide_composite1.cxx')
   TargetAdd('p3collide_composite2.obj', opts=OPTS, input='p3collide_composite2.cxx')
+
+  OPTS=['DIR:panda/src/collide']
   IGATEFILES=GetDirectoryContents('panda/src/collide', ["*.h", "*_composite*.cxx"])
   TargetAdd('libp3collide.in', opts=OPTS, input=IGATEFILES)
   TargetAdd('libp3collide.in', opts=['IMOD:panda3d.core', 'ILIB:libp3collide', 'SRCDIR:panda/src/collide'])
@@ -3404,9 +3492,11 @@ if (not RUNTIME):
 #
 
 if (not RUNTIME):
-  OPTS=['DIR:panda/src/parametrics', 'BUILDING:PANDA', 'BIGOBJ']
+  OPTS=['DIR:panda/src/parametrics', 'BUILDING:PANDA']
   TargetAdd('p3parametrics_composite1.obj', opts=OPTS, input='p3parametrics_composite1.cxx')
   TargetAdd('p3parametrics_composite2.obj', opts=OPTS, input='p3parametrics_composite2.cxx')
+
+  OPTS=['DIR:panda/src/parametrics']
   IGATEFILES=GetDirectoryContents('panda/src/parametrics', ["*.h", "*_composite*.cxx"])
   TargetAdd('libp3parametrics.in', opts=OPTS, input=IGATEFILES)
   TargetAdd('libp3parametrics.in', opts=['IMOD:panda3d.core', 'ILIB:libp3parametrics', 'SRCDIR:panda/src/parametrics'])
@@ -3417,9 +3507,11 @@ if (not RUNTIME):
 #
 
 if (not RUNTIME):
-  OPTS=['DIR:panda/src/pgui', 'BUILDING:PANDA', 'BIGOBJ']
+  OPTS=['DIR:panda/src/pgui', 'BUILDING:PANDA']
   TargetAdd('p3pgui_composite1.obj', opts=OPTS, input='p3pgui_composite1.cxx')
   TargetAdd('p3pgui_composite2.obj', opts=OPTS, input='p3pgui_composite2.cxx')
+
+  OPTS=['DIR:panda/src/pgui']
   IGATEFILES=GetDirectoryContents('panda/src/pgui', ["*.h", "*_composite*.cxx"])
   TargetAdd('libp3pgui.in', opts=OPTS, input=IGATEFILES)
   TargetAdd('libp3pgui.in', opts=['IMOD:panda3d.core', 'ILIB:libp3pgui', 'SRCDIR:panda/src/pgui'])
@@ -3442,6 +3534,8 @@ if (not RUNTIME):
   OPTS=['DIR:panda/src/recorder', 'BUILDING:PANDA']
   TargetAdd('p3recorder_composite1.obj', opts=OPTS, input='p3recorder_composite1.cxx')
   TargetAdd('p3recorder_composite2.obj', opts=OPTS, input='p3recorder_composite2.cxx')
+
+  OPTS=['DIR:panda/src/recorder']
   IGATEFILES=GetDirectoryContents('panda/src/recorder', ["*.h", "*_composite*.cxx"])
   TargetAdd('libp3recorder.in', opts=OPTS, input=IGATEFILES)
   TargetAdd('libp3recorder.in', opts=['IMOD:panda3d.core', 'ILIB:libp3recorder', 'SRCDIR:panda/src/recorder'])
@@ -3461,6 +3555,8 @@ if (RUNTIME or RTDIST):
 if (not RUNTIME):
   OPTS=['DIR:panda/src/dxml', 'BUILDING:PANDA', 'TINYXML']
   TargetAdd('p3dxml_composite1.obj', opts=OPTS, input='p3dxml_composite1.cxx')
+
+  OPTS=['DIR:panda/src/dxml', 'TINYXML']
   IGATEFILES=GetDirectoryContents('panda/src/dxml', ["*.h", "p3dxml_composite1.cxx"])
   TargetAdd('libp3dxml.in', opts=OPTS, input=IGATEFILES)
   TargetAdd('libp3dxml.in', opts=['IMOD:panda3d.core', 'ILIB:libp3dxml', 'SRCDIR:panda/src/dxml'])
@@ -3480,108 +3576,71 @@ if (not RUNTIME):
   TargetAdd('libpanda.dll', input='panda_panda.obj')
   TargetAdd('libpanda.dll', input='p3recorder_composite1.obj')
   TargetAdd('libpanda.dll', input='p3recorder_composite2.obj')
-  TargetAdd('libpanda.dll', input='libp3recorder_igate.obj')
   TargetAdd('libpanda.dll', input='p3pgraphnodes_composite1.obj')
   TargetAdd('libpanda.dll', input='p3pgraphnodes_composite2.obj')
-  TargetAdd('libpanda.dll', input='libp3pgraphnodes_igate.obj')
   TargetAdd('libpanda.dll', input='p3pgraph_nodePath.obj')
   TargetAdd('libpanda.dll', input='p3pgraph_composite1.obj')
   TargetAdd('libpanda.dll', input='p3pgraph_composite2.obj')
   TargetAdd('libpanda.dll', input='p3pgraph_composite3.obj')
   TargetAdd('libpanda.dll', input='p3pgraph_composite4.obj')
-  TargetAdd('libpanda.dll', input='libp3pgraph_igate.obj')
   TargetAdd('libpanda.dll', input='p3cull_composite1.obj')
   TargetAdd('libpanda.dll', input='p3cull_composite2.obj')
   TargetAdd('libpanda.dll', input='p3movies_composite1.obj')
-  TargetAdd('libpanda.dll', input='libp3movies_igate.obj')
   TargetAdd('libpanda.dll', input='p3grutil_multitexReducer.obj')
   TargetAdd('libpanda.dll', input='p3grutil_composite1.obj')
   TargetAdd('libpanda.dll', input='p3grutil_composite2.obj')
-  TargetAdd('libpanda.dll', input='libp3grutil_igate.obj')
   TargetAdd('libpanda.dll', input='p3chan_composite1.obj')
   TargetAdd('libpanda.dll', input='p3chan_composite2.obj')
-  TargetAdd('libpanda.dll', input='libp3chan_igate.obj')
   TargetAdd('libpanda.dll', input='p3pstatclient_composite1.obj')
   TargetAdd('libpanda.dll', input='p3pstatclient_composite2.obj')
-  TargetAdd('libpanda.dll', input='libp3pstatclient_igate.obj')
   TargetAdd('libpanda.dll', input='p3char_composite1.obj')
   TargetAdd('libpanda.dll', input='p3char_composite2.obj')
-  TargetAdd('libpanda.dll', input='libp3char_igate.obj')
   TargetAdd('libpanda.dll', input='p3collide_composite1.obj')
   TargetAdd('libpanda.dll', input='p3collide_composite2.obj')
-  TargetAdd('libpanda.dll', input='libp3collide_igate.obj')
   TargetAdd('libpanda.dll', input='p3device_composite1.obj')
   TargetAdd('libpanda.dll', input='p3device_composite2.obj')
-  TargetAdd('libpanda.dll', input='libp3device_igate.obj')
   TargetAdd('libpanda.dll', input='p3dgraph_composite1.obj')
   TargetAdd('libpanda.dll', input='p3dgraph_composite2.obj')
-  TargetAdd('libpanda.dll', input='libp3dgraph_igate.obj')
   TargetAdd('libpanda.dll', input='p3display_composite1.obj')
   TargetAdd('libpanda.dll', input='p3display_composite2.obj')
-  TargetAdd('libpanda.dll', input='libp3display_igate.obj')
   TargetAdd('libpanda.dll', input='p3pipeline_composite1.obj')
   TargetAdd('libpanda.dll', input='p3pipeline_composite2.obj')
   TargetAdd('libpanda.dll', input='p3pipeline_contextSwitch.obj')
-  TargetAdd('libpanda.dll', input='libp3pipeline_igate.obj')
   TargetAdd('libpanda.dll', input='p3event_composite1.obj')
   TargetAdd('libpanda.dll', input='p3event_composite2.obj')
-  TargetAdd('libpanda.dll', input='libp3event_igate.obj')
   TargetAdd('libpanda.dll', input='p3gobj_composite1.obj')
   TargetAdd('libpanda.dll', input='p3gobj_composite2.obj')
-  TargetAdd('libpanda.dll', input='libp3gobj_igate.obj')
   TargetAdd('libpanda.dll', input='p3gsgbase_composite1.obj')
-  TargetAdd('libpanda.dll', input='libp3gsgbase_igate.obj')
   TargetAdd('libpanda.dll', input='p3linmath_composite1.obj')
   TargetAdd('libpanda.dll', input='p3linmath_composite2.obj')
-  TargetAdd('libpanda.dll', input='libp3linmath_igate.obj')
   TargetAdd('libpanda.dll', input='p3mathutil_composite1.obj')
   TargetAdd('libpanda.dll', input='p3mathutil_composite2.obj')
-  TargetAdd('libpanda.dll', input='libp3mathutil_igate.obj')
   TargetAdd('libpanda.dll', input='p3parametrics_composite1.obj')
   TargetAdd('libpanda.dll', input='p3parametrics_composite2.obj')
-  TargetAdd('libpanda.dll', input='libp3parametrics_igate.obj')
   TargetAdd('libpanda.dll', input='p3pnmimagetypes_composite1.obj')
   TargetAdd('libpanda.dll', input='p3pnmimagetypes_composite2.obj')
   TargetAdd('libpanda.dll', input='p3pnmimage_composite1.obj')
   TargetAdd('libpanda.dll', input='p3pnmimage_composite2.obj')
-  TargetAdd('libpanda.dll', input='libp3pnmimage_igate.obj')
   TargetAdd('libpanda.dll', input='p3text_composite1.obj')
   TargetAdd('libpanda.dll', input='p3text_composite2.obj')
-  TargetAdd('libpanda.dll', input='libp3text_igate.obj')
   TargetAdd('libpanda.dll', input='p3tform_composite1.obj')
   TargetAdd('libpanda.dll', input='p3tform_composite2.obj')
-  TargetAdd('libpanda.dll', input='libp3tform_igate.obj')
   TargetAdd('libpanda.dll', input='p3putil_composite1.obj')
   TargetAdd('libpanda.dll', input='p3putil_composite2.obj')
-  TargetAdd('libpanda.dll', input='libp3putil_igate.obj')
   TargetAdd('libpanda.dll', input='p3audio_composite1.obj')
-  TargetAdd('libpanda.dll', input='libp3audio_igate.obj')
   TargetAdd('libpanda.dll', input='p3pgui_composite1.obj')
   TargetAdd('libpanda.dll', input='p3pgui_composite2.obj')
-  TargetAdd('libpanda.dll', input='libp3pgui_igate.obj')
   TargetAdd('libpanda.dll', input='p3net_composite1.obj')
   TargetAdd('libpanda.dll', input='p3net_composite2.obj')
-  TargetAdd('libpanda.dll', input='libp3net_igate.obj')
   TargetAdd('libpanda.dll', input='p3nativenet_composite1.obj')
-  TargetAdd('libpanda.dll', input='libp3nativenet_igate.obj')
   TargetAdd('libpanda.dll', input='p3pandabase_pandabase.obj')
   TargetAdd('libpanda.dll', input='libpandaexpress.dll')
   TargetAdd('libpanda.dll', input='p3dxml_composite1.obj')
-  TargetAdd('libpanda.dll', input='libp3dxml_igate.obj')
   TargetAdd('libpanda.dll', input='libp3dtoolconfig.dll')
   TargetAdd('libpanda.dll', input='libp3dtool.dll')
 
-  TargetAdd('libpanda.dll', input='p3putil_typedWritable_ext.obj')
-  TargetAdd('libpanda.dll', input='p3pnmimage_pfmFile_ext.obj')
-  TargetAdd('libpanda.dll', input='p3gobj_geomVertexArrayData_ext.obj')
-  TargetAdd('libpanda.dll', input='p3gobj_internalName_ext.obj')
-  TargetAdd('libpanda.dll', input='p3pgraph_ext_composite.obj')
-  TargetAdd('libpanda.dll', input='p3display_graphicsStateGuardian_ext.obj')
-  TargetAdd('libpanda.dll', input='p3display_graphicsWindow_ext.obj')
-
   if PkgSkip("FREETYPE")==0:
     TargetAdd('libpanda.dll', input="p3pnmtext_composite1.obj")
-    TargetAdd('libpanda.dll', input="libp3pnmtext_igate.obj")
 
   TargetAdd('libpanda.dll', dep='dtool_have_freetype.dat')
   TargetAdd('libpanda.dll', opts=OPTS)
@@ -3624,23 +3683,70 @@ if (not RUNTIME):
 
   TargetAdd('core_module.obj', opts=['IMOD:panda3d.core', 'ILIB:core'])
 
+  OPTS=['WINSOCK2']
+  TargetAdd('core.pyd', input='libp3downloader_igate.obj')
+  TargetAdd('core.pyd', input='p3express_ext_composite.obj')
+  TargetAdd('core.pyd', input='libp3express_igate.obj')
+
+  TargetAdd('core.pyd', input='libp3recorder_igate.obj')
+  TargetAdd('core.pyd', input='libp3pgraphnodes_igate.obj')
+  TargetAdd('core.pyd', input='libp3pgraph_igate.obj')
+  TargetAdd('core.pyd', input='libp3movies_igate.obj')
+  TargetAdd('core.pyd', input='libp3grutil_igate.obj')
+  TargetAdd('core.pyd', input='libp3chan_igate.obj')
+  TargetAdd('core.pyd', input='libp3pstatclient_igate.obj')
+  TargetAdd('core.pyd', input='libp3char_igate.obj')
+  TargetAdd('core.pyd', input='libp3collide_igate.obj')
+  TargetAdd('core.pyd', input='libp3device_igate.obj')
+  TargetAdd('core.pyd', input='libp3dgraph_igate.obj')
+  TargetAdd('core.pyd', input='libp3display_igate.obj')
+  TargetAdd('core.pyd', input='libp3pipeline_igate.obj')
+  TargetAdd('core.pyd', input='libp3event_igate.obj')
+  TargetAdd('core.pyd', input='libp3gobj_igate.obj')
+  TargetAdd('core.pyd', input='libp3gsgbase_igate.obj')
+  TargetAdd('core.pyd', input='libp3linmath_igate.obj')
+  TargetAdd('core.pyd', input='libp3mathutil_igate.obj')
+  TargetAdd('core.pyd', input='libp3parametrics_igate.obj')
+  TargetAdd('core.pyd', input='libp3pnmimage_igate.obj')
+  TargetAdd('core.pyd', input='libp3text_igate.obj')
+  TargetAdd('core.pyd', input='libp3tform_igate.obj')
+  TargetAdd('core.pyd', input='libp3putil_igate.obj')
+  TargetAdd('core.pyd', input='libp3audio_igate.obj')
+  TargetAdd('core.pyd', input='libp3pgui_igate.obj')
+  TargetAdd('core.pyd', input='libp3net_igate.obj')
+  TargetAdd('core.pyd', input='libp3nativenet_igate.obj')
+  TargetAdd('core.pyd', input='libp3dxml_igate.obj')
+
+  if PkgSkip("FREETYPE")==0:
+    TargetAdd('core.pyd', input="libp3pnmtext_igate.obj")
+
+  TargetAdd('core.pyd', input='p3putil_typedWritable_ext.obj')
+  TargetAdd('core.pyd', input='p3putil_pythonCallbackObject.obj')
+  TargetAdd('core.pyd', input='p3pnmimage_pfmFile_ext.obj')
+  TargetAdd('core.pyd', input='p3event_pythonTask.obj')
+  TargetAdd('core.pyd', input='p3gobj_ext_composite.obj')
+  TargetAdd('core.pyd', input='p3pgraph_ext_composite.obj')
+  TargetAdd('core.pyd', input='p3display_graphicsStateGuardian_ext.obj')
+  TargetAdd('core.pyd', input='p3display_graphicsWindow_ext.obj')
+  TargetAdd('core.pyd', input='p3display_pythonGraphicsWindowProc.obj')
+
   TargetAdd('core.pyd', input='core_module.obj')
   TargetAdd('core.pyd', input=COMMON_PANDA_LIBS)
-  TargetAdd('core.pyd', opts=['PYTHON'])
+  TargetAdd('core.pyd', opts=OPTS)
 
 #
 # DIRECTORY: panda/src/vision/
 #
 
 if (PkgSkip("VISION") == 0) and (not RUNTIME):
-  OPTS=['DIR:panda/src/vision', 'BUILDING:VISION', 'ARTOOLKIT', 'OPENCV', 'DX9', 'DIRECTCAM', 'JPEG']
+  OPTS=['DIR:panda/src/vision', 'BUILDING:VISION', 'ARTOOLKIT', 'OPENCV', 'DX9', 'DIRECTCAM', 'JPEG', 'EXCEPTIONS']
   TargetAdd('p3vision_composite1.obj', opts=OPTS, input='p3vision_composite1.cxx')
 
   TargetAdd('libp3vision.dll', input='p3vision_composite1.obj')
   TargetAdd('libp3vision.dll', input=COMMON_PANDA_LIBS)
   TargetAdd('libp3vision.dll', opts=OPTS)
 
-  OPTS=['DIR:panda/src/vision', 'ARTOOLKIT', 'OPENCV', 'DX9', 'DIRECTCAM', 'JPEG']
+  OPTS=['DIR:panda/src/vision', 'ARTOOLKIT', 'OPENCV', 'DX9', 'DIRECTCAM', 'JPEG', 'EXCEPTIONS']
   IGATEFILES=GetDirectoryContents('panda/src/vision', ["*.h", "*_composite*.cxx"])
   TargetAdd('libp3vision.in', opts=OPTS, input=IGATEFILES)
   TargetAdd('libp3vision.in', opts=['IMOD:panda3d.vision', 'ILIB:libp3vision', 'SRCDIR:panda/src/vision'])
@@ -3669,7 +3775,7 @@ if (PkgSkip("ROCKET") == 0) and (not RUNTIME):
   TargetAdd('libp3rocket.dll', input=COMMON_PANDA_LIBS)
   TargetAdd('libp3rocket.dll', opts=OPTS)
 
-  OPTS=['DIR:panda/src/rocket', 'ROCKET']
+  OPTS=['DIR:panda/src/rocket', 'ROCKET', 'RTTI', 'EXCEPTIONS']
   IGATEFILES=GetDirectoryContents('panda/src/rocket', ["rocketInputHandler.h",
     "rocketInputHandler.cxx", "rocketRegion.h", "rocketRegion.cxx", "rocketRegion_ext.h"])
   TargetAdd('libp3rocket.in', opts=OPTS, input=IGATEFILES)
@@ -3922,30 +4028,12 @@ if (PkgSkip("ZLIB")==0 and not RTDIST and not RUNTIME and PkgSkip("DEPLOYTOOLS")
 if (GetTarget() == 'windows' and not RUNTIME):
   OPTS=['DIR:panda/src/windisplay', 'BUILDING:PANDAWIN']
   TargetAdd('p3windisplay_composite1.obj', opts=OPTS+["BIGOBJ"], input='p3windisplay_composite1.cxx')
-  TargetAdd('p3windisplay_windetectdx8.obj', opts=OPTS + ["DX8"], input='winDetectDx8.cxx')
   TargetAdd('p3windisplay_windetectdx9.obj', opts=OPTS + ["DX9"], input='winDetectDx9.cxx')
   TargetAdd('libp3windisplay.dll', input='p3windisplay_composite1.obj')
-  TargetAdd('libp3windisplay.dll', input='p3windisplay_windetectdx8.obj')
   TargetAdd('libp3windisplay.dll', input='p3windisplay_windetectdx9.obj')
   TargetAdd('libp3windisplay.dll', input=COMMON_PANDA_LIBS)
   TargetAdd('libp3windisplay.dll', opts=['WINIMM', 'WINGDI', 'WINKERNEL', 'WINOLDNAMES', 'WINUSER', 'WINMM',"BIGOBJ"])
 
-#
-# DIRECTORY: panda/metalibs/pandadx8/
-#
-
-if PkgSkip("DX8")==0 and not RUNTIME:
-  OPTS=['DIR:panda/src/dxgsg8', 'DIR:panda/metalibs/pandadx8', 'BUILDING:PANDADX', 'DX8']
-  TargetAdd('p3dxgsg8_dxGraphicsStateGuardian8.obj', opts=OPTS, input='dxGraphicsStateGuardian8.cxx')
-  TargetAdd('p3dxgsg8_composite1.obj', opts=OPTS, input='p3dxgsg8_composite1.cxx')
-  TargetAdd('pandadx8_pandadx8.obj', opts=OPTS, input='pandadx8.cxx')
-  TargetAdd('libpandadx8.dll', input='pandadx8_pandadx8.obj')
-  TargetAdd('libpandadx8.dll', input='p3dxgsg8_dxGraphicsStateGuardian8.obj')
-  TargetAdd('libpandadx8.dll', input='p3dxgsg8_composite1.obj')
-  TargetAdd('libpandadx8.dll', input='libp3windisplay.dll')
-  TargetAdd('libpandadx8.dll', input=COMMON_PANDA_LIBS)
-  TargetAdd('libpandadx8.dll', opts=['MODULE', 'ADVAPI', 'WINGDI', 'WINKERNEL', 'WINUSER', 'WINMM', 'DX8'])
-
 #
 # DIRECTORY: panda/metalibs/pandadx9/
 #
@@ -4525,6 +4613,8 @@ if (PkgSkip("DIRECT")==0):
   TargetAdd('p3dcparser_dcLexer.obj', opts=OPTS, input='dcLexer.lxx')
   TargetAdd('p3dcparser_composite1.obj', opts=OPTS, input='p3dcparser_composite1.cxx')
   TargetAdd('p3dcparser_composite2.obj', opts=OPTS, input='p3dcparser_composite2.cxx')
+
+  OPTS=['DIR:direct/src/dcparser', 'WITHINPANDA']
   IGATEFILES=GetDirectoryContents('direct/src/dcparser', ["*.h", "*_composite*.cxx"])
   if "dcParser.h" in IGATEFILES: IGATEFILES.remove("dcParser.h")
   if "dcmsgtypes.h" in IGATEFILES: IGATEFILES.remove('dcmsgtypes.h')
@@ -4539,6 +4629,8 @@ if (PkgSkip("DIRECT")==0):
 if (PkgSkip("DIRECT")==0):
   OPTS=['DIR:direct/src/deadrec', 'BUILDING:DIRECT']
   TargetAdd('p3deadrec_composite1.obj', opts=OPTS, input='p3deadrec_composite1.cxx')
+
+  OPTS=['DIR:direct/src/deadrec']
   IGATEFILES=GetDirectoryContents('direct/src/deadrec', ["*.h", "*_composite*.cxx"])
   TargetAdd('libp3deadrec.in', opts=OPTS, input=IGATEFILES)
   TargetAdd('libp3deadrec.in', opts=['IMOD:panda3d.direct', 'ILIB:libp3deadrec', 'SRCDIR:direct/src/deadrec'])
@@ -4553,6 +4645,8 @@ if (PkgSkip("DIRECT")==0):
   TargetAdd('p3distributed_config_distributed.obj', opts=OPTS, input='config_distributed.cxx')
   TargetAdd('p3distributed_cConnectionRepository.obj', opts=OPTS, input='cConnectionRepository.cxx')
   TargetAdd('p3distributed_cDistributedSmoothNodeBase.obj', opts=OPTS, input='cDistributedSmoothNodeBase.cxx')
+
+  OPTS=['DIR:direct/src/distributed', 'WITHINPANDA', 'OPENSSL']
   IGATEFILES=GetDirectoryContents('direct/src/distributed', ["*.h", "*.cxx"])
   TargetAdd('libp3distributed.in', opts=OPTS, input=IGATEFILES)
   TargetAdd('libp3distributed.in', opts=['IMOD:panda3d.direct', 'ILIB:libp3distributed', 'SRCDIR:direct/src/distributed'])
@@ -4565,6 +4659,8 @@ if (PkgSkip("DIRECT")==0):
 if (PkgSkip("DIRECT")==0):
   OPTS=['DIR:direct/src/interval', 'BUILDING:DIRECT']
   TargetAdd('p3interval_composite1.obj', opts=OPTS, input='p3interval_composite1.cxx')
+
+  OPTS=['DIR:direct/src/interval']
   IGATEFILES=GetDirectoryContents('direct/src/interval', ["*.h", "*_composite*.cxx"])
   TargetAdd('libp3interval.in', opts=OPTS, input=IGATEFILES)
   TargetAdd('libp3interval.in', opts=['IMOD:panda3d.direct', 'ILIB:libp3interval', 'SRCDIR:direct/src/interval'])
@@ -4579,6 +4675,8 @@ if (PkgSkip("DIRECT")==0):
   TargetAdd('p3showbase_showBase.obj', opts=OPTS, input='showBase.cxx')
   if GetTarget() == 'darwin':
     TargetAdd('p3showbase_showBase_assist.obj', opts=OPTS, input='showBase_assist.mm')
+
+  OPTS=['DIR:direct/src/showbase']
   IGATEFILES=GetDirectoryContents('direct/src/showbase', ["*.h", "showBase.cxx"])
   TargetAdd('libp3showbase.in', opts=OPTS, input=IGATEFILES)
   TargetAdd('libp3showbase.in', opts=['IMOD:panda3d.direct', 'ILIB:libp3showbase', 'SRCDIR:direct/src/showbase'])
@@ -4598,19 +4696,14 @@ if (PkgSkip("DIRECT")==0):
   TargetAdd('libp3direct.dll', input='p3dcparser_composite2.obj')
   TargetAdd('libp3direct.dll', input='p3dcparser_dcParser.obj')
   TargetAdd('libp3direct.dll', input='p3dcparser_dcLexer.obj')
-  TargetAdd('libp3direct.dll', input='libp3dcparser_igate.obj')
   TargetAdd('libp3direct.dll', input='p3showbase_showBase.obj')
   if GetTarget() == 'darwin':
     TargetAdd('libp3direct.dll', input='p3showbase_showBase_assist.obj')
-  TargetAdd('libp3direct.dll', input='libp3showbase_igate.obj')
   TargetAdd('libp3direct.dll', input='p3deadrec_composite1.obj')
-  TargetAdd('libp3direct.dll', input='libp3deadrec_igate.obj')
   TargetAdd('libp3direct.dll', input='p3interval_composite1.obj')
-  TargetAdd('libp3direct.dll', input='libp3interval_igate.obj')
   TargetAdd('libp3direct.dll', input='p3distributed_config_distributed.obj')
   TargetAdd('libp3direct.dll', input='p3distributed_cConnectionRepository.obj')
   TargetAdd('libp3direct.dll', input='p3distributed_cDistributedSmoothNodeBase.obj')
-  TargetAdd('libp3direct.dll', input='libp3distributed_igate.obj')
   TargetAdd('libp3direct.dll', input=COMMON_PANDA_LIBS)
   TargetAdd('libp3direct.dll', opts=['ADVAPI',  'OPENSSL', 'WINUSER', 'WINGDI'])
 
@@ -4623,6 +4716,12 @@ if (PkgSkip("DIRECT")==0):
   TargetAdd('direct_module.obj', opts=OPTS)
   TargetAdd('direct_module.obj', opts=['IMOD:panda3d.direct', 'ILIB:direct'])
 
+  TargetAdd('direct.pyd', input='libp3dcparser_igate.obj')
+  TargetAdd('direct.pyd', input='libp3showbase_igate.obj')
+  TargetAdd('direct.pyd', input='libp3deadrec_igate.obj')
+  TargetAdd('direct.pyd', input='libp3interval_igate.obj')
+  TargetAdd('direct.pyd', input='libp3distributed_igate.obj')
+
   TargetAdd('direct.pyd', input='direct_module.obj')
   TargetAdd('direct.pyd', input='libp3direct.dll')
   TargetAdd('direct.pyd', input='core.pyd')
@@ -4692,7 +4791,7 @@ if (RTDIST or RUNTIME):
     TargetAdd('p3dpython.exe', input='p3dpython_p3dPythonMain.obj')
     TargetAdd('p3dpython.exe', input=COMMON_PANDA_LIBS)
     TargetAdd('p3dpython.exe', input='libp3tinyxml.ilb')
-    TargetAdd('p3dpython.exe', opts=['NOSTRIP', 'PYTHON', 'WINUSER'])
+    TargetAdd('p3dpython.exe', opts=['PYTHON', 'WINUSER'])
 
     TargetAdd('libp3dpython.dll', input='p3dpython_p3dpython_composite1.obj')
     TargetAdd('libp3dpython.dll', input=COMMON_PANDA_LIBS)
@@ -4730,7 +4829,7 @@ if (RTDIST or RUNTIME):
       TargetAdd('p3dcert.exe', input='plugin_mkdir_complete.obj')
       TargetAdd('p3dcert.exe', input='plugin_wstring_encode.obj')
       TargetAdd('p3dcert.exe', input='plugin_p3dCert.obj')
-      OPTS=['NOSTRIP', 'OPENSSL', 'WX', 'CARBON', 'WINOLE', 'WINOLEAUT', 'WINUSER', 'ADVAPI', 'WINSHELL', 'WINCOMCTL', 'WINGDI', 'WINCOMDLG']
+      OPTS=['OPENSSL', 'WX', 'CARBON', 'WINOLE', 'WINOLEAUT', 'WINUSER', 'ADVAPI', 'WINSHELL', 'WINCOMCTL', 'WINGDI', 'WINCOMDLG']
       if GetTarget() == "darwin":
           OPTS += ['GL', 'OPT:2']
       TargetAdd('p3dcert.exe', opts=OPTS)
@@ -4847,7 +4946,7 @@ if (RUNTIME):
     TargetAdd('Panda3D.app', input='libp3tinyxml.ilb')
     TargetAdd('Panda3D.app', input='panda3d_mac.plist', ipath=OPTS)
     TargetAdd('Panda3D.app', input='models/plugin_images/panda3d.icns')
-    TargetAdd('Panda3D.app', opts=['NOSTRIP', 'OPENSSL', 'ZLIB', 'WINGDI', 'WINUSER', 'WINSHELL', 'ADVAPI', 'WINSOCK2', 'WINOLE', 'CARBON'])
+    TargetAdd('Panda3D.app', opts=['OPENSSL', 'ZLIB', 'WINGDI', 'WINUSER', 'WINSHELL', 'ADVAPI', 'WINSOCK2', 'WINOLE', 'CARBON'])
   elif (GetTarget() == 'windows'):
     TargetAdd('plugin_standalone_panda3dWinMain.obj', opts=OPTS, input='panda3dWinMain.cxx')
     TargetAdd('panda3dw.exe', input='plugin_standalone_panda3d.obj')
@@ -4910,7 +5009,7 @@ if (RTDIST):
     TargetAdd('p3dembed.exe', input='libp3subprocbuffer.ilb')
   TargetAdd('p3dembed.exe', input='libp3tinyxml.ilb')
   TargetAdd('p3dembed.exe', input='libp3d_plugin_static.ilb')
-  TargetAdd('p3dembed.exe', opts=['NOICON', 'NOSTRIP', 'WINGDI', 'WINSOCK2', 'ZLIB', 'WINUSER', 'OPENSSL', 'JPEG', 'WINOLE', 'CARBON', 'MSIMG', 'WINCOMCTL', 'ADVAPI', 'WINSHELL', 'X11', 'PNG'])
+  TargetAdd('p3dembed.exe', opts=['NOICON', 'WINGDI', 'WINSOCK2', 'ZLIB', 'WINUSER', 'OPENSSL', 'JPEG', 'WINOLE', 'CARBON', 'MSIMG', 'WINCOMCTL', 'ADVAPI', 'WINSHELL', 'X11', 'PNG'])
 
   if GetTarget() == 'windows':
     OPTS.append("P3DEMBEDW")
@@ -4936,7 +5035,7 @@ if (RTDIST):
     TargetAdd('p3dembedw.exe', input='plugin_common.obj')
     TargetAdd('p3dembedw.exe', input='libp3tinyxml.ilb')
     TargetAdd('p3dembedw.exe', input='libp3d_plugin_static.ilb')
-    TargetAdd('p3dembedw.exe', opts=['NOICON', 'NOSTRIP', 'WINGDI', 'WINSOCK2', 'ZLIB', 'WINUSER', 'OPENSSL', 'JPEG', 'WINOLE', 'MSIMG', 'WINCOMCTL', 'ADVAPI', 'WINSHELL', 'PNG'])
+    TargetAdd('p3dembedw.exe', opts=['NOICON', 'WINGDI', 'WINSOCK2', 'ZLIB', 'WINUSER', 'OPENSSL', 'JPEG', 'WINOLE', 'MSIMG', 'WINCOMCTL', 'ADVAPI', 'WINSHELL', 'PNG'])
 
 #
 # DIRECTORY: pandatool/src/pandatoolbase/
@@ -5244,9 +5343,8 @@ if (PkgSkip("PANDATOOL")==0):
 
 if (PkgSkip("PANDATOOL")==0):
   OPTS=['DIR:pandatool/src/flt', 'ZLIB']
-  TargetAdd('p3flt_fltVectorRecord.obj', opts=OPTS, input='fltVectorRecord.cxx')
   TargetAdd('p3flt_composite1.obj', opts=OPTS, input='p3flt_composite1.cxx')
-  TargetAdd('libp3flt.lib', input=['p3flt_fltVectorRecord.obj', 'p3flt_composite1.obj'])
+  TargetAdd('libp3flt.lib', input=['p3flt_composite1.obj'])
 
 #
 # DIRECTORY: pandatool/src/fltegg/
@@ -6158,7 +6256,7 @@ Conflicts: panda3d
 Replaces: panda3d
 Maintainer: rdb <me@rdb.name>
 Installed-Size: INSTSIZE
-Description: The Panda3D free 3D engine SDK
+Description: Panda3D free 3D engine SDK
  Panda3D is a game engine which includes graphics, audio, I/O, collision detection, and other abilities relevant to the creation of 3D games. Panda3D is open source and free software under the revised BSD license, and can be used for both free and commercial game development at no financial cost.
  Panda3D's intended game-development language is Python. The engine itself is written in C++, and utilizes an automatic wrapper-generator to expose the complete functionality of the engine in a Python interface.
  .
@@ -6182,11 +6280,11 @@ Description: Runtime binary and browser plugin for the Panda3D Game Engine
 
 """
 
+
 # We're not putting "python" in the "Requires" field,
 # since the rpm-based distros don't have a common
 # naming for the Python package.
 INSTALLER_SPEC_FILE="""
-%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 Summary: The Panda3D free 3D engine SDK
 Name: panda3d
 Version: VERSION
@@ -6215,7 +6313,7 @@ This package contains the SDK for development with Panda3D, install panda3d-runt
 /usr/share/applications/*.desktop
 /etc/ld.so.conf.d/panda3d.conf
 /usr/%_lib/panda3d
-%{python_sitearch}
+""" + PYTHON_SITEPACKAGES + """
 /usr/include/panda3d
 """
 
@@ -6283,13 +6381,26 @@ def MakeInstallerLinux():
     oscmd("rm -rf targetroot data.tar.gz control.tar.gz panda3d.spec")
     oscmd("mkdir --mode=0755 targetroot")
 
-    if os.path.exists("/usr/bin/dpkg-deb"):
+    dpkg_present = False
+    if os.path.exists("/usr/bin/dpkg-architecture") and os.path.exists("/usr/bin/dpkg-deb"):
+        dpkg_present = True
+    rpmbuild_present = False
+    if os.path.exists("/usr/bin/rpmbuild"):
+        rpmbuild_present = True
+
+    if dpkg_present and rpmbuild_present:
+        print("Warning: both dpkg and rpmbuild present.")
+
+    if dpkg_present:
         # Invoke installpanda.py to install it into a temporary dir
+        lib_dir = GetDebLibDir()
         if RUNTIME:
-            InstallRuntime(destdir="targetroot", prefix="/usr", outputdir=GetOutputDir(), libdir=GetDebLibDir())
+            InstallRuntime(destdir="targetroot", prefix="/usr", outputdir=GetOutputDir(), libdir=lib_dir)
         else:
-            InstallPanda(destdir="targetroot", prefix="/usr", outputdir=GetOutputDir(), libdir=GetDebLibDir())
+            InstallPanda(destdir="targetroot", prefix="/usr", outputdir=GetOutputDir(), libdir=lib_dir)
             oscmd("chmod -R 755 targetroot/usr/share/panda3d")
+            oscmd("mkdir -p targetroot/usr/share/man/man1")
+            oscmd("cp doc/man/*.1 targetroot/usr/share/man/man1/")
 
         oscmd("dpkg --print-architecture > "+GetOutputDir()+"/tmp/architecture.txt")
         pkg_arch = ReadFile(GetOutputDir()+"/tmp/architecture.txt").strip()
@@ -6309,7 +6420,6 @@ def MakeInstallerLinux():
 
         # Determine the package name and the locations that
         # dpkg-shlibdeps should look in for executables.
-        lib_dir = GetLibDir()
         pkg_version = DEBVERSION
         if RUNTIME:
             pkg_name = "panda3d-runtime"
@@ -6368,7 +6478,7 @@ def MakeInstallerLinux():
             oscmd("chmod 644 targetroot/DEBIAN/conffiles targetroot/DEBIAN/symbols")
         oscmd("fakeroot dpkg-deb -b targetroot %s_%s_%s.deb" % (pkg_name, pkg_version, pkg_arch))
 
-    elif os.path.exists("/usr/bin/rpmbuild"):
+    elif rpmbuild_present:
         # Invoke installpanda.py to install it into a temporary dir
         if RUNTIME:
             InstallRuntime(destdir="targetroot", prefix="/usr", outputdir=GetOutputDir(), libdir=GetRPMLibDir())
@@ -6463,6 +6573,9 @@ def MakeInstallerOSX():
     # Trailing newline is important, works around a bug in OSX
     WriteFile("dstroot/tools/etc/paths.d/Panda3D", "/Developer/Tools/Panda3D\n")
 
+    oscmd("mkdir -p dstroot/tools/usr/share/man/man1")
+    oscmd("cp doc/man/*.1 dstroot/tools/usr/share/man/man1/")
+
     for base in os.listdir(GetOutputDir()+"/bin"):
         binname = "dstroot/tools/Developer/Tools/Panda3D/" + base
         # OSX needs the -R argument to copy symbolic links correctly, it doesn't have -d. How weird.
@@ -6502,7 +6615,7 @@ def MakeInstallerOSX():
         oscmd("cp -R samples/* dstroot/samples/Developer/Examples/Panda3D/")
 
     oscmd("chmod -R 0775 dstroot/*")
-    DeleteCVS("dstroot")
+    DeleteVCS("dstroot")
     DeleteBuildFiles("dstroot")
     # We need to be root to perform a chown. Bleh.
     # Fortunately PackageMaker does it for us, on 10.5 and above.
diff --git a/makepanda/makepanda.vcproj b/makepanda/makepanda.vcproj
index 93ca29fffc..1d8df0eeff 100755
--- a/makepanda/makepanda.vcproj
+++ b/makepanda/makepanda.vcproj
@@ -2462,7 +2462,6 @@
 				<File RelativePath="..\panda\src\windisplay\winDetectDx9.cxx"></File>
 				<File RelativePath="..\panda\src\windisplay\config_windisplay.cxx"></File>
 				<File RelativePath="..\panda\src\windisplay\winGraphicsPipe.h"></File>
-				<File RelativePath="..\panda\src\windisplay\winDetectDx8.cxx"></File>
 				<File RelativePath="..\panda\src\windisplay\winDetectDx.h"></File>
 			</Filter>
 			<Filter Name="pgraph">
diff --git a/makepanda/makepandacore.py b/makepanda/makepandacore.py
index 2c99416823..138c372af3 100644
--- a/makepanda/makepandacore.py
+++ b/makepanda/makepandacore.py
@@ -22,6 +22,8 @@ else:
 SUFFIX_INC = [".cxx",".c",".h",".I",".yxx",".lxx",".mm",".rc",".r"]
 SUFFIX_DLL = [".dll",".dlo",".dle",".dli",".dlm",".mll",".exe",".pyd",".ocx"]
 SUFFIX_LIB = [".lib",".ilb"]
+VCS_DIRS = set(["CVS", "CVSROOT", ".git", ".hg"])
+VCS_FILES = set([".cvsignore", ".gitignore", ".gitmodules", ".hgignore"])
 STARTTIME = time.time()
 MAINTHREAD = threading.currentThread()
 OUTPUTDIR = "built"
@@ -91,7 +93,7 @@ MAXVERSIONINFO = [("MAX6", "SOFTWARE\\Autodesk\\3DSMAX\\6.0", "installdir", "max
 
 MAYAVERSIONS = []
 MAXVERSIONS = []
-DXVERSIONS = ["DX8","DX9"]
+DXVERSIONS = ["DX9"]
 
 for (ver,key) in MAYAVERSIONINFO:
     MAYAVERSIONS.append(ver)
@@ -523,9 +525,9 @@ def oscmd(cmd, ignoreError = False):
         if "interrogate" in cmd.split(" ", 1)[0] and GetVerbose():
             print(ColorText("red", "Interrogate failed, retrieving debug output..."))
             if sys.platform == "win32":
-                os.spawnl(os.P_WAIT, exe, cmd.split(" ", 1)[0] + " -v " + cmd.split(" ", 1)[1])
+                os.spawnl(os.P_WAIT, exe, cmd.split(" ", 1)[0] + " -vv " + cmd.split(" ", 1)[1])
             else:
-                os.system(cmd.split(" ", 1)[0] + " -v " + cmd.split(" ", 1)[1])
+                os.system(cmd.split(" ", 1)[0] + " -vv " + cmd.split(" ", 1)[1])
         exit("The following command returned a non-zero value: " + str(cmd))
 
     return res
@@ -534,16 +536,6 @@ def oscmd(cmd, ignoreError = False):
 ##
 ## GetDirectoryContents
 ##
-## At times, makepanda will use a function like "os.listdir" to process
-## all the files in a directory.  Unfortunately, that means that any
-## accidental addition of a file to a directory could cause makepanda
-## to misbehave without warning.
-##
-## To alleviate this weakness, we created GetDirectoryContents.  This
-## uses "os.listdir" to fetch the directory contents, but then it
-## compares the results to the appropriate CVS/Entries to see if
-## they match.  If not, it prints a big warning message.
-##
 ########################################################################
 
 def GetDirectoryContents(dir, filters="*", skip=[]):
@@ -555,33 +547,6 @@ def GetDirectoryContents(dir, filters="*", skip=[]):
         for file in fnmatch.filter(files, filter):
             if (skip.count(file)==0) and (os.path.isfile(dir + "/" + file)):
                 actual[file] = 1
-    if (os.path.isfile(dir + "/CVS/Entries")):
-        cvs = {}
-        srchandle = open(dir + "/CVS/Entries", "r")
-        files = []
-        for line in srchandle:
-            if (line[0]=="/"):
-                s = line.split("/",2)
-                if (len(s)==3):
-                    files.append(s[1])
-        srchandle.close()
-        for filter in filters:
-            for file in fnmatch.filter(files, filter):
-                if (skip.count(file)==0):
-                    cvs[file] = 1
-
-        #XXX this happens all the time, do we really need to warn about this?
-        #for file in actual.keys():
-        #    if (file not in cvs and VERBOSE):
-        #        msg = "%sWARNING: %s is in %s, but not in CVS%s" % (GetColor("red"), ColorText("green", file), ColorText("green", dir), GetColor())
-        #        print msg
-        #        WARNINGS.append(msg)
-
-        for file in cvs.keys():
-            if (file not in actual and VERBOSE):
-                msg = "%sWARNING: %s is not in %s, but is in CVS%s" % (GetColor("red"), ColorText("green", file), ColorText("green", dir), GetColor())
-                print(msg)
-                WARNINGS.append(msg)
 
     results = list(actual.keys())
     results.sort()
@@ -1023,16 +988,16 @@ def ConditionalWriteFile(dest, desiredcontents):
         sys.stdout.flush()
         WriteFile(dest, desiredcontents)
 
-def DeleteCVS(dir):
+def DeleteVCS(dir):
     if dir == "": dir = "."
     for entry in os.listdir(dir):
         subdir = os.path.join(dir, entry)
         if (os.path.isdir(subdir)):
-            if (entry == "CVS" or entry == "CVSROOT"):
+            if entry in VCS_DIRS:
                 shutil.rmtree(subdir)
             else:
-                DeleteCVS(subdir)
-        elif (os.path.isfile(subdir) and (entry == ".cvsignore" or entry.startswith(".#"))):
+                DeleteVCS(subdir)
+        elif (os.path.isfile(subdir) and (entry in VCS_FILES or entry.startswith(".#"))):
             os.remove(subdir)
 
 def DeleteBuildFiles(dir):
@@ -1679,7 +1644,6 @@ def GetSdkDir(sdkname, sdkkey = None):
 def SdkLocateDirectX( strMode = 'default' ):
     if (GetHost() != "windows"): return
     if strMode == 'default':
-        GetSdkDir("directx8", "DX8")
         GetSdkDir("directx9", "DX9")
         if ("DX9" not in SDK):
             strMode = 'latest'
@@ -1716,18 +1680,12 @@ def SdkLocateDirectX( strMode = 'default' ):
                 print("Using DirectX SDK March 2009")
                 SDK["DX9"] = dir.replace("\\", "/").rstrip("/")
         archStr = GetTargetArch()
-        if ("DX9" not in SDK) or ("DX8" not in SDK):
+        if ("DX9" not in SDK):
             uninstaller = "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall"
             for subdir in ListRegistryKeys(uninstaller):
                 if (subdir[0]=="{"):
                     dir = GetRegistryKey(uninstaller+"\\"+subdir, "InstallLocation")
                     if (dir != 0):
-                        if (("DX8" not in SDK) and
-                            (os.path.isfile(dir+"\\Include\\d3d8.h")) and
-                            (os.path.isfile(dir+"\\Include\\d3dx8.h")) and
-                            (os.path.isfile(dir+"\\Lib\\d3d8.lib")) and
-                            (os.path.isfile(dir+"\\Lib\\d3dx8.lib"))):
-                            SDK["DX8"] = dir.replace("\\", "/").rstrip("/")
                         if (("DX9" not in SDK) and
                             (os.path.isfile(dir+"\\Include\\d3d9.h")) and
                             (os.path.isfile(dir+"\\Include\\d3dx9.h")) and
@@ -1778,18 +1736,12 @@ def SdkLocateDirectX( strMode = 'default' ):
             exit("Couldn't find DirectX March 2009 SDK")
     elif strMode == 'aug2006':
         archStr = GetTargetArch()
-        if ("DX9" not in SDK) or ("DX8" not in SDK):
+        if ("DX9" not in SDK):
             uninstaller = "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall"
             for subdir in ListRegistryKeys(uninstaller):
                 if (subdir[0]=="{"):
                     dir = GetRegistryKey(uninstaller+"\\"+subdir, "InstallLocation")
                     if (dir != 0):
-                        if (("DX8" not in SDK) and
-                            (os.path.isfile(dir+"\\Include\\d3d8.h")) and
-                            (os.path.isfile(dir+"\\Include\\d3dx8.h")) and
-                            (os.path.isfile(dir+"\\Lib\\d3d8.lib")) and
-                            (os.path.isfile(dir+"\\Lib\\d3dx8.lib"))):
-                            SDK["DX8"] = dir.replace("\\", "/").rstrip("/")
                         if (("DX9" not in SDK) and
                             (os.path.isfile(dir+"\\Include\\d3d9.h")) and
                             (os.path.isfile(dir+"\\Include\\d3dx9.h")) and
@@ -2109,7 +2061,7 @@ def SdkLocateAndroid():
 ########################################################################
 
 def SdkAutoDisableDirectX():
-    for ver in ["DX8","DX9","DIRECTCAM"]:
+    for ver in ["DX9", "DIRECTCAM"]:
         if (PkgSkip(ver)==0):
             if (ver not in SDK):
                 if (GetHost() == "windows"):
@@ -2432,16 +2384,16 @@ def CopyAllJavaSources(dir, skip=[]):
             WriteBinaryFile(dstfile, ReadBinaryFile(srcfile))
             JustBuilt([dstfile], [srcfile])
 
-def CopyTree(dstdir, srcdir, omitCVS=True):
+def CopyTree(dstdir, srcdir, omitVCS=True):
     if (os.path.isdir(dstdir)):
         for entry in os.listdir(srcdir):
             srcpth = os.path.join(srcdir, entry)
             dstpth = os.path.join(dstdir, entry)
             if (os.path.isfile(srcpth)):
-                if (not omitCVS or entry != ".cvsignore"):
+                if not omitVCS or entry not in VCS_FILES:
                     CopyFile(dstpth, srcpth)
             else:
-                if (not omitCVS or entry != "CVS"):
+                if not omitVCS or entry not in VCS_DIRS:
                     CopyTree(dstpth, srcpth)
     else:
         if sys.platform == 'win32':
@@ -2449,8 +2401,8 @@ def CopyTree(dstdir, srcdir, omitCVS=True):
         else:
             cmd = 'cp -R -f ' + srcdir + ' ' + dstdir
         oscmd(cmd)
-        if omitCVS:
-            DeleteCVS(dstdir)
+        if omitVCS:
+            DeleteVCS(dstdir)
 
 def CopyPythonTree(dstdir, srcdir, lib2to3_fixers=[]):
     if (not os.path.isdir(dstdir)):
@@ -2470,7 +2422,7 @@ def CopyPythonTree(dstdir, srcdir, lib2to3_fixers=[]):
         dstpth = os.path.join(dstdir, entry)
         if (os.path.isfile(srcpth)):
             base, ext = os.path.splitext(entry)
-            if (entry != ".cvsignore" and ext not in SUFFIX_INC + ['.pyc', '.pyo']):
+            if entry not in VCS_FILES and ext not in SUFFIX_INC + ['.pyc', '.pyo']:
                 if (NeedsBuild([dstpth], [srcpth])):
                     WriteBinaryFile(dstpth, ReadBinaryFile(srcpth))
 
@@ -2479,7 +2431,7 @@ def CopyPythonTree(dstdir, srcdir, lib2to3_fixers=[]):
                     else:
                         JustBuilt([dstpth], [srcpth])
 
-        elif (entry != "CVS"):
+        elif entry not in VCS_DIRS:
             CopyPythonTree(dstpth, srcpth, lib2to3_fixers)
 
     for dstpth, srcpth in refactor:
diff --git a/makepanda/panda3d.desktop b/makepanda/panda3d.desktop
index 873bfef491..ec988ad64b 100644
--- a/makepanda/panda3d.desktop
+++ b/makepanda/panda3d.desktop
@@ -7,5 +7,5 @@ StartupNotify=true
 NoDisplay=true
 Terminal=false
 Type=Application
-Categories=Game;Viewer;
+Categories=Game;3DGraphics;Viewer;
 MimeType=application/x-panda3d;
diff --git a/makepanda/pview.desktop b/makepanda/pview.desktop
index 14609243be..c64d8e2fb5 100644
--- a/makepanda/pview.desktop
+++ b/makepanda/pview.desktop
@@ -8,5 +8,5 @@ StartupNotify=true
 NoDisplay=true
 Terminal=true
 Type=Application
-Categories=Viewer;
+Categories=Graphics;Utility;3DGraphics;Viewer;
 MimeType=model/x-egg;model/x-compressed-egg;model/x-bam;model/x-compressed-bam;
diff --git a/panda/metalibs/pandadx8/Sources.pp b/panda/metalibs/pandadx8/Sources.pp
deleted file mode 100644
index aae0fed0b8..0000000000
--- a/panda/metalibs/pandadx8/Sources.pp
+++ /dev/null
@@ -1,24 +0,0 @@
-#define BUILD_DIRECTORY $[HAVE_DX8]
-
-// DIR_TYPE "metalib" indicates we are building a shared library that
-// consists mostly of references to other shared libraries.  Under
-// Windows, this directly produces a DLL (as opposed to the regular
-// src libraries, which don't produce anything but a pile of OBJ files
-// under Windows).
-
-#define DIR_TYPE metalib
-#define BUILDING_DLL BUILDING_PANDADX
-
-#define COMPONENT_LIBS \
-    p3dxgsg8
-#define LOCAL_LIBS p3gsgbase p3display p3express p3gobj
-#define OTHER_LIBS p3dtoolconfig p3dtool
-
-#begin metalib_target
-  #define TARGET pandadx8
-  #define SOURCES pandadx8.cxx
-  #define WIN_SYS_LIBS \
-     ddraw.lib dxguid.lib winmm.lib \
-     kernel32.lib gdi32.lib user32.lib advapi32.lib $[WIN_SYS_LIBS]  
-#end metalib_target
-
diff --git a/panda/metalibs/pandadx8/pandadx8.cxx b/panda/metalibs/pandadx8/pandadx8.cxx
deleted file mode 100644
index 32adf5ad1b..0000000000
--- a/panda/metalibs/pandadx8/pandadx8.cxx
+++ /dev/null
@@ -1,38 +0,0 @@
-// Filename: pandadx.cxx
-// Created by:  drose (15May00)
-// 
-////////////////////////////////////////////////////////////////////
-
-#include "pandadx8.h"
-
-#include "config_dxgsg8.h"
-#include "wdxGraphicsPipe8.h"
-
-// By including checkPandaVersion.h, we guarantee that runtime
-// attempts to load libpandadx8.dll will fail if they
-// inadvertently link with the wrong version of libdtool.dll.
-
-#include "checkPandaVersion.h"
-
-////////////////////////////////////////////////////////////////////
-//     Function: init_libpandadx
-//  Description: 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_libpandadx8() {
-  init_libdxgsg8();
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: get_pipe_type_pandadx8
-//  Description: Returns the TypeHandle index of the recommended
-//               graphics pipe type defined by this module.
-////////////////////////////////////////////////////////////////////
-int
-get_pipe_type_pandadx8() {
-  return wdxGraphicsPipe8::get_class_type().get_index();
-}
diff --git a/panda/metalibs/pandadx8/pandadx8.h b/panda/metalibs/pandadx8/pandadx8.h
deleted file mode 100644
index 6c6fc75306..0000000000
--- a/panda/metalibs/pandadx8/pandadx8.h
+++ /dev/null
@@ -1,14 +0,0 @@
-// Filename: pandadx.h
-// Created by:  drose (2Jan01)
-// 
-////////////////////////////////////////////////////////////////////
-
-#ifndef PANDADX8_H
-#define PANDADX8_H
-
-#include "pandabase.h"
-
-EXPCL_PANDADX void init_libpandadx8();
-extern "C" EXPCL_PANDADX int get_pipe_type_pandadx8();
-
-#endif
diff --git a/panda/src/audiotraits/config_fmodAudio.cxx b/panda/src/audiotraits/config_fmodAudio.cxx
index 31297c0347..0f0c1cf700 100644
--- a/panda/src/audiotraits/config_fmodAudio.cxx
+++ b/panda/src/audiotraits/config_fmodAudio.cxx
@@ -13,7 +13,6 @@
 ////////////////////////////////////////////////////////////////////
 
 #include "pandabase.h"
-#ifdef HAVE_FMODEX //[
 
 #include "config_fmodAudio.h"
 #include "audioManager.h"
@@ -73,5 +72,3 @@ get_audio_manager_func_fmod_audio() {
   init_libFmodAudio();
   return &Create_FmodAudioManager;
 }
-
-#endif //]
diff --git a/panda/src/audiotraits/config_fmodAudio.h b/panda/src/audiotraits/config_fmodAudio.h
index be695d21fe..cea24744c9 100644
--- a/panda/src/audiotraits/config_fmodAudio.h
+++ b/panda/src/audiotraits/config_fmodAudio.h
@@ -17,7 +17,6 @@
 
 #include "pandabase.h"
 
-#ifdef HAVE_FMODEX //[
 #include "notifyCategoryProxy.h"
 #include "dconfig.h"
 #include "audioManager.h"
@@ -30,6 +29,4 @@ extern ConfigVariableInt fmod_audio_preload_threshold;
 extern EXPCL_FMOD_AUDIO void init_libFmodAudio();
 extern "C" EXPCL_FMOD_AUDIO Create_AudioManager_proc *get_audio_manager_func_fmod_audio();
 
-#endif //]
-
 #endif // CONFIG_FMODAUDIO_H
diff --git a/panda/src/audiotraits/config_openalAudio.cxx b/panda/src/audiotraits/config_openalAudio.cxx
index 7aade3721b..ab89ad775f 100644
--- a/panda/src/audiotraits/config_openalAudio.cxx
+++ b/panda/src/audiotraits/config_openalAudio.cxx
@@ -13,8 +13,6 @@
 ////////////////////////////////////////////////////////////////////
 
 #include "pandabase.h"
-#ifdef HAVE_OPENAL //[
-
 
 #include "config_openalAudio.h"
 #include "openalAudioManager.h"
@@ -65,5 +63,3 @@ get_audio_manager_func_openal_audio() {
   init_libOpenALAudio();
   return &Create_OpenALAudioManager;
 }
-
-#endif //]
diff --git a/panda/src/audiotraits/config_openalAudio.h b/panda/src/audiotraits/config_openalAudio.h
index 3f556d7acd..9a122e2d90 100644
--- a/panda/src/audiotraits/config_openalAudio.h
+++ b/panda/src/audiotraits/config_openalAudio.h
@@ -17,7 +17,6 @@
 
 #include "pandabase.h"
 
-#ifdef HAVE_OPENAL //[
 #include "notifyCategoryProxy.h"
 #include "dconfig.h"
 #include "audioManager.h"
@@ -28,6 +27,4 @@ NotifyCategoryDecl(openalAudio, EXPCL_OPENAL_AUDIO, EXPTP_OPENAL_AUDIO);
 extern EXPCL_OPENAL_AUDIO void init_libOpenALAudio();
 extern "C" EXPCL_OPENAL_AUDIO Create_AudioManager_proc *get_audio_manager_func_openal_audio();
 
-#endif //]
-
 #endif // CONFIG_OPENALAUDIO_H
diff --git a/panda/src/audiotraits/fmodAudioManager.cxx b/panda/src/audiotraits/fmodAudioManager.cxx
index f5c190689a..3a6a4a82e4 100644
--- a/panda/src/audiotraits/fmodAudioManager.cxx
+++ b/panda/src/audiotraits/fmodAudioManager.cxx
@@ -20,8 +20,6 @@
 #include "config_fmodAudio.h"
 #include "dcast.h"
 
-#ifdef HAVE_FMODEX //[
-
 //Panda headers.
 #include "config_audio.h"
 #include "config_util.h"
@@ -897,5 +895,3 @@ get_cache_limit() const {
   //return _cache_limit;
   return 0;
 }
-
-#endif //]
diff --git a/panda/src/audiotraits/fmodAudioManager.h b/panda/src/audiotraits/fmodAudioManager.h
index e38a69563e..d43933dc4c 100644
--- a/panda/src/audiotraits/fmodAudioManager.h
+++ b/panda/src/audiotraits/fmodAudioManager.h
@@ -76,8 +76,6 @@
 #include "pandabase.h"
 #include "pset.h"
 
-#ifdef HAVE_FMODEX //[
-
 #include "audioManager.h"
 
 //The Includes needed for FMOD
@@ -235,6 +233,4 @@ private:
 EXPCL_FMOD_AUDIO AudioManager *Create_FmodAudioManager();
 
 
-#endif //]
-
 #endif /* __FMOD_AUDIO_MANAGER_H__ */
diff --git a/panda/src/audiotraits/fmodAudioSound.cxx b/panda/src/audiotraits/fmodAudioSound.cxx
index 7eb0fd269f..4b9446f38d 100644
--- a/panda/src/audiotraits/fmodAudioSound.cxx
+++ b/panda/src/audiotraits/fmodAudioSound.cxx
@@ -19,8 +19,6 @@
 #include "pandabase.h"
 #include "dcast.h"
 
-#ifdef HAVE_FMODEX //[
-
 //Panda Headers
 #include "config_audio.h"
 #include "config_fmodAudio.h"
@@ -1107,6 +1105,3 @@ seek_callback(void *handle, unsigned int pos, void *user_data) {
     return FMOD_OK;
   }
 }
-
-
-#endif //]
diff --git a/panda/src/audiotraits/fmodAudioSound.h b/panda/src/audiotraits/fmodAudioSound.h
index 46aac1c2a3..5be8e97b03 100644
--- a/panda/src/audiotraits/fmodAudioSound.h
+++ b/panda/src/audiotraits/fmodAudioSound.h
@@ -66,15 +66,11 @@
 //
 ////////////////////////////////////////////////////////////////////
 
-
-
 #ifndef __FMOD_AUDIO_SOUND_H__
 #define __FMOD_AUDIO_SOUND_H__
 
 #include <pandabase.h>
 
-#ifdef HAVE_FMODEX //[
-
 #include "audioSound.h"
 #include "reMutex.h"
 #include "fmodAudioManager.h"
@@ -257,11 +253,4 @@ class EXPCL_FMOD_AUDIO FmodAudioSound : public AudioSound {
 
 #include "fmodAudioSound.I"
 
-#endif //]
-
 #endif /* __FMOD_AUDIO_SOUND_H__ */
-
-
-
-
-
diff --git a/panda/src/audiotraits/fmod_audio_composite1.cxx b/panda/src/audiotraits/fmod_audio_composite1.cxx
index da514bbdd5..c67bbc3610 100644
--- a/panda/src/audiotraits/fmod_audio_composite1.cxx
+++ b/panda/src/audiotraits/fmod_audio_composite1.cxx
@@ -2,4 +2,3 @@
 #include "config_fmodAudio.cxx"
 #include "fmodAudioManager.cxx"
 #include "fmodAudioSound.cxx"
-      
diff --git a/panda/src/audiotraits/openalAudioManager.cxx b/panda/src/audiotraits/openalAudioManager.cxx
index df6d756a20..e87ebee5f0 100644
--- a/panda/src/audiotraits/openalAudioManager.cxx
+++ b/panda/src/audiotraits/openalAudioManager.cxx
@@ -15,8 +15,6 @@
 
 #include "pandabase.h"
 
-#ifdef HAVE_OPENAL //[
-
 //Panda headers.
 #include "config_audio.h"
 #include "config_util.h"
@@ -1109,5 +1107,3 @@ discard_excess_cache(int sample_limit) {
     delete sd;
   }
 }
-
-#endif //]
diff --git a/panda/src/audiotraits/openalAudioManager.h b/panda/src/audiotraits/openalAudioManager.h
index 2a95aba405..0dcc0e07e2 100644
--- a/panda/src/audiotraits/openalAudioManager.h
+++ b/panda/src/audiotraits/openalAudioManager.h
@@ -18,7 +18,6 @@
 #define __OPENAL_AUDIO_MANAGER_H__
 
 #include "pandabase.h"
-#ifdef HAVE_OPENAL //[
 
 #include "audioManager.h"
 #include "plist.h"
@@ -43,11 +42,11 @@ extern void alc_audio_errcheck(const char *context,ALCdevice* device);
 
 class EXPCL_OPENAL_AUDIO OpenALAudioManager : public AudioManager {
   class SoundData;
-  
+
   friend class OpenALAudioSound;
   friend class OpenALSoundData;
- public:
 
+ public:
   //Constructor and Destructor
   OpenALAudioManager();
   virtual ~OpenALAudioManager();
@@ -55,18 +54,18 @@ class EXPCL_OPENAL_AUDIO OpenALAudioManager : public AudioManager {
   virtual void shutdown();
 
   virtual bool is_valid();
-          
+
   virtual PT(AudioSound) get_sound(const string&,     bool positional = false, int mode=SM_heuristic);
   virtual PT(AudioSound) get_sound(MovieAudio *sound, bool positional = false, int mode=SM_heuristic);
-  
+
   virtual void uncache_sound(const string&);
   virtual void clear_cache();
   virtual void set_cache_limit(unsigned int count);
   virtual unsigned int get_cache_limit() const;
-    
+
   virtual void set_volume(PN_stdfloat);
   virtual PN_stdfloat get_volume() const;
-          
+
   void set_play_rate(PN_stdfloat play_rate);
   PN_stdfloat get_play_rate() const;
 
@@ -80,7 +79,7 @@ class EXPCL_OPENAL_AUDIO OpenALAudioManager : public AudioManager {
   // ux, uy and uz are the respective components of a unit up-vector
   // These changes will NOT be invoked until audio_3d_update() is called.
   virtual void audio_3d_set_listener_attributes(PN_stdfloat px, PN_stdfloat py, PN_stdfloat pz,
-                                                PN_stdfloat vx, PN_stdfloat xy, PN_stdfloat xz, 
+                                                PN_stdfloat vx, PN_stdfloat xy, PN_stdfloat xz,
                                                 PN_stdfloat fx, PN_stdfloat fy, PN_stdfloat fz,
                                                 PN_stdfloat ux, PN_stdfloat uy, PN_stdfloat uz);
 
@@ -88,7 +87,7 @@ class EXPCL_OPENAL_AUDIO OpenALAudioManager : public AudioManager {
                                                 PN_stdfloat *vx, PN_stdfloat *vy, PN_stdfloat *vz,
                                                 PN_stdfloat *fx, PN_stdfloat *fy, PN_stdfloat *fz,
                                                 PN_stdfloat *ux, PN_stdfloat *uy, PN_stdfloat *uz);
-          
+
   // Control the "relative distance factor" for 3D spacialized audio in units-per-foot. Default is 1.0
   // OpenAL has no distance factor but we use this as a scale
   // on the min/max distances of sounds to preserve FMOD compatibility.
@@ -121,7 +120,7 @@ private:
 
   bool can_use_audio(MovieAudioCursor *source);
   bool should_load_audio(MovieAudioCursor *source, int mode);
-  
+
   SoundData *get_sound_data(MovieAudio *source, int mode);
 
   // Tell the manager that the sound dtor was called.
@@ -129,12 +128,12 @@ private:
   void increment_client_count(SoundData *sd);
   void decrement_client_count(SoundData *sd);
   void discard_excess_cache(int limit);
-  
+
   void starting_sound(OpenALAudioSound* audio);
   void stopping_sound(OpenALAudioSound* audio);
-  
+
   void cleanup();
-  
+
 private:
   // This global lock protects all access to OpenAL library interfaces.
   static ReMutex _lock;
@@ -144,7 +143,7 @@ private:
   // around for a little while, since it is common to
   // stop using a sound for a brief moment and then
   // quickly resume.
-  
+
   typedef plist<void *> ExpirationQueue;
   ExpirationQueue _expiring_samples;
   ExpirationQueue _expiring_streams;
@@ -175,16 +174,16 @@ private:
     ExpirationQueue::iterator _expire;
   };
 
-  
+
   typedef phash_map<string, SoundData *> SampleCache;
   SampleCache _sample_cache;
-  
+
   typedef phash_set<PT(OpenALAudioSound)> SoundsPlaying;
   SoundsPlaying _sounds_playing;
 
   typedef phash_set<OpenALAudioSound *> AllSounds;
   AllSounds _all_sounds;
-  
+
   // State:
   int _cache_limit;
   PN_stdfloat _volume;
@@ -195,13 +194,13 @@ private:
   static int _active_managers;
   static bool _openal_active;
   unsigned int _concurrent_sound_limit;
-  
+
   bool _is_valid;
-  
+
   typedef pset<OpenALAudioManager *> Managers;
   static Managers *_managers;
 
-  static ALCdevice* _device; 
+  static ALCdevice* _device;
   static ALCcontext* _context;
 
   // cache of openal sources, use only for playing sounds
@@ -232,7 +231,7 @@ private:
     return get_class_type();
   }
   virtual TypeHandle force_init_type() {
-    init_type(); 
+    init_type();
     return get_class_type();
   }
 
@@ -247,7 +246,4 @@ private:
 
 EXPCL_OPENAL_AUDIO AudioManager *Create_OpenALAudioManager();
 
-
-#endif //]
-
 #endif /* __OPENAL_AUDIO_MANAGER_H__ */
diff --git a/panda/src/audiotraits/openalAudioSound.cxx b/panda/src/audiotraits/openalAudioSound.cxx
index af6d658568..eb34d24973 100644
--- a/panda/src/audiotraits/openalAudioSound.cxx
+++ b/panda/src/audiotraits/openalAudioSound.cxx
@@ -15,8 +15,6 @@
 
 #include "pandabase.h"
 
-#ifdef HAVE_OPENAL //[
-
 //Panda Headers
 #include "throw_event.h"
 #include "openalAudioSound.h"
@@ -916,5 +914,3 @@ status() const {
     return AudioSound::PLAYING;
   }
 }
-
-#endif //]
diff --git a/panda/src/audiotraits/openalAudioSound.h b/panda/src/audiotraits/openalAudioSound.h
index 5922e0d49b..7a18db21d4 100644
--- a/panda/src/audiotraits/openalAudioSound.h
+++ b/panda/src/audiotraits/openalAudioSound.h
@@ -13,15 +13,11 @@
 //
 ////////////////////////////////////////////////////////////////////
 
-
-
 #ifndef __OPENAL_AUDIO_SOUND_H__
 #define __OPENAL_AUDIO_SOUND_H__
 
 #include "pandabase.h"
 
-#ifdef HAVE_OPENAL //[
-
 #include "audioSound.h"
 #include "movieAudioCursor.h"
 #include "trueClock.h"
@@ -232,6 +228,4 @@ private:
 
 #include "openalAudioSound.I"
 
-#endif //]
-
 #endif /* __OPENAL_AUDIO_SOUND_H__ */
diff --git a/panda/src/bullet/bulletContactCallbacks.h b/panda/src/bullet/bulletContactCallbacks.h
index e0c3a31b57..0f6150c965 100644
--- a/panda/src/bullet/bulletContactCallbacks.h
+++ b/panda/src/bullet/bulletContactCallbacks.h
@@ -25,7 +25,6 @@
 #include "event.h"
 #include "eventQueue.h"
 #include "eventParameter.h"
-#include "eventStorePandaNode.h"
 #include "pandaNode.h"
 
 struct UserPersitentData {
@@ -77,8 +76,8 @@ contact_added_callback(btManifoldPoint &cp,
     if (bullet_enable_contact_events) {
 
       Event *event = new Event("bullet-contact-added");
-      event->add_parameter(EventParameter(new EventStorePandaNode(node0)));
-      event->add_parameter(EventParameter(new EventStorePandaNode(node1)));
+      event->add_parameter(EventParameter(node0));
+      event->add_parameter(EventParameter(node1));
 
       EventQueue::get_global_event_queue()->queue_event(event);
     }
@@ -137,8 +136,8 @@ contact_destroyed_callback(void *userPersistentData) {
   if (bullet_enable_contact_events) {
 
     Event *event = new Event("bullet-contact-destroyed");
-    event->add_parameter(EventParameter(new EventStorePandaNode(data->node0)));
-    event->add_parameter(EventParameter(new EventStorePandaNode(data->node1)));
+    event->add_parameter(EventParameter(data->node0));
+    event->add_parameter(EventParameter(data->node1));
 
     EventQueue::get_global_event_queue()->queue_event(event);
   }
diff --git a/panda/src/collide/collisionBox.cxx b/panda/src/collide/collisionBox.cxx
index 5c774d4a13..f467d73a8b 100644
--- a/panda/src/collide/collisionBox.cxx
+++ b/panda/src/collide/collisionBox.cxx
@@ -29,7 +29,7 @@
 #include "cmath.h"
 #include "mathNumbers.h"
 #include "geom.h"
-#include "geomTrifans.h"
+#include "geomTriangles.h"
 #include "geomVertexWriter.h"
 #include "config_mathutil.h"
 #include "dcast.h"
@@ -80,7 +80,7 @@ setup_box(){
 //     Function: CollisionBox::setup_points
 //       Access: Private
 //  Description: Computes the plane and 2d projection of points that
-//               make up this side          
+//               make up this side.
 ////////////////////////////////////////////////////////////////////
 void CollisionBox::
 setup_points(const LPoint3 *begin, const LPoint3 *end, int plane) {
@@ -552,7 +552,7 @@ test_intersection_from_segment(const CollisionEntry &entry) const {
   PN_stdfloat near_t = 0.0;
   bool intersect;
   LPlane plane;
-  LPlane near_plane; 
+  LPlane near_plane;
 
   //Returns the details about the first plane of the box that the
   //segment intersects.
@@ -589,7 +589,6 @@ test_intersection_from_segment(const CollisionEntry &entry) const {
     }
     ++j;
   }
-   
 
   if(!intersect) {
     //No intersection with ANY of the box's planes has been detected
@@ -645,22 +644,50 @@ fill_viz_geom() {
   PT(GeomVertexData) vdata = new GeomVertexData
     ("collision", GeomVertexFormat::get_v3(),
      Geom::UH_static);
-  GeomVertexWriter vertex(vdata, InternalName::get_vertex());
-  
-  for(int i = 0; i < 6; i++) {
-    for(int j = 0; j < 4; j++)
-      vertex.add_data3(get_point(plane_def[i][j]));
 
-    PT(GeomTrifans) body = new GeomTrifans(Geom::UH_static);
-    body->add_consecutive_vertices(i*4, 4);
-    body->close_primitive();
+  vdata->unclean_set_num_rows(8);
 
-    PT(Geom) geom = new Geom(vdata);
-    geom->add_primitive(body);
+  {
+    GeomVertexWriter vertex(vdata, InternalName::get_vertex());
+    vertex.set_data3(_min[0], _min[1], _min[2]);
+    vertex.set_data3(_min[0], _max[1], _min[2]);
+    vertex.set_data3(_max[0], _max[1], _min[2]);
+    vertex.set_data3(_max[0], _min[1], _min[2]);
 
-    _viz_geom->add_geom(geom, get_solid_viz_state());
-    _bounds_viz_geom->add_geom(geom, get_solid_bounds_viz_state());
+    vertex.set_data3(_min[0], _min[1], _max[2]);
+    vertex.set_data3(_min[0], _max[1], _max[2]);
+    vertex.set_data3(_max[0], _max[1], _max[2]);
+    vertex.set_data3(_max[0], _min[1], _max[2]);
   }
+
+  PT(GeomTriangles) tris = new GeomTriangles(Geom::UH_static);
+
+  // Bottom
+  tris->add_vertices(0, 1, 2);
+  tris->add_vertices(2, 3, 0);
+
+  // Top
+  tris->add_vertices(4, 7, 6);
+  tris->add_vertices(6, 5, 4);
+
+  // Sides
+  tris->add_vertices(0, 4, 1);
+  tris->add_vertices(1, 4, 5);
+
+  tris->add_vertices(1, 5, 2);
+  tris->add_vertices(2, 5, 6);
+
+  tris->add_vertices(2, 6, 3);
+  tris->add_vertices(3, 6, 7);
+
+  tris->add_vertices(3, 7, 0);
+  tris->add_vertices(0, 7, 4);
+
+  PT(Geom) geom = new Geom(vdata);
+  geom->add_primitive(tris);
+
+  _viz_geom->add_geom(geom, get_solid_viz_state());
+  _bounds_viz_geom->add_geom(geom, get_solid_bounds_viz_state());
 }
 
 ////////////////////////////////////////////////////////////////////
@@ -675,7 +702,7 @@ fill_viz_geom() {
 //               planes), or false otherwise.
 ////////////////////////////////////////////////////////////////////
 bool CollisionBox::
-apply_clip_plane(CollisionBox::Points &new_points, 
+apply_clip_plane(CollisionBox::Points &new_points,
                  const ClipPlaneAttrib *cpa,
                  const TransformState *net_transform, int plane_no) const {
   bool all_in = true;
@@ -687,9 +714,9 @@ apply_clip_plane(CollisionBox::Points &new_points,
     NodePath plane_path = cpa->get_on_plane(i);
     PlaneNode *plane_node = DCAST(PlaneNode, plane_path.node());
     if ((plane_node->get_clip_effect() & PlaneNode::CE_collision) != 0) {
-      CPT(TransformState) new_transform = 
+      CPT(TransformState) new_transform =
         net_transform->invert_compose(plane_path.get_net_transform());
-      
+
       LPlane plane = plane_node->get_plane() * new_transform->get_mat();
       if (first_plane) {
         first_plane = false;
diff --git a/panda/src/collide/collisionVisualizer.cxx b/panda/src/collide/collisionVisualizer.cxx
index 333552dda5..3a09d25803 100644
--- a/panda/src/collide/collisionVisualizer.cxx
+++ b/panda/src/collide/collisionVisualizer.cxx
@@ -122,14 +122,14 @@ cull_callback(CullTraverser *trav, CullTraverserData &data) {
     const VizInfo &viz_info = (*di).second;
 
     CullTraverserData xform_data(data);
-    
+
     // We don't want to inherit the transform from above!  We ignore
     // whatever transforms were above the CollisionVisualizer node; it
     // always renders its objects according to their appropriate net
     // transform.
     xform_data._net_transform = TransformState::make_identity();
     xform_data._view_frustum = trav->get_view_frustum();
-    xform_data.apply_transform_and_state(trav, net_transform, 
+    xform_data.apply_transform_and_state(trav, net_transform,
                                          RenderState::make_empty(),
                                          RenderEffects::make_empty(),
                                          ClipPlaneAttrib::make());
@@ -148,7 +148,7 @@ cull_callback(CullTraverser *trav, CullTraverserData &data) {
       PT(PandaNode) node = solid->get_viz(trav, xform_data, !was_detected);
       if (node != (PandaNode *)NULL) {
         CullTraverserData next_data(xform_data, node);
-        
+
         // We don't want to inherit the render state from above for
         // these guys.
         next_data._state = get_viz_state();
@@ -161,16 +161,16 @@ cull_callback(CullTraverser *trav, CullTraverserData &data) {
       CPT(RenderState) empty_state = RenderState::make_empty();
       CPT(RenderState) point_state = RenderState::make(RenderModeAttrib::make(RenderModeAttrib::M_unchanged, 1.0f, false));
 
-      PT(GeomVertexArrayFormat) point_array_format = 
+      PT(GeomVertexArrayFormat) point_array_format =
         new GeomVertexArrayFormat(InternalName::get_vertex(), 3,
                                   Geom::NT_stdfloat, Geom::C_point,
                                   InternalName::get_color(), 1,
                                   Geom::NT_packed_dabc, Geom::C_color,
-                                  InternalName::get_size(), 1, 
+                                  InternalName::get_size(), 1,
                                   Geom::NT_stdfloat, Geom::C_other);
-      CPT(GeomVertexFormat) point_format = 
+      CPT(GeomVertexFormat) point_format =
         GeomVertexFormat::register_format(point_array_format);
-        
+
       Points::const_iterator pi;
       for (pi = viz_info._points.begin(); pi != viz_info._points.end(); ++pi) {
         const CollisionPoint &point = (*pi);
@@ -178,9 +178,9 @@ cull_callback(CullTraverser *trav, CullTraverserData &data) {
         // Draw a small red point at the surface point, and a smaller
         // white point at the interior point.
         {
-          PT(GeomVertexData) point_vdata = 
+          PT(GeomVertexData) point_vdata =
             new GeomVertexData("viz", point_format, Geom::UH_stream);
-          
+
           PT(GeomPoints) points = new GeomPoints(Geom::UH_stream);
 
           GeomVertexWriter vertex(point_vdata, InternalName::get_vertex());
@@ -203,19 +203,17 @@ cull_callback(CullTraverser *trav, CullTraverserData &data) {
 
           PT(Geom) geom = new Geom(point_vdata);
           geom->add_primitive(points);
-            
-          CullableObject *object = 
-            new CullableObject(geom, point_state, 
-                               xform_data.get_net_transform(trav),
-                               xform_data.get_modelview_transform(trav),
-                               trav->get_scene());
-          
+
+          CullableObject *object =
+            new CullableObject(geom, point_state,
+                               xform_data.get_internal_transform(trav));
+
           trav->get_cull_handler()->record_object(object, trav);
         }
 
         // Draw the normal vector at the surface point.
         if (!point._surface_normal.almost_equal(LVector3::zero())) {
-          PT(GeomVertexData) line_vdata = 
+          PT(GeomVertexData) line_vdata =
             new GeomVertexData("viz", GeomVertexFormat::get_v3cp(),
                                Geom::UH_stream);
 
@@ -225,7 +223,7 @@ cull_callback(CullTraverser *trav, CullTraverserData &data) {
           GeomVertexWriter color(line_vdata, InternalName::get_color());
 
           vertex.add_data3(point._surface_point);
-          vertex.add_data3(point._surface_point + 
+          vertex.add_data3(point._surface_point +
                             point._surface_normal * _normal_scale);
           color.add_data4(1.0f, 0.0f, 0.0f, 1.0f);
           color.add_data4(1.0f, 1.0f, 1.0f, 1.0f);
@@ -234,13 +232,11 @@ cull_callback(CullTraverser *trav, CullTraverserData &data) {
 
           PT(Geom) geom = new Geom(line_vdata);
           geom->add_primitive(lines);
-          
-          CullableObject *object = 
-            new CullableObject(geom, empty_state, 
-                               xform_data.get_net_transform(trav),
-                               xform_data.get_modelview_transform(trav),
-                               trav->get_scene());
-          
+
+          CullableObject *object =
+            new CullableObject(geom, empty_state,
+                               xform_data.get_internal_transform(trav));
+
           trav->get_cull_handler()->record_object(object, trav);
         }
       }
diff --git a/panda/src/configfiles/panda.prc.pp b/panda/src/configfiles/panda.prc.pp
index 6cf74d0407..1a7f6099fa 100644
--- a/panda/src/configfiles/panda.prc.pp
+++ b/panda/src/configfiles/panda.prc.pp
@@ -27,9 +27,6 @@ aux-display pandadx9
 #if $[HAVE_GL]
 aux-display pandagl
 #endif
-#if $[HAVE_DX8]
-aux-display pandadx8
-#endif
 #if $[HAVE_TINYDISPLAY]
 aux-display p3tinydisplay
 #endif
diff --git a/panda/src/cull/cullBinBackToFront.cxx b/panda/src/cull/cullBinBackToFront.cxx
index d90fb4968d..6a734c0092 100644
--- a/panda/src/cull/cullBinBackToFront.cxx
+++ b/panda/src/cull/cullBinBackToFront.cxx
@@ -66,11 +66,11 @@ add_object(CullableObject *object, Thread *current_thread) {
 
   const GeometricBoundingVolume *gbv;
   DCAST_INTO_V(gbv, volume);
-  
+
   LPoint3 center = gbv->get_approx_center();
-  nassertv(object->_modelview_transform != (const TransformState *)NULL);
-  center = center * object->_modelview_transform->get_mat();
-  
+  nassertv(object->_internal_transform != (const TransformState *)NULL);
+  center = center * object->_internal_transform->get_mat();
+
   PN_stdfloat distance = _gsg->compute_distance_to(center);
   _objects.push_back(ObjectData(object, distance));
 }
diff --git a/panda/src/cull/cullBinFrontToBack.cxx b/panda/src/cull/cullBinFrontToBack.cxx
index ab1a23b777..91e8c99133 100644
--- a/panda/src/cull/cullBinFrontToBack.cxx
+++ b/panda/src/cull/cullBinFrontToBack.cxx
@@ -66,11 +66,11 @@ add_object(CullableObject *object, Thread *current_thread) {
 
   const GeometricBoundingVolume *gbv;
   DCAST_INTO_V(gbv, volume);
-  
+
   LPoint3 center = gbv->get_approx_center();
-  nassertv(object->_modelview_transform != (const TransformState *)NULL);
-  center = center * object->_modelview_transform->get_mat();
-  
+  nassertv(object->_internal_transform != (const TransformState *)NULL);
+  center = center * object->_internal_transform->get_mat();
+
   PN_stdfloat distance = _gsg->compute_distance_to(center);
   _objects.push_back(ObjectData(object, distance));
 }
diff --git a/panda/src/cull/cullBinStateSorted.I b/panda/src/cull/cullBinStateSorted.I
index 53141cc9c6..8f16030d0d 100644
--- a/panda/src/cull/cullBinStateSorted.I
+++ b/panda/src/cull/cullBinStateSorted.I
@@ -47,8 +47,8 @@ INLINE bool CullBinStateSorted::ObjectData::
 operator < (const ObjectData &other) const {
   // First group objects by transform, since transform changes are
   // supposed to be expensive.
-  if (_object->_modelview_transform != other._object->_modelview_transform) {
-    return _object->_modelview_transform < other._object->_modelview_transform;
+  if (_object->_internal_transform != other._object->_internal_transform) {
+    return _object->_internal_transform < other._object->_internal_transform;
   }
 
   // Then group by other state changes, in approximate order from
diff --git a/panda/src/cull/drawCullHandler.cxx b/panda/src/cull/drawCullHandler.cxx
index 02d6a660bb..bbaa2fe1b3 100644
--- a/panda/src/cull/drawCullHandler.cxx
+++ b/panda/src/cull/drawCullHandler.cxx
@@ -19,7 +19,7 @@
 #include "renderState.h"
 #include "graphicsStateGuardianBase.h"
 #include "config_pgraph.h"
-
+#include "cullTraverser.h"
 
 ////////////////////////////////////////////////////////////////////
 //     Function: DrawCullHandler::record_object
diff --git a/panda/src/cull/drawCullHandler.h b/panda/src/cull/drawCullHandler.h
index 91038bd597..7fea30c8b3 100644
--- a/panda/src/cull/drawCullHandler.h
+++ b/panda/src/cull/drawCullHandler.h
@@ -35,7 +35,7 @@ class EXPCL_PANDA_CULL DrawCullHandler : public CullHandler {
 public:
   INLINE DrawCullHandler(GraphicsStateGuardianBase *gsg);
 
-  virtual void record_object(CullableObject *object, 
+  virtual void record_object(CullableObject *object,
                              const CullTraverser *traverser);
 
 private:
@@ -46,5 +46,3 @@ private:
 
 #endif
 
-
-  
diff --git a/panda/src/display/Sources.pp b/panda/src/display/Sources.pp
index 98c9e3d24e..26aa3b5187 100644
--- a/panda/src/display/Sources.pp
+++ b/panda/src/display/Sources.pp
@@ -14,6 +14,7 @@
     standardMunger.I standardMunger.h \
     config_display.h \
     $[if $[HAVE_PYTHON], pythonGraphicsWindowProc.h] \
+    $[if $[HAVE_PYTHON], pythonGraphicsWindowProc.cxx] \
     callbackGraphicsWindow.I callbackGraphicsWindow.h \
     drawableRegion.I drawableRegion.h \
     displayRegion.I displayRegion.h  \
@@ -54,7 +55,6 @@
  #define INCLUDED_SOURCES  \
     standardMunger.cxx \
     config_display.cxx \
-    $[if $[HAVE_PYTHON], pythonGraphicsWindowProc.cxx] \
     callbackGraphicsWindow.cxx \
     drawableRegion.cxx \
     displayRegion.cxx \
diff --git a/panda/src/display/callbackGraphicsWindow.h b/panda/src/display/callbackGraphicsWindow.h
index 484e87754f..7af1ddc33f 100644
--- a/panda/src/display/callbackGraphicsWindow.h
+++ b/panda/src/display/callbackGraphicsWindow.h
@@ -40,7 +40,7 @@ protected:
 PUBLISHED:
   virtual ~CallbackGraphicsWindow();
 
-  class WindowCallbackData : public CallbackData {
+  class EXPCL_PANDA_DISPLAY WindowCallbackData : public CallbackData {
   public:
     INLINE WindowCallbackData(CallbackGraphicsWindow *window);
 
@@ -68,8 +68,7 @@ PUBLISHED:
     static TypeHandle _type_handle;
   };
 
-
-  class EventsCallbackData : public WindowCallbackData {
+  class EXPCL_PANDA_DISPLAY EventsCallbackData : public WindowCallbackData {
   public:
     INLINE EventsCallbackData(CallbackGraphicsWindow *window);
 
@@ -94,7 +93,7 @@ PUBLISHED:
     static TypeHandle _type_handle;
   };
 
-  class PropertiesCallbackData : public WindowCallbackData {
+  class EXPCL_PANDA_DISPLAY PropertiesCallbackData : public WindowCallbackData {
   public:
     INLINE PropertiesCallbackData(CallbackGraphicsWindow *window, WindowProperties &properties);
 
@@ -131,7 +130,7 @@ PUBLISHED:
     RCT_end_flip,
   };
 
-  class RenderCallbackData : public WindowCallbackData {
+  class EXPCL_PANDA_DISPLAY RenderCallbackData : public WindowCallbackData {
   public:
     INLINE RenderCallbackData(CallbackGraphicsWindow *window, RenderCallbackType callback_type, FrameMode frame_mode);
 
diff --git a/panda/src/display/config_display.cxx b/panda/src/display/config_display.cxx
index 5b207a446a..0143917956 100644
--- a/panda/src/display/config_display.cxx
+++ b/panda/src/display/config_display.cxx
@@ -451,8 +451,8 @@ ConfigVariableDouble pixel_zoom
 ("pixel-zoom", 1.0,
  PRC_DESC("The default pixel_zoom factor for new windows."));
 
-ConfigVariableDouble background_color
-("background-color", "0.41 0.41 0.41",
+ConfigVariableColor background_color
+("background-color", "0.41 0.41 0.41 0.0",
  PRC_DESC("Specifies the rgb(a) value of the default background color for a "
           "new window or offscreen buffer."));
 
diff --git a/panda/src/display/config_display.h b/panda/src/display/config_display.h
index 24ed75bbb8..4da350f4e6 100644
--- a/panda/src/display/config_display.h
+++ b/panda/src/display/config_display.h
@@ -24,6 +24,7 @@
 #include "configVariableInt.h"
 #include "configVariableEnum.h"
 #include "configVariableFilename.h"
+#include "configVariableColor.h"
 #include "coordinateSystem.h"
 #include "dconfig.h"
 
@@ -107,7 +108,7 @@ extern EXPCL_PANDA_DISPLAY ConfigVariableInt back_buffers;
 
 extern EXPCL_PANDA_DISPLAY ConfigVariableDouble pixel_zoom;
 
-extern EXPCL_PANDA_DISPLAY ConfigVariableDouble background_color;
+extern EXPCL_PANDA_DISPLAY ConfigVariableColor background_color;
 extern EXPCL_PANDA_DISPLAY ConfigVariableBool sync_video;
 extern EXPCL_PANDA_DISPLAY ConfigVariableBool basic_shaders_only;
 
diff --git a/panda/src/display/displayRegion.cxx b/panda/src/display/displayRegion.cxx
index f6a6189737..8e2fc71e4e 100644
--- a/panda/src/display/displayRegion.cxx
+++ b/panda/src/display/displayRegion.cxx
@@ -636,7 +636,7 @@ void DisplayRegion::
 compute_pixels() {
   if (_window != (GraphicsOutput *)NULL) {
     CDWriter cdata(_cycler, false);
-    for (int i = 0; i < cdata->_regions.size(); ++i) {
+    for (size_t i = 0; i < cdata->_regions.size(); ++i) {
       do_compute_pixels(i, _window->get_fb_x_size(), _window->get_fb_y_size(), 
                         cdata);
     }
@@ -658,7 +658,7 @@ compute_pixels_all_stages() {
   if (_window != (GraphicsOutput *)NULL) {
     OPEN_ITERATE_ALL_STAGES(_cycler) {
       CDStageWriter cdata(_cycler, pipeline_stage);
-      for (int i = 0; i < cdata->_regions.size(); ++i) {
+      for (size_t i = 0; i < cdata->_regions.size(); ++i) {
         do_compute_pixels(i, _window->get_fb_x_size(), _window->get_fb_y_size(), 
                           cdata);
       }
@@ -677,7 +677,7 @@ compute_pixels_all_stages() {
 void DisplayRegion::
 compute_pixels(int x_size, int y_size) {
   CDWriter cdata(_cycler, false);
-  for (int i = 0; i < cdata->_regions.size(); ++i) {
+  for (size_t i = 0; i < cdata->_regions.size(); ++i) {
     do_compute_pixels(i, x_size, y_size, cdata);
   }
 }
@@ -695,7 +695,7 @@ void DisplayRegion::
 compute_pixels_all_stages(int x_size, int y_size) {
   OPEN_ITERATE_ALL_STAGES(_cycler) {
     CDStageWriter cdata(_cycler, pipeline_stage);
-    for (int i = 0; i < cdata->_regions.size(); ++i) {
+    for (size_t i = 0; i < cdata->_regions.size(); ++i) {
       do_compute_pixels(i, x_size, y_size, cdata);
     }
   } 
diff --git a/panda/src/display/graphicsEngine.cxx b/panda/src/display/graphicsEngine.cxx
index 849e9efb4f..22b2b876f8 100644
--- a/panda/src/display/graphicsEngine.cxx
+++ b/panda/src/display/graphicsEngine.cxx
@@ -476,6 +476,42 @@ make_output(GraphicsPipe *pipe,
   return NULL;
 }
 
+////////////////////////////////////////////////////////////////////
+//     Function: GraphicsEngine::add_window
+//       Access: Published
+//  Description: This can be used to add a newly-created
+//               GraphicsOutput object (and its GSG) to the engine's
+//               list of windows, and requests that it be opened.
+//               This shouldn't be called by user code as
+//               make_output normally does this under the hood; it
+//               may be useful in esoteric cases in which a custom
+//               window object is used.
+////////////////////////////////////////////////////////////////////
+bool GraphicsEngine::
+add_window(GraphicsOutput *window, int sort) {
+  nassertr(window != NULL, false);
+
+  GraphicsThreadingModel threading_model = get_threading_model();
+  nassertr(this == window->get_engine(), false);
+
+  window->_sort = sort;
+  do_add_window(window, threading_model);
+
+  open_windows();
+  if (window->is_valid()) {
+    do_add_gsg(window->get_gsg(), window->get_pipe(), threading_model);
+
+    display_cat.info()
+      << "Added output of type " << window->get_type() << "\n";
+
+    return true;
+
+  } else {
+    remove_window(window);
+    return false;
+  }
+}
+
 ////////////////////////////////////////////////////////////////////
 //     Function: GraphicsEngine::remove_window
 //       Access: Published
@@ -1324,9 +1360,9 @@ cull_and_draw_together(const GraphicsEngine::Windows &wlist,
                        Thread *current_thread) {
   PStatTimer timer(_cull_pcollector, current_thread);
 
-  Windows::const_iterator wi;
-  for (wi = wlist.begin(); wi != wlist.end(); ++wi) {
-    GraphicsOutput *win = (*wi);
+  size_t wlist_size = wlist.size();
+  for (size_t wi = 0; wi < wlist_size; ++wi) {
+    GraphicsOutput *win = wlist[wi];
     if (win->is_active() && win->get_gsg()->is_active()) {
       if (win->flip_ready()) {
         {
@@ -1450,9 +1486,9 @@ cull_to_bins(const GraphicsEngine::Windows &wlist, Thread *current_thread) {
   typedef pmap<NodePath, DisplayRegion *> AlreadyCulled;
   AlreadyCulled already_culled;
 
-  Windows::const_iterator wi;
-  for (wi = wlist.begin(); wi != wlist.end(); ++wi) {
-    GraphicsOutput *win = (*wi);
+  size_t wlist_size = wlist.size();
+  for (size_t wi = 0; wi < wlist_size; ++wi) {
+    GraphicsOutput *win = wlist[wi];
     if (win->is_active() && win->get_gsg()->is_active()) {
       PStatTimer timer(win->get_cull_window_pcollector(), current_thread);
       int num_display_regions = win->get_num_active_display_regions();
@@ -1958,6 +1994,17 @@ setup_scene(GraphicsStateGuardian *gsg, DisplayRegionPipelineReader *dr) {
   CPT(TransformState) cs_transform = gsg->get_cs_transform_for(lens->get_coordinate_system());
   scene_setup->set_cs_transform(cs_transform);
 
+  CPT(TransformState) cs_world_transform = cs_transform->compose(world_transform);
+  scene_setup->set_cs_world_transform(cs_world_transform);
+
+  // Make sure that the GSG has a ShaderGenerator for the munger
+  // to use.  We have to do this here because the ShaderGenerator
+  // needs a host window pointer.  Hopefully we'll be able to
+  // eliminate that requirement in the future.
+  if (gsg->get_shader_generator() == NULL) {
+    gsg->set_shader_generator(new ShaderGenerator(gsg, window));
+  }
+
   return scene_setup;
 }
 
@@ -2107,6 +2154,8 @@ do_add_window(GraphicsOutput *window,
 void GraphicsEngine::
 do_add_gsg(GraphicsStateGuardian *gsg, GraphicsPipe *pipe,
            const GraphicsThreadingModel &threading_model) {
+  nassertv(gsg != NULL);
+
   ReMutexHolder holder(_lock);
   nassertv(gsg->get_pipe() == pipe && gsg->get_engine() == this);
   gsg->_threading_model = threading_model;
diff --git a/panda/src/display/graphicsEngine.h b/panda/src/display/graphicsEngine.h
index 7933f73350..cb371076ee 100644
--- a/panda/src/display/graphicsEngine.h
+++ b/panda/src/display/graphicsEngine.h
@@ -80,7 +80,7 @@ PUBLISHED:
                               const WindowProperties &win_prop,
                               int flags, GraphicsStateGuardian *gsg = NULL,
                               GraphicsOutput *host = NULL);
-  
+
   // Syntactic shorthand versions of make_output
   INLINE GraphicsOutput *make_buffer(GraphicsOutput *host,
                                      const string &name, int sort,
@@ -91,7 +91,8 @@ PUBLISHED:
   INLINE GraphicsOutput *make_parasite(GraphicsOutput *host,
                                        const string &name, int sort,
                                        int x_size, int y_size);
-  
+
+  bool add_window(GraphicsOutput *window, int sort);
   bool remove_window(GraphicsOutput *window);
   void remove_all_windows();
   void reset_all_windows(bool swapchain);
@@ -104,7 +105,7 @@ PUBLISHED:
   BLOCKING void render_frame();
   BLOCKING void open_windows();
   BLOCKING void sync_frame();
-  BLOCKING void ready_flip();  
+  BLOCKING void ready_flip();
   BLOCKING void flip_frame();
 
   bool extract_texture_data(Texture *tex, GraphicsStateGuardian *gsg);
@@ -130,7 +131,7 @@ public:
 public:
   static void do_cull(CullHandler *cull_handler, SceneSetup *scene_setup,
                       GraphicsStateGuardian *gsg, Thread *current_thread);
-  
+
 private:
   typedef ov_set< PT(GraphicsOutput), IndirectLess<GraphicsOutput> > Windows;
   typedef pset< PT(GraphicsStateGuardian) > GSGs;
@@ -158,7 +159,7 @@ private:
   void do_flip_frame(Thread *current_thread);
   INLINE void close_gsg(GraphicsPipe *pipe, GraphicsStateGuardian *gsg);
 
-  PT(SceneSetup) setup_scene(GraphicsStateGuardian *gsg, 
+  PT(SceneSetup) setup_scene(GraphicsStateGuardian *gsg,
                              DisplayRegionPipelineReader *dr);
   void do_draw(CullResult *cull_result, SceneSetup *scene_setup,
                GraphicsOutput *win, DisplayRegion *dr, Thread *current_thread);
@@ -281,7 +282,7 @@ private:
     Windows _cull;    // cull stage
     Windows _cdraw;   // cull-and-draw-together stage
     Windows _draw;    // draw stage
-    Windows _window;  // window stage, i.e. process windowing events 
+    Windows _window;  // window stage, i.e. process windowing events
 
     // These are not kept sorted.
     Windows _pending_close;    // moved from _window, pending close.
diff --git a/panda/src/display/graphicsOutput.cxx b/panda/src/display/graphicsOutput.cxx
index ce1eb08d00..f27b7dbfee 100644
--- a/panda/src/display/graphicsOutput.cxx
+++ b/panda/src/display/graphicsOutput.cxx
@@ -120,7 +120,6 @@ GraphicsOutput(GraphicsEngine *engine, GraphicsPipe *pipe,
   _sbs_left_dimensions.set(0.0f, 1.0f, 0.0f, 1.0f);
   _sbs_right_dimensions.set(0.0f, 1.0f, 0.0f, 1.0f);
   _delete_flag = false;
-  _texture_card = 0;
   _trigger_copy = false;
 
   if (_fb_properties.is_single_buffered()) {
@@ -139,9 +138,9 @@ GraphicsOutput(GraphicsEngine *engine, GraphicsPipe *pipe,
     }
     _side_by_side_stereo = side_by_side_stereo && !fb_prop.is_stereo();
     if (_side_by_side_stereo) {
-      _sbs_left_dimensions.set(sbs_left_dimensions[0], sbs_left_dimensions[1], 
+      _sbs_left_dimensions.set(sbs_left_dimensions[0], sbs_left_dimensions[1],
                                sbs_left_dimensions[2], sbs_left_dimensions[3]);
-      _sbs_right_dimensions.set(sbs_right_dimensions[0], sbs_right_dimensions[1], 
+      _sbs_right_dimensions.set(sbs_right_dimensions[0], sbs_right_dimensions[1],
                                 sbs_right_dimensions[2], sbs_right_dimensions[3]);
     }
   }
@@ -164,29 +163,7 @@ GraphicsOutput(GraphicsEngine *engine, GraphicsPipe *pipe,
   set_clear_color_active(true);
   set_clear_depth_active(true);
   set_clear_stencil_active(true);
-
-  switch (background_color.get_num_words()) {
-  case 1:
-    set_clear_color(LColor(background_color[0], background_color[0], background_color[0], 0.0f));
-    break;
-
-  case 2:
-    set_clear_color(LColor(background_color[0], background_color[0], background_color[0], background_color[1]));
-    break;
-
-  case 3:
-    set_clear_color(LColor(background_color[0], background_color[1], background_color[2], 0.0f));
-    break;
-
-  case 4:
-    set_clear_color(LColor(background_color[0], background_color[1], background_color[2], background_color[3]));
-    break;
-
-  default:
-    display_cat.warning()
-      << "Invalid background-color specification: "
-      << background_color.get_string_value() << "\n";
-  }
+  set_clear_color(background_color.get_value());
 }
 
 ////////////////////////////////////////////////////////////////////
@@ -579,9 +556,9 @@ set_inverted(bool inverted) {
 void GraphicsOutput::
 set_side_by_side_stereo(bool side_by_side_stereo) {
   LVecBase4 left, right;
-  left.set(sbs_left_dimensions[0], sbs_left_dimensions[1], 
+  left.set(sbs_left_dimensions[0], sbs_left_dimensions[1],
            sbs_left_dimensions[2], sbs_left_dimensions[3]);
-  right.set(sbs_right_dimensions[0], sbs_right_dimensions[1], 
+  right.set(sbs_right_dimensions[0], sbs_right_dimensions[1],
             sbs_right_dimensions[2], sbs_right_dimensions[3]);
   set_side_by_side_stereo(side_by_side_stereo, left, right);
 }
@@ -984,7 +961,7 @@ make_texture_buffer(const string &name, int x_size, int y_size,
                 flags, get_gsg(), get_host());
 
   if (buffer != (GraphicsOutput *)NULL) {
-    if (buffer->get_gsg() == (GraphicsStateGuardian *)NULL || 
+    if (buffer->get_gsg() == (GraphicsStateGuardian *)NULL ||
         buffer->get_gsg()->get_prepared_objects() != get_gsg()->get_prepared_objects()) {
       // If the newly-created buffer doesn't share texture objects
       // with the current GSG, then we will have to force the texture
@@ -1101,19 +1078,20 @@ make_cube_map(const string &name, int size, NodePath &camera_rig,
 ////////////////////////////////////////////////////////////////////
 NodePath GraphicsOutput::
 get_texture_card() {
-  if (_texture_card == 0) {
+  if (_texture_card == NULL) {
     PT(GeomVertexData) vdata = create_texture_card_vdata(get_x_size(), get_y_size());
     PT(GeomTristrips) strip = new GeomTristrips(Geom::UH_static);
     strip->set_shade_model(Geom::SM_uniform);
     strip->add_next_vertices(4);
     strip->close_primitive();
-    _texture_card = new Geom(vdata);
-    _texture_card->add_primitive(strip);
+    PT(Geom) geom = new Geom(vdata);
+    geom->add_primitive(strip);
+    _texture_card = new GeomNode("texture card");
+    _texture_card->add_geom(geom);
   }
 
-  PT(GeomNode) gnode = new GeomNode("texture card");
-  gnode->add_geom(_texture_card);
-  NodePath path(gnode);
+  NodePath path("texture card");
+  path.node()->add_child(_texture_card);
 
   // The texture card, by default, is textured with the first
   // render-to-texture output texture.  Depth and stencil
@@ -1277,8 +1255,8 @@ set_size_and_recalc(int x, int y) {
     (*dri)->compute_pixels_all_stages(fb_x_size, fb_y_size);
   }
 
-  if (_texture_card != 0) {
-    _texture_card->set_vertex_data(create_texture_card_vdata(x, y));
+  if (_texture_card != NULL && _texture_card->get_num_geoms() > 0) {
+    _texture_card->modify_geom(0)->set_vertex_data(create_texture_card_vdata(x, y));
   }
 }
 
@@ -1701,7 +1679,7 @@ add_display_region(DisplayRegion *display_region) {
   LightMutexHolder holder(_lock);
   CDWriter cdata(_cycler, true);
   cdata->_active_display_regions_stale = true;
-  
+
   _total_display_regions.push_back(display_region);
 
   return display_region;
@@ -1806,7 +1784,7 @@ parse_color_mask(const string &word) {
       result |= 0x008;
 
     } else if (w == "off") {
-      
+
     } else {
       display_cat.warning()
         << "Invalid color in red-blue-stereo-colors: " << (*ci) << "\n";
@@ -1819,7 +1797,7 @@ parse_color_mask(const string &word) {
 ////////////////////////////////////////////////////////////////////
 //     Function: GraphicsOutput::CData::Constructor
 //       Access: Public
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 GraphicsOutput::CData::
 CData() {
@@ -1834,7 +1812,7 @@ CData() {
 ////////////////////////////////////////////////////////////////////
 //     Function: GraphicsOutput::CData::Constructor
 //       Access: Public
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 GraphicsOutput::CData::
 CData(const GraphicsOutput::CData &copy) :
diff --git a/panda/src/display/graphicsOutput.h b/panda/src/display/graphicsOutput.h
index 7196fc2bcf..cbcd787d90 100644
--- a/panda/src/display/graphicsOutput.h
+++ b/panda/src/display/graphicsOutput.h
@@ -68,7 +68,7 @@ class GraphicsEngine;
 class EXPCL_PANDA_DISPLAY GraphicsOutput : public GraphicsOutputBase, public DrawableRegion {
 protected:
   GraphicsOutput(GraphicsEngine *engine,
-                 GraphicsPipe *pipe, 
+                 GraphicsPipe *pipe,
                  const string &name,
                  const FrameBufferProperties &fb_prop,
                  const WindowProperties &win_prop, int flags,
@@ -314,7 +314,7 @@ protected:
   int _target_tex_page;
   int _target_tex_view;
   DisplayRegion *_prev_page_dr;
-  PT(Geom) _texture_card;
+  PT(GeomNode) _texture_card;
   bool _trigger_copy;
 
   class RenderTexture {
diff --git a/panda/src/display/graphicsPipe.cxx b/panda/src/display/graphicsPipe.cxx
index 76ed9f2135..4865e3da9f 100644
--- a/panda/src/display/graphicsPipe.cxx
+++ b/panda/src/display/graphicsPipe.cxx
@@ -82,11 +82,25 @@ GraphicsPipe::
 //               performed: typically either the app thread (e.g. X)
 //               or the draw thread (Windows).
 ////////////////////////////////////////////////////////////////////
-GraphicsPipe::PreferredWindowThread 
+GraphicsPipe::PreferredWindowThread
 GraphicsPipe::get_preferred_window_thread() const {
   return PWT_draw;
 }
 
+////////////////////////////////////////////////////////////////////
+//     Function: GraphicsPipe::make_callback_gsg
+//       Access: Public, Virtual
+//  Description: This is called when make_output() is used to create a
+//               CallbackGraphicsWindow.  If the GraphicsPipe can
+//               construct a GSG that's not associated with any
+//               particular window object, do so now, assuming the
+//               correct graphics context has been set up externally.
+////////////////////////////////////////////////////////////////////
+PT(GraphicsStateGuardian) GraphicsPipe::
+make_callback_gsg(GraphicsEngine *engine) {
+  return NULL;
+}
+
 ////////////////////////////////////////////////////////////////////
 //     Function: GraphicsPipe::make_device
 //       Access: Public, Virtual
@@ -95,7 +109,7 @@ GraphicsPipe::get_preferred_window_thread() const {
 ////////////////////////////////////////////////////////////////////
 PT(GraphicsDevice) GraphicsPipe::
 make_device(void *scrn) {
-  display_cat.error() 
+  display_cat.error()
     << "make_device() unimplemented by " << get_type() << "\n";
   return NULL;
 }
@@ -138,20 +152,6 @@ make_output(const string &name,
   return NULL;
 }
 
-////////////////////////////////////////////////////////////////////
-//     Function: GraphicsPipe::make_callback_gsg
-//       Access: Protected, Virtual
-//  Description: This is called when make_output() is used to create a
-//               CallbackGraphicsWindow.  If the GraphicsPipe can
-//               construct a GSG that's not associated with any
-//               particular window object, do so now, assuming the
-//               correct graphics context has been set up externally.
-////////////////////////////////////////////////////////////////////
-PT(GraphicsStateGuardian) GraphicsPipe::
-make_callback_gsg(GraphicsEngine *engine) {
-  return NULL;
-}
-
 ////////////////////////////////////////////////////////////////////
 //     Function: GraphicsPipe::get_display_information
 //       Access: Published
diff --git a/panda/src/display/graphicsPipe.h b/panda/src/display/graphicsPipe.h
index 998a81ace1..134a3baddd 100644
--- a/panda/src/display/graphicsPipe.h
+++ b/panda/src/display/graphicsPipe.h
@@ -101,7 +101,7 @@ PUBLISHED:
 
   DisplayInformation *get_display_information();
   virtual void lookup_cpu_data();
-  
+
   virtual string get_interface_name() const=0;
 
 public:
@@ -114,9 +114,11 @@ public:
   INLINE GraphicsDevice *get_device() const;
   virtual PT(GraphicsDevice) make_device(void *scrn = NULL);
 
+  virtual PT(GraphicsStateGuardian) make_callback_gsg(GraphicsEngine *engine);
+
 protected:
   virtual void close_gsg(GraphicsStateGuardian *gsg);
-  
+
   virtual PT(GraphicsOutput) make_output(const string &name,
                                          const FrameBufferProperties &fb_prop,
                                          const WindowProperties &win_prop,
@@ -126,8 +128,7 @@ protected:
                                          GraphicsOutput *host,
                                          int retry,
                                          bool &precertify);
-  virtual PT(GraphicsStateGuardian) make_callback_gsg(GraphicsEngine *engine);
-  
+
   LightMutex _lock;
 
   bool _is_valid;
@@ -135,7 +136,7 @@ protected:
   int _display_width;
   int _display_height;
   PT(GraphicsDevice) _device;
-  
+
   DisplayInformation *_display_information;
 
   static const int strip_properties[];
diff --git a/panda/src/display/graphicsStateGuardian.I b/panda/src/display/graphicsStateGuardian.I
index d9a406c79f..a4cea5ffc3 100644
--- a/panda/src/display/graphicsStateGuardian.I
+++ b/panda/src/display/graphicsStateGuardian.I
@@ -204,7 +204,7 @@ set_loader(Loader *loader) {
 
 ////////////////////////////////////////////////////////////////////
 //     Function: GraphicsStateGuardian::get_loader
-//       Access: Public, Virtual
+//       Access: Public
 //  Description: Returns the Loader object that will be used by this
 //               GSG to load textures when necessary, if
 //               get_incomplete_render() is true.
@@ -214,6 +214,28 @@ get_loader() const {
   return _loader;
 }
 
+////////////////////////////////////////////////////////////////////
+//     Function: GraphicsStateGuardian::set_shader_generator
+//       Access: Public
+//  Description: Sets the ShaderGenerator object that will be used
+//               by this GSG to generate shaders when necessary.
+////////////////////////////////////////////////////////////////////
+INLINE void GraphicsStateGuardian::
+set_shader_generator(ShaderGenerator *shader_generator) {
+  _shader_generator = shader_generator;
+}
+
+////////////////////////////////////////////////////////////////////
+//     Function: GraphicsStateGuardian::get_shader_generator
+//       Access: Public
+//  Description: Returns the ShaderGenerator object that will be used
+//               by this GSG to generate shaders when necessary.
+////////////////////////////////////////////////////////////////////
+INLINE ShaderGenerator *GraphicsStateGuardian::
+get_shader_generator() const {
+  return _shader_generator;
+}
+
 ////////////////////////////////////////////////////////////////////
 //     Function: GraphicsStateGuardian::get_pipe
 //       Access: Published
diff --git a/panda/src/display/graphicsStateGuardian.cxx b/panda/src/display/graphicsStateGuardian.cxx
index 3ac9bfd84c..6dda4cb69a 100644
--- a/panda/src/display/graphicsStateGuardian.cxx
+++ b/panda/src/display/graphicsStateGuardian.cxx
@@ -266,8 +266,6 @@ GraphicsStateGuardian(CoordinateSystem internal_coordinate_system,
 
   _gamma = 1.0f;
   _texture_quality_override = Texture::QL_default;
-
-  _shader_generator = NULL;
 }
 
 ////////////////////////////////////////////////////////////////////
@@ -278,12 +276,6 @@ GraphicsStateGuardian(CoordinateSystem internal_coordinate_system,
 GraphicsStateGuardian::
 ~GraphicsStateGuardian() {
   remove_gsg(this);
-
-  if (_shader_generator) {
-    delete _shader_generator;
-    _shader_generator = 0;
-  }
-
   GeomMunger::unregister_mungers_for_gsg(this);
 }
 
@@ -365,6 +357,9 @@ set_coordinate_system(CoordinateSystem cs) {
   if (cs == CS_default) {
     cs = get_default_coordinate_system();
   }
+  if (_coordinate_system == cs) {
+    return;
+  }
   _coordinate_system = cs;
 
   // Changing the external coordinate system changes the cs_transform.
@@ -875,14 +870,14 @@ make_geom_munger(const RenderState *state, Thread *current_thread) {
 ////////////////////////////////////////////////////////////////////
 //     Function: GraphicsStateGuardian::compute_distance_to
 //       Access: Public, Virtual
-//  Description: This function may only be called during a render
-//               traversal; it will compute the distance to the
+//  Description: This function will compute the distance to the
 //               indicated point, assumed to be in eye coordinates,
-//               from the camera plane.
+//               from the camera plane.  The point is assumed to be
+//               in the GSG's internal coordinate system.
 ////////////////////////////////////////////////////////////////////
 PN_stdfloat GraphicsStateGuardian::
 compute_distance_to(const LPoint3 &point) const {
-  switch (_coordinate_system) {
+  switch (_internal_coordinate_system) {
   case CS_zup_right:
     return point[1];
 
@@ -898,7 +893,7 @@ compute_distance_to(const LPoint3 &point) const {
   default:
     gsg_cat.error()
       << "Invalid coordinate system in compute_distance_to: "
-      << (int)_coordinate_system << "\n";
+      << (int)_internal_coordinate_system << "\n";
     return 0.0f;
   }
 }
@@ -941,13 +936,13 @@ fetch_specified_value(Shader::ShaderMatSpec &spec, int altered) {
   LVecBase3 v;
 
   if (altered & spec._dep[0]) {
-    const LMatrix4 *t = fetch_specified_part(spec._part[0], spec._arg[0], spec._cache[0]);
+    const LMatrix4 *t = fetch_specified_part(spec._part[0], spec._arg[0], spec._cache[0], spec._index);
     if (t != &spec._cache[0]) {
       spec._cache[0] = *t;
     }
   }
   if (altered & spec._dep[1]) {
-    const LMatrix4 *t = fetch_specified_part(spec._part[1], spec._arg[1], spec._cache[1]);
+    const LMatrix4 *t = fetch_specified_part(spec._part[1], spec._arg[1], spec._cache[1], spec._index);
     if (t != &spec._cache[1]) {
       spec._cache[1] = *t;
     }
@@ -992,8 +987,9 @@ fetch_specified_value(Shader::ShaderMatSpec &spec, int altered) {
 //  Description: See fetch_specified_value
 ////////////////////////////////////////////////////////////////////
 const LMatrix4 *GraphicsStateGuardian::
-fetch_specified_part(Shader::ShaderMatInput part, InternalName *name, LMatrix4 &t) {
-  switch(part) {
+fetch_specified_part(Shader::ShaderMatInput part, InternalName *name,
+                     LMatrix4 &t, int index) {
+  switch (part) {
   case Shader::SMO_identity: {
     return &LMatrix4::ident_mat();
   }
@@ -1041,7 +1037,8 @@ fetch_specified_part(Shader::ShaderMatInput part, InternalName *name, LMatrix4 &
     return &t;
   }
   case Shader::SMO_attr_material: {
-    const MaterialAttrib *target_material = DCAST(MaterialAttrib, _target_rs->get_attrib_def(MaterialAttrib::get_class_slot()));
+    const MaterialAttrib *target_material = (const MaterialAttrib *)
+      _target_rs->get_attrib_def(MaterialAttrib::get_class_slot());
     // Material matrix contains AMBIENT, DIFFUSE, EMISSION, SPECULAR+SHININESS
     if (target_material->is_off()) {
       t = LMatrix4(1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0);
@@ -1060,7 +1057,8 @@ fetch_specified_part(Shader::ShaderMatInput part, InternalName *name, LMatrix4 &
     return &t;
   }
   case Shader::SMO_attr_color: {
-    const ColorAttrib *target_color = DCAST(ColorAttrib, _target_rs->get_attrib_def(ColorAttrib::get_class_slot()));
+    const ColorAttrib *target_color = (const ColorAttrib *)
+      _target_rs->get_attrib_def(ColorAttrib::get_class_slot());
     if (target_color->get_color_type() != ColorAttrib::T_flat) {
       return &LMatrix4::ones_mat();
     }
@@ -1069,7 +1067,8 @@ fetch_specified_part(Shader::ShaderMatInput part, InternalName *name, LMatrix4 &
     return &t;
   }
   case Shader::SMO_attr_colorscale: {
-    const ColorScaleAttrib *target_color = DCAST(ColorScaleAttrib, _target_rs->get_attrib_def(ColorScaleAttrib::get_class_slot()));
+    const ColorScaleAttrib *target_color = (const ColorScaleAttrib *)
+      _target_rs->get_attrib_def(ColorScaleAttrib::get_class_slot());
     if (target_color->is_identity()) {
       return &LMatrix4::ones_mat();
     }
@@ -1078,7 +1077,8 @@ fetch_specified_part(Shader::ShaderMatInput part, InternalName *name, LMatrix4 &
     return &t;
   }
   case Shader::SMO_attr_fog: {
-    const FogAttrib *target_fog = DCAST(FogAttrib, _target_rs->get_attrib_def(FogAttrib::get_class_slot()));
+    const FogAttrib *target_fog = (const FogAttrib *)
+      _target_rs->get_attrib_def(FogAttrib::get_class_slot());
     Fog *fog = target_fog->get_fog();
     if (fog == (Fog*) NULL) {
       return &LMatrix4::ones_mat();
@@ -1089,7 +1089,8 @@ fetch_specified_part(Shader::ShaderMatInput part, InternalName *name, LMatrix4 &
     return &t;
   }
   case Shader::SMO_attr_fogcolor: {
-    const FogAttrib *target_fog = DCAST(FogAttrib, _target_rs->get_attrib_def(FogAttrib::get_class_slot()));
+    const FogAttrib *target_fog = (const FogAttrib *)
+      _target_rs->get_attrib_def(FogAttrib::get_class_slot());
     Fog *fog = target_fog->get_fog();
     if (fog == (Fog*) NULL) {
       return &LMatrix4::ones_mat();
@@ -1167,6 +1168,31 @@ fetch_specified_part(Shader::ShaderMatInput part, InternalName *name, LMatrix4 &
     t = LMatrix4(c[0],c[1],c[2],c[3],s[0],s[1],s[2],s[3],p[0],p[1],p[2],0,d[0],d[1],d[2],cutoff);
     return &t;
   }
+  case Shader::SMO_light_ambient: {
+    LColor cur_ambient_light(0.0f, 0.0f, 0.0f, 0.0f);
+    const LightAttrib *target_light = (const LightAttrib *)
+      _target_rs->get_attrib_def(LightAttrib::get_class_slot());
+
+    int num_on_lights = target_light->get_num_on_lights();
+    if (num_on_lights == 0) {
+      // There are no lights at all.  This means, to follow the fixed-
+      // function model, we pretend there is an all-white ambient light.
+      t.set_row(3, LVecBase4(1, 1, 1, 1));
+    } else {
+      for (int li = 0; li < num_on_lights; li++) {
+        NodePath light = target_light->get_on_light(li);
+        nassertr(!light.is_empty(), &LMatrix4::zeros_mat());
+        Light *light_obj = light.node()->as_light();
+        nassertr(light_obj != (Light *)NULL, &LMatrix4::zeros_mat());
+
+        if (light_obj->get_type() == AmbientLight::get_class_type()) {
+          cur_ambient_light += light_obj->get_color();
+        }
+      }
+      t.set_row(3, cur_ambient_light);
+    }
+    return &t;
+  }
   case Shader::SMO_texmat_x: {
     const TexMatrixAttrib *tma = DCAST(TexMatrixAttrib, _target_rs->get_attrib_def(TexMatrixAttrib::get_class_slot()));
     const TextureAttrib *ta = DCAST(TextureAttrib, _target_rs->get_attrib_def(TextureAttrib::get_class_slot()));
@@ -1198,6 +1224,25 @@ fetch_specified_part(Shader::ShaderMatInput part, InternalName *name, LMatrix4 &
     t = LMatrix4(0,0,0,0,0,0,0,0,0,0,0,0,p[0],p[1],p[2],p[3]);
     return &t;
   }
+  case Shader::SMO_apiview_clipplane_i: {
+    const ClipPlaneAttrib *cpa = DCAST(ClipPlaneAttrib, _target_rs->get_attrib_def(ClipPlaneAttrib::get_class_slot()));
+    if (index >= cpa->get_num_on_planes()) {
+      return &LMatrix4::zeros_mat();
+    }
+
+    const NodePath &plane = cpa->get_on_plane(index);
+    nassertr(!plane.is_empty(), &LMatrix4::zeros_mat());
+    const PlaneNode *plane_node;
+    DCAST_INTO_R(plane_node, plane.node(), &LMatrix4::zeros_mat());
+
+    CPT(TransformState) transform =
+      get_scene()->get_cs_world_transform()->compose(
+        plane.get_transform(_scene_setup->get_scene_root().get_parent()));
+
+    LPlane xformed_plane = plane_node->get_plane() * transform->get_mat();
+    t.set_row(3, xformed_plane);
+    return &t;
+  }
   case Shader::SMO_mat_constant_x: {
     return &_target_shader->get_shader_input_matrix(name, t);
   }
@@ -1330,6 +1375,201 @@ fetch_specified_part(Shader::ShaderMatInput part, InternalName *name, LMatrix4 &
       calc_projection_mat(lens)->get_mat();
     return &t;
   }
+  case Shader::SMO_vec_constant_x_attrib: {
+    // This system is not ideal.  It will be improved in the future.
+    if (_target_shader->has_shader_input(name)) {
+      // There is an input specifying precisely this whole thing, with
+      // dot and all.  Support this, even if only for backward compatibility.
+      const LVecBase4 &data = _target_shader->get_shader_input_vector(name);
+      t = LMatrix4(data[0],data[1],data[2],data[3],
+                   data[0],data[1],data[2],data[3],
+                   data[0],data[1],data[2],data[3],
+                   data[0],data[1],data[2],data[3]);
+      return &t;
+    }
+
+    const NodePath &np = _target_shader->get_shader_input_nodepath(name->get_parent());
+    nassertr(!np.is_empty(), &LMatrix4::ident_mat());
+
+    CPT_InternalName attrib = name->get_basename();
+
+    static const CPT_InternalName IN_ambient("ambient");
+    static const CPT_InternalName IN_diffuse("diffuse");
+    static const CPT_InternalName IN_specular("specular");
+    static const CPT_InternalName IN_position("position");
+    static const CPT_InternalName IN_halfVector("halfVector");
+    static const CPT_InternalName IN_spotDirection("spotDirection");
+    static const CPT_InternalName IN_spotCutoff("spotCutoff");
+    static const CPT_InternalName IN_spotCosCutoff("spotCosCutoff");
+    static const CPT_InternalName IN_spotExponent("spotExponent");
+    static const CPT_InternalName IN_constantAttenuation("constantAttenuation");
+    static const CPT_InternalName IN_linearAttenuation("linearAttenuation");
+    static const CPT_InternalName IN_quadraticAttenuation("quadraticAttenuation");
+
+    if (attrib == IN_ambient) {
+#ifndef NDEBUG
+      Light *light = np.node()->as_light();
+      nassertr(light != (Light *)NULL, &LMatrix4::ident_mat());
+#endif
+      // Lights don't currently have an ambient color in Panda3D.
+      // We still have to support the attribute.
+      t.set_row(3, LColor(0.0f, 0.0f, 0.0f, 1.0f));
+      return &t;
+
+    } else if (attrib == IN_diffuse) {
+      Light *light = np.node()->as_light();
+      nassertr(light != (Light *)NULL, &LMatrix4::ones_mat());
+
+      LColor c = light->get_color();
+      c.componentwise_mult(_light_color_scale);
+      t.set_row(3, c);
+      return &t;
+
+    } else if (attrib == IN_specular) {
+      Light *light = np.node()->as_light();
+      nassertr(light != (Light *)NULL, &LMatrix4::ones_mat());
+      t.set_row(3, light->get_specular_color());
+      return &t;
+
+    } else if (attrib == IN_position) {
+      if (np.node()->is_of_type(DirectionalLight::get_class_type())) {
+        DirectionalLight *light;
+        DCAST_INTO_R(light, np.node(), &LMatrix4::ident_mat());
+
+        CPT(TransformState) transform = np.get_transform(_scene_setup->get_scene_root().get_parent());
+        LVector3 dir = -(light->get_direction() * transform->get_mat());
+        dir *= get_scene()->get_cs_world_transform()->get_mat();
+        t = LMatrix4(0,0,0,0,0,0,0,0,0,0,0,0,dir[0],dir[1],dir[2],0);
+        return &t;
+      } else {
+        LightLensNode *light;
+        DCAST_INTO_R(light, np.node(), &LMatrix4::ident_mat());
+        Lens *lens = light->get_lens();
+        nassertr(lens != (Lens *)NULL, &LMatrix4::ident_mat());
+
+        CPT(TransformState) transform =
+          get_scene()->get_cs_world_transform()->compose(
+            np.get_transform(_scene_setup->get_scene_root().get_parent()));
+
+        const LMatrix4 &light_mat = transform->get_mat();
+        LPoint3 pos = lens->get_nodal_point() * light_mat;
+        t = LMatrix4::translate_mat(pos);
+        return &t;
+      }
+
+    } else if (attrib == IN_halfVector) {
+      if (np.node()->is_of_type(DirectionalLight::get_class_type())) {
+        DirectionalLight *light;
+        DCAST_INTO_R(light, np.node(), &LMatrix4::ident_mat());
+
+        CPT(TransformState) transform = np.get_transform(_scene_setup->get_scene_root().get_parent());
+        LVector3 dir = -(light->get_direction() * transform->get_mat());
+        dir *= get_scene()->get_cs_world_transform()->get_mat();
+        dir.normalize();
+        dir += LVector3(0, 0, 1);
+        dir.normalize();
+        t = LMatrix4(0,0,0,0,0,0,0,0,0,0,0,0,dir[0],dir[1],dir[2],1);
+        return &t;
+      } else {
+        LightLensNode *light;
+        DCAST_INTO_R(light, np.node(), &LMatrix4::ident_mat());
+        Lens *lens = light->get_lens();
+        nassertr(lens != (Lens *)NULL, &LMatrix4::ident_mat());
+
+        CPT(TransformState) transform =
+          get_scene()->get_cs_world_transform()->compose(
+            np.get_transform(_scene_setup->get_scene_root().get_parent()));
+
+        const LMatrix4 &light_mat = transform->get_mat();
+        LPoint3 pos = lens->get_nodal_point() * light_mat;
+        pos.normalize();
+        pos += LVector3(0, 0, 1);
+        pos.normalize();
+        t = LMatrix4(0,0,0,0,0,0,0,0,0,0,0,0,pos[0],pos[1],pos[2],1);
+        return &t;
+      }
+
+    } else if (attrib == IN_spotDirection) {
+      LightLensNode *light;
+      DCAST_INTO_R(light, np.node(), &LMatrix4::ident_mat());
+      Lens *lens = light->get_lens();
+      nassertr(lens != (Lens *)NULL, &LMatrix4::ident_mat());
+
+      CPT(TransformState) transform =
+        get_scene()->get_cs_world_transform()->compose(
+          np.get_transform(_scene_setup->get_scene_root().get_parent()));
+
+      const LMatrix4 &light_mat = transform->get_mat();
+      LVector3 dir = lens->get_view_vector() * light_mat;
+      t.set_row(3, dir);
+      return &t;
+
+    } else if (attrib == IN_spotCutoff) {
+      if (np.node()->is_of_type(Spotlight::get_class_type())) {
+        LightLensNode *light;
+        DCAST_INTO_R(light, np.node(), &LMatrix4::ident_mat());
+        Lens *lens = light->get_lens();
+        nassertr(lens != (Lens *)NULL, &LMatrix4::ident_mat());
+
+        float cutoff = lens->get_hfov() * 0.5f;
+        t.set_row(3, LVecBase4(cutoff));
+        return &t;
+      } else {
+        // Other lights have no cut-off.
+        t.set_row(3, LVecBase4(180));
+        return &t;
+      }
+
+    } else if (attrib == IN_spotCosCutoff) {
+      if (np.node()->is_of_type(Spotlight::get_class_type())) {
+        LightLensNode *light;
+        DCAST_INTO_R(light, np.node(), &LMatrix4::ident_mat());
+        Lens *lens = light->get_lens();
+        nassertr(lens != (Lens *)NULL, &LMatrix4::ident_mat());
+
+        float cutoff = lens->get_hfov() * 0.5f;
+        t.set_row(3, LVecBase4(ccos(deg_2_rad(cutoff))));
+        return &t;
+      } else {
+        // Other lights have no cut-off.
+        t.set_row(3, LVecBase4(-1));
+        return &t;
+      }
+    } else if (attrib == IN_spotExponent) {
+      Light *light = np.node()->as_light();
+      nassertr(light != (Light *)NULL, &LMatrix4::ident_mat());
+
+      t.set_row(3, LVecBase4(light->get_exponent()));
+      return &t;
+
+    } else if (attrib == IN_constantAttenuation) {
+      Light *light = np.node()->as_light();
+      nassertr(light != (Light *)NULL, &LMatrix4::ones_mat());
+
+      t.set_row(3, LVecBase4(light->get_attenuation()[0]));
+      return &t;
+
+    } else if (attrib == IN_linearAttenuation) {
+      Light *light = np.node()->as_light();
+      nassertr(light != (Light *)NULL, &LMatrix4::ident_mat());
+
+      t.set_row(3, LVecBase4(light->get_attenuation()[1]));
+      return &t;
+
+    } else if (attrib == IN_quadraticAttenuation) {
+      Light *light = np.node()->as_light();
+      nassertr(light != (Light *)NULL, &LMatrix4::ident_mat());
+
+      t.set_row(3, LVecBase4(light->get_attenuation()[2]));
+      return &t;
+
+    } else {
+      display_cat.error()
+        << "Shader input requests invalid attribute " << *name
+        << " from node " << np << "\n";
+      return &LMatrix4::ident_mat();
+    }
+  }
   default:
     nassertr(false /*should never get here*/, &LMatrix4::ident_mat());
     return &LMatrix4::ident_mat();
@@ -2074,8 +2314,12 @@ get_render_buffer(int buffer_type, const FrameBufferProperties &prop) {
 ////////////////////////////////////////////////////////////////////
 CPT(TransformState) GraphicsStateGuardian::
 get_cs_transform_for(CoordinateSystem cs) const {
-  if (_internal_coordinate_system == CS_default ||
-      _internal_coordinate_system == cs) {
+  if (_coordinate_system == cs) {
+    // We've already calculated this.
+    return _cs_transform;
+
+  } else if (_internal_coordinate_system == CS_default ||
+             _internal_coordinate_system == cs) {
     return TransformState::make_identity();
 
   } else {
@@ -2111,7 +2355,9 @@ do_issue_clip_plane() {
   int num_enabled = 0;
   int num_on_planes = 0;
 
-  const ClipPlaneAttrib *target_clip_plane = DCAST(ClipPlaneAttrib, _target_rs->get_attrib_def(ClipPlaneAttrib::get_class_slot()));
+  const ClipPlaneAttrib *target_clip_plane = (const ClipPlaneAttrib *)
+    _target_rs->get_attrib_def(ClipPlaneAttrib::get_class_slot());
+
   if (target_clip_plane != (ClipPlaneAttrib *)NULL) {
     CPT(ClipPlaneAttrib) new_plane = target_clip_plane->filter_to_max(_max_clip_planes);
 
@@ -2171,7 +2417,9 @@ do_issue_clip_plane() {
 ////////////////////////////////////////////////////////////////////
 void GraphicsStateGuardian::
 do_issue_color() {
-  const ColorAttrib *target_color = DCAST(ColorAttrib, _target_rs->get_attrib_def(ColorAttrib::get_class_slot()));
+  const ColorAttrib *target_color = (const ColorAttrib *)
+    _target_rs->get_attrib_def(ColorAttrib::get_class_slot());
+
   switch (target_color->get_color_type()) {
   case ColorAttrib::T_flat:
     // Color attribute flat: it specifies a scene graph color that
@@ -2219,7 +2467,9 @@ do_issue_color_scale() {
     _state_mask.clear_bit(TextureAttrib::get_class_slot());
   }
 
-  const ColorScaleAttrib *target_color_scale = DCAST(ColorScaleAttrib, _target_rs->get_attrib_def(ColorScaleAttrib::get_class_slot()));
+  const ColorScaleAttrib *target_color_scale = (const ColorScaleAttrib *)
+    _target_rs->get_attrib_def(ColorScaleAttrib::get_class_slot());
+
   _color_scale_enabled = target_color_scale->has_scale();
   _current_color_scale = target_color_scale->get_scale();
   _has_texture_alpha_scale = false;
@@ -2278,7 +2528,9 @@ do_issue_light() {
   int num_enabled = 0;
   int num_on_lights = 0;
 
-  const LightAttrib *target_light = DCAST(LightAttrib, _target_rs->get_attrib_def(LightAttrib::get_class_slot()));
+  const LightAttrib *target_light = (const LightAttrib *)
+    _target_rs->get_attrib_def(LightAttrib::get_class_slot());
+
   if (display_cat.is_spam()) {
     display_cat.spam()
       << "do_issue_light: " << target_light << "\n";
@@ -2639,8 +2891,10 @@ end_bind_clip_planes() {
 ////////////////////////////////////////////////////////////////////
 void GraphicsStateGuardian::
 determine_target_texture() {
-  const TextureAttrib *target_texture = DCAST(TextureAttrib, _target_rs->get_attrib_def(TextureAttrib::get_class_slot()));
-  const TexGenAttrib *target_tex_gen = DCAST(TexGenAttrib, _target_rs->get_attrib_def(TexGenAttrib::get_class_slot()));
+  const TextureAttrib *target_texture = (const TextureAttrib *)
+    _target_rs->get_attrib_def(TextureAttrib::get_class_slot());
+  const TexGenAttrib *target_tex_gen = (const TexGenAttrib *)
+    _target_rs->get_attrib_def(TexGenAttrib::get_class_slot());
 
   nassertv(target_texture != (TextureAttrib *)NULL &&
            target_tex_gen != (TexGenAttrib *)NULL);
@@ -2710,6 +2964,13 @@ close_gsg() {
   Thread *current_thread = Thread::get_current_thread();
   _prepared_objects->begin_frame(this, current_thread);
   _prepared_objects->end_frame(current_thread);
+
+  // We have to clear the list of timer queries, though, otherwise
+  // their destructors will cause a crash when they try to access
+  // the GSG object.
+#ifdef DO_PSTATS
+  _pending_timer_queries.clear();
+#endif
 }
 
 ////////////////////////////////////////////////////////////////////
@@ -2951,6 +3212,18 @@ make_shadow_buffer(const NodePath &light_np, GraphicsOutputBase *host) {
   return tex;
 }
 
+////////////////////////////////////////////////////////////////////
+//     Function: GraphicsStateGuardian::has_extension
+//       Access: Public, Virtual
+//  Description: Returns true if the GSG implements the extension
+//               identified by the given string.  This currently
+//               is only implemented by the OpenGL back-end.
+////////////////////////////////////////////////////////////////////
+bool GraphicsStateGuardian::
+has_extension(const string &extension) const {
+  return false;
+}
+
 ////////////////////////////////////////////////////////////////////
 //     Function: GraphicsStateGuardian::get_driver_vendor
 //       Access: Public, Virtual
diff --git a/panda/src/display/graphicsStateGuardian.h b/panda/src/display/graphicsStateGuardian.h
index 32a3e863c0..b546a61945 100644
--- a/panda/src/display/graphicsStateGuardian.h
+++ b/panda/src/display/graphicsStateGuardian.h
@@ -49,10 +49,10 @@
 #include "shaderAttrib.h"
 #include "texGenAttrib.h"
 #include "textureAttrib.h"
+#include "shaderGenerator.h"
 
 class DrawableRegion;
 class GraphicsEngine;
-class ShaderGenerator;
 
 ////////////////////////////////////////////////////////////////////
 //       Class : GraphicsStateGuardian
@@ -104,6 +104,9 @@ PUBLISHED:
   INLINE void set_loader(Loader *loader);
   INLINE Loader *get_loader() const;
 
+  INLINE void set_shader_generator(ShaderGenerator *shader_generator);
+  INLINE ShaderGenerator *get_shader_generator() const;
+
   INLINE GraphicsPipe *get_pipe() const;
   GraphicsEngine *get_engine() const;
   INLINE const GraphicsThreadingModel &get_threading_model() const;
@@ -198,6 +201,7 @@ PUBLISHED:
 #endif
 
 PUBLISHED:
+  virtual bool has_extension(const string &extension) const;
 
   virtual string get_driver_vendor();
   virtual string get_driver_renderer();
@@ -251,7 +255,8 @@ public:
   virtual void clear(DrawableRegion *clearable);
 
   const LMatrix4 *fetch_specified_value(Shader::ShaderMatSpec &spec, int altered);
-  const LMatrix4 *fetch_specified_part(Shader::ShaderMatInput input, InternalName *name, LMatrix4 &t);
+  const LMatrix4 *fetch_specified_part(Shader::ShaderMatInput input, InternalName *name,
+                                       LMatrix4 &t, int index);
   const Shader::ShaderPtrData *fetch_ptr_parameter(const Shader::ShaderPtrSpec& spec);
 
   virtual void prepare_display_region(DisplayRegionPipelineReader *dr);
@@ -546,7 +551,7 @@ protected:
   PN_stdfloat _gamma;
   Texture::QualityLevel _texture_quality_override;
 
-  ShaderGenerator* _shader_generator;
+  PT(ShaderGenerator) _shader_generator;
 
 #ifndef NDEBUG
   PT(Texture) _flash_texture;
diff --git a/panda/src/display/graphicsStateGuardian_ext.cxx b/panda/src/display/graphicsStateGuardian_ext.cxx
index 2f1c2d916e..53407f500f 100644
--- a/panda/src/display/graphicsStateGuardian_ext.cxx
+++ b/panda/src/display/graphicsStateGuardian_ext.cxx
@@ -18,7 +18,7 @@
 #ifdef HAVE_PYTHON
 
 #ifndef CPPPARSER
-IMPORT_THIS struct Dtool_PyTypedObject Dtool_Texture;
+extern struct Dtool_PyTypedObject Dtool_Texture;
 #endif
 
 static bool traverse_callback(TextureContext *tc, void *data) {
diff --git a/panda/src/display/graphicsWindowProc.h b/panda/src/display/graphicsWindowProc.h
index 88df028bfd..f8b8551d83 100644
--- a/panda/src/display/graphicsWindowProc.h
+++ b/panda/src/display/graphicsWindowProc.h
@@ -12,7 +12,6 @@
 //
 ////////////////////////////////////////////////////////////////////
 
-
 #ifndef GRAPHICSWINDOWPROC_H
 #define GRAPHICSWINDOWPROC_H
 
@@ -25,18 +24,21 @@
 #include <windows.h>
 #endif
 
+class GraphicsWindow;
+
 ////////////////////////////////////////////////////////////////////
 //       Class : GraphicsWindowProc
 // Description : Defines an interface for storing platform-specific
 //               window processor methods.
 ////////////////////////////////////////////////////////////////////
-class GraphicsWindowProc{
+class EXPCL_PANDA_DISPLAY GraphicsWindowProc {
 public:
   GraphicsWindowProc();
 #if defined(__WIN32__) || defined(_WIN32)
-  virtual LONG wnd_proc(GraphicsWindow* graphicsWindow, HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam);
+  virtual LONG wnd_proc(GraphicsWindow* graphicsWindow, HWND hwnd,
+                        UINT msg, WPARAM wparam, LPARAM lparam);
 #endif
   //purely virtual class
 };
 
-#endif //GRAPHICSWINDOWPROC_H
+#endif  // GRAPHICSWINDOWPROC_H
diff --git a/panda/src/display/p3display_composite2.cxx b/panda/src/display/p3display_composite2.cxx
index 4d613bb588..66abd308d0 100644
--- a/panda/src/display/p3display_composite2.cxx
+++ b/panda/src/display/p3display_composite2.cxx
@@ -4,9 +4,6 @@
 #include "graphicsWindow.cxx"
 #include "graphicsWindowProc.cxx"
 #include "graphicsWindowProcCallbackData.cxx"
-#ifdef HAVE_PYTHON
-#include "pythonGraphicsWindowProc.cxx"
-#endif
 #include "graphicsWindowInputDevice.cxx"
 #include "lru.cxx"
 #include "nativeWindowHandle.cxx"
diff --git a/panda/src/display/pythonGraphicsWindowProc.cxx b/panda/src/display/pythonGraphicsWindowProc.cxx
index 0037641a50..4e829d5c59 100644
--- a/panda/src/display/pythonGraphicsWindowProc.cxx
+++ b/panda/src/display/pythonGraphicsWindowProc.cxx
@@ -15,6 +15,8 @@
 #include "pythonGraphicsWindowProc.h"
 #include "graphicsWindowProcCallbackData.h"
 
+#ifdef HAVE_PYTHON
+
 TypeHandle PythonGraphicsWindowProc::_type_handle;
 
 ////////////////////////////////////////////////////////////////////
@@ -72,3 +74,5 @@ PyObject* PythonGraphicsWindowProc::
 get_name(){
   return _name;
 }
+
+#endif  // HAVE_PYTHON
diff --git a/panda/src/display/pythonGraphicsWindowProc.h b/panda/src/display/pythonGraphicsWindowProc.h
index 6ce1c7c5be..5160ca6372 100644
--- a/panda/src/display/pythonGraphicsWindowProc.h
+++ b/panda/src/display/pythonGraphicsWindowProc.h
@@ -19,25 +19,29 @@
 #include "graphicsWindowProc.h"
 #include "pythonCallbackObject.h"
 
+#ifdef HAVE_PYTHON
+
 ////////////////////////////////////////////////////////////////////
 //       Class : PythonGraphicsWindowProc
 // Description : Extends GraphicsWindowProc to provde callback functionality
 //               to a python program.
 ////////////////////////////////////////////////////////////////////
-class PythonGraphicsWindowProc: public GraphicsWindowProc, public PythonCallbackObject{
+class PythonGraphicsWindowProc: public GraphicsWindowProc,
+                                public PythonCallbackObject {
 public:
   PythonGraphicsWindowProc(PyObject *function, PyObject* name);
   virtual ~PythonGraphicsWindowProc();
   ALLOC_DELETED_CHAIN(PythonGraphicsWindowProc);
 
 #ifdef WIN32
-  virtual LONG wnd_proc(GraphicsWindow* graphicsWindow, HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam);
+  virtual LONG wnd_proc(GraphicsWindow* graphicsWindow, HWND hwnd,
+                        UINT msg, WPARAM wparam, LPARAM lparam);
 #endif
 
-  PyObject* get_name();
+  PyObject *get_name();
 
 private:
-  PyObject* _name;
+  PyObject *_name;
 
 public:
   static TypeHandle get_class_type() {
@@ -57,4 +61,6 @@ private:
   static TypeHandle _type_handle;
 };
 
-#endif //PYTHONGRAPHICSWINDOWPROC_H
+#endif  // HAVE_PYTHON
+
+#endif  // PYTHONGRAPHICSWINDOWPROC_H
diff --git a/panda/src/display/standardMunger.cxx b/panda/src/display/standardMunger.cxx
index 35c6231cd5..922150a114 100644
--- a/panda/src/display/standardMunger.cxx
+++ b/panda/src/display/standardMunger.cxx
@@ -43,15 +43,18 @@ StandardMunger(GraphicsStateGuardianBase *gsg, const RenderState *state,
 
   _munge_color = false;
   _munge_color_scale = false;
+  _auto_shader = false;
 
   if (!get_gsg()->get_runtime_color_scale()) {
     // We might need to munge the colors.
-    CPT(ColorAttrib) color_attrib = DCAST(ColorAttrib, state->get_attrib(ColorAttrib::get_class_slot()));
-    CPT(ColorScaleAttrib) color_scale_attrib = DCAST(ColorScaleAttrib, state->get_attrib(ColorScaleAttrib::get_class_slot()));
+    const ColorAttrib *color_attrib = (const ColorAttrib *)
+      state->get_attrib(ColorAttrib::get_class_slot());
+    const ColorScaleAttrib *color_scale_attrib = (const ColorScaleAttrib *)
+      state->get_attrib(ColorScaleAttrib::get_class_slot());
 
     if (color_attrib != (ColorAttrib *)NULL && 
         color_attrib->get_color_type() == ColorAttrib::T_flat) {
-      
+
       if (!get_gsg()->get_color_scale_via_lighting()) {
         // We only need to munge the color directly if the GSG says it
         // can't cheat the color via lighting (presumably, in this case,
@@ -72,15 +75,16 @@ StandardMunger(GraphicsStateGuardianBase *gsg, const RenderState *state,
                color_scale_attrib->has_scale()) {
       _color_scale = color_scale_attrib->get_scale();
       
-      CPT(TextureAttrib) tex_attrib = DCAST(TextureAttrib, state->get_attrib(TextureAttrib::get_class_slot()));
-      
+      const TextureAttrib *tex_attrib = (const TextureAttrib *)
+        state->get_attrib(TextureAttrib::get_class_slot());
+
       // If the GSG says it can't cheat this RGB or alpha scale, we have
       // to apply the color scale directly.
       if ((color_scale_attrib->has_rgb_scale() && !get_gsg()->get_color_scale_via_lighting()) ||
           (color_scale_attrib->has_alpha_scale() && !get_gsg()->get_alpha_scale_via_texture(tex_attrib))) {
         _munge_color_scale = true;
       }
-      
+
       // Known bug: if there is a material on an object that would
       // obscure the effect of color_scale, we scale the lighting
       // anyway, thus applying the effect even if it should be obscured.
@@ -88,6 +92,12 @@ StandardMunger(GraphicsStateGuardianBase *gsg, const RenderState *state,
       // situation and handle it correctly.
     }
   }
+
+  const ShaderAttrib *shader_attrib = (const ShaderAttrib *)
+    state->get_attrib_def(ShaderAttrib::get_class_slot());
+  if (shader_attrib->auto_shader()) {
+    _auto_shader = true;
+  }
 }
 
 ////////////////////////////////////////////////////////////////////
@@ -297,6 +307,10 @@ compare_to_impl(const GeomMunger *other) const {
     }
   }
 
+  if (_auto_shader != om->_auto_shader) {
+    return (int)_auto_shader - (int)om->_auto_shader;
+  }
+
   return StateMunger::compare_to_impl(other);
 }
 
@@ -351,5 +365,20 @@ munge_state_impl(const RenderState *state) {
     munged_state = munged_state->remove_attrib(ColorScaleAttrib::get_class_slot());
   }
 
+  if (_auto_shader) {
+    CPT(RenderState) shader_state = munged_state->get_auto_shader_state();
+    ShaderGenerator *shader_generator = get_gsg()->get_shader_generator();
+    if (shader_generator == NULL) {
+      pgraph_cat.error()
+        << "auto_shader enabled, but GSG has no shader generator assigned!\n";
+      return munged_state;
+    }
+    if (shader_state->_generated_shader == NULL) {
+      // Cache the generated ShaderAttrib on the shader state.
+      shader_state->_generated_shader = shader_generator->synthesize_shader(shader_state);
+    }
+    munged_state = munged_state->set_attrib(shader_state->_generated_shader);
+  }
+
   return munged_state;
 }
diff --git a/panda/src/display/standardMunger.h b/panda/src/display/standardMunger.h
index 9b432da718..1e2b8ef024 100644
--- a/panda/src/display/standardMunger.h
+++ b/panda/src/display/standardMunger.h
@@ -57,6 +57,7 @@ private:
 
   bool _munge_color;
   bool _munge_color_scale;
+  bool _auto_shader;
 
   LColor _color;
   LVecBase4 _color_scale;
diff --git a/panda/src/downloader/httpAuthorization.h b/panda/src/downloader/httpAuthorization.h
index 95461b0771..dd27c23c95 100644
--- a/panda/src/downloader/httpAuthorization.h
+++ b/panda/src/downloader/httpAuthorization.h
@@ -35,12 +35,8 @@ class URLSpec;
 //               authorization requests in the past, which can
 //               possibly be re-used for future requests to the same
 //               server.
-//
-//               This class does not need to be exported from the DLL
-//               because it has no public interface; it is simply a
-//               helper class for HTTPChannel.
 ////////////////////////////////////////////////////////////////////
-class HTTPAuthorization : public ReferenceCount {
+class EXPCL_PANDAEXPRESS HTTPAuthorization : public ReferenceCount {
 public:
   typedef pmap<string, string> Tokens;
   typedef pmap<string, Tokens> AuthenticationSchemes;
diff --git a/panda/src/dxgsg8/Sources.pp b/panda/src/dxgsg8/Sources.pp
deleted file mode 100644
index 515ad29c6f..0000000000
--- a/panda/src/dxgsg8/Sources.pp
+++ /dev/null
@@ -1,42 +0,0 @@
-#define BUILD_DIRECTORY $[HAVE_DX8]
-
-#define OTHER_LIBS \
-   p3interrogatedb:c p3dconfig:c p3dtoolconfig:m \
-   p3dtoolutil:c p3dtoolbase:c p3dtool:m
-   
-#define USE_PACKAGES dx8
-
-#begin lib_target
-  #define TARGET p3dxgsg8
-  #define LOCAL_LIBS \
-    p3gsgbase p3gobj p3display p3windisplay \
-    p3putil p3linmath p3mathutil p3pnmimage p3event
-    
-  #define COMBINED_SOURCES $[TARGET]_composite1.cxx     
-
-  // build dxGraphicsStateGuardian separately since its so big
-  
-  #define SOURCES \
-    dxGraphicsStateGuardian8.cxx \
-    dxGraphicsDevice8.h \
-    wdxGraphicsPipe8.I wdxGraphicsPipe8.h \
-    wdxGraphicsWindow8.I wdxGraphicsWindow8.h \
-    dxgsg8base.h config_dxgsg8.h dxGraphicsStateGuardian8.I dxGraphicsStateGuardian8.h \
-    dxVertexBufferContext8.h dxVertexBufferContext8.I \
-    dxIndexBufferContext8.h dxIndexBufferContext8.I \
-    dxTextureContext8.h dxTextureContext8.I \
-    dxGeomMunger8.h dxGeomMunger8.I \
-    dxGraphicsDevice8.h
-    
-  #define INCLUDED_SOURCES \
-    config_dxgsg8.cxx \
-    dxVertexBufferContext8.cxx \
-    dxIndexBufferContext8.cxx \
-    dxTextureContext8.cxx \
-    dxGeomMunger8.cxx \
-    dxGraphicsDevice8.cxx \
-    wdxGraphicsPipe8.cxx \
-    wdxGraphicsWindow8.cxx \
-    wdxGraphicsBuffer8.cxx
-
-#end lib_target
diff --git a/panda/src/dxgsg8/config_dxgsg8.cxx b/panda/src/dxgsg8/config_dxgsg8.cxx
deleted file mode 100644
index 8f93af0a0c..0000000000
--- a/panda/src/dxgsg8/config_dxgsg8.cxx
+++ /dev/null
@@ -1,155 +0,0 @@
-// Filename: config_dxgsg8.cxx
-// Created by:  drose (06Oct99)
-//
-////////////////////////////////////////////////////////////////////
-//
-// 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 "config_dxgsg8.h"
-#include "dxGraphicsStateGuardian8.h"
-#include "dxTextureContext8.h"
-#include "dxVertexBufferContext8.h"
-#include "dxIndexBufferContext8.h"
-#include "dxGeomMunger8.h"
-#include "graphicsPipeSelection.h"
-#include "wdxGraphicsWindow8.h"
-#include "wdxGraphicsPipe8.h"
-#include "pandaSystem.h"
-
-#include "dconfig.h"
-
-Configure(config_dxgsg8);
-NotifyCategoryDef(dxgsg8, ":display:gsg");
-NotifyCategoryDef(wdxdisplay8, "display");
-
-// Configure this variable true to cause the DXGSG to show each
-// transform space it renders by drawing a little unit axis.  This
-// cannot be enabled when the player is compiled in NDEBUG mode.
-ConfigVariableBool dx_show_transforms
-("dx-show-transforms", false);
-
-// Set Level of MultiSampling to be used, if HW supports it.  Valid values are 2-16.
-ConfigVariableInt dx_multisample_antialiasing_level
-("dx-multisample-antialiasing-level", 0);
-
-// if true, if card only supports per-vertex fog, it will be treated as no-HW fog capability
-ConfigVariableBool dx_no_vertex_fog
-("dx-no-vertex-fog", false);
-
-// if true, overwrite cursor bitmap tip with "D3D" to distinguish it from GDI cursor 
-ConfigVariableBool dx_show_cursor_watermark
-("dx-show-cursor-watermark", 
-#ifdef _DEBUG
-    true
-#else
-    false
-#endif
-    );
-
-// if true, triangle filter will be used to generate mipmap levels instead of default box filter
-ConfigVariableBool dx_use_triangle_mipgen_filter
-("dx-use-triangle-mipgen-filter", false);
-
-ConfigVariableBool dx_broken_max_index
-("dx-broken-max-index", false,
- PRC_DESC("Configure this true if you have a buggy graphics driver that "
-          "doesn't correctly implement the third parameter, NumVertices, "
-          "of DrawIndexedPrimitive().  In particular, the NVIDIA Quadro "
-          "driver version 6.14.10.7184 seems to treat this as a maximum "
-          "vertex index, rather than a delta between the maximum and "
-          "minimum vertex index.  Turn this on if you are seeing stray "
-          "triangles, or you are not seeing all of your triangles.  Enabling "
-          "this should work around this bug, at the cost of some additional "
-          "rendering overhead on the GPU."));
-
-#ifndef NDEBUG
-// debugging flag
-// values are same as D3DCULL enumtype, 0 - no force, 1 - force none, 2 - force CW, 3 - force CCW
-ConfigVariableInt dx_force_backface_culling
-("dx-force-backface-culling", 0);
-#endif
-
-ConfigVariableBool dx_mipmap_everything
-("dx-mipmap-everything", false);
-ConfigVariableBool dx_ignore_mipmaps
-("dx-ignore-mipmaps", false);
-
-// if this is set, more accurate but more expensive fog computations are performed
-ConfigVariableBool dx_use_rangebased_fog
-("dx-use-rangebased-fog", false);
-ConfigVariableBool dx_no_dithering
-("dx-no-dithering", false);
-ConfigVariableBool dx_force_16bpp_zbuffer
-("dx-force-16bpp-zbuffer", false);
-ConfigVariableBool dx_do_vidmemsize_check
-("do-vidmemsize-check", true);
-// Setting this true theoretically hinders render performance, because
-// it forces the FPU to go through some extra work to clean itself up
-// after rendering a frame, but the performance cost seems to be
-// small.  On the other hand, setting it false can force the
-// application to run in single-precision arithmetic mode, even if
-// it believes it is using double-precision variables.
-ConfigVariableBool dx_preserve_fpu_state
-("dx-preserve-fpu-state", true);
-
-ConfigVariableInt dx_preferred_device_id
-("dx-preferred-device-id", -1);
-
-#ifdef _DEBUG
-ConfigVariableDouble dx_global_miplevel_bias
-("dx-global-miplevel-bias", 0.0);
-ConfigVariableBool dx_debug_view_mipmaps
-("dx-debug-view-mipmaps", false);
-#endif
-
-ConfigVariableBool dx_force_anisotropic_filtering
-("dx-force-anisotropic-filtering", false);
-
-// set 'retained-mode #t' and this to have prepare_geom concatenate all tristrips within a geom 
-// together using degenerate tris
-ConfigVariableBool link_tristrips
-("link-tristrips", false);
-
-ConfigureFn(config_dxgsg8) {
-  init_libdxgsg8();
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: init_libdxgsg
-//  Description: 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_libdxgsg8() {
-  static bool initialized = false;
-  if (initialized) {
-    return;
-  }
-  initialized = true;
-
-  DXGraphicsStateGuardian8::init_type();
-  DXTextureContext8::init_type();
-  DXVertexBufferContext8::init_type();
-  DXIndexBufferContext8::init_type();
-  DXGeomMunger8::init_type();
-
-  wdxGraphicsPipe8::init_type();
-  wdxGraphicsWindow8::init_type();
-
-  GraphicsPipeSelection *selection = GraphicsPipeSelection::get_global_ptr();
-  selection->add_pipe_type(wdxGraphicsPipe8::get_class_type(),
-                           wdxGraphicsPipe8::pipe_constructor);
-
-  PandaSystem *ps = PandaSystem::get_global_ptr();
-  ps->add_system("DirectX8");
-}
diff --git a/panda/src/dxgsg8/config_dxgsg8.h b/panda/src/dxgsg8/config_dxgsg8.h
deleted file mode 100644
index 8980c1c75b..0000000000
--- a/panda/src/dxgsg8/config_dxgsg8.h
+++ /dev/null
@@ -1,60 +0,0 @@
-// Filename: config_dxgsg.h
-// Created by:  drose (06Oct99)
-//
-////////////////////////////////////////////////////////////////////
-//
-// 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 CONFIG_DXGSG8_H
-#define CONFIG_DXGSG8_H
-
-#include "pandabase.h"
-#include "notifyCategoryProxy.h"
-#include "dxgsg8base.h"
-#include "configVariableBool.h"
-#include "configVariableInt.h"
-#include "configVariableDouble.h"
-
-NotifyCategoryDecl(dxgsg8, EXPCL_PANDADX, EXPTP_PANDADX);
-NotifyCategoryDecl(wdxdisplay8, EXPCL_PANDADX, EXPTP_PANDADX);
-
-extern ConfigVariableBool dx_no_vertex_fog;
-extern ConfigVariableBool dx_show_cursor_watermark;
-extern ConfigVariableBool dx_full_screen_antialiasing;
-extern ConfigVariableBool dx_use_rangebased_fog;
-extern ConfigVariableBool link_tristrips;
-extern ConfigVariableInt dx_multisample_antialiasing_level;
-extern ConfigVariableBool dx_use_triangle_mipgen_filter;
-extern ConfigVariableBool dx_broken_max_index;
-
-
-// debug flags we might want to use in full optimized build
-extern ConfigVariableBool dx_ignore_mipmaps;
-extern ConfigVariableBool dx_mipmap_everything;
-extern ConfigVariableBool dx_show_transforms;
-extern ConfigVariableBool dx_no_dithering;
-extern ConfigVariableBool dx_force_anisotropic_filtering;
-extern ConfigVariableBool dx_force_16bpp_zbuffer;
-extern ConfigVariableBool dx_do_vidmemsize_check;
-extern ConfigVariableBool dx_preserve_fpu_state;
-extern ConfigVariableInt dx_preferred_device_id;
-
-#ifndef NDEBUG
-extern ConfigVariableInt dx_force_backface_culling;
-#endif
-
-#ifdef _DEBUG
-extern ConfigVariableDouble dx_global_miplevel_bias;
-extern ConfigVariableBool dx_debug_view_mipmaps;
-#endif
-
-extern EXPCL_PANDADX void init_libdxgsg8();
-
-#endif
diff --git a/panda/src/dxgsg8/dxGeomMunger8.I b/panda/src/dxgsg8/dxGeomMunger8.I
deleted file mode 100644
index b0a3911417..0000000000
--- a/panda/src/dxgsg8/dxGeomMunger8.I
+++ /dev/null
@@ -1,40 +0,0 @@
-// Filename: dxGeomMunger8.I
-// Created by:  drose (11Mar05)
-//
-////////////////////////////////////////////////////////////////////
-//
-// 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."
-//
-////////////////////////////////////////////////////////////////////
-
-
-////////////////////////////////////////////////////////////////////
-//     Function: DXGeomMunger8::Constructor
-//       Access: Public
-//  Description:
-////////////////////////////////////////////////////////////////////
-INLINE DXGeomMunger8::
-DXGeomMunger8(GraphicsStateGuardian *gsg, const RenderState *state) :
-  StandardMunger(gsg, state, 1, NT_packed_dabc, C_color),
-  _texture(DCAST(TextureAttrib, state->get_attrib(TextureAttrib::get_class_slot()))),
-  _tex_gen(DCAST(TexGenAttrib, state->get_attrib(TexGenAttrib::get_class_slot())))
-{
-  _filtered_texture = (TextureAttrib *)NULL;
-  _reffed_filtered_texture = false;
-  if (_texture != (TextureAttrib *)NULL) {
-    _filtered_texture = _texture->filter_to_max(gsg->get_max_texture_stages());
-    if (_filtered_texture != _texture) {
-      _filtered_texture->ref();
-      _reffed_filtered_texture = true;
-    }
-  }
-  // Set a callback to unregister ourselves when either the Texture or
-  // the TexGen object gets deleted.
-  _texture.set_callback(this);
-  _tex_gen.set_callback(this);
-}
diff --git a/panda/src/dxgsg8/dxGeomMunger8.cxx b/panda/src/dxgsg8/dxGeomMunger8.cxx
deleted file mode 100644
index 4037a34865..0000000000
--- a/panda/src/dxgsg8/dxGeomMunger8.cxx
+++ /dev/null
@@ -1,322 +0,0 @@
-// Filename: dxGeomMunger8.cxx
-// Created by:  drose (11Mar05)
-//
-////////////////////////////////////////////////////////////////////
-//
-// 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 "dxGeomMunger8.h"
-#include "geomVertexReader.h"
-#include "geomVertexWriter.h"
-#include "config_dxgsg8.h"
-
-GeomMunger *DXGeomMunger8::_deleted_chain = NULL;
-TypeHandle DXGeomMunger8::_type_handle;
-
-////////////////////////////////////////////////////////////////////
-//     Function: DXGeomMunger8::Destructor
-//       Access: Public, Virtual
-//  Description: 
-////////////////////////////////////////////////////////////////////
-DXGeomMunger8::
-~DXGeomMunger8() {
-  if (_reffed_filtered_texture) {
-    unref_delete(_filtered_texture);
-    _reffed_filtered_texture = false;
-  }
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: DXGeomMunger8::wp_callback
-//       Access: Public, Virtual
-//  Description: This callback is set to be made whenever the
-//               associated _texture or _tex_gen attributes are
-//               destructed, in which case the GeomMunger is invalid
-//               and should no longer be used.
-////////////////////////////////////////////////////////////////////
-void DXGeomMunger8::
-wp_callback(void *) {
-  unregister_myself();
-
-  if (_reffed_filtered_texture) {
-    unref_delete(_filtered_texture);
-    _reffed_filtered_texture = false;
-  }
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: DXGeomMunger8::munge_format_impl
-//       Access: Protected, Virtual
-//  Description: Given a source GeomVertexFormat, converts it if
-//               necessary to the appropriate format for rendering.
-////////////////////////////////////////////////////////////////////
-CPT(GeomVertexFormat) DXGeomMunger8::
-munge_format_impl(const GeomVertexFormat *orig,
-                  const GeomVertexAnimationSpec &animation) {
-  if (dxgsg8_cat.is_debug()) {
-    if (animation.get_animation_type() != AT_none) {
-      dxgsg8_cat.debug()
-        << "preparing animation type " << animation << " for " << *orig
-        << "\n";
-    }
-  }
-  // We have to build a completely new format that includes only the
-  // appropriate components, in the appropriate order, in just one
-  // array.
-  PT(GeomVertexFormat) new_format = new GeomVertexFormat(*orig);
-  new_format->set_animation(animation);
-  PT(GeomVertexArrayFormat) new_array_format = new GeomVertexArrayFormat;
-
-  const GeomVertexColumn *vertex_type = orig->get_vertex_column();
-  const GeomVertexColumn *normal_type = orig->get_normal_column(); 
-  const GeomVertexColumn *color_type = orig->get_color_column();
-
-  if (vertex_type != (const GeomVertexColumn *)NULL) {
-    new_array_format->add_column
-      (InternalName::get_vertex(), 3, NT_float32,
-       vertex_type->get_contents());
-    new_format->remove_column(vertex_type->get_name());
-
-  } else {
-    // If we don't have a vertex type, not much we can do.
-    return orig;
-  }
-
-  if (animation.get_animation_type() == AT_hardware &&
-      animation.get_num_transforms() > 0) {
-    if (animation.get_num_transforms() > 1) {
-      // If we want hardware animation, we need to reserve space for the
-      // blend weights.
-      new_array_format->add_column
-        (InternalName::get_transform_weight(), animation.get_num_transforms() - 1,
-         NT_float32, C_other);
-    }
-      
-    if (animation.get_indexed_transforms()) {
-      // Also, if we'll be indexing into the transform table, reserve
-      // space for the index.
-      new_array_format->add_column
-        (InternalName::get_transform_index(), 1,
-         NT_packed_dcba, C_index);
-    }                                    
-
-    // Make sure the old weights and indices are removed, just in
-    // case.
-    new_format->remove_column(InternalName::get_transform_weight());
-    new_format->remove_column(InternalName::get_transform_index());
-
-    // And we don't need the transform_blend table any more.
-    new_format->remove_column(InternalName::get_transform_blend());
-  }
-
-  if (normal_type != (const GeomVertexColumn *)NULL) {
-    new_array_format->add_column
-      (InternalName::get_normal(), 3, NT_float32, C_vector);
-    new_format->remove_column(normal_type->get_name());
-  }
-
-  if (color_type != (const GeomVertexColumn *)NULL) {
-    new_array_format->add_column
-      (InternalName::get_color(), 1, NT_packed_dabc, C_color);
-    new_format->remove_column(color_type->get_name());
-  }
-
-  // To support multitexture, we will need to add all of the relevant
-  // texcoord types, and in the order specified by the TextureAttrib.
-
-  // Now set up each of the active texture coordinate stages--or at
-  // least those for which we're not generating texture coordinates
-  // automatically.
-
-  if (_filtered_texture != (TextureAttrib *)NULL) {
-    int num_stages = _filtered_texture->get_num_on_ff_stages();
-    vector_int ff_tc_index(num_stages, 0);
-
-    // Be sure we add the texture coordinates in the right order, as
-    // specified by the attrib.  To ensure this, we first walk through
-    // the stages of the attrib and get the index numbers in the
-    // appropriate order.
-    int si, tc_index;
-    int max_tc_index = -1;
-    for (si = 0; si < num_stages; ++si) {
-      int tc_index = _filtered_texture->get_ff_tc_index(si);
-      nassertr(tc_index < num_stages, orig);
-      ff_tc_index[tc_index] = si;
-      max_tc_index = max(tc_index, max_tc_index);
-    }
-
-    // Now walk through the texture coordinates in the order they will
-    // appear on the final geometry.  For each one, get the texture
-    // coordinate name from the associated stage.
-    for (tc_index = 0; tc_index <= max_tc_index; ++tc_index) {
-      si = ff_tc_index[tc_index];
-      TextureStage *stage = _filtered_texture->get_on_ff_stage(si);
-      InternalName *name = stage->get_texcoord_name();
-
-      const GeomVertexColumn *texcoord_type = orig->get_column(name);
-
-      if (texcoord_type != (const GeomVertexColumn *)NULL) {
-        new_array_format->add_column
-          (name, texcoord_type->get_num_values(), NT_float32, C_texcoord);
-      } else {
-        // We have to add something as a placeholder, even if the
-        // texture coordinates aren't defined.
-        new_array_format->add_column(name, 2, NT_float32, C_texcoord);
-      }
-      new_format->remove_column(name);
-    }
-  }
-
-  // Make sure the FVF-style array we just built up is first in the
-  // list.
-  new_format->insert_array(0, new_array_format);
-
-  return GeomVertexFormat::register_format(new_format);
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: DXGeomMunger8::premunge_format_impl
-//       Access: Protected, Virtual
-//  Description: Given a source GeomVertexFormat, converts it if
-//               necessary to the appropriate format for rendering.
-////////////////////////////////////////////////////////////////////
-CPT(GeomVertexFormat) DXGeomMunger8::
-premunge_format_impl(const GeomVertexFormat *orig) {
-  // We have to build a completely new format that includes only the
-  // appropriate components, in the appropriate order, in just one
-  // array.
-  PT(GeomVertexFormat) new_format = new GeomVertexFormat(*orig);
-  PT(GeomVertexArrayFormat) new_array_format = new GeomVertexArrayFormat;
-
-  const GeomVertexColumn *vertex_type = orig->get_vertex_column();
-  const GeomVertexColumn *normal_type = orig->get_normal_column(); 
-  const GeomVertexColumn *color_type = orig->get_color_column();
-
-  if (vertex_type != (const GeomVertexColumn *)NULL) {
-    new_array_format->add_column
-      (InternalName::get_vertex(), 3, NT_float32,
-       vertex_type->get_contents());
-    new_format->remove_column(vertex_type->get_name());
-
-  } else {
-    // If we don't have a vertex type, not much we can do.
-    return orig;
-  }
-
-  if (normal_type != (const GeomVertexColumn *)NULL) {
-    new_array_format->add_column
-      (InternalName::get_normal(), 3, NT_float32, C_vector);
-    new_format->remove_column(normal_type->get_name());
-  }
-
-  if (color_type != (const GeomVertexColumn *)NULL) {
-    new_array_format->add_column
-      (InternalName::get_color(), 1, NT_packed_dabc, C_color);
-    new_format->remove_column(color_type->get_name());
-  }
-
-  // To support multitexture, we will need to add all of the relevant
-  // texcoord types, and in the order specified by the TextureAttrib.
-
-  // Now set up each of the active texture coordinate stages--or at
-  // least those for which we're not generating texture coordinates
-  // automatically.
-
-  if (_filtered_texture != (TextureAttrib *)NULL) {
-    int num_stages = _filtered_texture->get_num_on_ff_stages();
-    vector_int ff_tc_index(num_stages, 0);
-
-    // Be sure we add the texture coordinates in the right order, as
-    // specified by the attrib.  To ensure this, we first walk through
-    // the stages of the attrib and get the index numbers in the
-    // appropriate order.
-    int si, tc_index;
-    int max_tc_index = -1;
-    for (si = 0; si < num_stages; ++si) {
-      int tc_index = _filtered_texture->get_ff_tc_index(si);
-      nassertr(tc_index < num_stages, orig);
-      ff_tc_index[tc_index] = si;
-      max_tc_index = max(tc_index, max_tc_index);
-    }
-
-    // Now walk through the texture coordinates in the order they will
-    // appear on the final geometry.  For each one, get the texture
-    // coordinate name from the associated stage.
-    for (tc_index = 0; tc_index <= max_tc_index; ++tc_index) {
-      si = ff_tc_index[tc_index];
-      TextureStage *stage = _filtered_texture->get_on_ff_stage(si);
-      InternalName *name = stage->get_texcoord_name();
-
-      const GeomVertexColumn *texcoord_type = orig->get_column(name);
-
-      if (texcoord_type != (const GeomVertexColumn *)NULL) {
-        new_array_format->add_column
-          (name, texcoord_type->get_num_values(), NT_float32, C_texcoord);
-      } else {
-        // We have to add something as a placeholder, even if the
-        // texture coordinates aren't defined.
-        new_array_format->add_column(name, 2, NT_float32, C_texcoord);
-      }
-      new_format->remove_column(name);
-    }
-  }
-
-  // Make sure the FVF-style array we just built up is first in the
-  // list.
-  new_format->insert_array(0, new_array_format);
-
-  return GeomVertexFormat::register_format(new_format);
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: DXGeomMunger8::compare_to_impl
-//       Access: Protected, Virtual
-//  Description: Called to compare two GeomMungers who are known to be
-//               of the same type, for an apples-to-apples comparison.
-//               This will never be called on two pointers of a
-//               different type.
-////////////////////////////////////////////////////////////////////
-int DXGeomMunger8::
-compare_to_impl(const GeomMunger *other) const {
-  const DXGeomMunger8 *om = DCAST(DXGeomMunger8, other);
-  if (_filtered_texture != om->_filtered_texture) {
-    return _filtered_texture < om->_filtered_texture ? -1 : 1;
-  }
-  if (_tex_gen != om->_tex_gen) {
-    return _tex_gen < om->_tex_gen ? -1 : 1;
-  }
-
-  return StandardMunger::compare_to_impl(other);
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: DXGeomMunger8::geom_compare_to_impl
-//       Access: Protected, Virtual
-//  Description: Called to compare two GeomMungers who are known to be
-//               of the same type, for an apples-to-apples comparison.
-//               This will never be called on two pointers of a
-//               different type.
-////////////////////////////////////////////////////////////////////
-int DXGeomMunger8::
-geom_compare_to_impl(const GeomMunger *other) const {
-  // Unlike GLGeomMunger, we do consider _filtered_texture and
-  // _tex_gen important for this purpose, since they control the
-  // number and order of texture coordinates we might put into the
-  // FVF.
-  const DXGeomMunger8 *om = DCAST(DXGeomMunger8, other);
-  if (_filtered_texture != om->_filtered_texture) {
-    return _filtered_texture < om->_filtered_texture ? -1 : 1;
-  }
-  if (_tex_gen != om->_tex_gen) {
-    return _tex_gen < om->_tex_gen ? -1 : 1;
-  }
-
-  return StandardMunger::geom_compare_to_impl(other);
-}
diff --git a/panda/src/dxgsg8/dxGeomMunger8.h b/panda/src/dxgsg8/dxGeomMunger8.h
deleted file mode 100644
index f2edd56eac..0000000000
--- a/panda/src/dxgsg8/dxGeomMunger8.h
+++ /dev/null
@@ -1,82 +0,0 @@
-// Filename: dxGeomMunger8.h
-// Created by:  drose (11Mar05)
-//
-////////////////////////////////////////////////////////////////////
-//
-// 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 DXGEOMMUNGER8_H
-#define DXGEOMMUNGER8_H
-
-#include "pandabase.h"
-#include "standardMunger.h"
-#include "graphicsStateGuardian.h"
-#include "weakPointerTo.h"
-#include "weakPointerCallback.h"
-
-////////////////////////////////////////////////////////////////////
-//       Class : DXGeomMunger8
-// Description : This specialization on GeomMunger finesses vertices
-//               for DirectX rendering.  In particular, it makes sure
-//               colors are stored in DirectX's packed_argb format,
-//               and that all relevant components are packed into a
-//               single array, in the correct order.
-////////////////////////////////////////////////////////////////////
-class EXPCL_PANDADX DXGeomMunger8 : public StandardMunger, public WeakPointerCallback {
-public:
-  INLINE DXGeomMunger8(GraphicsStateGuardian *gsg, const RenderState *state);
-  virtual ~DXGeomMunger8();
-  ALLOC_DELETED_CHAIN(DXGeomMunger8);
-
-  virtual void wp_callback(void *);
-
-protected:
-  virtual CPT(GeomVertexFormat) munge_format_impl(const GeomVertexFormat *orig,
-                                                  const GeomVertexAnimationSpec &animation);
-  virtual CPT(GeomVertexFormat) premunge_format_impl(const GeomVertexFormat *orig);
-
-  virtual int compare_to_impl(const GeomMunger *other) const;
-  virtual int geom_compare_to_impl(const GeomMunger *other) const;
-
-private:
-  WCPT(TextureAttrib) _texture;
-  WCPT(TexGenAttrib) _tex_gen;
-
-  // This pointer is derived from _texture, above.  In the case that
-  // it is a different pointer, we maintain its reference count
-  // explicitly.  If it is the same pointer, we don't reference count
-  // it at all (so we won't hold on to the reference count
-  // unnecessarily).
-  const TextureAttrib *_filtered_texture;
-  bool _reffed_filtered_texture;
-
-  static GeomMunger *_deleted_chain;
-
-public:
-  static TypeHandle get_class_type() {
-    return _type_handle;
-  }
-  static void init_type() {
-    StandardMunger::init_type();
-    register_type(_type_handle, "DXGeomMunger8",
-                  StandardMunger::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 "dxGeomMunger8.I"
-
-#endif
diff --git a/panda/src/dxgsg8/dxGraphicsDevice8.cxx b/panda/src/dxgsg8/dxGraphicsDevice8.cxx
deleted file mode 100644
index c86b4c338e..0000000000
--- a/panda/src/dxgsg8/dxGraphicsDevice8.cxx
+++ /dev/null
@@ -1,42 +0,0 @@
-// Filename: dxGraphicsDevice.cxx
-// Created by:  masad (22Jul03)
-//
-////////////////////////////////////////////////////////////////////
-//
-// 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 "config_dxgsg8.h"
-#include "dxGraphicsDevice8.h"
-
-
-////////////////////////////////////////////////////////////////////
-//     Function: DXGraphicsDevice8::Constructor
-//       Access: Public
-//  Description:
-////////////////////////////////////////////////////////////////////
-DXGraphicsDevice8::
-DXGraphicsDevice8(wdxGraphicsPipe8 *pipe) :
-  GraphicsDevice(pipe) {
-
-  ZeroMemory(&_Scrn,sizeof(_Scrn));
-  _d3d_device = NULL;
-  _swap_chain = NULL;
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: DXGraphicsDevice8::Destructor
-//       Access: Public
-//  Description:
-////////////////////////////////////////////////////////////////////
-DXGraphicsDevice8::
-~DXGraphicsDevice8() {
-
-}
-
diff --git a/panda/src/dxgsg8/dxGraphicsDevice8.h b/panda/src/dxgsg8/dxGraphicsDevice8.h
deleted file mode 100755
index dd6af7d44a..0000000000
--- a/panda/src/dxgsg8/dxGraphicsDevice8.h
+++ /dev/null
@@ -1,51 +0,0 @@
-// Filename: dxGraphicsDevice.h
-// Created by:  masad (22Jul03)
-//
-////////////////////////////////////////////////////////////////////
-//
-// 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 DXGRAPHICSDEVICE_H
-#define DXGRAPHICSDEVICE_H
-
-//#define GSG_VERBOSE 1
-
-#include "dxgsg8base.h"
-#include "graphicsDevice.h"
-#include "wdxGraphicsPipe8.h"
-
-
-////////////////////////////////////////////////////////////////////
-//   Class : DXGraphicsDevice8
-// Description : A GraphicsDevice necessary for multi-window rendering
-//               in DX. 
-////////////////////////////////////////////////////////////////////
-class EXPCL_PANDADX DXGraphicsDevice8 : public GraphicsDevice {
-  friend class wdxGraphicsPipe8;
-
-public:
-  DXGraphicsDevice8(wdxGraphicsPipe8 *pipe);
-  ~DXGraphicsDevice8();
-
-  DXScreenData _Scrn;
-  LPDIRECT3DDEVICE8 _d3d_device;  // same as Scrn._d3d_device, cached for spd
-  IDirect3DSwapChain8 *_swap_chain;
-
-#if 0
-protected:
-  static TypeHandle get_class_type();
-  static void init_type();
-  virtual TypeHandle get_type() const;
-  virtual TypeHandle force_init_type() {init_type(); return get_class_type();}
-#endif
-};
-
-#endif
-
diff --git a/panda/src/dxgsg8/dxGraphicsStateGuardian8.I b/panda/src/dxgsg8/dxGraphicsStateGuardian8.I
deleted file mode 100644
index 58302f94b4..0000000000
--- a/panda/src/dxgsg8/dxGraphicsStateGuardian8.I
+++ /dev/null
@@ -1,159 +0,0 @@
-// Filename: dxGraphicsStateGuardian8.I
-// Created by:  mike (02Feb99)
-//
-////////////////////////////////////////////////////////////////////
-//
-// 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."
-//
-////////////////////////////////////////////////////////////////////
-
-
-////////////////////////////////////////////////////////////////////
-//     Function: DXGraphicsStateGuardian8::LColor_to_D3DCOLOR
-//       Access: Public, Static
-//  Description: Converts Panda's floating-point LColor structure to
-//               DirectX's D3DCOLOR packed structure.
-////////////////////////////////////////////////////////////////////
-INLINE DWORD DXGraphicsStateGuardian8::
-LColor_to_D3DCOLOR(const LColor &cLColor) {
-// MS VC defines _M_IX86 for x86.  gcc should define _X86_
-#if (defined(_M_IX86) || defined(_X86_)) && !defined(STDFLOAT_DOUBLE)
-  DWORD d3dcolor, tempcolorval=255;
-
-  // note the default FPU rounding mode will give 255*0.5f=0x80, not 0x7F as VC would force it to by resetting rounding mode
-  // don't think this makes much difference
-  
-  __asm {
-        push ebx   ; want to save this in case this fn is inlined
-        push ecx
-        mov ecx, cLColor
-        fild tempcolorval
-        fld DWORD PTR [ecx]
-        fmul ST(0), ST(1)
-        fistp tempcolorval  ; no way to store directly to int register
-        mov eax, tempcolorval
-        shl eax, 16
-
-        fld DWORD PTR [ecx+4]  ;grn
-        fmul ST(0), ST(1)
-        fistp tempcolorval
-        mov ebx, tempcolorval
-        shl ebx, 8
-        or eax, ebx
-
-        fld DWORD PTR [ecx+8]  ;blue
-        fmul ST(0), ST(1)
-        fistp tempcolorval
-        or eax, tempcolorval
-
-        fld DWORD PTR [ecx+12] ;alpha
-        fmul ST(0), ST(1)
-        fistp tempcolorval
-        ; simulate pop 255.0 off FP stack w/o store, mark top as empty and increment stk ptr
-        ffree ST(0)
-        fincstp
-        mov ebx, tempcolorval
-        shl ebx, 24
-        or eax, ebx
-        mov d3dcolor, eax
-        pop ecx
-        pop ebx
-  }
-
-  //   dxgsg8_cat.debug() << (void*)d3dcolor << endl;
-  return d3dcolor;
-#else //!_X86_
-  return MY_D3DRGBA(cLColor[0], cLColor[1], cLColor[2], cLColor[3]);
-#endif //!_X86_
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: DXGraphicsStateGuardian8::get_texture_wrap_mode
-//       Access: Protected, Static
-//  Description: Maps from the Texture's internal wrap mode symbols to
-//               GL's.
-////////////////////////////////////////////////////////////////////
-INLINE D3DTEXTUREADDRESS DXGraphicsStateGuardian8::
-get_texture_wrap_mode(SamplerState::WrapMode wm) {
-  switch (wm) {
-  case SamplerState::WM_clamp:
-    return D3DTADDRESS_CLAMP;
-  case SamplerState::WM_repeat:
-    return D3DTADDRESS_WRAP;
-  case SamplerState::WM_mirror:
-    return D3DTADDRESS_MIRROR;
-  case SamplerState::WM_mirror_once:
-    return D3DTADDRESS_MIRRORONCE;
-  case SamplerState::WM_border_color:
-    return D3DTADDRESS_BORDER;
-  }
-  dxgsg8_cat.error() << "Invalid Texture::Mode value" << endl;
-  return D3DTADDRESS_WRAP;
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: DXGraphicsStateGuardian8::get_fog_mode_type
-//       Access: Protected, Static
-//  Description: Maps from the fog types to gl version
-////////////////////////////////////////////////////////////////////
-INLINE D3DFOGMODE DXGraphicsStateGuardian8::
-get_fog_mode_type(Fog::Mode m) {
-  switch (m) {
-  case Fog::M_linear:
-    return D3DFOG_LINEAR;
-  case Fog::M_exponential:
-    return D3DFOG_EXP;
-  case Fog::M_exponential_squared:
-    return D3DFOG_EXP2;
-  }
-  dxgsg8_cat.error() << "Invalid Fog::Mode value" << endl;
-  return D3DFOG_EXP;
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: DXGraphicsStateGuardian8::get_tex_mat_sym
-//       Access: Protected, Static
-//  Description: Returns the nth D3DTS_TEXTURE(n) constant.
-////////////////////////////////////////////////////////////////////
-INLINE D3DTRANSFORMSTATETYPE DXGraphicsStateGuardian8::
-get_tex_mat_sym(int stage_index) {
-  return (D3DTRANSFORMSTATETYPE)(D3DTS_TEXTURE0 + stage_index);
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: DXGraphicsStateGuardian8::get_safe_buffer_start
-//       Access: Protected, Static
-//  Description: Returns the address of a 64K buffer that is allocated
-//               at the beginning of a 64K block.
-////////////////////////////////////////////////////////////////////
-INLINE unsigned char *DXGraphicsStateGuardian8::
-get_safe_buffer_start() {
-  if (_temp_buffer == NULL) {
-    // Guarantee we get a buffer of size 0x10000 bytes that begins
-    // on an even multiple of 0x10000.  We do this by allocating
-    // double the required buffer, and then pointing to the first
-    // multiple of 0x10000 within that buffer.
-    _temp_buffer = new unsigned char[0x1ffff];
-    _safe_buffer_start = (unsigned char *)(((long)_temp_buffer + 0xffff) & ~0xffff);
-  }
-
-  return _safe_buffer_start;
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: DXGraphicsStateGuardian8::get_supports_render_texture
-//       Access: Published
-//  Description: Returns true if this particular GSG can render
-//               from a wdxGraphicsBuffer8 directly into a texture, or
-//               false if it must always copy-to-texture at the end of
-//               each frame to achieve this effect.
-////////////////////////////////////////////////////////////////////
-INLINE bool DXGraphicsStateGuardian8::
-get_supports_render_texture() const {
-  return _supports_render_texture;
-}
diff --git a/panda/src/dxgsg8/dxGraphicsStateGuardian8.cxx b/panda/src/dxgsg8/dxGraphicsStateGuardian8.cxx
deleted file mode 100644
index 9d87cfa494..0000000000
--- a/panda/src/dxgsg8/dxGraphicsStateGuardian8.cxx
+++ /dev/null
@@ -1,4674 +0,0 @@
-// Filename: dxGraphicsStateGuardian8.cxx
-// Created by:  mike (02Feb99)
-//
-////////////////////////////////////////////////////////////////////
-//
-// 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 "dxGraphicsStateGuardian8.h"
-#include "config_dxgsg8.h"
-#include "displayRegion.h"
-#include "renderBuffer.h"
-#include "geom.h"
-#include "graphicsWindow.h"
-#include "graphicsEngine.h"
-#include "lens.h"
-#include "ambientLight.h"
-#include "directionalLight.h"
-#include "pointLight.h"
-#include "spotlight.h"
-#include "textureAttrib.h"
-#include "texGenAttrib.h"
-#include "shadeModelAttrib.h"
-#include "cullFaceAttrib.h"
-#include "transparencyAttrib.h"
-#include "alphaTestAttrib.h"
-#include "depthTestAttrib.h"
-#include "depthWriteAttrib.h"
-#include "colorWriteAttrib.h"
-#include "texMatrixAttrib.h"
-#include "materialAttrib.h"
-#include "renderModeAttrib.h"
-#include "rescaleNormalAttrib.h"
-#include "fogAttrib.h"
-#include "depthOffsetAttrib.h"
-#include "lightAttrib.h"
-#include "stencilAttrib.h"
-#include "scissorAttrib.h"
-#include "clipPlaneAttrib.h"
-#include "fog.h"
-#include "throw_event.h"
-#include "geomVertexFormat.h"
-#include "geomVertexData.h"
-#include "geomTriangles.h"
-#include "geomTristrips.h"
-#include "geomTrifans.h"
-#include "geomLines.h"
-#include "geomLinestrips.h"
-#include "geomPoints.h"
-#include "geomVertexReader.h"
-#include "dxGeomMunger8.h"
-#include "config_gobj.h"
-#include "dxVertexBufferContext8.h"
-#include "dxIndexBufferContext8.h"
-#include "pStatTimer.h"
-#include "pStatCollector.h"
-#include "dxgsg8base.h"
-#include "wdxGraphicsBuffer8.h"
-
-#include <mmsystem.h>
-
-TypeHandle DXGraphicsStateGuardian8::_type_handle;
-
-D3DMATRIX DXGraphicsStateGuardian8::_d3d_ident_mat;
-
-unsigned char *DXGraphicsStateGuardian8::_temp_buffer = NULL;
-unsigned char *DXGraphicsStateGuardian8::_safe_buffer_start = NULL;
-
-#define __D3DLIGHT_RANGE_MAX ((PN_stdfloat)sqrt(FLT_MAX))  //for some reason this is missing in dx8 hdrs
-
-#define MY_D3DRGBA(r, g, b, a) ((D3DCOLOR) D3DCOLOR_COLORVALUE(r, g, b, a))
-
-////////////////////////////////////////////////////////////////////
-//     Function: DXGraphicsStateGuardian8::Constructor
-//       Access: Public
-//  Description:
-////////////////////////////////////////////////////////////////////
-DXGraphicsStateGuardian8::
-DXGraphicsStateGuardian8(GraphicsEngine *engine, GraphicsPipe *pipe) :
-  GraphicsStateGuardian(CS_yup_left, engine, pipe)
-{
-  // Assume that we will get a hardware-accelerated context, unless
-  // the window tells us otherwise.
-  _is_hardware = true;
-
-  _screen = NULL;
-  _d3d_device = NULL;
-
-  _dx_is_ready = false;
-  _vertex_blending_enabled = false;
-  _overlay_windows_supported = false;
-  _tex_stats_retrieval_impossible = false;
-  _supports_render_texture = false;
-
-  _active_vbuffer = NULL;
-  _active_ibuffer = NULL;
-
-  // This is a static member, but we initialize it here in the
-  // constructor anyway.  It won't hurt if it gets repeatedly
-  // initalized.
-  ZeroMemory(&_d3d_ident_mat, sizeof(D3DMATRIX));
-  _d3d_ident_mat._11 = _d3d_ident_mat._22 = _d3d_ident_mat._33 = _d3d_ident_mat._44 = 1.0f;
-
-  _cur_read_pixel_buffer = RenderBuffer::T_front;
-
-  // DirectX drivers seem to consistently invert the texture when
-  // they copy framebuffer-to-texture.  Ok.
-  _copy_texture_inverted = true;
-
-  // D3DRS_POINTSPRITEENABLE doesn't seem to support remapping the
-  // texture coordinates via a texture matrix, so we don't advertise
-  // GR_point_sprite_tex_matrix.
-  _supported_geom_rendering =
-    Geom::GR_point | Geom::GR_point_uniform_size |
-    Geom::GR_point_perspective | Geom::GR_point_sprite |
-    Geom::GR_indexed_other |
-    Geom::GR_triangle_strip | Geom::GR_triangle_fan |
-    Geom::GR_flat_first_vertex;
-
-  _scissor_mat = TransformState::make_identity();
-
-  get_gamma_table();
-  atexit (atexit_function);
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: DXGraphicsStateGuardian8::Destructor
-//       Access: Public
-//  Description:
-////////////////////////////////////////////////////////////////////
-DXGraphicsStateGuardian8::
-~DXGraphicsStateGuardian8() {
-  if (IS_VALID_PTR(_d3d_device)) {
-    _d3d_device->SetTexture(0, NULL);  // this frees reference to the old texture
-  }
-  free_nondx_resources();
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: DXGraphicsStateGuardian8::prepare_texture
-//       Access: Public, Virtual
-//  Description: Creates a new retained-mode representation of the
-//               given texture, and returns a newly-allocated
-//               TextureContext pointer to reference it.  It is the
-//               responsibility of the calling function to later
-//               call release_texture() with this same pointer (which
-//               will also delete the pointer).
-//
-//               This function should not be called directly to
-//               prepare a texture.  Instead, call Texture::prepare().
-////////////////////////////////////////////////////////////////////
-TextureContext *DXGraphicsStateGuardian8::
-prepare_texture(Texture *tex, int view) {
-  DXTextureContext8 *dtc = new DXTextureContext8(_prepared_objects, tex, view);
-
-  if (!get_supports_compressed_texture_format(tex->get_ram_image_compression())) {
-    dxgsg8_cat.error()
-      << *dtc->get_texture() << " is stored in an unsupported compressed format.\n";
-    return NULL;
-  }
-
-  return dtc;
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: DXGraphicsStateGuardian8::apply_texture
-//       Access: Public
-//  Description: Makes the texture the currently available texture for
-//               rendering on the ith stage.
-////////////////////////////////////////////////////////////////////
-void DXGraphicsStateGuardian8::
-apply_texture(int i, TextureContext *tc, const SamplerState &sampler) {
-  if (tc == (TextureContext *)NULL) {
-    // The texture wasn't bound properly or something, so ensure
-    // texturing is disabled and just return.
-    _d3d_device->SetTextureStageState(i, D3DTSS_COLOROP, D3DTOP_DISABLE);
-    return;
-  }
-  if (!update_texture(tc, false)) {
-    // Couldn't get the texture image or something.
-    _d3d_device->SetTextureStageState(i, D3DTSS_COLOROP, D3DTOP_DISABLE);
-    return;
-  }
-
-  tc->set_active(true);
-
-  DXTextureContext8 *dtc = DCAST(DXTextureContext8, tc);
-  Texture *tex = tc->get_texture();
-
-  SamplerState::WrapMode wrap_u, wrap_v, wrap_w;
-  wrap_u = sampler.get_wrap_u();
-  wrap_v = sampler.get_wrap_v();
-  wrap_w = sampler.get_wrap_w();
-
-  _d3d_device->SetTextureStageState(i, D3DTSS_ADDRESSU, get_texture_wrap_mode(wrap_u));
-  _d3d_device->SetTextureStageState(i, D3DTSS_ADDRESSV, get_texture_wrap_mode(wrap_v));
-  _d3d_device->SetTextureStageState(i, D3DTSS_ADDRESSW, get_texture_wrap_mode(wrap_w));
-
-  _d3d_device->SetTextureStageState(i, D3DTSS_BORDERCOLOR,
-                                    LColor_to_D3DCOLOR(sampler.get_border_color()));
-
-  uint aniso_degree = sampler.get_effective_anisotropic_degree();
-  SamplerState::FilterType ft = sampler.get_effective_magfilter();
-
-  if (aniso_degree >= 1) {
-    _d3d_device->SetTextureStageState(i, D3DTSS_MAXANISOTROPY, aniso_degree);
-  }
-
-  D3DTEXTUREFILTERTYPE new_mag_filter;
-  if (aniso_degree <= 1) {
-    new_mag_filter = ((ft != SamplerState::FT_nearest) ? D3DTEXF_LINEAR : D3DTEXF_POINT);
-  } else {
-    new_mag_filter = D3DTEXF_ANISOTROPIC;
-  }
-
-  _d3d_device->SetTextureStageState(i, D3DTSS_MAGFILTER, new_mag_filter);
-
-  // map Panda composite min+mip filter types to d3d's separate min & mip filter types
-  D3DTEXTUREFILTERTYPE new_min_filter = get_d3d_min_type(sampler.get_effective_minfilter());
-  D3DTEXTUREFILTERTYPE new_mip_filter = get_d3d_mip_type(sampler.get_effective_minfilter());
-
-  if (!tex->might_have_ram_image()) {
-    // If the texture is completely dynamic, don't try to issue
-    // mipmaps--pandadx doesn't support auto-generated mipmaps at this
-    // point.
-    new_mip_filter = D3DTEXF_NONE;
-  }
-
-  // sanity check
-  if (!dtc->has_mipmaps()) {
-    new_mip_filter = D3DTEXF_NONE;
-  }
-
-  if (aniso_degree >= 2) {
-    new_min_filter = D3DTEXF_ANISOTROPIC;
-  }
-
-  _d3d_device->SetTextureStageState(i, D3DTSS_MINFILTER, new_min_filter);
-  _d3d_device->SetTextureStageState(i, D3DTSS_MIPFILTER, new_mip_filter);
-
-  _d3d_device->SetTexture(i, dtc->get_d3d_texture());
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: DXGraphicsStateGuardian8::update_texture
-//       Access: Public, Virtual
-//  Description: Ensures that the current Texture data is refreshed
-//               onto the GSG.  This means updating the texture
-//               properties and/or re-uploading the texture image, if
-//               necessary.  This should only be called within the
-//               draw thread.
-//
-//               If force is true, this function will not return until
-//               the texture has been fully uploaded.  If force is
-//               false, the function may choose to upload a simple
-//               version of the texture instead, if the texture is not
-//               fully resident (and if get_incomplete_render() is
-//               true).
-////////////////////////////////////////////////////////////////////
-bool DXGraphicsStateGuardian8::
-update_texture(TextureContext *tc, bool force) {
-  DXTextureContext8 *dtc = DCAST(DXTextureContext8, tc);
-
-  // If the texture image has changed, or if its use of mipmaps has
-  // changed, we need to re-create the image.
-
-  if (dtc->was_modified()) {
-    if (!upload_texture(dtc, force)) {
-      // Oops, we can't re-create the texture for some reason.
-      Texture *tex = tc->get_texture();
-      dxgsg8_cat.error()
-        << "Unable to re-create texture " << *tex << endl;
-      cerr << "b\n";
-      return false;
-    }
-  }
-  dtc->enqueue_lru(&_prepared_objects->_graphics_memory_lru);
-
-  return true;
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: DXGraphicsStateGuardian8::upload_texture
-//       Access: Public
-//  Description: Creates a texture surface on the graphics card and
-//               fills it with its pixel data.
-////////////////////////////////////////////////////////////////////
-bool DXGraphicsStateGuardian8::
-upload_texture(DXTextureContext8 *dtc, bool force) {
-  Texture *tex = dtc->get_texture();
-  if (!get_supports_compressed_texture_format(tex->get_ram_image_compression())) {
-    dxgsg8_cat.error()
-      << *tex << " is stored in an unsupported compressed format.\n";
-    return false;
-  }
-
-  dtc->delete_texture();
-  dtc->update_data_size_bytes(0);
-  dtc->mark_unloaded();
-
-  if (_effective_incomplete_render && !force) {
-    bool has_image = _supports_compressed_texture ? tex->has_ram_image() : tex->has_uncompressed_ram_image();
-    if (!has_image && tex->might_have_ram_image() &&
-        tex->has_simple_ram_image() &&
-        !_loader.is_null()) {
-      // If we don't have the texture data right now, go get it, but in
-      // the meantime load a temporary simple image in its place.
-      async_reload_texture(dtc);
-      has_image = _supports_compressed_texture ? tex->has_ram_image() : tex->has_uncompressed_ram_image();
-      if (!has_image) {
-        if (dtc->was_simple_image_modified()) {
-          return dtc->create_simple_texture(*_screen);
-        }
-        return true;
-      }
-    }
-  }
-
-  return dtc->create_texture(*_screen);
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: DXGraphicsStateGuardian8::release_texture
-//       Access: Public, Virtual
-//  Description: Frees the GL resources previously allocated for the
-//               texture.
-////////////////////////////////////////////////////////////////////
-void DXGraphicsStateGuardian8::
-release_texture(TextureContext *tc) {
-  DXTextureContext8 *dtc = DCAST(DXTextureContext8, tc);
-  delete dtc;
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: DXGraphicsStateGuardian8::extract_texture_data
-//       Access: Public, Virtual
-//  Description: This method should only be called by the
-//               GraphicsEngine.  Do not call it directly; call
-//               GraphicsEngine::extract_texture_data() instead.
-//
-//               This method will be called in the draw thread to
-//               download the texture memory's image into its
-//               ram_image value.  It returns true on success, false
-//               otherwise.
-////////////////////////////////////////////////////////////////////
-bool DXGraphicsStateGuardian8::
-extract_texture_data(Texture *tex) {
-  TextureContext *tc = tex->prepare_now(0, get_prepared_objects(), this);
-  nassertr(tc != (TextureContext *)NULL, false);
-  DXTextureContext8 *dtc = DCAST(DXTextureContext8, tc);
-
-  return dtc->extract_texture_data();
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: DXGraphicsStateGuardian8::prepare_vertex_buffer
-//       Access: Public, Virtual
-//  Description: Creates a new retained-mode representation of the
-//               given data, and returns a newly-allocated
-//               VertexBufferContext pointer to reference it.  It is the
-//               responsibility of the calling function to later
-//               call release_vertex_buffer() with this same pointer (which
-//               will also delete the pointer).
-//
-//               This function should not be called directly to
-//               prepare a buffer.  Instead, call Geom::prepare().
-////////////////////////////////////////////////////////////////////
-VertexBufferContext *DXGraphicsStateGuardian8::
-prepare_vertex_buffer(GeomVertexArrayData *data) {
-  DXVertexBufferContext8 *dvbc = new DXVertexBufferContext8(_prepared_objects, data);
-  return dvbc;
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: DXGraphicsStateGuardian8::apply_vertex_buffer
-//       Access: Public
-//  Description: Updates the vertex buffer with the current data, and
-//               makes it the current vertex buffer for rendering.
-////////////////////////////////////////////////////////////////////
-bool DXGraphicsStateGuardian8::
-apply_vertex_buffer(VertexBufferContext *vbc,
-                    const GeomVertexArrayDataHandle *reader, bool force) {
-  DXVertexBufferContext8 *dvbc = DCAST(DXVertexBufferContext8, vbc);
-
-  if (dvbc->_vbuffer == NULL) {
-    // Attempt to create a new vertex buffer.
-    if (vertex_buffers &&
-        reader->get_usage_hint() != Geom::UH_client) {
-      dvbc->create_vbuffer(*_screen, reader);
-    }
-
-    if (dvbc->_vbuffer != NULL) {
-      if (!dvbc->upload_data(reader, force)) {
-        return false;
-      }
-
-      dvbc->mark_loaded(reader);
-
-      _d3d_device->SetStreamSource
-        (0, dvbc->_vbuffer, reader->get_array_format()->get_stride());
-      _active_vbuffer = dvbc;
-      _active_ibuffer = NULL;
-      dvbc->set_active(true);
-
-    } else {
-      _active_vbuffer = NULL;
-    }
-
-  } else {
-    if (dvbc->was_modified(reader)) {
-      if (dvbc->changed_size(reader)) {
-        // We have to destroy the old vertex buffer and create a new
-        // one.
-        dvbc->create_vbuffer(*_screen, reader);
-      }
-
-      if (!dvbc->upload_data(reader, force)) {
-        return false;
-      }
-      dvbc->mark_loaded(reader);
-      _active_vbuffer = NULL;
-    }
-
-    if (_active_vbuffer != dvbc) {
-      _d3d_device->SetStreamSource
-        (0, dvbc->_vbuffer, reader->get_array_format()->get_stride());
-      _active_vbuffer = dvbc;
-      _active_ibuffer = NULL;
-      dvbc->set_active(true);
-    }
-  }
-  dvbc->enqueue_lru(&_prepared_objects->_graphics_memory_lru);
-
-  HRESULT hr = _d3d_device->SetVertexShader(dvbc->_fvf);
-#ifndef NDEBUG
-  if (FAILED(hr)) {
-    dxgsg8_cat.error()
-      << "SetVertexShader(0x" << (void*)dvbc->_fvf
-      << ") failed" << D3DERRORSTRING(hr);
-  }
-#endif
-  return true;
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: DXGraphicsStateGuardian8::release_vertex_buffer
-//       Access: Public, Virtual
-//  Description: Frees the GL resources previously allocated for the
-//               data.  This function should never be called
-//               directly; instead, call Data::release() (or simply
-//               let the Data destruct).
-////////////////////////////////////////////////////////////////////
-void DXGraphicsStateGuardian8::
-release_vertex_buffer(VertexBufferContext *vbc) {
-  DXVertexBufferContext8 *dvbc = DCAST(DXVertexBufferContext8, vbc);
-  delete dvbc;
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: DXGraphicsStateGuardian8::prepare_index_buffer
-//       Access: Public, Virtual
-//  Description: Creates a new retained-mode representation of the
-//               given data, and returns a newly-allocated
-//               IndexBufferContext pointer to reference it.  It is the
-//               responsibility of the calling function to later call
-//               release_index_buffer() with this same pointer (which
-//               will also delete the pointer).
-//
-//               This function should not be called directly to
-//               prepare a buffer.  Instead, call Geom::prepare().
-////////////////////////////////////////////////////////////////////
-IndexBufferContext *DXGraphicsStateGuardian8::
-prepare_index_buffer(GeomPrimitive *data) {
-  DXIndexBufferContext8 *dibc = new DXIndexBufferContext8(_prepared_objects, data);
-  return dibc;
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: DXGraphicsStateGuardian8::apply_index_buffer
-//       Access: Public
-//  Description: Updates the index buffer with the current data, and
-//               makes it the current index buffer for rendering.
-////////////////////////////////////////////////////////////////////
-bool DXGraphicsStateGuardian8::
-apply_index_buffer(IndexBufferContext *ibc,
-                   const GeomPrimitivePipelineReader *reader, bool force) {
-  DXIndexBufferContext8 *dibc = DCAST(DXIndexBufferContext8, ibc);
-
-  if (dibc->_ibuffer == NULL) {
-    // Attempt to create a new index buffer.
-    dibc->create_ibuffer(*_screen, reader);
-
-    if (dibc->_ibuffer != NULL) {
-      if (!dibc->upload_data(reader, force)) {
-        return false;
-      }
-      dibc->mark_loaded(reader);
-
-      _d3d_device->SetIndices(dibc->_ibuffer, 0);
-      _active_ibuffer = dibc;
-      dibc->set_active(true);
-
-    } else {
-      _d3d_device->SetIndices(NULL, 0);
-      _active_ibuffer = NULL;
-    }
-
-  } else {
-    if (dibc->was_modified(reader)) {
-      if (dibc->changed_size(reader)) {
-        // We have to destroy the old index buffer and create a new
-        // one.
-        dibc->create_ibuffer(*_screen, reader);
-      }
-
-      if (!dibc->upload_data(reader, force)) {
-        return false;
-      }
-
-      dibc->mark_loaded(reader);
-      _active_ibuffer = NULL;
-    }
-
-    if (_active_ibuffer != dibc) {
-      _d3d_device->SetIndices(dibc->_ibuffer, 0);
-      _active_ibuffer = dibc;
-      dibc->set_active(true);
-    }
-  }
-  dibc->enqueue_lru(&_prepared_objects->_graphics_memory_lru);
-
-  return true;
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: DXGraphicsStateGuardian8::release_index_buffer
-//       Access: Public, Virtual
-//  Description: Frees the GL resources previously allocated for the
-//               data.  This function should never be called
-//               directly; instead, call Data::release() (or simply
-//               let the Data destruct).
-////////////////////////////////////////////////////////////////////
-void DXGraphicsStateGuardian8::
-release_index_buffer(IndexBufferContext *ibc) {
-  DXIndexBufferContext8 *dibc = DCAST(DXIndexBufferContext8, ibc);
-  delete dibc;
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: DXGraphicsStateGuardian8::make_geom_munger
-//       Access: Public, Virtual
-//  Description: Creates a new GeomMunger object to munge vertices
-//               appropriate to this GSG for the indicated state.
-////////////////////////////////////////////////////////////////////
-PT(GeomMunger) DXGraphicsStateGuardian8::
-make_geom_munger(const RenderState *state, Thread *current_thread) {
-  PT(DXGeomMunger8) munger = new DXGeomMunger8(this, state);
-  return GeomMunger::register_munger(munger, current_thread);
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: DXGraphicsStateGuardian8::do_clear
-//       Access: Public, Virtual
-//  Description: Clears all of the indicated buffers to their assigned
-//               colors.
-////////////////////////////////////////////////////////////////////
-void DXGraphicsStateGuardian8::
-clear(DrawableRegion *clearable) {
-
-  DWORD main_flags = 0;
-  DWORD aux_flags = 0;
-
-  D3DCOLOR color_clear_value = LColor_to_D3DCOLOR(clearable->get_clear_color());
-  PN_stdfloat depth_clear_value = clearable->get_clear_depth();
-  DWORD stencil_clear_value = (DWORD)(clearable->get_clear_stencil());
-
-  //set appropriate flags
-  if (clearable->get_clear_color_active()) {
-    main_flags |=  D3DCLEAR_TARGET;
-  }
-
-  if (clearable->get_clear_depth_active()) {
-    aux_flags |=  D3DCLEAR_ZBUFFER;
-    nassertv(_screen->_presentation_params.EnableAutoDepthStencil);
-  }
-
-  if (clearable->get_clear_stencil_active()) {
-    // clear only if there is a stencil buffer
-    if (_screen->_presentation_params.EnableAutoDepthStencil &&
-      IS_STENCIL_FORMAT(_screen->_presentation_params.AutoDepthStencilFormat)) {
-      aux_flags |=  D3DCLEAR_STENCIL;
-    }
-  }
-
-  if ((main_flags | aux_flags) != 0) {
-    HRESULT hr = _d3d_device->Clear(0, NULL, main_flags | aux_flags, color_clear_value,
-                                    depth_clear_value, stencil_clear_value);
-    if (FAILED(hr) && main_flags == D3DCLEAR_TARGET && aux_flags != 0) {
-      // Maybe there's a problem with the one or more of the auxiliary
-      // buffers.
-      hr = _d3d_device->Clear(0, NULL, D3DCLEAR_TARGET, color_clear_value,
-                              depth_clear_value, stencil_clear_value);
-      if (!FAILED(hr)) {
-        // Yep, it worked without them.  That's a problem.  Which buffer
-        // poses the problem?
-        if (clearable->get_clear_depth_active()) {
-          aux_flags |=  D3DCLEAR_ZBUFFER;
-          HRESULT hr2 = _d3d_device->Clear(0, NULL, D3DCLEAR_ZBUFFER, color_clear_value,
-                                           depth_clear_value, stencil_clear_value);
-          if (FAILED(hr2)) {
-            dxgsg8_cat.error()
-              << "Unable to clear depth buffer; removing.\n";
-            // This is really hacky code.
-            ((FrameBufferProperties *)_current_properties)->set_depth_bits(0);
-          }
-        }
-        if (clearable->get_clear_stencil_active()) {
-          aux_flags |=  D3DCLEAR_STENCIL;
-          HRESULT hr2 = _d3d_device->Clear(0, NULL, D3DCLEAR_STENCIL, color_clear_value,
-                                           stencil_clear_value, stencil_clear_value);
-          if (FAILED(hr2)) {
-            dxgsg8_cat.error()
-              << "Unable to clear stencil buffer; removing.\n";
-            // This is really hacky code.
-            ((FrameBufferProperties *)_current_properties)->set_stencil_bits(0);
-            _supports_stencil = false;
-          }
-        }
-      }
-    }
-
-    if (FAILED(hr)) {
-      dxgsg8_cat.error()
-        << "clear_buffer failed:  Clear returned " << D3DERRORSTRING(hr);
-    }
-  }
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: DXGraphicsStateGuardian8::prepare_display_region
-//       Access: Public, Virtual
-//  Description: Prepare a display region for rendering (set up
-//       scissor region and viewport)
-////////////////////////////////////////////////////////////////////
-void DXGraphicsStateGuardian8::
-prepare_display_region(DisplayRegionPipelineReader *dr) {
-  nassertv(dr != (DisplayRegionPipelineReader *)NULL);
-  GraphicsStateGuardian::prepare_display_region(dr);
-
-  int l, u, w, h;
-  dr->get_region_pixels_i(l, u, w, h);
-
-  // Create the viewport
-  D3DVIEWPORT8 vp = { l, u, w, h, 0.0f, 1.0f };
-  _current_viewport = vp;
-  set_scissor(0.0f, 1.0f, 0.0f, 1.0f);
-
-  if (_screen->_can_direct_disable_color_writes) {
-    _d3d_device->SetRenderState(D3DRS_COLORWRITEENABLE, _color_write_mask);
-  }
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: DXGraphicsStateGuardian8::calc_projection_mat
-//       Access: Public, Virtual
-//  Description: Given a lens, calculates the appropriate projection
-//               matrix for use with this gsg.  Note that the
-//               projection matrix depends a lot upon the coordinate
-//               system of the rendering API.
-//
-//               The return value is a TransformState if the lens is
-//               acceptable, NULL if it is not.
-////////////////////////////////////////////////////////////////////
-CPT(TransformState) DXGraphicsStateGuardian8::
-calc_projection_mat(const Lens *lens) {
-  if (lens == (Lens *)NULL) {
-    return NULL;
-  }
-
-  if (!lens->is_linear()) {
-    return NULL;
-  }
-
-  // DirectX also uses a Z range of 0 to 1, whereas the Panda
-  // convention is for the projection matrix to produce a Z range of
-  // -1 to 1.  We have to rescale to compensate.
-  static const LMatrix4 rescale_mat
-    (1, 0, 0, 0,
-     0, 1, 0, 0,
-     0, 0, 0.5, 0,
-     0, 0, 0.5, 1);
-
-  LMatrix4 result =
-    LMatrix4::convert_mat(CS_yup_left, _current_lens->get_coordinate_system()) *
-    lens->get_projection_mat(_current_stereo_channel) *
-    rescale_mat;
-
-  if (_scene_setup->get_inverted()) {
-    // If the scene is supposed to be inverted, then invert the
-    // projection matrix.
-    result *= LMatrix4::scale_mat(1.0f, -1.0f, 1.0f);
-  }
-
-  return TransformState::make_mat(result);
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: DXGraphicsStateGuardian8::prepare_lens
-//       Access: Public, Virtual
-//  Description: Makes the current lens (whichever lens was most
-//               recently specified with set_scene()) active, so
-//               that it will transform future rendered geometry.
-//               Normally this is only called from the draw process,
-//               and usually it is called by set_scene().
-//
-//               The return value is true if the lens is acceptable,
-//               false if it is not.
-////////////////////////////////////////////////////////////////////
-bool DXGraphicsStateGuardian8::
-prepare_lens() {
-  CPT(TransformState) scissor_proj_mat = _scissor_mat->compose(_projection_mat);
-  LMatrix4f mat = LCAST(float, scissor_proj_mat->get_mat());
-  HRESULT hr =
-    _d3d_device->SetTransform(D3DTS_PROJECTION,
-                              (D3DMATRIX*)mat.get_data());
-  return SUCCEEDED(hr);
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: DXGraphicsStateGuardian8::begin_frame
-//       Access: Public, Virtual
-//  Description: Called before each frame is rendered, to allow the
-//               GSG a chance to do any internal cleanup before
-//               beginning the frame.
-//
-//               The return value is true if successful (in which case
-//               the frame will be drawn and end_frame() will be
-//               called later), or false if unsuccessful (in which
-//               case nothing will be drawn and end_frame() will not
-//               be called).
-////////////////////////////////////////////////////////////////////
-bool DXGraphicsStateGuardian8::
-begin_frame(Thread *current_thread) {
-  if (!GraphicsStateGuardian::begin_frame(current_thread)) {
-    return false;
-  }
-
-  if (_d3d_device == NULL) {
-    dxgsg8_cat.debug()
-      << this << "::begin_frame(): no device.\n";
-    return false;
-  }
-
-  return true;
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: DXGraphicsStateGuardian8::begin_scene
-//       Access: Public, Virtual
-//  Description: Called between begin_frame() and end_frame() to mark
-//               the beginning of drawing commands for a "scene"
-//               (usually a particular DisplayRegion) within a frame.
-//               All 3-D drawing commands, except the clear operation,
-//               must be enclosed within begin_scene() .. end_scene().
-//
-//               The return value is true if successful (in which case
-//               the scene will be drawn and end_scene() will be
-//               called later), or false if unsuccessful (in which
-//               case nothing will be drawn and end_scene() will not
-//               be called).
-////////////////////////////////////////////////////////////////////
-bool DXGraphicsStateGuardian8::
-begin_scene() {
-  if (!GraphicsStateGuardian::begin_scene()) {
-    return false;
-  }
-
-  HRESULT hr = _d3d_device->BeginScene();
-
-  if (FAILED(hr)) {
-    if (hr == D3DERR_DEVICELOST) {
-      if (dxgsg8_cat.is_debug()) {
-        dxgsg8_cat.debug()
-          << "BeginScene returns D3DERR_DEVICELOST" << endl;
-      }
-
-      check_cooperative_level();
-
-    } else {
-      dxgsg8_cat.error()
-        << "BeginScene failed, unhandled error hr == "
-        << D3DERRORSTRING(hr) << endl;
-      throw_event("panda3d-render-error");
-    }
-    return false;
-  }
-
-  return true;
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: DXGraphicsStateGuardian8::end_scene
-//       Access: Public, Virtual
-//  Description: Called between begin_frame() and end_frame() to mark
-//               the end of drawing commands for a "scene" (usually a
-//               particular DisplayRegion) within a frame.  All 3-D
-//               drawing commands, except the clear operation, must be
-//               enclosed within begin_scene() .. end_scene().
-////////////////////////////////////////////////////////////////////
-void DXGraphicsStateGuardian8::
-end_scene() {
-  GraphicsStateGuardian::end_scene();
-  _dlights.clear();
-
-  HRESULT hr = _d3d_device->EndScene();
-
-  if (FAILED(hr)) {
-    if (hr == D3DERR_DEVICELOST) {
-      if (dxgsg8_cat.is_debug()) {
-        dxgsg8_cat.debug()
-          << "EndScene returns DeviceLost\n";
-      }
-      check_cooperative_level();
-
-    } else {
-      dxgsg8_cat.error()
-        << "EndScene failed, unhandled error hr == " << D3DERRORSTRING(hr);
-      throw_event("panda3d-render-error");
-    }
-    return;
-  }
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: GraphicsStateGuardian::end_frame
-//       Access: Public, Virtual
-//  Description: Called after each frame is rendered, to allow the
-//               GSG a chance to do any internal cleanup after
-//               rendering the frame, and before the window flips.
-////////////////////////////////////////////////////////////////////
-void DXGraphicsStateGuardian8::
-end_frame(Thread *current_thread) {
-
-#if defined(DO_PSTATS)
-  if (_texmgrmem_total_pcollector.is_active()) {
-#define TICKS_PER_GETTEXINFO (2.5*1000)   // 2.5 second interval
-    static DWORD last_tick_count = 0;
-    DWORD cur_tick_count = GetTickCount();
-
-    if (cur_tick_count - last_tick_count > TICKS_PER_GETTEXINFO) {
-      last_tick_count = cur_tick_count;
-      report_texmgr_stats();
-    }
-  }
-#endif
-
-  // Note: regular GraphicsWindow::end_frame is being called,
-  // but we override gsg::end_frame, so need to explicitly call it here
-  // (currently it's an empty fn)
-  GraphicsStateGuardian::end_frame(current_thread);
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: DXGraphicsStateGuardian8::begin_draw_primitives
-//       Access: Public, Virtual
-//  Description: Called before a sequence of draw_primitive()
-//               functions are called, this should prepare the vertex
-//               data for rendering.  It returns true if the vertices
-//               are ok, false to abort this group of primitives.
-////////////////////////////////////////////////////////////////////
-bool DXGraphicsStateGuardian8::
-begin_draw_primitives(const GeomPipelineReader *geom_reader,
-                      const GeomMunger *munger,
-                      const GeomVertexDataPipelineReader *data_reader,
-                      bool force) {
-  if (!GraphicsStateGuardian::begin_draw_primitives(geom_reader, munger,
-                                                    data_reader, force)) {
-    return false;
-  }
-  nassertr(_data_reader != (GeomVertexDataPipelineReader *)NULL, false);
-
-  const GeomVertexFormat *format = _data_reader->get_format();
-
-  // The munger should have put the FVF data in the first array.
-  const GeomVertexArrayDataHandle *data = _data_reader->get_array_reader(0);
-
-  VertexBufferContext *vbc = ((GeomVertexArrayData *)(data->get_object()))->prepare_now(get_prepared_objects(), this);
-  nassertr(vbc != (VertexBufferContext *)NULL, false);
-  if (!apply_vertex_buffer(vbc, data, force)) {
-    return false;
-  }
-
-  const GeomVertexAnimationSpec &animation =
-    data_reader->get_format()->get_animation();
-  if (animation.get_animation_type() == Geom::AT_hardware) {
-    // Set up vertex blending.
-    switch (animation.get_num_transforms()) {
-    case 1:
-      // The MSDN docs suggest we should use D3DVBF_0WEIGHTS here, but
-      // that doesn't seem to work at all.  On the other hand,
-      // D3DVBF_DISABLE *does* work, because it disables special
-      // handling, meaning only the world matrix affects these
-      // vertices--and by accident or design, the first matrix,
-      // D3DTS_WORLDMATRIX(0), *is* the world matrix.
-      _d3d_device->SetRenderState(D3DRS_VERTEXBLEND, D3DVBF_DISABLE);
-      break;
-    case 2:
-      _d3d_device->SetRenderState(D3DRS_VERTEXBLEND, D3DVBF_1WEIGHTS);
-      break;
-    case 3:
-      _d3d_device->SetRenderState(D3DRS_VERTEXBLEND, D3DVBF_2WEIGHTS);
-      break;
-    case 4:
-      _d3d_device->SetRenderState(D3DRS_VERTEXBLEND, D3DVBF_3WEIGHTS);
-      break;
-    }
-
-    if (animation.get_indexed_transforms()) {
-      // Set up indexed vertex blending.
-      _d3d_device->SetRenderState(D3DRS_INDEXEDVERTEXBLENDENABLE, TRUE);
-    } else {
-      _d3d_device->SetRenderState(D3DRS_INDEXEDVERTEXBLENDENABLE, FALSE);
-    }
-
-    const TransformTable *table = data_reader->get_transform_table();
-    if (table != (TransformTable *)NULL) {
-      for (int i = 0; i < table->get_num_transforms(); i++) {
-        LMatrix4 mat;
-        table->get_transform(i)->mult_matrix(mat, _internal_transform->get_mat());
-        LMatrix4f matf = LCAST(float, mat);
-        const D3DMATRIX *d3d_mat = (const D3DMATRIX *)matf.get_data();
-        _d3d_device->SetTransform(D3DTS_WORLDMATRIX(i), d3d_mat);
-      }
-
-      // Setting the first animation matrix steps on the world matrix,
-      // so we have to set a flag to reload the world matrix later.
-      _transform_stale = true;
-    }
-    _vertex_blending_enabled = true;
-
-  } else {
-    // We're not using vertex blending.
-    if (_vertex_blending_enabled) {
-      _d3d_device->SetRenderState(D3DRS_INDEXEDVERTEXBLENDENABLE, FALSE);
-      _d3d_device->SetRenderState(D3DRS_VERTEXBLEND, D3DVBF_DISABLE);
-      _vertex_blending_enabled = false;
-    }
-
-    if (_transform_stale && !_data_reader->is_vertex_transformed()) {
-      LMatrix4f mat = LCAST(float, _internal_transform->get_mat());
-      const D3DMATRIX *d3d_mat = (const D3DMATRIX *)mat.get_data();
-      _d3d_device->SetTransform(D3DTS_WORLD, d3d_mat);
-      _transform_stale = false;
-    }
-  }
-
-  if (_data_reader->is_vertex_transformed()) {
-    // If the vertex data claims to be already transformed into clip
-    // coordinates, wipe out the current projection and modelview
-    // matrix (so we don't attempt to transform it again).
-
-    // It's tempting just to use the D3DFVF_XYZRHW specification on
-    // these vertices, but that turns out to be a bigger hammer than
-    // we want: that also prevents lighting calculations and user clip
-    // planes.
-    _d3d_device->SetTransform(D3DTS_WORLD, &_d3d_ident_mat);
-    static const LMatrix4f rescale_mat
-      (1, 0, 0, 0,
-       0, 1, 0, 0,
-       0, 0, 0.5, 0,
-       0, 0, 0.5, 1);
-    _transform_stale = true;
-
-    _d3d_device->SetTransform(D3DTS_PROJECTION, (const D3DMATRIX *)rescale_mat.get_data());
-  }
-
-  return true;
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: DXGraphicsStateGuardian8::draw_triangles
-//       Access: Public, Virtual
-//  Description: Draws a series of disconnected triangles.
-////////////////////////////////////////////////////////////////////
-bool DXGraphicsStateGuardian8::
-draw_triangles(const GeomPrimitivePipelineReader *reader, bool force) {
-  //PStatTimer timer(_draw_primitive_pcollector);
-  _vertices_tri_pcollector.add_level(reader->get_num_vertices());
-  _primitive_batches_tri_pcollector.add_level(1);
-  if (reader->is_indexed()) {
-    int min_vertex = dx_broken_max_index ? 0 : reader->get_min_vertex();
-    int max_vertex = reader->get_max_vertex();
-
-    if (_active_vbuffer != NULL) {
-      // Indexed, vbuffers.
-      IndexBufferContext *ibc = ((GeomPrimitive *)(reader->get_object()))->prepare_now(get_prepared_objects(), this);
-      nassertr(ibc != (IndexBufferContext *)NULL, false);
-      if (!apply_index_buffer(ibc, reader, force)) {
-        return false;
-      }
-
-      _d3d_device->DrawIndexedPrimitive
-        (D3DPT_TRIANGLELIST,
-         min_vertex, max_vertex - min_vertex + 1,
-         0, reader->get_num_primitives());
-
-    } else {
-      // Indexed, client arrays.
-      const unsigned char *index_pointer = reader->get_read_pointer(force);
-      if (index_pointer == NULL) {
-        return false;
-      }
-      D3DFORMAT index_type = get_index_type(reader->get_index_type());
-      const unsigned char *vertex_pointer = _data_reader->get_array_reader(0)->get_read_pointer(force);
-      if (vertex_pointer == NULL) {
-        return false;
-      }
-      draw_indexed_primitive_up
-        (D3DPT_TRIANGLELIST,
-         min_vertex, max_vertex,
-         reader->get_num_primitives(),
-         index_pointer, index_type, vertex_pointer,
-         _data_reader->get_format()->get_array(0)->get_stride());
-    }
-  } else {
-    if (_active_vbuffer != NULL) {
-      // Nonindexed, vbuffers.
-      _d3d_device->DrawPrimitive
-        (D3DPT_TRIANGLELIST,
-         reader->get_first_vertex(),
-         reader->get_num_primitives());
-
-    } else {
-      // Nonindexed, client arrays.
-      const unsigned char *vertex_pointer = _data_reader->get_array_reader(0)->get_read_pointer(force);
-      if (vertex_pointer == NULL) {
-        return false;
-      }
-      draw_primitive_up(D3DPT_TRIANGLELIST, reader->get_num_primitives(),
-                        reader->get_first_vertex(),
-                        reader->get_num_vertices(),
-                        vertex_pointer,
-                        _data_reader->get_format()->get_array(0)->get_stride());
-    }
-  }
-  return true;
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: DXGraphicsStateGuardian8::draw_tristrips
-//       Access: Public, Virtual
-//  Description: Draws a series of triangle strips.
-////////////////////////////////////////////////////////////////////
-bool DXGraphicsStateGuardian8::
-draw_tristrips(const GeomPrimitivePipelineReader *reader, bool force) {
-  //PStatTimer timer(_draw_primitive_pcollector);
-  if (connect_triangle_strips && _current_fill_mode != RenderModeAttrib::M_wireframe) {
-    // One long triangle strip, connected by the degenerate vertices
-    // that have already been set up within the primitive.
-    _vertices_tristrip_pcollector.add_level(reader->get_num_vertices());
-    _primitive_batches_tristrip_pcollector.add_level(1);
-    if (reader->is_indexed()) {
-      int min_vertex = dx_broken_max_index ? 0 : reader->get_min_vertex();
-      int max_vertex = reader->get_max_vertex();
-
-      if (_active_vbuffer != NULL) {
-        // Indexed, vbuffers, one line triangle strip.
-        IndexBufferContext *ibc = ((GeomPrimitive *)(reader->get_object()))->prepare_now(get_prepared_objects(), this);
-        nassertr(ibc != (IndexBufferContext *)NULL, false);
-        if (!apply_index_buffer(ibc, reader, force)) {
-          return false;
-        }
-
-        _d3d_device->DrawIndexedPrimitive
-          (D3DPT_TRIANGLESTRIP,
-           min_vertex, max_vertex - min_vertex + 1,
-           0, reader->get_num_vertices() - 2);
-
-      } else {
-        // Indexed, client arrays, one long triangle strip.
-        const unsigned char *index_pointer = reader->get_read_pointer(force);
-        if (index_pointer == NULL) {
-          return false;
-        }
-        D3DFORMAT index_type = get_index_type(reader->get_index_type());
-        const unsigned char *vertex_pointer = _data_reader->get_array_reader(0)->get_read_pointer(force);
-        if (vertex_pointer == NULL) {
-          return false;
-        }
-        draw_indexed_primitive_up
-          (D3DPT_TRIANGLESTRIP,
-           min_vertex, max_vertex,
-           reader->get_num_vertices() - 2,
-           index_pointer, index_type, vertex_pointer,
-           _data_reader->get_format()->get_array(0)->get_stride());
-      }
-    } else {
-      if (_active_vbuffer != NULL) {
-        // Nonindexed, vbuffers, one long triangle strip.
-        _d3d_device->DrawPrimitive
-          (D3DPT_TRIANGLESTRIP,
-           reader->get_first_vertex(),
-           reader->get_num_vertices() - 2);
-
-      } else {
-        // Indexed, client arrays, one long triangle strip.
-        const unsigned char *vertex_pointer = _data_reader->get_array_reader(0)->get_read_pointer(force);
-        if (vertex_pointer == NULL) {
-          return false;
-        }
-        draw_primitive_up(D3DPT_TRIANGLESTRIP,
-                          reader->get_num_vertices() - 2,
-                          reader->get_first_vertex(),
-                          reader->get_num_vertices(),
-                          vertex_pointer,
-                          _data_reader->get_format()->get_array(0)->get_stride());
-      }
-    }
-
-  } else {
-    // Send the individual triangle strips, stepping over the
-    // degenerate vertices.
-    CPTA_int ends = reader->get_ends();
-    _primitive_batches_tristrip_pcollector.add_level(ends.size());
-
-    if (reader->is_indexed()) {
-      CPTA_int ends = reader->get_ends();
-      int index_stride = reader->get_index_stride();
-      _primitive_batches_tristrip_pcollector.add_level(ends.size());
-
-      GeomVertexReader mins(reader->get_mins(), 0);
-      GeomVertexReader maxs(reader->get_maxs(), 0);
-      nassertr(reader->get_mins()->get_num_rows() == (int)ends.size() &&
-               reader->get_maxs()->get_num_rows() == (int)ends.size(), false);
-
-      if (_active_vbuffer != NULL) {
-        // Indexed, vbuffers, individual triangle strips.
-        IndexBufferContext *ibc = ((GeomPrimitive *)(reader->get_object()))->prepare_now(get_prepared_objects(), this);
-        nassertr(ibc != (IndexBufferContext *)NULL, false);
-        if (!apply_index_buffer(ibc, reader, force)) {
-          return false;
-        }
-
-        unsigned int start = 0;
-        for (size_t i = 0; i < ends.size(); i++) {
-          _vertices_tristrip_pcollector.add_level(ends[i] - start);
-          unsigned int min = mins.get_data1i();
-          unsigned int max = maxs.get_data1i();
-          _d3d_device->DrawIndexedPrimitive
-            (D3DPT_TRIANGLESTRIP,
-             min, max - min + 1,
-             start, ends[i] - start - 2);
-
-          start = ends[i] + 2;
-        }
-
-      } else {
-        // Indexed, client arrays, individual triangle strips.
-        int stride = _data_reader->get_format()->get_array(0)->get_stride();
-        const unsigned char *index_pointer = reader->get_read_pointer(force);
-        if (index_pointer == NULL) {
-          return false;
-        }
-        D3DFORMAT index_type = get_index_type(reader->get_index_type());
-        const unsigned char *vertex_pointer = _data_reader->get_array_reader(0)->get_read_pointer(force);
-        if (vertex_pointer == NULL) {
-          return false;
-        }
-
-        unsigned int start = 0;
-        for (size_t i = 0; i < ends.size(); i++) {
-          _vertices_tristrip_pcollector.add_level(ends[i] - start);
-          unsigned int min = mins.get_data1i();
-          unsigned int max = maxs.get_data1i();
-          draw_indexed_primitive_up
-            (D3DPT_TRIANGLESTRIP,
-             min, max,
-             ends[i] - start - 2,
-             index_pointer + start * index_stride, index_type,
-             vertex_pointer, stride);
-
-          start = ends[i] + 2;
-        }
-      }
-    } else {
-      unsigned int first_vertex = reader->get_first_vertex();
-
-      if (_active_vbuffer != NULL) {
-        // Nonindexed, vbuffers, individual triangle strips.
-        unsigned int start = 0;
-        for (size_t i = 0; i < ends.size(); i++) {
-          _vertices_tristrip_pcollector.add_level(ends[i] - start);
-          _d3d_device->DrawPrimitive
-            (D3DPT_TRIANGLESTRIP,
-             first_vertex + start, ends[i] - start - 2);
-
-          start = ends[i] + 2;
-        }
-
-      } else {
-        // Nonindexed, client arrays, individual triangle strips.
-        const unsigned char *vertex_pointer = _data_reader->get_array_reader(0)->get_read_pointer(force);
-        if (vertex_pointer == NULL) {
-          return false;
-        }
-        int stride = _data_reader->get_format()->get_array(0)->get_stride();
-
-        unsigned int start = 0;
-        for (size_t i = 0; i < ends.size(); i++) {
-          _vertices_tristrip_pcollector.add_level(ends[i] - start);
-          draw_primitive_up(D3DPT_TRIANGLESTRIP, ends[i] - start - 2,
-                            first_vertex + start,
-                            ends[i] - start,
-                            vertex_pointer, stride);
-
-          start = ends[i] + 2;
-        }
-      }
-    }
-  }
-  return true;
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: DXGraphicsStateGuardian8::draw_trifans
-//       Access: Public, Virtual
-//  Description: Draws a series of triangle fans.
-////////////////////////////////////////////////////////////////////
-bool DXGraphicsStateGuardian8::
-draw_trifans(const GeomPrimitivePipelineReader *reader, bool force) {
-  //PStatTimer timer(_draw_primitive_pcollector);
-  CPTA_int ends = reader->get_ends();
-  _primitive_batches_trifan_pcollector.add_level(ends.size());
-
-  if (reader->is_indexed()) {
-    int min_vertex = dx_broken_max_index ? 0 : reader->get_min_vertex();
-    int max_vertex = reader->get_max_vertex();
-
-    // Send the individual triangle fans.  There's no connecting fans
-    // with degenerate vertices, so no worries about that.
-    int index_stride = reader->get_index_stride();
-
-    GeomVertexReader mins(reader->get_mins(), 0);
-    GeomVertexReader maxs(reader->get_maxs(), 0);
-    nassertr(reader->get_mins()->get_num_rows() == (int)ends.size() &&
-             reader->get_maxs()->get_num_rows() == (int)ends.size(), false);
-
-    if (_active_vbuffer != NULL) {
-      // Indexed, vbuffers.
-      IndexBufferContext *ibc = ((GeomPrimitive *)(reader->get_object()))->prepare_now(get_prepared_objects(), this);
-      nassertr(ibc != (IndexBufferContext *)NULL, false);
-      if (!apply_index_buffer(ibc, reader, force)) {
-        return false;
-      }
-
-      unsigned int start = 0;
-      for (size_t i = 0; i < ends.size(); i++) {
-        _vertices_trifan_pcollector.add_level(ends[i] - start);
-        unsigned int min = mins.get_data1i();
-        unsigned int max = maxs.get_data1i();
-        _d3d_device->DrawIndexedPrimitive
-          (D3DPT_TRIANGLEFAN,
-           min, max - min + 1,
-           start, ends[i] - start - 2);
-
-        start = ends[i];
-      }
-
-    } else {
-      // Indexed, client arrays.
-      int stride = _data_reader->get_format()->get_array(0)->get_stride();
-      const unsigned char *index_pointer = reader->get_read_pointer(force);
-      if (index_pointer == NULL) {
-        return false;
-      }
-      D3DFORMAT index_type = get_index_type(reader->get_index_type());
-      const unsigned char *vertex_pointer = _data_reader->get_array_reader(0)->get_read_pointer(force);
-      if (vertex_pointer == NULL) {
-        return false;
-      }
-
-      unsigned int start = 0;
-      for (size_t i = 0; i < ends.size(); i++) {
-        _vertices_trifan_pcollector.add_level(ends[i] - start);
-        unsigned int min = mins.get_data1i();
-        unsigned int max = maxs.get_data1i();
-        draw_indexed_primitive_up
-          (D3DPT_TRIANGLEFAN,
-           min, max,
-           ends[i] - start - 2,
-           index_pointer + start * index_stride, index_type,
-           vertex_pointer, stride);
-
-        start = ends[i];
-      }
-    }
-  } else {
-    unsigned int first_vertex = reader->get_first_vertex();
-
-    if (_active_vbuffer != NULL) {
-      // Nonindexed, vbuffers.
-      unsigned int start = 0;
-      for (size_t i = 0; i < ends.size(); i++) {
-        _vertices_trifan_pcollector.add_level(ends[i] - start);
-        _d3d_device->DrawPrimitive
-          (D3DPT_TRIANGLEFAN,
-           first_vertex + start, ends[i] - start - 2);
-
-        start = ends[i];
-      }
-
-    } else {
-      // Nonindexed, client arrays.
-      const unsigned char *vertex_pointer = _data_reader->get_array_reader(0)->get_read_pointer(force);
-      if (vertex_pointer == NULL) {
-        return false;
-      }
-      int stride = _data_reader->get_format()->get_array(0)->get_stride();
-
-      unsigned int start = 0;
-      for (size_t i = 0; i < ends.size(); i++) {
-        _vertices_trifan_pcollector.add_level(ends[i] - start);
-        draw_primitive_up(D3DPT_TRIANGLEFAN,
-                          ends[i] - start - 2,
-                          first_vertex,
-                          ends[i] - start,
-                          vertex_pointer, stride);
-        start = ends[i];
-      }
-    }
-  }
-  return true;
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: DXGraphicsStateGuardian8::draw_lines
-//       Access: Public, Virtual
-//  Description: Draws a series of disconnected line segments.
-////////////////////////////////////////////////////////////////////
-bool DXGraphicsStateGuardian8::
-draw_lines(const GeomPrimitivePipelineReader *reader, bool force) {
-  //PStatTimer timer(_draw_primitive_pcollector);
-  _vertices_other_pcollector.add_level(reader->get_num_vertices());
-  _primitive_batches_other_pcollector.add_level(1);
-
-  if (reader->is_indexed()) {
-    int min_vertex = dx_broken_max_index ? 0 : reader->get_min_vertex();
-    int max_vertex = reader->get_max_vertex();
-
-    if (_active_vbuffer != NULL) {
-      // Indexed, vbuffers.
-      IndexBufferContext *ibc = ((GeomPrimitive *)(reader->get_object()))->prepare_now(get_prepared_objects(), this);
-      nassertr(ibc != (IndexBufferContext *)NULL, false);
-      if (!apply_index_buffer(ibc, reader, force)) {
-        return false;
-      }
-
-      _d3d_device->DrawIndexedPrimitive
-        (D3DPT_LINELIST,
-         min_vertex, max_vertex - min_vertex + 1,
-         0, reader->get_num_primitives());
-
-    } else {
-      // Indexed, client arrays.
-      const unsigned char *index_pointer = reader->get_read_pointer(force);
-      if (index_pointer == NULL) {
-        return false;
-      }
-      D3DFORMAT index_type = get_index_type(reader->get_index_type());
-      const unsigned char *vertex_pointer = _data_reader->get_array_reader(0)->get_read_pointer(force);
-      if (vertex_pointer == NULL) {
-        return false;
-      }
-
-      draw_indexed_primitive_up
-        (D3DPT_LINELIST,
-         min_vertex, max_vertex,
-         reader->get_num_primitives(),
-         index_pointer, index_type, vertex_pointer,
-         _data_reader->get_format()->get_array(0)->get_stride());
-    }
-  } else {
-    if (_active_vbuffer != NULL) {
-      // Nonindexed, vbuffers.
-      _d3d_device->DrawPrimitive
-        (D3DPT_LINELIST,
-         reader->get_first_vertex(),
-         reader->get_num_primitives());
-
-    } else {
-      // Nonindexed, client arrays.
-      const unsigned char *vertex_pointer = _data_reader->get_array_reader(0)->get_read_pointer(force);
-      if (vertex_pointer == NULL) {
-        return false;
-      }
-      draw_primitive_up(D3DPT_LINELIST, reader->get_num_primitives(),
-                        reader->get_first_vertex(),
-                        reader->get_num_vertices(),
-                        vertex_pointer,
-                        _data_reader->get_format()->get_array(0)->get_stride());
-    }
-  }
-  return true;
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: DXGraphicsStateGuardian8::draw_linestrips
-//       Access: Public, Virtual
-//  Description: Draws a series of line strips.
-////////////////////////////////////////////////////////////////////
-bool DXGraphicsStateGuardian8::
-draw_linestrips(const GeomPrimitivePipelineReader *reader, bool force) {
-  return false;
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: DXGraphicsStateGuardian8::draw_points
-//       Access: Public, Virtual
-//  Description: Draws a series of disconnected points.
-////////////////////////////////////////////////////////////////////
-bool DXGraphicsStateGuardian8::
-draw_points(const GeomPrimitivePipelineReader *reader, bool force) {
-  //PStatTimer timer(_draw_primitive_pcollector);
-  _vertices_other_pcollector.add_level(reader->get_num_vertices());
-  _primitive_batches_other_pcollector.add_level(1);
-
-  // The munger should have protected us from indexed points--DirectX
-  // doesn't support them.
-  nassertr(!reader->is_indexed(), false);
-
-  if (_active_vbuffer != NULL) {
-    // Nonindexed, vbuffers.
-    _d3d_device->DrawPrimitive
-      (D3DPT_POINTLIST,
-       reader->get_first_vertex(),
-       reader->get_num_primitives());
-
-  } else {
-    // Nonindexed, client arrays.
-    const unsigned char *vertex_pointer = _data_reader->get_array_reader(0)->get_read_pointer(force);
-    if (vertex_pointer == NULL) {
-      return false;
-    }
-    draw_primitive_up(D3DPT_POINTLIST, reader->get_num_primitives(),
-                      reader->get_first_vertex(),
-                      reader->get_num_vertices(),
-                      vertex_pointer,
-                      _data_reader->get_format()->get_array(0)->get_stride());
-  }
-  return true;
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: DXGraphicsStateGuardian8::end_draw_primitives()
-//       Access: Public, Virtual
-//  Description: Called after a sequence of draw_primitive()
-//               functions are called, this should do whatever cleanup
-//               is appropriate.
-////////////////////////////////////////////////////////////////////
-void DXGraphicsStateGuardian8::
-end_draw_primitives() {
-  // Turn off vertex blending--it seems to cause problems if we leave
-  // it on.
-  if (_vertex_blending_enabled) {
-    _d3d_device->SetRenderState(D3DRS_INDEXEDVERTEXBLENDENABLE, FALSE);
-    _d3d_device->SetRenderState(D3DRS_VERTEXBLEND, D3DVBF_DISABLE);
-    _vertex_blending_enabled = false;
-  }
-
-  if (_data_reader->is_vertex_transformed()) {
-    // Restore the projection matrix that we wiped out above.
-    LMatrix4f mat = LCAST(float, _projection_mat->get_mat());
-    _d3d_device->SetTransform(D3DTS_PROJECTION,
-                              (D3DMATRIX*)mat.get_data());
-  }
-
-  GraphicsStateGuardian::end_draw_primitives();
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: DXGraphicsStateGuardian8::framebuffer_copy_to_texture
-//       Access: Public, Virtual
-//  Description: Copy the pixels within the indicated display
-//               region from the framebuffer into texture memory.
-//
-//               If z > -1, it is the cube map index into which to
-//               copy.
-////////////////////////////////////////////////////////////////////
-bool DXGraphicsStateGuardian8::
-framebuffer_copy_to_texture(Texture *tex, int view, int z,
-                            const DisplayRegion *dr, const RenderBuffer &rb) {
-  set_read_buffer(rb);
-
-  int orig_x = tex->get_x_size();
-  int orig_y = tex->get_y_size();
-
-  HRESULT hr;
-  int xo, yo, w, h;
-  dr->get_region_pixels_i(xo, yo, w, h);
-  tex->set_size_padded(w, h);
-
-  TextureContext *tc = tex->prepare_now(view, get_prepared_objects(), this);
-  if (tc == (TextureContext *)NULL) {
-    return false;
-  }
-  DXTextureContext8 *dtc = DCAST(DXTextureContext8, tc);
-  if (!dtc->create_texture(*_screen)) {
-    // Oops, we can't re-create the texture for some reason.
-    dxgsg8_cat.error()
-      << "Unable to re-create texture " << *dtc->get_texture() << endl;
-    return false;
-  }
-
-  if (tex->get_texture_type() != Texture::TT_2d_texture) {
-    // For a specialty texture like a cube map, go the slow route
-    // through RAM for now.
-    return do_framebuffer_copy_to_ram(tex, view, z, dr, rb, true);
-  }
-  nassertr(dtc->get_d3d_2d_texture() != NULL, false);
-
-  IDirect3DSurface8 *tex_level_0;
-  hr = dtc->get_d3d_2d_texture()->GetSurfaceLevel(0, &tex_level_0);
-  if (FAILED(hr)) {
-    dxgsg8_cat.error() << "GetSurfaceLev failed in copy_texture" << D3DERRORSTRING(hr);
-    return false;
-  }
-
-  // If the texture is the wrong size, we need to do something about it.
-  D3DSURFACE_DESC texdesc;
-  hr = tex_level_0->GetDesc(&texdesc);
-  if (FAILED(hr)) {
-    dxgsg8_cat.error() << "GetDesc failed in copy_texture" << D3DERRORSTRING(hr);
-    SAFE_RELEASE(tex_level_0);
-    return false;
-  }
-  if ((texdesc.Width != tex->get_x_size())||(texdesc.Height != tex->get_y_size())) {
-    if ((orig_x != tex->get_x_size()) || (orig_y != tex->get_y_size())) {
-      // Texture might be wrong size because we resized it and need to recreate.
-      SAFE_RELEASE(tex_level_0);
-      if (!dtc->create_texture(*_screen)) {
-        // Oops, we can't re-create the texture for some reason.
-        dxgsg8_cat.error()
-          << "Unable to re-create texture " << *dtc->get_texture() << endl;
-        return false;
-      }
-      hr = dtc->get_d3d_2d_texture()->GetSurfaceLevel(0, &tex_level_0);
-      if (FAILED(hr)) {
-        dxgsg8_cat.error() << "GetSurfaceLev failed in copy_texture" << D3DERRORSTRING(hr);
-        return false;
-      }
-      hr = tex_level_0->GetDesc(&texdesc);
-      if (FAILED(hr)) {
-        dxgsg8_cat.error() << "GetDesc 2 failed in copy_texture" << D3DERRORSTRING(hr);
-        SAFE_RELEASE(tex_level_0);
-        return false;
-      }
-    }
-    if ((texdesc.Width != tex->get_x_size())||(texdesc.Height != tex->get_y_size())) {
-      // If it's still the wrong size, it's because driver can't create size
-      // that we want.  In that case, there's no helping it, we have to give up.
-      dxgsg8_cat.error()
-        << "Unable to copy to texture, texture is wrong size: " << *dtc->get_texture() << endl;
-      SAFE_RELEASE(tex_level_0);
-      return false;
-    }
-  }
-
-  IDirect3DSurface8 *render_target;
-  hr = _d3d_device->GetRenderTarget(&render_target);
-  if (FAILED(hr)) {
-    dxgsg8_cat.error() << "GetRenderTgt failed in copy_texture" << D3DERRORSTRING(hr);
-    SAFE_RELEASE(tex_level_0);
-    return false;
-  }
-
-  RECT src_rect;
-
-  src_rect.left = xo;
-  src_rect.right = xo+w;
-  src_rect.top = yo;
-  src_rect.bottom = yo+h;
-
-  // now copy from fb to tex
-  bool okflag = true;
-  hr = _d3d_device->CopyRects(render_target, &src_rect, 1, tex_level_0, 0);
-  if (FAILED(hr)) {
-    dxgsg8_cat.info()
-      << "CopyRects failed in copy_texture " << D3DERRORSTRING(hr);
-    okflag = framebuffer_copy_to_ram(tex, view, z, dr, rb);
-  }
-
-  SAFE_RELEASE(render_target);
-  SAFE_RELEASE(tex_level_0);
-
-  if (okflag) {
-    dtc->mark_loaded();
-    dtc->enqueue_lru(&_prepared_objects->_graphics_memory_lru);
-
-  } else {
-    // The copy failed.  Fall back to copying it to RAM and back.
-    // Terribly slow, but what are you going to do?
-    return do_framebuffer_copy_to_ram(tex, view, z, dr, rb, true);
-  }
-
-  return true;
-}
-
-
-////////////////////////////////////////////////////////////////////
-//     Function: DXGraphicsStateGuardian8::framebuffer_copy_to_ram
-//       Access: Public, Virtual
-//  Description: Copy the pixels within the indicated display region
-//               from the framebuffer into system memory, not texture
-//               memory.  Returns true on success, false on failure.
-//
-//               This completely redefines the ram image of the
-//               indicated texture.
-////////////////////////////////////////////////////////////////////
-bool DXGraphicsStateGuardian8::
-framebuffer_copy_to_ram(Texture *tex, int view, int z,
-                        const DisplayRegion *dr, const RenderBuffer &rb) {
-  return do_framebuffer_copy_to_ram(tex, view, z, dr, rb, false);
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: DXGraphicsStateGuardian8::do_framebuffer_copy_to_ram
-//       Access: Public
-//  Description: This is the implementation of
-//               framebuffer_copy_to_ram(); it adds one additional
-//               parameter, which should be true if the framebuffer is
-//               to be inverted during the copy (as in the same way it
-//               copies to texture memory).
-////////////////////////////////////////////////////////////////////
-bool DXGraphicsStateGuardian8::
-do_framebuffer_copy_to_ram(Texture *tex, int view, int z,
-                           const DisplayRegion *dr, const RenderBuffer &rb,
-                           bool inverted) {
-  set_read_buffer(rb);
-
-  RECT rect;
-  nassertr(tex != NULL && dr != NULL, false);
-
-  int xo, yo, w, h;
-  dr->get_region_pixels_i(xo, yo, w, h);
-
-  Texture::Format format = tex->get_format();
-  Texture::ComponentType component_type = tex->get_component_type();
-
-  switch (format) {
-  case Texture::F_depth_stencil:
-    // Sorry, not (yet?) supported in pandadx.
-    return false;
-
-  default:
-    format = Texture::F_rgb;
-    component_type = Texture::T_unsigned_byte;
-  }
-
-  Texture::TextureType texture_type;
-  if (z >= 0) {
-    texture_type = Texture::TT_cube_map;
-  } else {
-    texture_type = Texture::TT_2d_texture;
-  }
-
-  if (tex->get_x_size() != w || tex->get_y_size() != h ||
-      tex->get_component_type() != component_type ||
-      tex->get_format() != format ||
-      tex->get_texture_type() != texture_type) {
-    // Re-setup the texture; its properties have changed.
-    tex->setup_texture(texture_type, w, h, tex->get_z_size(),
-                       component_type, format);
-  }
-
-  rect.top = yo;
-  rect.left = xo;
-  rect.right = xo + w;
-  rect.bottom = yo + h;
-  bool copy_inverted = false;
-
-  IDirect3DSurface8 *temp_surface = NULL;
-  HRESULT hr;
-
-  // Note if you try to grab the backbuffer and full-screen
-  // anti-aliasing is on, the backbuffer might be larger than the
-  // window size.  For screenshots it's safer to get the front buffer.
-  if (_cur_read_pixel_buffer & RenderBuffer::T_back) {
-    IDirect3DSurface8 *backbuffer = NULL;
-    // GetRenderTarget() seems to be a little more reliable than
-    // GetBackBuffer().  Might just be related to the swap_chain
-    // thing.
-    hr = _d3d_device->GetRenderTarget(&backbuffer);
-
-    if (FAILED(hr)) {
-      dxgsg8_cat.error() << "GetRenderTarget failed" << D3DERRORSTRING(hr);
-      return false;
-    }
-
-    // Since we might not be able to Lock the back buffer, we will
-    // need to copy it to a temporary surface of the appropriate type
-    // first.
-    hr = _d3d_device->CreateImageSurface(w, h, _screen->_display_mode.Format,
-                                         &temp_surface);
-    if (FAILED(hr)) {
-      dxgsg8_cat.error()
-        << "CreateImageSurface failed in copy_pixel_buffer()"
-        << D3DERRORSTRING(hr);
-      backbuffer->Release();
-      return false;
-    }
-
-    // Now we must copy from the backbuffer to our temporary surface.
-    hr = _d3d_device->CopyRects(backbuffer, &rect, 1, temp_surface, NULL);
-    if (FAILED(hr)) {
-      dxgsg8_cat.error() << "CopyRects failed" << D3DERRORSTRING(hr);
-      temp_surface->Release();
-      backbuffer->Release();
-      return false;
-    }
-
-    copy_inverted = true;
-
-    RELEASE(backbuffer, dxgsg8, "backbuffer", RELEASE_ONCE);
-
-  } else if (_cur_read_pixel_buffer & RenderBuffer::T_front) {
-
-    if (_screen->_presentation_params.Windowed) {
-      // GetFrontBuffer() retrieves the entire desktop for a monitor,
-      // so we need to reserve space for that.
-
-      // We have to use GetMonitorInfo(), since this GSG may not be
-      // for the primary monitor.
-      MONITORINFO minfo;
-      minfo.cbSize = sizeof(MONITORINFO);
-      GetMonitorInfo(_screen->_monitor, &minfo);
-
-      w = RECT_XSIZE(minfo.rcMonitor);
-      h = RECT_YSIZE(minfo.rcMonitor);
-
-      // set rect to client area of window in scrn coords
-      ClientToScreen(_screen->_window, (POINT*)&rect.left);
-      ClientToScreen(_screen->_window, (POINT*)&rect.right);
-    }
-
-    // For GetFrontBuffer(), we need a temporary surface of type
-    // A8R8G8B8.  Unlike GetBackBuffer(), GetFrontBuffer() implicitly
-    // performs a copy.
-    hr = _d3d_device->CreateImageSurface(w, h, D3DFMT_A8R8G8B8, &temp_surface);
-    if (FAILED(hr)) {
-      dxgsg8_cat.error()
-        << "CreateImageSurface failed in copy_pixel_buffer()"
-        << D3DERRORSTRING(hr);
-      return false;
-    }
-
-    hr = _d3d_device->GetFrontBuffer(temp_surface);
-
-    if (hr == D3DERR_DEVICELOST) {
-      dxgsg8_cat.error()
-        << "copy_pixel_buffer failed: device lost\n";
-      temp_surface->Release();
-      return false;
-    }
-
-    copy_inverted = true;
-
-  } else {
-    dxgsg8_cat.error()
-      << "copy_pixel_buffer: unhandled current_read_pixel_buffer type\n";
-    temp_surface->Release();
-    return false;
-  }
-
-  if (inverted) {
-    copy_inverted = !copy_inverted;
-  }
-  DXTextureContext8::d3d_surface_to_texture(rect, temp_surface,
-                                            copy_inverted, tex, view, z);
-
-  RELEASE(temp_surface, dxgsg8, "temp_surface", RELEASE_ONCE);
-
-  nassertr(tex->has_ram_image(), false);
-  return true;
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: DXGraphicsStateGuardian8::reset
-//       Access: Public, Virtual
-//  Description: Resets all internal state as if the gsg were newly
-//               created.  The GraphicsWindow pointer represents a
-//               typical window that might be used for this context;
-//               it may be required to set up the frame buffer
-//               properly the first time.
-////////////////////////////////////////////////////////////////////
-void DXGraphicsStateGuardian8::
-reset() {
-  GraphicsStateGuardian::reset();
-
-  _auto_rescale_normal = false;
-
-  // overwrite gsg defaults with these values
-
-  HRESULT hr;
-
-  // make sure gsg passes all current state down to us
-  // set_state_and_transform(RenderState::make_empty(),
-  // TransformState::make_identity());
-  // want gsg to pass all state settings down so any non-matching defaults we set here get overwritten
-
-  if (_d3d_device == NULL) {
-    return;
-  }
-
-  nassertv(_screen->_d3d8 != NULL);
-
-  D3DCAPS8 d3d_caps;
-  _d3d_device->GetDeviceCaps(&d3d_caps);
-
-  if (dxgsg8_cat.is_debug()) {
-    dxgsg8_cat.debug()
-      << "\nHwTransformAndLight = " << ((d3d_caps.DevCaps & D3DDEVCAPS_HWTRANSFORMANDLIGHT) != 0)
-      << "\nMaxTextureWidth = " << d3d_caps.MaxTextureWidth
-      << "\nMaxTextureHeight = " << d3d_caps.MaxTextureHeight
-      << "\nMaxVolumeExtent = " << d3d_caps.MaxVolumeExtent
-      << "\nMaxTextureAspectRatio = " << d3d_caps.MaxTextureAspectRatio
-      << "\nTexCoordCount = " << (d3d_caps.FVFCaps & D3DFVFCAPS_TEXCOORDCOUNTMASK)
-      << "\nMaxTextureBlendStages = " << d3d_caps.MaxTextureBlendStages
-      << "\nMaxSimultaneousTextures = " << d3d_caps.MaxSimultaneousTextures
-      << "\nMaxActiveLights = " << d3d_caps.MaxActiveLights
-      << "\nMaxUserClipPlanes = " << d3d_caps.MaxUserClipPlanes
-      << "\nMaxVertexBlendMatrices = " << d3d_caps.MaxVertexBlendMatrices
-      << "\nMaxVertexBlendMatrixIndex = " << d3d_caps.MaxVertexBlendMatrixIndex
-      << "\nMaxPointSize = " << d3d_caps.MaxPointSize
-      << "\nMaxPrimitiveCount = " << d3d_caps.MaxPrimitiveCount
-      << "\nMaxVertexIndex = " << d3d_caps.MaxVertexIndex
-      << "\nMaxStreams = " << d3d_caps.MaxStreams
-      << "\nMaxStreamStride = " << d3d_caps.MaxStreamStride
-      << "\nD3DTEXOPCAPS_MULTIPLYADD = " << ((d3d_caps.TextureOpCaps & D3DTEXOPCAPS_MULTIPLYADD) != 0)
-      << "\nD3DTEXOPCAPS_LERP = " << ((d3d_caps.TextureOpCaps & D3DTEXOPCAPS_LERP) != 0)
-      << "\nD3DPMISCCAPS_TSSARGTEMP = " << ((d3d_caps.PrimitiveMiscCaps & D3DPMISCCAPS_TSSARGTEMP) != 0)
-      << "\nVertexShaderVersion = " << D3DSHADER_VERSION_MAJOR (d3d_caps.VertexShaderVersion) << "." << D3DSHADER_VERSION_MINOR (d3d_caps.VertexShaderVersion)
-      << "\nPixelShaderVersion = " << D3DSHADER_VERSION_MAJOR (d3d_caps.PixelShaderVersion) << "." << D3DSHADER_VERSION_MINOR (d3d_caps.PixelShaderVersion)
-      << "\nMaxVertexShaderConst = " << d3d_caps.MaxVertexShaderConst
-      << "\n";
-  }
-
-  if (support_stencil) {
-    int min_stencil = D3DSTENCILCAPS_ZERO | D3DSTENCILCAPS_REPLACE | D3DSTENCILCAPS_INCR | D3DSTENCILCAPS_DECR;
-    if ((d3d_caps.StencilCaps & min_stencil) == min_stencil) {
-      if (dxgsg8_cat.is_debug()) {
-        dxgsg8_cat.debug()
-          << "Checking for stencil; mode = "
-          << D3DFormatStr(_screen->_presentation_params.AutoDepthStencilFormat)
-          << "\n";
-      }
-      switch (_screen->_presentation_params.AutoDepthStencilFormat) {
-        // These are the only formats that support stencil.
-      case D3DFMT_D15S1:
-      case D3DFMT_D24S8:
-      case D3DFMT_D24X4S4:
-        _supports_stencil = true;
-        if (dxgsg8_cat.is_debug()) {
-          dxgsg8_cat.debug()
-            << "Stencils supported.\n";
-        }
-        break;
-
-      default:
-        if (dxgsg8_cat.is_debug()) {
-          dxgsg8_cat.debug()
-            << "Stencils NOT supported.\n";
-        }
-      }
-    }
-  }
-
-  _max_vertices_per_array = d3d_caps.MaxVertexIndex;
-  _max_vertices_per_primitive = d3d_caps.MaxPrimitiveCount;
-
-  _max_texture_stages = d3d_caps.MaxSimultaneousTextures;
-
-  _max_texture_dimension = min(d3d_caps.MaxTextureWidth, d3d_caps.MaxTextureHeight);
-
-  _supports_texture_combine = ((d3d_caps.TextureOpCaps & D3DTEXOPCAPS_LERP) != 0);
-  _supports_texture_saved_result = ((d3d_caps.PrimitiveMiscCaps & D3DPMISCCAPS_TSSARGTEMP) != 0);
-  _supports_texture_dot3 = true;
-
-  // check for render to texture support
-  D3DDEVICE_CREATION_PARAMETERS creation_parameters;
-
-  _supports_render_texture = false;
-  _screen->_render_to_texture_d3d_format = D3DFMT_UNKNOWN;
-  _screen->_framebuffer_d3d_format = D3DFMT_UNKNOWN;
-
-  #define TOTAL_RENDER_TO_TEXTURE_FORMATS 3
-
-  D3DFORMAT render_to_texture_formats [TOTAL_RENDER_TO_TEXTURE_FORMATS] =
-  {
-    D3DFMT_A8R8G8B8,  // check for this format first
-    D3DFMT_X8R8G8B8,
-    D3DFMT_UNKNOWN,   // place holder for _screen->_display_mode.Format
-  };
-
-  render_to_texture_formats [TOTAL_RENDER_TO_TEXTURE_FORMATS - 1] = _screen->_display_mode.Format;
-
-  hr = _d3d_device->GetCreationParameters (&creation_parameters);
-  if (SUCCEEDED (hr)) {
-    _screen->_framebuffer_d3d_format = _screen->_display_mode.Format;
-
-    int index;
-    for (index = 0; index < TOTAL_RENDER_TO_TEXTURE_FORMATS; index++) {
-      hr = _screen->_d3d8->CheckDeviceFormat (
-          creation_parameters.AdapterOrdinal,
-          creation_parameters.DeviceType,
-          _screen->_display_mode.Format,
-          D3DUSAGE_RENDERTARGET,
-          D3DRTYPE_TEXTURE,
-          render_to_texture_formats [index]);
-      if (SUCCEEDED (hr)) {
-        _screen->_render_to_texture_d3d_format = render_to_texture_formats [index];
-        _supports_render_texture = true;
-      }
-      if (_supports_render_texture) {
-        break;
-      }
-    }
-  }
-  if (dxgsg8_cat.is_debug()) {
-    dxgsg8_cat.debug() << "Render to Texture Support = " << _supports_render_texture << "\n";
-  }
-
-  _supports_3d_texture = ((d3d_caps.TextureCaps & D3DPTEXTURECAPS_VOLUMEMAP) != 0);
-  if (_supports_3d_texture) {
-    _max_3d_texture_dimension = d3d_caps.MaxVolumeExtent;
-  }
-  _supports_cube_map = ((d3d_caps.TextureCaps & D3DPTEXTURECAPS_CUBEMAP) != 0);
-  if (_supports_cube_map) {
-    _max_cube_map_dimension = _max_texture_dimension;
-  }
-
-  _num_active_texture_stages = 0;
-
-  _max_lights = (int)d3d_caps.MaxActiveLights;
-  _max_clip_planes = (int)d3d_caps.MaxUserClipPlanes;
-  _max_vertex_transforms = d3d_caps.MaxVertexBlendMatrices;
-  _max_vertex_transform_indices = d3d_caps.MaxVertexBlendMatrixIndex;
-
-  _d3d_device->SetRenderState(D3DRS_AMBIENT, 0x0);
-
-  _clip_plane_bits = 0;
-  _d3d_device->SetRenderState(D3DRS_CLIPPLANEENABLE , 0x0);
-
-  _d3d_device->SetRenderState(D3DRS_CLIPPING, true);
-
-  _d3d_device->SetRenderState(D3DRS_SHADEMODE, D3DSHADE_GOURAUD);
-
-  _d3d_device->SetRenderState(D3DRS_ZWRITEENABLE, TRUE);
-
-  _d3d_device->SetRenderState(D3DRS_EDGEANTIALIAS, false);
-
-  _d3d_device->SetRenderState(D3DRS_ZENABLE, D3DZB_FALSE);
-
-  _d3d_device->SetRenderState(D3DRS_ALPHABLENDENABLE, FALSE);
-
-  _d3d_device->SetRenderState(D3DRS_FOGENABLE, FALSE);
-
-  _has_scene_graph_color = false;
-
-  _last_testcooplevel_result = D3D_OK;
-
-  for(int i = 0; i < MAX_POSSIBLE_TEXFMTS; i++) {
-    // look for all possible DX8 texture fmts
-    D3DFORMAT_FLAG fmtflag = D3DFORMAT_FLAG(1 << i);
-    hr = _screen->_d3d8->CheckDeviceFormat(_screen->_card_id, D3DDEVTYPE_HAL, _screen->_display_mode.Format,
-                                           0x0, D3DRTYPE_TEXTURE, g_D3DFORMATmap[fmtflag]);
-    if (SUCCEEDED(hr)){
-      _screen->_supported_tex_formats_mask |= fmtflag;
-    }
-  }
-
-  // check if compressed textures are supported
-  #define CHECK_FOR_DXTVERSION(num) \
-  if (_screen->_supported_tex_formats_mask & DXT##num##_FLAG) {\
-    if (dxgsg8_cat.is_debug()) {\
-      dxgsg8_cat.debug() << "Compressed texture format DXT" << #num << " supported \n";\
-    }\
-    _supports_compressed_texture = true;\
-    _compressed_texture_formats.set_bit(Texture::CM_dxt##num);\
-  }
-
-  CHECK_FOR_DXTVERSION(1)
-  CHECK_FOR_DXTVERSION(2)
-  CHECK_FOR_DXTVERSION(3)
-  CHECK_FOR_DXTVERSION(4)
-  CHECK_FOR_DXTVERSION(5)
-
-  #undef CHECK_FOR_DXTVERSION
-
-  // s3 virge drivers sometimes give crap values for these
-  if (_screen->_d3dcaps.MaxTextureWidth == 0)
-    _screen->_d3dcaps.MaxTextureWidth = 256;
-
-  if (_screen->_d3dcaps.MaxTextureHeight == 0)
-    _screen->_d3dcaps.MaxTextureHeight = 256;
-
-  if (_screen->_d3dcaps.RasterCaps & D3DPRASTERCAPS_FOGTABLE) {
-    // Watch out for drivers that emulate per-pixel fog with
-    // per-vertex fog (Riva128, Matrox Millen G200).  Some of these
-    // require gouraud-shading to be set to work, as if you were using
-    // vertex fog
-    _do_fog_type = PerPixelFog;
-  } else {
-    // every card is going to have vertex fog, since it's implemented
-    // in d3d runtime.
-    nassertv((_screen->_d3dcaps.RasterCaps & D3DPRASTERCAPS_FOGVERTEX) != 0);
-
-    // vertex fog may look crappy if you have large polygons in the
-    // foreground and they get clipped, so you may want to disable it
-
-    if (dx_no_vertex_fog) {
-      _do_fog_type = None;
-    } else {
-      _do_fog_type = PerVertexFog;
-
-      // range-based fog only works with vertex fog in dx7/8
-      if (dx_use_rangebased_fog && (_screen->_d3dcaps.RasterCaps & D3DPRASTERCAPS_FOGRANGE)) {
-        _d3d_device->SetRenderState(D3DRS_RANGEFOGENABLE, true);
-      }
-    }
-  }
-
-  _screen->_can_direct_disable_color_writes = ((_screen->_d3dcaps.PrimitiveMiscCaps & D3DPMISCCAPS_COLORWRITEENABLE) != 0);
-
-  // Lighting, let's turn it off initially.
-  _d3d_device->SetRenderState(D3DRS_LIGHTING, false);
-
-  // turn on dithering if the rendertarget is < 8bits/color channel
-  bool dither_enabled = ((!dx_no_dithering) && IS_16BPP_DISPLAY_FORMAT(_screen->_presentation_params.BackBufferFormat)
-                         && (_screen->_d3dcaps.RasterCaps & D3DPRASTERCAPS_DITHER));
-  _d3d_device->SetRenderState(D3DRS_DITHERENABLE, dither_enabled);
-
-  _d3d_device->SetRenderState(D3DRS_CLIPPING, true);
-
-  // Stencil test is off by default
-  _d3d_device->SetRenderState(D3DRS_STENCILENABLE, FALSE);
-
-  // Antialiasing.
-  _d3d_device->SetRenderState(D3DRS_EDGEANTIALIAS, FALSE);
-
-  _current_fill_mode = RenderModeAttrib::M_filled;
-  _d3d_device->SetRenderState(D3DRS_FILLMODE, D3DFILL_SOLID);
-
-  // must do SetTSS here because redundant states are filtered out by
-  // our code based on current values above, so initial conditions
-  // must be correct
-  _d3d_device->SetTextureStageState(0, D3DTSS_COLOROP, D3DTOP_DISABLE);  // disables texturing
-
-  _cull_face_mode = CullFaceAttrib::M_cull_none;
-  _d3d_device->SetRenderState(D3DRS_CULLMODE, D3DCULL_NONE);
-
-  _d3d_device->SetRenderState(D3DRS_ALPHAFUNC, D3DCMP_ALWAYS);
-  _d3d_device->SetRenderState(D3DRS_ALPHAREF, 255);
-  _d3d_device->SetRenderState(D3DRS_ALPHATESTENABLE, FALSE);
-
-  // this is a new DX8 state that lets you do additional operations other than ADD (e.g. subtract/max/min)
-  // must check (_screen->_d3dcaps.PrimitiveMiscCaps & D3DPMISCCAPS_BLENDOP) (yes on GF2/Radeon8500, no on TNT)
-  _d3d_device->SetRenderState(D3DRS_BLENDOP, D3DBLENDOP_ADD);
-
-  PRINT_REFCNT(dxgsg8, _d3d_device);
-
-  // Now that the GSG has been initialized, make it available for
-  // optimizations.
-  add_gsg(this);
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: DXGraphicsStateGuardian8::apply_fog
-//       Access: Public, Virtual
-//  Description:
-////////////////////////////////////////////////////////////////////
-void DXGraphicsStateGuardian8::
-apply_fog(Fog *fog) {
-  if (_do_fog_type == None)
-    return;
-
-  Fog::Mode panda_fogmode = fog->get_mode();
-  D3DFOGMODE d3dfogmode = get_fog_mode_type(panda_fogmode);
-
-  _d3d_device->SetRenderState((D3DRENDERSTATETYPE)_do_fog_type, d3dfogmode);
-
-  const LColor &fog_colr = fog->get_color();
-  _d3d_device->SetRenderState(D3DRS_FOGCOLOR,
-                              MY_D3DRGBA(fog_colr[0], fog_colr[1], fog_colr[2], 0.0f));  // Alpha bits are not used
-
-  // do we need to adjust fog start/end values based on D3DPRASTERCAPS_WFOG/D3DPRASTERCAPS_ZFOG ?
-  // if not WFOG, then docs say we need to adjust values to range [0, 1]
-
-  switch (panda_fogmode) {
-  case Fog::M_linear:
-    {
-      PN_stdfloat onset, opaque;
-      fog->get_linear_range(onset, opaque);
-
-      _d3d_device->SetRenderState(D3DRS_FOGSTART,
-                                  *((LPDWORD) (&onset)));
-      _d3d_device->SetRenderState(D3DRS_FOGEND,
-                                  *((LPDWORD) (&opaque)));
-    }
-    break;
-  case Fog::M_exponential:
-  case Fog::M_exponential_squared:
-    {
-      // Exponential fog is always camera-relative.
-      PN_stdfloat fog_density = fog->get_exp_density();
-      _d3d_device->SetRenderState(D3DRS_FOGDENSITY,
-                                  *((LPDWORD) (&fog_density)));
-    }
-    break;
-  }
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: DXGraphicsStateGuardian8::do_issue_transform
-//       Access: Protected
-//  Description: Sends the indicated transform matrix to the graphics
-//               API to be applied to future vertices.
-//
-//               This transform is the internal_transform, already
-//               converted into the GSG's internal coordinate system.
-////////////////////////////////////////////////////////////////////
-void DXGraphicsStateGuardian8::
-do_issue_transform() {
-  const TransformState *transform = _internal_transform;
-  DO_PSTATS_STUFF(_transform_state_pcollector.add_level(1));
-
-  LMatrix4f mat = LCAST(float, transform->get_mat());
-  const D3DMATRIX *d3d_mat = (const D3DMATRIX *)mat.get_data();
-  _d3d_device->SetTransform(D3DTS_WORLD, d3d_mat);
-  _transform_stale = false;
-
-  if (_auto_rescale_normal) {
-    do_auto_rescale_normal();
-  }
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: DXGraphicsStateGuardian8::do_issue_alpha_test
-//       Access: Protected
-//  Description:
-////////////////////////////////////////////////////////////////////
-void DXGraphicsStateGuardian8::
-do_issue_alpha_test() {
-  const AlphaTestAttrib *target_alpha_test = DCAST(AlphaTestAttrib, _target_rs->get_attrib_def(AlphaTestAttrib::get_class_slot()));
-  AlphaTestAttrib::PandaCompareFunc mode = target_alpha_test->get_mode();
-  if (mode == AlphaTestAttrib::M_none) {
-    _d3d_device->SetRenderState(D3DRS_ALPHATESTENABLE, FALSE);
-
-  } else {
-    //  AlphaTestAttrib::PandaCompareFunc === D3DCMPFUNC
-    _d3d_device->SetRenderState(D3DRS_ALPHAFUNC, (D3DCMPFUNC)mode);
-    _d3d_device->SetRenderState(D3DRS_ALPHAREF, (UINT) (target_alpha_test->get_reference_alpha()*255.0f));  //d3d uses 0x0-0xFF, not a float
-    _d3d_device->SetRenderState(D3DRS_ALPHATESTENABLE, TRUE);
-  }
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: DXGraphicsStateGuardian8::do_issue_render_mode
-//       Access: Protected
-//  Description:
-////////////////////////////////////////////////////////////////////
-void DXGraphicsStateGuardian8::
-do_issue_render_mode() {
-  const RenderModeAttrib *target_render_mode = DCAST(RenderModeAttrib, _target_rs->get_attrib_def(RenderModeAttrib::get_class_slot()));
-  RenderModeAttrib::Mode mode = target_render_mode->get_mode();
-
-  switch (mode) {
-  case RenderModeAttrib::M_unchanged:
-  case RenderModeAttrib::M_filled:
-  case RenderModeAttrib::M_filled_flat:
-    _d3d_device->SetRenderState(D3DRS_FILLMODE, D3DFILL_SOLID);
-    break;
-
-  case RenderModeAttrib::M_wireframe:
-    _d3d_device->SetRenderState(D3DRS_FILLMODE, D3DFILL_WIREFRAME);
-    break;
-
-  case RenderModeAttrib::M_point:
-    _d3d_device->SetRenderState(D3DRS_FILLMODE, D3DFILL_POINT);
-    break;
-
-  default:
-    dxgsg8_cat.error()
-      << "Unknown render mode " << (int)mode << endl;
-  }
-
-  // This might also specify the point size.
-  PN_stdfloat point_size = target_render_mode->get_thickness();
-  _d3d_device->SetRenderState(D3DRS_POINTSIZE, *((DWORD*)&point_size));
-
-  if (target_render_mode->get_perspective()) {
-    _d3d_device->SetRenderState(D3DRS_POINTSCALEENABLE, TRUE);
-
-    LVector3 height(0.0f, point_size, 1.0f);
-    height = height * _projection_mat->get_mat();
-    PN_stdfloat s = height[1] / point_size;
-
-    PN_stdfloat zero = 0.0f;
-    PN_stdfloat one_over_s2 = 1.0f / (s * s);
-    _d3d_device->SetRenderState(D3DRS_POINTSCALE_A, *((DWORD*)&zero));
-    _d3d_device->SetRenderState(D3DRS_POINTSCALE_B, *((DWORD*)&zero));
-    _d3d_device->SetRenderState(D3DRS_POINTSCALE_C, *((DWORD*)&one_over_s2));
-
-  } else {
-    _d3d_device->SetRenderState(D3DRS_POINTSCALEENABLE, FALSE);
-  }
-
-  _current_fill_mode = mode;
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: DXGraphicsStateGuardian8::do_issue_rescale_normal
-//       Access: Protected
-//  Description:
-////////////////////////////////////////////////////////////////////
-void DXGraphicsStateGuardian8::
-do_issue_rescale_normal() {
-  const RescaleNormalAttrib *target_rescale_normal = DCAST(RescaleNormalAttrib, _target_rs->get_attrib_def(RescaleNormalAttrib::get_class_slot()));
-  RescaleNormalAttrib::Mode mode = target_rescale_normal->get_mode();
-
-  _auto_rescale_normal = false;
-
-  switch (mode) {
-  case RescaleNormalAttrib::M_none:
-    _d3d_device->SetRenderState(D3DRS_NORMALIZENORMALS, false);
-    break;
-
-  case RescaleNormalAttrib::M_rescale:
-  case RescaleNormalAttrib::M_normalize:
-    _d3d_device->SetRenderState(D3DRS_NORMALIZENORMALS, true);
-    break;
-
-  case RescaleNormalAttrib::M_auto:
-    _auto_rescale_normal = true;
-    do_auto_rescale_normal();
-    break;
-
-  default:
-    dxgsg8_cat.error()
-      << "Unknown rescale_normal mode " << (int)mode << endl;
-  }
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: DXGraphicsStateGuardian8::do_issue_depth_test
-//       Access: Protected
-//  Description:
-////////////////////////////////////////////////////////////////////
-void DXGraphicsStateGuardian8::
-do_issue_depth_test() {
-  const DepthTestAttrib *target_depth_test = DCAST(DepthTestAttrib, _target_rs->get_attrib_def(DepthTestAttrib::get_class_slot()));
-  DepthTestAttrib::PandaCompareFunc mode = target_depth_test->get_mode();
-  if (mode == DepthTestAttrib::M_none) {
-    _d3d_device->SetRenderState(D3DRS_ZENABLE, D3DZB_FALSE);
-  } else {
-    _d3d_device->SetRenderState(D3DRS_ZENABLE, D3DZB_TRUE);
-    _d3d_device->SetRenderState(D3DRS_ZFUNC, (D3DCMPFUNC) mode);
-  }
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: DXGraphicsStateGuardian8::do_issue_depth_write
-//       Access: Protected
-//  Description:
-////////////////////////////////////////////////////////////////////
-void DXGraphicsStateGuardian8::
-do_issue_depth_write() {
-  const DepthWriteAttrib *target_depth_write = DCAST(DepthWriteAttrib, _target_rs->get_attrib_def(DepthWriteAttrib::get_class_slot()));
-  if (target_depth_write->get_mode() == DepthWriteAttrib::M_on) {
-    _d3d_device->SetRenderState(D3DRS_ZWRITEENABLE, TRUE);
-  } else {
-    _d3d_device->SetRenderState(D3DRS_ZWRITEENABLE, FALSE);
-  }
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: DXGraphicsStateGuardian8::do_issue_cull_face
-//       Access: Protected
-//  Description:
-////////////////////////////////////////////////////////////////////
-void DXGraphicsStateGuardian8::
-do_issue_cull_face() {
-  const CullFaceAttrib *target_cull_face = DCAST(CullFaceAttrib, _target_rs->get_attrib_def(CullFaceAttrib::get_class_slot()));
-  _cull_face_mode = target_cull_face->get_effective_mode();
-
-  switch (_cull_face_mode) {
-  case CullFaceAttrib::M_cull_none:
-    _d3d_device->SetRenderState(D3DRS_CULLMODE, D3DCULL_NONE);
-    break;
-  case CullFaceAttrib::M_cull_clockwise:
-    _d3d_device->SetRenderState(D3DRS_CULLMODE, D3DCULL_CW);
-    break;
-  case CullFaceAttrib::M_cull_counter_clockwise:
-    _d3d_device->SetRenderState(D3DRS_CULLMODE, D3DCULL_CCW);
-    break;
-  default:
-    dxgsg8_cat.error()
-      << "invalid cull face mode " << (int)_cull_face_mode << endl;
-    break;
-  }
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: DXGraphicsStateGuardian8::do_issue_fog
-//       Access: Protected
-//  Description:
-////////////////////////////////////////////////////////////////////
-void DXGraphicsStateGuardian8::
-do_issue_fog() {
-  const FogAttrib *target_fog = DCAST(FogAttrib, _target_rs->get_attrib_def(FogAttrib::get_class_slot()));
-  if (!target_fog->is_off()) {
-    _d3d_device->SetRenderState(D3DRS_FOGENABLE, TRUE);
-    Fog *fog = target_fog->get_fog();
-    nassertv(fog != (Fog *)NULL);
-    apply_fog(fog);
-  } else {
-    _d3d_device->SetRenderState(D3DRS_FOGENABLE, FALSE);
-  }
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: DXGraphicsStateGuardian8::do_issue_depth_offset
-//       Access: Protected
-//  Description:
-////////////////////////////////////////////////////////////////////
-void DXGraphicsStateGuardian8::
-do_issue_depth_offset() {
-  const DepthOffsetAttrib *target_depth_offset = DCAST(DepthOffsetAttrib, _target_rs->get_attrib_def(DepthOffsetAttrib::get_class_slot()));
-  int offset = target_depth_offset->get_offset();
-  _d3d_device->SetRenderState(D3DRS_ZBIAS, offset);
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: DXGraphicsStateGuardian8::do_issue_shade_model
-//       Access: Protected
-//  Description:
-////////////////////////////////////////////////////////////////////
-void DXGraphicsStateGuardian8::
-do_issue_shade_model() {
-  const ShadeModelAttrib *target_shade_model = DCAST(ShadeModelAttrib, _target_rs->get_attrib_def(ShadeModelAttrib::get_class_slot()));
-  switch (target_shade_model->get_mode()) {
-  case ShadeModelAttrib::M_smooth:
-    _d3d_device->SetRenderState(D3DRS_SHADEMODE, D3DSHADE_GOURAUD);
-    break;
-
-  case ShadeModelAttrib::M_flat:
-    _d3d_device->SetRenderState(D3DRS_SHADEMODE, D3DSHADE_FLAT);
-    break;
-  }
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: DXGraphicsStateGuardian8::set_state_and_transform
-//       Access: Public, Virtual
-//  Description: Simultaneously resets the render state and the
-//               transform state.
-//
-//               This transform specified is the "internal" net
-//               transform, already converted into the GSG's internal
-//               coordinate space by composing it to
-//               get_cs_transform().  (Previously, this used to be the
-//               "external" net transform, with the assumption that
-//               that GSG would convert it internally, but that is no
-//               longer the case.)
-//
-//               Special case: if (state==NULL), then the target
-//               state is already stored in _target.
-////////////////////////////////////////////////////////////////////
-void DXGraphicsStateGuardian8::
-set_state_and_transform(const RenderState *target,
-                        const TransformState *transform) {
-#ifndef NDEBUG
-  if (gsg_cat.is_spam()) {
-    gsg_cat.spam() << "Setting GSG state to " << (void *)target << ":\n";
-    target->write(gsg_cat.spam(false), 2);
-  }
-#endif
-  _state_pcollector.add_level(1);
-  PStatTimer timer1(_draw_set_state_pcollector);
-
-  if (transform != _internal_transform) {
-    //PStatTimer timer(_draw_set_state_transform_pcollector);
-    _state_pcollector.add_level(1);
-    _internal_transform = transform;
-    do_issue_transform();
-  }
-
-  if (target == _state_rs) {
-    return;
-  }
-  _target_rs = target;
-
-  int alpha_test_slot = AlphaTestAttrib::get_class_slot();
-  if (_target_rs->get_attrib(alpha_test_slot) != _state_rs->get_attrib(alpha_test_slot) ||
-      !_state_mask.get_bit(alpha_test_slot)) {
-    //PStatTimer timer(_draw_set_state_alpha_test_pcollector);
-    do_issue_alpha_test();
-    _state_mask.set_bit(alpha_test_slot);
-  }
-
-  int clip_plane_slot = ClipPlaneAttrib::get_class_slot();
-  if (_target_rs->get_attrib(clip_plane_slot) != _state_rs->get_attrib(clip_plane_slot) ||
-      !_state_mask.get_bit(clip_plane_slot)) {
-    //PStatTimer timer(_draw_set_state_clip_plane_pcollector);
-    do_issue_clip_plane();
-    _state_mask.set_bit(clip_plane_slot);
-  }
-
-  int color_slot = ColorAttrib::get_class_slot();
-  int color_scale_slot = ColorScaleAttrib::get_class_slot();
-  if (_target_rs->get_attrib(color_slot) != _state_rs->get_attrib(color_slot) ||
-      _target_rs->get_attrib(color_scale_slot) != _state_rs->get_attrib(color_scale_slot) ||
-      !_state_mask.get_bit(color_slot) ||
-      !_state_mask.get_bit(color_scale_slot)) {
-    //PStatTimer timer(_draw_set_state_color_pcollector);
-    do_issue_color();
-    do_issue_color_scale();
-    _state_mask.set_bit(color_slot);
-    _state_mask.set_bit(color_scale_slot);
-  }
-
-  int cull_face_slot = CullFaceAttrib::get_class_slot();
-  if (_target_rs->get_attrib(cull_face_slot) != _state_rs->get_attrib(cull_face_slot) ||
-      !_state_mask.get_bit(cull_face_slot)) {
-    //PStatTimer timer(_draw_set_state_cull_face_pcollector);
-    do_issue_cull_face();
-    _state_mask.set_bit(cull_face_slot);
-  }
-
-  int depth_offset_slot = DepthOffsetAttrib::get_class_slot();
-  if (_target_rs->get_attrib(depth_offset_slot) != _state_rs->get_attrib(depth_offset_slot) ||
-      !_state_mask.get_bit(depth_offset_slot)) {
-    //PStatTimer timer(_draw_set_state_depth_offset_pcollector);
-    do_issue_depth_offset();
-    _state_mask.set_bit(depth_offset_slot);
-  }
-
-  int depth_test_slot = DepthTestAttrib::get_class_slot();
-  if (_target_rs->get_attrib(depth_test_slot) != _state_rs->get_attrib(depth_test_slot) ||
-      !_state_mask.get_bit(depth_test_slot)) {
-    //PStatTimer timer(_draw_set_state_depth_test_pcollector);
-    do_issue_depth_test();
-    _state_mask.set_bit(depth_test_slot);
-  }
-
-  int depth_write_slot = DepthWriteAttrib::get_class_slot();
-  if (_target_rs->get_attrib(depth_write_slot) != _state_rs->get_attrib(depth_write_slot) ||
-      !_state_mask.get_bit(depth_write_slot)) {
-    //PStatTimer timer(_draw_set_state_depth_write_pcollector);
-    do_issue_depth_write();
-    _state_mask.set_bit(depth_write_slot);
-  }
-
-  int fog_slot = FogAttrib::get_class_slot();
-  if (_target_rs->get_attrib(fog_slot) != _state_rs->get_attrib(fog_slot) ||
-      !_state_mask.get_bit(fog_slot)) {
-    //PStatTimer timer(_draw_set_state_fog_pcollector);
-    do_issue_fog();
-    _state_mask.set_bit(fog_slot);
-  }
-
-  int render_mode_slot = RenderModeAttrib::get_class_slot();
-  if (_target_rs->get_attrib(render_mode_slot) != _state_rs->get_attrib(render_mode_slot) ||
-      !_state_mask.get_bit(render_mode_slot)) {
-    //PStatTimer timer(_draw_set_state_render_mode_pcollector);
-    do_issue_render_mode();
-    _state_mask.set_bit(render_mode_slot);
-  }
-
-  int rescale_normal_slot = RescaleNormalAttrib::get_class_slot();
-  if (_target_rs->get_attrib(rescale_normal_slot) != _state_rs->get_attrib(rescale_normal_slot) ||
-      !_state_mask.get_bit(rescale_normal_slot)) {
-    //PStatTimer timer(_draw_set_state_rescale_normal_pcollector);
-    do_issue_rescale_normal();
-    _state_mask.set_bit(rescale_normal_slot);
-  }
-
-  int shade_model_slot = ShadeModelAttrib::get_class_slot();
-  if (_target_rs->get_attrib(shade_model_slot) != _state_rs->get_attrib(shade_model_slot) ||
-      !_state_mask.get_bit(shade_model_slot)) {
-    //PStatTimer timer(_draw_set_state_shade_model_pcollector);
-    do_issue_shade_model();
-    _state_mask.set_bit(shade_model_slot);
-  }
-
-  int transparency_slot = TransparencyAttrib::get_class_slot();
-  int color_write_slot = ColorWriteAttrib::get_class_slot();
-  int color_blend_slot = ColorBlendAttrib::get_class_slot();
-  if (_target_rs->get_attrib(transparency_slot) != _state_rs->get_attrib(transparency_slot) ||
-      _target_rs->get_attrib(color_write_slot) != _state_rs->get_attrib(color_write_slot) ||
-      _target_rs->get_attrib(color_blend_slot) != _state_rs->get_attrib(color_blend_slot) ||
-      !_state_mask.get_bit(transparency_slot) ||
-      !_state_mask.get_bit(color_write_slot) ||
-      !_state_mask.get_bit(color_blend_slot)) {
-    //PStatTimer timer(_draw_set_state_blending_pcollector);
-    do_issue_blending();
-    _state_mask.set_bit(transparency_slot);
-    _state_mask.set_bit(color_write_slot);
-    _state_mask.set_bit(color_blend_slot);
-  }
-
-  int texture_slot = TextureAttrib::get_class_slot();
-  int tex_matrix_slot = TexMatrixAttrib::get_class_slot();
-  int tex_gen_slot = TexGenAttrib::get_class_slot();
-  if (_target_rs->get_attrib(texture_slot) != _state_rs->get_attrib(texture_slot) ||
-      _target_rs->get_attrib(tex_matrix_slot) != _state_rs->get_attrib(tex_matrix_slot) ||
-      _target_rs->get_attrib(tex_gen_slot) != _state_rs->get_attrib(tex_gen_slot) ||
-      !_state_mask.get_bit(texture_slot) ||
-      !_state_mask.get_bit(tex_matrix_slot) ||
-      !_state_mask.get_bit(tex_gen_slot)) {
-    //PStatTimer timer(_draw_set_state_texture_pcollector);
-    determine_target_texture();
-
-    // For some mysterious and disturbing reason, making this call
-    // here--which should have no effect--actually prevents the DX
-    // context from going awry.  If this call is omitted, the DX
-    // context goes foobar when switching states and refuses to draw
-    // anything at all.  I strongly suspect memory corruption
-    // somewhere, but can't locate it.
-    //    _target_texture->filter_to_max(_max_texture_stages);
-
-    do_issue_texture();
-
-    _state_texture = _target_texture;
-    _state_mask.set_bit(texture_slot);
-    _state_mask.set_bit(tex_matrix_slot);
-    _state_mask.set_bit(tex_gen_slot);
-  }
-
-  int material_slot = MaterialAttrib::get_class_slot();
-  if (_target_rs->get_attrib(material_slot) != _state_rs->get_attrib(material_slot) ||
-      !_state_mask.get_bit(material_slot)) {
-    //PStatTimer timer(_draw_set_state_material_pcollector);
-    do_issue_material();
-    _state_mask.set_bit(material_slot);
-  }
-
-  int light_slot = LightAttrib::get_class_slot();
-  if (_target_rs->get_attrib(light_slot) != _state_rs->get_attrib(light_slot) ||
-      !_state_mask.get_bit(light_slot)) {
-    //PStatTimer timer(_draw_set_state_light_pcollector);
-    do_issue_light();
-    _state_mask.set_bit(light_slot);
-  }
-
-  int stencil_slot = StencilAttrib::get_class_slot();
-  if (_target_rs->get_attrib(stencil_slot) != _state_rs->get_attrib(stencil_slot) ||
-      !_state_mask.get_bit(stencil_slot)) {
-    //PStatTimer timer(_draw_set_state_stencil_pcollector);
-    do_issue_stencil();
-    _state_mask.set_bit(stencil_slot);
-  }
-
-  int scissor_slot = ScissorAttrib::get_class_slot();
-  if (_target_rs->get_attrib(scissor_slot) != _state_rs->get_attrib(scissor_slot) ||
-      !_state_mask.get_bit(scissor_slot)) {
-    //PStatTimer timer(_draw_set_state_scissor_pcollector);
-    do_issue_scissor();
-    _state_mask.set_bit(scissor_slot);
-  }
-
-  _state_rs = _target_rs;
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: DXGraphicsStateGuardian8::bind_light
-//       Access: Public, Virtual
-//  Description: Called the first time a particular light has been
-//               bound to a given id within a frame, this should set
-//               up the associated hardware light with the light's
-//               properties.
-////////////////////////////////////////////////////////////////////
-void DXGraphicsStateGuardian8::
-bind_light(PointLight *light_obj, const NodePath &light, int light_id) {
-  // Get the light in "world coordinates" (actually, view
-  // coordinates).  This means the light in the coordinate space of
-  // the camera, converted to DX's coordinate system.
-  CPT(TransformState) transform = light.get_transform(_scene_setup->get_camera_path());
-  const LMatrix4 &light_mat = transform->get_mat();
-  LMatrix4 rel_mat = light_mat * LMatrix4::convert_mat(CS_yup_left, CS_default);
-  LPoint3f pos = LCAST(float, light_obj->get_point() * rel_mat);
-
-  D3DCOLORVALUE black;
-  black.r = black.g = black.b = black.a = 0.0f;
-  D3DLIGHT8 alight;
-  alight.Type =  D3DLIGHT_POINT;
-  alight.Diffuse  = get_light_color(light_obj);
-  alight.Ambient  =  black ;
-  LColorf color = LCAST(float, light_obj->get_specular_color());
-  alight.Specular = *(D3DCOLORVALUE *)(color.get_data());
-
-  // Position needs to specify x, y, z, and w
-  // w == 1 implies non-infinite position
-  alight.Position = *(D3DVECTOR *)pos.get_data();
-
-  alight.Range =  __D3DLIGHT_RANGE_MAX;
-  alight.Falloff =  1.0f;
-
-  const LVecBase3 &att = light_obj->get_attenuation();
-  alight.Attenuation0 = att[0];
-  alight.Attenuation1 = att[1];
-  alight.Attenuation2 = att[2];
-
-  HRESULT hr = _d3d_device->SetLight(light_id, &alight);
-  if (FAILED(hr)) {
-    wdxdisplay8_cat.warning()
-      << "Could not set light properties for " << light
-      << " to id " << light_id << ": " << D3DERRORSTRING(hr) << "\n";
-  }
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: DXGraphicsStateGuardian8::bind_light
-//       Access: Public, Virtual
-//  Description: Called the first time a particular light has been
-//               bound to a given id within a frame, this should set
-//               up the associated hardware light with the light's
-//               properties.
-////////////////////////////////////////////////////////////////////
-void DXGraphicsStateGuardian8::
-bind_light(DirectionalLight *light_obj, const NodePath &light, int light_id) {
-  static PStatCollector _draw_set_state_light_bind_directional_pcollector("Draw:Set State:Light:Bind:Directional");
-  //PStatTimer timer(_draw_set_state_light_bind_directional_pcollector);
-
-  pair<DirectionalLights::iterator, bool> lookup = _dlights.insert(DirectionalLights::value_type(light, D3DLIGHT8()));
-  D3DLIGHT8 &fdata = (*lookup.first).second;
-  if (lookup.second) {
-    // Get the light in "world coordinates" (actually, view
-    // coordinates).  This means the light in the coordinate space of
-    // the camera, converted to DX's coordinate system.
-    CPT(TransformState) transform = light.get_transform(_scene_setup->get_camera_path());
-    const LMatrix4 &light_mat = transform->get_mat();
-    LMatrix4 rel_mat = light_mat * LMatrix4::convert_mat(CS_yup_left, CS_default);
-    LVector3f dir = LCAST(float, light_obj->get_direction() * rel_mat);
-
-    D3DCOLORVALUE black;
-    black.r = black.g = black.b = black.a = 0.0f;
-
-    ZeroMemory(&fdata, sizeof(D3DLIGHT8));
-
-    fdata.Type =  D3DLIGHT_DIRECTIONAL;
-    fdata.Ambient  =  black ;
-    LColorf color = LCAST(float, light_obj->get_specular_color());
-    fdata.Specular = *(D3DCOLORVALUE *)(color.get_data());
-
-    fdata.Direction = *(D3DVECTOR *)dir.get_data();
-
-    fdata.Range =  __D3DLIGHT_RANGE_MAX;
-    fdata.Falloff =  1.0f;
-
-    fdata.Attenuation0 = 1.0f;       // constant
-    fdata.Attenuation1 = 0.0f;       // linear
-    fdata.Attenuation2 = 0.0f;       // quadratic
-  }
-
-  // We have to reset the Diffuse color at each call, because it might
-  // have changed independently of the light object itself (due to
-  // color_scale_via_lighting being in effect).
-  fdata.Diffuse  = get_light_color(light_obj);
-
-  HRESULT hr = _d3d_device->SetLight(light_id, &fdata);
-  if (FAILED(hr)) {
-    wdxdisplay8_cat.warning()
-      << "Could not set light properties for " << light
-      << " to id " << light_id << ": " << D3DERRORSTRING(hr) << "\n";
-  }
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: DXGraphicsStateGuardian8::bind_light
-//       Access: Public, Virtual
-//  Description: Called the first time a particular light has been
-//               bound to a given id within a frame, this should set
-//               up the associated hardware light with the light's
-//               properties.
-////////////////////////////////////////////////////////////////////
-void DXGraphicsStateGuardian8::
-bind_light(Spotlight *light_obj, const NodePath &light, int light_id) {
-  Lens *lens = light_obj->get_lens();
-  nassertv(lens != (Lens *)NULL);
-
-  // Get the light in "world coordinates" (actually, view
-  // coordinates).  This means the light in the coordinate space of
-  // the camera, converted to DX's coordinate system.
-  CPT(TransformState) transform = light.get_transform(_scene_setup->get_camera_path());
-  const LMatrix4 &light_mat = transform->get_mat();
-  LMatrix4 rel_mat = light_mat * LMatrix4::convert_mat(CS_yup_left, CS_default);
-  LPoint3f pos = LCAST(float, lens->get_nodal_point() * rel_mat);
-  LVector3f dir = LCAST(float, lens->get_view_vector() * rel_mat);
-
-  D3DCOLORVALUE black;
-  black.r = black.g = black.b = black.a = 0.0f;
-
-  D3DLIGHT8  alight;
-  ZeroMemory(&alight, sizeof(D3DLIGHT8));
-
-  alight.Type =  D3DLIGHT_SPOT;
-  alight.Ambient  =  black ;
-  alight.Diffuse  = get_light_color(light_obj);
-  LColorf color = LCAST(float, light_obj->get_specular_color());
-  alight.Specular = *(D3DCOLORVALUE *)(color.get_data());
-
-  alight.Position = *(D3DVECTOR *)pos.get_data();
-
-  alight.Direction = *(D3DVECTOR *)dir.get_data();
-
-  alight.Range =  __D3DLIGHT_RANGE_MAX;
-
-  // I determined this formular empirically.  It seems to mostly
-  // approximate the OpenGL spotlight equation, for a reasonable range
-  // of values for FOV.
-  PN_stdfloat fov = lens->get_hfov();
-  alight.Falloff =  light_obj->get_exponent() * (fov * fov * fov) / 1620000.0f;
-
-  alight.Theta =  0.0f;
-  alight.Phi = deg_2_rad(fov);
-
-  const LVecBase3 &att = light_obj->get_attenuation();
-  alight.Attenuation0 = att[0];
-  alight.Attenuation1 = att[1];
-  alight.Attenuation2 = att[2];
-
-  HRESULT hr = _d3d_device->SetLight(light_id, &alight);
-  if (FAILED(hr)) {
-    wdxdisplay8_cat.warning()
-      << "Could not set light properties for " << light
-      << " to id " << light_id << ": " << D3DERRORSTRING(hr) << "\n";
-  }
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: DXGraphicsStateGuardian8::get_index_type
-//       Access: Protected, Static
-//  Description: Maps from the Geom's internal numeric type symbols
-//               to DirectX's.
-////////////////////////////////////////////////////////////////////
-D3DFORMAT DXGraphicsStateGuardian8::
-get_index_type(Geom::NumericType numeric_type) {
-  switch (numeric_type) {
-  case Geom::NT_uint16:
-    return D3DFMT_INDEX16;
-
-  case Geom::NT_uint32:
-    return D3DFMT_INDEX32;
-  }
-
-  dxgsg8_cat.error()
-    << "Invalid index NumericType value (" << (int)numeric_type << ")\n";
-  return D3DFMT_INDEX16;
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: DXGraphicsStateGuardian8::do_issue_material
-//       Access: Public, Virtual
-//  Description:
-////////////////////////////////////////////////////////////////////
-void DXGraphicsStateGuardian8::
-do_issue_material() {
-  static Material empty;
-  const Material *material;
-  const MaterialAttrib *target_material = DCAST(MaterialAttrib, _target_rs->get_attrib_def(MaterialAttrib::get_class_slot()));
-  if (target_material->is_off()) {
-    material = &empty;
-  } else {
-    material = target_material->get_material();
-  }
-
-  D3DMATERIAL8 cur_material;
-  LColorf color = LCAST(float, material->get_diffuse());
-  cur_material.Diffuse = *(D3DCOLORVALUE *)(color.get_data());
-  color = LCAST(float, material->get_ambient());
-  cur_material.Ambient = *(D3DCOLORVALUE *)(color.get_data());
-  color = LCAST(float, material->get_specular());
-  cur_material.Specular = *(D3DCOLORVALUE *)(color.get_data());
-  color = LCAST(float, material->get_emission());
-  cur_material.Emissive = *(D3DCOLORVALUE *)(color.get_data());
-  cur_material.Power = material->get_shininess();
-
-  if (material->has_diffuse()) {
-    // If the material specifies an diffuse color, use it.
-    _d3d_device->SetRenderState(D3DRS_DIFFUSEMATERIALSOURCE, D3DMCS_MATERIAL);
-  } else {
-    // Otherwise, the diffuse color comes from the object color.
-    if (_has_material_force_color) {
-      color = LCAST(float, _material_force_color);
-      cur_material.Diffuse = *(D3DCOLORVALUE *)color.get_data();
-      _d3d_device->SetRenderState(D3DRS_DIFFUSEMATERIALSOURCE, D3DMCS_MATERIAL);
-    } else {
-      _d3d_device->SetRenderState(D3DRS_DIFFUSEMATERIALSOURCE, D3DMCS_COLOR1);
-    }
-  }
-  if (material->has_ambient()) {
-    // If the material specifies an ambient color, use it.
-    _d3d_device->SetRenderState(D3DRS_AMBIENTMATERIALSOURCE, D3DMCS_MATERIAL);
-  } else {
-    // Otherwise, the ambient color comes from the object color.
-    if (_has_material_force_color) {
-      color = LCAST(float, _material_force_color);
-      cur_material.Ambient = *(D3DCOLORVALUE *)color.get_data();
-      _d3d_device->SetRenderState(D3DRS_AMBIENTMATERIALSOURCE, D3DMCS_MATERIAL);
-    } else {
-      _d3d_device->SetRenderState(D3DRS_AMBIENTMATERIALSOURCE, D3DMCS_COLOR1);
-    }
-  }
-
-  if (material->has_specular()) {
-    _d3d_device->SetRenderState(D3DRS_SPECULARENABLE, TRUE);
-  } else {
-    _d3d_device->SetRenderState(D3DRS_SPECULARENABLE, FALSE);
-  }
-
-  if (material->get_local()) {
-    _d3d_device->SetRenderState(D3DRS_LOCALVIEWER, TRUE);
-  } else {
-    _d3d_device->SetRenderState(D3DRS_LOCALVIEWER, FALSE);
-  }
-
-  _d3d_device->SetMaterial(&cur_material);
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: DXGraphicsStateGuardian8::do_issue_texture
-//       Access: Public, Virtual
-//  Description:
-////////////////////////////////////////////////////////////////////
-void DXGraphicsStateGuardian8::
-do_issue_texture() {
-  DO_PSTATS_STUFF(_texture_state_pcollector.add_level(1));
-
-  int num_stages = _target_texture->get_num_on_ff_stages();
-  nassertv(num_stages <= _max_texture_stages &&
-           _num_active_texture_stages <= _max_texture_stages);
-
-  _texture_involves_color_scale = false;
-
-  // We have to match up the texcoord stage index to the order written
-  // out by the DXGeomMunger.  This means the texcoord names are
-  // written in the order indicated by the TextureAttrib.
-
-  int si;
-  for (si = 0; si < num_stages; si++) {
-    TextureStage *stage = _target_texture->get_on_ff_stage(si);
-    int texcoord_index = _target_texture->get_ff_tc_index(si);
-
-    Texture *texture = _target_texture->get_on_texture(stage);
-    nassertv(texture != (Texture *)NULL);
-    const SamplerState &sampler = _target_texture->get_on_sampler(stage);
-
-    // We always reissue every stage in DX, just in case the texcoord
-    // index or texgen mode or some other property has changed.
-    TextureContext *tc = texture->prepare_now(0, _prepared_objects, this);
-    apply_texture(si, tc, sampler);
-    set_texture_blend_mode(si, stage);
-
-    int texcoord_dimensions = 2;
-
-    CPT(TransformState) tex_mat = TransformState::make_identity();
-    const TexMatrixAttrib *target_tex_matrix = DCAST(TexMatrixAttrib, _target_rs->get_attrib_def(TexMatrixAttrib::get_class_slot()));
-    if (target_tex_matrix->has_stage(stage)) {
-      tex_mat = target_tex_matrix->get_transform(stage);
-    }
-
-    // Issue the texgen mode.
-    TexGenAttrib::Mode mode = _target_tex_gen->get_mode(stage);
-    bool any_point_sprite = false;
-
-    switch (mode) {
-    case TexGenAttrib::M_off:
-    case TexGenAttrib::M_light_vector:
-      _d3d_device->SetTextureStageState(si, D3DTSS_TEXCOORDINDEX, texcoord_index);
-      break;
-
-    case TexGenAttrib::M_eye_sphere_map:
-      {
-        _d3d_device->SetTextureStageState(si, D3DTSS_TEXCOORDINDEX,
-                                          texcoord_index | D3DTSS_TCI_CAMERASPACEREFLECTIONVECTOR);
-        // This texture matrix, applied on top of the texcoord
-        // computed by D3DTSS_TCI_CAMERASPACEREFLECTIONVECTOR,
-        // approximates the effect produced by OpenGL's GL_SPHERE_MAP.
-        static CPT(TransformState) sphere_map =
-          TransformState::make_mat(LMatrix4(0.33, 0.0f, 0.0f, 0.0f,
-                                             0.0f, 0.33, 0.0f, 0.0f,
-                                             0.0f, 0.0f, 1.0f, 0.0f,
-                                             0.5f, 0.5f, 0.0f, 1.0f));
-        tex_mat = tex_mat->compose(sphere_map);
-        texcoord_dimensions = 3;
-      }
-      break;
-
-    case TexGenAttrib::M_world_cube_map:
-      // To achieve world reflection vector, we must transform camera
-      // coordinates to world coordinates; i.e. apply the camera
-      // transform.  In the case of a vector, we should not apply the
-      // pos component of the transform.
-      {
-        _d3d_device->SetTextureStageState(si, D3DTSS_TEXCOORDINDEX,
-                                          texcoord_index | D3DTSS_TCI_CAMERASPACEREFLECTIONVECTOR);
-        texcoord_dimensions = 3;
-        CPT(TransformState) camera_transform = _scene_setup->get_camera_transform()->compose(_inv_cs_transform);
-        tex_mat = tex_mat->compose(camera_transform->set_pos(LVecBase3::zero()));
-      }
-      break;
-
-    case TexGenAttrib::M_eye_cube_map:
-      _d3d_device->SetTextureStageState(si, D3DTSS_TEXCOORDINDEX,
-                                        texcoord_index | D3DTSS_TCI_CAMERASPACEREFLECTIONVECTOR);
-      tex_mat = tex_mat->compose(_inv_cs_transform);
-      texcoord_dimensions = 3;
-      break;
-
-    case TexGenAttrib::M_world_normal:
-      // To achieve world normal, we must transform camera coordinates
-      // to world coordinates; i.e. apply the camera transform.  In
-      // the case of a normal, we should not apply the pos component
-      // of the transform.
-      {
-        _d3d_device->SetTextureStageState(si, D3DTSS_TEXCOORDINDEX,
-                                          texcoord_index | D3DTSS_TCI_CAMERASPACENORMAL);
-        texcoord_dimensions = 3;
-        CPT(TransformState) camera_transform = _scene_setup->get_camera_transform()->compose(_inv_cs_transform);
-        tex_mat = tex_mat->compose(camera_transform->set_pos(LVecBase3::zero()));
-      }
-      break;
-
-    case TexGenAttrib::M_eye_normal:
-      _d3d_device->SetTextureStageState(si, D3DTSS_TEXCOORDINDEX,
-                                        texcoord_index | D3DTSS_TCI_CAMERASPACENORMAL);
-      texcoord_dimensions = 3;
-      tex_mat = tex_mat->compose(_inv_cs_transform);
-      break;
-
-    case TexGenAttrib::M_world_position:
-      // To achieve world position, we must transform camera
-      // coordinates to world coordinates; i.e. apply the
-      // camera transform.
-      {
-        _d3d_device->SetTextureStageState(si, D3DTSS_TEXCOORDINDEX,
-                                          texcoord_index | D3DTSS_TCI_CAMERASPACEPOSITION);
-        texcoord_dimensions = 3;
-        CPT(TransformState) camera_transform = _scene_setup->get_camera_transform()->compose(_inv_cs_transform);
-        tex_mat = tex_mat->compose(camera_transform);
-      }
-      break;
-
-    case TexGenAttrib::M_eye_position:
-      _d3d_device->SetTextureStageState(si, D3DTSS_TEXCOORDINDEX,
-                                        texcoord_index | D3DTSS_TCI_CAMERASPACEPOSITION);
-      texcoord_dimensions = 3;
-      tex_mat = tex_mat->compose(_inv_cs_transform);
-      break;
-
-    case TexGenAttrib::M_point_sprite:
-      _d3d_device->SetTextureStageState(si, D3DTSS_TEXCOORDINDEX, texcoord_index);
-      any_point_sprite = true;
-      break;
-
-    case TexGenAttrib::M_constant:
-      // To generate a constant UV(w) coordinate everywhere, we use
-      // CAMERASPACEPOSITION coordinates, but we construct a special
-      // matrix that flattens the existing values to zero and then
-      // adds our desired value.
-
-      // The only reason we need to specify CAMERASPACEPOSITION at
-      // all, instead of using whatever texture coordinates (if any)
-      // happen to be on the vertices, is because we need to guarantee
-      // that there are 3-d texture coordinates, because of the
-      // 3-component texture coordinate in get_constant_value().
-      {
-        _d3d_device->SetTextureStageState(si, D3DTSS_TEXCOORDINDEX,
-                                          texcoord_index | D3DTSS_TCI_CAMERASPACEPOSITION);
-        texcoord_dimensions = 3;
-
-        const LTexCoord3 &v = _target_tex_gen->get_constant_value(stage);
-        CPT(TransformState) squash =
-          TransformState::make_pos_hpr_scale(v, LVecBase3::zero(),
-                                             LVecBase3::zero());
-        tex_mat = tex_mat->compose(squash);
-      }
-      break;
-    }
-
-    _d3d_device->SetRenderState(D3DRS_POINTSPRITEENABLE, any_point_sprite);
-
-    if (!tex_mat->is_identity()) {
-      if (/*tex_mat->is_2d() &&*/ texcoord_dimensions <= 2) {
-        // For 2-d texture coordinates, we have to reorder the matrix.
-        LMatrix4 m = tex_mat->get_mat();
-        LMatrix4f mf;
-        mf.set(m(0, 0), m(0, 1), m(0, 3), 0.0f,
-               m(1, 0), m(1, 1), m(1, 3), 0.0f,
-               m(3, 0), m(3, 1), m(3, 3), 0.0f,
-               0.0f, 0.0f, 0.0f, 1.0f);
-        _d3d_device->SetTransform(get_tex_mat_sym(si), (D3DMATRIX *)mf.get_data());
-        _d3d_device->SetTextureStageState(si, D3DTSS_TEXTURETRANSFORMFLAGS,
-                                          D3DTTFF_COUNT2);
-      } else {
-        LMatrix4f m = LCAST(float, tex_mat->get_mat());
-        _d3d_device->SetTransform(get_tex_mat_sym(si), (D3DMATRIX *)m.get_data());
-        DWORD transform_flags = texcoord_dimensions;
-        if (m.get_col(3) != LVecBase4(0.0f, 0.0f, 0.0f, 1.0f)) {
-          // If we have a projected texture matrix, we also need to
-          // set D3DTTFF_COUNT4.
-          transform_flags = D3DTTFF_COUNT4 | D3DTTFF_PROJECTED;
-        }
-        _d3d_device->SetTextureStageState(si, D3DTSS_TEXTURETRANSFORMFLAGS,
-                                          transform_flags);
-      }
-
-    } else {
-      _d3d_device->SetTextureStageState(si, D3DTSS_TEXTURETRANSFORMFLAGS,
-                                        D3DTTFF_DISABLE);
-      // For some reason, "disabling" texture coordinate transforms
-      // doesn't seem to be sufficient.  We'll load an identity matrix
-      // to underscore the point.
-      _d3d_device->SetTransform(get_tex_mat_sym(si), &_d3d_ident_mat);
-    }
-  }
-
-  // Disable the texture stages that are no longer used.
-  for (si = num_stages; si < _num_active_texture_stages; si++) {
-    _d3d_device->SetTextureStageState(si, D3DTSS_COLOROP, D3DTOP_DISABLE);
-  }
-
-  // Save the count of texture stages for next time.
-  _num_active_texture_stages = num_stages;
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: DXGraphicsStateGuardian8::reissue_transforms
-//       Access: Protected, Virtual
-//  Description: Called by clear_state_and_transform() to ensure that
-//               the current modelview and projection matrices are
-//               properly loaded in the graphics state, after a
-//               callback might have mucked them up.
-////////////////////////////////////////////////////////////////////
-void DXGraphicsStateGuardian8::
-reissue_transforms() {
-  prepare_lens();
-  do_issue_transform();
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: DXGraphicsStateGuardian8::enable_lighting
-//       Access: Protected, Virtual
-//  Description: Intended to be overridden by a derived class to
-//               enable or disable the use of lighting overall.  This
-//               is called by issue_light() according to whether any
-//               lights are in use or not.
-////////////////////////////////////////////////////////////////////
-void DXGraphicsStateGuardian8::
-enable_lighting(bool enable) {
-  _d3d_device->SetRenderState(D3DRS_LIGHTING, (DWORD)enable);
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: DXGraphicsStateGuardian8::set_ambient_light
-//       Access: Protected, Virtual
-//  Description: Intended to be overridden by a derived class to
-//               indicate the color of the ambient light that should
-//               be in effect.  This is called by issue_light() after
-//               all other lights have been enabled or disabled.
-////////////////////////////////////////////////////////////////////
-void DXGraphicsStateGuardian8::
-set_ambient_light(const LColor &color) {
-  LColor c = color;
-  c.set(c[0] * _light_color_scale[0],
-        c[1] * _light_color_scale[1],
-        c[2] * _light_color_scale[2],
-        c[3] * _light_color_scale[3]);
-
-  _d3d_device->SetRenderState(D3DRS_AMBIENT, LColor_to_D3DCOLOR(c));
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: DXGraphicsStateGuardian8::enable_light
-//       Access: Protected, Virtual
-//  Description: Intended to be overridden by a derived class to
-//               enable the indicated light id.  A specific Light will
-//               already have been bound to this id via bind_light().
-////////////////////////////////////////////////////////////////////
-void DXGraphicsStateGuardian8::
-enable_light(int light_id, bool enable) {
-  HRESULT hr = _d3d_device->LightEnable(light_id, enable);
-
-  if (FAILED(hr)) {
-    wdxdisplay8_cat.warning()
-      << "Could not enable light " << light_id << ": "
-      << D3DERRORSTRING(hr) << "\n";
-  }
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: DXGraphicsStateGuardian8::enable_clip_plane
-//       Access: Protected, Virtual
-//  Description: Intended to be overridden by a derived class to
-//               enable the indicated clip_plane id.  A specific
-//               PlaneNode will already have been bound to this id via
-//               bind_clip_plane().
-////////////////////////////////////////////////////////////////////
-void DXGraphicsStateGuardian8::
-enable_clip_plane(int plane_id, bool enable) {
-  if (enable) {
-    _clip_plane_bits |= ((DWORD)1 << plane_id);
-  } else {
-    _clip_plane_bits &= ~((DWORD)1 << plane_id);
-  }
-  _d3d_device->SetRenderState(D3DRS_CLIPPLANEENABLE, _clip_plane_bits);
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: DXGraphicsStateGuardian8::bind_clip_plane
-//       Access: Protected, Virtual
-//  Description: Called the first time a particular clip_plane has been
-//               bound to a given id within a frame, this should set
-//               up the associated hardware clip_plane with the clip_plane's
-//               properties.
-////////////////////////////////////////////////////////////////////
-void DXGraphicsStateGuardian8::
-bind_clip_plane(const NodePath &plane, int plane_id) {
-  // Get the plane in "world coordinates" (actually, view
-  // coordinates).  This means the plane in the coordinate space of
-  // the camera, converted to DX's coordinate system.
-  CPT(TransformState) transform = plane.get_transform(_scene_setup->get_camera_path());
-  const LMatrix4 &plane_mat = transform->get_mat();
-  LMatrix4 rel_mat = plane_mat * LMatrix4::convert_mat(CS_yup_left, CS_default);
-  const PlaneNode *plane_node;
-  DCAST_INTO_V(plane_node, plane.node());
-  LPlanef world_plane = LCAST(float, plane_node->get_plane() * rel_mat);
-
-  HRESULT hr = _d3d_device->SetClipPlane(plane_id, world_plane.get_data());
-  if (FAILED(hr)) {
-    wdxdisplay8_cat.warning()
-      << "Could not set clip plane for " << plane
-      << " to id " << plane_id << ": " << D3DERRORSTRING(hr) << "\n";
-  }
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: DXGraphicsStateGuardian8::set_blend_mode
-//       Access: Protected, Virtual
-//  Description: Called after any of the things that might change
-//               blending state have changed, this function is
-//               responsible for setting the appropriate color
-//               blending mode based on the current properties.
-////////////////////////////////////////////////////////////////////
-void DXGraphicsStateGuardian8::
-do_issue_blending() {
-
-  // Handle the color_write attrib.  If color_write is off, then
-  // all the other blending-related stuff doesn't matter.  If the
-  // device doesn't support color-write, we use blending tricks
-  // to effectively disable color write.
-  const ColorWriteAttrib *target_color_write = DCAST(ColorWriteAttrib, _target_rs->get_attrib_def(ColorWriteAttrib::get_class_slot()));
-  unsigned int color_channels =
-    target_color_write->get_channels() & _color_write_mask;
-  if (color_channels == ColorWriteAttrib::C_off) {
-    if (_screen->_can_direct_disable_color_writes) {
-      _d3d_device->SetRenderState(D3DRS_ALPHABLENDENABLE, FALSE);
-      _d3d_device->SetRenderState(D3DRS_COLORWRITEENABLE, (DWORD)0x0);
-    } else {
-      _d3d_device->SetRenderState(D3DRS_ALPHABLENDENABLE, TRUE);
-      _d3d_device->SetRenderState(D3DRS_SRCBLEND, D3DBLEND_ZERO);
-      _d3d_device->SetRenderState(D3DRS_DESTBLEND, D3DBLEND_ONE);
-    }
-    return;
-  }
-
-  if (_screen->_can_direct_disable_color_writes) {
-    _d3d_device->SetRenderState(D3DRS_COLORWRITEENABLE, color_channels);
-  }
-
-  const ColorBlendAttrib *target_color_blend = DCAST(ColorBlendAttrib, _target_rs->get_attrib_def(ColorBlendAttrib::get_class_slot()));
-  ColorBlendAttrib::Mode color_blend_mode = target_color_blend->get_mode();
-
-  const TransparencyAttrib *target_transparency = DCAST(TransparencyAttrib, _target_rs->get_attrib_def(TransparencyAttrib::get_class_slot()));
-  TransparencyAttrib::Mode transparency_mode = target_transparency->get_mode();
-
-  // Is there a color blend set?
-  if (color_blend_mode != ColorBlendAttrib::M_none) {
-    _d3d_device->SetRenderState(D3DRS_ALPHABLENDENABLE, TRUE);
-
-    switch (color_blend_mode) {
-    case ColorBlendAttrib::M_add:
-      _d3d_device->SetRenderState(D3DRS_BLENDOP, D3DBLENDOP_ADD);
-      break;
-
-    case ColorBlendAttrib::M_subtract:
-      _d3d_device->SetRenderState(D3DRS_BLENDOP, D3DBLENDOP_SUBTRACT);
-      break;
-
-    case ColorBlendAttrib::M_inv_subtract:
-      _d3d_device->SetRenderState(D3DRS_BLENDOP, D3DBLENDOP_REVSUBTRACT);
-      break;
-
-    case ColorBlendAttrib::M_min:
-      _d3d_device->SetRenderState(D3DRS_BLENDOP, D3DBLENDOP_MIN);
-      break;
-
-    case ColorBlendAttrib::M_max:
-      _d3d_device->SetRenderState(D3DRS_BLENDOP, D3DBLENDOP_MAX);
-      break;
-    }
-
-    _d3d_device->SetRenderState(D3DRS_SRCBLEND,
-                                get_blend_func(target_color_blend->get_operand_a()));
-    _d3d_device->SetRenderState(D3DRS_DESTBLEND,
-                                get_blend_func(target_color_blend->get_operand_b()));
-    return;
-  }
-
-  // No color blend; is there a transparency set?
-  switch (transparency_mode) {
-  case TransparencyAttrib::M_none:
-  case TransparencyAttrib::M_binary:
-    break;
-
-  case TransparencyAttrib::M_alpha:
-  case TransparencyAttrib::M_multisample:
-  case TransparencyAttrib::M_multisample_mask:
-  case TransparencyAttrib::M_dual:
-    _d3d_device->SetRenderState(D3DRS_ALPHABLENDENABLE, TRUE);
-    _d3d_device->SetRenderState(D3DRS_BLENDOP, D3DBLENDOP_ADD);
-    _d3d_device->SetRenderState(D3DRS_SRCBLEND, D3DBLEND_SRCALPHA);
-    _d3d_device->SetRenderState(D3DRS_DESTBLEND, D3DBLEND_INVSRCALPHA);
-    return;
-
-  default:
-    dxgsg8_cat.error()
-      << "invalid transparency mode " << (int)transparency_mode << endl;
-    break;
-  }
-
-  // Nothing's set, so disable blending.
-  _d3d_device->SetRenderState(D3DRS_ALPHABLENDENABLE, FALSE);
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: DXGraphicsStateGuardian8::close_gsg
-//       Access: Protected, Virtual
-//  Description: This is called by the associated GraphicsWindow when
-//               close_window() is called.  It should null out the
-//               _win pointer and possibly free any open resources
-//               associated with the GSG.
-////////////////////////////////////////////////////////////////////
-void DXGraphicsStateGuardian8::
-close_gsg() {
-  GraphicsStateGuardian::close_gsg();
-
-  // Unlike in OpenGL, in DX8 it is safe to try to explicitly release
-  // any textures here.  And it may even be a good idea.
-  if (_prepared_objects->get_ref_count() == 1) {
-    release_all();
-
-    // Now we need to actually delete all of the objects we just
-    // released.
-    Thread *current_thread = Thread::get_current_thread();
-    _prepared_objects->begin_frame(this, current_thread);
-    _prepared_objects->end_frame(current_thread);
-  }
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: DXGraphicsStateGuardian8::free_nondx_resources
-//       Access: Public
-//  Description: Frees some memory that was explicitly allocated
-//               within the dxgsg.
-////////////////////////////////////////////////////////////////////
-void DXGraphicsStateGuardian8::
-free_nondx_resources() {
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: DXGraphicsStateGuardian8::free_d3d_device
-//       Access: Public
-//  Description: setup for re-calling dx_init(), this is not the final
-//               exit cleanup routine (see dx_cleanup)
-////////////////////////////////////////////////////////////////////
-void DXGraphicsStateGuardian8::
-free_d3d_device() {
-  // don't want a full reset of gsg, just a state clear
-  _state_rs = RenderState::make_empty();
-  _state_mask.clear();
-
-  // want gsg to pass all state settings through
-
-  _dx_is_ready = false;
-
-  if (_d3d_device != NULL)
-    for(int i = 0;i<D3D_MAXTEXTURESTAGES;i++)
-      _d3d_device->SetTexture(i, NULL);  // d3d should release this stuff internally anyway, but whatever
-
-  release_all();
-
-  if (_d3d_device != NULL)
-    RELEASE(_d3d_device, dxgsg8, "d3dDevice", RELEASE_DOWN_TO_ZERO);
-
-  free_nondx_resources();
-
-  // obviously we don't release ID3D8, just ID3DDevice8
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: DXGraphicsStateGuardian8::set_draw_buffer
-//       Access: Protected
-//  Description: Sets up the glDrawBuffer to render into the buffer
-//               indicated by the RenderBuffer object.  This only sets
-//               up the color bits; it does not affect the depth,
-//               stencil, accum layers.
-////////////////////////////////////////////////////////////////////
-void DXGraphicsStateGuardian8::
-set_draw_buffer(const RenderBuffer &rb) {
-  dxgsg8_cat.fatal() << "DX set_draw_buffer unimplemented!!!";
-  return;
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: DXGraphicsStateGuardian8::set_read_buffer
-//       Access: Protected
-//  Description: Vestigial analog of glReadBuffer
-////////////////////////////////////////////////////////////////////
-void DXGraphicsStateGuardian8::
-set_read_buffer(const RenderBuffer &rb) {
-  if (rb._buffer_type & RenderBuffer::T_front) {
-    _cur_read_pixel_buffer = RenderBuffer::T_front;
-  } else  if (rb._buffer_type & RenderBuffer::T_back) {
-    _cur_read_pixel_buffer = RenderBuffer::T_back;
-  } else {
-    dxgsg8_cat.error() << "Invalid or unimplemented Argument to set_read_buffer!\n";
-  }
-  return;
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: DXGraphicsStateGuardian8::do_auto_rescale_normal
-//       Access: Protected
-//  Description: Issues the appropriate GL commands to either rescale
-//               or normalize the normals according to the current
-//               transform.
-////////////////////////////////////////////////////////////////////
-void DXGraphicsStateGuardian8::
-do_auto_rescale_normal() {
-  if (_internal_transform->has_identity_scale()) {
-    // If there's no scale, don't normalize anything.
-    _d3d_device->SetRenderState(D3DRS_NORMALIZENORMALS, false);
-
-  } else {
-    // If there is a scale, turn on normalization.
-    _d3d_device->SetRenderState(D3DRS_NORMALIZENORMALS, true);
-  }
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: GLGraphicsStateGuardian::get_light_color
-//       Access: Public
-//  Description: Returns the array of four floats that should be
-//               issued as the light's color, as scaled by the current
-//               value of _light_color_scale, in the case of
-//               color_scale_via_lighting.
-////////////////////////////////////////////////////////////////////
-const D3DCOLORVALUE &DXGraphicsStateGuardian8::
-get_light_color(Light *light) const {
-  LColor c = light->get_color();
-  static LColorf cf;
-  cf.set(c[0] * _light_color_scale[0],
-         c[1] * _light_color_scale[1],
-         c[2] * _light_color_scale[2],
-         c[3] * _light_color_scale[3]);
-  return *(D3DCOLORVALUE *)cf.get_data();
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: DXGraphicsStateGuardian8::get_blend_func
-//       Access: Protected, Static
-//  Description: Maps from ColorBlendAttrib::Operand to D3DBLEND
-//               value.
-////////////////////////////////////////////////////////////////////
-D3DBLEND DXGraphicsStateGuardian8::
-get_blend_func(ColorBlendAttrib::Operand operand) {
-  switch (operand) {
-  case ColorBlendAttrib::O_zero:
-    return D3DBLEND_ZERO;
-
-  case ColorBlendAttrib::O_one:
-    return D3DBLEND_ONE;
-
-  case ColorBlendAttrib::O_incoming_color:
-    return D3DBLEND_SRCCOLOR;
-
-  case ColorBlendAttrib::O_one_minus_incoming_color:
-    return D3DBLEND_INVSRCCOLOR;
-
-  case ColorBlendAttrib::O_fbuffer_color:
-    return D3DBLEND_DESTCOLOR;
-
-  case ColorBlendAttrib::O_one_minus_fbuffer_color:
-    return D3DBLEND_INVDESTCOLOR;
-
-  case ColorBlendAttrib::O_incoming_alpha:
-    return D3DBLEND_SRCALPHA;
-
-  case ColorBlendAttrib::O_one_minus_incoming_alpha:
-    return D3DBLEND_INVSRCALPHA;
-
-  case ColorBlendAttrib::O_fbuffer_alpha:
-    return D3DBLEND_DESTALPHA;
-
-  case ColorBlendAttrib::O_one_minus_fbuffer_alpha:
-    return D3DBLEND_INVDESTALPHA;
-
-  case ColorBlendAttrib::O_constant_color:
-    // Not supported by DX.
-    return D3DBLEND_SRCCOLOR;
-
-  case ColorBlendAttrib::O_one_minus_constant_color:
-    // Not supported by DX.
-    return D3DBLEND_INVSRCCOLOR;
-
-  case ColorBlendAttrib::O_constant_alpha:
-    // Not supported by DX.
-    return D3DBLEND_SRCALPHA;
-
-  case ColorBlendAttrib::O_one_minus_constant_alpha:
-    // Not supported by DX.
-    return D3DBLEND_INVSRCALPHA;
-
-  case ColorBlendAttrib::O_incoming_color_saturate:
-    return D3DBLEND_SRCALPHASAT;
-  }
-
-  dxgsg8_cat.error()
-    << "Unknown color blend operand " << (int)operand << endl;
-  return D3DBLEND_ZERO;
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: DXGraphicsStateGuardian8::report_texmgr_stats
-//       Access: Protected
-//  Description: Reports the DX texture manager's activity to PStats.
-////////////////////////////////////////////////////////////////////
-void DXGraphicsStateGuardian8::
-report_texmgr_stats() {
-
-#ifdef DO_PSTATS
-  HRESULT hr;
-#ifdef TEXMGRSTATS_USES_GETAVAILVIDMEM
-  DWORD dwTexTotal, dwTexFree, dwVidTotal, dwVidFree;
-
-  if (_total_texmem_pcollector.is_active()) {
-    DDSCAPS2 ddsCaps;
-
-    ZeroMemory(&ddsCaps, sizeof(ddsCaps));
-
-    ddsCaps.dwCaps = DDSCAPS_VIDEOMEMORY | DDSCAPS_PRIMARYSURFACE | DDSCAPS_3DDEVICE;
-    if (FAILED( hr = _d3d_device->GetAvailableVidMem(&ddsCaps, &dwVidTotal, &dwVidFree))) {
-      dxgsg8_cat.fatal() << "report_texmgr GetAvailableVidMem for VIDMEM failed : result = " << D3DERRORSTRING(hr);
-      throw_event("panda3d-render-error");
-      return;
-    }
-
-    ddsCaps.dwCaps = DDSCAPS_TEXTURE;
-    if (FAILED( hr = _d3d_device->GetAvailableVidMem(&ddsCaps, &dwTexTotal, &dwTexFree))) {
-      dxgsg8_cat.fatal() << "report_texmgr GetAvailableVidMem for TEXTURE failed : result = " << D3DERRORSTRING(hr);
-      throw_event("panda3d-render-error");
-      return;
-    }
-  }
-#endif  // TEXMGRSTATS_USES_GETAVAILVIDMEM
-
-  D3DDEVINFO_RESOURCEMANAGER all_resource_stats;
-  ZeroMemory(&all_resource_stats, sizeof(D3DDEVINFO_RESOURCEMANAGER));
-
-  if (!_tex_stats_retrieval_impossible) {
-    hr = _d3d_device->GetInfo(D3DDEVINFOID_RESOURCEMANAGER, &all_resource_stats, sizeof(D3DDEVINFO_RESOURCEMANAGER));
-    if (hr != D3D_OK) {
-      if (hr == S_FALSE) {
-        static int PrintedMsg = 2;
-        if (PrintedMsg>0) {
-          if (dxgsg8_cat.is_debug()) {
-            dxgsg8_cat.debug()
-              << "texstats GetInfo() requires debug DX DLLs to be installed!!\n";
-          }
-          ZeroMemory(&all_resource_stats, sizeof(D3DDEVINFO_RESOURCEMANAGER));
-          _tex_stats_retrieval_impossible = true;
-        }
-      } else {
-        dxgsg8_cat.error() << "GetInfo(RESOURCEMANAGER) failed to get tex stats: result = " << D3DERRORSTRING(hr);
-        return;
-      }
-    }
-  }
-
-  // Tell PStats about the state of the texture memory.
-
-  if (_texmgrmem_total_pcollector.is_active()) {
-    // report zero if no debug dlls, to signal this info is invalid
-    _texmgrmem_total_pcollector.set_level(all_resource_stats.stats[D3DRTYPE_TEXTURE].TotalBytes);
-    _texmgrmem_resident_pcollector.set_level(all_resource_stats.stats[D3DRTYPE_TEXTURE].WorkingSetBytes);
-  }
-#ifdef TEXMGRSTATS_USES_GETAVAILVIDMEM
-  if (_total_texmem_pcollector.is_active()) {
-    _total_texmem_pcollector.set_level(dwTexTotal);
-    _used_texmem_pcollector.set_level(dwTexTotal - dwTexFree);
-  }
-#endif  // TEXMGRSTATS_USES_GETAVAILVIDMEM
-#endif  // DO_PSTATS
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: DXGraphicsStateGuardian8::set_context
-//       Access: Protected
-//  Description:
-////////////////////////////////////////////////////////////////////
-void DXGraphicsStateGuardian8::
-set_context(DXScreenData *new_context) {
-  nassertv(new_context != NULL);
-  _screen = new_context;
-  _d3d_device = _screen->_d3d_device;   //copy this one field for speed of deref
-  _swap_chain = _screen->_swap_chain;   //copy this one field for speed of deref
-
-  _screen->_dxgsg8 = this;
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: DXGraphicsStateGuardian8::set_render_target
-//       Access: Protected
-//  Description: Set render target to the backbuffer of current swap
-//               chain.
-////////////////////////////////////////////////////////////////////
-void DXGraphicsStateGuardian8::
-set_render_target() {
-  if (_d3d_device == NULL) {
-    return;
-  }
-
-  LPDIRECT3DSURFACE8 back = NULL, stencil = NULL;
-
-  if (!_swap_chain)  //maybe fullscreen mode or main/single window
-    _d3d_device->GetBackBuffer(0, D3DBACKBUFFER_TYPE_MONO, &back);
-  else
-    _swap_chain->GetBackBuffer(0, D3DBACKBUFFER_TYPE_MONO, &back);
-
-  //wdxdisplay8_cat.debug() << "swapchain is " << _swap_chain << "\n";
-  //wdxdisplay8_cat.debug() << "back buffer is " << back << "\n";
-
-  _d3d_device->GetDepthStencilSurface(&stencil);
-  _d3d_device->SetRenderTarget(back, stencil);
-  if (back) {
-    back->Release();
-  }
-  if (stencil) {
-    stencil->Release();
-  }
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: DXGraphicsStateGuardian8::set_texture_blend_mode
-//       Access: Protected
-//  Description:
-////////////////////////////////////////////////////////////////////
-void DXGraphicsStateGuardian8::
-set_texture_blend_mode(int i, const TextureStage *stage) {
-  switch (stage->get_mode()) {
-  case TextureStage::M_modulate:
-  case TextureStage::M_modulate_glow:
-  case TextureStage::M_modulate_gloss:
-    // emulates GL_MODULATE glTexEnv mode
-    _d3d_device->SetTextureStageState(i, D3DTSS_COLOROP, D3DTOP_MODULATE);
-    _d3d_device->SetTextureStageState(i, D3DTSS_COLORARG1, D3DTA_TEXTURE);
-    _d3d_device->SetTextureStageState(i, D3DTSS_COLORARG2, D3DTA_CURRENT);
-    _d3d_device->SetTextureStageState(i, D3DTSS_ALPHAOP, D3DTOP_MODULATE);
-    _d3d_device->SetTextureStageState(i, D3DTSS_ALPHAARG1, D3DTA_TEXTURE);
-    _d3d_device->SetTextureStageState(i, D3DTSS_ALPHAARG2, D3DTA_CURRENT);
-    break;
-
-  case TextureStage::M_decal:
-    // emulates GL_DECAL glTexEnv mode
-    _d3d_device->SetTextureStageState(i, D3DTSS_COLOROP, D3DTOP_BLENDTEXTUREALPHA);
-    _d3d_device->SetTextureStageState(i, D3DTSS_COLORARG1, D3DTA_TEXTURE);
-    _d3d_device->SetTextureStageState(i, D3DTSS_COLORARG2, D3DTA_CURRENT);
-
-    _d3d_device->SetTextureStageState(i, D3DTSS_ALPHAOP, D3DTOP_SELECTARG1);
-    _d3d_device->SetTextureStageState(i, D3DTSS_ALPHAARG1, D3DTA_CURRENT);
-    break;
-
-  case TextureStage::M_replace:
-    _d3d_device->SetTextureStageState(i, D3DTSS_COLOROP, D3DTOP_SELECTARG1);
-    _d3d_device->SetTextureStageState(i, D3DTSS_COLORARG1, D3DTA_TEXTURE);
-
-    _d3d_device->SetTextureStageState(i, D3DTSS_ALPHAOP, D3DTOP_SELECTARG1);
-    _d3d_device->SetTextureStageState(i, D3DTSS_ALPHAARG1, D3DTA_TEXTURE);
-    break;
-
-  case TextureStage::M_add:
-    _d3d_device->SetTextureStageState(i, D3DTSS_COLOROP, D3DTOP_ADD);
-    _d3d_device->SetTextureStageState(i, D3DTSS_COLORARG1, D3DTA_TEXTURE);
-    _d3d_device->SetTextureStageState(i, D3DTSS_COLORARG2, D3DTA_CURRENT);
-
-    _d3d_device->SetTextureStageState(i, D3DTSS_ALPHAOP, D3DTOP_MODULATE);
-    _d3d_device->SetTextureStageState(i, D3DTSS_ALPHAARG1, D3DTA_TEXTURE);
-    _d3d_device->SetTextureStageState(i, D3DTSS_ALPHAARG2, D3DTA_CURRENT);
-    break;
-
-  case TextureStage::M_blend:
-  case TextureStage::M_blend_color_scale:
-    {
-      _d3d_device->SetTextureStageState(i, D3DTSS_COLOROP, D3DTOP_LERP);
-      _d3d_device->SetTextureStageState(i, D3DTSS_COLORARG0, D3DTA_TEXTURE);
-      _d3d_device->SetTextureStageState(i, D3DTSS_COLORARG2, D3DTA_CURRENT);
-      _d3d_device->SetTextureStageState(i, D3DTSS_COLORARG1, D3DTA_TFACTOR);
-
-      _d3d_device->SetTextureStageState(i, D3DTSS_ALPHAOP, D3DTOP_MODULATE);
-      _d3d_device->SetTextureStageState(i, D3DTSS_ALPHAARG1, D3DTA_TEXTURE);
-      _d3d_device->SetTextureStageState(i, D3DTSS_ALPHAARG2, D3DTA_CURRENT);
-    }
-    break;
-
-  case TextureStage::M_combine:
-    // M_combine mode begins a collection of more sophisticated modes,
-    // which match up more closely with DirectX's built-in modes.
-    _d3d_device->SetTextureStageState
-      (i, D3DTSS_COLOROP,
-       get_texture_operation(stage->get_combine_rgb_mode(),
-                             stage->get_rgb_scale()));
-
-    switch (stage->get_num_combine_rgb_operands()) {
-    case 3:
-      _d3d_device->SetTextureStageState
-        (i, D3DTSS_COLORARG0,
-         get_texture_argument(stage->get_combine_rgb_source2(),
-                              stage->get_combine_rgb_operand2()));
-      // fall through
-
-    case 2:
-      _d3d_device->SetTextureStageState
-        (i, D3DTSS_COLORARG2,
-         get_texture_argument(stage->get_combine_rgb_source1(),
-                              stage->get_combine_rgb_operand1()));
-      // fall through
-
-    case 1:
-      _d3d_device->SetTextureStageState
-        (i, D3DTSS_COLORARG1,
-         get_texture_argument(stage->get_combine_rgb_source0(),
-                              stage->get_combine_rgb_operand0()));
-      // fall through
-
-    default:
-      break;
-    }
-
-    _d3d_device->SetTextureStageState
-      (i, D3DTSS_ALPHAOP,
-       get_texture_operation(stage->get_combine_alpha_mode(),
-                             stage->get_alpha_scale()));
-
-    switch (stage->get_num_combine_alpha_operands()) {
-    case 3:
-      _d3d_device->SetTextureStageState
-        (i, D3DTSS_ALPHAARG0,
-         get_texture_argument(stage->get_combine_alpha_source2(),
-                              stage->get_combine_alpha_operand2()));
-      // fall through
-
-    case 2:
-      _d3d_device->SetTextureStageState
-        (i, D3DTSS_ALPHAARG2,
-         get_texture_argument(stage->get_combine_alpha_source1(),
-                              stage->get_combine_alpha_operand1()));
-      // fall through
-
-    case 1:
-      _d3d_device->SetTextureStageState
-        (i, D3DTSS_ALPHAARG1,
-         get_texture_argument(stage->get_combine_alpha_source0(),
-                              stage->get_combine_alpha_operand0()));
-      // fall through
-
-    default:
-      break;
-    }
-    break;
-
-  default:
-    dxgsg8_cat.error()
-      << "Unknown texture mode " << (int)stage->get_mode() << endl;
-    break;
-  }
-
-  if (stage->get_saved_result()) {
-    _d3d_device->SetTextureStageState(i, D3DTSS_RESULTARG, D3DTA_TEMP);
-  } else {
-    _d3d_device->SetTextureStageState(i, D3DTSS_RESULTARG, D3DTA_CURRENT);
-  }
-
-  if (stage->uses_color()) {
-    // Set up the constant color for this stage.
-
-    // Actually, DX8 doesn't support a per-stage constant color, but
-    // it does support one TEXTUREFACTOR color for the whole pipeline.
-    // This does mean you can't have two different blends in effect
-    // with different colors on the same object.  However, DX9 does
-    // support a per-stage constant color with the D3DTA_CONSTANT
-    // argument--so we should implement that when this code gets
-    // ported to DX9.
-
-    D3DCOLOR texture_factor;
-    if (stage->involves_color_scale() && _color_scale_enabled) {
-      LColor color = stage->get_color();
-      color.set(color[0] * _current_color_scale[0],
-                color[1] * _current_color_scale[1],
-                color[2] * _current_color_scale[2],
-                color[3] * _current_color_scale[3]);
-      _texture_involves_color_scale = true;
-      texture_factor = LColor_to_D3DCOLOR(color);
-    } else {
-      texture_factor = LColor_to_D3DCOLOR(stage->get_color());
-    }
-    _d3d_device->SetRenderState(D3DRS_TEXTUREFACTOR, texture_factor);
-  }
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: DXGraphicsStateGuardian8::dx_cleanup
-//       Access: Protected
-//  Description: Clean up the DirectX environment, accounting for exit()
-////////////////////////////////////////////////////////////////////
-void DXGraphicsStateGuardian8::
-dx_cleanup() {
-  if (!_d3d_device) {
-    return;
-  }
-
-  free_nondx_resources();
-  PRINT_REFCNT(dxgsg8, _d3d_device);
-
-  // Do a safe check for releasing the D3DDEVICE. RefCount should be zero.
-  // if we're called from exit(), _d3d_device may already have been released
-  RELEASE(_d3d_device, dxgsg8, "d3dDevice", RELEASE_DOWN_TO_ZERO);
-  _screen->_d3d_device = NULL;
-
-  // Releasing pD3D is now the responsibility of the GraphicsPipe destructor
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: DXGraphicsStateGuardian8::reset_d3d_device
-//       Access: Protected
-//  Description: This function checks current device's framebuffer
-//               dimension against passed p_presentation_params backbuffer
-//               dimension to determine a device reset if there is
-//               only one window or it is the main window or
-//               fullscreen mode then, it resets the device. Finally
-//               it returns the new DXScreenData through parameter
-//               screen
-////////////////////////////////////////////////////////////////////
-HRESULT DXGraphicsStateGuardian8::
-reset_d3d_device(D3DPRESENT_PARAMETERS *presentation_params,
-                 DXScreenData **screen) {
-  HRESULT hr;
-
-  nassertr(IS_VALID_PTR(presentation_params), E_FAIL);
-  nassertr(IS_VALID_PTR(_screen->_d3d8), E_FAIL);
-  nassertr(IS_VALID_PTR(_d3d_device), E_FAIL);
-
-  // for windowed mode make sure our format matches the desktop fmt,
-  // in case the desktop mode has been changed
-  _screen->_d3d8->GetAdapterDisplayMode(_screen->_card_id, &_screen->_display_mode);
-  presentation_params->BackBufferFormat = _screen->_display_mode.Format;
-
-  // here we have to look at the _presentation_reset frame buffer dimension
-  // if current window's dimension is bigger than _presentation_reset
-  // we have to reset the device before creating new swapchain.
-  // inorder to reset properly, we need to release all swapchains
-
-  if (true || !(_screen->_swap_chain)
-      || (_presentation_reset.BackBufferWidth < presentation_params->BackBufferWidth)
-      || (_presentation_reset.BackBufferHeight < presentation_params->BackBufferHeight)) {
-    if (wdxdisplay8_cat.is_debug()) {
-      wdxdisplay8_cat.debug()
-        << "swap_chain = " << _screen->_swap_chain << " _presentation_reset = "
-        << _presentation_reset.BackBufferWidth << "x" << _presentation_reset.BackBufferHeight
-        << " presentation_params = "
-        << presentation_params->BackBufferWidth << "x" << presentation_params->BackBufferHeight << "\n";
-    }
-
-    get_engine()->reset_all_windows(false);// reset old swapchain by releasing
-
-    if (_screen->_swap_chain) {  //other windows might be using bigger buffers
-      _presentation_reset.BackBufferWidth = max(_presentation_reset.BackBufferWidth, presentation_params->BackBufferWidth);
-      _presentation_reset.BackBufferHeight = max(_presentation_reset.BackBufferHeight, presentation_params->BackBufferHeight);
-
-    } else {  // single window, must reset to the new presentation_params dimension
-      _presentation_reset.BackBufferWidth = presentation_params->BackBufferWidth;
-      _presentation_reset.BackBufferHeight = presentation_params->BackBufferHeight;
-    }
-
-    // Calling this forces all of the textures and vbuffers to be
-    // regenerated, a prerequisite to calling Reset().  Actually, this
-    // shouldn't be necessary, because all of our textures and
-    // vbuffers are stored in the D3DPOOL_MANAGED memory class.
-    release_all();
-
-    // Just to be extra-conservative for now, we'll go ahead and
-    // release the vbuffers and ibuffers at least; they're relatively
-    // cheap to replace.
-    release_all_vertex_buffers();
-    release_all_index_buffers();
-
-    Thread *current_thread = Thread::get_current_thread();
-    _prepared_objects->begin_frame(this, current_thread);
-
-    // release graphics buffer surfaces
-    {
-      wdxGraphicsBuffer8 *graphics_buffer;
-      list <wdxGraphicsBuffer8 **>::iterator graphics_buffer_iterator;
-
-      for (graphics_buffer_iterator = _graphics_buffer_list.begin( ); graphics_buffer_iterator != _graphics_buffer_list.end( ); graphics_buffer_iterator++)
-      {
-        graphics_buffer = **graphics_buffer_iterator;
-        if (graphics_buffer -> _color_backing_store)
-        {
-          graphics_buffer -> _color_backing_store -> Release ( );
-          graphics_buffer -> _color_backing_store = 0;
-        }
-        if (graphics_buffer -> _depth_backing_store)
-        {
-          graphics_buffer -> _depth_backing_store -> Release ( );
-          graphics_buffer -> _depth_backing_store = 0;
-        }
-      }
-    }
-
-    this -> mark_new();
-    hr = _d3d_device->Reset(&_presentation_reset);
-    if (FAILED(hr)) {
-      return hr;
-    }
-
-    get_engine()->reset_all_windows(true);// reset with new swapchains by creating
-    if (screen) {
-      *screen = NULL;
-    }
-
-    if (presentation_params != &_screen->_presentation_params) {
-      memcpy(&_screen->_presentation_params, presentation_params, sizeof(D3DPRESENT_PARAMETERS));
-    }
-
-    return hr;
-  }
-
-  // release the old swapchain and create a new one
-  if (_screen && _screen->_swap_chain) {
-    _screen->_swap_chain->Release();
-    wdxdisplay8_cat.debug()
-      << "swap chain " << _screen->_swap_chain << " is released\n";
-    _screen->_swap_chain = NULL;
-    hr = _d3d_device->CreateAdditionalSwapChain(presentation_params, &_screen->_swap_chain);
-  }
-  if (SUCCEEDED(hr)) {
-    if (presentation_params != &_screen->_presentation_params) {
-      memcpy(&_screen->_presentation_params, presentation_params, sizeof(D3DPRESENT_PARAMETERS));
-    }
-    if (screen) {
-      *screen = _screen;
-    }
-  }
-  return hr;
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: DXGraphicsStateGuardian8::check_cooperative_level
-//       Access: Protected
-//  Description:
-////////////////////////////////////////////////////////////////////
-bool DXGraphicsStateGuardian8::
-check_cooperative_level() {
-  bool bDoReactivateWindow = false;
-  if (_d3d_device == NULL) {
-    return false;
-  }
-  HRESULT hr = _d3d_device->TestCooperativeLevel();
-
-  if (SUCCEEDED(hr)) {
-    nassertr(SUCCEEDED(_last_testcooplevel_result), false);
-    return true;
-  }
-
-  switch (hr) {
-  case D3DERR_DEVICENOTRESET:
-    _dx_is_ready = false;
-
-    // call this just in case
-    _prepared_objects->begin_frame(this, Thread::get_current_thread());
-
-    hr = reset_d3d_device(&_screen->_presentation_params);
-    if (FAILED(hr)) {
-      // I think this shouldnt fail unless I've screwed up the
-      // _presentation_params from the original working ones somehow
-      dxgsg8_cat.error()
-        << "check_cooperative_level Reset() failed, hr = " << D3DERRORSTRING(hr);
-    }
-
-    hr = _d3d_device->TestCooperativeLevel();
-    if (FAILED(hr)) {
-      // internal chk, shouldnt fail
-      dxgsg8_cat.error()
-        << "TestCooperativeLevel following Reset() failed, hr = " << D3DERRORSTRING(hr);
-
-    }
-
-    _dx_is_ready = TRUE;
-    break;
-
-  case D3DERR_DEVICELOST:
-    // sleep while the device is lost to free up the CPU
-    Sleep (10);
-
-    if (SUCCEEDED(_last_testcooplevel_result)) {
-      if (_dx_is_ready) {
-        _dx_is_ready = false;
-        if (dxgsg8_cat.is_debug()) {
-          dxgsg8_cat.debug() << "D3D Device was Lost, waiting...\n";
-        }
-      }
-    }
-  }
-
-  _last_testcooplevel_result = hr;
-  return SUCCEEDED(hr);
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: DXGraphicsStateGuardian8::show_frame
-//       Access: Protected
-//  Description: redraw primary buffer
-////////////////////////////////////////////////////////////////////
-void DXGraphicsStateGuardian8::
-show_frame() {
-  if (_d3d_device == NULL) {
-    return;
-  }
-
-  HRESULT hr;
-
-  if (_swap_chain) {
-    hr = _swap_chain->Present((CONST RECT*)NULL, (CONST RECT*)NULL, (HWND)NULL, NULL);
-  } else {
-    hr = _d3d_device->Present((CONST RECT*)NULL, (CONST RECT*)NULL, (HWND)NULL, NULL);
-  }
-
-  if (FAILED(hr)) {
-    if (hr == D3DERR_DEVICELOST) {
-      check_cooperative_level();
-    } else {
-      dxgsg8_cat.error()
-        << "show_frame() - Present() failed" << D3DERRORSTRING(hr);
-      throw_event("panda3d-render-error");
-    }
-  }
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: DXGraphicsStateGuardian8::create_swap_chain
-//       Access: Protected
-//  Description:
-////////////////////////////////////////////////////////////////////
-bool DXGraphicsStateGuardian8::
-create_swap_chain(DXScreenData *new_context) {
-  // Instead of creating a device and rendering as d3ddevice->present()
-  // we should render using SwapChain->present(). This is done to support
-  // multiple windows rendering. For that purpose, we need to set additional
-  // swap chains here.
-
-  HRESULT hr;
-  hr = new_context->_d3d_device->CreateAdditionalSwapChain(&new_context->_presentation_params, &new_context->_swap_chain);
-  if (FAILED(hr)) {
-    wdxdisplay8_cat.debug() << "Swapchain creation failed :"<<D3DERRORSTRING(hr)<<"\n";
-    return false;
-  }
-  wdxdisplay8_cat.debug()
-    << "Created swap chain " << new_context->_swap_chain << "\n";
-  return true;
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: DXGraphicsStateGuardian8::release_swap_chain
-//       Access: Protected
-//  Description: Release the swap chain on this DXScreenData
-////////////////////////////////////////////////////////////////////
-bool DXGraphicsStateGuardian8::
-release_swap_chain(DXScreenData *new_context) {
-  HRESULT hr;
-  wdxdisplay8_cat.debug()
-    << "Releasing swap chain " << new_context->_swap_chain << "\n";
-  if (new_context->_swap_chain) {
-    hr = new_context->_swap_chain->Release();
-    if (FAILED(hr)) {
-      wdxdisplay8_cat.debug() << "Swapchain release failed:" << D3DERRORSTRING(hr) << "\n";
-      return false;
-    }
-  }
-  return true;
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: DXGraphicsStateGuardian8::copy_pres_reset
-//       Access: Protected
-//  Description: copies the PresReset from passed DXScreenData
-////////////////////////////////////////////////////////////////////
-void DXGraphicsStateGuardian8::
-copy_pres_reset(DXScreenData *screen) {
-  memcpy(&_presentation_reset, &_screen->_presentation_params, sizeof(D3DPRESENT_PARAMETERS));
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: DXGraphicsStateGuardian8::get_d3d_min_type
-//       Access: Protected, Static
-//  Description:
-////////////////////////////////////////////////////////////////////
-D3DTEXTUREFILTERTYPE DXGraphicsStateGuardian8::
-get_d3d_min_type(SamplerState::FilterType filter_type) {
-  switch (filter_type) {
-  case SamplerState::FT_nearest:
-    return D3DTEXF_POINT;
-
-  case SamplerState::FT_linear:
-    return D3DTEXF_LINEAR;
-
-  case SamplerState::FT_nearest_mipmap_nearest:
-    return D3DTEXF_POINT;
-
-  case SamplerState::FT_linear_mipmap_nearest:
-    return D3DTEXF_LINEAR;
-
-  case SamplerState::FT_nearest_mipmap_linear:
-    return D3DTEXF_POINT;
-
-  case SamplerState::FT_linear_mipmap_linear:
-    return D3DTEXF_LINEAR;
-
-  case SamplerState::FT_shadow:
-  case SamplerState::FT_default:
-    return D3DTEXF_LINEAR;
-  }
-
-  dxgsg8_cat.error()
-    << "Invalid FilterType value (" << (int)filter_type << ")\n";
-  return D3DTEXF_POINT;
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: DXGraphicsStateGuardian8::get_d3d_mip_type
-//       Access: Protected, Static
-//  Description:
-////////////////////////////////////////////////////////////////////
-D3DTEXTUREFILTERTYPE DXGraphicsStateGuardian8::
-get_d3d_mip_type(SamplerState::FilterType filter_type) {
-  switch (filter_type) {
-  case SamplerState::FT_nearest:
-    return D3DTEXF_NONE;
-
-  case SamplerState::FT_linear:
-    return D3DTEXF_NONE;
-
-  case SamplerState::FT_nearest_mipmap_nearest:
-    return D3DTEXF_POINT;
-
-  case SamplerState::FT_linear_mipmap_nearest:
-    return D3DTEXF_POINT;
-
-  case SamplerState::FT_nearest_mipmap_linear:
-    return D3DTEXF_LINEAR;
-
-  case SamplerState::FT_linear_mipmap_linear:
-    return D3DTEXF_LINEAR;
-
-  case SamplerState::FT_shadow:
-  case SamplerState::FT_default:
-    return D3DTEXF_NONE;
-  }
-
-  dxgsg8_cat.error()
-    << "Invalid FilterType value (" << (int)filter_type << ")\n";
-  return D3DTEXF_NONE;
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: DXGraphicsStateGuardian8::get_texture_operation
-//       Access: Protected, Static
-//  Description: Returns the D3DTEXTUREOP value corresponding to the
-//               indicated TextureStage::CombineMode enumerated type.
-////////////////////////////////////////////////////////////////////
-D3DTEXTUREOP DXGraphicsStateGuardian8::
-get_texture_operation(TextureStage::CombineMode mode, int scale) {
-  switch (mode) {
-  case TextureStage::CM_undefined:
-  case TextureStage::CM_replace:
-    return D3DTOP_SELECTARG1;
-
-  case TextureStage::CM_modulate:
-    if (scale < 2) {
-      return D3DTOP_MODULATE;
-    } else if (scale < 4) {
-      return D3DTOP_MODULATE2X;
-    } else {
-      return D3DTOP_MODULATE4X;
-    }
-
-  case TextureStage::CM_add:
-    return D3DTOP_ADD;
-
-  case TextureStage::CM_add_signed:
-    if (scale < 2) {
-      return D3DTOP_ADDSIGNED;
-    } else {
-      return D3DTOP_ADDSIGNED2X;
-    }
-
-  case TextureStage::CM_interpolate:
-    return D3DTOP_LERP;
-
-  case TextureStage::CM_subtract:
-    return D3DTOP_SUBTRACT;
-
-  case TextureStage::CM_dot3_rgb:
-  case TextureStage::CM_dot3_rgba:
-    return D3DTOP_DOTPRODUCT3;
-  }
-
-  dxgsg8_cat.error()
-    << "Invalid TextureStage::CombineMode value (" << (int)mode << ")\n";
-  return D3DTOP_DISABLE;
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: DXGraphicsStateGuardian8::get_texture_argument
-//       Access: Protected, Static
-//  Description: Returns the D3DTA value corresponding to the
-//               indicated TextureStage::CombineSource and
-//               TextureStage::CombineOperand enumerated types.
-////////////////////////////////////////////////////////////////////
-DWORD DXGraphicsStateGuardian8::
-get_texture_argument(TextureStage::CombineSource source,
-                     TextureStage::CombineOperand operand) {
-  switch (source) {
-  case TextureStage::CS_undefined:
-  case TextureStage::CS_texture:
-    return D3DTA_TEXTURE | get_texture_argument_modifier(operand);
-
-  case TextureStage::CS_constant:
-  case TextureStage::CS_constant_color_scale:
-    return D3DTA_TFACTOR | get_texture_argument_modifier(operand);
-
-  case TextureStage::CS_primary_color:
-    return D3DTA_DIFFUSE | get_texture_argument_modifier(operand);
-
-  case TextureStage::CS_previous:
-    return D3DTA_CURRENT | get_texture_argument_modifier(operand);
-
-  case TextureStage::CS_last_saved_result:
-    return D3DTA_TEMP | get_texture_argument_modifier(operand);
-  }
-  dxgsg8_cat.error()
-    << "Invalid TextureStage::CombineSource value (" << (int)source << ")\n";
-  return D3DTA_CURRENT;
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: DXGraphicsStateGuardian8::get_texture_argument_modifier
-//       Access: Protected, Static
-//  Description: Returns the extra bits that modify the D3DTA
-//               argument, according to the indicated
-//               TextureStage::CombineOperand enumerated type.
-////////////////////////////////////////////////////////////////////
-DWORD DXGraphicsStateGuardian8::
-get_texture_argument_modifier(TextureStage::CombineOperand operand) {
-  switch (operand) {
-  case TextureStage::CO_src_color:
-    return 0;
-
-  case TextureStage::CO_one_minus_src_color:
-    return D3DTA_COMPLEMENT;
-
-  case TextureStage::CO_src_alpha:
-    return D3DTA_ALPHAREPLICATE;
-
-  case TextureStage::CO_one_minus_src_alpha:
-    return D3DTA_ALPHAREPLICATE | D3DTA_COMPLEMENT;
-
-  case TextureStage::CO_undefined:
-    break;
-  }
-  dxgsg8_cat.error()
-    << "Invalid TextureStage::CombineOperand value (" << (int)operand << ")\n";
-  return 0;
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: DXGraphicsStateGuardian8::draw_primitive_up
-//       Access: Protected
-//  Description: Issues the DrawPrimitiveUP call to draw the indicated
-//               primitive_type from the given buffer.  We add the
-//               num_vertices parameter, so we can determine the size
-//               of the buffer.
-////////////////////////////////////////////////////////////////////
-void DXGraphicsStateGuardian8::
-draw_primitive_up(D3DPRIMITIVETYPE primitive_type,
-                  unsigned int primitive_count,
-                  unsigned int first_vertex,
-                  unsigned int num_vertices,
-                  const unsigned char *buffer, size_t stride) {
-
-  // It appears that the common ATI driver seems to fail to draw
-  // anything in the DrawPrimitiveUP() call if the address range of
-  // the buffer supplied crosses over a multiple of 0x10000.  That's
-  // incredibly broken, yet it undeniably appears to be true.  We'll
-  // have to hack around it.
-
-  const unsigned char *buffer_start = buffer + stride * first_vertex;
-  const unsigned char *buffer_end = buffer_start + stride * num_vertices;
-
-  if (buffer_end - buffer_start > 0x10000) {
-    // Actually, the buffer doesn't fit within the required limit
-    // anyway.  Go ahead and draw it and hope for the best.
-    _d3d_device->DrawPrimitiveUP(primitive_type, primitive_count,
-                                 buffer_start, stride);
-
-  } else if ((((long)buffer_end ^ (long)buffer_start) & ~0xffff) == 0) {
-    // No problem; we can draw the buffer directly.
-    _d3d_device->DrawPrimitiveUP(primitive_type, primitive_count,
-                                 buffer_start, stride);
-
-  } else {
-    // We have a problem--the buffer crosses over a 0x10000 boundary.
-    // We have to copy the buffer to a temporary buffer that we can
-    // draw from.
-    unsigned char *safe_buffer_start = get_safe_buffer_start();
-    memcpy(safe_buffer_start, buffer_start, buffer_end - buffer_start);
-    _d3d_device->DrawPrimitiveUP(primitive_type, primitive_count,
-                                 safe_buffer_start, stride);
-
-  }
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: DXGraphicsStateGuardian8::draw_indexed_primitive_up
-//       Access: Protected
-//  Description: Issues the DrawIndexedPrimitiveUP call to draw the
-//               indicated primitive_type from the given buffer.  As
-//               in draw_primitive_up(), above, the parameter list is
-//               not exactly one-for-one with the
-//               DrawIndexedPrimitiveUP() call, but it's similar (in
-//               particular, we pass max_index instead of NumVertices,
-//               which always seemed ambiguous to me).
-////////////////////////////////////////////////////////////////////
-void DXGraphicsStateGuardian8::
-draw_indexed_primitive_up(D3DPRIMITIVETYPE primitive_type,
-                          unsigned int min_index, unsigned int max_index,
-                          unsigned int num_primitives,
-                          const unsigned char *index_data,
-                          D3DFORMAT index_type,
-                          const unsigned char *buffer, size_t stride) {
-  // As above, we'll hack the case of the buffer crossing the 0x10000
-  // boundary.
-  const unsigned char *buffer_start = buffer + stride * min_index;
-  const unsigned char *buffer_end = buffer + stride * (max_index + 1);
-
-  if (buffer_end - buffer > 0x10000) {
-    // Actually, the buffer doesn't fit within the required limit
-    // anyway.  Go ahead and draw it and hope for the best.
-    _d3d_device->DrawIndexedPrimitiveUP
-      (primitive_type, min_index, max_index - min_index + 1, num_primitives,
-       index_data, index_type, buffer, stride);
-
-  } else if ((((long)buffer_end ^ (long)buffer) & ~0xffff) == 0) {
-    // No problem; we can draw the buffer directly.
-    _d3d_device->DrawIndexedPrimitiveUP
-      (primitive_type, min_index, max_index - min_index + 1, num_primitives,
-       index_data, index_type, buffer, stride);
-
-  } else {
-    // We have a problem--the buffer crosses over a 0x10000 boundary.
-    // We have to copy the buffer to a temporary buffer that we can
-    // draw from.
-    unsigned char *safe_buffer_start = get_safe_buffer_start();
-    size_t offset = buffer_start - buffer;
-    memcpy(safe_buffer_start + offset, buffer_start, buffer_end - buffer_start);
-    _d3d_device->DrawIndexedPrimitiveUP
-      (primitive_type, min_index, max_index - min_index + 1, num_primitives,
-       index_data, index_type, safe_buffer_start, stride);
-  }
-}
-
-////////////////////////////////////////////////////////////////////
-//  DX stencil code section
-////////////////////////////////////////////////////////////////////
-static int dx_stencil_comparison_function_array[] = {
-  D3DCMP_NEVER,
-  D3DCMP_LESS,
-  D3DCMP_EQUAL,
-  D3DCMP_LESSEQUAL,
-  D3DCMP_GREATER,
-  D3DCMP_NOTEQUAL,
-  D3DCMP_GREATEREQUAL,
-  D3DCMP_ALWAYS,
-};
-
-static int dx_stencil_operation_array[] = {
-  D3DSTENCILOP_KEEP,
-  D3DSTENCILOP_ZERO,
-  D3DSTENCILOP_REPLACE,
-  D3DSTENCILOP_INCR,
-  D3DSTENCILOP_DECR,
-  D3DSTENCILOP_INVERT,
-
-  D3DSTENCILOP_INCRSAT,
-  D3DSTENCILOP_DECRSAT,
-};
-
-////////////////////////////////////////////////////////////////////
-//     Function: DXGraphicsStateGuardian8::do_issue_stencil
-//       Access: Protected
-//  Description: Set stencil render states.
-////////////////////////////////////////////////////////////////////
-void DXGraphicsStateGuardian8::
-do_issue_stencil() {
-  if (!_supports_stencil) {
-    return;
-  }
-
-  const StencilAttrib *stencil = DCAST(StencilAttrib, _target_rs->get_attrib(StencilAttrib::get_class_slot()));
-
-  if (stencil != (const StencilAttrib *)NULL) {
-    // DEBUG
-    if (false) {
-      dxgsg8_cat.debug() << "STENCIL STATE CHANGE\n";
-      dxgsg8_cat.debug() << "\n"
-        << "SRS_front_comparison_function " << stencil->get_render_state(StencilAttrib::SRS_front_comparison_function) << "\n"
-        << "SRS_front_stencil_fail_operation " << stencil->get_render_state(StencilAttrib::SRS_front_stencil_fail_operation) << "\n"
-        << "SRS_front_stencil_pass_z_fail_operation " << stencil->get_render_state(StencilAttrib::SRS_front_stencil_pass_z_fail_operation) << "\n"
-        << "SRS_front_stencil_pass_z_pass_operation " << stencil->get_render_state(StencilAttrib::SRS_front_stencil_pass_z_pass_operation) << "\n"
-        << "SRS_reference " << stencil->get_render_state(StencilAttrib::SRS_reference) << "\n"
-        << "SRS_read_mask " << stencil->get_render_state(StencilAttrib::SRS_read_mask) << "\n"
-        << "SRS_write_mask " << stencil->get_render_state(StencilAttrib::SRS_write_mask) << "\n";
-    }
-
-    unsigned int front_compare;
-    front_compare = stencil->get_render_state(StencilAttrib::SRS_front_comparison_function);
-    if (front_compare != RenderAttrib::M_none) {
-      set_render_state(D3DRS_STENCILENABLE, TRUE);
-      set_render_state(D3DRS_STENCILFUNC, dx_stencil_comparison_function_array[front_compare]);
-      set_render_state(D3DRS_STENCILFAIL, dx_stencil_operation_array[
-        stencil->get_render_state(StencilAttrib::SRS_front_stencil_fail_operation)]);
-      set_render_state(D3DRS_STENCILZFAIL, dx_stencil_operation_array[
-        stencil->get_render_state(StencilAttrib::SRS_front_stencil_pass_z_fail_operation)]);
-      set_render_state(D3DRS_STENCILPASS, dx_stencil_operation_array[
-        stencil->get_render_state(StencilAttrib::SRS_front_stencil_pass_z_pass_operation)]);
-
-      set_render_state(D3DRS_STENCILREF, stencil->get_render_state(StencilAttrib::SRS_reference));
-      set_render_state(D3DRS_STENCILMASK, stencil->get_render_state(StencilAttrib::SRS_read_mask));
-      set_render_state(D3DRS_STENCILWRITEMASK, stencil->get_render_state(StencilAttrib::SRS_write_mask));
-    } else {
-      set_render_state(D3DRS_STENCILENABLE, FALSE);
-    }
-
-    if (stencil->get_render_state(StencilAttrib::SRS_clear)) {
-      _d3d_device->Clear(0, NULL, D3DCLEAR_STENCIL, 0, 0.0f, stencil->get_render_state(StencilAttrib::SRS_clear_value));
-    }
-
-  } else {
-    // DEBUG
-    if (false) {
-      dxgsg8_cat.debug() << "STENCIL STATE CHANGE TO OFF\n";
-    }
-
-    set_render_state(D3DRS_STENCILENABLE, FALSE);
-  }
-}
-
-LPDIRECT3DDEVICE8 DXGraphicsStateGuardian8::
-get_d3d_device() {
-  return _d3d_device;
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: dxGraphicsStateGuardian8::do_issue_scissor
-//       Access: Protected
-//  Description:
-////////////////////////////////////////////////////////////////////
-void DXGraphicsStateGuardian8::
-do_issue_scissor() {
-  const ScissorAttrib *target_scissor = DCAST(ScissorAttrib, _target_rs->get_attrib_def(ScissorAttrib::get_class_slot()));
-  const LVecBase4 &frame = target_scissor->get_frame();
-  set_scissor(frame[0], frame[1], frame[2], frame[3]);
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: DXGraphicsStateGuardian8::set_scissor
-//       Access: Private
-//  Description: Sets up the scissor region, as a set of coordinates
-//               relative to the current viewport.
-////////////////////////////////////////////////////////////////////
-void DXGraphicsStateGuardian8::
-set_scissor(PN_stdfloat left, PN_stdfloat right, PN_stdfloat bottom, PN_stdfloat top) {
-  // DirectX8 doesn't have an explicit scissor control, independent of
-  // the viewport, so we have to do it by hand, by moving the viewport
-  // smaller but adjusting the projection matrix to compensate.
-
-  // First, constrain the viewport to the scissor region.
-  D3DVIEWPORT8 vp;
-  vp.Width = _current_viewport.Width * (right - left);
-  vp.X = _current_viewport.X + _current_viewport.Width * left;
-  vp.Height = _current_viewport.Height * (top - bottom);
-  vp.Y = _current_viewport.Y + _current_viewport.Height * (1.0f - top);
-  vp.MinZ = 0.0f;
-  vp.MaxZ = 1.0f;
-
-  HRESULT hr = _d3d_device->SetViewport(&vp);
-  if (FAILED(hr)) {
-    dxgsg8_cat.error()
-      << "_screen->_swap_chain = " << _screen->_swap_chain << " _swap_chain = " << _swap_chain << "\n";
-    dxgsg8_cat.error()
-      << "SetViewport(" << vp.X << ", " << vp.Y << ", " << vp.Width << ", " << vp.Height
-      << ") failed" << D3DERRORSTRING(hr);
-
-    D3DVIEWPORT8 vp_old;
-    _d3d_device->GetViewport(&vp_old);
-    dxgsg8_cat.error()
-      << "GetViewport(" << vp_old.X << ", " << vp_old.Y << ", " << vp_old.Width << ", "
-      << vp_old.Height << ") returned: Trying to set that vp---->\n";
-    hr = _d3d_device->SetViewport(&vp_old);
-
-    if (FAILED(hr)) {
-      dxgsg8_cat.error() << "Failed again\n";
-      throw_event("panda3d-render-error");
-      nassertv(false);
-    }
-  }
-
-  // Now, compute _scissor_mat, which we use to compensate the
-  // projection matrix.
-  PN_stdfloat xsize = right - left;
-  PN_stdfloat ysize = top - bottom;
-  PN_stdfloat xcenter = (left + right) - 1.0f;
-  PN_stdfloat ycenter = (bottom + top) - 1.0f;
-  if (xsize == 0.0f || ysize == 0.0f) {
-    // If the scissor region is zero, nothing will be drawn anyway, so
-    // don't worry about it.
-    _scissor_mat = TransformState::make_identity();
-  } else {
-    _scissor_mat = TransformState::make_scale(LVecBase3(1.0f / xsize, 1.0f / ysize, 1.0f))->compose(TransformState::make_pos(LPoint3(-xcenter, -ycenter, 0.0f)));
-  }
-  prepare_lens();
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: dxGraphicsStateGuardian8::calc_fb_properties
-//       Access: Public
-//  Description: Convert DirectX framebuffer format ids into a
-//               FrameBufferProperties structure.
-////////////////////////////////////////////////////////////////////
-FrameBufferProperties DXGraphicsStateGuardian8::
-calc_fb_properties(DWORD cformat, DWORD dformat, DWORD multisampletype) {
-  FrameBufferProperties props;
-  int index=0;
-  int r=0, g=0, b=0, a=0;
-  switch (cformat) {
-  case D3DFMT_R8G8B8:      r=8; g=8; b=8; a=0; break;
-  case D3DFMT_A8R8G8B8:    r=8; g=8; b=8; a=8; break;
-  case D3DFMT_X8R8G8B8:    r=8; g=8; b=8; a=0; break;
-  case D3DFMT_R5G6B5:      r=5; g=6; b=5; a=0; break;
-  case D3DFMT_X1R5G5B5:    r=5; g=5; b=5; a=0; break;
-  case D3DFMT_A1R5G5B5:    r=5; g=5; b=5; a=1; break;
-  case D3DFMT_A4R4G4B4:    r=4; g=4; b=4; a=4; break;
-  case D3DFMT_R3G3B2:      r=3; g=3; b=2; a=0; break;
-  case D3DFMT_A8R3G3B2:    r=3; g=3; b=2; a=8; break;
-  case D3DFMT_X4R4G4B4:    r=4; g=4; b=4; a=0; break;
-  case D3DFMT_A2B10G10R10: r=10;g=10;b=10;a=2; break;
-  case D3DFMT_A8P8:        index=8; a=8; break;
-  case D3DFMT_P8:          index=8; a=0; break;
-  default: break;
-  }
-  if (index > 0) {
-    props.set_rgb_color(0);
-    props.set_indexed_color(1);
-    props.set_color_bits(index);
-  } else if (r + g + b > 0) {
-    props.set_rgb_color(1);
-    props.set_indexed_color(0);
-    props.set_rgba_bits(r, g, b, a);
-  }
-  props.set_alpha_bits(a);
-
-  int depth=0;
-  int stencil=0;
-  switch (dformat) {
-  case D3DFMT_D32:     depth=32; stencil=0; break;
-  case D3DFMT_D15S1:   depth=15; stencil=1; break;
-  case D3DFMT_D24S8:   depth=24; stencil=8; break;
-  case D3DFMT_D16:     depth=16; stencil=0; break;
-  case D3DFMT_D24X8:   depth=24; stencil=0; break;
-  case D3DFMT_D24X4S4: depth=24; stencil=4; break;
-  default: break;
-  }
-  props.set_depth_bits(depth);
-  props.set_stencil_bits(stencil);
-  props.set_multisamples(multisampletype);
-  return props;
-}
-
-#define GAMMA_1 (255.0 * 256.0)
-
-static bool _gamma_table_initialized = false;
-static unsigned short _orignial_gamma_table [256 * 3];
-
-void _create_gamma_table (PN_stdfloat gamma, unsigned short *original_red_table, unsigned short *original_green_table, unsigned short *original_blue_table, unsigned short *red_table, unsigned short *green_table, unsigned short *blue_table) {
-  int i;
-  double gamma_correction;
-
-  if (gamma <= 0.0) {
-    // avoid divide by zero and negative exponents
-    gamma = 1.0;
-  }
-  gamma_correction = 1.0 / (double) gamma;
-
-  for (i = 0; i < 256; i++) {
-    double r;
-    double g;
-    double b;
-
-    if (original_red_table) {
-      r = (double) original_red_table [i] / GAMMA_1;
-      g = (double) original_green_table [i] / GAMMA_1;
-      b = (double) original_blue_table [i] / GAMMA_1;
-    }
-    else {
-      r = ((double) i / 255.0);
-      g = r;
-      b = r;
-    }
-
-    r = pow (r, gamma_correction);
-    g = pow (g, gamma_correction);
-    b = pow (b, gamma_correction);
-
-    if (r > 1.00) {
-      r = 1.0;
-    }
-    if (g > 1.00) {
-      g = 1.0;
-    }
-    if (b > 1.00) {
-      b = 1.0;
-    }
-
-    r = r * GAMMA_1;
-    g = g * GAMMA_1;
-    b = b * GAMMA_1;
-
-    red_table [i] = r;
-    green_table [i] = g;
-    blue_table [i] = b;
-  }
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: DXGraphicsStateGuardian8::get_gamma_table
-//       Access: Public, Static
-//  Description: Static function for getting the original gamma.
-////////////////////////////////////////////////////////////////////
-bool DXGraphicsStateGuardian8::
-get_gamma_table(void) {
-  bool get;
-
-  get = false;
-  if (_gamma_table_initialized == false) {
-    HDC hdc = GetDC(NULL);
-
-    if (hdc) {
-      if (GetDeviceGammaRamp (hdc, (LPVOID) _orignial_gamma_table)) {
-        _gamma_table_initialized = true;
-        get = true;
-      }
-
-      ReleaseDC (NULL, hdc);
-    }
-  }
-
-  return get;
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: DXGraphicsStateGuardian8::static_set_gamma
-//       Access: Public, Static
-//  Description: Static function for setting gamma which is needed
-//               for atexit.
-////////////////////////////////////////////////////////////////////
-bool DXGraphicsStateGuardian8::
-static_set_gamma(bool restore, PN_stdfloat gamma) {
-  bool set;
-  HDC hdc = GetDC(NULL);
-
-  set = false;
-  if (hdc) {
-    unsigned short ramp [256 * 3];
-
-    if (restore && _gamma_table_initialized) {
-      _create_gamma_table (gamma, &_orignial_gamma_table [0], &_orignial_gamma_table [256], &_orignial_gamma_table [512], &ramp [0], &ramp [256], &ramp [512]);
-    }
-    else {
-      _create_gamma_table (gamma, 0, 0, 0, &ramp [0], &ramp [256], &ramp [512]);
-    }
-
-    if (SetDeviceGammaRamp (hdc, ramp)) {
-      set = true;
-    }
-
-    ReleaseDC (NULL, hdc);
-  }
-
-  return set;
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: DXGraphicsStateGuardian8::set_gamma
-//       Access: Published
-//  Description: Non static version of setting gamma.  Returns true
-//               on success.
-////////////////////////////////////////////////////////////////////
-bool DXGraphicsStateGuardian8::
-set_gamma(PN_stdfloat gamma) {
-  bool set;
-
-  set = static_set_gamma(false, gamma);
-  if (set) {
-    _gamma = gamma;
-  }
-
-  return set;
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: DXGraphicsStateGuardian8::restore_gamma
-//       Access: Published
-//  Description: Restore original gamma.
-////////////////////////////////////////////////////////////////////
-void DXGraphicsStateGuardian8::
-restore_gamma() {
-  static_set_gamma(true, 1.0f);
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: DXGraphicsStateGuardian8::atexit_function
-//       Access: Public, Static
-//  Description: This function is passed to the atexit function.
-////////////////////////////////////////////////////////////////////
-void DXGraphicsStateGuardian8::
-atexit_function(void) {
-  static_set_gamma(true, 1.0);
-}
diff --git a/panda/src/dxgsg8/dxGraphicsStateGuardian8.h b/panda/src/dxgsg8/dxGraphicsStateGuardian8.h
deleted file mode 100644
index 029ec5e2de..0000000000
--- a/panda/src/dxgsg8/dxGraphicsStateGuardian8.h
+++ /dev/null
@@ -1,309 +0,0 @@
-// Filename: dxGraphicsStateGuardian8.h
-// Created by:  mike (02Feb99)
-//
-////////////////////////////////////////////////////////////////////
-//
-// 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 DXGRAPHICSSTATEGUARDIAN8_H
-#define DXGRAPHICSSTATEGUARDIAN8_H
-
-#include "dxgsg8base.h"
-#include "dxTextureContext8.h"
-#include "config_dxgsg8.h"
-
-#include "graphicsStateGuardian.h"
-#include "texture.h"
-#include "displayRegion.h"
-#include "material.h"
-#include "depthTestAttrib.h"
-#include "cullFaceAttrib.h"
-#include "renderModeAttrib.h"
-#include "colorBlendAttrib.h"
-#include "fog.h"
-#include "pointerToArray.h"
-
-class Light;
-
-class DXTextureContext8;
-class DXVertexBufferContext8;
-class DXIndexBufferContext8;
-
-////////////////////////////////////////////////////////////////////
-//       Class : DXGraphicsStateGuardian8
-// Description : A GraphicsStateGuardian for rendering into DirectX8
-//               contexts.
-////////////////////////////////////////////////////////////////////
-class EXPCL_PANDADX DXGraphicsStateGuardian8 : public GraphicsStateGuardian {
-public:
-  DXGraphicsStateGuardian8(GraphicsEngine *engine, GraphicsPipe *pipe);
-  ~DXGraphicsStateGuardian8();
-
-  FrameBufferProperties
-    calc_fb_properties(DWORD cformat, DWORD dformat, DWORD multisampletype);
-
-  virtual TextureContext *prepare_texture(Texture *tex, int view);
-  void apply_texture(int i, TextureContext *tc, const SamplerState &sampler);
-  virtual bool update_texture(TextureContext *tc, bool force);
-  bool upload_texture(DXTextureContext8 *dtc, bool force);
-  virtual void release_texture(TextureContext *tc);
-  virtual bool extract_texture_data(Texture *tex);
-
-  virtual VertexBufferContext *prepare_vertex_buffer(GeomVertexArrayData *data);
-  bool apply_vertex_buffer(VertexBufferContext *vbc,
-                           const GeomVertexArrayDataHandle *reader, bool force);
-  virtual void release_vertex_buffer(VertexBufferContext *vbc);
-
-  virtual IndexBufferContext *prepare_index_buffer(GeomPrimitive *data);
-  bool apply_index_buffer(IndexBufferContext *ibc,
-                          const GeomPrimitivePipelineReader *reader, bool force);
-  virtual void release_index_buffer(IndexBufferContext *ibc);
-
-  virtual PT(GeomMunger) make_geom_munger(const RenderState *state,
-                                          Thread *current_thread);
-
-  virtual void clear(DrawableRegion *region);
-
-  virtual void prepare_display_region(DisplayRegionPipelineReader *dr);
-  virtual CPT(TransformState) calc_projection_mat(const Lens *lens);
-  virtual bool prepare_lens();
-
-  virtual bool begin_frame(Thread *current_thread);
-  virtual bool begin_scene();
-  virtual void end_scene();
-  virtual void end_frame(Thread *current_thread);
-
-  virtual bool begin_draw_primitives(const GeomPipelineReader *geom_reader,
-                                     const GeomMunger *munger,
-                                     const GeomVertexDataPipelineReader *data_reader,
-                                     bool force);
-  virtual bool draw_triangles(const GeomPrimitivePipelineReader *reader,
-                              bool force);
-  virtual bool draw_tristrips(const GeomPrimitivePipelineReader *reader,
-                              bool force);
-  virtual bool draw_trifans(const GeomPrimitivePipelineReader *reader,
-                            bool force);
-  virtual bool draw_lines(const GeomPrimitivePipelineReader *reader,
-                          bool force);
-  virtual bool draw_linestrips(const GeomPrimitivePipelineReader *reader,
-                               bool force);
-  virtual bool draw_points(const GeomPrimitivePipelineReader *reader,
-                           bool force);
-  virtual void end_draw_primitives();
-
-  virtual bool framebuffer_copy_to_texture(Texture *tex, int view, int z,
-                                           const DisplayRegion *dr,
-                                           const RenderBuffer &rb);
-  virtual bool framebuffer_copy_to_ram(Texture *tex, int view, int z,
-                                       const DisplayRegion *dr,
-                                       const RenderBuffer &rb);
-  bool do_framebuffer_copy_to_ram(Texture *tex, int view, int z,
-                                  const DisplayRegion *dr,
-                                  const RenderBuffer &rb,
-                                  bool inverted);
-
-  virtual void reset();
-
-  virtual void apply_fog(Fog *fog);
-
-  virtual void bind_light(PointLight *light_obj, const NodePath &light,
-                          int light_id);
-  virtual void bind_light(DirectionalLight *light_obj, const NodePath &light,
-                          int light_id);
-  virtual void bind_light(Spotlight *light_obj, const NodePath &light,
-                          int light_id);
-
-  static D3DFORMAT get_index_type(Geom::NumericType numeric_type);
-  INLINE static DWORD LColor_to_D3DCOLOR(const LColor &cLColor);
-
-  virtual void set_state_and_transform(const RenderState *state,
-                                       const TransformState *transform);
-  LPDIRECT3DDEVICE8 get_d3d_device();
-  INLINE bool get_supports_render_texture() const;
-
-  static bool get_gamma_table(void);
-  static bool static_set_gamma(bool restore, PN_stdfloat gamma);
-  bool set_gamma(PN_stdfloat gamma);
-  void restore_gamma();
-  static void atexit_function(void);
-
-protected:
-  void do_issue_transform();
-  void do_issue_alpha_test();
-  void do_issue_render_mode();
-  void do_issue_rescale_normal();
-  void do_issue_color_write();
-  void do_issue_depth_test();
-  void do_issue_depth_write();
-  void do_issue_cull_face();
-  void do_issue_fog();
-  void do_issue_depth_offset();
-  void do_issue_tex_gen();
-  void do_issue_shade_model();
-  void do_issue_material();
-  void do_issue_texture();
-  void do_issue_blending();
-  void do_issue_stencil();
-  void do_issue_scissor();
-
-  void set_scissor(PN_stdfloat left, PN_stdfloat right, PN_stdfloat bottom, PN_stdfloat top);
-
-  virtual void reissue_transforms();
-
-  virtual void enable_lighting(bool enable);
-  virtual void set_ambient_light(const LColor &color);
-  virtual void enable_light(int light_id, bool enable);
-
-  virtual void enable_clip_plane(int plane_id, bool enable);
-  virtual void bind_clip_plane(const NodePath &plane, int plane_id);
-
-  virtual void close_gsg();
-  void free_nondx_resources();
-  void free_d3d_device();
-
-  void set_draw_buffer(const RenderBuffer &rb);
-  void set_read_buffer(const RenderBuffer &rb);
-
-  void do_auto_rescale_normal();
-
-protected:
-  INLINE static D3DTEXTUREADDRESS get_texture_wrap_mode(SamplerState::WrapMode wm);
-  INLINE static D3DFOGMODE get_fog_mode_type(Fog::Mode m);
-  const D3DCOLORVALUE &get_light_color(Light *light) const;
-  INLINE static D3DTRANSFORMSTATETYPE get_tex_mat_sym(int stage_index);
-
-  static D3DBLEND get_blend_func(ColorBlendAttrib::Operand operand);
-  void report_texmgr_stats();
-
-  void set_context(DXScreenData *new_context);
-  void set_render_target();
-
-  void set_texture_blend_mode(int i, const TextureStage *stage);
-
-  void dx_cleanup();
-  HRESULT reset_d3d_device(D3DPRESENT_PARAMETERS *p_presentation_params,
-                           DXScreenData **screen = NULL);
-
-  bool check_cooperative_level();
-
-  void show_frame();
-
-  bool create_swap_chain (DXScreenData *new_context);
-  bool release_swap_chain (DXScreenData *new_context);
-  void copy_pres_reset(DXScreenData *new_context);
-
-  static D3DTEXTUREFILTERTYPE get_d3d_min_type(SamplerState::FilterType filter_type);
-  static D3DTEXTUREFILTERTYPE get_d3d_mip_type(SamplerState::FilterType filter_type);
-  static D3DTEXTUREOP get_texture_operation(TextureStage::CombineMode mode, int scale);
-  static DWORD get_texture_argument(TextureStage::CombineSource source,
-                                    TextureStage::CombineOperand operand);
-  static DWORD get_texture_argument_modifier(TextureStage::CombineOperand operand);
-
-  void draw_primitive_up(D3DPRIMITIVETYPE primitive_type,
-       unsigned int primitive_count,
-       unsigned int first_vertex,
-       unsigned int num_vertices,
-       const unsigned char *buffer, size_t stride);
-  void draw_indexed_primitive_up(D3DPRIMITIVETYPE primitive_type,
-         unsigned int min_index, unsigned int max_index,
-         unsigned int num_primitives,
-         const unsigned char *index_data,
-         D3DFORMAT index_type,
-         const unsigned char *buffer, size_t stride);
-
-  INLINE static unsigned char *get_safe_buffer_start();
-
-protected:
-  DXScreenData *_screen;
-  LPDIRECT3DDEVICE8 _d3d_device;  // same as _screen->_d3d_device, cached for spd
-  IDirect3DSwapChain8 *_swap_chain;
-  D3DPRESENT_PARAMETERS _presentation_reset;  // This is built during reset device
-
-  bool _dx_is_ready;
-  HRESULT _last_testcooplevel_result;
-
-  bool _vertex_blending_enabled;
-  bool _supports_render_texture;
-
-  RenderBuffer::Type _cur_read_pixel_buffer;  // source for copy_pixel_buffer operation
-  bool _auto_rescale_normal;
-
-  PN_stdfloat _material_ambient;
-  PN_stdfloat _material_diffuse;
-  PN_stdfloat _material_specular;
-  PN_stdfloat _material_shininess;
-  PN_stdfloat _material_emission;
-
-  enum DxgsgFogType {
-    None,
-    PerVertexFog=D3DRS_FOGVERTEXMODE,
-    PerPixelFog=D3DRS_FOGTABLEMODE
-  };
-  DxgsgFogType _do_fog_type;
-
-  D3DVIEWPORT8 _current_viewport;
-
-  DWORD _clip_plane_bits;
-  CullFaceAttrib::Mode _cull_face_mode;
-  RenderModeAttrib::Mode _current_fill_mode;  //point/wireframe/solid
-
-  const DXVertexBufferContext8 *_active_vbuffer;
-  const DXIndexBufferContext8 *_active_ibuffer;
-
-  int _num_active_texture_stages;
-
-  // Cache the data necessary to bind each particular light each
-  // frame, so if we bind a given light multiple times, we only have
-  // to compute its data once.
-  typedef pmap<NodePath, D3DLIGHT8> DirectionalLights;
-  DirectionalLights _dlights;
-
-  bool _overlay_windows_supported;
-  bool _tex_stats_retrieval_impossible;
-
-  static D3DMATRIX _d3d_ident_mat;
-  CPT(TransformState) _scissor_mat;
-
-  static unsigned char *_temp_buffer;
-  static unsigned char *_safe_buffer_start;
-
-  list <wdxGraphicsBuffer8 **> _graphics_buffer_list;
-
-public:
-  virtual TypeHandle get_type() const {
-    return get_class_type();
-  }
-  virtual TypeHandle force_init_type() {init_type(); return get_class_type();}
-
-  static TypeHandle get_class_type() {
-    return _type_handle;
-  }
-
-public:
-  static void init_type() {
-    GraphicsStateGuardian::init_type();
-    register_type(_type_handle, "DXGraphicsStateGuardian8",
-                  GraphicsStateGuardian::get_class_type());
-  }
-
-private:
-  static TypeHandle _type_handle;
-
-  friend class wdxGraphicsWindow8;
-  friend class wdxGraphicsBuffer8;
-  friend class wdxGraphicsPipe8;
-  friend class wdxGraphicsWindowGroup8;
-  friend class DXTextureContext8;
-};
-
-#include "dxGraphicsStateGuardian8.I"
-
-#endif
-
diff --git a/panda/src/dxgsg8/dxIndexBufferContext8.I b/panda/src/dxgsg8/dxIndexBufferContext8.I
deleted file mode 100644
index 81ec205c07..0000000000
--- a/panda/src/dxgsg8/dxIndexBufferContext8.I
+++ /dev/null
@@ -1,14 +0,0 @@
-// Filename: dxIndexBufferContext8.I
-// Created by:  drose (18Mar05)
-//
-////////////////////////////////////////////////////////////////////
-//
-// 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."
-//
-////////////////////////////////////////////////////////////////////
-
diff --git a/panda/src/dxgsg8/dxIndexBufferContext8.cxx b/panda/src/dxgsg8/dxIndexBufferContext8.cxx
deleted file mode 100644
index 51b9745dd7..0000000000
--- a/panda/src/dxgsg8/dxIndexBufferContext8.cxx
+++ /dev/null
@@ -1,173 +0,0 @@
-// Filename: dxIndexBufferContext8.cxx
-// Created by:  drose (18Mar05)
-//
-////////////////////////////////////////////////////////////////////
-//
-// 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 "dxIndexBufferContext8.h"
-#include "geomPrimitive.h"
-#include "config_dxgsg8.h"
-#include "graphicsStateGuardian.h"
-#include "pStatTimer.h"
-#include "dxgsg8base.h"
-
-TypeHandle DXIndexBufferContext8::_type_handle;
-
-////////////////////////////////////////////////////////////////////
-//     Function: DXIndexBufferContext8::Constructor
-//       Access: Public
-//  Description:
-////////////////////////////////////////////////////////////////////
-DXIndexBufferContext8::
-DXIndexBufferContext8(PreparedGraphicsObjects *pgo, GeomPrimitive *data) :
-  IndexBufferContext(pgo, data),
-  _ibuffer(NULL)
-{
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: DXIndexBufferContext8::Destructor
-//       Access: Public
-//  Description:
-////////////////////////////////////////////////////////////////////
-DXIndexBufferContext8::
-~DXIndexBufferContext8() {
-  if (_ibuffer != NULL) {
-    if (dxgsg8_cat.is_debug()) {
-      dxgsg8_cat.debug()
-        << "deleting index buffer " << _ibuffer << "\n";
-    }
-
-    RELEASE(_ibuffer, dxgsg8, "index buffer", RELEASE_ONCE);
-    _ibuffer = NULL;
-  }
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: DXIndexBufferContext8::evict_lru
-//       Access: Public, Virtual
-//  Description: Evicts the page from the LRU.  Called internally when
-//               the LRU determines that it is full.  May also be
-//               called externally when necessary to explicitly evict
-//               the page.
-//
-//               It is legal for this method to either evict the page
-//               as requested, do nothing (in which case the eviction
-//               will be requested again at the next epoch), or
-//               requeue itself on the tail of the queue (in which
-//               case the eviction will be requested again much
-//               later).
-////////////////////////////////////////////////////////////////////
-void DXIndexBufferContext8::
-evict_lru() {
-  dequeue_lru();
-
-  if (_ibuffer != NULL) {
-    if (dxgsg8_cat.is_debug()) {
-      dxgsg8_cat.debug()
-        << "deleting index buffer " << _ibuffer << "\n";
-    }
-
-    RELEASE(_ibuffer, dxgsg8, "index buffer", RELEASE_ONCE);
-    _ibuffer = NULL;
-  }
-
-  update_data_size_bytes(0);
-  mark_unloaded();
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: DXIndexBufferContext8::create_ibuffer
-//       Access: Public
-//  Description: Creates a new index buffer (but does not upload data
-//               to it).
-////////////////////////////////////////////////////////////////////
-void DXIndexBufferContext8::
-create_ibuffer(DXScreenData &scrn, 
-               const GeomPrimitivePipelineReader *reader) {
-  nassertv(reader->get_object() == get_data());
-  Thread *current_thread = reader->get_current_thread();
-
-  if (_ibuffer != NULL) {
-    RELEASE(_ibuffer, dxgsg8, "index buffer", RELEASE_ONCE);
-    _ibuffer = NULL;
-  }
-
-  PStatTimer timer(GraphicsStateGuardian::_create_index_buffer_pcollector,
-                   current_thread);
-
-  D3DFORMAT index_type =
-    DXGraphicsStateGuardian8::get_index_type(reader->get_index_type());
-
-  HRESULT hr = scrn._d3d_device->CreateIndexBuffer
-//    (reader->get_data_size_bytes(), D3DUSAGE_WRITEONLY,
-//     index_type, D3DPOOL_MANAGED, &_ibuffer);
-    (reader->get_data_size_bytes(), D3DUSAGE_WRITEONLY | D3DUSAGE_DYNAMIC,
-     index_type, D3DPOOL_DEFAULT, &_ibuffer);
-  if (FAILED(hr)) {
-    dxgsg8_cat.warning()
-      << "CreateIndexBuffer failed" << D3DERRORSTRING(hr);
-    _ibuffer = NULL;
-  } else {
-    if (dxgsg8_cat.is_debug()) {
-      dxgsg8_cat.debug()
-        << "creating index buffer " << _ibuffer << ": "
-        << reader->get_num_vertices() << " indices ("
-        << reader->get_vertices_reader()->get_array_format()->get_column(0)->get_numeric_type()
-        << ")\n";
-    }
-  }
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: DXIndexBufferContext8::upload_data
-//       Access: Public
-//  Description: Copies the latest data from the client store to
-//               DirectX.
-////////////////////////////////////////////////////////////////////
-bool DXIndexBufferContext8::
-upload_data(const GeomPrimitivePipelineReader *reader, bool force) {
-  nassertr(reader->get_object() == get_data(), false);
-  Thread *current_thread = reader->get_current_thread();
-
-  nassertr(_ibuffer != NULL, false);
-
-  const unsigned char *data_pointer = reader->get_read_pointer(force);
-  if (data_pointer == NULL) {
-    return false;
-  }
-  int data_size = reader->get_data_size_bytes();
-
-  if (dxgsg8_cat.is_spam()) {
-    dxgsg8_cat.spam()
-      << "copying " << data_size
-      << " bytes into index buffer " << _ibuffer << "\n";
-  }
-
-  PStatTimer timer(GraphicsStateGuardian::_load_index_buffer_pcollector,
-                   current_thread);
-
-  BYTE *local_pointer;
-//  HRESULT hr = _ibuffer->Lock(0, data_size, &local_pointer, 0);
-  HRESULT hr = _ibuffer->Lock(0, data_size, &local_pointer, D3DLOCK_DISCARD);
-  if (FAILED(hr)) {
-    dxgsg8_cat.error()
-      << "IndexBuffer::Lock failed" << D3DERRORSTRING(hr);
-    return false;
-  }
-
-  GraphicsStateGuardian::_data_transferred_pcollector.add_level(data_size);
-  memcpy(local_pointer, data_pointer, data_size);
-
-  _ibuffer->Unlock();
-  return true;
-}
-
diff --git a/panda/src/dxgsg8/dxIndexBufferContext8.h b/panda/src/dxgsg8/dxIndexBufferContext8.h
deleted file mode 100644
index 8322463800..0000000000
--- a/panda/src/dxgsg8/dxIndexBufferContext8.h
+++ /dev/null
@@ -1,62 +0,0 @@
-// Filename: dxIndexBufferContext8.h
-// Created by:  drose (18Mar05)
-//
-////////////////////////////////////////////////////////////////////
-//
-// 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 DXINDEXBUFFERCONTEXT8_H
-#define DXINDEXBUFFERCONTEXT8_H
-
-#include "pandabase.h"
-#include "dxgsg8base.h"
-#include "indexBufferContext.h"
-
-////////////////////////////////////////////////////////////////////
-//       Class : DXIndexBufferContext8
-// Description : Caches a GeomPrimitive in the DirectX device as
-//               an index buffer.
-////////////////////////////////////////////////////////////////////
-class EXPCL_PANDADX DXIndexBufferContext8 : public IndexBufferContext {
-public:
-  DXIndexBufferContext8(PreparedGraphicsObjects *pgo, GeomPrimitive *data);
-  virtual ~DXIndexBufferContext8();
-
-  virtual void evict_lru();
-
-  void create_ibuffer(DXScreenData &scrn,
-                      const GeomPrimitivePipelineReader *reader);
-  bool upload_data(const GeomPrimitivePipelineReader *reader, bool force);
-
-  IDirect3DIndexBuffer8 *_ibuffer;
-
-public:
-  static TypeHandle get_class_type() {
-    return _type_handle;
-  }
-  static void init_type() {
-    IndexBufferContext::init_type();
-    register_type(_type_handle, "DXIndexBufferContext8",
-                  IndexBufferContext::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 "dxIndexBufferContext8.I"
-
-#endif
-
-
diff --git a/panda/src/dxgsg8/dxInput8.cxx b/panda/src/dxgsg8/dxInput8.cxx
deleted file mode 100644
index a26e23679a..0000000000
--- a/panda/src/dxgsg8/dxInput8.cxx
+++ /dev/null
@@ -1,272 +0,0 @@
-// Filename: dxInput8.cxx
-// Created by:  angelina jolie (07Oct99)
-//
-////////////////////////////////////////////////////////////////////
-//
-// 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 "config_wdxdisplay8.h"
-#include "dxInput8.h"
-
-#define AXIS_RESOLUTION 2000   // use this many levels of resolution by default (could be more if needed and device supported it)
-#define AXIS_RANGE_CENTERED    // if defined, axis range is centered on 0, instead of starting on 0
-
-BOOL CALLBACK EnumGameCtrlsCallback( const DIDEVICEINSTANCE* pdidInstance,
-                                     VOID* pContext ) {
-    DI_DeviceInfos *pDevInfos = (DI_DeviceInfos *)pContext;
-
-    (*pDevInfos).push_back(*pdidInstance);
-
-    if(wdxdisplay_cat.is_debug())
-        wdxdisplay_cat.debug() << "Found DevType 0x" << (void*)pdidInstance->dwDevType << ": " << pdidInstance->tszInstanceName << ": " << pdidInstance->tszProductName <<endl;
-
-    return DIENUM_CONTINUE;
-}
-
-extern BOOL CALLBACK EnumObjectsCallbackJoystick(const DIDEVICEOBJECTINSTANCE* pdidoi,VOID* pContext);
-
-DInput8Info::DInput8Info() {
-    _pDInput8 = NULL;
-    _hDInputDLL = NULL;
-    _JoystickPollTimer = NULL;
-}
-
-DInput8Info::~DInput8Info() {
-  for(UINT i=0;i<_DeviceList.size();i++) {
-      _DeviceList[i]->Unacquire();
-      SAFE_RELEASE(_DeviceList[i]);
-  }
-
-  // bugbug: need to handle this
-  // if(_JoystickPollTimer!=NULL)
-  //   KillTimer(...)
-
-  SAFE_RELEASE(_pDInput8);
-  if(_hDInputDLL) {
-      FreeLibrary(_hDInputDLL);
-      _hDInputDLL=NULL;
-  }
-}
-
-bool DInput8Info::InitDirectInput() {
-    HRESULT hr;
-
-    // assumes dx8 exists
-    // use dynamic load so non-dinput programs don't have to load dinput
-    #define DLLNAME "dinput8.dll"
-    #define DINPUTCREATE "DirectInput8Create"
-
-    HINSTANCE _hDInputDLL = LoadLibrary(DLLNAME);
-    if(_hDInputDLL == 0) {
-        wdxdisplay_cat.fatal() << "LoadLibrary(" << DLLNAME <<") failed!, error=" << GetLastError() << endl;
-        exit(1);
-    }
-
-    typedef HRESULT (WINAPI * LPDIRECTINPUT8CREATE)(HINSTANCE hinst, DWORD dwVersion, REFIID riidltf, LPVOID *ppvOut, LPUNKNOWN punkOuter);
-    LPDIRECTINPUT8CREATE pDInputCreate8;
-
-    pDInputCreate8 = (LPDIRECTINPUT8CREATE) GetProcAddress(_hDInputDLL,DINPUTCREATE);
-    if(pDInputCreate8 == NULL) {
-        wdxdisplay_cat.fatal() << "GetProcAddr failed for " << DINPUTCREATE << endl;
-        exit(1);
-    }
-
-    // Register with the DirectInput subsystem and get a pointer
-    // to a IDirectInput interface we can use.
-    // Create a DInput object
-    if( FAILED( hr = (*pDInputCreate8)(GetModuleHandle(NULL), DIRECTINPUT_VERSION,
-                                         IID_IDirectInput8, (VOID**)&_pDInput8, NULL ) ) ) {
-        wdxdisplay_cat.error() << DINPUTCREATE << "failed" << D3DERRORSTRING(hr);
-        return false;
-    }
-
-    // enum all the joysticks,etc  (but not keybd/mouse)
-    if( FAILED( hr = _pDInput8->EnumDevices(DI8DEVCLASS_GAMECTRL,
-                                         EnumGameCtrlsCallback,
-                                         (LPVOID)&_DevInfos, DIEDFL_ATTACHEDONLY ) ) ) {
-        wdxdisplay_cat.error() << "EnumDevices failed" << D3DERRORSTRING(hr);
-        return false;
-    }
-
-    return true;
-}
-
-bool DInput8Info::CreateJoystickOrPad(HWND _window) {
-    bool bFoundDev = false;
-    UINT devnum=0;
-    char *errstr=NULL;
-
-    // look through the list for the first joystick or gamepad
-    for(;devnum<_DevInfos.size();devnum++) {
-        DWORD devType = GET_DIDEVICE_TYPE(_DevInfos[devnum].dwDevType);
-        if((devType==DI8DEVTYPE_GAMEPAD) ||(devType==DI8DEVTYPE_JOYSTICK)) {
-          bFoundDev=true;
-          break;
-        }
-    }
-
-    if(!bFoundDev) {
-        wdxdisplay_cat.error() << "Cant find an attached Joystick or GamePad!\n";
-        return false;
-    }
-
-    LPDIRECTINPUTDEVICE8 pJoyDevice;
-
-    // Obtain an interface to the enumerated joystick.
-    HRESULT hr = _pDInput8->CreateDevice(_DevInfos[devnum].guidInstance, &pJoyDevice, NULL );
-    if(FAILED(hr)) {
-        errstr="CreateDevice";
-        goto handle_error;
-    }
-
-    nassertr(pJoyDevice!=NULL, false);
-    _DeviceList.push_back(pJoyDevice);
-
-    // Set the data format to "simple joystick" - a predefined data format
-    //
-    // A data format specifies which controls on a device we are interested in,
-    // and how they should be reported. This tells DInput that we will be
-    // passing a DIJOYSTATE2 structure to IDirectInputDevice::GetDeviceState().
-    hr = pJoyDevice->SetDataFormat(&c_dfDIJoystick2);
-    if(FAILED(hr)) {
-        errstr="SetDataFormat";
-        goto handle_error;
-    }
-
-    // must be called AFTER SetDataFormat to get all the proper flags
-    DX_DECLARE_CLEAN(DIDEVCAPS, DIDevCaps);
-    hr = pJoyDevice->GetCapabilities(&DIDevCaps);
-    nassertr(SUCCEEDED(hr), false);
-
-    _DevCaps.push_back(DIDevCaps);
-
-    if(wdxdisplay_cat.is_debug())
-        wdxdisplay_cat.debug() << "Joy/Pad has " << DIDevCaps.dwAxes << " Axes, " <<  DIDevCaps.dwButtons << " Buttons, " <<  DIDevCaps.dwPOVs << " POVs" << endl;
-
-    // Set the cooperative level to let DInput know how this device should
-    // interact with the system and with other DInput applications.
-    hr = pJoyDevice->SetCooperativeLevel( _window, DISCL_EXCLUSIVE | DISCL_FOREGROUND);
-    if(FAILED(hr)) {
-        errstr="SetCooperativeLevel";
-        goto handle_error;
-    }
-
-    // set the min/max values property for discovered axes.
-    hr = pJoyDevice->EnumObjects(EnumObjectsCallbackJoystick, (LPVOID)pJoyDevice, DIDFT_AXIS);
-    if(FAILED(hr)) {
-        errstr="EnumObjects";
-        goto handle_error;
-    }
-
-    return true;
-
-  handle_error:
-    wdxdisplay_cat.error() << errstr << " failed for (" << _DevInfos[devnum].tszInstanceName << ":" << _DevInfos[devnum].tszProductName << ")" << D3DERRORSTRING(hr);
-    return false;
-}
-
-//-----------------------------------------------------------------------------
-// Name: EnumObjectsCallback()
-// Desc: Callback function for enumerating objects (axes, buttons, POVs) on a
-//       joystick. This function enables user interface elements for objects
-//       that are found to exist, and scales axes min/max values.
-//-----------------------------------------------------------------------------
-BOOL CALLBACK EnumObjectsCallbackJoystick( const DIDEVICEOBJECTINSTANCE* pdidoi,
-                                   VOID* pContext ) {
-
-    LPDIRECTINPUTDEVICE8 pJoyDevice = (LPDIRECTINPUTDEVICE8) pContext;
-    HRESULT hr;
-
-    // For axes that are returned, set the DIPROP_RANGE property for the
-    // enumerated axis in order to scale min/max values.
-    if( pdidoi->dwType & DIDFT_AXIS ) {
-        DIPROPRANGE diprg;
-        diprg.diph.dwSize       = sizeof(DIPROPRANGE);
-        diprg.diph.dwHeaderSize = sizeof(DIPROPHEADER);
-        diprg.diph.dwHow        = DIPH_BYID;
-        diprg.diph.dwObj        = pdidoi->dwType; // Specify the enumerated axis
-
-     #ifdef AXIS_RANGE_CENTERED
-        diprg.lMin              = -AXIS_RESOLUTION/2;
-        diprg.lMax              = +AXIS_RESOLUTION/2;
-     #else
-        diprg.lMin              = 0;
-        diprg.lMax              = +AXIS_RESOLUTION;
-     #endif
-
-        // Set the range for the axis
-        hr = pJoyDevice->SetProperty( DIPROP_RANGE, &diprg.diph);
-        if(FAILED(hr)) {
-          wdxdisplay_cat.error() << "SetProperty on axis failed" << D3DERRORSTRING(hr);
-          return DIENUM_STOP;
-        }
-    }
-
-    return DIENUM_CONTINUE;
-}
-
-bool DInput8Info::ReadJoystick(int devnum, DIJOYSTATE2 &js) {
-    LPDIRECTINPUTDEVICE8 pJoystick = _DeviceList[devnum];
-    nassertr(pJoystick!=NULL, false);
-    HRESULT hr;
-    char *errstr;
-
-    // Poll the device to read the current state
-
-    hr = pJoystick->Poll();
-
-    if( FAILED(hr) ) {
-        // DInput is telling us that the input stream has been
-        // interrupted. We aren't tracking any state between polls, so
-        // we don't have any special reset that needs to be done. We
-        // just re-acquire and try again.
-
-        if((hr==DIERR_NOTACQUIRED)||(hr == DIERR_INPUTLOST)) {
-            hr = pJoystick->Acquire();
-
-            if(FAILED(hr)) {
-                if(wdxdisplay_cat.is_spam())
-                   wdxdisplay_cat.spam() << "Acquire failed" << D3DERRORSTRING(hr);
-
-                // hr may be DIERR_OTHERAPPHASPRIO or other errors.  This
-                // may occur when the app is minimized or in the process of
-                // switching, so just try again later
-                return false;
-            }
-
-            hr = pJoystick->Poll();
-            if(FAILED(hr)) {
-                // should never happen!
-                errstr = "Poll after successful Acquire failed";
-                goto handle_error;
-            }
-        } else {
-            errstr =  "Unknown Poll failure";
-            goto handle_error;
-        }
-    }
-
-    // should we make a vector of devstate dataformats to generalize this fn for all device types?
-
-    // Get the input's device state
-    hr = pJoystick->GetDeviceState( sizeof(DIJOYSTATE2), &js);
-    if(FAILED(hr)) {
-        errstr =  "GetDeviceState failed";
-        goto handle_error;
-    }
-
-    return true;
-
-  handle_error:
-     wdxdisplay_cat.fatal() << errstr << D3DERRORSTRING(hr);
-     return false;
-}
-
-
diff --git a/panda/src/dxgsg8/dxInput8.h b/panda/src/dxgsg8/dxInput8.h
deleted file mode 100644
index a5f1c5f8b3..0000000000
--- a/panda/src/dxgsg8/dxInput8.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Filename: dxInput8.h
-// Created by:  blllyjo (07Oct99)
-//
-////////////////////////////////////////////////////////////////////
-//
-// 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 DXINPUT8_H
-#define DXINPUT8_H
-
-#define DIRECTINPUT_VERSION 0x800
-#include <dinput.h>
-typedef vector<DIDEVICEINSTANCE> DI_DeviceInfos;
-typedef vector<DIDEVICEOBJECTINSTANCE> DI_DeviceObjInfos;
-
-class DInput8Info {
-public:
- DInput8Info();
- ~DInput8Info();
- bool InitDirectInput();
- bool CreateJoystickOrPad(HWND _window);
- bool ReadJoystick(int devnum, DIJOYSTATE2 &js);
-
- HINSTANCE _hDInputDLL;
- UINT_PTR  _JoystickPollTimer;
- LPDIRECTINPUT8 _pDInput8;
- DI_DeviceInfos _DevInfos;
- // arrays for all created devices.  Should probably put these together in a struct,
- // along with the data fmt info
- vector<LPDIRECTINPUTDEVICE8> _DeviceList;
- vector<DIDEVCAPS> _DevCaps;
-};
-
-#endif
diff --git a/panda/src/dxgsg8/dxTextureContext8.I b/panda/src/dxgsg8/dxTextureContext8.I
deleted file mode 100644
index 8fdd3bb9b4..0000000000
--- a/panda/src/dxgsg8/dxTextureContext8.I
+++ /dev/null
@@ -1,69 +0,0 @@
-// Filename: dxTextureContext8.I
-// Created by:  drose (23May05)
-//
-////////////////////////////////////////////////////////////////////
-//
-// 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."
-//
-////////////////////////////////////////////////////////////////////
-
-
-////////////////////////////////////////////////////////////////////
-//     Function: DXTextureContext8::has_mipmaps
-//       Access: Public
-//  Description: Returns true if the texture was created with mipmaps,
-//               false otherwise.
-////////////////////////////////////////////////////////////////////
-INLINE bool DXTextureContext8::
-has_mipmaps() const {
-  return _has_mipmaps;
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: DXTextureContext8::get_d3d_texture
-//       Access: Public
-//  Description: Returns the Direct3D object that represents the
-//               texture, whatever kind of texture it is.
-////////////////////////////////////////////////////////////////////
-INLINE IDirect3DBaseTexture8 *DXTextureContext8::
-get_d3d_texture() const {
-  return _d3d_texture;
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: DXTextureContext8::get_d3d_2d_texture
-//       Access: Public
-//  Description: Returns the Direct3D object that represents the
-//               texture, in the case of a 1-d or 2-d texture.
-////////////////////////////////////////////////////////////////////
-INLINE IDirect3DTexture8 *DXTextureContext8::
-get_d3d_2d_texture() const {
-  return _d3d_2d_texture;
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: DXTextureContext8::get_d3d_volume_texture
-//       Access: Public
-//  Description: Returns the Direct3D object that represents the
-//               texture, in the case of a 3-d texture.
-////////////////////////////////////////////////////////////////////
-INLINE IDirect3DVolumeTexture8 *DXTextureContext8::
-get_d3d_volume_texture() const {
-  return _d3d_volume_texture;
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: DXTextureContext8::get_d3d_cube_texture
-//       Access: Public
-//  Description: Returns the Direct3D object that represents the
-//               texture, in the case of a cube map texture.
-////////////////////////////////////////////////////////////////////
-INLINE IDirect3DCubeTexture8 *DXTextureContext8::
-get_d3d_cube_texture() const {
-  return _d3d_cube_texture;
-}
diff --git a/panda/src/dxgsg8/dxTextureContext8.cxx b/panda/src/dxgsg8/dxTextureContext8.cxx
deleted file mode 100644
index 7a299cb4d0..0000000000
--- a/panda/src/dxgsg8/dxTextureContext8.cxx
+++ /dev/null
@@ -1,1853 +0,0 @@
-// Filename: dxTextureContext8.cxx
-// Created by:  georges (02Feb02)
-//
-////////////////////////////////////////////////////////////////////
-//
-// 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 "dxTextureContext8.h"
-#include "config_dxgsg8.h"
-#include "dxGraphicsStateGuardian8.h"
-#include "pStatTimer.h"
-#include "dxgsg8base.h"
-#include "bamCache.h"
-#include "graphicsEngine.h"
-
-#include <assert.h>
-#include <time.h>
-
-TypeHandle DXTextureContext8::_type_handle;
-
-static const DWORD g_LowByteMask = 0x000000FF;
-
-////////////////////////////////////////////////////////////////////
-//     Function: DXTextureContext8::Constructor
-//       Access: Public
-//  Description:
-////////////////////////////////////////////////////////////////////
-DXTextureContext8::
-DXTextureContext8(PreparedGraphicsObjects *pgo, Texture *tex, int view) :
-  TextureContext(pgo, tex, view) {
-
-  if (dxgsg8_cat.is_spam()) {
-    dxgsg8_cat.spam()
-      << "Creating DX texture [" << tex->get_name() << "], minfilter(" << tex->get_minfilter() << "), magfilter(" << tex->get_magfilter() << "), anisodeg(" << tex->get_anisotropic_degree() << ")\n";
-  }
-
-  _d3d_texture = NULL;
-  _d3d_2d_texture = NULL;
-  _d3d_volume_texture = NULL;
-  _d3d_cube_texture = NULL;
-  _has_mipmaps = false;
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: DXTextureContext8::Destructor
-//       Access: Public, Virtual
-//  Description:
-////////////////////////////////////////////////////////////////////
-DXTextureContext8::
-~DXTextureContext8() {
-  delete_texture();
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: DXTextureContext8::evict_lru
-//       Access: Public, Virtual
-//  Description: Evicts the page from the LRU.  Called internally when
-//               the LRU determines that it is full.  May also be
-//               called externally when necessary to explicitly evict
-//               the page.
-//
-//               It is legal for this method to either evict the page
-//               as requested, do nothing (in which case the eviction
-//               will be requested again at the next epoch), or
-//               requeue itself on the tail of the queue (in which
-//               case the eviction will be requested again much
-//               later).
-////////////////////////////////////////////////////////////////////
-void DXTextureContext8::
-evict_lru() {
-  if (get_texture()->get_render_to_texture()) {
-    // Don't evict the result of render-to-texture.
-    mark_used_lru();
-    return;
-  }
-
-  dequeue_lru();
-  delete_texture();
-  update_data_size_bytes(0);
-  mark_unloaded();
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: DXTextureContext8::create_texture
-//       Access: Public
-//  Description: Use panda texture's pixelbuffer to create a texture
-//               for the specified device.  This code gets the
-//               attributes of the texture from the bitmap, creates
-//               the texture, and then copies the bitmap into the
-//               texture.  The return value is true if the texture is
-//               successfully created, false otherwise.
-////////////////////////////////////////////////////////////////////
-bool DXTextureContext8::
-create_texture(DXScreenData &scrn) {
-  HRESULT hr;
-  int num_alpha_bits;     //  number of alpha bits in texture pixfmt
-  D3DFORMAT target_pixel_format = D3DFMT_UNKNOWN;
-  bool needs_luminance = false;
-  bool compress_texture = false;
-
-  Texture *tex = get_texture();
-  nassertr(IS_VALID_PTR(tex), false);
-
-  delete_texture();
-
-#ifdef DO_PSTATS
-  update_data_size_bytes(tex->estimate_texture_memory());
-#endif  // DO_PSTATS
-
-  // bpp indicates requested fmt, not texture fmt
-  DWORD target_bpp = get_bits_per_pixel(tex->get_format(), &num_alpha_bits);
-  DWORD num_color_channels = tex->get_num_components();
-
-  //PRINT_REFCNT(dxgsg8, scrn._d3d8);
-
-  DWORD orig_width = (DWORD)tex->get_x_size();
-  DWORD orig_height = (DWORD)tex->get_y_size();
-  DWORD orig_depth = (DWORD)tex->get_z_size();
-
-  if ((tex->get_format() == Texture::F_luminance_alpha)||
-      (tex->get_format() == Texture::F_luminance_alphamask) ||
-      (tex->get_format() == Texture::F_luminance)) {
-    needs_luminance = true;
-  }
-
-  if (num_alpha_bits > 0) {
-    if (num_color_channels == 3) {
-      dxgsg8_cat.error()
-        << "texture " << tex->get_name()
-        << " has no inherent alpha channel, but alpha format is requested!\n";
-    }
-  }
-
-  _d3d_format = D3DFMT_UNKNOWN;
-
-  // figure out what 'D3DFMT' the Texture is in, so D3DXLoadSurfFromMem knows how to perform copy
-
-  switch (num_color_channels) {
-  case 1:
-    if (num_alpha_bits > 0) {
-      _d3d_format = D3DFMT_A8;
-    } else if (needs_luminance) {
-      _d3d_format = D3DFMT_L8;
-    }
-    break;
-  case 2:
-    nassertr(needs_luminance && (num_alpha_bits > 0), false);
-    _d3d_format = D3DFMT_A8L8;
-    break;
-  case 3:
-    _d3d_format = D3DFMT_R8G8B8;
-    break;
-  case 4:
-    _d3d_format = D3DFMT_A8R8G8B8;
-    break;
-  }
-
-  // check for texture compression
-  bool texture_wants_compressed = false;
-  Texture::CompressionMode compression_mode = tex->get_ram_image_compression();
-  bool texture_stored_compressed = compression_mode != Texture::CM_off;
-  
-  if (texture_stored_compressed) {
-    texture_wants_compressed = true;  
-  }
-  else {
-    if (tex->get_compression() == Texture::CM_off) {
-      // no compression
-    }
-    else {    
-      if (tex->get_compression() == Texture::CM_default) {
-        // default = use "compressed-textures" config setting
-        if (compressed_textures) {
-          texture_wants_compressed = true;
-        }
-      }
-      else {
-        texture_wants_compressed = true;
-      }
-    }  
-  }
-
-  switch (tex->get_texture_type()) {
-    case Texture::TT_1d_texture:
-    case Texture::TT_2d_texture:
-    case Texture::TT_cube_map:
-      // no compression for render target textures, or very small
-      // textures
-      if (tex->get_render_to_texture() == false &&
-          orig_width >= 4 && orig_height >= 4) {
-        if (texture_wants_compressed){
-          compress_texture = true;
-        }
-      }
-      break;
-    case Texture::TT_3d_texture:
-      // not supported by all video chips
-      break;
-  }
-
-  // make sure we handled all the possible cases
-  nassertr(_d3d_format != D3DFMT_UNKNOWN, false);
-
-  DWORD target_width = orig_width;
-  DWORD target_height = orig_height;
-  DWORD target_depth = orig_depth;
-
-  DWORD filter_caps;
-
-  switch (tex->get_texture_type()) {
-  case Texture::TT_1d_texture:
-  case Texture::TT_2d_texture:
-    filter_caps = scrn._d3dcaps.TextureFilterCaps;
-
-    if (target_width > scrn._d3dcaps.MaxTextureWidth) {
-      target_width = scrn._d3dcaps.MaxTextureWidth;
-    }
-    if (target_height > scrn._d3dcaps.MaxTextureHeight) {
-      target_height = scrn._d3dcaps.MaxTextureHeight;
-    }
-
-    if (scrn._d3dcaps.TextureCaps & D3DPTEXTURECAPS_POW2) {
-      if (!ISPOW2(target_width)) {
-        target_width = down_to_power_2(target_width);
-      }
-      if (!ISPOW2(target_height)) {
-        target_height = down_to_power_2(target_height);
-      }
-    }
-    break;
-
-  case Texture::TT_3d_texture:
-    if ((scrn._d3dcaps.TextureCaps & D3DPTEXTURECAPS_VOLUMEMAP) == 0) {
-      dxgsg8_cat.warning()
-        << "3-d textures are not supported by this graphics driver.\n";
-      return false;
-    }
-
-    filter_caps = scrn._d3dcaps.VolumeTextureFilterCaps;
-
-    if (target_width > scrn._d3dcaps.MaxVolumeExtent) {
-      target_width = scrn._d3dcaps.MaxVolumeExtent;
-    }
-    if (target_height > scrn._d3dcaps.MaxVolumeExtent) {
-      target_height = scrn._d3dcaps.MaxVolumeExtent;
-    }
-    if (target_depth > scrn._d3dcaps.MaxVolumeExtent) {
-      target_depth = scrn._d3dcaps.MaxVolumeExtent;
-    }
-
-    if (scrn._d3dcaps.TextureCaps & D3DPTEXTURECAPS_VOLUMEMAP_POW2) {
-      if (!ISPOW2(target_width)) {
-        target_width = down_to_power_2(target_width);
-      }
-      if (!ISPOW2(target_height)) {
-        target_height = down_to_power_2(target_height);
-      }
-      if (!ISPOW2(target_depth)) {
-        target_depth = down_to_power_2(target_depth);
-      }
-    }
-    break;
-
-  case Texture::TT_cube_map:
-    if ((scrn._d3dcaps.TextureCaps & D3DPTEXTURECAPS_CUBEMAP) == 0) {
-      dxgsg8_cat.warning()
-        << "Cube map textures are not supported by this graphics driver.\n";
-      return false;
-    }
-
-    filter_caps = scrn._d3dcaps.CubeTextureFilterCaps;
-
-    if (target_width > scrn._d3dcaps.MaxTextureWidth) {
-      target_width = scrn._d3dcaps.MaxTextureWidth;
-    }
-
-    if (scrn._d3dcaps.TextureCaps & D3DPTEXTURECAPS_CUBEMAP_POW2) {
-      if (!ISPOW2(target_width)) {
-        target_width = down_to_power_2(target_width);
-      }
-    }
-
-    target_height = target_width;
-    break;
-  }
-
-  // checks for SQUARE reqmt (nvidia riva128 needs this)
-  if ((target_width != target_height) &&
-      (scrn._d3dcaps.TextureCaps & D3DPTEXTURECAPS_SQUAREONLY) != 0) {
-    // assume pow2 textures.  sum exponents, divide by 2 rounding down
-    // to get sq size
-    int i, width_exp, height_exp;
-    for (i = target_width, width_exp = 0; i > 1; width_exp++, i >>= 1) {
-    }
-    for (i = target_height, height_exp = 0; i > 1; height_exp++, i >>= 1) {
-    }
-    target_height = target_width = 1<<((width_exp+height_exp)>>1);
-  }
-
-  bool shrink_original = false;
-
-  if (orig_width != target_width || orig_height != target_height ||
-      orig_depth != target_depth) {
-    if (tex->get_texture_type() == Texture::TT_3d_texture) {
-      dxgsg8_cat.info()
-        << "Reducing size of " << tex->get_name()
-        << " from " << orig_width << "x" << orig_height << "x" << orig_depth
-        << " to " << target_width << "x" << target_height
-        << "x" << target_depth << "\n";
-    } else {
-      dxgsg8_cat.info()
-        << "Reducing size of " << tex->get_name()
-        << " from " << orig_width << "x" << orig_height
-        << " to " << target_width << "x" << target_height << "\n";
-    }
-
-    shrink_original = true;
-  }
-
-  const char *error_message;
-
-  error_message = "create_texture failed: couldn't find compatible device Texture Pixel Format for input texture";
-
-  if (dxgsg8_cat.is_spam()) {
-    dxgsg8_cat.spam()
-      << "create_texture handling target bitdepth: " << target_bpp
-      << " alphabits: " << num_alpha_bits << endl;
-  }
-
-  // I could possibly replace some of this logic with
-  // D3DXCheckTextureRequirements(), but it wouldn't handle all my
-  // specialized low-memory cases perfectly
-
-#define CHECK_FOR_FMT(FMT)  \
-                    if (scrn._supported_tex_formats_mask & FMT##_FLAG) {   \
-                        target_pixel_format = D3DFMT_##FMT;                 \
-                        goto found_matching_format; }
-
-  if (texture_stored_compressed && compress_texture) {
-    // if the texture is already compressed, we need to choose the
-    // corresponding format, otherwise we might end up
-    // cross-compressing from e.g. DXT5 to DXT3
-    switch (compression_mode){
-    case Texture::CM_dxt1:
-      CHECK_FOR_FMT(DXT1);
-      break;
-    case Texture::CM_dxt2:
-      CHECK_FOR_FMT(DXT2);
-      break;
-    case Texture::CM_dxt3:
-      CHECK_FOR_FMT(DXT3);
-      break;
-    case Texture::CM_dxt4:
-      CHECK_FOR_FMT(DXT4);
-      break;
-    case Texture::CM_dxt5:
-      CHECK_FOR_FMT(DXT5);
-      break;
-    }
-
-    // We don't support the compressed format.  Fall through.
-  }
-
-  if (compress_texture) {
-    if (num_alpha_bits <= 1) {
-      CHECK_FOR_FMT(DXT1);    
-    } else if (num_alpha_bits <= 4) {
-      CHECK_FOR_FMT(DXT3);    
-    } else {
-      CHECK_FOR_FMT(DXT5);
-    }
-  }
-
-  // We can't compress for some reason, so ensure the uncompressed
-  // image is ready to load.
-  if (texture_stored_compressed) {
-    tex->get_uncompressed_ram_image();
-    compression_mode = tex->get_ram_image_compression();
-    texture_stored_compressed = compression_mode != Texture::CM_off;
-    compress_texture = false;
-  }
-  
-  // handle each target bitdepth separately.  might be less confusing
-  // to reorg by num_color_channels (input type)
-  switch (target_bpp) {
-
-    // IMPORTANT NOTE:
-    // target_bpp is REQUESTED bpp, not what exists in the texture
-    // array (the texture array contains num_color_channels*8bits)
-
-  case 32:
-    if (!((num_color_channels == 3) || (num_color_channels == 4)))
-      break; //bail
-
-    CHECK_FOR_FMT(A8R8G8B8);
-    
-    if (num_alpha_bits>0) {
-      nassertr(num_color_channels == 4, false);
-
-      // no 32-bit fmt, look for 16 bit w/alpha  (1-15)
-
-      // 32 bit RGBA was requested, but only 16 bit alpha fmts are
-      // avail.  By default, convert to 4-4-4-4 which has 4-bit alpha
-      // for blurry edges.  If we know tex only needs 1 bit alpha
-      // (i.e. for a mask), use 1555 instead.
-
-
-      //  ConversionType ConvTo1 = Conv32to16_4444, ConvTo2 = Conv32to16_1555;
-      //  DWORD dwAlphaMask1 = 0xF000, dwAlphaMask2 = 0x8000;
-
-      // assume ALPHAMASK is x8000 and RGBMASK is x7fff to simplify
-      // 32->16 conversion.  This should be true on most cards.
-
-      if (num_alpha_bits == 1) {
-        CHECK_FOR_FMT(A1R5G5B5);
-      }
-
-      // normally prefer 4444 due to better alpha channel resolution
-      CHECK_FOR_FMT(A4R4G4B4);
-      CHECK_FOR_FMT(A1R5G5B5);
-
-      // At this point, bail.  Don't worry about converting to
-      // non-alpha formats yet, I think this will be a very rare case.
-      error_message = "create_texture failed: couldn't find compatible Tex DDPIXELFORMAT! no available 16 or 32-bit alpha formats!";
-    } else {
-      // convert 3 or 4 channel to closest 16bpp color fmt
-
-      if (num_color_channels == 3) {
-        CHECK_FOR_FMT(R5G6B5);
-        CHECK_FOR_FMT(X1R5G5B5);
-      } else {
-        CHECK_FOR_FMT(R5G6B5);
-        CHECK_FOR_FMT(X1R5G5B5);
-      }
-    }
-    break;
-
-  case 24:
-    nassertr(num_color_channels == 3, false);
-
-    CHECK_FOR_FMT(R8G8B8);
-    
-    // no 24-bit fmt.  look for 32 bit fmt (note: this is
-    // memory-hogging choice instead I could look for
-    // memory-conserving 16-bit fmt).
-    
-    CHECK_FOR_FMT(X8R8G8B8);
-    CHECK_FOR_FMT(A8R8G8B8);
-
-    // no 24-bit or 32 fmt.  look for 16 bit fmt (higher res 565 1st)
-    CHECK_FOR_FMT(R5G6B5);
-    CHECK_FOR_FMT(X1R5G5B5);
-    CHECK_FOR_FMT(A1R5G5B5);
-    break;
-
-  case 16:
-    if (needs_luminance) {
-      nassertr(num_alpha_bits > 0, false);
-      nassertr(num_color_channels == 2, false);
-
-      CHECK_FOR_FMT(A8L8);
-      CHECK_FOR_FMT(A8R8G8B8);
-
-      if (num_alpha_bits == 1) {
-        CHECK_FOR_FMT(A1R5G5B5);
-      }
-
-      // normally prefer 4444 due to better alpha channel resolution
-      CHECK_FOR_FMT(A4R4G4B4);
-      CHECK_FOR_FMT(A1R5G5B5);
-    } else {
-      nassertr((num_color_channels == 3)||(num_color_channels == 4), false);
-      // look for compatible 16bit fmts, if none then give up
-      // (don't worry about other bitdepths for 16 bit)
-      switch(num_alpha_bits) {
-      case 0:
-        if (num_color_channels == 3) {
-          CHECK_FOR_FMT(R5G6B5);
-          CHECK_FOR_FMT(X1R5G5B5);
-        } else {
-          nassertr(num_color_channels == 4, false);
-          // it could be 4 if user asks us to throw away the alpha channel
-          CHECK_FOR_FMT(R5G6B5);
-          CHECK_FOR_FMT(X1R5G5B5);
-        }
-        break;
-      case 1:
-        // app specifically requests 1-5-5-5 F_rgba5 case, where you
-        // explicitly want 1-5-5-5 fmt, as opposed to F_rgbm, which
-        // could use 32bpp ARGB.  fail if this particular fmt not
-        // avail.
-        nassertr(num_color_channels == 4, false);
-        CHECK_FOR_FMT(X1R5G5B5);
-        break;
-      case 4:
-        // app specifically requests 4-4-4-4 F_rgba4 case, as opposed
-        // to F_rgba, which could use 32bpp ARGB
-        nassertr(num_color_channels == 4, false);
-        CHECK_FOR_FMT(A4R4G4B4);
-        break;
-      default:
-        nassertr(false, false);  // problem in get_bits_per_pixel()?
-      }
-    }
-  case 8:
-    if (needs_luminance) {
-      // don't bother handling those other 8bit lum fmts like 4-4,
-      // since 16 8-8 is usually supported too
-      nassertr(num_color_channels == 1, false);
-
-      // look for native lum fmt first
-      CHECK_FOR_FMT(L8);
-      CHECK_FOR_FMT(L8);
-
-      CHECK_FOR_FMT(R8G8B8);
-      CHECK_FOR_FMT(X8R8G8B8);
-
-      CHECK_FOR_FMT(R5G6B5);
-      CHECK_FOR_FMT(X1R5G5B5);
-
-    } else if (num_alpha_bits == 8) {
-      // look for 16bpp A8L8, else 32-bit ARGB, else 16-4444.
-
-      // skip 8bit alpha only (D3DFMT_A8), because I think only voodoo
-      // supports it and the voodoo support isn't the kind of blending
-      // model we need somehow (is it that voodoo assumes color is
-      // white?  isnt that what we do in ConvAlpha8to32 anyway?)
-
-      CHECK_FOR_FMT(A8L8);
-      CHECK_FOR_FMT(A8R8G8B8);
-      CHECK_FOR_FMT(A4R4G4B4);
-    }
-    break;
-
-  default:
-    error_message = "create_texture failed: unhandled pixel bitdepth in DX loader";
-  }
-
-  // if we've gotten here, haven't found a match
-  dxgsg8_cat.error()
-    << error_message << ": " << tex->get_name() << endl
-    << "NumColorChannels: " << num_color_channels << "; NumAlphaBits: "
-    << num_alpha_bits << "; targetbpp: " <<target_bpp
-    << "; _supported_tex_formats_mask: 0x"
-    << (void*)scrn._supported_tex_formats_mask
-    << "; NeedLuminance: " << needs_luminance << endl;
-  goto error_exit;
-
-  ///////////////////////////////////////////////////////////
-
- found_matching_format:
-  // We found a suitable format that matches the texture's format.
-  
-  if (tex->get_match_framebuffer_format()) {
-    // Instead of creating a texture with the found format, we will
-    // need to make one that exactly matches the framebuffer's
-    // format.  Look up what that format is.
-    IDirect3DSurface8 *render_target;
-    hr = scrn._d3d_device->GetRenderTarget(&render_target);
-    if (FAILED(hr)) {
-      dxgsg8_cat.error()
-        << "GetRenderTgt failed in create_texture: " << D3DERRORSTRING(hr);
-    } else {
-      D3DSURFACE_DESC surface_desc;
-      hr = render_target->GetDesc(&surface_desc);
-      if (FAILED(hr)) {
-        dxgsg8_cat.error()
-          << "GetDesc failed in create_texture: " << D3DERRORSTRING(hr);
-      } else {
-        if (target_pixel_format != surface_desc.Format) {
-          if (dxgsg8_cat.is_debug()) {
-            dxgsg8_cat.debug()
-              << "Chose format " << D3DFormatStr(surface_desc.Format)
-              << " instead of " << D3DFormatStr(target_pixel_format)
-              << " for texture to match framebuffer.\n";
-          }
-          target_pixel_format = surface_desc.Format;
-        }
-      }
-      SAFE_RELEASE(render_target);
-    }
-  }
-
-  // validate magfilter setting
-  // degrade filtering if no HW support
-
-  SamplerState::FilterType ft;
-
-  ft = tex->get_magfilter();
-  if ((ft != SamplerState::FT_linear) && ft != SamplerState::FT_nearest) {
-    // mipmap settings make no sense for magfilter
-    if (ft == SamplerState::FT_nearest_mipmap_nearest) {
-      ft = SamplerState::FT_nearest;
-    } else {
-      ft = SamplerState::FT_linear;
-    }
-  }
-
-  if (ft == SamplerState::FT_linear &&
-      (filter_caps & D3DPTFILTERCAPS_MAGFLINEAR) == 0) {
-    ft = SamplerState::FT_nearest;
-  }
-  tex->set_magfilter(ft);
-
-  // figure out if we are mipmapping this texture
-  ft = tex->get_minfilter();
-  _has_mipmaps = false;
-
-  if (!dx_ignore_mipmaps) {  // set if no HW mipmap capable
-    switch(ft) {
-    case SamplerState::FT_nearest_mipmap_nearest:
-    case SamplerState::FT_linear_mipmap_nearest:
-    case SamplerState::FT_nearest_mipmap_linear:  // pick nearest in each, interpolate linearly b/w them
-    case SamplerState::FT_linear_mipmap_linear:
-      _has_mipmaps = true;
-    }
-
-    if (dx_mipmap_everything) {  // debug toggle, ok to leave in since its just a creation cost
-      _has_mipmaps = true;
-      if (dxgsg8_cat.is_spam()) {
-        if (ft != SamplerState::FT_linear_mipmap_linear) {
-          dxgsg8_cat.spam()
-            << "Forcing trilinear mipmapping on DX texture ["
-            << tex->get_name() << "]\n";
-        }
-      }
-      ft = SamplerState::FT_linear_mipmap_linear;
-      tex->set_minfilter(ft);
-    }
-
-  } else if ((ft == SamplerState::FT_nearest_mipmap_nearest) ||   // cvt to no-mipmap filter types
-             (ft == SamplerState::FT_nearest_mipmap_linear)) {
-    ft = SamplerState::FT_nearest;
-
-  } else if ((ft == SamplerState::FT_linear_mipmap_nearest) ||
-            (ft == SamplerState::FT_linear_mipmap_linear)) {
-    ft = SamplerState::FT_linear;
-  }
-
-  nassertr((filter_caps & D3DPTFILTERCAPS_MINFPOINT) != 0, false);
-
-#define TRILINEAR_MIPMAP_TEXFILTERCAPS (D3DPTFILTERCAPS_MIPFLINEAR | D3DPTFILTERCAPS_MINFLINEAR)
-
-  // do any other filter type degradations necessary
-  switch(ft) {
-  case SamplerState::FT_linear_mipmap_linear:
-    if ((filter_caps & TRILINEAR_MIPMAP_TEXFILTERCAPS) != TRILINEAR_MIPMAP_TEXFILTERCAPS) {
-      if (filter_caps & D3DPTFILTERCAPS_MINFLINEAR) {
-        ft = SamplerState::FT_linear_mipmap_nearest;
-      } else {
-        // if you cant do linear in a level, you probably cant do
-        // linear b/w levels, so just do nearest-all
-        ft = SamplerState::FT_nearest_mipmap_nearest;
-      }
-    }
-    break;
-
-  case SamplerState::FT_nearest_mipmap_linear:
-    // if we don't have bilinear, do nearest_nearest
-    if (!((filter_caps & D3DPTFILTERCAPS_MIPFPOINT) &&
-          (filter_caps & D3DPTFILTERCAPS_MINFLINEAR))) {
-      ft = SamplerState::FT_nearest_mipmap_nearest;
-    }
-    break;
-
-  case SamplerState::FT_linear_mipmap_nearest:
-    // if we don't have mip linear, do nearest_nearest
-    if (!(filter_caps & D3DPTFILTERCAPS_MIPFLINEAR)) {
-      ft = SamplerState::FT_nearest_mipmap_nearest;
-    }
-    break;
-
-  case SamplerState::FT_linear:
-    if (!(filter_caps & D3DPTFILTERCAPS_MINFLINEAR)) {
-      ft = SamplerState::FT_nearest;
-    }
-    break;
-  }
-
-  tex->set_minfilter(ft);
-
-  uint aniso_degree;
-
-  aniso_degree = 1;
-  if (scrn._d3dcaps.RasterCaps & D3DPRASTERCAPS_ANISOTROPY) {
-    aniso_degree = tex->get_anisotropic_degree();
-    if ((aniso_degree>scrn._d3dcaps.MaxAnisotropy) ||
-        dx_force_anisotropic_filtering) {
-      aniso_degree = scrn._d3dcaps.MaxAnisotropy;
-    }
-  }
-  tex->set_anisotropic_degree(aniso_degree);
-
-#ifdef _DEBUG
-  dxgsg8_cat.spam()
-    << "create_texture: setting aniso degree for " << tex->get_name()
-    << " to: " << aniso_degree << endl;
-#endif
-
-  UINT mip_level_count;
-
-  if (_has_mipmaps) {
-    tex->get_ram_image();
-    mip_level_count = tex->get_num_loadable_ram_mipmap_images();
-    if (mip_level_count < 2) {
-      // tell CreateTex to alloc space for all mip levels down to 1x1
-      mip_level_count = 0;
-
-      if (dxgsg8_cat.is_debug()) {
-        dxgsg8_cat.debug()
-          << "create_texture: generating mipmaps for " << tex->get_name()
-          << endl;
-      }
-    }
-  } else {
-    mip_level_count = 1;
-  }
-
-  DWORD usage;
-  D3DPOOL pool;
-
-  usage = 0;
-  if (tex->get_render_to_texture ()) {
-    // REQUIRED
-    pool = D3DPOOL_DEFAULT;
-    if (support_render_texture && scrn._dxgsg8 -> get_supports_render_texture ( )) {
-      usage |= D3DUSAGE_RENDERTARGET;
-    }
-  }
-  else {
-    pool = D3DPOOL_MANAGED;
-  }
-
-  switch (tex->get_texture_type()) {
-  case Texture::TT_1d_texture:
-  case Texture::TT_2d_texture:
-    hr = scrn._d3d_device->CreateTexture
-      (target_width, target_height, mip_level_count, usage,
-       target_pixel_format, pool, &_d3d_2d_texture);
-    _d3d_texture = _d3d_2d_texture;
-    break;
-
-  case Texture::TT_3d_texture:
-    hr = scrn._d3d_device->CreateVolumeTexture
-      (target_width, target_height, target_depth, mip_level_count, usage,
-       target_pixel_format, pool, &_d3d_volume_texture);
-    _d3d_texture = _d3d_volume_texture;
-    break;
-
-  case Texture::TT_cube_map:
-    hr = scrn._d3d_device->CreateCubeTexture
-      (target_width, mip_level_count, usage,
-       target_pixel_format, pool, &_d3d_cube_texture);
-    _d3d_texture = _d3d_cube_texture;
-    break;
-  }
-
-  if (FAILED(hr)) {
-    dxgsg8_cat.error()
-      << "D3D create_texture failed!" << D3DERRORSTRING(hr);
-    goto error_exit;
-  }
-
-  if (dxgsg8_cat.is_debug()) {
-    dxgsg8_cat.debug()
-      << "create_texture: " << tex->get_name()
-      << " converting panda equivalent of " << D3DFormatStr(_d3d_format)
-      << " => " << D3DFormatStr(target_pixel_format) << endl;
-  }
-
-  hr = fill_d3d_texture_pixels(scrn);
-  if (FAILED(hr)) {
-    goto error_exit;
-  }
-  
-  if (tex->get_post_load_store_cache()) {
-    tex->set_post_load_store_cache(false);
-    // OK, get the RAM image, and save it in a BamCache record.
-    if (extract_texture_data()) {
-      if (tex->has_ram_image()) {
-        BamCache *cache = BamCache::get_global_ptr();
-        PT(BamCacheRecord) record = cache->lookup(tex->get_fullpath(), "txo");
-        if (record != (BamCacheRecord *)NULL) {
-          record->set_data(tex, tex);
-          cache->store(record);
-        }
-      }
-    }
-  }
-
-  scrn._dxgsg8->get_engine()->texture_uploaded(tex);
-  mark_loaded();
-  return true;
-
- error_exit:
-
-  RELEASE(_d3d_texture, dxgsg8, "texture", RELEASE_ONCE);
-  _d3d_2d_texture = NULL;
-  _d3d_volume_texture = NULL;
-  _d3d_cube_texture = NULL;
-  return false;
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: DXTextureContext8::create_simple_texture
-//       Access: Public
-//  Description: 
-////////////////////////////////////////////////////////////////////
-bool DXTextureContext8::
-create_simple_texture(DXScreenData &scrn) {
-  nassertr(IS_VALID_PTR(get_texture()), false);
-
-  HRESULT hr;
-
-  delete_texture();
-
-  _d3d_format = D3DFMT_A8R8G8B8;
-  D3DFORMAT target_pixel_format = D3DFMT_A8R8G8B8;
-  DWORD target_bpp = 32;
-  DWORD num_color_channels = 4;
-
-  DWORD target_width = (DWORD)get_texture()->get_simple_x_size();
-  DWORD target_height = (DWORD)get_texture()->get_simple_y_size();
-  DWORD mip_level_count = 1;
-  DWORD usage = 0;
-  D3DPOOL pool = D3DPOOL_MANAGED;
-
-  int data_size = target_width * target_height * 4;
-
-  hr = scrn._d3d_device->CreateTexture
-    (target_width, target_height, mip_level_count, usage,
-     target_pixel_format, pool, &_d3d_2d_texture);
-  _d3d_texture = _d3d_2d_texture;      
-  if (FAILED(hr)) {
-    dxgsg8_cat.error()
-      << "D3D create_simple_texture failed!" << D3DERRORSTRING(hr);
-    dxgsg8_cat.error()
-      << "  width = " << target_width << " height = " << target_height << " target_pixel_format = " << target_pixel_format << "\n";
-
-    goto error_exit;
-  }
-
-  if (dxgsg8_cat.is_debug()) {
-    dxgsg8_cat.debug()
-      << "create_simple_texture: " << get_texture()->get_name()
-      << "\n";
-  }
-
-  {
-    CPTA_uchar image = get_texture()->get_simple_ram_image();
-
-    hr = -1;
-    //  hr = fill_d3d_texture_pixels(scrn);
-
-    IDirect3DSurface8 *surface = NULL;
-    _d3d_2d_texture->GetSurfaceLevel(0, &surface);
-
-    RECT source_size;
-    source_size.left = source_size.top = 0;
-    source_size.right = target_width;
-    source_size.bottom = target_height;
-
-    DWORD mip_filter = D3DX_FILTER_LINEAR;
-
-    hr = D3DXLoadSurfaceFromMemory
-      (surface, (PALETTEENTRY*)NULL, (RECT*)NULL, (LPCVOID)image.p(),
-       target_pixel_format, target_width * 4, (PALETTEENTRY*)NULL,
-       &source_size, mip_filter, (D3DCOLOR)0x0);
-
-    RELEASE(surface, dxgsg8, "create_simple_texture Surface", RELEASE_ONCE);
-  }
-    
-  if (FAILED(hr)) {
-    dxgsg8_cat.debug ()
-      << "*** fill_d3d_texture_pixels failed ***: format "
-      << target_pixel_format
-      << "\n";
-    
-    goto error_exit;
-  }
-
-  mark_simple_loaded();
-  return true;
-
- error_exit:
-  RELEASE(_d3d_texture, dxgsg8, "texture", RELEASE_ONCE);
-  _d3d_2d_texture = NULL;
-  _d3d_volume_texture = NULL;
-  _d3d_cube_texture = NULL;
-  return false;
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: DXTextureContext8::delete_texture
-//       Access: Public
-//  Description: Release the surface used to store the texture
-////////////////////////////////////////////////////////////////////
-void DXTextureContext8::
-delete_texture() {
-  if (_d3d_texture == NULL) {
-    // don't bother printing the msg below, since we already released it.
-    return;
-  }
-
-  RELEASE(_d3d_texture, dxgsg8, "texture", RELEASE_ONCE);
-  _d3d_2d_texture = NULL;
-  _d3d_volume_texture = NULL;
-  _d3d_cube_texture = NULL;
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: DXTextureContext8::extract_texture_data
-//       Access: Public
-//  Description: This method will be called in the draw thread to
-//               download the texture memory's image into its
-//               ram_image value.  It returns true on success, false
-//               otherwise.
-////////////////////////////////////////////////////////////////////
-bool DXTextureContext8::
-extract_texture_data() {
-  HRESULT hr;
-
-  Texture *tex = get_texture();
-  if (tex->get_texture_type() != Texture::TT_2d_texture) {
-    dxgsg8_cat.error()
-      << "Not supported: extract_texture_data for " << tex->get_texture_type()
-      << "\n";
-    return false;
-  }
-  nassertr(IS_VALID_PTR(_d3d_2d_texture), false);
-
-  D3DSURFACE_DESC desc;
-  hr = _d3d_2d_texture->GetLevelDesc(0, &desc);
-  if (FAILED(hr)) {
-    dxgsg8_cat.error()
-      << "Texture::GetLevelDesc() failed!" << D3DERRORSTRING(hr);
-    return false;
-  }
-
-  int div = 1;
-  Texture::Format format = Texture::F_rgba;
-  Texture::CompressionMode compression = Texture::CM_off;
-
-  switch (desc.Format) {
-  case D3DFMT_R8G8B8:
-    format = Texture::F_rgb;
-    break;
-
-  case D3DFMT_A8R8G8B8:
-  case D3DFMT_X8R8G8B8:
-    break;
-
-  case D3DFMT_L8:
-    format = Texture::F_luminance;
-    break;
-
-  case D3DFMT_A8L8:
-    format = Texture::F_luminance_alpha;
-    break;
-
-  case D3DFMT_DXT1:
-    compression = Texture::CM_dxt1;
-    div = 4;
-    break;
-  case D3DFMT_DXT2:
-    compression = Texture::CM_dxt2;
-    div = 4;
-    break;
-  case D3DFMT_DXT3:
-    compression = Texture::CM_dxt3;
-    div = 4;
-    break;
-  case D3DFMT_DXT4:
-    compression = Texture::CM_dxt4;
-    div = 4;
-    break;
-  case D3DFMT_DXT5:
-    compression = Texture::CM_dxt5;
-    div = 4;
-    break;
-
-  default:
-    dxgsg8_cat.error()
-      << "Cannot extract texture data: unhandled surface format " 
-      << desc.Format << "\n";
-    return false;
-  }
-
-  int num_levels = _d3d_2d_texture->GetLevelCount();
-
-  tex->set_x_size(desc.Width);
-  tex->set_y_size(desc.Height);
-  tex->set_z_size(1);
-  tex->set_component_type(Texture::T_unsigned_byte);
-  tex->set_format(format);
-  tex->clear_ram_image();
-
-  for (int n = 0; n < num_levels; ++n) {
-    D3DLOCKED_RECT rect;
-    hr = _d3d_2d_texture->LockRect(n, &rect, NULL, D3DLOCK_READONLY);
-    if (FAILED(hr)) {
-      dxgsg8_cat.error()
-        << "Texture::LockRect() failed!" << D3DERRORSTRING(hr);
-      return false;
-    }
-    
-    int x_size = tex->get_expected_mipmap_x_size(n);
-    int y_size = tex->get_expected_mipmap_y_size(n);
-    PTA_uchar image;
-
-    if (compression == Texture::CM_off) {
-      // Uncompressed, but we have to respect the pitch.
-      int pitch = x_size * tex->get_num_components() * tex->get_component_width();
-      pitch = min(pitch, (int)rect.Pitch);
-      int size = pitch * y_size;
-      image = PTA_uchar::empty_array(size);
-      if (pitch == rect.Pitch) {
-        // Easy copy.
-        memcpy(image.p(), rect.pBits, size);
-      } else {
-        // Harder copy: we have to de-interleave DirectX's extra bytes
-        // on the end of each row.
-        unsigned char *dest = image.p();
-        unsigned char *source = (unsigned char *)rect.pBits;
-        for (int yi = 0; yi < y_size; ++yi) {
-          memcpy(dest, source, pitch);
-          dest += pitch;
-          source += rect.Pitch;
-        }
-      }
-
-    } else {
-      // Compressed; just copy the data verbatim.
-      int size = rect.Pitch * (y_size / div);
-      image = PTA_uchar::empty_array(size);
-      memcpy(image.p(), rect.pBits, size);
-    }
-    
-    _d3d_2d_texture->UnlockRect(n);
-    if (n == 0) {
-      tex->set_ram_image(image, compression);
-    } else {
-      tex->set_ram_mipmap_image(n, image);
-    }
-  }
-    
-  return true;
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: DXTextureContext8::d3d_surface_to_texture
-//       Access: Public, Static
-//  Description: copies source_rect in pD3DSurf to upper left of
-//               texture
-////////////////////////////////////////////////////////////////////
-HRESULT DXTextureContext8::
-d3d_surface_to_texture(RECT &source_rect, IDirect3DSurface8 *d3d_surface,
-           bool inverted, Texture *result, int view, int z) {
-
-  // still need custom conversion since d3d/d3dx has no way to convert
-  // arbitrary fmt to ARGB in-memory user buffer
-
-  HRESULT hr;
-  DWORD num_components = result->get_num_components();
-
-  nassertr(result->get_component_width() == sizeof(BYTE), E_FAIL);   // cant handle anything else now
-  nassertr(result->get_component_type() == Texture::T_unsigned_byte, E_FAIL);   // cant handle anything else now
-  nassertr((num_components == 3) || (num_components == 4), E_FAIL);  // cant handle anything else now
-  nassertr(IS_VALID_PTR(d3d_surface), E_FAIL);
-
-  BYTE *buf = result->modify_ram_image();
-  if (z >= 0) {
-    nassertr(z < result->get_z_size(), E_FAIL);
-    buf += z * result->get_expected_ram_page_size();
-  }
-  if (view > 0) {
-    buf += (view * result->get_z_size()) * result->get_expected_ram_page_size();
-  }
-
-  if (IsBadWritePtr(d3d_surface, sizeof(DWORD))) {
-    dxgsg8_cat.error()
-      << "d3d_surface_to_texture failed: bad pD3DSurf ptr value ("
-      << ((void*)d3d_surface) << ")\n";
-    exit(1);
-  }
-
-  DWORD x_window_offset, y_window_offset;
-  DWORD copy_width, copy_height;
-
-  D3DLOCKED_RECT locked_rect;
-  D3DSURFACE_DESC surface_desc;
-
-  hr = d3d_surface->GetDesc(&surface_desc);
-
-  x_window_offset = source_rect.left, y_window_offset = source_rect.top;
-  copy_width = RECT_XSIZE(source_rect);
-  copy_height = RECT_YSIZE(source_rect);
-
-  // make sure there's enough space in the texture, its size must
-  // match (especially xsize) or scanlines will be too long
-
-  if (!((copy_width == result->get_x_size()) && (copy_height <= (DWORD)result->get_y_size()))) {
-    dxgsg8_cat.error()
-      << "d3d_surface_to_texture, Texture size (" << result->get_x_size()
-      << ", " << result->get_y_size()
-      << ") too small to hold display surface ("
-      << copy_width << ", " << copy_height << ")\n";
-    nassertr(false, E_FAIL);
-    return E_FAIL;
-  }
-
-  hr = d3d_surface->LockRect(&locked_rect, (CONST RECT*)NULL, (D3DLOCK_READONLY | D3DLOCK_NO_DIRTY_UPDATE));
-  if (FAILED(hr)) {
-    dxgsg8_cat.error()
-      << "d3d_surface_to_texture LockRect() failed!" << D3DERRORSTRING(hr);
-    return hr;
-  }
-
-  // ones not listed not handled yet
-  nassertr((surface_desc.Format == D3DFMT_A8R8G8B8) ||
-           (surface_desc.Format == D3DFMT_X8R8G8B8) ||
-           (surface_desc.Format == D3DFMT_R8G8B8) ||
-           (surface_desc.Format == D3DFMT_R5G6B5) ||
-           (surface_desc.Format == D3DFMT_X1R5G5B5) ||
-           (surface_desc.Format == D3DFMT_A1R5G5B5) ||
-           (surface_desc.Format == D3DFMT_A4R4G4B4), E_FAIL);
-
-  //buf contains raw ARGB in Texture byteorder
-
-  int byte_pitch = locked_rect.Pitch;
-  BYTE *surface_bytes = (BYTE *)locked_rect.pBits;
-
-  if (inverted) {
-    surface_bytes += byte_pitch * (y_window_offset + copy_height - 1);
-    byte_pitch = -byte_pitch;
-  } else {
-    surface_bytes += byte_pitch * y_window_offset;
-  }
-
-  // writes out last line in DDSurf first in PixelBuf, so Y line order
-  // precedes inversely
-
-  if (dxgsg8_cat.is_debug()) {
-    dxgsg8_cat.debug()
-      << "d3d_surface_to_texture converting "
-      << D3DFormatStr(surface_desc.Format)
-      << " DDSurf to " <<  num_components << "-channel panda Texture\n";
-  }
-
-  DWORD *dest_word = (DWORD *)buf;
-  BYTE *dest_byte = (BYTE *)buf;
-
-  switch(surface_desc.Format) {
-  case D3DFMT_A8R8G8B8:
-  case D3DFMT_X8R8G8B8: {
-    if (num_components == 4) {
-      DWORD *source_word;
-      BYTE *dest_line = (BYTE*)dest_word;
-
-      for (DWORD y = 0; y < copy_height; y++) {
-        source_word = ((DWORD*)surface_bytes) + x_window_offset;
-        memcpy(dest_line, source_word, byte_pitch);
-        dest_line += byte_pitch;
-  surface_bytes += byte_pitch;
-      }
-    } else {
-      // 24bpp texture case (numComponents == 3)
-      DWORD *source_word;
-      for (DWORD y = 0; y < copy_height; y++) {
-        source_word = ((DWORD*)surface_bytes) + x_window_offset;
-
-        for (DWORD x = 0; x < copy_width; x++) {
-          BYTE r, g, b;
-          DWORD pixel = *source_word;
-
-          r = (BYTE)((pixel>>16) & g_LowByteMask);
-          g = (BYTE)((pixel>> 8) & g_LowByteMask);
-          b = (BYTE)((pixel    ) & g_LowByteMask);
-
-          *dest_byte++ = b;
-          *dest_byte++ = g;
-          *dest_byte++ = r;
-    source_word++;
-        }
-  surface_bytes += byte_pitch;
-      }
-    }
-    break;
-  }
-
-  case D3DFMT_R8G8B8: {
-    BYTE *source_byte;
-
-    if (num_components == 4) {
-      for (DWORD y = 0; y < copy_height; y++) {
-        source_byte = surface_bytes + x_window_offset * 3 * sizeof(BYTE);
-        for (DWORD x = 0; x < copy_width; x++) {
-          DWORD r, g, b;
-
-          b = *source_byte++;
-          g = *source_byte++;
-          r = *source_byte++;
-
-          *dest_word = 0xFF000000 | (r << 16) | (g << 8) | b;
-    dest_word++;
-        }
-  surface_bytes += byte_pitch;
-      }
-    } else {
-      // 24bpp texture case (numComponents == 3)
-      for (DWORD y = 0; y < copy_height; y++) {
-        source_byte = surface_bytes + x_window_offset * 3 * sizeof(BYTE);
-        memcpy(dest_byte, source_byte, byte_pitch);
-        dest_byte += byte_pitch;
-  surface_bytes += byte_pitch;
-      }
-    }
-    break;
-  }
-
-  case D3DFMT_R5G6B5:
-  case D3DFMT_X1R5G5B5:
-  case D3DFMT_A1R5G5B5:
-  case D3DFMT_A4R4G4B4: {
-    WORD  *source_word;
-    // handle 0555, 1555, 0565, 4444 in same loop
-
-    BYTE redshift, greenshift, blueshift;
-    DWORD redmask, greenmask, bluemask;
-
-    if (surface_desc.Format == D3DFMT_R5G6B5) {
-      redshift = (11-3);
-      redmask = 0xF800;
-      greenmask = 0x07E0;
-      greenshift = (5-2);
-      bluemask = 0x001F;
-      blueshift = 3;
-    } else if (surface_desc.Format == D3DFMT_A4R4G4B4) {
-      redmask = 0x0F00;
-      redshift = 4;
-      greenmask = 0x00F0;
-      greenshift = 0;
-      bluemask = 0x000F;
-      blueshift = 4;
-    } else {  // 1555 or x555
-      redmask = 0x7C00;
-      redshift = (10-3);
-      greenmask = 0x03E0;
-      greenshift = (5-3);
-      bluemask = 0x001F;
-      blueshift = 3;
-    }
-
-    if (num_components == 4) {
-      // Note: these 16bpp loops ignore input alpha completely (alpha
-      // is set to fully opaque in texture!)
-
-      // if we need to capture alpha, probably need to make separate
-      // loops for diff 16bpp fmts for best speed
-
-      for (DWORD y = 0; y < copy_height; y++) {
-        source_word = ((WORD*)surface_bytes) + x_window_offset;
-        for (DWORD x = 0; x < copy_width; x++) {
-          WORD pixel = *source_word;
-          BYTE r, g, b;
-
-          b = (pixel & bluemask) << blueshift;
-          g = (pixel & greenmask) >> greenshift;
-          r = (pixel & redmask) >> redshift;
-
-          // alpha is just set to 0xFF
-
-          *dest_word = 0xFF000000 | (r << 16) | (g << 8) | b;
-    source_word++;
-    dest_word++;
-        }
-  surface_bytes += byte_pitch;
-      }
-    } else {
-      // 24bpp texture case (numComponents == 3)
-      for (DWORD y = 0; y < copy_height; y++) {
-        source_word = ((WORD*)surface_bytes) + x_window_offset;
-        for (DWORD x = 0; x < copy_width; x++) {
-          WORD pixel = *source_word;
-          BYTE r, g, b;
-
-          b = (pixel & bluemask) << blueshift;
-          g = (pixel & greenmask) >> greenshift;
-          r = (pixel & redmask) >> redshift;
-
-          *dest_byte++ = b;
-          *dest_byte++ = g;
-          *dest_byte++ = r;
-
-    source_word++;
-        }
-  surface_bytes += byte_pitch;
-      }
-    }
-    break;
-  }
-
-  default:
-    dxgsg8_cat.error()
-      << "d3d_surface_to_texture: unsupported D3DFORMAT!\n";
-  }
-
-  d3d_surface->UnlockRect();
-  return S_OK;
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: calculate_row_byte_length
-//       Access: Private, hidden
-//  Description: local helper function, which calculates the 
-//               'row_byte_length' or 'pitch' needed for calling
-//               D3DXLoadSurfaceFromMemory.
-//               Takes compressed formats (DXTn) into account.
-////////////////////////////////////////////////////////////////////
-static UINT calculate_row_byte_length (int width, int num_color_channels, D3DFORMAT tex_format)
-{
-    UINT source_row_byte_length = 0;
-
-    // check for compressed textures and adjust source_row_byte_length and source_format accordingly
-    switch (tex_format) {
-      case D3DFMT_DXT1:
-          // for dxt1 compressed textures, the row_byte_lenght is "the width of one row of cells, in bytes"
-          // cells are 4 pixels wide, take up 8 bytes, and at least 1 cell has to be there.
-          source_row_byte_length = max(1,width / 4)*8;
-        break;
-      case D3DFMT_DXT2:
-      case D3DFMT_DXT3:
-      case D3DFMT_DXT4:
-      case D3DFMT_DXT5:
-          // analogue as above, but cells take up 16 bytes
-          source_row_byte_length = max(1,width / 4)*16;
-        break;
-      default:
-        // no known compression format.. usual calculation
-        source_row_byte_length = width*num_color_channels;
-        break;
-    }
-    return source_row_byte_length;
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: DXTextureContext8::fill_d3d_texture_mipmap_pixels
-//       Access: Private
-//  Description: Called from fill_d3d_texture_pixels, this function
-//               fills a single mipmap with texture data.
-//               Takes care of all necessery conversions and error
-//               handling.
-////////////////////////////////////////////////////////////////////
-HRESULT DXTextureContext8::fill_d3d_texture_mipmap_pixels(int mip_level, int depth_index, D3DFORMAT source_format)
-{
-  // This whole function was refactored out of fill_d3d_texture_pixels to make the code 
-  // more readable and to avoid code duplication.
-  IDirect3DSurface8 *mip_surface = NULL;
-  bool using_temp_buffer = false;
-  HRESULT hr = E_FAIL;
-  CPTA_uchar image = get_texture()->get_ram_mipmap_image(mip_level);
-  nassertr(!image.is_null(), E_FAIL);
-  BYTE *pixels = (BYTE*) image.p();
-  DWORD width  = (DWORD) get_texture()->get_expected_mipmap_x_size(mip_level);
-  DWORD height = (DWORD) get_texture()->get_expected_mipmap_y_size(mip_level);
-  int component_width = get_texture()->get_component_width();
-
-  pixels += depth_index * get_texture()->get_expected_ram_mipmap_page_size(mip_level);
-  
-  if (get_texture()->get_texture_type() == Texture::TT_cube_map) {
-    nassertr(IS_VALID_PTR(_d3d_cube_texture), E_FAIL);
-    hr = _d3d_cube_texture->GetCubeMapSurface((D3DCUBEMAP_FACES)depth_index, mip_level, &mip_surface);
-  } else {
-    nassertr(IS_VALID_PTR(_d3d_2d_texture), E_FAIL);
-    hr = _d3d_2d_texture->GetSurfaceLevel(mip_level, &mip_surface);
-  }
-
-  if (FAILED(hr)) {
-    dxgsg8_cat.error()
-      << "FillDDTextureMipmapPixels failed for " << get_texture()->get_name()
-      << ", GetSurfaceLevel failed" << D3DERRORSTRING(hr);
-    return E_FAIL;
-  }
-
-  RECT source_size;
-  source_size.left = source_size.top = 0;
-  source_size.right = width;
-  source_size.bottom = height;
-
-  UINT source_row_byte_length = calculate_row_byte_length(width, get_texture()->get_num_components(), source_format);
-
-  DWORD mip_filter;
-  // need filtering if size changes, (also if bitdepth reduced (need
-  // dithering)??)
-  mip_filter = D3DX_FILTER_LINEAR ; //| D3DX_FILTER_DITHER;  //dithering looks ugly on i810 for 4444 textures
-
-  // D3DXLoadSurfaceFromMemory will load black luminance and we want
-  // full white, so convert to explicit luminance-alpha format
-  if (_d3d_format == D3DFMT_A8) {
-    // alloc buffer for explicit D3DFMT_A8L8
-    USHORT *temp_buffer = new USHORT[width * height];
-    if (!IS_VALID_PTR(temp_buffer)) {
-      dxgsg8_cat.error()
-        << "FillDDTextureMipmapPixels couldnt alloc mem for temp pixbuf!\n";
-      goto exit_FillMipmapSurf;
-    }
-    using_temp_buffer = true;
-
-    USHORT *out_pixels = temp_buffer;
-    BYTE *source_pixels = pixels + component_width - 1;
-    for (UINT y = 0; y < height; y++) {
-      for (UINT x = 0; x < width; x++, source_pixels += component_width, out_pixels++) {
-        // add full white, which is our interpretation of alpha-only
-        // (similar to default adding full opaque alpha 0xFF to
-        // RGB-only textures)
-        *out_pixels = ((*source_pixels) << 8 ) | 0xFF;
-      }
-    }
-
-    source_format = D3DFMT_A8L8;
-    source_row_byte_length = width * sizeof(USHORT);
-    pixels = (BYTE*)temp_buffer;
-  } 
-  else if (component_width != 1) {
-    // Convert from 16-bit per channel (or larger) format down to
-    // 8-bit per channel.  This throws away precision in the
-    // original image, but dx8 doesn't support high-precision images
-    // anyway.
-
-    int num_components = get_texture()->get_num_components();
-    int num_pixels = width * height * num_components;
-    BYTE *temp_buffer = new BYTE[num_pixels];
-    if (!IS_VALID_PTR(temp_buffer)) {
-      dxgsg8_cat.error() << "FillDDTextureMipmapPixels couldnt alloc mem for temp pixbuf!\n";
-      goto exit_FillMipmapSurf;
-    }
-    using_temp_buffer = true;
-
-    BYTE *source_pixels = pixels + component_width - 1;
-    for (int i = 0; i < num_pixels; i++) {
-      temp_buffer[i] = *source_pixels;
-      source_pixels += component_width;
-    }
-    pixels = (BYTE*)temp_buffer;
-  }
-
-  // filtering may be done here if texture if targetsize != origsize
-#ifdef DO_PSTATS
-  GraphicsStateGuardian::_data_transferred_pcollector.add_level(source_row_byte_length * height);
-#endif
-  hr = D3DXLoadSurfaceFromMemory
-    (mip_surface, (PALETTEENTRY*)NULL, (RECT*)NULL, (LPCVOID)pixels,
-      source_format, source_row_byte_length, (PALETTEENTRY*)NULL,
-      &source_size, mip_filter, (D3DCOLOR)0x0);
-  if (FAILED(hr)) {
-    dxgsg8_cat.error()
-      << "FillDDTextureMipmapPixels failed for " << get_texture()->get_name()
-      << ", mip_level " << mip_level
-      << ", D3DXLoadSurfFromMem failed" << D3DERRORSTRING(hr);
-  }
-
-exit_FillMipmapSurf:
-  if (using_temp_buffer) {
-    SAFE_DELETE_ARRAY(pixels);
-  }
-
-  RELEASE(mip_surface, dxgsg8, "FillDDTextureMipmapPixels MipSurface texture ptr", RELEASE_ONCE);
-  return hr;
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: DXTextureContext8::fill_d3d_texture_pixels
-//       Access: Private
-//  Description:
-////////////////////////////////////////////////////////////////////
-HRESULT DXTextureContext8::
-fill_d3d_texture_pixels(DXScreenData &scrn) {
-  Texture *tex = get_texture();
-  nassertr(IS_VALID_PTR(tex), E_FAIL);
-  if (tex->get_texture_type() == Texture::TT_3d_texture) {
-    return fill_d3d_volume_texture_pixels(scrn);
-  }
-
-  HRESULT hr = E_FAIL;
-  nassertr(IS_VALID_PTR(tex), E_FAIL);
-
-  CPTA_uchar image;
-  if (scrn._dxgsg8->get_supports_compressed_texture()) {
-    image = tex->get_ram_image();
-  } else {
-    image = tex->get_uncompressed_ram_image();
-  }
-
-  Texture::CompressionMode image_compression;
-  if (image.is_null()) {
-    image_compression = Texture::CM_off;
-  } else {
-    image_compression = tex->get_ram_image_compression();
-  }
-
-  if (!scrn._dxgsg8->get_supports_compressed_texture_format(image_compression)) {
-    image = tex->get_uncompressed_ram_image();
-    image_compression = Texture::CM_off;
-  }    
-  if (image.is_null()) {
-    // The texture doesn't have an image to load.  That's ok; it
-    // might be a texture we've rendered to by frame buffer
-    // operations or something.
-    return S_OK;
-  }
-  nassertr(IS_VALID_PTR((BYTE*)image.p()), E_FAIL);
-  nassertr(IS_VALID_PTR(_d3d_texture), E_FAIL);
-
-  PStatTimer timer(GraphicsStateGuardian::_load_texture_pcollector);
-
-  DWORD orig_depth = (DWORD) tex->get_z_size();
-  D3DFORMAT source_format = _d3d_format;
-
-  // check for compressed textures and adjust source_format accordingly
-  switch (image_compression) {
-  case Texture::CM_dxt1:
-    source_format = D3DFMT_DXT1;
-    break;
-  case Texture::CM_dxt2:
-    source_format = D3DFMT_DXT2;
-    break;
-  case Texture::CM_dxt3:
-    source_format = D3DFMT_DXT3;
-    break;
-  case Texture::CM_dxt4:
-    source_format = D3DFMT_DXT4;
-    break;
-  case Texture::CM_dxt5:
-    source_format = D3DFMT_DXT5;
-    break;
-  default:
-    // no known compression format.. no adjustment
-    break;
-  }
-  
-  for (unsigned int di = 0; di < orig_depth; di++) {
-    
-    // fill top level mipmap
-    hr = fill_d3d_texture_mipmap_pixels(0, di, source_format);
-    if (FAILED(hr)) {
-      return hr; // error message was already output in fill_d3d_texture_mipmap_pixels
-    }
-
-    if (_has_mipmaps) {
-      // if we have pre-calculated mipmap levels, use them, otherwise generate on the fly
-      int miplevel_count = _d3d_2d_texture->GetLevelCount(); // what if it's not a 2d texture?
-      if (miplevel_count <= tex->get_num_loadable_ram_mipmap_images()) {
-        dxgsg8_cat.debug()
-          << "Using pre-calculated mipmap levels for texture  " << tex->get_name() << "\n";
-
-        for (int mip_level = 1; mip_level < miplevel_count; ++mip_level) {
-          hr = fill_d3d_texture_mipmap_pixels(mip_level, di, source_format);
-          if (FAILED(hr)) {
-            return hr; // error message was already output in fill_d3d_texture_mipmap_pixels
-          }
-        }        
-      } 
-      else {
-        // mipmaps need to be generated.
-
-        DWORD mip_filter_flags;
-        if (!dx_use_triangle_mipgen_filter) {
-          mip_filter_flags = D3DX_FILTER_BOX;
-        } else {
-          mip_filter_flags = D3DX_FILTER_TRIANGLE;
-        }
-        
-        // mip_filter_flags |= D3DX_FILTER_DITHER;
-        hr = D3DXFilterTexture(_d3d_texture, (PALETTEENTRY*)NULL, 0,
-                               mip_filter_flags);
-        
-        if (FAILED(hr)) {
-          dxgsg8_cat.error()
-            << "FillDDSurfaceTexturePixels failed for " << tex->get_name()
-            << ", D3DXFilterTex failed" << D3DERRORSTRING(hr);
-        }
-      }
-    }
-  }
-
-  return hr;
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: DXTextureContext8::fill_d3d_volume_texture_pixels
-//       Access: Private
-//  Description:
-////////////////////////////////////////////////////////////////////
-HRESULT DXTextureContext8::
-fill_d3d_volume_texture_pixels(DXScreenData &scrn) {
-  Texture *tex = get_texture();
-  HRESULT hr = E_FAIL;
-  nassertr(IS_VALID_PTR(tex), E_FAIL);
-
-  CPTA_uchar image;
-  if (scrn._dxgsg8->get_supports_compressed_texture()) {
-    image = tex->get_ram_image();
-  } else {
-    image = tex->get_uncompressed_ram_image();
-  }
-
-  Texture::CompressionMode image_compression;
-  if (image.is_null()) {
-    image_compression = Texture::CM_off;
-  } else {
-    image_compression = tex->get_ram_image_compression();
-  }
-
-  if (!scrn._dxgsg8->get_supports_compressed_texture_format(image_compression) ||
-      tex->get_x_size() < 4 || tex->get_y_size() < 4) {
-    // If we don't support this particular compression method, or in
-    // any case if the texture is too small (DirectX won't accept a
-    // small compressed texture), then fetch and load the uncompressed
-    // version instead.
-    image = tex->get_uncompressed_ram_image();
-    image_compression = Texture::CM_off;
-  }    
-
-  if (image.is_null()) {
-    // The texture doesn't have an image to load.  That's ok; it
-    // might be a texture we've rendered to by frame buffer
-    // operations or something.
-    return S_OK;
-  }
-
-  PStatTimer timer(GraphicsStateGuardian::_load_texture_pcollector);
-
-  nassertr(IS_VALID_PTR(_d3d_texture), E_FAIL);
-  nassertr(tex->get_texture_type() == Texture::TT_3d_texture, E_FAIL);
-
-  DWORD orig_width  = (DWORD) tex->get_x_size();
-  DWORD orig_height = (DWORD) tex->get_y_size();
-  DWORD orig_depth = (DWORD) tex->get_z_size();
-  DWORD num_color_channels = tex->get_num_components();
-  D3DFORMAT source_format = _d3d_format;
-  BYTE *image_pixels = (BYTE*)image.p();
-  int component_width = tex->get_component_width();
-
-  nassertr(IS_VALID_PTR(image_pixels), E_FAIL);
-
-  IDirect3DVolume8 *mip_level_0 = NULL;
-  bool using_temp_buffer = false;
-  BYTE *pixels = image_pixels;
-
-  nassertr(IS_VALID_PTR(_d3d_volume_texture), E_FAIL);
-  hr = _d3d_volume_texture->GetVolumeLevel(0, &mip_level_0);
-
-  if (FAILED(hr)) {
-    dxgsg8_cat.error()
-      << "FillDDSurfaceTexturePixels failed for " << tex->get_name()
-      << ", GetSurfaceLevel failed" << D3DERRORSTRING(hr);
-    return E_FAIL;
-  }
-
-  D3DBOX source_size;
-  source_size.Left = source_size.Top = source_size.Front = 0;
-  source_size.Right = orig_width;
-  source_size.Bottom = orig_height;
-  source_size.Back = orig_depth;
-
-  UINT source_row_byte_length = orig_width * num_color_channels;
-  UINT source_page_byte_length = orig_height * source_row_byte_length;
-
-  DWORD level_0_filter, mip_filter_flags;
-  using_temp_buffer = false;
-
-  // need filtering if size changes, (also if bitdepth reduced (need
-  // dithering)??)
-  level_0_filter = D3DX_FILTER_LINEAR ; //| D3DX_FILTER_DITHER;  //dithering looks ugly on i810 for 4444 textures
-
-  // D3DXLoadSurfaceFromMemory will load black luminance and we want
-  // full white, so convert to explicit luminance-alpha format
-  if (_d3d_format == D3DFMT_A8) {
-    // alloc buffer for explicit D3DFMT_A8L8
-    USHORT *temp_buffer = new USHORT[orig_width * orig_height * orig_depth];
-    if (!IS_VALID_PTR(temp_buffer)) {
-      dxgsg8_cat.error()
-        << "FillDDSurfaceTexturePixels couldnt alloc mem for temp pixbuf!\n";
-      goto exit_FillDDSurf;
-    }
-    using_temp_buffer = true;
-
-    USHORT *out_pixels = temp_buffer;
-    BYTE *source_pixels = pixels + component_width - 1;
-    for (UINT z = 0; z < orig_depth; z++) {
-      for (UINT y = 0; y < orig_height; y++) {
-        for (UINT x = 0;
-             x < orig_width;
-             x++, source_pixels += component_width, out_pixels++) {
-          // add full white, which is our interpretation of alpha-only
-          // (similar to default adding full opaque alpha 0xFF to
-          // RGB-only textures)
-          *out_pixels = ((*source_pixels) << 8 ) | 0xFF;
-        }
-      }
-    }
-
-    source_format = D3DFMT_A8L8;
-    source_row_byte_length = orig_width * sizeof(USHORT);
-    source_page_byte_length = orig_height * source_row_byte_length;
-    pixels = (BYTE*)temp_buffer;
-
-  } else if (component_width != 1) {
-    // Convert from 16-bit per channel (or larger) format down to
-    // 8-bit per channel.  This throws away precision in the
-    // original image, but dx8 doesn't support high-precision images
-    // anyway.
-
-    int num_components = tex->get_num_components();
-    int num_pixels = orig_width * orig_height * orig_depth * num_components;
-    BYTE *temp_buffer = new BYTE[num_pixels];
-    if (!IS_VALID_PTR(temp_buffer)) {
-      dxgsg8_cat.error() << "FillDDSurfaceTexturePixels couldnt alloc mem for temp pixbuf!\n";
-      goto exit_FillDDSurf;
-    }
-    using_temp_buffer = true;
-
-    BYTE *source_pixels = pixels + component_width - 1;
-    for (int i = 0; i < num_pixels; i++) {
-      temp_buffer[i] = *source_pixels;
-      source_pixels += component_width;
-    }
-    pixels = (BYTE*)temp_buffer;
-  }
-
-
-  // filtering may be done here if texture if targetsize != origsize
-#ifdef DO_PSTATS
-  GraphicsStateGuardian::_data_transferred_pcollector.add_level(source_page_byte_length * orig_depth);
-#endif
-  hr = D3DXLoadVolumeFromMemory
-    (mip_level_0, (PALETTEENTRY*)NULL, (D3DBOX*)NULL, (LPCVOID)pixels,
-     source_format, source_row_byte_length, source_page_byte_length,
-     (PALETTEENTRY*)NULL,
-     &source_size, level_0_filter, (D3DCOLOR)0x0);
-  if (FAILED(hr)) {
-    dxgsg8_cat.error()
-      << "FillDDSurfaceTexturePixels failed for " << tex->get_name()
-      << ", D3DXLoadVolumeFromMem failed" << D3DERRORSTRING(hr);
-    goto exit_FillDDSurf;
-  }
-
-  if (_has_mipmaps) {
-    if (!dx_use_triangle_mipgen_filter) {
-      mip_filter_flags = D3DX_FILTER_BOX;
-    } else {
-      mip_filter_flags = D3DX_FILTER_TRIANGLE;
-    }
-
-    //    mip_filter_flags| = D3DX_FILTER_DITHER;
-
-    hr = D3DXFilterTexture(_d3d_texture, (PALETTEENTRY*)NULL, 0,
-                           mip_filter_flags);
-    if (FAILED(hr)) {
-      dxgsg8_cat.error()
-        << "FillDDSurfaceTexturePixels failed for " << tex->get_name()
-        << ", D3DXFilterTex failed" << D3DERRORSTRING(hr);
-      goto exit_FillDDSurf;
-    }
-  }
-
- exit_FillDDSurf:
-  if (using_temp_buffer) {
-    SAFE_DELETE_ARRAY(pixels);
-  }
-  RELEASE(mip_level_0, dxgsg8, "FillDDSurf MipLev0 texture ptr", RELEASE_ONCE);
-  return hr;
-}
-
-
-////////////////////////////////////////////////////////////////////
-//     Function: DXTextureContext8::down_to_power_2
-//       Access: Private, Static
-//  Description: Returns the largest power of 2 less than or equal
-//               to value.
-////////////////////////////////////////////////////////////////////
-int DXTextureContext8::
-down_to_power_2(int value) {
-  int x = 1;
-  while ((x << 1) <= value) {
-    x = (x << 1);
-  }
-  return x;
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: DXTextureContext8::get_bits_per_pixel
-//       Access: Private
-//  Description: Maps from the Texture's Format symbols to bpp.
-//               Returns # of alpha bits.  Note: Texture's format
-//               indicates REQUESTED final format, not the stored
-//               format, which is indicated by pixelbuffer type
-////////////////////////////////////////////////////////////////////
-unsigned int DXTextureContext8::
-get_bits_per_pixel(Texture::Format format, int *alphbits) {
-  *alphbits = 0;      // assume no alpha bits
-  switch(format) {
-  case Texture::F_alpha:
-    *alphbits = 8;
-  case Texture::F_color_index:
-  case Texture::F_red:
-  case Texture::F_green:
-  case Texture::F_blue:
-  case Texture::F_rgb332:
-    return 8;
-  case Texture::F_luminance_alphamask:
-    *alphbits = 1;
-    return 16;
-  case Texture::F_luminance_alpha:
-    *alphbits = 8;
-    return 16;
-  case Texture::F_luminance:
-    return 8;
-  case Texture::F_rgba4:
-    *alphbits = 4;
-    return 16;
-  case Texture::F_rgba5:
-    *alphbits = 1;
-    return 16;
-  case Texture::F_depth_stencil:
-    return 32;
-  case Texture::F_rgb5:
-    return 16;
-  case Texture::F_rgb8:
-  case Texture::F_rgb:
-    return 24;
-  case Texture::F_rgba8:
-  case Texture::F_rgba:
-    *alphbits = 8;
-    return 32;
-  case Texture::F_rgbm:
-    *alphbits = 1;
-    return 32;
-  case Texture::F_rgb12:
-    return 36;
-  case Texture::F_rgba12:
-    *alphbits = 12;
-    return 48;
-  }
-  return 8;
-}
diff --git a/panda/src/dxgsg8/dxTextureContext8.h b/panda/src/dxgsg8/dxTextureContext8.h
deleted file mode 100644
index 5fc06f8d0a..0000000000
--- a/panda/src/dxgsg8/dxTextureContext8.h
+++ /dev/null
@@ -1,89 +0,0 @@
-// Filename: dxTextureContext8.h
-// Created by:  drose (07Oct99)
-//
-////////////////////////////////////////////////////////////////////
-//
-// 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 DXTEXTURECONTEXT8_H
-#define DXTEXTURECONTEXT8_H
-
-#include "dxgsg8base.h"
-#include "texture.h"
-#include "textureContext.h"
-
-////////////////////////////////////////////////////////////////////
-//       Class : DXTextureContext8
-// Description :
-////////////////////////////////////////////////////////////////////
-class EXPCL_PANDADX DXTextureContext8 : public TextureContext {
-public:
-  DXTextureContext8(PreparedGraphicsObjects *pgo, Texture *tex, int view);
-  virtual ~DXTextureContext8();
-
-  virtual void evict_lru();
-
-  bool create_texture(DXScreenData &scrn);
-  bool create_simple_texture(DXScreenData &scrn);
-  void delete_texture();
-  bool extract_texture_data();
-
-  INLINE bool has_mipmaps() const;
-  INLINE IDirect3DBaseTexture8 *get_d3d_texture() const;
-  INLINE IDirect3DTexture8 *get_d3d_2d_texture() const;
-  INLINE IDirect3DVolumeTexture8 *get_d3d_volume_texture() const;
-  INLINE IDirect3DCubeTexture8 *get_d3d_cube_texture() const;
-
-  static HRESULT d3d_surface_to_texture(RECT &source_rect,
-          IDirect3DSurface8 *d3d_surface,
-          bool inverted, Texture *result,
-          int view, int z);
-
-private:
-  HRESULT fill_d3d_texture_mipmap_pixels(int mip_level, int depth_index, D3DFORMAT source_format);
-  HRESULT fill_d3d_texture_pixels();
-  HRESULT fill_d3d_texture_pixels(DXScreenData &scrn);
-  HRESULT fill_d3d_volume_texture_pixels(DXScreenData &scrn);
-  static int down_to_power_2(int value);
-  unsigned int get_bits_per_pixel(Texture::Format format, int *alphbits);
-
-private:
-  D3DFORMAT _d3d_format;    // the 'D3DFORMAT' the Panda TextureBuffer fmt corresponds to
-  IDirect3DBaseTexture8 *_d3d_texture;
-  IDirect3DTexture8 *_d3d_2d_texture;
-  IDirect3DVolumeTexture8 *_d3d_volume_texture;
-  IDirect3DCubeTexture8 *_d3d_cube_texture;
-
-  bool _has_mipmaps;
-
-public:
-  static TypeHandle get_class_type() {
-    return _type_handle;
-  }
-  static void init_type() {
-    TextureContext::init_type();
-    register_type(_type_handle, "DXTextureContext8",
-          TextureContext::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;
-
-  friend class wdxGraphicsBuffer8;
-};
-
-#include "dxTextureContext8.I"
-
-#endif
-
diff --git a/panda/src/dxgsg8/dxVertexBufferContext8.I b/panda/src/dxgsg8/dxVertexBufferContext8.I
deleted file mode 100644
index 1f0e299222..0000000000
--- a/panda/src/dxgsg8/dxVertexBufferContext8.I
+++ /dev/null
@@ -1,14 +0,0 @@
-// Filename: dxVertexBufferContext8.I
-// Created by:  drose (18Mar05)
-//
-////////////////////////////////////////////////////////////////////
-//
-// 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."
-//
-////////////////////////////////////////////////////////////////////
-
diff --git a/panda/src/dxgsg8/dxVertexBufferContext8.cxx b/panda/src/dxgsg8/dxVertexBufferContext8.cxx
deleted file mode 100644
index dbabf0de46..0000000000
--- a/panda/src/dxgsg8/dxVertexBufferContext8.cxx
+++ /dev/null
@@ -1,299 +0,0 @@
-// Filename: dxVertexBufferContext8.cxx
-// Created by:  drose (18Mar05)
-//
-////////////////////////////////////////////////////////////////////
-//
-// 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 "dxVertexBufferContext8.h"
-#include "geomVertexArrayData.h"
-#include "geomVertexArrayFormat.h"
-#include "graphicsStateGuardian.h"
-#include "pStatTimer.h"
-#include "internalName.h"
-#include "config_dxgsg8.h"
-#include "dxgsg8base.h"
-
-TypeHandle DXVertexBufferContext8::_type_handle;
-
-////////////////////////////////////////////////////////////////////
-//     Function: DXVertexBufferContext8::Constructor
-//       Access: Public
-//  Description:
-////////////////////////////////////////////////////////////////////
-DXVertexBufferContext8::
-DXVertexBufferContext8(PreparedGraphicsObjects *pgo, GeomVertexArrayData *data) :
-  VertexBufferContext(pgo, data),
-  _vbuffer(NULL)
-{
-  // Now fill in the FVF code.
-  const GeomVertexArrayFormat *array_format = data->get_array_format();
-
-  // We have to start with the vertex data, and work up from there in
-  // order, since that's the way the FVF is defined.
-  int n = 0;
-  int num_columns = array_format->get_num_columns();
-
-  _fvf = 0;
-
-  if (n < num_columns &&
-      array_format->get_column(n)->get_name() == InternalName::get_vertex()) {
-    ++n;
-
-    int num_blend_values = 0;
-
-    if (n < num_columns &&
-        array_format->get_column(n)->get_name() == InternalName::get_transform_weight()) {
-      // We have hardware vertex animation.
-      num_blend_values = array_format->get_column(n)->get_num_values();
-      ++n;
-    }
-
-    if (n < num_columns &&
-        array_format->get_column(n)->get_name() == InternalName::get_transform_index()) {
-      // Furthermore, it's indexed vertex animation.
-      _fvf |= D3DFVF_LASTBETA_UBYTE4;
-      ++num_blend_values;
-      ++n;
-    }
-
-    switch (num_blend_values) {
-    case 0:
-      _fvf |= D3DFVF_XYZ;
-      break;
-
-    case 1:
-      _fvf |= D3DFVF_XYZB1;
-      break;
-
-    case 2:
-      _fvf |= D3DFVF_XYZB2;
-      break;
-
-    case 3:
-      _fvf |= D3DFVF_XYZB3;
-      break;
-
-    case 4:
-      _fvf |= D3DFVF_XYZB4;
-      break;
-
-    case 5:
-      _fvf |= D3DFVF_XYZB5;
-      break;
-    }
-  }
-
-  if (n < num_columns &&
-      array_format->get_column(n)->get_name() == InternalName::get_normal()) {
-    _fvf |= D3DFVF_NORMAL;
-    ++n;
-  }
-  if (n < num_columns &&
-      array_format->get_column(n)->get_name() == InternalName::get_color()) {
-    _fvf |= D3DFVF_DIFFUSE;
-    ++n;
-  }
-
-  // Now look for all of the texcoord names and enable them in the
-  // same order they appear in the array.
-  int texcoord_index = 0;
-  while (n < num_columns &&
-         array_format->get_column(n)->get_contents() == Geom::C_texcoord) {
-    const GeomVertexColumn *column = array_format->get_column(n);
-    switch (column->get_num_values()) {
-    case 1:
-      _fvf |= D3DFVF_TEXCOORDSIZE1(texcoord_index);
-      ++n;
-      break;
-    case 2:
-      _fvf |= D3DFVF_TEXCOORDSIZE2(texcoord_index);
-      ++n;
-      break;
-    case 3:
-      _fvf |= D3DFVF_TEXCOORDSIZE3(texcoord_index);
-      ++n;
-      break;
-    case 4:
-      _fvf |= D3DFVF_TEXCOORDSIZE4(texcoord_index);
-      ++n;
-      break;
-    }
-    ++texcoord_index;
-  }
-
-  switch (texcoord_index) {
-  case 0:
-    break;
-  case 1:
-    _fvf |= D3DFVF_TEX1;
-    break;
-  case 2:
-    _fvf |= D3DFVF_TEX2;
-    break;
-  case 3:
-    _fvf |= D3DFVF_TEX3;
-    break;
-  case 4:
-    _fvf |= D3DFVF_TEX4;
-    break;
-  case 5:
-    _fvf |= D3DFVF_TEX5;
-    break;
-  case 6:
-    _fvf |= D3DFVF_TEX6;
-    break;
-  case 7:
-    _fvf |= D3DFVF_TEX7;
-    break;
-  case 8:
-    _fvf |= D3DFVF_TEX8;
-    break;
-  }
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: DXVertexBufferContext8::Destructor
-//       Access: Public
-//  Description:
-////////////////////////////////////////////////////////////////////
-DXVertexBufferContext8::
-~DXVertexBufferContext8() {
-  if (_vbuffer != NULL) {
-    if (dxgsg8_cat.is_debug()) {
-      dxgsg8_cat.debug()
-        << "deleting vertex buffer " << _vbuffer << "\n";
-    }
-
-    RELEASE(_vbuffer, dxgsg8, "vertex buffer", RELEASE_ONCE);
-    _vbuffer = NULL;
-  }
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: DXVertexBufferContext8::evict_lru
-//       Access: Public, Virtual
-//  Description: Evicts the page from the LRU.  Called internally when
-//               the LRU determines that it is full.  May also be
-//               called externally when necessary to explicitly evict
-//               the page.
-//
-//               It is legal for this method to either evict the page
-//               as requested, do nothing (in which case the eviction
-//               will be requested again at the next epoch), or
-//               requeue itself on the tail of the queue (in which
-//               case the eviction will be requested again much
-//               later).
-////////////////////////////////////////////////////////////////////
-void DXVertexBufferContext8::
-evict_lru() {
-  dequeue_lru();
-
-  if (_vbuffer != NULL) {
-    if (dxgsg8_cat.is_debug()) {
-      dxgsg8_cat.debug()
-        << "deleting vertex buffer " << _vbuffer << "\n";
-    }
-
-    RELEASE(_vbuffer, dxgsg8, "vertex buffer", RELEASE_ONCE);
-    _vbuffer = NULL;
-  }
-
-  update_data_size_bytes(0);
-  mark_unloaded();
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: DXVertexBufferContext8::create_vbuffer
-//       Access: Public
-//  Description: Creates a new vertex buffer (but does not upload data
-//               to it).
-////////////////////////////////////////////////////////////////////
-void DXVertexBufferContext8::
-create_vbuffer(DXScreenData &scrn,
-               const GeomVertexArrayDataHandle *reader) {
-  nassertv(reader->get_object() == get_data());
-  Thread *current_thread = reader->get_current_thread();
-
-  if (_vbuffer != NULL) {
-    if (dxgsg8_cat.is_debug()) {
-      dxgsg8_cat.debug()
-        << "deleting vertex buffer " << _vbuffer << "\n";
-    }
-
-    RELEASE(_vbuffer, dxgsg8, "vertex buffer", RELEASE_ONCE);
-    _vbuffer = NULL;
-  }
-
-  PStatTimer timer(GraphicsStateGuardian::_create_vertex_buffer_pcollector,
-                   current_thread);
-
-  HRESULT hr = scrn._d3d_device->CreateVertexBuffer
-//    (reader->get_data_size_bytes(), D3DUSAGE_WRITEONLY,
-//     _fvf, D3DPOOL_MANAGED, &_vbuffer);
-     (reader->get_data_size_bytes(), D3DUSAGE_WRITEONLY | D3DUSAGE_DYNAMIC,
-     _fvf, D3DPOOL_DEFAULT, &_vbuffer);
-  if (FAILED(hr)) {
-    dxgsg8_cat.warning()
-      << "CreateVertexBuffer failed" << D3DERRORSTRING(hr);
-    _vbuffer = NULL;
-  } else {
-    if (dxgsg8_cat.is_debug()) {
-      dxgsg8_cat.debug()
-        << "created vertex buffer " << _vbuffer << ": "
-        << reader->get_num_rows() << " vertices "
-        << *reader->get_array_format() << "\n";
-    }
-  }
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: DXVertexBufferContext8::upload_data
-//       Access: Public
-//  Description: Copies the latest data from the client store to
-//               DirectX.
-////////////////////////////////////////////////////////////////////
-bool DXVertexBufferContext8::
-upload_data(const GeomVertexArrayDataHandle *reader, bool force) {
-  nassertr(reader->get_object() == get_data(), false);
-  nassertr(_vbuffer != NULL, false);
-  Thread *current_thread = reader->get_current_thread();
-
-  const unsigned char *data_pointer = reader->get_read_pointer(force);
-  if (data_pointer == NULL) {
-    return false;
-  }
-  int data_size = reader->get_data_size_bytes();
-
-  if (dxgsg8_cat.is_spam()) {
-    dxgsg8_cat.spam()
-      << "copying " << data_size
-      << " bytes into vertex buffer " << _vbuffer << "\n";
-  }
-
-  PStatTimer timer(GraphicsStateGuardian::_load_vertex_buffer_pcollector,
-                   current_thread);
-
-  BYTE *local_pointer;
-//  HRESULT hr = _vbuffer->Lock(0, data_size, &local_pointer, 0);
-  HRESULT hr = _vbuffer->Lock(0, data_size, &local_pointer, D3DLOCK_DISCARD);
-  if (FAILED(hr)) {
-    dxgsg8_cat.error()
-      << "VertexBuffer::Lock failed" << D3DERRORSTRING(hr);
-    return false;
-  }
-
-  GraphicsStateGuardian::_data_transferred_pcollector.add_level(data_size);
-  memcpy(local_pointer, data_pointer, data_size);
-
-  _vbuffer->Unlock();
-  return true;
-}
-
diff --git a/panda/src/dxgsg8/dxVertexBufferContext8.h b/panda/src/dxgsg8/dxVertexBufferContext8.h
deleted file mode 100644
index 44d85ce73d..0000000000
--- a/panda/src/dxgsg8/dxVertexBufferContext8.h
+++ /dev/null
@@ -1,63 +0,0 @@
-// Filename: dxVertexBufferContext8.h
-// Created by:  drose (18Mar05)
-//
-////////////////////////////////////////////////////////////////////
-//
-// 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 DXVERTEXBUFFERCONTEXT8_H
-#define DXVERTEXBUFFERCONTEXT8_H
-
-#include "pandabase.h"
-#include "dxgsg8base.h"
-#include "vertexBufferContext.h"
-
-////////////////////////////////////////////////////////////////////
-//       Class : DXVertexBufferContext8
-// Description : Caches a GeomVertexArrayData in the DirectX device as
-//               a vertex buffer.
-////////////////////////////////////////////////////////////////////
-class EXPCL_PANDADX DXVertexBufferContext8 : public VertexBufferContext {
-public:
-  DXVertexBufferContext8(PreparedGraphicsObjects *pgo, GeomVertexArrayData *data);
-  virtual ~DXVertexBufferContext8();
-
-  virtual void evict_lru();
-
-  void create_vbuffer(DXScreenData &scrn,
-                      const GeomVertexArrayDataHandle *reader);
-  bool upload_data(const GeomVertexArrayDataHandle *reader, bool force);
-
-  IDirect3DVertexBuffer8 *_vbuffer;
-  int _fvf;
-
-public:
-  static TypeHandle get_class_type() {
-    return _type_handle;
-  }
-  static void init_type() {
-    VertexBufferContext::init_type();
-    register_type(_type_handle, "DXVertexBufferContext8",
-                  VertexBufferContext::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 "dxVertexBufferContext8.I"
-
-#endif
-
-
diff --git a/panda/src/dxgsg8/dxgsg8base.h b/panda/src/dxgsg8/dxgsg8base.h
deleted file mode 100644
index 49650f89eb..0000000000
--- a/panda/src/dxgsg8/dxgsg8base.h
+++ /dev/null
@@ -1,208 +0,0 @@
-// Filename: dxgsg8base.h
-// Created by:  georges (07Oct01)
-//
-////////////////////////////////////////////////////////////////////
-//
-// 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 DXGSG8BASE_H
-#define DXGSG8BASE_H
-
-#include "pandabase.h"
-#include "graphicsWindow.h"
-#include "pmap.h"
-
-#define WIN32_LEAN_AND_MEAN   // get rid of mfc win32 hdr stuff
-#ifndef STRICT
-// enable strict type checking in windows.h, see msdn
-#define STRICT
-#endif
-
-#define DIRECT3D_VERSION 0x0800
-#include <windows.h>
-#include <d3d8.h>
-#include <d3dx8.h>
-#include <dxerr8.h>
-#include <d3dx8tex.h>
-#undef WIN32_LEAN_AND_MEAN
-
-#ifndef D3DERRORSTRING
-#ifdef NDEBUG
-#define D3DERRORSTRING(HRESULT) " at (" << __FILE__ << ":" << __LINE__ << "), hr=" <<  DXGetErrorString8(HRESULT) << endl  // leave out descriptions to shrink release build
-#else
-#define D3DERRORSTRING(HRESULT) " at (" << __FILE__ << ":" << __LINE__ << "), hr=" <<  DXGetErrorString8(HRESULT) << ": " << DXGetErrorDescription8(HRESULT) << endl
-#endif
-#endif
-
-// imperfect method to ID NVid? could also scan desc str, but that isnt fullproof either
-#define IS_NVIDIA(DDDEVICEID) ((DDDEVICEID.VendorId==0x10DE) || (DDDEVICEID.VendorId==0x12D2))
-#define IS_ATI(DDDEVICEID) (DDDEVICEID.VendorId==0x1002)
-#define IS_MATROX(DDDEVICEID) (DDDEVICEID.VendorId==0x102B)
-
-#define D3D_MAXTEXTURESTAGES 8
-
-typedef enum {VertexShader,PixelShader} ShaderType;
-typedef DWORD DXShaderHandle;
-
-#define ISPOW2(X) (((X) & ((X)-1))==0)
-#define IS_VALID_PTR(PTR)  (!IsBadWritePtr(PTR,sizeof(void*)))
-
-#define DX_DECLARE_CLEAN(type, var) \
-    type var;                       \
-    ZeroMemory(&var, sizeof(type)); \
-    var.dwSize = sizeof(type);
-
-#define SAFE_DELSHADER(TYPE,HANDLE,PDEVICE)  \
-  if((HANDLE!=NULL)&&IS_VALID_PTR(PDEVICE)) { PDEVICE->Delete##TYPE##Shader(HANDLE);  HANDLE=NULL; }
-
-#define SAFE_DELETE(p)       { if(p) { assert(IS_VALID_PTR(p));   delete (p);     (p)=NULL; } }
-#define SAFE_DELETE_ARRAY(p) { if(p) { assert(IS_VALID_PTR(p));   delete [] (p);   (p)=NULL; } }
-
-// for stuff outside a panda class
-#define SAFE_RELEASE(p)      { if(p) { assert(IS_VALID_PTR(p)); (p)->Release(); (p)=NULL; } }
-#define SAFE_FREELIB(hDLL)   { if(hDLL!=NULL) {  FreeLibrary(hDLL);hDLL = NULL; } }
-
-// this is bDoDownToZero argument to RELEASE()
-#define RELEASE_DOWN_TO_ZERO true
-#define RELEASE_ONCE false
-
-
-// uncomment to add refcnt debug output
-#define DEBUG_RELEASES
-
-#ifdef DEBUG_RELEASES
-#define RELEASE(OBJECT,MODULE,DBGSTR,bDoDownToZero)             {  \
-   ULONG refcnt;                                                \
-   if(IS_VALID_PTR(OBJECT)) {                                   \
-        refcnt = (OBJECT)->Release();                           \
-        MODULE##_cat.debug() << DBGSTR << " released, refcnt = " << refcnt << " at " << __FILE__ << ":" << __LINE__ << endl; \
-        if((bDoDownToZero) && (refcnt>0)) {                     \
-              MODULE##_cat.warning() << DBGSTR << " released but still has a non-zero refcnt(" << refcnt << "), multi-releasing it down to zero!\n"; \
-              do {                                \
-                refcnt = (OBJECT)->Release();     \
-              } while(refcnt>0);                  \
-        }                                         \
-        (OBJECT) = NULL;                          \
-      } else {                                    \
-        MODULE##_cat.debug() << DBGSTR << " not released, ptr == NULL" << endl;  \
-      }}
-
-#define PRINT_REFCNT(MODULE,p) { ULONG refcnt;  (p)->AddRef();  refcnt=(p)->Release(); \
-                                 MODULE##_cat.debug() << #p << " has refcnt = " << refcnt << " at " << __FILE__ << ":" << __LINE__ << endl; }
-
-#else
-#define RELEASE(OBJECT,MODULE,DBGSTR,bDoDownToZero)   { \
-   ULONG refcnt;                                        \
-   if(IS_VALID_PTR(OBJECT))                           { \
-        refcnt=(OBJECT)->Release();                     \
-        if((bDoDownToZero) && (refcnt>0)) {             \
-              MODULE##_cat.warning() << DBGSTR << " released but still has a non-zero refcnt(" << refcnt << "), multi-releasing it down to zero!\n"; \
-              do {                                \
-                refcnt = (OBJECT)->Release();     \
-              } while(refcnt>0);                  \
-        }                                         \
-        (OBJECT) = NULL;                          \
-   }}
-
-#define PRINT_REFCNT(MODULE,p)
-#endif
-
-#ifdef DO_PSTATS
-#define DO_PSTATS_STUFF(XX) XX;
-#else
-#define DO_PSTATS_STUFF(XX)
-#endif
-
-#define PANDA_MAXNUMVERTS 0xFFFF  // Note Device may support more than this if it supports D3DFMT_INDEX32 indexbufs.
-
-#define FLG(NN) (1<<NN)
-#define MAX_POSSIBLE_TEXFMTS 32
-typedef enum {
-    R8G8B8_FLAG =       FLG(0),
-    A8R8G8B8_FLAG =     FLG(1),
-    X8R8G8B8_FLAG =     FLG(2),
-    R5G6B5_FLAG =       FLG(3),
-    X1R5G5B5_FLAG =     FLG(4),
-    A1R5G5B5_FLAG =     FLG(5),
-    A4R4G4B4_FLAG =     FLG(6),
-    R3G3B2_FLAG =       FLG(7),
-    A8_FLAG =           FLG(8),
-    A8R3G3B2_FLAG =     FLG(9),
-    X4R4G4B4_FLAG =     FLG(10),
-    A2B10G10R10_FLAG =  FLG(11),
-    G16R16_FLAG =       FLG(12),
-    A8P8_FLAG =         FLG(13),
-    P8_FLAG =           FLG(14),
-    L8_FLAG =           FLG(15),
-    A8L8_FLAG =         FLG(16),
-    A4L4_FLAG =         FLG(17),
-    V8U8_FLAG =         FLG(18),
-    L6V5U5_FLAG =       FLG(19),
-    X8L8V8U8_FLAG =     FLG(20),
-    Q8W8V8U8_FLAG =     FLG(21),
-    V16U16_FLAG =       FLG(22),
-    W11V11U10_FLAG =    FLG(23),
-    A2W10V10U10_FLAG =  FLG(24),
-    UYVY_FLAG =         FLG(25),
-    YUY2_FLAG =         FLG(26),
-    DXT1_FLAG =         FLG(27),
-    DXT2_FLAG =         FLG(28),
-    DXT3_FLAG =         FLG(29),
-    DXT4_FLAG =         FLG(30),
-    DXT5_FLAG =         FLG(31)
-} D3DFORMAT_FLAG;
-
-// this is only used in conjunction w/rendertgt fmts, so just make it something that can never be a rtgt
-#define DISPLAY_32BPP_REQUIRES_16BPP_ZBUFFER_FLAG DXT1_FLAG
-#define DISPLAY_16BPP_REQUIRES_16BPP_ZBUFFER_FLAG DXT2_FLAG
-
-#define IS_16BPP_DISPLAY_FORMAT(FMT) (((FMT)==D3DFMT_R5G6B5)||((FMT)==D3DFMT_X1R5G5B5)||((FMT)==D3DFMT_A1R5G5B5))
-#define IS_16BPP_ZBUFFER(FMT) ((FMT==D3DFMT_D16)||(FMT==D3DFMT_D15S1))
-#define IS_STENCIL_FORMAT(FMT) (((FMT)==D3DFMT_D24S8) || ((FMT)==D3DFMT_D15S1) || ((FMT)==D3DFMT_D24X4S4))
-#define RECT_XSIZE(REC) (REC.right-REC.left)
-#define RECT_YSIZE(REC) (REC.bottom-REC.top)
-
-class DXGraphicsStateGuardian8;
-
-struct DXScreenData {
-  LPDIRECT3DDEVICE8 _d3d_device;
-  IDirect3DSwapChain8 *_swap_chain;
-  LPDIRECT3D8 _d3d8;  // copied from DXGraphicsPipe8 for convenience
-  HWND _window;
-  HMONITOR _monitor;
-  DWORD _max_available_video_memory;
-  ushort _card_id;  // adapter ID
-  ushort _depth_buffer_bitdepth;  //GetSurfaceDesc is not reliable so must store this explicitly
-  bool _can_direct_disable_color_writes;  // if true, don't need blending for this
-  bool _is_low_memory_card;
-  bool _is_tnl_device;
-  bool _can_use_hw_vertex_shaders;
-  bool _can_use_pixel_shaders;
-  bool _is_dx8_1;
-  UINT _supported_screen_depths_mask;
-  UINT _supported_tex_formats_mask;
-  D3DCAPS8 _d3dcaps;
-  D3DDISPLAYMODE _display_mode;
-  D3DPRESENT_PARAMETERS _presentation_params;  // not redundant with _display_mode since width/height must be 0 for windowed mode
-  D3DADAPTER_IDENTIFIER8 _dx_device_id;
-  D3DFORMAT _render_to_texture_d3d_format;
-  D3DFORMAT _framebuffer_d3d_format;
-
-  DXGraphicsStateGuardian8 *_dxgsg8;
-};
-
-
-//utility stuff
-extern pmap<D3DFORMAT_FLAG,D3DFORMAT> g_D3DFORMATmap;
-extern void Init_D3DFORMAT_map();
-extern const char *D3DFormatStr(D3DFORMAT fmt);
-
-#endif
-
diff --git a/panda/src/dxgsg8/p3dxgsg8_composite1.cxx b/panda/src/dxgsg8/p3dxgsg8_composite1.cxx
deleted file mode 100644
index 8e3cc0e6f9..0000000000
--- a/panda/src/dxgsg8/p3dxgsg8_composite1.cxx
+++ /dev/null
@@ -1,10 +0,0 @@
-#include "dxgsg8base.h"
-#include "config_dxgsg8.cxx"
-#include "dxTextureContext8.cxx"
-#include "dxVertexBufferContext8.cxx"
-#include "dxIndexBufferContext8.cxx"
-#include "dxGeomMunger8.cxx"
-#include "wdxGraphicsPipe8.cxx"
-#include "wdxGraphicsWindow8.cxx"
-#include "wdxGraphicsBuffer8.cxx"
-#include "dxGraphicsDevice8.cxx"
diff --git a/panda/src/dxgsg8/wdxGraphicsBuffer8.cxx b/panda/src/dxgsg8/wdxGraphicsBuffer8.cxx
deleted file mode 100644
index 9b0c28b7b1..0000000000
--- a/panda/src/dxgsg8/wdxGraphicsBuffer8.cxx
+++ /dev/null
@@ -1,575 +0,0 @@
-// Filename: wdxGraphicsBuffer8.cxx
-// Created by:  drose (08Feb04)
-//
-////////////////////////////////////////////////////////////////////
-//
-// 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 "wdxGraphicsPipe8.h"
-#include "wdxGraphicsBuffer8.h"
-#include "pStatTimer.h"
-
-
-// ISSUES:
-  // render to texure format
-    // can be specified via the DXGraphicsStateGuardian8 member
-    // _render_to_texture_d3d_format  default = D3DFMT_X8R8G8B8
-
-  // should check texture creation with CheckDepthStencilMatch
-  // support copy from texture to ram?
-    // check D3DCAPS2_DYNAMICTEXTURES
-
-#define FL << "\n" << __FILE__ << " " << __LINE__ << "\n"
-
-TypeHandle wdxGraphicsBuffer8::_type_handle;
-
-
-////////////////////////////////////////////////////////////////////
-//     Function: wdxGraphicsBuffer8::Constructor
-//       Access: Public
-//  Description:
-////////////////////////////////////////////////////////////////////
-wdxGraphicsBuffer8::
-wdxGraphicsBuffer8(GraphicsEngine *engine, GraphicsPipe *pipe,
-                   const string &name,
-                   const FrameBufferProperties &fb_prop,
-                   const WindowProperties &win_prop,
-                   int flags,
-                   GraphicsStateGuardian *gsg,
-                   GraphicsOutput *host):
-  GraphicsBuffer(engine, pipe, name, fb_prop, win_prop, flags, gsg, host)
-{
-  // initialize all class members
-  _cube_map_index = -1;
-  _saved_color_buffer = NULL;
-  _saved_depth_buffer = NULL;
-  _color_backing_store = NULL;
-  _depth_backing_store = NULL;
-
-  // is this correct ???
-  // Since the pbuffer never gets flipped, we get screenshots from the
-  // same buffer we draw into.
-  _screenshot_buffer_type = _draw_buffer_type;
-
-  _this = 0;
-
-  if (_gsg) {
-    // save to GSG list to handle device lost issues
-    DXGraphicsStateGuardian8 *dxgsg;
-
-    dxgsg = DCAST (DXGraphicsStateGuardian8, _gsg);
-    _this = new (wdxGraphicsBuffer8 *);
-    *_this = this;
-    dxgsg -> _graphics_buffer_list.push_back(_this);
-  }
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: wdxGraphicsBuffer8::Destructor
-//       Access: Public, Virtual
-//  Description:
-////////////////////////////////////////////////////////////////////
-wdxGraphicsBuffer8::
-~wdxGraphicsBuffer8() {
-  this -> close_buffer ( );
-
-  if (_gsg) {
-    // remove from GSG list
-    DXGraphicsStateGuardian8 *dxgsg;
-
-    dxgsg = DCAST (DXGraphicsStateGuardian8, _gsg);
-    if (_this) {
-      dxgsg -> _graphics_buffer_list.remove(_this);
-    }
-    _this = 0;
-    _gsg.clear();
-    _gsg = 0;
-  }
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: wdxGraphicsBuffer8::begin_frame
-//       Access: Public, Virtual
-//  Description: This function will be called within the draw thread
-//               before beginning rendering for a given frame.  It
-//               should do whatever setup is required, and return true
-//               if the frame should be rendered, or false if it
-//               should be skipped.
-////////////////////////////////////////////////////////////////////
-bool wdxGraphicsBuffer8::
-begin_frame(FrameMode mode, Thread *current_thread) {
-
-  begin_frame_spam(mode);
-  if (_gsg == (GraphicsStateGuardian *)NULL) {
-    return false;
-  }
-  if (_dxgsg -> _d3d_device == 0) {
-    return false;
-  }
-
-  if (mode == FM_render) {
-    if (!save_bitplanes()) {
-      return false;
-    }
-    if (!rebuild_bitplanes()) {
-      restore_bitplanes();
-      return false;
-    }
-    clear_cube_map_selection();
-  }
-
-  _gsg->set_current_properties(&get_fb_properties());
-  return _gsg->begin_frame(current_thread);
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: wdxGraphicsBuffer8::end_frame
-//       Access: Public, Virtual
-//  Description: This function will be called within the draw thread
-//               after rendering is completed for a given frame.  It
-//               should do whatever finalization is required.
-////////////////////////////////////////////////////////////////////
-void wdxGraphicsBuffer8::
-end_frame(FrameMode mode, Thread *current_thread) {
-
-  end_frame_spam(mode);
-  nassertv(_gsg != (GraphicsStateGuardian *)NULL);
-
-  if (mode == FM_render) {
-    copy_to_textures();
-  }
-
-  _gsg->end_frame(current_thread);
-
-  if (mode == FM_render) {
-    trigger_flip();
-    clear_cube_map_selection();
-    restore_bitplanes();
-  }
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: wdxGraphicsBuffer8::save_bitplanes
-//       Access: Public
-//  Description: After rendering, d3d_device will need to be restored
-//               to its initial state.  This function saves the state.
-////////////////////////////////////////////////////////////////////
-bool wdxGraphicsBuffer8::
-save_bitplanes() {
-  HRESULT hr;
-
-  hr = _dxgsg -> _d3d_device -> GetRenderTarget (&_saved_color_buffer);
-  if (!SUCCEEDED (hr)) {
-    dxgsg8_cat.error ( ) << "GetRenderTarget " << D3DERRORSTRING(hr) FL;
-    return false;
-  }
-  hr = _dxgsg -> _d3d_device -> GetDepthStencilSurface (&_saved_depth_buffer);
-  if (!SUCCEEDED (hr)) {
-    dxgsg8_cat.error ( ) << "GetDepthStencilSurface " << D3DERRORSTRING(hr) FL;
-    return false;
-  }
-  return true;
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: wdxGraphicsBuffer8::restore_bitplanes
-//       Access: Public
-//  Description: After rendering, d3d_device will need to be restored
-//               to its initial state.  This function restores the state.
-////////////////////////////////////////////////////////////////////
-void wdxGraphicsBuffer8::
-restore_bitplanes() {
-  DXGraphicsStateGuardian8 *dxgsg;
-  DCAST_INTO_V(dxgsg, _gsg);
-
-  HRESULT hr;
-
-  hr = dxgsg -> _d3d_device ->
-    SetRenderTarget (_saved_color_buffer, _saved_depth_buffer);
-
-  if (!SUCCEEDED (hr)) {
-    dxgsg8_cat.error ( ) << "SetRenderTarget " << D3DERRORSTRING(hr) FL;
-  }
-
-  _saved_color_buffer->Release();
-  _saved_depth_buffer->Release();
-  _saved_color_buffer = NULL;
-  _saved_depth_buffer = NULL;
-}
-
-
-////////////////////////////////////////////////////////////////////
-//     Function: wdxGraphicsBuffer8::rebuild_bitplanes
-//       Access: Public
-//  Description: If necessary, reallocates (or allocates) the
-//               bitplanes for the buffer.
-////////////////////////////////////////////////////////////////////
-bool wdxGraphicsBuffer8::
-rebuild_bitplanes() {
-
-  HRESULT hr;
-  Texture *color_tex = 0;
-  Texture *depth_tex = 0;
-  DXTextureContext8 *color_ctx = 0;
-  DXTextureContext8 *depth_ctx = 0;
-  IDirect3DTexture8 *color_d3d_tex = 0;
-  IDirect3DTexture8 *depth_d3d_tex = 0;
-  IDirect3DCubeTexture8 *color_cube = 0;
-  IDirect3DCubeTexture8 *depth_cube = 0;
-  IDirect3DSurface8 *color_surf = 0;
-  IDirect3DSurface8 *depth_surf = 0;
-
-  // Decide how big the bitplanes should be.
-
-  if ((_host != 0)&&(_creation_flags & GraphicsPipe::BF_size_track_host)) {
-    if (_host->get_size() != _size) {
-      set_size_and_recalc(_host->get_x_size(),
-                          _host->get_y_size());
-    }
-  }
-  int bitplane_x = get_x_size();
-  int bitplane_y = get_y_size();
-  if (Texture::get_textures_power_2() != ATS_none) {
-    bitplane_x = Texture::up_to_power_2(bitplane_x);
-    bitplane_y = Texture::up_to_power_2(bitplane_y);
-  }
-
-  // Find the color and depth textures.  Either may be present,
-  // or neither.
-  //
-  // NOTE: Currently, depth-stencil textures are not implemented,
-  // but since it's coming soon, we're structuring for it.
-
-  int color_tex_index = -1;
-  int depth_tex_index = -1;
-  for (int i=0; i<count_textures(); i++) {
-    if (get_rtm_mode(i) == RTM_bind_or_copy) {
-      if ((get_texture(i)->get_format() != Texture::F_depth_stencil)&&
-          (get_texture(i)->get_format() != Texture::F_depth_component)&&
-          (color_tex_index < 0)) {
-        color_tex_index = i;
-      }
-    }
-  }
-
-
-  if (color_tex_index < 0) {
-    // Maintain the backing color surface.
-    if ((_color_backing_store)&&
-        ((bitplane_x != _backing_sizex)||(bitplane_y != _backing_sizey))) {
-      _color_backing_store->Release();
-      _color_backing_store = NULL;
-    }
-    if (!_color_backing_store) {
-      hr = _dxgsg -> _d3d_device ->
-        CreateImageSurface(bitplane_x, bitplane_y, _saved_color_desc.Format, &_color_backing_store);
-      if (!SUCCEEDED(hr)) {
-        dxgsg8_cat.error ( ) << "CreateImageSurface " << D3DERRORSTRING(hr) FL;
-      }
-    }
-    color_surf = _color_backing_store;
-  } else {
-    // Maintain the color texture.
-    if (_color_backing_store) {
-      _color_backing_store->Release();
-      _color_backing_store = NULL;
-    }
-    color_tex = get_texture(color_tex_index);
-    color_tex->set_x_size(bitplane_x);
-    color_tex->set_y_size(bitplane_y);
-    color_tex->set_format(Texture::F_rgba);
-    color_ctx =
-      DCAST(DXTextureContext8,
-            color_tex->prepare_now(0, _gsg->get_prepared_objects(), _gsg));
-    if (color_ctx) {
-      if (!color_ctx->create_texture(*_dxgsg->_screen)) {
-        dxgsg8_cat.error()
-          << "Unable to re-create texture " << *color_ctx->get_texture() << endl;
-        return false;
-      }
-      if (color_tex->get_texture_type() == Texture::TT_2d_texture) {
-        color_d3d_tex = color_ctx->_d3d_2d_texture;
-        nassertr(color_d3d_tex != 0, false);
-        hr = color_d3d_tex -> GetSurfaceLevel(0, &color_surf);
-        if (!SUCCEEDED(hr)) {
-          dxgsg8_cat.error ( ) << "GetSurfaceLevel " << D3DERRORSTRING(hr) FL;
-        }
-      } else {
-        color_cube = color_ctx->_d3d_cube_texture;
-        nassertr(color_cube != 0, false);
-        if (_cube_map_index >= 0 && _cube_map_index < 6) {
-          hr = color_cube -> GetCubeMapSurface ((D3DCUBEMAP_FACES) _cube_map_index, 0, &color_surf);
-          if (!SUCCEEDED(hr)) {
-            dxgsg8_cat.error ( ) << "GetCubeMapSurface " << D3DERRORSTRING(hr) FL;
-          }
-        }
-      }
-    }
-  }
-
-  if (depth_tex_index < 0) {
-    // Maintain the backing depth surface.
-    if ((_depth_backing_store)&&
-        ((bitplane_x != _backing_sizex)||(bitplane_y != _backing_sizey))) {
-      _depth_backing_store->Release();
-      _depth_backing_store = NULL;
-    }
-    if (!_depth_backing_store) {
-      hr = _dxgsg -> _d3d_device ->
-        CreateDepthStencilSurface (bitplane_x, bitplane_y, _saved_depth_desc.Format,
-                                   _saved_depth_desc.MultiSampleType, &_depth_backing_store);
-      if (!SUCCEEDED(hr)) {
-        dxgsg8_cat.error ( ) << "CreateDepthStencilSurface " << D3DERRORSTRING(hr) FL;
-      }
-    }
-    depth_surf = _depth_backing_store;
-  } else {
-    // Maintain the depth texture.
-    if (_depth_backing_store) {
-      _depth_backing_store->Release();
-      _depth_backing_store = NULL;
-    }
-    depth_tex = get_texture(depth_tex_index);
-    depth_tex->set_x_size(bitplane_x);
-    depth_tex->set_y_size(bitplane_y);
-    depth_tex->set_format(Texture::F_depth_stencil);
-    depth_ctx =
-      DCAST(DXTextureContext8,
-            depth_tex->prepare_now(0, _gsg->get_prepared_objects(), _gsg));
-    if (depth_ctx) {
-      if (!depth_ctx->create_texture(*_dxgsg->_screen)) {
-        dxgsg8_cat.error()
-          << "Unable to re-create texture " << *depth_ctx->get_texture() << endl;
-        return false;
-      }
-
-      if (depth_tex->get_texture_type() == Texture::TT_2d_texture) {
-        depth_d3d_tex = depth_ctx->_d3d_2d_texture;
-        nassertr(depth_d3d_tex != 0, false);
-        hr = depth_d3d_tex -> GetSurfaceLevel(0, &depth_surf);
-        if (!SUCCEEDED(hr)) {
-          dxgsg8_cat.error ( ) << "GetSurfaceLevel " << D3DERRORSTRING(hr) FL;
-        }
-      } else {
-        depth_cube = depth_ctx->_d3d_cube_texture;
-        nassertr(depth_cube != 0, false);
-        hr = depth_cube -> GetCubeMapSurface ((D3DCUBEMAP_FACES) _cube_map_index, 0, &depth_surf);
-        if (!SUCCEEDED(hr)) {
-          dxgsg8_cat.error ( ) << "GetCubeMapSurface " << D3DERRORSTRING(hr) FL;
-        }
-      }
-    }
-  }
-
-  _backing_sizex = bitplane_x;
-  _backing_sizey = bitplane_y;
-
-  // Load up the bitplanes.
-
-  if (color_surf && depth_surf) {
-    hr = _dxgsg -> _d3d_device -> SetRenderTarget (color_surf, depth_surf);
-    if (!SUCCEEDED (hr)) {
-      dxgsg8_cat.error ( ) << "SetRenderTarget " << D3DERRORSTRING(hr) FL;
-    }
-  }
-
-  // Decrement the reference counts on these surfaces. The refcounts
-  // were incremented earlier when we called GetSurfaceLevel.
-
-  if ((color_surf != 0)&&(color_surf != _color_backing_store)) {
-    color_surf->Release();
-  }
-  if ((depth_surf != 0)&&(depth_surf != _depth_backing_store)) {
-    depth_surf->Release();
-  }
-  return true;
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: wdxGraphicsBuffer8::select_target_tex_page
-//       Access: Public, Virtual
-//  Description: Called internally when the window is in
-//               render-to-a-texture mode and we are in the process of
-//               rendering the six faces of a cube map.  This should
-//               do whatever needs to be done to switch the buffer to
-//               the indicated face.
-////////////////////////////////////////////////////////////////////
-void wdxGraphicsBuffer8::
-select_target_tex_page(int page) {
-  _cube_map_index = page;
-
-  HRESULT hr;
-  Texture *color_tex = 0;
-  DXTextureContext8 *color_ctx = 0;
-  IDirect3DCubeTexture8 *color_cube = 0;
-  IDirect3DSurface8 *color_surf = 0;
-  int color_tex_index = -1;
-
-  for (int i=0; i<count_textures(); i++) {
-    if (get_rtm_mode(i) == RTM_bind_or_copy) {
-      if ((get_texture(i)->get_format() != Texture::F_depth_stencil)&&
-          (get_texture(i)->get_format() != Texture::F_depth_component)&&
-          (color_tex_index < 0)) {
-        color_tex_index = i;
-      }
-    }
-  }
-
-  color_tex = get_texture(color_tex_index);
-  if (color_tex) {
-    color_ctx =
-      DCAST(DXTextureContext8,
-            color_tex->prepare_now(0, _gsg->get_prepared_objects(), _gsg));
-    if (!color_ctx->create_texture(*_dxgsg->_screen)) {
-      dxgsg8_cat.error()
-        << "Unable to re-create texture " << *color_ctx->get_texture() << endl;
-      return;
-    }
-
-    color_cube = color_ctx->_d3d_cube_texture;
-
-    if (color_cube && _cube_map_index >= 0 && _cube_map_index < 6) {
-      hr = color_cube -> GetCubeMapSurface ((D3DCUBEMAP_FACES) _cube_map_index, 0, &color_surf);
-      if (!SUCCEEDED(hr)) {
-        dxgsg8_cat.error ( ) << "GetCubeMapSurface " << D3DERRORSTRING(hr) FL;
-      }
-
-      hr = _dxgsg -> _d3d_device -> SetRenderTarget (color_surf, 0);
-      if (!SUCCEEDED (hr)) {
-        dxgsg8_cat.error ( ) << "SetRenderTarget " << D3DERRORSTRING(hr) FL;
-      }
-      else {
-        color_surf->Release();
-      }
-    }
-  }
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: wdxGraphicsBuffer8::process_events
-//       Access: Public, Virtual
-//  Description: Do whatever processing is necessary to ensure that
-//               the window responds to user events.  Also, honor any
-//               requests recently made via request_properties()
-//
-//               This function is called only within the window
-//               thread.
-////////////////////////////////////////////////////////////////////
-void wdxGraphicsBuffer8::
-process_events() {
-  GraphicsBuffer::process_events();
-
-  MSG msg;
-
-  // Handle all the messages on the queue in a row.  Some of these
-  // might be for another window, but they will get dispatched
-  // appropriately.
-  while (PeekMessage(&msg, NULL, 0, 0, PM_NOREMOVE)) {
-    process_1_event();
-  }
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: wdxGraphicsBuffer8::close_buffer
-//       Access: Protected, Virtual
-//  Description: Closes the buffer right now.  Called from the window
-//               thread.
-////////////////////////////////////////////////////////////////////
-void wdxGraphicsBuffer8::
-close_buffer() {
-
-  if (_gsg != (GraphicsStateGuardian *)NULL) {
-    _gsg.clear();
-  }
-
-  if (_color_backing_store) {
-    _color_backing_store->Release();
-    _color_backing_store = NULL;
-  }
-  if (_depth_backing_store) {
-    _depth_backing_store->Release();
-    _depth_backing_store = NULL;
-  }
-
-  _cube_map_index = -1;
-  _is_valid = false;
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: wdxGraphicsBuffer8::open_buffer
-//       Access: Protected, Virtual
-//  Description: Opens the window right now.  Called from the window
-//               thread.  Returns true if the window is successfully
-//               opened, or false if there was a problem.
-////////////////////////////////////////////////////////////////////
-bool wdxGraphicsBuffer8::
-open_buffer() {
-
-  // GSG creation/initialization.
-  if (_gsg == 0) {
-    // The code below doesn't support creating a GSG on the fly.
-    // Just error out for now.
-    //_dxgsg = new DXGraphicsStateGuardian8(_engine, _pipe);
-    //_gsg = _dxgsg;
-    return false;
-  }
-   
-  DCAST_INTO_R(_dxgsg, _gsg, false);
-
-  if (!save_bitplanes()) {
-    return false;
-  }
-
-  HRESULT hr;
-  hr = _saved_color_buffer -> GetDesc (&_saved_color_desc);
-  if (!SUCCEEDED (hr)) {
-    dxgsg8_cat.error ( ) << "GetDesc " << D3DERRORSTRING(hr) FL;
-    return false;
-  }
-  hr = _saved_depth_buffer -> GetDesc (&_saved_depth_desc);
-  if (!SUCCEEDED (hr)) {
-    dxgsg8_cat.error ( ) << "GetDesc " << D3DERRORSTRING(hr) FL;
-    return false;
-  }
-  _fb_properties = _dxgsg->
-    calc_fb_properties(_saved_color_desc.Format,
-                       _saved_depth_desc.Format,
-                       _saved_depth_desc.MultiSampleType);
-  _fb_properties.set_force_hardware(1); // Wild guess.
-
-  if (!rebuild_bitplanes()) {
-    restore_bitplanes();
-    return false;
-  }
-
-  restore_bitplanes();
-  return true;
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: wdxGraphicsBuffer8::process_1_event
-//       Access: Private, Static
-//  Description: Handles one event from the message queue.
-////////////////////////////////////////////////////////////////////
-void wdxGraphicsBuffer8::
-process_1_event() {
-  MSG msg;
-
-  if (!GetMessage(&msg, NULL, 0, 0)) {
-    // WM_QUIT received.  We need a cleaner way to deal with this.
-    //    DestroyAllWindows(false);
-    exit(msg.wParam);  // this will invoke AtExitFn
-  }
-
-  // Translate virtual key messages
-  TranslateMessage(&msg);
-  // Call window_proc
-  DispatchMessage(&msg);
-}
diff --git a/panda/src/dxgsg8/wdxGraphicsBuffer8.h b/panda/src/dxgsg8/wdxGraphicsBuffer8.h
deleted file mode 100644
index fe3c5a95de..0000000000
--- a/panda/src/dxgsg8/wdxGraphicsBuffer8.h
+++ /dev/null
@@ -1,99 +0,0 @@
-// Filename: wdxGraphicsBuffer8.h
-// Created by:  drose (08Feb04)
-//
-////////////////////////////////////////////////////////////////////
-//
-// 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 wdxGraphicsBuffer8_H
-#define wdxGraphicsBuffer8_H
-
-#include "pandabase.h"
-#include "graphicsBuffer.h"
-#include "dxgsg8base.h"
-
-
-////////////////////////////////////////////////////////////////////
-//       Class : wdxGraphicsBuffer8
-// Description : An offscreen render buffer.  In OpenGL under Windows,
-//               this simply renders into a window that is never made
-//               visible.  There's a Windows interface for rendering
-//               into a DIB, but this puts restrictions on the kind of
-//               pixelformat we can use, and thus makes it difficult
-//               to support one GSG rendering into an offscreen buffer
-//               and also into a window.
-////////////////////////////////////////////////////////////////////
-class EXPCL_PANDADX wdxGraphicsBuffer8 : public GraphicsBuffer {
-public:
-  wdxGraphicsBuffer8(GraphicsEngine *engine, GraphicsPipe *pipe,
-                     const string &name,
-                     const FrameBufferProperties &fb_prop,
-                     const WindowProperties &win_prop,
-                     int flags,
-                     GraphicsStateGuardian *gsg,
-                     GraphicsOutput *host);
-  virtual ~wdxGraphicsBuffer8();
-  
-  virtual INLINE bool get_supports_render_texture() const;
-
-  virtual bool begin_frame(FrameMode mode, Thread *current_thread);
-  virtual void end_frame(FrameMode mode, Thread *current_thread);
-
-  virtual void select_target_tex_page(int page);
-
-  virtual void process_events();
-
-protected:
-  virtual void close_buffer();
-  virtual bool open_buffer();
-
-private:
-  bool save_bitplanes();
-  bool rebuild_bitplanes();
-  void restore_bitplanes();
-  static void process_1_event();
-
-  int _cube_map_index;
-  DXGraphicsStateGuardian8 *_dxgsg;
-  IDirect3DSurface8 *_saved_color_buffer;
-  IDirect3DSurface8 *_saved_depth_buffer;
-  D3DSURFACE_DESC    _saved_color_desc;
-  D3DSURFACE_DESC    _saved_depth_desc;
-  IDirect3DSurface8 *_color_backing_store;
-  IDirect3DSurface8 *_depth_backing_store;
-  int _backing_sizex;
-  int _backing_sizey;
-
-  wdxGraphicsBuffer8 **_this;
-
-public:
-  static TypeHandle get_class_type() {
-    return _type_handle;
-  }
-  static void init_type() {
-    GraphicsBuffer::init_type();
-    register_type(_type_handle, "wdxGraphicsBuffer8",
-                  GraphicsBuffer::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;
-
-  friend class DXGraphicsStateGuardian8;
-  friend class DXTextureContext8;
-};
-
-#include "wdxGraphicsBuffer8.I"
-
-#endif
diff --git a/panda/src/dxgsg8/wdxGraphicsPipe8.I b/panda/src/dxgsg8/wdxGraphicsPipe8.I
deleted file mode 100644
index f9c26197b8..0000000000
--- a/panda/src/dxgsg8/wdxGraphicsPipe8.I
+++ /dev/null
@@ -1,13 +0,0 @@
-// Filename: wdxGraphicsPipe8.I
-// Created by:  drose (20Dec02)
-//
-////////////////////////////////////////////////////////////////////
-//
-// 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."
-//
-////////////////////////////////////////////////////////////////////
diff --git a/panda/src/dxgsg8/wdxGraphicsPipe8.cxx b/panda/src/dxgsg8/wdxGraphicsPipe8.cxx
deleted file mode 100644
index 6412bf1572..0000000000
--- a/panda/src/dxgsg8/wdxGraphicsPipe8.cxx
+++ /dev/null
@@ -1,931 +0,0 @@
-// Filename: wdxGraphicsPipe8.cxx
-// Created by:  drose (20Dec02)
-//
-////////////////////////////////////////////////////////////////////
-//
-// 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 "wdxGraphicsPipe8.h"
-#include "dxGraphicsDevice8.h"
-#include "wdxGraphicsWindow8.h"
-#include "wdxGraphicsBuffer8.h"
-#include "config_dxgsg8.h"
-
-TypeHandle wdxGraphicsPipe8::_type_handle;
-
-#define LOWVIDMEMTHRESHOLD 5700000  // 4MB cards should fall below this
-#define CRAPPY_DRIVER_IS_LYING_VIDMEMTHRESHOLD 1000000  // if # is > 1MB, card is lying and I cant tell what it is
-#define UNKNOWN_VIDMEM_SIZE 0xFFFFFFFF
-
-////////////////////////////////////////////////////////////////////
-//     Function: wdxGraphicsPipe8::Constructor
-//       Access: Public
-//  Description:
-////////////////////////////////////////////////////////////////////
-wdxGraphicsPipe8::
-wdxGraphicsPipe8() {
-  _hDDrawDLL = NULL;
-  _hD3D8_DLL = NULL;
-  __d3d8 = NULL;
-  _is_valid = init();
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: wdxGraphicsPipe8::Destructor
-//       Access: Public, Virtual
-//  Description:
-////////////////////////////////////////////////////////////////////
-wdxGraphicsPipe8::
-~wdxGraphicsPipe8() {
-  RELEASE(__d3d8, wdxdisplay8, "ID3D8", RELEASE_DOWN_TO_ZERO);
-  SAFE_FREELIB(_hD3D8_DLL);
-  SAFE_FREELIB(_hDDrawDLL);
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: wdxGraphicsPipe8::get_interface_name
-//       Access: Published, Virtual
-//  Description: Returns the name of the rendering interface
-//               associated with this GraphicsPipe.  This is used to
-//               present to the user to allow him/her to choose
-//               between several possible GraphicsPipes available on a
-//               particular platform, so the name should be meaningful
-//               and unique for a given platform.
-////////////////////////////////////////////////////////////////////
-string wdxGraphicsPipe8::
-get_interface_name() const {
-  return "DirectX8";
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: wdxGraphicsPipe8::pipe_constructor
-//       Access: Public, Static
-//  Description: This function is passed to the GraphicsPipeSelection
-//               object to allow the user to make a default
-//               wdxGraphicsPipe8.
-////////////////////////////////////////////////////////////////////
-PT(GraphicsPipe) wdxGraphicsPipe8::
-pipe_constructor() {
-  return new wdxGraphicsPipe8;
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: wdxGraphicsPipe8::make_output
-//       Access: Protected, Virtual
-//  Description: Creates a new window on the pipe, if possible.
-////////////////////////////////////////////////////////////////////
-PT(GraphicsOutput) wdxGraphicsPipe8::
-make_output(const string &name,
-            const FrameBufferProperties &fb_prop,
-            const WindowProperties &win_prop,
-            int flags,
-            GraphicsEngine *engine,
-            GraphicsStateGuardian *gsg,
-            GraphicsOutput *host,
-            int retry,
-            bool &precertify) {
-
-  if (!_is_valid) {
-    return NULL;
-  }
-
-  DXGraphicsStateGuardian8 *wdxgsg = 0;
-  if (gsg != 0) {
-    DCAST_INTO_R(wdxgsg, gsg, NULL);
-  }
-
-  // First thing to try: a visible window.
-
-  if (retry == 0) {
-    if (((flags&BF_require_parasite)!=0)||
-        ((flags&BF_refuse_window)!=0)||
-        ((flags&BF_resizeable)!=0)||
-        ((flags&BF_size_track_host)!=0)||
-        ((flags&BF_rtt_cumulative)!=0)||
-        ((flags&BF_can_bind_color)!=0)||
-        ((flags&BF_can_bind_every)!=0)) {
-      return NULL;
-    }
-    // Early failure - if we are sure that this buffer WONT
-    // meet specs, we can bail out early.
-    if ((flags & BF_fb_props_optional) == 0) {
-      if ((fb_prop.get_aux_rgba() > 0)||
-          (fb_prop.get_aux_rgba() > 0)||
-          (fb_prop.get_aux_float() > 0)) {
-        return NULL;
-      }
-    }
-    return new wdxGraphicsWindow8(engine, this, name, fb_prop, win_prop,
-                                  flags, gsg, host);
-  }
-
-  // Second thing to try: a wdxGraphicsBuffer8
-
-  if (retry == 1) {
-    if ((!support_render_texture)||
-        ((flags&BF_require_parasite)!=0)||
-        ((flags&BF_require_window)!=0)||
-        ((flags&BF_resizeable)!=0)||
-        ((flags&BF_size_track_host)!=0)||
-        ((flags&BF_rtt_cumulative)!=0)||
-        ((flags&BF_can_bind_every)!=0)) {
-      return NULL;
-    }
-    // Early failure - if we are sure that this buffer WONT
-    // meet specs, we can bail out early.
-    if ((flags & BF_fb_props_optional) == 0) {
-      if ((fb_prop.get_aux_rgba() > 0)||
-          (fb_prop.get_aux_rgba() > 0)||
-          (fb_prop.get_aux_float() > 0)||
-          (fb_prop.get_indexed_color() > 0)||
-          (fb_prop.get_back_buffers() > 0)||
-          (fb_prop.get_accum_bits() > 0)||
-          (fb_prop.get_multisamples() > 0)) {
-        return NULL;
-      }
-    }
-    // Early success - if we are sure that this buffer WILL
-    // meet specs, we can precertify it.
-    // This looks rather overly optimistic -- ie, buggy.
-    if ((gsg != 0)&&
-        (gsg->is_valid())&&
-        (!gsg->needs_reset())&&
-        (DCAST(DXGraphicsStateGuardian8, gsg)->get_supports_render_texture())) {
-      precertify = true;
-    }
-    return new wdxGraphicsBuffer8(engine, this, name, fb_prop, win_prop,
-                                  flags, gsg, host);
-  }
-
-  // Nothing else left to try.
-  return NULL;
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: wdxGraphicsPipe8::init
-//       Access: Private
-//  Description: Performs some initialization steps to load up
-//               function pointers from the relevant DLL's, and
-//               determine the number and type of available graphics
-//               adapters, etc.  Returns true on success, false on
-//               failure.
-////////////////////////////////////////////////////////////////////
-bool wdxGraphicsPipe8::
-init() {
-  if (!MyLoadLib(_hDDrawDLL, "ddraw.dll")) {
-    goto error;
-  }
-
-  if (!MyGetProcAddr(_hDDrawDLL, (FARPROC*)&_DirectDrawCreateEx, "DirectDrawCreateEx")) {
-    goto error;
-  }
-
-  if (!MyGetProcAddr(_hDDrawDLL, (FARPROC*)&_DirectDrawEnumerateExA, "DirectDrawEnumerateExA")) {
-    goto error;
-  }
-
-  if (!MyLoadLib(_hD3D8_DLL, "d3d8.dll")) {
-    goto error;
-  }
-
-  if (!MyGetProcAddr(_hD3D8_DLL, (FARPROC*)&_Direct3DCreate8, "Direct3DCreate8")) {
-    goto error;
-  }
-
-  // Create a Direct3D object.
-
-  // these were taken from the 8.0 and 8.1 d3d8.h SDK headers
-#define D3D_SDK_VERSION_8_0  120
-#define D3D_SDK_VERSION_8_1  220
-
-  // are we using 8.0 or 8.1?
-  WIN32_FIND_DATA TempFindData;
-  HANDLE hFind;
-  char tmppath[_MAX_PATH + 128];
-  GetSystemDirectory(tmppath, MAX_PATH);
-  strcat(tmppath, "\\dpnhpast.dll");
-  hFind = FindFirstFile (tmppath, &TempFindData);
-  if (hFind != INVALID_HANDLE_VALUE) {
-    FindClose(hFind);
-    __is_dx8_1 = true;
-    __d3d8 = (*_Direct3DCreate8)(D3D_SDK_VERSION_8_1);
-  } else {
-    __is_dx8_1 = false;
-    __d3d8 = (*_Direct3DCreate8)(D3D_SDK_VERSION_8_0);
-  }
-
-  if (__d3d8 == NULL) {
-    wdxdisplay8_cat.error() << "Direct3DCreate8(8." << (__is_dx8_1 ? "1" : "0") << ") failed!, error = " << GetLastError() << endl;
-    //release_gsg();
-    goto error;
-  }
-
-  Init_D3DFORMAT_map();
-
-  return find_all_card_memavails();
-
- error:
-  return false;
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: wdxGraphicsPipe8::find_all_card_memavails
-//       Access: Private
-//  Description: Uses DX7 calls to determine how much video memory is
-//               available for each video adapter in the system.
-//               Returns true on success, false on failure.
-////////////////////////////////////////////////////////////////////
-bool wdxGraphicsPipe8::
-find_all_card_memavails() {
-  HRESULT hr;
-
-  hr = (*_DirectDrawEnumerateExA)(dx7_driver_enum_callback, this,
-                                  DDENUM_ATTACHEDSECONDARYDEVICES | DDENUM_NONDISPLAYDEVICES);
-  if (FAILED(hr)) {
-    wdxdisplay8_cat.fatal()
-      << "DirectDrawEnumerateEx failed" << D3DERRORSTRING(hr);
-    return false;
-  }
-
-  if (_card_ids.empty()) {
-    wdxdisplay8_cat.error()
-      << "DirectDrawEnumerateEx enum'ed no devices!\n";
-    return false;
-  }
-
-  GUID ZeroGUID;
-  ZeroMemory(&ZeroGUID, sizeof(GUID));
-
-  if (_card_ids.size() > 1) {
-    nassertr(IsEqualGUID(ZeroGUID, _card_ids[0].DX7_DeviceGUID), false);
-    // delete enum of primary display (always the first), since it is
-    // duplicated by explicit entry
-    _card_ids.erase(_card_ids.begin());
-  }
-
-  for (UINT i = 0; i < _card_ids.size(); i++) {
-    LPDIRECTDRAW7 pDD;
-    BYTE ddd_space[sizeof(DDDEVICEIDENTIFIER2)+4];  //bug in DX7 requires 4 extra bytes for GetDeviceID
-    DDDEVICEIDENTIFIER2 *pDX7DeviceID = (DDDEVICEIDENTIFIER2 *)&ddd_space[0];
-    GUID *pGUID = &(_card_ids[i].DX7_DeviceGUID);
-
-    if (IsEqualGUID(*pGUID, ZeroGUID)) {
-      pGUID = NULL;
-    }
-
-    // Create the Direct Draw Object
-    hr = (*_DirectDrawCreateEx)(pGUID, (void **)&pDD, IID_IDirectDraw7, NULL);
-    if (FAILED(hr)) {
-      wdxdisplay8_cat.error()
-        << "DirectDrawCreateEx failed for device (" << i
-        << ")" << D3DERRORSTRING(hr);
-      continue;
-    }
-
-    ZeroMemory(ddd_space, sizeof(DDDEVICEIDENTIFIER2));
-
-    hr = pDD->GetDeviceIdentifier(pDX7DeviceID, 0x0);
-    if (FAILED(hr)) {
-      wdxdisplay8_cat.error()
-        << "GetDeviceID failed for device (" << i << ")" << D3DERRORSTRING(hr);
-      continue;
-    }
-
-    _card_ids[i].DeviceID = pDX7DeviceID->dwDeviceId;
-    _card_ids[i].VendorID = pDX7DeviceID->dwVendorId;
-
-    // Get Current VidMem avail.  Note this is only an estimate, when
-    // we switch to fullscreen mode from desktop, more vidmem will be
-    // available (typically 1.2 meg).  I don't want to switch to
-    // fullscreen more than once due to the annoying monitor flicker,
-    // so try to figure out optimal mode using this estimate
-    DDSCAPS2 ddsGAVMCaps;
-    DWORD dwVidMemTotal, dwVidMemFree;
-    dwVidMemTotal = dwVidMemFree = 0;
-    {
-      // print out total INCLUDING AGP just for information purposes
-      // and future use.  The real value I'm interested in for
-      // purposes of measuring possible valid screen sizes shouldnt
-      // include AGP.
-      ZeroMemory(&ddsGAVMCaps, sizeof(DDSCAPS2));
-      ddsGAVMCaps.dwCaps = DDSCAPS_VIDEOMEMORY;
-
-      hr = pDD->GetAvailableVidMem(&ddsGAVMCaps, &dwVidMemTotal, &dwVidMemFree);
-      if (FAILED(hr)) {
-        wdxdisplay8_cat.error()
-          << "GetAvailableVidMem failed for device #" << i
-          << D3DERRORSTRING(hr);
-        //goto skip_device;
-        //exit(1);  // probably want to exit, since it may be my fault
-      }
-    }
-
-    wdxdisplay8_cat.info()
-      << "GetAvailableVidMem (including AGP) returns Total: "
-      << dwVidMemTotal <<", Free: " << dwVidMemFree
-      << " for device #" << i << endl;
-
-    ZeroMemory(&ddsGAVMCaps, sizeof(DDSCAPS2));
-
-    // just want to measure localvidmem, not AGP texmem
-    ddsGAVMCaps.dwCaps = DDSCAPS_VIDEOMEMORY | DDSCAPS_LOCALVIDMEM;
-
-    hr = pDD->GetAvailableVidMem(&ddsGAVMCaps, &dwVidMemTotal, &dwVidMemFree);
-    if (FAILED(hr)) {
-      wdxdisplay8_cat.error() << "GetAvailableVidMem failed for device #" << i<< D3DERRORSTRING(hr);
-      // sometimes GetAvailableVidMem fails with hr = DDERR_NODIRECTDRAWHW for some unknown reason (bad drivers?)
-      // see bugs: 15327, 18122, others.  is it because D3D8 object has already been created?
-      if (hr == DDERR_NODIRECTDRAWHW)
-        continue;
-      exit(1);  // probably want to exit, since it may be my fault
-    }
-
-    wdxdisplay8_cat.info()
-      << "GetAvailableVidMem (no AGP) returns Total: " << dwVidMemTotal
-      << ", Free: " << dwVidMemFree << " for device #" << i<< endl;
-
-    pDD->Release();  // release DD obj, since this is all we needed it for
-
-    if (!dx_do_vidmemsize_check) {
-      // still calling the DD stuff to get deviceID, etc.  is this necessary?
-      _card_ids[i]._max_available_video_memory = UNKNOWN_VIDMEM_SIZE;
-      _card_ids[i]._is_low_memory_card = false;
-      continue;
-    }
-
-    if (dwVidMemTotal == 0) {  // unreliable driver
-      dwVidMemTotal = UNKNOWN_VIDMEM_SIZE;
-    } else {
-      if (!ISPOW2(dwVidMemTotal)) {
-        // assume they wont return a proper max value, so
-        // round up to next pow of 2
-        UINT count = 0;
-        while ((dwVidMemTotal >> count) != 0x0) {
-          count++;
-        }
-        dwVidMemTotal = (1 << count);
-      }
-    }
-
-    // after Set_display_mode, GetAvailVidMem totalmem seems to go down
-    // by 1.2 meg (contradicting above comment and what I think would
-    // be correct behavior (shouldnt FS mode release the desktop
-    // vidmem?), so this is the true value
-    _card_ids[i]._max_available_video_memory = dwVidMemTotal;
-
-    // I can never get this stuff to work reliably, so I'm just
-    // rounding up to nearest pow2.  Could try to get
-    // HardwareInformation.Memory_size MB number from registry like
-    // video control panel, but its not clear how to find the proper
-    // registry location for a given card
-
-    // assume buggy drivers (this means you, FireGL2) may return zero
-    // (or small amts) for dwVidMemTotal, so ignore value if its < CRAPPY_DRIVER_IS_LYING_VIDMEMTHRESHOLD
-    bool bLowVidMemFlag =
-      ((dwVidMemTotal > CRAPPY_DRIVER_IS_LYING_VIDMEMTHRESHOLD) &&
-       (dwVidMemTotal< LOWVIDMEMTHRESHOLD));
-
-    _card_ids[i]._is_low_memory_card = bLowVidMemFlag;
-    wdxdisplay8_cat.info()
-      << "SetLowVidMem flag to " << bLowVidMemFlag
-      << " based on adjusted VidMemTotal: " << dwVidMemTotal << endl;
-  }
-  return true;
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: wdxGraphicsPipe8::dx7_driver_enum_callback
-//       Access: Private, Static
-//  Description:
-////////////////////////////////////////////////////////////////////
-BOOL WINAPI wdxGraphicsPipe8::
-dx7_driver_enum_callback(GUID *pGUID, TCHAR *strDesc, TCHAR *strName,
-                         VOID *argptr, HMONITOR hm) {
-  wdxGraphicsPipe8 *self = (wdxGraphicsPipe8 *)argptr;
-
-  CardID card_id;
-  ZeroMemory(&card_id, sizeof(CardID));
-
-  if (hm == NULL) {
-    card_id._monitor = MonitorFromWindow(GetDesktopWindow(),
-                                     MONITOR_DEFAULTTOPRIMARY);
-  } else {
-    card_id._monitor = hm;
-  }
-
-  if (pGUID != NULL) {
-    memcpy(&card_id.DX7_DeviceGUID, pGUID, sizeof(GUID));
-  }
-
-  card_id._max_available_video_memory = UNKNOWN_VIDMEM_SIZE;
-
-  self->_card_ids.push_back(card_id);
-
-  return DDENUMRET_OK;
-}
-
-//////////////////////////////////////////////////////////////////
-//     Function: wdxGraphicsWindow8::find_best_depth_format
-//       Access: Private
-//  Description:
-////////////////////////////////////////////////////////////////////
-bool wdxGraphicsPipe8::
-find_best_depth_format(DXScreenData &Display, D3DDISPLAYMODE &Test_display_mode,
-                       D3DFORMAT *pBestFmt, bool bWantStencil,
-                       bool bForce16bpp, bool bVerboseMode) const {
-  if (dxgsg8_cat.is_debug()) {
-    bVerboseMode = true;
-  }
-
-  // list formats to try in order of preference.
-
-#define NUM_TEST_ZFMTS 6
-#define FIRST_NON_STENCIL_ZFMT 3
-  static D3DFORMAT FormatPrefList[NUM_TEST_ZFMTS] = {
-    D3DFMT_D24S8, D3DFMT_D24X4S4, D3DFMT_D15S1,  // with stencil
-    D3DFMT_D32, D3DFMT_D24X8, D3DFMT_D16         // without stencil
-  };
-
-  // do not use Display._display_mode since that is probably not set yet, use Test_display_mode instead
-
-  *pBestFmt = D3DFMT_UNKNOWN;
-  HRESULT hr;
-
-  // nvidia likes zbuf depth to match rendertarget depth
-  bool bOnlySelect16bpp = (bForce16bpp ||
-                           (IS_NVIDIA(Display._dx_device_id) && IS_16BPP_DISPLAY_FORMAT(Test_display_mode.Format)));
-
-  if (bVerboseMode) {
-    wdxdisplay8_cat.info()
-      << "FindBestDepthFmt: bSelectOnly16bpp: " << bOnlySelect16bpp << endl;
-  }
-
-  int first_format = (bWantStencil ? 0 : FIRST_NON_STENCIL_ZFMT);
-  for (int i = first_format; i < NUM_TEST_ZFMTS; i++) {
-    D3DFORMAT TestDepthFmt = FormatPrefList[i];
-
-    if (bOnlySelect16bpp && !IS_16BPP_ZBUFFER(TestDepthFmt)) {
-      continue;
-    }
-
-    hr = Display._d3d8->CheckDeviceFormat(Display._card_id,
-                                          D3DDEVTYPE_HAL,
-                                          Test_display_mode.Format,
-                                          D3DUSAGE_DEPTHSTENCIL,
-                                          D3DRTYPE_SURFACE, TestDepthFmt);
-
-    if (FAILED(hr)) {
-      if (hr == D3DERR_NOTAVAILABLE) {
-        if (bVerboseMode)
-          wdxdisplay8_cat.info()
-            << "FindBestDepthFmt: ChkDevFmt returns NotAvail for "
-            << D3DFormatStr(TestDepthFmt) << endl;
-        continue;
-      }
-
-      wdxdisplay8_cat.error()
-        << "unexpected CheckDeviceFormat failure" << D3DERRORSTRING(hr)
-        << endl;
-      exit(1);
-    }
-
-    hr = Display._d3d8->CheckDepthStencilMatch(Display._card_id,
-                                               D3DDEVTYPE_HAL,
-                                               Test_display_mode.Format,   // adapter format
-                                               Test_display_mode.Format,   // backbuffer fmt  (should be the same in my apps)
-                                               TestDepthFmt);
-    if (SUCCEEDED(hr)) {
-      *pBestFmt = TestDepthFmt;
-      break;
-    } else {
-      if (hr == D3DERR_NOTAVAILABLE) {
-        if (bVerboseMode) {
-          wdxdisplay8_cat.info()
-            << "FindBestDepthFmt: ChkDepMatch returns NotAvail for "
-            << D3DFormatStr(Test_display_mode.Format) << ", "
-            << D3DFormatStr(TestDepthFmt) << endl;
-        }
-      } else {
-        wdxdisplay8_cat.error()
-          << "unexpected CheckDepthStencilMatch failure for "
-          << D3DFormatStr(Test_display_mode.Format) << ", "
-          << D3DFormatStr(TestDepthFmt) << endl;
-      }
-    }
-  }
-
-  if (bVerboseMode) {
-    wdxdisplay8_cat.info()
-      << "FindBestDepthFmt returns fmt " << D3DFormatStr(*pBestFmt) << endl;
-  }
-
-  return (*pBestFmt != D3DFMT_UNKNOWN);
-}
-
-
-////////////////////////////////////////////////////////////////////
-//     Function: wdxGraphicsWindow8::special_check_fullscreen_resolution
-//       Access: Private
-//  Description: overrides of the general estimator for known working
-//               cases
-////////////////////////////////////////////////////////////////////
-bool wdxGraphicsPipe8::
-special_check_fullscreen_resolution(DXScreenData &scrn, UINT x_size, UINT y_size) {
-  DWORD VendorId = scrn._dx_device_id.VendorId;
-  DWORD DeviceId = scrn._dx_device_id.DeviceId;
-
-  switch (VendorId) {
-  case 0x8086:  // Intel
-    if ((x_size == 640) && (y_size == 480)) {
-      return true;
-    }
-    if ((x_size == 800) && (y_size == 600)) {
-      return true;
-    }
-    if ((x_size == 1024) && (y_size == 768)) {
-      return true;
-    }
-    break;
-  }
-
-  return false;
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: wdxGraphicsWindow8::search_for_valid_displaymode
-//       Access: Private
-//  Description: All ptr args are output parameters.  If no valid mode
-//               found, returns *pSuggestedPixFmt = D3DFMT_UNKNOWN;
-////////////////////////////////////////////////////////////////////
-void wdxGraphicsPipe8::
-search_for_valid_displaymode(DXScreenData &scrn,
-                             UINT RequestedX_Size, UINT RequestedY_Size,
-                             bool bWantZBuffer, bool bWantStencil,
-                             UINT *p_supported_screen_depths_mask,
-                             bool *pCouldntFindAnyValidZBuf,
-                             D3DFORMAT *pSuggestedPixFmt,
-                             bool bForce16bppZBuffer,
-                             bool bVerboseMode) {
-
-  nassertv(IS_VALID_PTR(scrn._d3d8));
-  HRESULT hr;
-
-  *pSuggestedPixFmt = D3DFMT_UNKNOWN;
-  *p_supported_screen_depths_mask = 0x0;
-  *pCouldntFindAnyValidZBuf = false;
-
-  int cNumModes = scrn._d3d8->GetAdapterModeCount(scrn._card_id);
-  D3DDISPLAYMODE BestDispMode;
-  ZeroMemory(&BestDispMode, sizeof(BestDispMode));
-
-  if (bVerboseMode) {
-    wdxdisplay8_cat.info()
-      << "searching for valid display modes at res: ("
-      << RequestedX_Size << ", " << RequestedY_Size
-      << "), TotalModes: " << cNumModes << endl;
-  }
-
-  // ignore memory based checks for min res 640x480.  some cards just
-  // don't give accurate memavails.  (should I do the check anyway for
-  // 640x480 32bpp?)
-  bool bDoMemBasedChecks =
-    ((!((RequestedX_Size == 640)&&(RequestedY_Size == 480))) &&
-     (scrn._max_available_video_memory != UNKNOWN_VIDMEM_SIZE) &&
-     (!special_check_fullscreen_resolution(scrn, RequestedX_Size, RequestedY_Size)));
-
-  if (bVerboseMode || wdxdisplay8_cat.is_spam()) {
-    wdxdisplay8_cat.info()
-      << "DoMemBasedChecks = " << bDoMemBasedChecks << endl;
-  }
-
-  for (int i = 0; i < cNumModes; i++) {
-    D3DDISPLAYMODE dispmode;
-    hr = scrn._d3d8->EnumAdapterModes(scrn._card_id, i, &dispmode);
-    if (FAILED(hr)) {
-      wdxdisplay8_cat.error()
-        << "EnumAdapter_display_mode failed for device #"
-        << scrn._card_id << D3DERRORSTRING(hr);
-      continue;
-    }
-
-    if ((dispmode.Width != RequestedX_Size) ||
-        (dispmode.Height != RequestedY_Size)) {
-      if (bVerboseMode) {
-        wdxdisplay8_cat.info()
-          << "Mode dimension " << dispmode.Width << "x" << dispmode.Height
-          << "; format " << D3DFormatStr(dispmode.Format)
-          << ": onto next mode\n";
-      }
-      continue;
-    }
-
-    // disable refresh rate checking since SLI video cards may use 
-    // refresh rates less than 60
-    if (0) {
-      if ((dispmode.RefreshRate<60) && (dispmode.RefreshRate>1)) {
-        // don't want refresh rates under 60Hz, but 0 or 1 might indicate
-        // a default refresh rate, which is usually > = 60
-        if (bVerboseMode) {
-          wdxdisplay8_cat.info()
-            << "skipping mode[" << i << "], bad refresh rate: "
-            << dispmode.RefreshRate << endl;
-        }
-        continue;
-      }
-    }
-    
-    // Note no attempt is made to verify if format will work at
-    // requested size, so even if this call succeeds, could still get
-    // an out-of-video-mem error
-
-    hr = scrn._d3d8->CheckDeviceFormat(scrn._card_id, D3DDEVTYPE_HAL, dispmode.Format,
-                                       D3DUSAGE_RENDERTARGET, D3DRTYPE_SURFACE,
-                                       dispmode.Format);
-    if (FAILED(hr)) {
-      if (hr == D3DERR_NOTAVAILABLE) {
-        if (bVerboseMode) {
-          wdxdisplay8_cat.info()
-            << "skipping mode[" << i
-            << "], CheckDevFmt returns NotAvail for fmt: "
-            << D3DFormatStr(dispmode.Format) << endl;
-        }
-        continue;
-      } else {
-        wdxdisplay8_cat.error()
-          << "CheckDeviceFormat failed for device #"
-          << scrn._card_id << D3DERRORSTRING(hr);
-        continue;
-      }
-    }
-
-    bool bIs16bppRenderTgt = IS_16BPP_DISPLAY_FORMAT(dispmode.Format);
-    PN_stdfloat RendTgtMinMemReqmt = 0.0f;
-
-    // if we have a valid memavail value, try to determine if we have
-    // enough space
-    if (bDoMemBasedChecks) {
-      // assume user is testing fullscreen, not windowed, so use the
-      // dwTotal value see if 3 scrnbufs (front/back/z)at 16bpp at
-      // x_size*y_size will fit with a few extra megs for texmem
-
-      // 8MB Rage Pro says it has 6.8 megs Total free and will run at
-      // 1024x768, so formula makes it so that is OK
-
-#define REQD_TEXMEM 1800000
-
-      PN_stdfloat bytes_per_pixel = (bIs16bppRenderTgt ? 2 : 4);
-
-      // *2 for double buffer
-
-      RendTgtMinMemReqmt =
-        ((PN_stdfloat)RequestedX_Size) * ((PN_stdfloat)RequestedY_Size) *
-        bytes_per_pixel * 2 + REQD_TEXMEM;
-
-      if (bVerboseMode || wdxdisplay8_cat.is_spam())
-        wdxdisplay8_cat.info()
-          << "Testing Mode (" <<RequestedX_Size<<"x" << RequestedY_Size
-          << ", " << D3DFormatStr(dispmode.Format) << ")\nReqdVidMem: "
-          << (int)RendTgtMinMemReqmt << " AvailVidMem: "
-          << scrn._max_available_video_memory << endl;
-
-      if (RendTgtMinMemReqmt > scrn._max_available_video_memory) {
-        if (bVerboseMode || wdxdisplay8_cat.is_debug())
-          wdxdisplay8_cat.info()
-            << "not enough VidMem for render tgt, skipping display fmt "
-            << D3DFormatStr(dispmode.Format) << " ("
-            << (int)RendTgtMinMemReqmt << " > "
-            << scrn._max_available_video_memory << ")\n";
-        continue;
-      }
-    }
-
-    if (bWantZBuffer) {
-      D3DFORMAT zformat;
-      if (!find_best_depth_format(scrn, dispmode, &zformat,
-                                  bWantStencil, bForce16bppZBuffer)) {
-        *pCouldntFindAnyValidZBuf = true;
-        continue;
-      }
-
-      PN_stdfloat MinMemReqmt = 0.0f;
-
-      if (bDoMemBasedChecks) {
-        // test memory again, this time including zbuf size
-        PN_stdfloat zbytes_per_pixel = (IS_16BPP_ZBUFFER(zformat) ? 2 : 4);
-        PN_stdfloat MinMemReqmt = RendTgtMinMemReqmt + ((PN_stdfloat)RequestedX_Size)*((PN_stdfloat)RequestedY_Size)*zbytes_per_pixel;
-
-        if (bVerboseMode || wdxdisplay8_cat.is_spam())
-          wdxdisplay8_cat.info()
-            << "Testing Mode w/Z (" << RequestedX_Size << "x"
-            << RequestedY_Size << ", " << D3DFormatStr(dispmode.Format)
-            << ")\nReqdVidMem: " << (int)MinMemReqmt << " AvailVidMem: "
-            << scrn._max_available_video_memory << endl;
-
-        if (MinMemReqmt > scrn._max_available_video_memory) {
-          if (bVerboseMode || wdxdisplay8_cat.is_debug())
-            wdxdisplay8_cat.info()
-              << "not enough VidMem for RendTgt+zbuf, skipping display fmt "
-              << D3DFormatStr(dispmode.Format) << " (" << (int)MinMemReqmt
-              << " > " << scrn._max_available_video_memory << ")\n";
-          continue;
-        }
-      }
-
-//      Optimizing for 16-bit depth does not work in all cases so turn it off.
-      if (false) {
-        if ((!bDoMemBasedChecks) || (MinMemReqmt<scrn._max_available_video_memory)) {
-          if (!IS_16BPP_ZBUFFER(zformat)) {
-            // see if things fit with a 16bpp zbuffer
-
-            if (!find_best_depth_format(scrn, dispmode, &zformat,
-                                        bWantStencil, true, bVerboseMode)) {
-              if (bVerboseMode)
-                wdxdisplay8_cat.info()
-                  << "FindBestDepthFmt rejected Mode[" << i << "] ("
-                  << RequestedX_Size << "x" << RequestedY_Size
-                  << ", " << D3DFormatStr(dispmode.Format) << endl;
-              *pCouldntFindAnyValidZBuf = true;
-              continue;
-            }
-
-            // right now I'm not going to use these flags, just let the
-            // create fail out-of-mem and retry at 16bpp
-            *p_supported_screen_depths_mask |=
-              (IS_16BPP_DISPLAY_FORMAT(dispmode.Format) ? DISPLAY_16BPP_REQUIRES_16BPP_ZBUFFER_FLAG : DISPLAY_32BPP_REQUIRES_16BPP_ZBUFFER_FLAG);
-          }
-        }
-      }
-    }
-
-    if (bVerboseMode || wdxdisplay8_cat.is_spam())
-      wdxdisplay8_cat.info()
-        << "Validated Mode (" << RequestedX_Size << "x"
-        << RequestedY_Size << ", " << D3DFormatStr(dispmode.Format) << endl;
-
-    /*
-    // dx8 valid display modes for render targets.
-    D3DFMT_X1R5G5B5, D3DFMT_R5G6B5, D3DFMT_X8R8G8B8, and D3DFMT_A8R8G8B8
-    */
-
-    switch (dispmode.Format) {
-    case D3DFMT_X1R5G5B5:
-      *p_supported_screen_depths_mask |= X1R5G5B5_FLAG;
-      break;
-    case D3DFMT_X8R8G8B8:
-      *p_supported_screen_depths_mask |= X8R8G8B8_FLAG;
-      break;
-    case D3DFMT_A8R8G8B8:
-      *p_supported_screen_depths_mask |= A8R8G8B8_FLAG;
-      break;
-    case D3DFMT_R5G6B5:
-      *p_supported_screen_depths_mask |= R5G6B5_FLAG;
-      break;
-    default:
-      // Render target formats should be only D3DFMT_X1R5G5B5,
-      // D3DFMT_R5G6B5, D3DFMT_X8R8G8B8 and D3DFMT_A8R8G8B8
-      wdxdisplay8_cat.error()
-        << "unrecognized supported fmt " << D3DFormatStr(dispmode.Format)
-        << " returned by EnumAdapter_display_modes!\n";
-    }
-  }
-
-  // note: this chooses 32bpp, which may not be preferred over 16 for
-  // memory & speed reasons on some older cards in particular
-  if (*p_supported_screen_depths_mask & X8R8G8B8_FLAG) {
-    *pSuggestedPixFmt = D3DFMT_X8R8G8B8;
-  } else if (*p_supported_screen_depths_mask & A8R8G8B8_FLAG) {
-    *pSuggestedPixFmt = D3DFMT_A8R8G8B8;
-  } else if (*p_supported_screen_depths_mask & R5G6B5_FLAG) {
-    *pSuggestedPixFmt = D3DFMT_R5G6B5;
-  } else if (*p_supported_screen_depths_mask & X1R5G5B5_FLAG) {
-    *pSuggestedPixFmt = D3DFMT_X1R5G5B5;
-  }
-
-  if (bVerboseMode || wdxdisplay8_cat.is_spam()) {
-    wdxdisplay8_cat.info()
-      << "search_for_valid_device returns fmt: "
-      << D3DFormatStr(*pSuggestedPixFmt) << endl;
-  }
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: wdxGraphicsPipew8::make_device
-//       Access: Public, Virtual
-//  Description: Creates a new reference to a particular hardware
-//               device and associates it with the pipe.
-////////////////////////////////////////////////////////////////////
-PT(GraphicsDevice) wdxGraphicsPipe8::
-make_device(void *scrn) {
-  PT(DXGraphicsDevice8) device = new DXGraphicsDevice8(this);
-  memcpy(&device->_Scrn, scrn, sizeof(device->_Scrn));
-  device->_d3d_device = device->_Scrn._d3d_device;
-
-  _device = device;
-  wdxdisplay8_cat.info() << "walla: device" << device << "\n";
-
-  return device.p();
-}
-
-pmap<D3DFORMAT_FLAG, D3DFORMAT> g_D3DFORMATmap;
-
-void Init_D3DFORMAT_map() {
-  if (g_D3DFORMATmap.size() != 0)
-    return;
-
-#define INSERT_ELEM(XX)  g_D3DFORMATmap[XX##_FLAG] = D3DFMT_##XX;
-
-  INSERT_ELEM(R8G8B8);
-  INSERT_ELEM(A8R8G8B8);
-  INSERT_ELEM(X8R8G8B8);
-  INSERT_ELEM(R5G6B5);
-  INSERT_ELEM(X1R5G5B5);
-  INSERT_ELEM(A1R5G5B5);
-  INSERT_ELEM(A4R4G4B4);
-  INSERT_ELEM(R3G3B2);
-  INSERT_ELEM(A8);
-  INSERT_ELEM(A8R3G3B2);
-  INSERT_ELEM(X4R4G4B4);
-  INSERT_ELEM(A2B10G10R10);
-  INSERT_ELEM(G16R16);
-  INSERT_ELEM(A8P8);
-  INSERT_ELEM(P8);
-  INSERT_ELEM(L8);
-  INSERT_ELEM(A8L8);
-  INSERT_ELEM(A4L4);
-  INSERT_ELEM(V8U8);
-  INSERT_ELEM(L6V5U5);
-  INSERT_ELEM(X8L8V8U8);
-  INSERT_ELEM(Q8W8V8U8);
-  INSERT_ELEM(V16U16);
-  INSERT_ELEM(W11V11U10);
-  INSERT_ELEM(A2W10V10U10);
-  INSERT_ELEM(UYVY);
-  INSERT_ELEM(YUY2);
-  INSERT_ELEM(DXT1);
-  INSERT_ELEM(DXT2);
-  INSERT_ELEM(DXT3);
-  INSERT_ELEM(DXT4);
-  INSERT_ELEM(DXT5);
-}
-
-
-
-const char *D3DFormatStr(D3DFORMAT fmt) {
-
-#define CASESTR(XX) case XX: return #XX;
-  switch(fmt) {
-    CASESTR(D3DFMT_UNKNOWN);
-    CASESTR(D3DFMT_R8G8B8);
-    CASESTR(D3DFMT_A8R8G8B8);
-    CASESTR(D3DFMT_X8R8G8B8);
-    CASESTR(D3DFMT_R5G6B5);
-    CASESTR(D3DFMT_X1R5G5B5);
-    CASESTR(D3DFMT_A1R5G5B5);
-    CASESTR(D3DFMT_A4R4G4B4);
-    CASESTR(D3DFMT_R3G3B2);
-    CASESTR(D3DFMT_A8);
-    CASESTR(D3DFMT_A8R3G3B2);
-    CASESTR(D3DFMT_X4R4G4B4);
-    CASESTR(D3DFMT_A2B10G10R10);
-    CASESTR(D3DFMT_G16R16);
-    CASESTR(D3DFMT_A8P8);
-    CASESTR(D3DFMT_P8);
-    CASESTR(D3DFMT_L8);
-    CASESTR(D3DFMT_A8L8);
-    CASESTR(D3DFMT_A4L4);
-    CASESTR(D3DFMT_V8U8);
-    CASESTR(D3DFMT_L6V5U5);
-    CASESTR(D3DFMT_X8L8V8U8);
-    CASESTR(D3DFMT_Q8W8V8U8);
-    CASESTR(D3DFMT_V16U16);
-    CASESTR(D3DFMT_W11V11U10);
-    CASESTR(D3DFMT_A2W10V10U10);
-    CASESTR(D3DFMT_UYVY);
-    CASESTR(D3DFMT_YUY2);
-    CASESTR(D3DFMT_DXT1);
-    CASESTR(D3DFMT_DXT2);
-    CASESTR(D3DFMT_DXT3);
-    CASESTR(D3DFMT_DXT4);
-    CASESTR(D3DFMT_DXT5);
-    CASESTR(D3DFMT_D16_LOCKABLE);
-    CASESTR(D3DFMT_D32);
-    CASESTR(D3DFMT_D15S1);
-    CASESTR(D3DFMT_D24S8);
-    CASESTR(D3DFMT_D16);
-    CASESTR(D3DFMT_D24X8);
-    CASESTR(D3DFMT_D24X4S4);
-    CASESTR(D3DFMT_VERTEXDATA);
-    CASESTR(D3DFMT_INDEX16);
-    CASESTR(D3DFMT_INDEX32);
-  }
-
-  return "Invalid D3DFORMAT";
-}
-
diff --git a/panda/src/dxgsg8/wdxGraphicsPipe8.h b/panda/src/dxgsg8/wdxGraphicsPipe8.h
deleted file mode 100644
index 91606306f6..0000000000
--- a/panda/src/dxgsg8/wdxGraphicsPipe8.h
+++ /dev/null
@@ -1,122 +0,0 @@
-// Filename: wdxGraphicsPipe8.h
-// Created by:  drose (20Dec02)
-//
-////////////////////////////////////////////////////////////////////
-//
-// 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 WDXGRAPHICSPIPE8_H
-#define WDXGRAPHICSPIPE8_H
-
-#include "pandabase.h"
-#include "winGraphicsPipe.h"
-#include "pvector.h"
-#include "dxgsg8base.h"
-#include <ddraw.h>
-
-////////////////////////////////////////////////////////////////////
-//       Class : wdxGraphicsPipe8
-// Description : This graphics pipe represents the interface for
-//               creating DirectX8 graphics windows.
-////////////////////////////////////////////////////////////////////
-class EXPCL_PANDADX wdxGraphicsPipe8 : public WinGraphicsPipe {
-public:
-  wdxGraphicsPipe8();
-  virtual ~wdxGraphicsPipe8();
-
-  virtual string get_interface_name() const;
-  static PT(GraphicsPipe) pipe_constructor();
-
-  virtual PT(GraphicsDevice) make_device(void *scrn);
-
-  bool find_best_depth_format(DXScreenData &Display, D3DDISPLAYMODE &Test_display_mode,
-                              D3DFORMAT *pBestFmt, bool bWantStencil,
-                              bool bForce16bpp, bool bVerboseMode = false) const;
-
-  void search_for_valid_displaymode(DXScreenData &scrn,
-                                    UINT RequestedX_Size, UINT RequestedY_Size,
-                                    bool bWantZBuffer, bool bWantStencil,
-                                    UINT *p_supported_screen_depths_mask,
-                                    bool *pCouldntFindAnyValidZBuf,
-                                    D3DFORMAT *pSuggestedPixFmt,
-                                    bool bForce16bppZBuffer,
-                                    bool bVerboseMode = false);
-
-   bool special_check_fullscreen_resolution(DXScreenData &scrn, UINT x_size,UINT y_size);
-
-protected:
-   virtual PT(GraphicsOutput) make_output(const string &name,
-                                          const FrameBufferProperties &fb_prop,
-                                          const WindowProperties &win_prop,
-                                          int flags,
-                                          GraphicsEngine *engine,
-                                          GraphicsStateGuardian *gsg,
-                                          GraphicsOutput *host,
-                                          int retry,
-                                          bool &precertify);
-   
-private:
-  bool init();
-  bool find_all_card_memavails();
-
-  static BOOL WINAPI
-  dx7_driver_enum_callback(GUID *pGUID, TCHAR *strDesc, TCHAR *strName,
-                           VOID *argptr, HMONITOR hm);
-
-private:
-  HINSTANCE _hDDrawDLL;
-  HINSTANCE _hD3D8_DLL;
-  LPDIRECT3D8 __d3d8;
-
-
-  typedef LPDIRECT3D8 (WINAPI *Direct3DCreate8_ProcPtr)(UINT SDKVersion);
-  typedef HRESULT (WINAPI * LPDIRECTDRAWCREATEEX)(GUID FAR * lpGuid, LPVOID *lplpDD, REFIID iid, IUnknown FAR *pUnkOuter);
-
-  LPDIRECTDRAWCREATEEX _DirectDrawCreateEx;
-  LPDIRECTDRAWENUMERATEEX _DirectDrawEnumerateExA;
-  Direct3DCreate8_ProcPtr _Direct3DCreate8;
-
-  // CardID is used in DX7 lowmem card-classification pass so DX8 can
-  // establish correspondence b/w DX7 mem info & DX8 device
-  struct CardID {
-    HMONITOR _monitor;
-    DWORD _max_available_video_memory;
-    bool  _is_low_memory_card;
-    GUID  DX7_DeviceGUID;
-    DWORD VendorID, DeviceID;
-  };
-
-  typedef pvector<CardID> CardIDs;
-  CardIDs _card_ids;
-  bool __is_dx8_1;
-
-public:
-  static TypeHandle get_class_type() {
-    return _type_handle;
-  }
-  static void init_type() {
-    WinGraphicsPipe::init_type();
-    register_type(_type_handle, "wdxGraphicsPipe8",
-                  WinGraphicsPipe::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;
-
-  friend class wdxGraphicsWindow8;
-};
-
-#include "wdxGraphicsPipe8.I"
-
-#endif
diff --git a/panda/src/dxgsg8/wdxGraphicsWindow8.I b/panda/src/dxgsg8/wdxGraphicsWindow8.I
deleted file mode 100644
index fc44aa533a..0000000000
--- a/panda/src/dxgsg8/wdxGraphicsWindow8.I
+++ /dev/null
@@ -1,13 +0,0 @@
-// Filename: wdxGraphicsWindow8.I
-// Created by:  drose (20Dec02)
-//
-////////////////////////////////////////////////////////////////////
-//
-// 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."
-//
-////////////////////////////////////////////////////////////////////
diff --git a/panda/src/dxgsg8/wdxGraphicsWindow8.cxx b/panda/src/dxgsg8/wdxGraphicsWindow8.cxx
deleted file mode 100644
index 077274e36d..0000000000
--- a/panda/src/dxgsg8/wdxGraphicsWindow8.cxx
+++ /dev/null
@@ -1,1241 +0,0 @@
-// Filename: wdxGraphicsWindow8.cxx
-// Created by:  mike (09Jan00)
-//
-////////////////////////////////////////////////////////////////////
-//
-// 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 "wdxGraphicsPipe8.h"
-#include "wdxGraphicsWindow8.h"
-#include "config_dxgsg8.h"
-#include "config_display.h"
-#include "keyboardButton.h"
-#include "mouseButton.h"
-#include "throw_event.h"
-#include "pStatTimer.h"
-#include "pmap.h"
-#include <ddraw.h>
-#include <errno.h>
-#include <time.h>
-#include <math.h>
-#include <tchar.h>
-
-TypeHandle wdxGraphicsWindow8::_type_handle;
-
-////////////////////////////////////////////////////////////////////
-//     Function: wdxGraphicsWindow8::Constructor
-//       Access: Public
-//  Description:
-////////////////////////////////////////////////////////////////////
-wdxGraphicsWindow8::
-wdxGraphicsWindow8(GraphicsEngine *engine, GraphicsPipe *pipe,
-                   const string &name,
-                   const FrameBufferProperties &fb_prop,
-                   const WindowProperties &win_prop,
-                   int flags,
-                   GraphicsStateGuardian *gsg,
-                   GraphicsOutput *host):
-  WinGraphicsWindow(engine, pipe, name, fb_prop, win_prop, flags, gsg, host)
-{
-  // don't actually create the window in the constructor.  reason:
-  // multi-threading requires panda C++ window object to exist in
-  // separate thread from actual API window
-
-  _dxgsg = DCAST(DXGraphicsStateGuardian8, gsg);
-  _depth_buffer_bpp = 0;
-  _awaiting_restore = false;
-  ZeroMemory(&_wcontext, sizeof(_wcontext));
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: wdxGraphicsWindow8::Destructor
-//       Access: Public, Virtual
-//  Description:
-////////////////////////////////////////////////////////////////////
-wdxGraphicsWindow8::
-~wdxGraphicsWindow8() {
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: wdxGraphicsWindow8::begin_frame
-//       Access: Public, Virtual
-//  Description: This function will be called within the draw thread
-//               before beginning rendering for a given frame.  It
-//               should do whatever setup is required, and return true
-//               if the frame should be rendered, or false if it
-//               should be skipped.
-////////////////////////////////////////////////////////////////////
-bool wdxGraphicsWindow8::
-begin_frame(FrameMode mode, Thread *current_thread) {
-  begin_frame_spam(mode);
-  if (_gsg == (GraphicsStateGuardian *)NULL) {
-    return false;
-  }
-  
-  if (_awaiting_restore) {
-    // The fullscreen window was recently restored; we can't continue
-    // until the GSG says we can.
-    if (!_dxgsg->check_cooperative_level()) {
-      // Keep waiting.
-      return false;
-    }
-    _awaiting_restore = false;
-    init_resized_window();
-  }
-
-  make_current();
-
-  if (mode == FM_render) {
-    clear_cube_map_selection();
-  }
-
-  _gsg->set_current_properties(&get_fb_properties());
-  bool return_val = _gsg->begin_frame(current_thread);
-  _dxgsg->set_render_target();
-  return return_val;
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: wdxGraphicsWindow8::end_frame
-//       Access: Public, Virtual
-//  Description: This function will be called within the draw thread
-//               after rendering is completed for a given frame.  It
-//               should do whatever finalization is required.
-////////////////////////////////////////////////////////////////////
-void wdxGraphicsWindow8::
-end_frame(FrameMode mode, Thread *current_thread) {
-
-  end_frame_spam(mode);
-  nassertv(_gsg != (GraphicsStateGuardian *)NULL);
-
-  if (mode == FM_render) {
-    copy_to_textures();
-  }
-
-  _gsg->end_frame(current_thread);
-
-  if (mode == FM_render) {
-    trigger_flip();
-    clear_cube_map_selection();
-  }
-}
-////////////////////////////////////////////////////////////////////
-//     Function: wdxGraphicsWindow8::make_current
-//       Access: Private
-//  Description: 
-////////////////////////////////////////////////////////////////////
-void wdxGraphicsWindow8::
-make_current() {
-  PStatTimer timer(_make_current_pcollector);
-
-  _dxgsg->set_context(&_wcontext);
-
-  // Now that we have made the context current to a window, we can
-  // reset the GSG state if this is the first time it has been used.
-  // (We can't just call reset() when we construct the GSG, because
-  // reset() requires having a current context.)
-  _dxgsg->reset_if_new();
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: wdxGraphicsWindow8::end_flip
-//       Access: Public, Virtual
-//  Description: This function will be called within the draw thread
-//               after begin_flip() has been called on all windows, to
-//               finish the exchange of the front and back buffers.
-//
-//               This should cause the window to wait for the flip, if
-//               necessary.
-////////////////////////////////////////////////////////////////////
-void wdxGraphicsWindow8::
-end_flip() {
-  if (_dxgsg != (DXGraphicsStateGuardian8 *)NULL && is_active()) {
-    _dxgsg->show_frame();
-  }
-  GraphicsWindow::end_flip();
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: wdxGraphicsWindow8::verify_window_sizes
-//       Access: Public, Virtual
-//  Description: Determines which of the indicated window sizes are
-//               supported by available hardware (e.g. in fullscreen
-//               mode).
-//
-//               On entry, dimen is an array containing contiguous x, y
-//               pairs specifying possible display sizes; it is
-//               numsizes*2 words long.  The function will zero out
-//               any invalid x, y size pairs.  The return value is the
-//               number of valid sizes that were found.
-////////////////////////////////////////////////////////////////////
-int wdxGraphicsWindow8::
-verify_window_sizes(int numsizes, int *dimen) {
-  // unfortunately this only works AFTER you make the window
-  // initially, so its really mostly useful for resizes only
-  nassertr(IS_VALID_PTR(_dxgsg), 0);
-
-  int num_valid_modes = 0;
-
-  wdxGraphicsPipe8 *dxpipe;
-  DCAST_INTO_R(dxpipe, _pipe, 0);
-
-  // not requesting same refresh rate since changing res might not
-  // support same refresh rate at new size
-
-  int *pCurDim = dimen;
-
-  for (int i = 0; i < numsizes; i++, pCurDim += 2) {
-    int x_size = pCurDim[0];
-    int y_size = pCurDim[1];
-
-    bool bIsGoodMode = false;
-    bool CouldntFindAnyValidZBuf;
-    D3DFORMAT newPixFmt = D3DFMT_UNKNOWN;
-
-    if (dxpipe->special_check_fullscreen_resolution(_wcontext, x_size, y_size)) {
-      // bypass the test below for certain cards we know have valid modes
-      bIsGoodMode = true;
-
-    } else {
-      if (_wcontext._is_low_memory_card) {
-        bIsGoodMode = ((x_size == 640) && (y_size == 480));
-      } else  {
-        dxpipe->search_for_valid_displaymode
-          (_wcontext, x_size, y_size, _wcontext._presentation_params.EnableAutoDepthStencil != false,
-           IS_STENCIL_FORMAT(_wcontext._presentation_params.AutoDepthStencilFormat),
-           &_wcontext._supported_screen_depths_mask,
-           &CouldntFindAnyValidZBuf, &newPixFmt, dx_force_16bpp_zbuffer);
-        bIsGoodMode = (newPixFmt != D3DFMT_UNKNOWN);
-      }
-    }
-
-    if (bIsGoodMode) {
-      num_valid_modes++;
-    } else {
-      // tell caller the mode is invalid
-      pCurDim[0] = 0;
-      pCurDim[1] = 0;
-    }
-
-    if (wdxdisplay8_cat.is_spam()) {
-      wdxdisplay8_cat.spam()
-        << "Fullscrn Mode (" << x_size << ", " << y_size << ")\t"
-        << (bIsGoodMode ? "V" : "Inv") << "alid\n";
-    }
-  }
-
-  return num_valid_modes;
-}
-
-//////////////////////////////////////////////////////////////////
-//     Function: wdxGraphicsWindow::close_window
-//       Access: Public
-//  Description: Some cleanup is necessary for directx closeup of window.
-//               Handle close window events for this particular
-//               window.
-////////////////////////////////////////////////////////////////////
-void wdxGraphicsWindow8::
-close_window() {
-  if (wdxdisplay8_cat.is_debug()) {
-    wdxdisplay8_cat.debug()
-      << "wdxGraphicsWindow8::close_window() " << this << "\n";
-  }
-
-  if (_gsg != (GraphicsStateGuardian*)NULL) {
-    _gsg.clear();
-  }
-
-  _dxgsg->release_swap_chain(&_wcontext);
-  WinGraphicsWindow::close_window();
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: wdxGraphicsWindow8::open_window
-//       Access: Protected, Virtual
-//  Description: Opens the window right now.  Called from the window
-//               thread.  Returns true if the window is successfully
-//               opened, or false if there was a problem.
-////////////////////////////////////////////////////////////////////
-bool wdxGraphicsWindow8::
-open_window() {
-  PT(DXGraphicsDevice8) dxdev;
-  WindowProperties props;
-
-  // For now, let's make this configurable.  If this is true, then you
-  // can't open multiple different windows with the same GSG, but you
-  // may have more luck opening different windows with different
-  // GSG's.
-  static ConfigVariableBool always_discard_device("always-discard-device", true);
-  bool discard_device = always_discard_device;
-
-  // GSG creation/initialization.
-  if (_gsg == 0) {
-    _dxgsg = new DXGraphicsStateGuardian8(_engine, _pipe);
-    _gsg = _dxgsg;
-  } else {
-    DCAST_INTO_R(_dxgsg, _gsg, false);
-  }
-  
-  if (!choose_device()) {
-    return false;
-  }
-
-  // Ensure the window properties get set to the actual size of the
-  // window.
-  {
-    WindowProperties resized_props;
-    resized_props.set_size(_wcontext._display_mode.Width, 
-                           _wcontext._display_mode.Height);
-    _properties.add_properties(resized_props);
-  }
-
-  wdxdisplay8_cat.debug() << "_wcontext._window is " << _wcontext._window << "\n";
-  if (!WinGraphicsWindow::open_window()) {
-    return false;
-  }
-  _wcontext._window = _hWnd;
-
-  wdxdisplay8_cat.debug() << "_wcontext._window is " << _wcontext._window << "\n";
-
-  // Here check if a device already exists. If so, then this open_window
-  // call may be an extension to create multiple windows on same device
-  // In that case just create an additional swapchain for this window
-
-  while (true) {
-    if (_dxgsg->get_pipe()->get_device() == NULL || discard_device) {
-      wdxdisplay8_cat.debug() << "device is null or fullscreen\n";
-
-      // If device exists, free it
-      if (_dxgsg->get_pipe()->get_device()) {
-        _dxgsg->dx_cleanup();
-      }
-
-      wdxdisplay8_cat.debug() << "device width " << _wcontext._display_mode.Width << "\n";
-      if (!create_screen_buffers_and_device(_wcontext, dx_force_16bpp_zbuffer)) {
-        wdxdisplay8_cat.error() << "Unable to create window with specified parameters.\n";
-        close_window();
-        return false;
-      }
-      _dxgsg->get_pipe()->make_device((void*)(&_wcontext));
-      _dxgsg->copy_pres_reset(&_wcontext);
-      _dxgsg->create_swap_chain(&_wcontext);
-      break;
-
-    } else {
-      // fill in the DXScreenData from dxdevice here and change the
-      // reference to _window.
-      wdxdisplay8_cat.debug() << "device is not null\n";
-
-      dxdev = (DXGraphicsDevice8*)(_dxgsg->get_pipe()->get_device());
-      props = get_properties();
-      memcpy(&_wcontext, &dxdev->_Scrn, sizeof(DXScreenData));
-
-      _wcontext._presentation_params.Windowed = !is_fullscreen();
-      _wcontext._presentation_params.hDeviceWindow = _wcontext._window = _hWnd;
-      _wcontext._presentation_params.BackBufferWidth = _wcontext._display_mode.Width = props.get_x_size();
-      _wcontext._presentation_params.BackBufferHeight = _wcontext._display_mode.Height = props.get_y_size();
-
-      wdxdisplay8_cat.debug() << "device width " << _wcontext._presentation_params.BackBufferWidth << "\n";
-      if (!_dxgsg->create_swap_chain(&_wcontext)) {
-        discard_device = true;
-        continue; // try again
-      }
-      init_resized_window();
-      break;
-    }
-  }
-  wdxdisplay8_cat.debug() << "swapchain is " << _wcontext._swap_chain << "\n";
-  return true;
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: wdxGraphicsWindow8::reset_window
-//       Access: Public, Virtual
-//  Description: Resets the window framebuffer right now.  Called
-//               from graphicsEngine. It releases the current swap
-//               chain / creates a new one. If this is the initial
-//               window and swapchain is false, then it calls reset_
-//               main_device to Reset the device.
-////////////////////////////////////////////////////////////////////
-void wdxGraphicsWindow8::
-reset_window(bool swapchain) {
-  if (swapchain) {
-    if (_wcontext._swap_chain) {
-      _dxgsg->create_swap_chain(&_wcontext);
-      wdxdisplay8_cat.debug() << "created swapchain " << _wcontext._swap_chain << "\n";
-    }
-  }
-  else {
-    if (_wcontext._swap_chain) {
-      _dxgsg->release_swap_chain(&_wcontext);
-      wdxdisplay8_cat.debug() << "released swapchain " << _wcontext._swap_chain << "\n";
-    }
-  }
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: wdxGraphicsWindow8::fullscreen_restored
-//       Access: Protected, Virtual
-//  Description: This is a hook for derived classes to do something
-//               special, if necessary, when a fullscreen window has
-//               been restored after being minimized.  The given
-//               WindowProperties struct will be applied to this
-//               window's properties after this function returns.
-////////////////////////////////////////////////////////////////////
-void wdxGraphicsWindow8::
-fullscreen_restored(WindowProperties &properties) {
-  // In DX8, unlike DX7, for some reason we can't immediately start
-  // rendering as soon as the window is restored, even though
-  // BeginScene() says we can.  Instead, we have to wait until
-  // TestCooperativeLevel() lets us in.  We need to set a flag so we
-  // can handle this special case in begin_frame().
-  if (_dxgsg != NULL) {
-    _awaiting_restore = true;
-  }
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: wdxGraphicsWindow8::handle_reshape
-//       Access: Protected, Virtual
-//  Description: Called in the window thread when the window size or
-//               location is changed, this updates the properties
-//               structure accordingly.
-////////////////////////////////////////////////////////////////////
-void wdxGraphicsWindow8::
-handle_reshape() {
-  GdiFlush();
-  WinGraphicsWindow::handle_reshape();
-
-  if (_dxgsg != NULL && _dxgsg->_d3d_device != NULL) {
-    // create the new resized rendertargets
-    WindowProperties props = get_properties();
-    int x_size = props.get_x_size();
-    int y_size = props.get_y_size();
-
-    if (_wcontext._presentation_params.BackBufferWidth != x_size ||
-        _wcontext._presentation_params.BackBufferHeight != y_size) {
-      bool resize_succeeded = reset_device_resize_window(x_size, y_size);
-
-      if (wdxdisplay8_cat.is_debug()) {
-        if (!resize_succeeded) {
-          wdxdisplay8_cat.debug()
-            << "windowed_resize to size: (" << x_size << ", " << y_size
-            << ") failed due to out-of-memory\n";
-        } else {
-          int x_origin = props.get_x_origin();
-          int y_origin = props.get_y_origin();
-          wdxdisplay8_cat.debug()
-            << "windowed_resize to origin: (" << x_origin << ", "
-            << y_origin << "), size: (" << x_size
-            << ", " << y_size << ")\n";
-        }
-      }
-    }
-  }
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: wdxGraphicsWindow8::do_fullscreen_resize
-//       Access: Protected, Virtual
-//  Description: Called in the window thread to resize a fullscreen
-//               window.
-////////////////////////////////////////////////////////////////////
-bool wdxGraphicsWindow8::
-do_fullscreen_resize(int x_size, int y_size) {
-  if (!WinGraphicsWindow::do_fullscreen_resize(x_size, y_size)) {
-    return false;
-  }
-
-  bool bCouldntFindValidZBuf;
-  D3DFORMAT pixFmt;
-  bool bNeedZBuffer = (_wcontext._presentation_params.EnableAutoDepthStencil != false);
-  bool bNeedStencilBuffer = IS_STENCIL_FORMAT(_wcontext._presentation_params.AutoDepthStencilFormat);
-
-  wdxGraphicsPipe8 *dxpipe;
-  DCAST_INTO_R(dxpipe, _pipe, false);
-
-  bool bIsGoodMode = false;
-  bool bResizeSucceeded = false;
-
-  if (!dxpipe->special_check_fullscreen_resolution(_wcontext, x_size, y_size)) {
-    // bypass the lowvidmem test below for certain "lowmem" cards we know have valid modes
-
-    if (_wcontext._is_low_memory_card && (!((x_size == 640) && (y_size == 480)))) {
-      wdxdisplay8_cat.error() << "resize() failed: will not try to resize low vidmem device #" << _wcontext._card_id << " to non-640x480!\n";
-      return bResizeSucceeded;
-    }
-  }
-
-  // must ALWAYS use search_for_valid_displaymode even if we know
-  // a-priori that res is valid so we can get a valid pixfmt
-  dxpipe->search_for_valid_displaymode(_wcontext, x_size, y_size,
-                                       bNeedZBuffer, bNeedStencilBuffer,
-                                       &_wcontext._supported_screen_depths_mask,
-                                       &bCouldntFindValidZBuf,
-                                       &pixFmt, dx_force_16bpp_zbuffer);
-  bIsGoodMode = (pixFmt != D3DFMT_UNKNOWN);
-
-  if (!bIsGoodMode) {
-    wdxdisplay8_cat.error() << "resize() failed: "
-                            << (bCouldntFindValidZBuf ? "Couldnt find valid zbuffer format to go with FullScreen mode" : "No supported FullScreen modes")
-                            << " at " << x_size << "x" << y_size << " for device #" << _wcontext._card_id << endl;
-    return bResizeSucceeded;
-  }
-
-  // reset_device_resize_window handles both windowed & fullscrn,
-  // so need to set new displaymode manually here
-  _wcontext._display_mode.Width = x_size;
-  _wcontext._display_mode.Height = y_size;
-  _wcontext._display_mode.Format = pixFmt;
-  _wcontext._display_mode.RefreshRate = D3DPRESENT_RATE_DEFAULT;
-
-  _wcontext._presentation_params.BackBufferFormat = pixFmt;   // make reset_device_resize use presparams or displaymode??
-
-  bResizeSucceeded = reset_device_resize_window(x_size, y_size);
-
-  if (!bResizeSucceeded) {
-    wdxdisplay8_cat.error() << "resize() failed with OUT-OF-MEMORY error!\n";
-
-    if ((!IS_16BPP_DISPLAY_FORMAT(_wcontext._presentation_params.BackBufferFormat)) &&
-        (_wcontext._supported_screen_depths_mask & (R5G6B5_FLAG|X1R5G5B5_FLAG))) {
-      // fallback strategy, if we trying >16bpp, fallback to 16bpp buffers
-      _wcontext._display_mode.Format = ((_wcontext._supported_screen_depths_mask & R5G6B5_FLAG) ? D3DFMT_R5G6B5 : D3DFMT_X1R5G5B5);
-      dx_force_16bpp_zbuffer = true;
-      if (wdxdisplay8_cat.info())
-        wdxdisplay8_cat.info() << "CreateDevice failed with out-of-vidmem, retrying w/16bpp buffers on device #" << _wcontext._card_id << endl;
-
-      bResizeSucceeded = reset_device_resize_window(x_size, y_size);  // create the new resized rendertargets
-    }
-  }
-
-  return bResizeSucceeded;
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: wdxGraphicsWindow8::create_screen_buffers_and_device
-//       Access: Private
-//  Description: Called whenever the window is resized, this recreates
-//               the necessary buffers for rendering.
-//
-//               Sets _depth_buffer_bpp appropriately.
-////////////////////////////////////////////////////////////////////
-bool wdxGraphicsWindow8::
-create_screen_buffers_and_device(DXScreenData &display, bool force_16bpp_zbuffer) {
-  wdxGraphicsPipe8 *dxpipe;
-  DCAST_INTO_R(dxpipe, _pipe, false);
-
-  DWORD dwRenderWidth = display._display_mode.Width;
-  DWORD dwRenderHeight = display._display_mode.Height;
-  DWORD dwBehaviorFlags = 0x0;
-  LPDIRECT3D8 _d3d8 = display._d3d8;
-  D3DCAPS8 *pD3DCaps = &display._d3dcaps;
-  D3DPRESENT_PARAMETERS* presentation_params = &display._presentation_params;
-  RECT view_rect;
-  HRESULT hr;
-
-  wdxdisplay8_cat.debug() << "Display Width " << dwRenderWidth << " and PresParam Width " << _wcontext._presentation_params.BackBufferWidth << "\n";
-
-  bool bWantStencil = (_fb_properties.get_stencil_bits() > 0);
-
-  PRINT_REFCNT(wdxdisplay8, _d3d8);
-
-  nassertr(_d3d8 != NULL, false);
-  nassertr(pD3DCaps->DevCaps & D3DDEVCAPS_HWRASTERIZATION, false);
-
-  presentation_params->BackBufferFormat = display._display_mode.Format;  // don't need dest alpha, so just use adapter format
-  cerr << "attempting " << D3DFormatStr(presentation_params->BackBufferFormat) << "\n";
-
-  bool do_sync = sync_video;
-
-  if (do_sync && !(pD3DCaps->Caps & D3DCAPS_READ_SCANLINE)) {
-    wdxdisplay8_cat.info()
-      << "HW doesnt support syncing to vertical refresh, ignoring sync-video\n";
-    do_sync = false;
-  }
-
-  // verify the rendertarget fmt one last time
-  if (FAILED(_d3d8->CheckDeviceFormat(display._card_id, D3DDEVTYPE_HAL, display._display_mode.Format, D3DUSAGE_RENDERTARGET,
-                                      D3DRTYPE_SURFACE, presentation_params->BackBufferFormat))) {
-    wdxdisplay8_cat.error() << "device #" << display._card_id << " CheckDeviceFmt failed for surface fmt " << D3DFormatStr(presentation_params->BackBufferFormat) << endl;
-    goto Fallback_to_16bpp_buffers;
-  }
-
-  if (FAILED(_d3d8->CheckDeviceType(display._card_id, D3DDEVTYPE_HAL, display._display_mode.Format, presentation_params->BackBufferFormat,
-                                    is_fullscreen()))) {
-    wdxdisplay8_cat.error() << "device #" << display._card_id << " CheckDeviceType failed for surface fmt " << D3DFormatStr(presentation_params->BackBufferFormat) << endl;
-    goto Fallback_to_16bpp_buffers;
-  }
-
-  if (display._presentation_params.EnableAutoDepthStencil) {
-    if (!dxpipe->find_best_depth_format(display, display._display_mode,
-                                        &display._presentation_params.AutoDepthStencilFormat,
-                                        bWantStencil, false)) {
-      wdxdisplay8_cat.error()
-        << "find_best_depth_format failed in CreateScreenBuffers for device #"
-        << display._card_id << endl;
-      goto Fallback_to_16bpp_buffers;
-    }
-    _depth_buffer_bpp = D3DFMT_to_DepthBits(display._presentation_params.AutoDepthStencilFormat);
-  } else {
-    _depth_buffer_bpp = 0;
-  }
-
-  presentation_params->Windowed = !is_fullscreen();
-
-  if (dx_multisample_antialiasing_level>1) {
-    // need to check both rendertarget and zbuffer fmts
-    hr = _d3d8->CheckDeviceMultiSampleType(display._card_id, D3DDEVTYPE_HAL, display._display_mode.Format,
-                                           is_fullscreen(), D3DMULTISAMPLE_TYPE(dx_multisample_antialiasing_level.get_value()));
-    if (FAILED(hr)) {
-      wdxdisplay8_cat.fatal() << "device #" << display._card_id << " doesnt support multisample level " << dx_multisample_antialiasing_level << "surface fmt " << D3DFormatStr(display._display_mode.Format) << endl;
-      return false;
-    }
-
-    if (display._presentation_params.EnableAutoDepthStencil) {
-      hr = _d3d8->CheckDeviceMultiSampleType(display._card_id, D3DDEVTYPE_HAL, display._presentation_params.AutoDepthStencilFormat,
-                                             is_fullscreen(), D3DMULTISAMPLE_TYPE(dx_multisample_antialiasing_level.get_value()));
-      if (FAILED(hr)) {
-        wdxdisplay8_cat.fatal() << "device #" << display._card_id << " doesnt support multisample level " << dx_multisample_antialiasing_level << "surface fmt " << D3DFormatStr(display._presentation_params.AutoDepthStencilFormat) << endl;
-        return false;
-      }
-    }
-
-    presentation_params->MultiSampleType = D3DMULTISAMPLE_TYPE(dx_multisample_antialiasing_level.get_value());
-
-    if (wdxdisplay8_cat.is_info())
-      wdxdisplay8_cat.info() << "device #" << display._card_id << " using multisample antialiasing level " << dx_multisample_antialiasing_level << endl;
-  }
-
-  presentation_params->BackBufferCount = 1;
-  presentation_params->Flags = 0x0;
-  presentation_params->hDeviceWindow = display._window;
-  presentation_params->BackBufferWidth = display._display_mode.Width;
-  presentation_params->BackBufferHeight = display._display_mode.Height;
-
-  if (_wcontext._is_tnl_device) {
-    dwBehaviorFlags |= D3DCREATE_HARDWARE_VERTEXPROCESSING;
-    // note: we could create a pure device in this case if I
-    // eliminated the GetRenderState calls in dxgsg
-
-    // also, no software vertex processing available since I specify
-    // D3DCREATE_HARDWARE_VERTEXPROCESSING and not
-    // D3DCREATE_MIXED_VERTEXPROCESSING
-  } else {
-    dwBehaviorFlags |= D3DCREATE_SOFTWARE_VERTEXPROCESSING;
-  }
-
-  if (dx_preserve_fpu_state)
-    dwBehaviorFlags |= D3DCREATE_FPU_PRESERVE;
-
-  // if window is not foreground in exclusive mode, ddraw thinks you
-  // are 'not active', so it changes your WM_ACTIVATEAPP from true to
-  // false, causing us to go into a 'wait-for WM_ACTIVATEAPP true'
-  // loop, and the event never comes so we hang in fullscreen wait.
-  // also doing this for windowed mode since it was requested.
-  if (!SetForegroundWindow(display._window)) {
-    wdxdisplay8_cat.warning() << "SetForegroundWindow() failed!\n";
-  }
-
-  if (is_fullscreen()) {
-    // CREATE FULLSCREEN BUFFERS
-
-    presentation_params->SwapEffect = D3DSWAPEFFECT_DISCARD;  // we don't care about preserving contents of old frame
-    presentation_params->FullScreen_PresentationInterval = (do_sync ? D3DPRESENT_INTERVAL_ONE : D3DPRESENT_INTERVAL_IMMEDIATE);
-    presentation_params->FullScreen_RefreshRateInHz = display._display_mode.RefreshRate;
-
-    ClearToBlack(display._window, get_properties());
-
-    hr = _d3d8->CreateDevice(display._card_id, D3DDEVTYPE_HAL, _hWnd,
-                             dwBehaviorFlags, presentation_params, &display._d3d_device);
-
-    if (FAILED(hr)) {
-      wdxdisplay8_cat.fatal() << "D3D CreateDevice failed for device #" << display._card_id << ", " << D3DERRORSTRING(hr);
-
-      if (hr == D3DERR_OUTOFVIDEOMEMORY)
-        goto Fallback_to_16bpp_buffers;
-      else
-        return false;
-    }
-
-    SetRect(&view_rect, 0, 0, dwRenderWidth, dwRenderHeight);
-
-  } else {
-    // CREATE WINDOWED BUFFERS
-
-    D3DDISPLAYMODE dispmode;
-    hr = display._d3d8->GetAdapterDisplayMode(display._card_id, &dispmode);
-
-    if (FAILED(hr)) {
-      wdxdisplay8_cat.fatal()
-        << "GetAdapterDisplayMode failed" << D3DERRORSTRING(hr);
-      return false;
-    }
-
-    if (dispmode.Format == D3DFMT_P8) {
-      wdxdisplay8_cat.fatal()
-        << "Can't run windowed in an 8-bit or less display mode" << endl;
-      return false;
-    }
-
-    presentation_params->FullScreen_PresentationInterval = 0;
-
-    if (dx_multisample_antialiasing_level<2) {
-      if (do_sync) {
-        // It turns out that COPY_VSYNC has real performance problems
-        // on many nVidia cards--it syncs at some random interval,
-        // possibly skipping over several video syncs.  Screw it,
-        // we'll effectively disable sync-video with windowed mode
-        // using DirectX8.
-        //presentation_params->SwapEffect = D3DSWAPEFFECT_COPY_VSYNC;
-        presentation_params->SwapEffect = D3DSWAPEFFECT_DISCARD;
-      } else {
-        presentation_params->SwapEffect = D3DSWAPEFFECT_DISCARD;
-      }
-    } else {
-      presentation_params->SwapEffect = D3DSWAPEFFECT_DISCARD;
-    }
-
-    //nassertv((dwRenderWidth == presentation_params->BackBufferWidth)&&(dwRenderHeight == presentation_params->BackBufferHeight));
-
-    hr = _d3d8->CreateDevice(display._card_id, D3DDEVTYPE_HAL, _hWnd,
-                             dwBehaviorFlags, presentation_params, &display._d3d_device);
-
-    if (FAILED(hr)) {
-      wdxdisplay8_cat.warning() << "presentation_params->BackBufferWidth : " << presentation_params->BackBufferWidth << endl;
-      wdxdisplay8_cat.warning() << "presentation_params->BackBufferHeight : " << presentation_params->BackBufferHeight << endl;
-      wdxdisplay8_cat.warning() << "presentation_params->BackBufferFormat : " << presentation_params->BackBufferFormat << endl;
-      wdxdisplay8_cat.warning() << "presentation_params->BackBufferCount : " << presentation_params->BackBufferCount << endl;
-      wdxdisplay8_cat.warning() << "D3D CreateDevice failed for device #" << display._card_id << D3DERRORSTRING(hr);
-      goto Fallback_to_16bpp_buffers;
-    }
-  }  // end create windowed buffers
-
-  //  ========================================================
-
-  PRINT_REFCNT(wdxdisplay8, _wcontext._d3d_device);
-
-  if (presentation_params->EnableAutoDepthStencil) {
-    int depth_bits;
-    int stencil_bits;
-
-    depth_bits = 1;
-    stencil_bits = 0;
-    switch (presentation_params->AutoDepthStencilFormat)
-    {
-      case D3DFMT_D16_LOCKABLE:
-        depth_bits = 16;
-        break;
-      case D3DFMT_D32:
-        depth_bits = 32;
-        break;
-      case D3DFMT_D15S1:
-        depth_bits = 15;
-        stencil_bits = 1;
-        break;
-      case D3DFMT_D24S8:
-        depth_bits = 24;
-        stencil_bits = 8;
-        break;
-      case D3DFMT_D24X8:
-        depth_bits = 24;
-        break;
-      case D3DFMT_D24X4S4:
-        depth_bits = 24;
-        stencil_bits = 4;
-        break;
-      case D3DFMT_D16:
-        depth_bits = 16;
-        break;
-      default:
-        wdxdisplay8_cat.error() << "unknown depth stencil format  " << presentation_params->AutoDepthStencilFormat;
-        break;
-    }
-      
-    _fb_properties.set_stencil_bits(stencil_bits);
-    _fb_properties.set_depth_bits(depth_bits);
-  } else {
-    _fb_properties.set_depth_bits(0);
-    _fb_properties.set_stencil_bits(0);
-  }
-
-  init_resized_window();
-
-  return true;
-
- Fallback_to_16bpp_buffers:
-  if ((!IS_16BPP_DISPLAY_FORMAT(presentation_params->BackBufferFormat)) &&
-      (display._supported_screen_depths_mask & (R5G6B5_FLAG|X1R5G5B5_FLAG))) {
-    // fallback strategy, if we trying >16bpp, fallback to 16bpp buffers
-
-    display._display_mode.Format = ((display._supported_screen_depths_mask & R5G6B5_FLAG) ? D3DFMT_R5G6B5 : D3DFMT_X1R5G5B5);
-
-    if (wdxdisplay8_cat.info()) {
-      wdxdisplay8_cat.info()
-        << "CreateDevice failed with out-of-vidmem or invalid BackBufferFormat, retrying w/16bpp buffers on device #"
-        << display._card_id << endl;
-    }
-    return create_screen_buffers_and_device(display, true);
-    //return;
-
-  } else if (!((dwRenderWidth == 640)&&(dwRenderHeight == 480))) {
-    if (wdxdisplay8_cat.info())
-      wdxdisplay8_cat.info() << "CreateDevice failed w/out-of-vidmem, retrying at 640x480 w/16bpp buffers on device #" << display._card_id << endl;
-    // try final fallback to 640x480x16
-    display._display_mode.Width = 640;
-    display._display_mode.Height = 480;
-    return create_screen_buffers_and_device(display, true);
-    //return;
-
-  } else {
-    wdxdisplay8_cat.fatal()
-      << "Can't create any screen buffers, bailing out.\n";
-    return false;
-  }
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: wdxGraphicsWindow8::choose_device
-//       Access: Private
-//  Description: Looks at the list of available graphics adapters and
-//               chooses a suitable one for the window.
-//
-//               Returns true if successful, false on failure.
-////////////////////////////////////////////////////////////////////
-bool wdxGraphicsWindow8::
-choose_device() {
-  HRESULT hr;
-
-  wdxGraphicsPipe8 *dxpipe;
-  DCAST_INTO_R(dxpipe, _pipe, false);
-
-  int num_adapters = dxpipe->__d3d8->GetAdapterCount();
-  DXDeviceInfoVec device_infos;
-
-  for (int i = 0; i < num_adapters; i++) {
-    D3DADAPTER_IDENTIFIER8 adapter_info;
-    ZeroMemory(&adapter_info, sizeof(D3DADAPTER_IDENTIFIER8));
-    hr = dxpipe->__d3d8->GetAdapterIdentifier(i, D3DENUM_NO_WHQL_LEVEL, &adapter_info);
-    if (FAILED(hr)) {
-      wdxdisplay8_cat.fatal()
-        << "D3D GetAdapterID(" << i << ") failed: "
-        << D3DERRORSTRING(hr) << endl;
-      continue;
-    }
-
-    LARGE_INTEGER *DrvVer = &adapter_info.DriverVersion;
-
-    wdxdisplay8_cat.info()
-      << "D3D8." << (dxpipe->__is_dx8_1 ?"1":"0") << " Adapter[" << i << "]: " << adapter_info.Description
-      << ", Driver: " << adapter_info.Driver << ", DriverVersion: ("
-      << HIWORD(DrvVer->HighPart) << "." << LOWORD(DrvVer->HighPart) << "."
-      << HIWORD(DrvVer->LowPart) << "." << LOWORD(DrvVer->LowPart)
-      << ")\nVendorID: 0x" << (void*) adapter_info.VendorId
-      << " DeviceID: 0x" <<  (void*) adapter_info.DeviceId
-      << " SubsysID: 0x" << (void*) adapter_info.SubSysId
-      << " Revision: 0x" << (void*) adapter_info.Revision << endl;
-
-    HMONITOR _monitor = dxpipe->__d3d8->GetAdapterMonitor(i);
-    if (_monitor == NULL) {
-      wdxdisplay8_cat.info()
-        << "D3D8 Adapter[" << i << "]: seems to be disabled, skipping it\n";
-      continue;
-    }
-
-    DXDeviceInfo devinfo;
-    ZeroMemory(&devinfo, sizeof(devinfo));
-    memcpy(&devinfo.guidDeviceIdentifier, &adapter_info.DeviceIdentifier,
-           sizeof(GUID));
-    strncpy(devinfo.szDescription, adapter_info.Description,
-            MAX_DEVICE_IDENTIFIER_STRING);
-    strncpy(devinfo.szDriver, adapter_info.Driver,
-            MAX_DEVICE_IDENTIFIER_STRING);
-    devinfo.VendorID = adapter_info.VendorId;
-    devinfo.DeviceID = adapter_info.DeviceId;
-    devinfo._monitor = _monitor;
-    devinfo.cardID = i;
-
-    device_infos.push_back(devinfo);
-  }
-
-  if (device_infos.empty()) {
-    wdxdisplay8_cat.error()
-      << "No available D3D8 devices found.\n";
-    return false;
-  }
-
-  // Since some adapters may have been disabled, we should re-obtain
-  // the number of available adapters.
-  num_adapters = (int)device_infos.size();
-
-  // Now choose a suitable adapter.
-
-  int adapter_num = D3DADAPTER_DEFAULT;
-
-  // Eventually, we should have some interface for specifying a device
-  // index interactively, instead of only via Configrc.
-  if (dx_preferred_device_id != -1) {
-    if (dx_preferred_device_id < 0 || dx_preferred_device_id >= num_adapters) {
-      wdxdisplay8_cat.error()
-        << "invalid 'dx-preferred-device-id', valid values are 0-"
-        << num_adapters - 1 << ", using default adapter instead.\n";
-    } else {
-      adapter_num = dx_preferred_device_id;
-    }
-  }
-
-  UINT good_device_count = 0;
-  for(UINT devnum = 0;devnum<device_infos.size() /*&& (good_device_count < num_windows)*/;devnum++) {
-    if (search_for_device(dxpipe, &device_infos[devnum]))
-      good_device_count++;
-  }
-
-  if (good_device_count == 0) {
-    wdxdisplay8_cat.error() << "no usable display devices.\n";
-    return false;
-  }
-
-  return true;
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: wdxGraphicsWindow8::search_for_device
-//       Access: Private
-//  Description: Searches for a suitable hardware device for
-//               rendering.
-////////////////////////////////////////////////////////////////////
-bool wdxGraphicsWindow8::
-search_for_device(wdxGraphicsPipe8 *dxpipe, DXDeviceInfo *device_info) {
-
-  nassertr(dxpipe != NULL, false);
-  WindowProperties properties = get_properties();
-  DWORD dwRenderWidth = properties.get_x_size();
-  DWORD dwRenderHeight = properties.get_y_size();
-  HRESULT hr;
-  LPDIRECT3D8 _d3d8 = dxpipe->__d3d8;
-
-  nassertr(_dxgsg != NULL, false);
-  _wcontext._d3d8 = _d3d8;
-  _wcontext._is_dx8_1 = dxpipe->__is_dx8_1;
-  _wcontext._card_id = device_info->cardID;  // could this change by end?
-
-  bool bWantStencil = (_fb_properties.get_stencil_bits() > 0);
-
-  hr = _d3d8->GetAdapterIdentifier(device_info->cardID, D3DENUM_NO_WHQL_LEVEL,
-                                   &_wcontext._dx_device_id);
-  if (FAILED(hr)) {
-    wdxdisplay8_cat.error()
-      << "D3D GetAdapterID failed" << D3DERRORSTRING(hr);
-    return false;
-  }
-
-  D3DCAPS8 _d3dcaps;
-  hr = _d3d8->GetDeviceCaps(device_info->cardID, D3DDEVTYPE_HAL, &_d3dcaps);
-  if (FAILED(hr)) {
-    if ((hr == D3DERR_INVALIDDEVICE)||(hr == D3DERR_NOTAVAILABLE)) {
-      wdxdisplay8_cat.error()
-        << "No DirectX 8 D3D-capable 3D hardware detected for device # "
-        << device_info->cardID << " (" << device_info->szDescription
-        << ")!\n";
-    } else {
-      wdxdisplay8_cat.error()
-        << "GetDeviceCaps failed: " << D3DERRORSTRING(hr) << endl;
-    }
-    return false;
-  }
-
-  //search_for_valid_displaymode needs these to be set
-  memcpy(&_wcontext._d3dcaps, &_d3dcaps, sizeof(D3DCAPS8));
-  _wcontext._card_id = device_info->cardID;
-
-  _wcontext._max_available_video_memory = UNKNOWN_VIDMEM_SIZE;
-  _wcontext._is_low_memory_card = false;
-
-  // bugbug: wouldnt we like to do GetAVailVidMem so we can do
-  // upper-limit memory computation for dx8 cards too?  otherwise
-  // verify_window_sizes cant do much
-  if (_d3dcaps.MaxStreams == 0) {
-    if (wdxdisplay8_cat.is_debug()) {
-      wdxdisplay8_cat.debug()
-        << "checking vidmem size\n";
-    }
-
-    UINT IDnum;
-
-    // simple linear search to match DX7 card info w/DX8 card ID
-    for (IDnum = 0; IDnum < dxpipe->_card_ids.size(); IDnum++) {
-      if ((device_info->VendorID == dxpipe->_card_ids[IDnum].VendorID) &&
-          (device_info->DeviceID == dxpipe->_card_ids[IDnum].DeviceID) &&
-          (device_info->_monitor == dxpipe->_card_ids[IDnum]._monitor))
-        break;
-    }
-
-    if (IDnum < dxpipe->_card_ids.size()) {
-      _wcontext._max_available_video_memory = dxpipe->_card_ids[IDnum]._max_available_video_memory;
-      _wcontext._is_low_memory_card = dxpipe->_card_ids[IDnum]._is_low_memory_card;
-    } else {
-      wdxdisplay8_cat.error()
-        << "Error: couldnt find a CardID match in DX7 info, assuming card is not a lowmem card\n";
-    }
-  }
-
-  if ((bWantStencil) && (_d3dcaps.StencilCaps == 0x0)) {
-    wdxdisplay8_cat.fatal()
-      << "Stencil ability requested, but device #" << device_info->cardID
-      << " (" << _wcontext._dx_device_id.Description
-      << "), has no stencil capability!\n";
-    return false;
-  }
-
-  // just because TNL is true, it doesnt mean vtx shaders are
-  // supported in HW (see GF2) for this case, you probably want MIXED
-  // processing to use HW for fixed-fn vertex processing and SW for
-  // vtx shaders
-  _wcontext._is_tnl_device =
-    ((_d3dcaps.DevCaps & D3DDEVCAPS_HWTRANSFORMANDLIGHT) != 0);
-  _wcontext._can_use_hw_vertex_shaders =
-    (_d3dcaps.VertexShaderVersion >= D3DVS_VERSION(1, 0));
-  _wcontext._can_use_pixel_shaders =
-    (_d3dcaps.PixelShaderVersion >= D3DPS_VERSION(1, 0));
-
-  bool bNeedZBuffer =
-    ((!(_d3dcaps.RasterCaps & D3DPRASTERCAPS_ZBUFFERLESSHSR )) &&
-     (_fb_properties.get_depth_bits() > 0));
-
-  _wcontext._presentation_params.EnableAutoDepthStencil = bNeedZBuffer;
-
-  D3DFORMAT pixFmt = D3DFMT_UNKNOWN;
-
-  if (is_fullscreen()) {
-    bool bCouldntFindValidZBuf;
-    dxpipe->search_for_valid_displaymode(_wcontext, dwRenderWidth, dwRenderHeight,
-                                         bNeedZBuffer, bWantStencil,
-                                         &_wcontext._supported_screen_depths_mask,
-                                         &bCouldntFindValidZBuf,
-                                         &pixFmt, dx_force_16bpp_zbuffer);
-    
-    // note I'm not saving refresh rate, will just use adapter
-    // default at given res for now
-    
-    if (pixFmt == D3DFMT_UNKNOWN) {
-      wdxdisplay8_cat.error()
-        << (bCouldntFindValidZBuf ? "Couldnt find valid zbuffer format to go with FullScreen mode" : "No supported FullScreen modes")
-        << " at " << dwRenderWidth << "x" << dwRenderHeight << " for device #" << _wcontext._card_id << endl;
-      
-      // run it again in verbose mode to get more dbg info to log
-      dxpipe->search_for_valid_displaymode(_wcontext, dwRenderWidth, dwRenderHeight,
-                                           bNeedZBuffer, bWantStencil,
-                                           &_wcontext._supported_screen_depths_mask,
-                                           &bCouldntFindValidZBuf,
-                                           &pixFmt, dx_force_16bpp_zbuffer, true);
-      
-      // if still D3DFMT_UNKNOWN return false
-      if (pixFmt == D3DFMT_UNKNOWN)
-        return false;
-    }
-  } else {
-    // Windowed Mode
-
-    D3DDISPLAYMODE dispmode;
-    hr = _d3d8->GetAdapterDisplayMode(device_info->cardID, &dispmode);
-    if (FAILED(hr)) {
-      wdxdisplay8_cat.error()
-        << "GetAdapterDisplayMode(" << device_info->cardID
-        << ") failed" << D3DERRORSTRING(hr);
-      return false;
-    }
-    pixFmt = dispmode.Format;
-  }
-
-  _wcontext._display_mode.Width = dwRenderWidth;
-  _wcontext._display_mode.Height = dwRenderHeight;
-  _wcontext._display_mode.Format = pixFmt;
-  _wcontext._display_mode.RefreshRate = D3DPRESENT_RATE_DEFAULT;
-  _wcontext._monitor = device_info->_monitor;
-
-  if (dwRenderWidth != properties.get_x_size() ||
-      dwRenderHeight != properties.get_y_size()) {
-    // This is probably not the best place to put this; I'm just
-    // putting it here for now because the code above might have
-    // changed the size of the window unexpectedly.  This code gets
-    // called when make_gsg() is called, which means it is called in
-    // the draw thread, but this method should really be called from
-    // the window thread.  In DirectX those may always be the same
-    // threads anyway, so we may be all right.  Still, it's a little
-    // strange that the window may change size after it has already
-    // been opened, at the time we create the GSG for it; it would be
-    // better if we could find a way to do this resolution-selection
-    // logic earlier, say at the time the window is created.
-    system_changed_size(dwRenderWidth, dwRenderHeight);
-    WindowProperties resized_props;
-    resized_props.set_size(dwRenderWidth, dwRenderHeight);
-    _properties.add_properties(resized_props);
-  }
-
-  return true;
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: wdxGraphicsWindow8::reset_device_resize_window
-//       Access: Private
-//  Description: Called after a window (either fullscreen or windowed)
-//               has been resized, this recreates the D3D structures
-//               to match the new size.
-////////////////////////////////////////////////////////////////////
-bool wdxGraphicsWindow8::
-reset_device_resize_window(UINT new_xsize, UINT new_ysize) {
-  nassertr((new_xsize > 0) && (new_ysize > 0), false);
-  bool retval = true;
-
-  DXScreenData *screen = NULL;
-  D3DPRESENT_PARAMETERS d3dpp;
-  memcpy(&d3dpp, &_wcontext._presentation_params, sizeof(D3DPRESENT_PARAMETERS));
-  _wcontext._presentation_params.BackBufferWidth = new_xsize;
-  _wcontext._presentation_params.BackBufferHeight = new_ysize;
-  make_current();
-  HRESULT hr = _dxgsg->reset_d3d_device(&_wcontext._presentation_params, &screen);
-
-  if (FAILED(hr)) {
-    retval = false;
-    wdxdisplay8_cat.error()
-      << "reset_device_resize_window Reset() failed" << D3DERRORSTRING(hr);
-    if (hr == D3DERR_OUTOFVIDEOMEMORY) {
-      memcpy(&_wcontext._presentation_params, &d3dpp, sizeof(D3DPRESENT_PARAMETERS));
-      hr = _dxgsg->reset_d3d_device(&_wcontext._presentation_params, &screen);
-      if (FAILED(hr)) {
-        wdxdisplay8_cat.error()
-          << "reset_device_resize_window Reset() failed OutOfVidmem, then failed again doing Reset w/original params:" << D3DERRORSTRING(hr);
-        throw_event("panda3d-render-error");
-        return false;
-
-      } else {
-        if (wdxdisplay8_cat.is_info()) {
-          wdxdisplay8_cat.info()
-            << "reset of original size (" << _wcontext._presentation_params.BackBufferWidth
-            << ", " << _wcontext._presentation_params.BackBufferHeight << ") succeeded\n";
-        }
-      }
-    } else {
-      wdxdisplay8_cat.fatal()
-        << "Can't reset device, bailing out.\n";
-      throw_event("panda3d-render-error");
-      return false;
-    }
-  }
-  // before you init_resized_window you need to copy certain changes to _wcontext
-  if (screen) {
-    _wcontext._swap_chain = screen->_swap_chain;
-  }
-  wdxdisplay8_cat.debug() << "swapchain is " << _wcontext._swap_chain << "\n";
-  _gsg->mark_new();
-  init_resized_window();
-  return retval;
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: wdxGraphicsWindow8::init_resized_window
-//       Access: Private
-//  Description: Reinitializes the window after it has been resized,
-//               or after it is first created.
-//
-//               Assumes CreateDevice or Device->Reset() has just been
-//               called, and the new size is specified in
-//               _wcontext._presentation_params.
-////////////////////////////////////////////////////////////////////
-void wdxGraphicsWindow8::
-init_resized_window() {
-  HRESULT hr;
-
-  DWORD newWidth = _wcontext._presentation_params.BackBufferWidth;
-  DWORD newHeight = _wcontext._presentation_params.BackBufferHeight;
-
-  nassertv((newWidth != 0) && (newHeight != 0));
-  nassertv(_wcontext._window != NULL);
-
-  if (_wcontext._presentation_params.Windowed) {
-    POINT ul, lr;
-    RECT client_rect;
-
-    // need to figure out x, y origin offset of window client area on screen
-    // (we already know the client area size)
-
-    GetClientRect(_wcontext._window, &client_rect);
-    ul.x = client_rect.left;
-    ul.y = client_rect.top;
-    lr.x = client_rect.right;
-    lr.y = client_rect.bottom;
-    ClientToScreen(_wcontext._window, &ul);
-    ClientToScreen(_wcontext._window, &lr);
-    client_rect.left = ul.x;
-    client_rect.top = ul.y;
-    client_rect.right = lr.x;
-    client_rect.bottom = lr.y;
-  }
-
-  // clear window to black ASAP
-  nassertv(_wcontext._window != NULL);
-  ClearToBlack(_wcontext._window, get_properties());
-
-  // clear textures and VB's out of video&AGP mem, so cache is reset
-  hr = _wcontext._d3d_device->ResourceManagerDiscardBytes(0);
-  if (FAILED(hr)) {
-    wdxdisplay8_cat.error()
-      << "ResourceManagerDiscardBytes failed for device #"
-      << _wcontext._card_id << D3DERRORSTRING(hr);
-  }
-
-  make_current();
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: wdxGraphicsWindow8::D3DFMT_to_DepthBits
-//       Access: Private, Static
-//  Description: Returns the number of depth bits represented by the
-//               indicated D3DFORMAT value.
-////////////////////////////////////////////////////////////////////
-int wdxGraphicsWindow8::
-D3DFMT_to_DepthBits(D3DFORMAT fmt) {
-  switch(fmt) {
-  case D3DFMT_D16:
-    return 16;
-
-  case D3DFMT_D24X8:
-  case D3DFMT_D24X4S4:
-  case D3DFMT_D24S8:
-    return 24;
-
-  case D3DFMT_D32:
-    return 32;
-
-  case D3DFMT_D15S1:
-    return 15;
-
-  default:
-    wdxdisplay8_cat.debug()
-      << "D3DFMT_DepthBits: unhandled D3DFMT!\n";
-    return 0;
-  }
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: wdxGraphicsWindow8::is_badvidmem_card
-//       Access: Private, Static
-//  Description: Returns true if the indicated video adapter card is
-//               known to report an inaccurate figure for available
-//               video memory.
-////////////////////////////////////////////////////////////////////
-bool wdxGraphicsWindow8::
-is_badvidmem_card(D3DADAPTER_IDENTIFIER8 *pDevID) {
-  // don't trust Intel cards since they often use regular memory as vidmem
-  if (pDevID->VendorId == 0x00008086) {
-    return true;
-  }
-
-  return false;
-}
diff --git a/panda/src/dxgsg8/wdxGraphicsWindow8.h b/panda/src/dxgsg8/wdxGraphicsWindow8.h
deleted file mode 100644
index a9d080dd61..0000000000
--- a/panda/src/dxgsg8/wdxGraphicsWindow8.h
+++ /dev/null
@@ -1,108 +0,0 @@
-// Filename: wdxGraphicsWindow8.h
-// Created by:  mike (09Jan97)
-//
-////////////////////////////////////////////////////////////////////
-//
-// 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 WDXGRAPHICSWINDOW8_H
-#define WDXGRAPHICSWINDOW8_H
-
-#include "pandabase.h"
-#include "winGraphicsWindow.h"
-#include "dxGraphicsStateGuardian8.h"
-#include "dxInput8.h"
-#include "wdxGraphicsPipe8.h"
-
-class wdxGraphicsPipe8;
-
-////////////////////////////////////////////////////////////////////
-//       Class : wdxGraphicsWindow8
-// Description : A single graphics window for rendering DirectX under
-//               Microsoft Windows.
-////////////////////////////////////////////////////////////////////
-class EXPCL_PANDADX wdxGraphicsWindow8 : public WinGraphicsWindow {
-public:
-  wdxGraphicsWindow8(GraphicsEngine *engine, GraphicsPipe *pipe,
-                     const string &name,
-                     const FrameBufferProperties &fb_prop,
-                     const WindowProperties &win_prop,
-                     int flags,
-                     GraphicsStateGuardian *gsg,
-                     GraphicsOutput *host);
-  virtual ~wdxGraphicsWindow8();
-
-  virtual bool begin_frame(FrameMode mode, Thread *current_thread);
-  virtual void end_frame(FrameMode mode, Thread *current_thread);
-  virtual void end_flip();
-
-  virtual int verify_window_sizes(int numsizes, int *dimen);
-
-protected:
-  virtual void close_window();
-  virtual bool open_window();
-  virtual void reset_window(bool swapchain);
-
-  virtual void fullscreen_restored(WindowProperties &properties);
-  virtual void handle_reshape();
-  virtual bool do_fullscreen_resize(int x_size, int y_size);
-
-private:
-  struct DXDeviceInfo {
-    UINT cardID;
-    char szDriver[MAX_DEVICE_IDENTIFIER_STRING];
-    char szDescription[MAX_DEVICE_IDENTIFIER_STRING];
-    GUID guidDeviceIdentifier;
-    DWORD VendorID, DeviceID;
-    HMONITOR _monitor;
-  };
-  typedef pvector<DXDeviceInfo> DXDeviceInfoVec;
-
-  bool create_screen_buffers_and_device(DXScreenData &display,
-                                        bool force_16bpp_zbuffer);
-
-  bool choose_device();
-  bool search_for_device(wdxGraphicsPipe8 *dxpipe, DXDeviceInfo *device_info);
-
-  bool reset_device_resize_window(UINT new_xsize, UINT new_ysize);
-  void init_resized_window();
-  void make_current();
-  static int D3DFMT_to_DepthBits(D3DFORMAT fmt);
-  static bool is_badvidmem_card(D3DADAPTER_IDENTIFIER8 *pDevID);
-
-  DXGraphicsStateGuardian8 *_dxgsg;
-  DXScreenData _wcontext;
-
-  int _depth_buffer_bpp;
-  bool _awaiting_restore;
-
-public:
-  static TypeHandle get_class_type() {
-    return _type_handle;
-  }
-  static void init_type() {
-    WinGraphicsWindow::init_type();
-    register_type(_type_handle, "wdxGraphicsWindow8",
-                  WinGraphicsWindow::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;
-  friend class wdxGraphicsPipe8;
-};
-
-
-#include "wdxGraphicsWindow8.I"
-
-#endif
diff --git a/panda/src/dxgsg9/dxGraphicsStateGuardian9.cxx b/panda/src/dxgsg9/dxGraphicsStateGuardian9.cxx
index 228d57db99..cafc199a95 100755
--- a/panda/src/dxgsg9/dxGraphicsStateGuardian9.cxx
+++ b/panda/src/dxgsg9/dxGraphicsStateGuardian9.cxx
@@ -84,7 +84,9 @@ D3DMATRIX DXGraphicsStateGuardian9::_d3d_ident_mat;
 unsigned char *DXGraphicsStateGuardian9::_temp_buffer = NULL;
 unsigned char *DXGraphicsStateGuardian9::_safe_buffer_start = NULL;
 
+#ifdef HAVE_CG
 LPDIRECT3DDEVICE9 DXGraphicsStateGuardian9::_cg_device = NULL;
+#endif
 
 #define __D3DLIGHT_RANGE_MAX ((PN_stdfloat)sqrt(FLT_MAX))  //for some reason this is missing in dx9 hdrs
 
@@ -150,6 +152,10 @@ DXGraphicsStateGuardian9(GraphicsEngine *engine, GraphicsPipe *pipe) :
 
   _supports_stream_offset = false;
 
+#ifdef HAVE_CG
+  _cg_context = 0;
+#endif
+
   get_gamma_table();
   atexit (atexit_function);
 }
@@ -2372,6 +2378,8 @@ reset() {
 #ifdef HAVE_CG
   set_cg_device(_d3d_device);
 
+  _cg_context = cgCreateContext();
+
   if (cgD3D9IsProfileSupported(CG_PROFILE_PS_2_0) &&
       cgD3D9IsProfileSupported(CG_PROFILE_VS_2_0)) {
     _supports_basic_shaders = true;
@@ -2388,7 +2396,6 @@ reset() {
   }
 
   if (dxgsg9_cat.is_debug()) {
-
     CGprofile vertex_profile;
     CGprofile pixel_profile;
 
@@ -2408,8 +2415,8 @@ reset() {
     }
 
     dxgsg9_cat.debug()
-      << "\nCg vertex profile = " << vertex_profile_str << "  id = " << vertex_profile
-      << "\nCg pixel profile = " << pixel_profile_str << "  id = " << pixel_profile
+      << "\nCg latest vertex profile = " << vertex_profile_str << "  id = " << vertex_profile
+      << "\nCg latest pixel profile = " << pixel_profile_str << "  id = " << pixel_profile
       << "\nshader model = " << _shader_model
       << "\n";
   }
@@ -3194,16 +3201,6 @@ set_state_and_transform(const RenderState *target,
   _target_rs = target;
 
   _target_shader = DCAST(ShaderAttrib, _target_rs->get_attrib_def(ShaderAttrib::get_class_slot()));
-  if (_target_shader->auto_shader()) {
-    // If we don't have a generated shader, make sure we have a ShaderGenerator, then generate the shader.
-    if (_target_rs->_generated_shader == NULL) {
-      if (_shader_generator == NULL) {
-        _shader_generator = new ShaderGenerator(this, _scene_setup->get_display_region()->get_window());
-      }
-      const_cast<RenderState*>(_target_rs.p())->_generated_shader = DCAST(ShaderAttrib, _shader_generator->synthesize_shader(_target_rs));
-    }
-    _target_shader = DCAST(ShaderAttrib, _target_rs->_generated_shader);
-  }
 
   int alpha_test_slot = AlphaTestAttrib::get_class_slot();
   if (_target_rs->get_attrib(alpha_test_slot) != _state_rs->get_attrib(alpha_test_slot) ||
@@ -3751,7 +3748,7 @@ update_standard_texture_bindings() {
 
     switch (mode) {
     case TexGenAttrib::M_off:
-    case TexGenAttrib::M_light_vector:
+    case TexGenAttrib::M_unused2:
       set_texture_stage_state(si, D3DTSS_TEXCOORDINDEX, texcoord_index);
       break;
 
@@ -4162,6 +4159,12 @@ close_gsg() {
 ////////////////////////////////////////////////////////////////////
 void DXGraphicsStateGuardian9::
 free_nondx_resources() {
+#ifdef HAVE_CG
+  if (_cg_context) {
+    cgDestroyContext(_cg_context);
+    _cg_context = 0;
+  }
+#endif
 }
 
 ////////////////////////////////////////////////////////////////////
@@ -5638,9 +5641,6 @@ set_cg_device(LPDIRECT3DDEVICE9 cg_device) {
 #endif // HAVE_CG
 }
 
-
-
-
 typedef string KEY;
 
 typedef struct _KEY_ELEMENT
diff --git a/panda/src/dxgsg9/dxGraphicsStateGuardian9.h b/panda/src/dxgsg9/dxGraphicsStateGuardian9.h
index caa8e91769..ac242d7ff2 100755
--- a/panda/src/dxgsg9/dxGraphicsStateGuardian9.h
+++ b/panda/src/dxgsg9/dxGraphicsStateGuardian9.h
@@ -377,7 +377,10 @@ protected:
 
   int _supports_gamma_calibration;
 
+#ifdef HAVE_CG
+  CGcontext _cg_context;
   static LPDIRECT3DDEVICE9 _cg_device;
+#endif
 
 public:
   virtual TypeHandle get_type() const {
diff --git a/panda/src/dxgsg9/dxShaderContext9.I b/panda/src/dxgsg9/dxShaderContext9.I
index 72794f752d..0eced1b511 100644
--- a/panda/src/dxgsg9/dxShaderContext9.I
+++ b/panda/src/dxgsg9/dxShaderContext9.I
@@ -12,6 +12,7 @@
 //
 ////////////////////////////////////////////////////////////////////
 
+
 ////////////////////////////////////////////////////////////////////
 //     Function: DXShaderContext9::valid
 //       Access: Public
@@ -22,12 +23,10 @@
 //               or if no shader languages are compiled into panda.
 ////////////////////////////////////////////////////////////////////
 INLINE bool CLP(ShaderContext)::
-valid (GSG *gsg) {
+valid(GSG *gsg) {
 #ifdef HAVE_CG
-  if (_cg_context) {
-    return true;
-  }
-#endif
+  return (_cg_program != 0);
+#else
   return false;
+#endif
 }
-
diff --git a/panda/src/dxgsg9/dxShaderContext9.cxx b/panda/src/dxgsg9/dxShaderContext9.cxx
index 426e31a366..0e86d46c16 100644
--- a/panda/src/dxgsg9/dxShaderContext9.cxx
+++ b/panda/src/dxgsg9/dxShaderContext9.cxx
@@ -22,8 +22,9 @@
 #include <fcntl.h>
 #include <sys/types.h>
 #include <sys/stat.h>
+
 #ifdef HAVE_CG
-#include "Cg/cgD3D9.h"
+#include <Cg/cgD3D9.h>
 #endif
 
 #define DEBUG_SHADER 0
@@ -37,89 +38,42 @@ TypeHandle CLP(ShaderContext)::_type_handle;
 ////////////////////////////////////////////////////////////////////
 CLP(ShaderContext)::
 CLP(ShaderContext)(Shader *s, GSG *gsg) : ShaderContext(s) {
-
   _vertex_element_array = NULL;
   _vertex_declaration = NULL;
 
   _num_bound_streams = 0;
 
-  _name = s->get_filename ( );
+  _name = s->get_filename();
 
 #ifdef HAVE_CG
-  _cg_context = 0;
+  CGcontext context = DCAST(DXGraphicsStateGuardian9, gsg)->_cg_context;
+
   if (s->get_language() == Shader::SL_Cg) {
 
     // Ask the shader to compile itself for us and
     // to give us the resulting Cg program objects.
-
-    if (!s->cg_compile_for(gsg->_shader_caps,
-                           _cg_context,
-                           _cg_vprogram,
-                           _cg_fprogram,
-                           _cg_gprogram,        // CG2 CHANGE
-                           _cg_parameter_map)) {
+    if (!s->cg_compile_for(gsg->_shader_caps, context,
+                           _cg_program, _cg_parameter_map)) {
       return;
     }
 
     // Load the program.
-
-    BOOL paramater_shadowing;
-    DWORD assembly_flags;
-
-    paramater_shadowing = FALSE;
-    assembly_flags = 0;
-
+    DWORD assembly_flags = 0;
 #if DEBUG_SHADER
     assembly_flags |= D3DXSHADER_DEBUG;
 #endif
 
     HRESULT hr;
     bool success = true;
-    hr = cgD3D9LoadProgram(_cg_vprogram, paramater_shadowing, assembly_flags);
+    hr = cgD3D9LoadProgram(_cg_program, FALSE, assembly_flags);
     if (FAILED (hr)) {
       dxgsg9_cat.error()
-        << "vertex shader cgD3D9LoadProgram failed "
-        << D3DERRORSTRING(hr);
+        << "cgD3D9LoadProgram failed " << D3DERRORSTRING(hr);
 
       CGerror error = cgGetError();
       if (error != CG_NO_ERROR) {
         dxgsg9_cat.error() << "  CG ERROR: " << cgGetErrorString(error) << "\n";
       }
-      success = false;
-    }
-
-    hr = cgD3D9LoadProgram(_cg_fprogram, paramater_shadowing, assembly_flags);
-    if (FAILED (hr)) {
-      dxgsg9_cat.error()
-        << "pixel shader cgD3D9LoadProgram failed "
-        << D3DERRORSTRING(hr);
-
-      CGerror error = cgGetError();
-      if (error != CG_NO_ERROR) {
-        dxgsg9_cat.error() << "  CG ERROR: " << cgGetErrorString(error) << "\n";
-      }
-      success = false;
-    }
-
-    // BEGIN CG2 CHANGE
-    if (_cg_gprogram != 0)
-    {
-        hr = cgD3D9LoadProgram(_cg_gprogram, paramater_shadowing, assembly_flags);
-        if (FAILED (hr)) {
-          dxgsg9_cat.error()
-            << "geometry shader cgD3D9LoadProgram failed "
-            << D3DERRORSTRING(hr);
-
-          CGerror error = cgGetError();
-          if (error != CG_NO_ERROR) {
-            dxgsg9_cat.error() << "  CG ERROR: " << cgGetErrorString(error) << "\n";
-          }
-          success = false;
-        }
-    }
-    // END CG2 CHANGE
-
-    if (!success) {
       release_resources();
     }
   }
@@ -203,12 +157,9 @@ CLP(ShaderContext)::
 void CLP(ShaderContext)::
 release_resources() {
 #ifdef HAVE_CG
-  if (_cg_context) {
-    cgDestroyContext(_cg_context);
-    _cg_context = 0;
-    _cg_vprogram = 0;
-    _cg_fprogram = 0;
-    _cg_gprogram = 0;   // CG2 CHANGE
+  if (_cg_program) {
+    cgDestroyProgram(_cg_program);
+    _cg_program = 0;
     _cg_parameter_map.clear();
   }
 #endif
@@ -228,11 +179,10 @@ release_resources() {
 bool CLP(ShaderContext)::
 bind(GSG *gsg) {
 
-  bool bind_state;
+  bool bind_state = false;
 
-  bind_state = false;
 #ifdef HAVE_CG
-  if (_cg_context) {
+  if (_cg_program) {
     // clear the last cached FVF to make sure the next SetFVF call goes through
 
     gsg -> _last_fvf = 0;
@@ -244,9 +194,9 @@ bind(GSG *gsg) {
 
     // Bind the shaders.
     bind_state = true;
-    hr = cgD3D9BindProgram(_cg_vprogram);
+    hr = cgD3D9BindProgram(_cg_program);
     if (FAILED (hr)) {
-      dxgsg9_cat.error() << "cgD3D9BindProgram vertex shader failed " << D3DERRORSTRING(hr);
+      dxgsg9_cat.error() << "cgD3D9BindProgram failed " << D3DERRORSTRING(hr);
 
       CGerror error = cgGetError();
       if (error != CG_NO_ERROR) {
@@ -255,34 +205,6 @@ bind(GSG *gsg) {
 
       bind_state = false;
     }
-    hr = cgD3D9BindProgram(_cg_fprogram);
-    if (FAILED (hr)) {
-      dxgsg9_cat.error() << "cgD3D9BindProgram pixel shader failed " << D3DERRORSTRING(hr);
-
-      CGerror error = cgGetError();
-      if (error != CG_NO_ERROR) {
-        dxgsg9_cat.error() << "  CG ERROR: " << cgGetErrorString(error) << "\n";
-      }
-
-      bind_state = false;
-    }
-
-    // BEGIN CG2 CHANGE
-    if (_cg_gprogram != 0)
-    {
-        hr = cgD3D9BindProgram(_cg_gprogram);
-        if (FAILED (hr)) {
-          dxgsg9_cat.error() << "cgD3D9BindProgram geometry shader failed " << D3DERRORSTRING(hr);
-
-          CGerror error = cgGetError();
-          if (error != CG_NO_ERROR) {
-            dxgsg9_cat.error() << "  CG ERROR: " << cgGetErrorString(error) << "\n";
-          }
-
-          bind_state = false;
-        }
-    }
-    // END CG2 CHANGE
   }
 #endif
 
@@ -298,18 +220,12 @@ void CLP(ShaderContext)::
 unbind(GSG *gsg) {
 
 #ifdef HAVE_CG
-  if (_cg_context) {
+  if (_cg_program) {
     HRESULT hr;
-
-    hr = gsg -> _d3d_device -> SetVertexShader (NULL);
-    if (FAILED (hr)) {
+    hr = cgD3D9UnbindProgram(_cg_program);
+    if (FAILED(hr)) {
       dxgsg9_cat.error()
-        << "SetVertexShader (NULL) failed " << D3DERRORSTRING(hr);
-    }
-    hr = gsg -> _d3d_device -> SetPixelShader (NULL);
-    if (FAILED (hr)) {
-      dxgsg9_cat.error()
-        << "SetPixelShader (NULL) failed " << D3DERRORSTRING(hr);
+        << "cgD3D9UnbindProgram failed " << D3DERRORSTRING(hr);
     }
   }
 #endif
@@ -339,10 +255,9 @@ InternalName *global_internal_name_1 = 0;
 #endif
 
 void CLP(ShaderContext)::
-issue_parameters(GSG *gsg, int altered)
-{
+issue_parameters(GSG *gsg, int altered) {
 #ifdef HAVE_CG
-  if (_cg_context) {
+  if (_cg_program) {
 
   // Iterate through _ptr parameters
     for (int i=0; i<(int)_shader->_ptr_spec.size(); i++) {
@@ -510,7 +425,7 @@ bool CLP(ShaderContext)::
 update_shader_vertex_arrays(CLP(ShaderContext) *prev, GSG *gsg, bool force) {
   if (prev) prev->disable_shader_vertex_arrays(gsg);
 #ifdef HAVE_CG
-  if (!_cg_context) {
+  if (!_cg_program) {
     return true;
   }
 
@@ -717,11 +632,11 @@ update_shader_vertex_arrays(CLP(ShaderContext) *prev, GSG *gsg, bool force) {
 
     if (( _vertex_element_array != NULL ) &&
         ( _vertex_element_array->add_end_vertex_element() != false )) {
-      if ( dxgsg9_cat.is_debug() ) {
+      if (dxgsg9_cat.is_debug()) {
         // Note that the currently generated vertex declaration works but never validates.
         // My theory is that this is due to the shader programs always using float4 whereas
         // the vertex declaration correctly sets the number of inputs (float2, float3, etc.).
-        if (cgD3D9ValidateVertexDeclaration(_cg_vprogram,
+        if (cgD3D9ValidateVertexDeclaration(_cg_program,
                                             _vertex_element_array->_vertex_element_array) == CG_TRUE) {
           dxgsg9_cat.debug() << "cgD3D9ValidateVertexDeclaration succeeded\n";
         } else {
@@ -763,7 +678,7 @@ void CLP(ShaderContext)::
 disable_shader_texture_bindings(GSG *gsg)
 {
 #ifdef HAVE_CG
-  if (_cg_context) {
+  if (_cg_program) {
     for (int i=0; i<(int)_shader->_tex_spec.size(); i++) {
       CGparameter p = _cg_parameter_map[_shader->_tex_spec[i]._id._seqno];
       if (p == NULL) {
@@ -803,7 +718,7 @@ update_shader_texture_bindings(CLP(ShaderContext) *prev, GSG *gsg)
   if (prev) prev->disable_shader_texture_bindings(gsg);
 
 #ifdef HAVE_CG
-  if (_cg_context) {
+  if (_cg_program) {
 
     for (int i=0; i<(int)_shader->_tex_spec.size(); i++) {
       CGparameter p = _cg_parameter_map[_shader->_tex_spec[i]._id._seqno];
diff --git a/panda/src/dxgsg9/dxShaderContext9.h b/panda/src/dxgsg9/dxShaderContext9.h
index 41424f38db..c680443268 100644
--- a/panda/src/dxgsg9/dxShaderContext9.h
+++ b/panda/src/dxgsg9/dxShaderContext9.h
@@ -22,11 +22,9 @@
 #include "shader.h"
 #include "shaderContext.h"
 
-
 #define CLP(name) DX##name##9
 #define CLASSPREFIX_QUOTED "DX"
 
-
 class VertexElementArray;
 class CLP(GraphicsStateGuardian);
 
@@ -41,7 +39,7 @@ class CLP(GraphicsStateGuardian);
 //   D3DXCONSTANT_DESC *constant_description_array;
 // }
 // DX_PARAMETER;
-// 
+//
 // typedef struct
 // {
 //   int state;
@@ -52,7 +50,7 @@ class CLP(GraphicsStateGuardian);
 //   };
 //   LPD3DXCONSTANTTABLE constant_table;
 //   D3DXCONSTANTTABLE_DESC constant_table_description;
-// 
+//
 //   int total_semantics;
 //   D3DXSEMANTIC *semantic_array;
 // }
@@ -62,11 +60,10 @@ class CLP(GraphicsStateGuardian);
 //       Class : DXShaderContext9
 // Description : xyz
 ////////////////////////////////////////////////////////////////////
-
-class EXPCL_PANDADX CLP(ShaderContext): public ShaderContext {
+class EXPCL_PANDADX CLP(ShaderContext) : public ShaderContext {
 public:
   typedef CLP(GraphicsStateGuardian) GSG;
-  
+
   CLP(ShaderContext)(Shader *s, GSG *gsg);
   ~CLP(ShaderContext)();
 
@@ -88,23 +85,14 @@ public:
 
   // FOR DEBUGGING
   string _name;
-  
+
 private:
-
 #ifdef HAVE_CG
-  CGcontext _cg_context;
-  CGprogram _cg_vprogram;
-  CGprogram _cg_fprogram;
-
-  // BEGIN CG2 CHANGE
-  CGprogram _cg_gprogram;   // Geometry program
-  // END CG2 CHANGE
-
+  CGprogram _cg_program;
   pvector <CGparameter> _cg_parameter_map;
 #endif
 
 private:
-
   void release_resources(void);
 
 public:
diff --git a/panda/src/dxgsg9/dxgsg9base.h b/panda/src/dxgsg9/dxgsg9base.h
index a31730b47e..9c00e41816 100755
--- a/panda/src/dxgsg9/dxgsg9base.h
+++ b/panda/src/dxgsg9/dxgsg9base.h
@@ -19,7 +19,9 @@
 #include "graphicsWindow.h"
 #include "pmap.h"
 
-#define WIN32_LEAN_AND_MEAN   // get rid of mfc win32 hdr stuff
+#ifndef WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN 1  // get rid of mfc win32 hdr stuff
+#endif
 #ifndef STRICT
 // enable strict type checking in windows.h, see msdn
 #define STRICT
diff --git a/panda/src/dxml/config_dxml.h b/panda/src/dxml/config_dxml.h
index 5e78df63a6..8a08d45ad4 100755
--- a/panda/src/dxml/config_dxml.h
+++ b/panda/src/dxml/config_dxml.h
@@ -36,10 +36,10 @@ extern EXPCL_PANDA void init_libdxml();
 class TiXmlDocument;
 class TiXmlNode;
 BEGIN_PUBLISH
-TiXmlDocument *read_xml_stream(istream &in);
-void write_xml_stream(ostream &out, TiXmlDocument *doc);
-void print_xml(TiXmlNode *xnode);
-void print_xml_to_file(const Filename &filename, TiXmlNode *xnode);
+EXPCL_PANDA TiXmlDocument *read_xml_stream(istream &in);
+EXPCL_PANDA void write_xml_stream(ostream &out, TiXmlDocument *doc);
+EXPCL_PANDA void print_xml(TiXmlNode *xnode);
+EXPCL_PANDA void print_xml_to_file(const Filename &filename, TiXmlNode *xnode);
 END_PUBLISH
 
 #endif
diff --git a/panda/src/dxml/tinyxml.h b/panda/src/dxml/tinyxml.h
index d80c5c4e37..562a4efc84 100644
--- a/panda/src/dxml/tinyxml.h
+++ b/panda/src/dxml/tinyxml.h
@@ -96,7 +96,7 @@ const int TIXML_PATCH_VERSION = 1;
 /*  Internal structure for tracking location of items 
     in the XML file.
 */
-struct TiXmlCursor
+struct EXPCL_PANDA TiXmlCursor
 {
     TiXmlCursor()       { Clear(); }
     void Clear()        { row = col = -1; }
@@ -125,7 +125,7 @@ struct TiXmlCursor
 
     @sa TiXmlNode::Accept()
 */
-class TiXmlVisitor
+class EXPCL_PANDA TiXmlVisitor
 {
 public:
     virtual ~TiXmlVisitor() {}
@@ -191,7 +191,7 @@ const TiXmlEncoding TIXML_DEFAULT_ENCODING = TIXML_ENCODING_UNKNOWN;
     A Decleration contains: Attributes (not on tree)
     @endverbatim
 */
-class TiXmlBase
+class EXPCL_PANDA TiXmlBase
 {
     friend class TiXmlNode;
     friend class TiXmlElement;
@@ -420,7 +420,7 @@ private:
     in a document, or stand on its own. The type of a TiXmlNode
     can be queried, and it can be cast to its more defined type.
 */
-class TiXmlNode : public TiXmlBase
+class EXPCL_PANDA TiXmlNode : public TiXmlBase
 {
     friend class TiXmlDocument;
     friend class TiXmlElement;
@@ -776,7 +776,7 @@ private:
           part of the tinyXML document object model. There are other
           suggested ways to look at this problem.
 */
-class TiXmlAttribute : public TiXmlBase
+class EXPCL_PANDA TiXmlAttribute : public TiXmlBase
 {
     friend class TiXmlAttributeSet;
 
@@ -900,7 +900,7 @@ private:
         - I like circular lists
         - it demonstrates some independence from the (typical) doubly linked list.
 */
-class TiXmlAttributeSet
+class EXPCL_PANDA TiXmlAttributeSet
 {
 public:
     TiXmlAttributeSet();
@@ -937,7 +937,7 @@ private:
     and can contain other elements, text, comments, and unknowns.
     Elements also contain an arbitrary number of attributes.
 */
-class TiXmlElement : public TiXmlNode
+class EXPCL_PANDA TiXmlElement : public TiXmlNode
 {
 public:
     /// Construct an element.
@@ -1152,7 +1152,7 @@ private:
 
 /** An XML comment.
 */
-class TiXmlComment : public TiXmlNode
+class EXPCL_PANDA TiXmlComment : public TiXmlNode
 {
 public:
     /// Constructs an empty comment.
@@ -1202,7 +1202,7 @@ private:
     you generally want to leave it alone, but you can change the output mode with 
     SetCDATA() and query it with CDATA().
 */
-class TiXmlText : public TiXmlNode
+class EXPCL_PANDA TiXmlText : public TiXmlNode
 {
     friend class TiXmlElement;
 public:
@@ -1275,7 +1275,7 @@ private:
     handled as special cases, not generic attributes, simply
     because there can only be at most 3 and they are always the same.
 */
-class TiXmlDeclaration : public TiXmlNode
+class EXPCL_PANDA TiXmlDeclaration : public TiXmlNode
 {
 public:
     /// Construct an empty declaration.
@@ -1344,7 +1344,7 @@ private:
 
     DTD tags get thrown into TiXmlUnknowns.
 */
-class TiXmlUnknown : public TiXmlNode
+class EXPCL_PANDA TiXmlUnknown : public TiXmlNode
 {
 public:
     TiXmlUnknown() : TiXmlNode( TiXmlNode::TINYXML_UNKNOWN )    {}
@@ -1383,7 +1383,7 @@ private:
     XML pieces. It can be saved, loaded, and printed to the screen.
     The 'value' of a document node is the xml file name.
 */
-class TiXmlDocument : public TiXmlNode
+class EXPCL_PANDA TiXmlDocument : public TiXmlNode
 {
 public:
     /// Create an empty document, that has no name.
@@ -1628,7 +1628,7 @@ private:
     }
     @endverbatim
 */
-class TiXmlHandle
+class EXPCL_PANDA TiXmlHandle
 {
 public:
     /// Create a handle from any node (at any depth of the tree.) This can be a null pointer.
@@ -1727,7 +1727,7 @@ private:
     fprintf( stdout, "%s", printer.CStr() );
     @endverbatim
 */
-class TiXmlPrinter : public TiXmlVisitor
+class EXPCL_PANDA TiXmlPrinter : public TiXmlVisitor
 {
 public:
     TiXmlPrinter() : depth( 0 ), simpleTextPrint( false ),
diff --git a/panda/src/egg/eggGroupNode_ext.cxx b/panda/src/egg/eggGroupNode_ext.cxx
index e554bb243c..92b343b972 100644
--- a/panda/src/egg/eggGroupNode_ext.cxx
+++ b/panda/src/egg/eggGroupNode_ext.cxx
@@ -17,7 +17,7 @@
 #ifdef HAVE_PYTHON
 
 #ifndef CPPPARSER
-IMPORT_THIS struct Dtool_PyTypedObject Dtool_EggNode;
+extern struct Dtool_PyTypedObject Dtool_EggNode;
 #endif
 
 ////////////////////////////////////////////////////////////////////
@@ -37,7 +37,7 @@ get_children() const {
   }
 
   // Fill in the list.
-  int i = 0;
+  size_t i = 0;
   for (it = _this->begin(); it != _this->end() && i < len; ++it) {
     EggNode *node = *it;
     node->ref();
diff --git a/panda/src/egg/eggVertex.cxx b/panda/src/egg/eggVertex.cxx
index 774c66ade8..d0d82502d3 100644
--- a/panda/src/egg/eggVertex.cxx
+++ b/panda/src/egg/eggVertex.cxx
@@ -398,6 +398,125 @@ clear_aux(const string &name) {
   _aux_map.erase(name);
 }
 
+////////////////////////////////////////////////////////////////////
+//     Function: EggVertex::make_average
+//       Access: Published, Static
+//  Description: Creates a new vertex that lies in between the two
+//               given vertices.  The attributes for the UV sets
+//               they have in common are averaged.
+//
+//               Both vertices need to be either in no pool, or in
+//               the same pool.  In the latter case, the new vertex
+//               will be placed in that pool.
+///////////////////////////////////////////////////////////////////
+PT(EggVertex) EggVertex::
+make_average(const EggVertex *first, const EggVertex *second) {
+  PT(EggVertexPool) pool = first->get_pool();
+  nassertr(pool == second->get_pool(), NULL);
+
+  // If both vertices are in a pool, the new vertex will be part of
+  // the pool as well.
+  PT(EggVertex) middle;
+  if (pool == NULL) {
+    middle = new EggVertex;
+  } else {
+    middle = pool->make_new_vertex();
+  }
+
+  middle->set_pos4((first->get_pos4() + second->get_pos4()) / 2);
+
+  if (first->has_normal() && second->has_normal()) {
+    LNormald normal = (first->get_normal() + second->get_normal()) / 2;
+    normal.normalize();
+    middle->set_normal(normal);
+  }
+  if (first->has_color() && second->has_color()) {
+    middle->set_color((first->get_color() + second->get_color()) / 2);
+  }
+
+  // Average out the EggVertexUV objects, but only for the UV sets
+  // that they have in common.
+  const_uv_iterator it;
+  for (it = first->uv_begin(); it != first->uv_end(); ++it) {
+    const EggVertexUV *first_uv = it->second;
+    const EggVertexUV *second_uv = second->get_uv_obj(it->first);
+
+    if (first_uv != NULL && second_uv != NULL) {
+      middle->set_uv_obj(EggVertexUV::make_average(first_uv, second_uv));
+    }
+  }
+
+  // Same for EggVertexAux.
+  const_aux_iterator ai;
+  for (ai = first->aux_begin(); ai != first->aux_end(); ++ai) {
+    const EggVertexAux *first_aux = ai->second;
+    const EggVertexAux *second_aux = second->get_aux_obj(ai->first);
+
+    if (first_aux != NULL && second_aux != NULL) {
+      middle->set_aux_obj(EggVertexAux::make_average(first_aux, second_aux));
+    }
+  }
+
+  // Now process the morph targets.
+  EggMorphVertexList::const_iterator vi, vi2;
+  for (vi = first->_dxyzs.begin(); vi != first->_dxyzs.end(); ++vi) {
+    for (vi2 = second->_dxyzs.begin(); vi2 != second->_dxyzs.end(); ++vi2) {
+      if (vi->get_name() == vi2->get_name()) {
+        middle->_dxyzs.insert(EggMorphVertex(vi->get_name(),
+                              (vi->get_offset() + vi2->get_offset()) / 2));
+        break;
+      }
+    }
+  }
+
+  EggMorphNormalList::const_iterator ni, ni2;
+  for (ni = first->_dxyzs.begin(); ni != first->_dxyzs.end(); ++ni) {
+    for (ni2 = second->_dxyzs.begin(); ni2 != second->_dxyzs.end(); ++ni2) {
+      if (ni->get_name() == ni2->get_name()) {
+        middle->_dnormals.insert(EggMorphNormal(ni->get_name(),
+                                 (ni->get_offset() + ni2->get_offset()) / 2));
+        break;
+      }
+    }
+  }
+
+  EggMorphColorList::const_iterator ci, ci2;
+  for (ci = first->_drgbas.begin(); ci != first->_drgbas.end(); ++ci) {
+    for (ci2 = second->_drgbas.begin(); ci2 != second->_drgbas.end(); ++ci2) {
+      if (ci->get_name() == ci2->get_name()) {
+        middle->_drgbas.insert(EggMorphColor(ci->get_name(),
+                               (ci->get_offset() + ci2->get_offset()) / 2));
+        break;
+      }
+    }
+  }
+
+  // Now merge the vertex memberships.
+  GroupRef::iterator gi;
+  for (gi = first->_gref.begin(); gi != first->_gref.end(); ++gi) {
+    EggGroup *group = *gi;
+    if (second->_gref.count(group)) {
+      group->set_vertex_membership(middle,
+        (group->get_vertex_membership(first) +
+         group->get_vertex_membership(second)) / 2.);
+    } else {
+      // Hmm, unfortunate, only one of the vertices is member of this
+      // group, so we can't make an average.  We'll have to assign the
+      // only group membership we have.
+      group->set_vertex_membership(middle, group->get_vertex_membership(first));
+    }
+  }
+  // Also assign memberships to the grefs in the second vertex that
+  // aren't part of the first vertex.
+  for (gi = second->_gref.begin(); gi != second->_gref.end(); ++gi) {
+    EggGroup *group = *gi;
+    if (second->_gref.count(group) == 0) {
+      group->set_vertex_membership(middle, group->get_vertex_membership(second));
+    }
+  }
+
+  return middle;
+}
 
 ///////////////////////////////////////////////////////////////////
 //       Class : GroupRefEntry
diff --git a/panda/src/egg/eggVertex.h b/panda/src/egg/eggVertex.h
index 88c434c997..e56036fec4 100644
--- a/panda/src/egg/eggVertex.h
+++ b/panda/src/egg/eggVertex.h
@@ -109,6 +109,9 @@ PUBLISHED:
   void set_aux_obj(EggVertexAux *vertex_aux);
   void clear_aux(const string &name);
 
+  static PT(EggVertex) make_average(const EggVertex *first,
+                                    const EggVertex *second);
+
 public:
   INLINE const_uv_iterator uv_begin() const;
   INLINE const_uv_iterator uv_end() const;
diff --git a/panda/src/egg/eggVertexAux.cxx b/panda/src/egg/eggVertexAux.cxx
index 15d5e748d7..9c6d91cc1b 100644
--- a/panda/src/egg/eggVertexAux.cxx
+++ b/panda/src/egg/eggVertexAux.cxx
@@ -22,7 +22,7 @@ TypeHandle EggVertexAux::_type_handle;
 ////////////////////////////////////////////////////////////////////
 //     Function: EggVertexAux::Constructor
 //       Access: Published
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 EggVertexAux::
 EggVertexAux(const string &name, const LVecBase4d &aux) :
@@ -34,7 +34,7 @@ EggVertexAux(const string &name, const LVecBase4d &aux) :
 ////////////////////////////////////////////////////////////////////
 //     Function: EggVertexAux::Copy Constructor
 //       Access: Published
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 EggVertexAux::
 EggVertexAux(const EggVertexAux &copy) :
@@ -46,7 +46,7 @@ EggVertexAux(const EggVertexAux &copy) :
 ////////////////////////////////////////////////////////////////////
 //     Function: EggVertexAux::Copy Assignment Operator
 //       Access: Published
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 EggVertexAux &EggVertexAux::
 operator = (const EggVertexAux &copy) {
@@ -59,16 +59,31 @@ operator = (const EggVertexAux &copy) {
 ////////////////////////////////////////////////////////////////////
 //     Function: EggVertexAux::Destructor
 //       Access: Published, Virtual
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 EggVertexAux::
 ~EggVertexAux() {
 }
 
+////////////////////////////////////////////////////////////////////
+//     Function: EggVertexAux::make_average
+//       Access: Published, Static
+//  Description: Creates a new EggVertexAux that contains the
+//               averaged values of the two given objects.  It is
+//               an error if they don't have the same name.
+///////////////////////////////////////////////////////////////////
+PT(EggVertexAux) EggVertexAux::
+make_average(const EggVertexAux *first, const EggVertexAux *second) {
+  nassertr(first->get_name() == second->get_name(), NULL);
+
+  LVecBase4d aux = (first->_aux + second->_aux) / 2;
+  return new EggVertexAux(first->get_name(), aux);
+}
+
 ////////////////////////////////////////////////////////////////////
 //     Function: EggVertexAux::write
 //       Access: Public
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 void EggVertexAux::
 write(ostream &out, int indent_level) const {
diff --git a/panda/src/egg/eggVertexAux.h b/panda/src/egg/eggVertexAux.h
index 082795c86b..7d3aac7483 100644
--- a/panda/src/egg/eggVertexAux.h
+++ b/panda/src/egg/eggVertexAux.h
@@ -42,6 +42,9 @@ PUBLISHED:
   INLINE const LVecBase4d &get_aux() const;
   INLINE void set_aux(const LVecBase4d &aux);
 
+  static PT(EggVertexAux) make_average(const EggVertexAux *first,
+                                       const EggVertexAux *second);
+
   void write(ostream &out, int indent_level) const;
   int compare_to(const EggVertexAux &other) const;
 
diff --git a/panda/src/egg/eggVertexUV.cxx b/panda/src/egg/eggVertexUV.cxx
index 387ba33f13..cb0a6961cc 100755
--- a/panda/src/egg/eggVertexUV.cxx
+++ b/panda/src/egg/eggVertexUV.cxx
@@ -22,7 +22,7 @@ TypeHandle EggVertexUV::_type_handle;
 ////////////////////////////////////////////////////////////////////
 //     Function: EggVertexUV::Constructor
 //       Access: Published
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 EggVertexUV::
 EggVertexUV(const string &name, const LTexCoordd &uv) :
@@ -38,7 +38,7 @@ EggVertexUV(const string &name, const LTexCoordd &uv) :
 ////////////////////////////////////////////////////////////////////
 //     Function: EggVertexUV::Constructor
 //       Access: Published
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 EggVertexUV::
 EggVertexUV(const string &name, const LTexCoord3d &uvw) :
@@ -54,7 +54,7 @@ EggVertexUV(const string &name, const LTexCoord3d &uvw) :
 ////////////////////////////////////////////////////////////////////
 //     Function: EggVertexUV::Copy Constructor
 //       Access: Published
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 EggVertexUV::
 EggVertexUV(const EggVertexUV &copy) :
@@ -70,7 +70,7 @@ EggVertexUV(const EggVertexUV &copy) :
 ////////////////////////////////////////////////////////////////////
 //     Function: EggVertexUV::Copy Assignment Operator
 //       Access: Published
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 EggVertexUV &EggVertexUV::
 operator = (const EggVertexUV &copy) {
@@ -87,12 +87,37 @@ operator = (const EggVertexUV &copy) {
 ////////////////////////////////////////////////////////////////////
 //     Function: EggVertexUV::Destructor
 //       Access: Published, Virtual
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 EggVertexUV::
 ~EggVertexUV() {
 }
 
+////////////////////////////////////////////////////////////////////
+//     Function: EggVertexUV::make_average
+//       Access: Published, Static
+//  Description: Creates a new EggVertexUV that contains the
+//               averaged values of the two given objects.  It is
+//               an error if they don't have the same name.
+///////////////////////////////////////////////////////////////////
+PT(EggVertexUV) EggVertexUV::
+make_average(const EggVertexUV *first, const EggVertexUV *second) {
+  nassertr(first->get_name() == second->get_name(), NULL);
+  int flags = first->_flags & second->_flags;
+
+  LTexCoord3d uvw = (first->_uvw + second->_uvw) / 2;
+
+  PT(EggVertexUV) new_obj = new EggVertexUV(first->get_name(), uvw);
+  new_obj->_flags = flags;
+  new_obj->_tangent = (first->_tangent + second->_tangent) / 2;
+  new_obj->_binormal = (first->_binormal + second->_binormal) / 2;
+
+  // Normalize because we're polite.
+  new_obj->_tangent.normalize();
+  new_obj->_binormal.normalize();
+  return new_obj;
+}
+
 ////////////////////////////////////////////////////////////////////
 //     Function: EggVertexUV::transform
 //       Access: Published, Virtual
@@ -115,7 +140,7 @@ transform(const LMatrix4d &mat) {
 ////////////////////////////////////////////////////////////////////
 //     Function: EggVertexUV::write
 //       Access: Public
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 void EggVertexUV::
 write(ostream &out, int indent_level) const {
diff --git a/panda/src/egg/eggVertexUV.h b/panda/src/egg/eggVertexUV.h
index ddb6cc3576..d250e9f58e 100755
--- a/panda/src/egg/eggVertexUV.h
+++ b/panda/src/egg/eggVertexUV.h
@@ -57,6 +57,9 @@ PUBLISHED:
   INLINE void set_binormal(const LNormald &binormal);
   INLINE void clear_binormal();
 
+  static PT(EggVertexUV) make_average(const EggVertexUV *first,
+                                      const EggVertexUV *second);
+
   void transform(const LMatrix4d &mat);
 
   void write(ostream &out, int indent_level) const;
diff --git a/panda/src/egg2pg/eggLoader.cxx b/panda/src/egg2pg/eggLoader.cxx
index a88792cfb2..8cafc8dced 100644
--- a/panda/src/egg2pg/eggLoader.cxx
+++ b/panda/src/egg2pg/eggLoader.cxx
@@ -2855,9 +2855,8 @@ make_sphere(EggGroup *egg_group, EggGroup::CollideFlags flags,
 //               This box is used by make_collision_box.
 ////////////////////////////////////////////////////////////////////
 bool EggLoader::
-make_box(EggGroup *egg_group, EggGroup::CollideFlags flags, 
-            LPoint3 &min_p, LPoint3 &max_p, LColor &color) {
-  bool success = false;
+make_box(EggGroup *egg_group, EggGroup::CollideFlags flags,
+         LPoint3 &min_p, LPoint3 &max_p, LColor &color) {
   EggGroup *geom_group = find_collision_geometry(egg_group, flags);
   if (geom_group != (EggGroup *)NULL) {
     // Collect all of the vertices.
@@ -2875,36 +2874,38 @@ make_box(EggGroup *egg_group, EggGroup::CollideFlags flags,
     }
 
     // Now find the min/max points
-    int num_vertices = 0;
-    bool first = true;
     pset<EggVertex *>::const_iterator vi;
-    for (vi = vertices.begin(); vi != vertices.end(); ++vi) {
-      EggVertex *vtx = (*vi);
-      LVertex pos = LCAST(PN_stdfloat, vtx->get_pos3());
+    vi = vertices.begin();
 
-      if (first) {
-        min_p.set(pos[0], pos[1], pos[2]);
-        max_p.set(pos[0], pos[1], pos[2]);
-        first = false;
-      } else {
-        min_p.set(min(min_p[0], pos[0]),
-                  min(min_p[1], pos[1]),
-                  min(min_p[2], pos[2]));
-        max_p.set(max(max_p[0], pos[0]),
-                  max(max_p[1], pos[1]),
-                  max(max_p[2], pos[2]));
-      }
-      num_vertices++;
+    if (vi == vertices.end()) {
+      // No vertices, no bounding box.
+      min_p.set(0, 0, 0);
+      max_p.set(0, 0, 0);
+      return false;
     }
 
-    if (num_vertices > 1) {
-      vi = vertices.begin();
-      EggVertex *clr_vtx = (*vi);
-      color = clr_vtx->get_color();
-      success = true;
+    EggVertex *vertex = (*vi);
+    LVertexd min_pd = vertex->get_pos3();
+    LVertexd max_pd = min_pd;
+    color = vertex->get_color();
+
+    for (++vi; vi != vertices.end(); ++vi) {
+      vertex = (*vi);
+      const LVertexd &pos = vertex->get_pos3();
+      min_pd.set(min(min_pd[0], pos[0]),
+                 min(min_pd[1], pos[1]),
+                 min(min_pd[2], pos[2]));
+      max_pd.set(max(max_pd[0], pos[0]),
+                 max(max_pd[1], pos[1]),
+                 max(max_pd[2], pos[2]));
     }
+
+    LMatrix4d mat = egg_group->get_vertex_to_node();
+    min_p = LCAST(PN_stdfloat, min_pd * mat);
+    max_p = LCAST(PN_stdfloat, max_pd * mat);
+    return (min_pd != max_pd);
   }
-  return success;
+  return false;
 }
 
 ////////////////////////////////////////////////////////////////////
diff --git a/panda/src/event/Sources.pp b/panda/src/event/Sources.pp
index bd3e322d5d..22bf575414 100644
--- a/panda/src/event/Sources.pp
+++ b/panda/src/event/Sources.pp
@@ -20,7 +20,7 @@
     genericAsyncTask.h genericAsyncTask.I \
     pointerEvent.I pointerEvent.h \
     pointerEventList.I pointerEventList.h \
-    pythonTask.h pythonTask.I \
+    pythonTask.h pythonTask.I pythonTask.cxx \
     event.I event.h eventHandler.h eventHandler.I \
     eventParameter.I eventParameter.h \
     eventQueue.I eventQueue.h eventReceiver.h \
@@ -38,7 +38,6 @@
     genericAsyncTask.cxx \
     pointerEvent.cxx \
     pointerEventList.cxx \
-    pythonTask.cxx \
     config_event.cxx event.cxx eventHandler.cxx \ 
     eventParameter.cxx eventQueue.cxx eventReceiver.cxx \
     pt_Event.cxx
diff --git a/panda/src/event/config_event.cxx b/panda/src/event/config_event.cxx
index 1ceaf7572a..aee490825a 100644
--- a/panda/src/event/config_event.cxx
+++ b/panda/src/event/config_event.cxx
@@ -24,7 +24,6 @@
 #include "eventParameter.h"
 #include "genericAsyncTask.h"
 #include "pointerEventList.h"
-#include "pythonTask.h"
 
 #include "dconfig.h"
 
@@ -45,9 +44,6 @@ ConfigureFn(config_event) {
   EventStoreInt::init_type("EventStoreInt");
   EventStoreDouble::init_type("EventStoreDouble");
   GenericAsyncTask::init_type();
-#ifdef HAVE_PYTHON
-  PythonTask::init_type();
-#endif
 
   ButtonEventList::register_with_read_factory();
   EventStoreInt::register_with_read_factory();
diff --git a/panda/src/event/p3event_composite1.cxx b/panda/src/event/p3event_composite1.cxx
index 08165b1800..57cc83159c 100644
--- a/panda/src/event/p3event_composite1.cxx
+++ b/panda/src/event/p3event_composite1.cxx
@@ -9,4 +9,3 @@
 #include "genericAsyncTask.cxx"
 #include "pointerEvent.cxx"
 #include "pointerEventList.cxx"
-#include "pythonTask.cxx"
diff --git a/panda/src/event/pythonTask.cxx b/panda/src/event/pythonTask.cxx
index 4ae81b5a1a..53be111dfa 100644
--- a/panda/src/event/pythonTask.cxx
+++ b/panda/src/event/pythonTask.cxx
@@ -17,12 +17,17 @@
 #include "config_event.h"
 
 #ifdef HAVE_PYTHON
-#include "py_panda.h"  
+#include "py_panda.h"
 
 TypeHandle PythonTask::_type_handle;
 
+Configure(config_pythonTask);
+ConfigureFn(config_pythonTask) {
+  PythonTask::init_type();
+}
+
 #ifndef CPPPARSER
-IMPORT_THIS struct Dtool_PyTypedObject Dtool_TypedReferenceCount;
+extern struct Dtool_PyTypedObject Dtool_TypedReferenceCount;
 #endif
 
 ////////////////////////////////////////////////////////////////////
diff --git a/panda/src/event/pythonTask.h b/panda/src/event/pythonTask.h
index 13874bc317..294af18387 100644
--- a/panda/src/event/pythonTask.h
+++ b/panda/src/event/pythonTask.h
@@ -25,7 +25,7 @@
 // Description : This class exists to allow association of a Python
 //               function with the AsyncTaskManager.
 ////////////////////////////////////////////////////////////////////
-class EXPCL_PANDA_PIPELINE PythonTask : public AsyncTask {
+class PythonTask : public AsyncTask {
 PUBLISHED:
   PythonTask(PyObject *function = Py_None, const string &name = string());
   virtual ~PythonTask();
diff --git a/panda/src/express/dcast.cxx b/panda/src/express/dcast.cxx
index ecdedb6506..34517ff28c 100644
--- a/panda/src/express/dcast.cxx
+++ b/panda/src/express/dcast.cxx
@@ -16,11 +16,12 @@
 #include "config_express.h"
 
 #ifdef _WIN32
-#define WIN32_LEAN_AND_MEAN
+#ifndef WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN 1
+#endif
 #include <windows.h>  // for IsBadWritePtr()
 #endif
 
-
 #ifdef DO_DCAST
 ////////////////////////////////////////////////////////////////////
 //     Function: _dcast_verify
diff --git a/panda/src/express/memoryUsage.I b/panda/src/express/memoryUsage.I
index 03939f09d1..8f52d9172d 100644
--- a/panda/src/express/memoryUsage.I
+++ b/panda/src/express/memoryUsage.I
@@ -366,3 +366,20 @@ INLINE void MemoryUsage::
 show_trend_ages() {
   get_global_ptr()->ns_show_trend_ages();
 }
+
+////////////////////////////////////////////////////////////////////
+//     Function: MemoryUsage::get_global_ptr
+//       Access: Private, Static
+//  Description: Returns the pointer to the only MemoryUsage object in
+//               the world.
+////////////////////////////////////////////////////////////////////
+INLINE MemoryUsage *MemoryUsage::
+get_global_ptr() {
+  if (_global_ptr == (MemoryUsage *)NULL) {
+    init_memory_hook();
+    _global_ptr = new MemoryUsage(*memory_hook);
+    memory_hook = _global_ptr;
+  }
+
+  return _global_ptr;
+}
diff --git a/panda/src/express/memoryUsage.cxx b/panda/src/express/memoryUsage.cxx
index 9061aab12d..93315ac428 100644
--- a/panda/src/express/memoryUsage.cxx
+++ b/panda/src/express/memoryUsage.cxx
@@ -564,24 +564,6 @@ overflow_heap_size() {
   _report_memory_usage = true;
 }
 
-////////////////////////////////////////////////////////////////////
-//     Function: MemoryUsage::get_global_ptr
-//       Access: Private, Static
-//  Description: Returns the pointer to the only MemoryUsage object in
-//               the world.
-////////////////////////////////////////////////////////////////////
-MemoryUsage *MemoryUsage::
-get_global_ptr() {
-  if (_global_ptr == (MemoryUsage *)NULL) {
-    init_memory_hook();
-    _global_ptr = new MemoryUsage(*memory_hook);
-    memory_hook = _global_ptr;
-  }
-
-  return _global_ptr;
-}
-
-
 ////////////////////////////////////////////////////////////////////
 //     Function: MemoryUsage::ns_record_pointer
 //       Access: Private
diff --git a/panda/src/express/memoryUsage.h b/panda/src/express/memoryUsage.h
index 893b0c8351..0a2f653e7e 100644
--- a/panda/src/express/memoryUsage.h
+++ b/panda/src/express/memoryUsage.h
@@ -96,7 +96,7 @@ protected:
 
 private:
   MemoryUsage(const MemoryHook &copy);
-  static MemoryUsage *get_global_ptr();
+  INLINE static MemoryUsage *get_global_ptr();
 
   void ns_record_pointer(ReferenceCount *ptr);
   void ns_update_type(ReferenceCount *ptr, TypeHandle type);
diff --git a/panda/src/express/multifile.I b/panda/src/express/multifile.I
index 35de9b9cc6..f2ddf6b060 100644
--- a/panda/src/express/multifile.I
+++ b/panda/src/express/multifile.I
@@ -534,51 +534,3 @@ get_last_byte_pos() const {
   return max(_index_start + (streampos)_index_length, 
              _data_start + (streampos)_data_length) - (streampos)1;
 }
-
-#ifdef HAVE_OPENSSL
-////////////////////////////////////////////////////////////////////
-//     Function: Multifile::CertRecord::Constructor
-//       Access: Public
-//  Description: Ownership of the X509 object is passed into the
-//               CertRecord; it will be freed when the CertRecord
-//               destructs.
-////////////////////////////////////////////////////////////////////
-INLINE Multifile::CertRecord::
-CertRecord(X509 *cert) :
-  _cert(cert)
-{
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: Multifile::CertRecord::Copy Constructor
-//       Access: Public
-//  Description: 
-////////////////////////////////////////////////////////////////////
-INLINE Multifile::CertRecord::
-CertRecord(const Multifile::CertRecord &copy) :
-  _cert(X509_dup(copy._cert))
-{
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: Multifile::CertRecord::Destructor
-//       Access: Public
-//  Description: 
-////////////////////////////////////////////////////////////////////
-INLINE Multifile::CertRecord::
-~CertRecord() {
-  X509_free(_cert);
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: Multifile::CertRecord::Copy Assignment
-//       Access: Public
-//  Description: 
-////////////////////////////////////////////////////////////////////
-INLINE void Multifile::CertRecord::
-operator = (const Multifile::CertRecord &other) {
-  X509_free(_cert);
-  _cert = X509_dup(other._cert);
-}
-#endif
-
diff --git a/panda/src/express/multifile.cxx b/panda/src/express/multifile.cxx
index 79ad6a4d16..b693e8e5c6 100644
--- a/panda/src/express/multifile.cxx
+++ b/panda/src/express/multifile.cxx
@@ -604,6 +604,53 @@ update_subfile(const string &subfile_name, const Filename &filename,
   return name;
 }
 
+#ifdef HAVE_OPENSSL
+////////////////////////////////////////////////////////////////////
+//     Function: Multifile::CertRecord::Constructor
+//       Access: Public
+//  Description: Ownership of the X509 object is passed into the
+//               CertRecord; it will be freed when the CertRecord
+//               destructs.
+////////////////////////////////////////////////////////////////////
+Multifile::CertRecord::
+CertRecord(X509 *cert) :
+  _cert(cert)
+{
+}
+
+////////////////////////////////////////////////////////////////////
+//     Function: Multifile::CertRecord::Copy Constructor
+//       Access: Public
+//  Description:
+////////////////////////////////////////////////////////////////////
+Multifile::CertRecord::
+CertRecord(const Multifile::CertRecord &copy) :
+  _cert(X509_dup(copy._cert))
+{
+}
+
+////////////////////////////////////////////////////////////////////
+//     Function: Multifile::CertRecord::Destructor
+//       Access: Public
+//  Description:
+////////////////////////////////////////////////////////////////////
+Multifile::CertRecord::
+~CertRecord() {
+  X509_free(_cert);
+}
+
+////////////////////////////////////////////////////////////////////
+//     Function: Multifile::CertRecord::Copy Assignment
+//       Access: Public
+//  Description:
+////////////////////////////////////////////////////////////////////
+void Multifile::CertRecord::
+operator = (const Multifile::CertRecord &other) {
+  X509_free(_cert);
+  _cert = X509_dup(other._cert);
+}
+#endif  // HAVE_OPENSSL
+
 #ifdef HAVE_OPENSSL
 ////////////////////////////////////////////////////////////////////
 //     Function: Multifile::add_signature
diff --git a/panda/src/express/multifile.h b/panda/src/express/multifile.h
index 5a90c17be6..b52fc6b825 100644
--- a/panda/src/express/multifile.h
+++ b/panda/src/express/multifile.h
@@ -84,12 +84,12 @@ PUBLISHED:
                         int compression_level);
 
 #ifdef HAVE_OPENSSL
-  class CertRecord {
+  class EXPCL_PANDAEXPRESS CertRecord {
   public:
-    INLINE CertRecord(X509 *cert);
-    INLINE CertRecord(const CertRecord &copy);
-    INLINE ~CertRecord();
-    INLINE void operator = (const CertRecord &other);
+    CertRecord(X509 *cert);
+    CertRecord(const CertRecord &copy);
+    ~CertRecord();
+    void operator = (const CertRecord &other);
     X509 *_cert;
   };
   typedef pvector<CertRecord> CertChain;
diff --git a/panda/src/express/nodePointerTo.I b/panda/src/express/nodePointerTo.I
index 8897c160b3..cdc2d6cbdd 100644
--- a/panda/src/express/nodePointerTo.I
+++ b/panda/src/express/nodePointerTo.I
@@ -51,6 +51,36 @@ INLINE NodePointerTo<T>::
 }
 #endif  // CPPPARSER
 
+#ifdef USE_MOVE_SEMANTICS
+#ifndef CPPPARSER
+////////////////////////////////////////////////////////////////////
+//     Function: NodePointerTo::Move Constructor
+//       Access: Public
+//  Description:
+////////////////////////////////////////////////////////////////////
+template<class T>
+INLINE NodePointerTo<T>::
+NodePointerTo(NodePointerTo<T> &&from) NOEXCEPT :
+  NodePointerToBase<T>((NodePointerToBase<T> &&)from)
+{
+}
+#endif  // CPPPARSER
+
+#ifndef CPPPARSER
+////////////////////////////////////////////////////////////////////
+//     Function: NodePointerTo::Move Assignment Operator
+//       Access: Public
+//  Description:
+////////////////////////////////////////////////////////////////////
+template<class T>
+INLINE NodePointerTo<T> &NodePointerTo<T>::
+operator = (NodePointerTo<T> &&from) NOEXCEPT {
+  this->reassign(move(from));
+  return *this;
+}
+#endif  // CPPPARSER
+#endif  // USE_MOVE_SEMANTICS
+
 #ifndef CPPPARSER
 ////////////////////////////////////////////////////////////////////
 //     Function: NodePointerTo::Dereference operator
@@ -192,6 +222,64 @@ INLINE NodeConstPointerTo<T>::
 }
 #endif  // CPPPARSER
 
+#ifdef USE_MOVE_SEMANTICS
+#ifndef CPPPARSER
+////////////////////////////////////////////////////////////////////
+//     Function: NodeConstPointerTo::Move Constructor
+//       Access: Public
+//  Description:
+////////////////////////////////////////////////////////////////////
+template<class T>
+INLINE NodeConstPointerTo<T>::
+NodeConstPointerTo(NodePointerTo<T> &&from) NOEXCEPT :
+  NodePointerToBase<T>((NodePointerToBase<T> &&)from)
+{
+}
+#endif  // CPPPARSER
+
+#ifndef CPPPARSER
+////////////////////////////////////////////////////////////////////
+//     Function: NodeConstPointerTo::Move Constructor
+//       Access: Public
+//  Description:
+////////////////////////////////////////////////////////////////////
+template<class T>
+INLINE NodeConstPointerTo<T>::
+NodeConstPointerTo(NodeConstPointerTo<T> &&from) NOEXCEPT :
+  NodePointerToBase<T>((NodePointerToBase<T> &&)from)
+{
+}
+#endif  // CPPPARSER
+
+#ifndef CPPPARSER
+////////////////////////////////////////////////////////////////////
+//     Function: NodeConstPointerTo::Move Assignment Operator
+//       Access: Public
+//  Description:
+////////////////////////////////////////////////////////////////////
+template<class T>
+INLINE NodeConstPointerTo<T> &NodeConstPointerTo<T>::
+operator = (NodePointerTo<T> &&from) NOEXCEPT {
+  this->reassign(move(from));
+  return *this;
+}
+#endif  // CPPPARSER
+
+#ifndef CPPPARSER
+////////////////////////////////////////////////////////////////////
+//     Function: NodeConstPointerTo::Move Assignment Operator
+//       Access: Public
+//  Description:
+////////////////////////////////////////////////////////////////////
+template<class T>
+INLINE NodeConstPointerTo<T> &NodeConstPointerTo<T>::
+operator = (NodeConstPointerTo<T> &&from) NOEXCEPT {
+  this->reassign(move(from));
+  return *this;
+}
+#endif  // CPPPARSER
+#endif  // USE_MOVE_SEMANTICS
+
 #ifndef CPPPARSER
 ////////////////////////////////////////////////////////////////////
 //     Function: NodeConstPointerTo::Dereference operator
diff --git a/panda/src/express/nodePointerTo.h b/panda/src/express/nodePointerTo.h
index 5de988ddfc..dfd87923ab 100644
--- a/panda/src/express/nodePointerTo.h
+++ b/panda/src/express/nodePointerTo.h
@@ -36,6 +36,11 @@ public:
   INLINE NodePointerTo(const NodePointerTo<T> &copy);
   INLINE ~NodePointerTo();
 
+#ifdef USE_MOVE_SEMANTICS
+  INLINE NodePointerTo(NodePointerTo<T> &&from) NOEXCEPT;
+  INLINE NodePointerTo<T> &operator = (NodePointerTo<T> &&from) NOEXCEPT;
+#endif
+
   INLINE To &operator *() const;
   INLINE To *operator -> () const;
 
@@ -67,6 +72,13 @@ public:
   INLINE NodeConstPointerTo(const NodeConstPointerTo<T> &copy);
   INLINE ~NodeConstPointerTo();
 
+#ifdef USE_MOVE_SEMANTICS
+  INLINE NodeConstPointerTo(NodePointerTo<T> &&from) NOEXCEPT;
+  INLINE NodeConstPointerTo(NodeConstPointerTo<T> &&from) NOEXCEPT;
+  INLINE NodeConstPointerTo<T> &operator = (NodePointerTo<T> &&from) NOEXCEPT;
+  INLINE NodeConstPointerTo<T> &operator = (NodeConstPointerTo<T> &&from) NOEXCEPT;
+#endif
+
   INLINE const To &operator *() const;
   INLINE const To *operator -> () const;
   INLINE operator const T *() const;
@@ -79,6 +91,16 @@ public:
 #endif  // CPPPARSER
 };
 
+template <class T>
+void swap(NodePointerTo<T> &one, NodePointerTo<T> &two) NOEXCEPT {
+  one.swap(two);
+}
+
+template <class T>
+void swap(NodeConstPointerTo<T> &one, NodeConstPointerTo<T> &two) NOEXCEPT {
+  one.swap(two);
+}
+
 #define NPT(type) NodePointerTo< type >
 #define NCPT(type) NodeConstPointerTo< type >
 
diff --git a/panda/src/express/nodePointerToBase.I b/panda/src/express/nodePointerToBase.I
index d76afccc94..4729f6184d 100644
--- a/panda/src/express/nodePointerToBase.I
+++ b/panda/src/express/nodePointerToBase.I
@@ -46,6 +46,43 @@ INLINE NodePointerToBase<T>::
   reassign((To *)NULL);
 }
 
+#ifdef USE_MOVE_SEMANTICS
+////////////////////////////////////////////////////////////////////
+//     Function: NodePointerToBase::Move Constructor
+//       Access: Protected
+//  Description:
+////////////////////////////////////////////////////////////////////
+template<class T>
+INLINE NodePointerToBase<T>::
+NodePointerToBase(NodePointerToBase<T> &&from) NOEXCEPT {
+  _void_ptr = from._void_ptr;
+  from._void_ptr = (void *)NULL;
+}
+
+////////////////////////////////////////////////////////////////////
+//     Function: NodePointerToBase::reassign
+//       Access: Protected
+//  Description: This version of reassign is called when a
+//               NodePointerTo is assigned to this Node PointerTo
+//               as an rvalue.  In this case, we can steal the
+//               reference count from the other PointerTo, without
+//               needing to call ref() and unref() unnecessarily.
+////////////////////////////////////////////////////////////////////
+template<class T>
+INLINE void NodePointerToBase<T>::
+reassign(NodePointerToBase<T> &&from) NOEXCEPT {
+  To *old_ptr = (To *)this->_void_ptr;
+
+  this->_void_ptr = from._void_ptr;
+  from._void_ptr = NULL;
+
+  // Now delete the old pointer.
+  if (old_ptr != (To *)NULL) {
+    node_unref_delete(old_ptr);
+  }
+}
+#endif  // USE_MOVE_SEMANTICS
+
 ////////////////////////////////////////////////////////////////////
 //     Function: NodePointerToBase::reassign
 //       Access: Protected
diff --git a/panda/src/express/nodePointerToBase.h b/panda/src/express/nodePointerToBase.h
index 44377d6569..870824c2b6 100644
--- a/panda/src/express/nodePointerToBase.h
+++ b/panda/src/express/nodePointerToBase.h
@@ -42,6 +42,11 @@ protected:
   INLINE NodePointerToBase(const NodePointerToBase<T> &copy);
   INLINE ~NodePointerToBase();
 
+#ifdef USE_MOVE_SEMANTICS
+  INLINE NodePointerToBase(NodePointerToBase<T> &&from) NOEXCEPT;
+  INLINE void reassign(NodePointerToBase<To> &&from) NOEXCEPT;
+#endif
+
   void reassign(To *ptr);
   INLINE void reassign(const NodePointerToBase<To> &copy);
 
diff --git a/panda/src/express/openSSLWrapper.I b/panda/src/express/openSSLWrapper.I
index c7e12551c7..e90339034e 100644
--- a/panda/src/express/openSSLWrapper.I
+++ b/panda/src/express/openSSLWrapper.I
@@ -12,3 +12,39 @@
 //
 ////////////////////////////////////////////////////////////////////
 
+
+////////////////////////////////////////////////////////////////////
+//     Function: OpenSSLWrapper::load_certificates_from_pem_ram
+//       Access: Public
+//  Description: Reads a chain of trusted certificates from the
+//               indicated data buffer and adds them to the X509_STORE
+//               object.  The data buffer should be PEM-formatted.
+//               Returns the number of certificates read on success,
+//               or 0 on failure.
+//
+//               You should call this only with trusted,
+//               locally-stored certificates; not with certificates
+//               received from an untrusted source.
+////////////////////////////////////////////////////////////////////
+INLINE int OpenSSLWrapper::
+load_certificates_from_pem_ram(const string &data) {
+  return load_certificates_from_pem_ram(data.data(), data.size());
+}
+
+////////////////////////////////////////////////////////////////////
+//     Function: OpenSSLWrapper::load_certificates_from_der_ram
+//       Access: Public
+//  Description: Reads a chain of trusted certificates from the
+//               indicated data buffer and adds them to the X509_STORE
+//               object.  The data buffer should be DER-formatted.
+//               Returns the number of certificates read on success,
+//               or 0 on failure.
+//
+//               You should call this only with trusted,
+//               locally-stored certificates; not with certificates
+//               received from an untrusted source.
+////////////////////////////////////////////////////////////////////
+INLINE int OpenSSLWrapper::
+load_certificates_from_der_ram(const string &data) {
+  return load_certificates_from_der_ram(data.data(), data.size());
+}
diff --git a/panda/src/express/openSSLWrapper.h b/panda/src/express/openSSLWrapper.h
index 4e277d881a..ee473dbcc6 100644
--- a/panda/src/express/openSSLWrapper.h
+++ b/panda/src/express/openSSLWrapper.h
@@ -48,12 +48,15 @@ private:
   OpenSSLWrapper();
   ~OpenSSLWrapper();
 
-public:
+PUBLISHED:
   void clear_certificates();
   int load_certificates(const Filename &filename);
   int load_certificates_from_pem_ram(const char *data, size_t data_size);
   int load_certificates_from_der_ram(const char *data, size_t data_size);
 
+  INLINE int load_certificates_from_pem_ram(const string &data);
+  INLINE int load_certificates_from_der_ram(const string &data);
+
   X509_STORE *get_x509_store();
 
   void notify_ssl_errors();
diff --git a/panda/src/express/ordered_vector.I b/panda/src/express/ordered_vector.I
index c7a4714ebd..ec0f23bfb6 100644
--- a/panda/src/express/ordered_vector.I
+++ b/panda/src/express/ordered_vector.I
@@ -18,8 +18,8 @@
 //       Access: Public
 //  Description: 
 ////////////////////////////////////////////////////////////////////
-template<class Key, class Compare>
-INLINE ordered_vector<Key, Compare>::
+template<class Key, class Compare, class Vector>
+INLINE ordered_vector<Key, Compare, Vector>::
 ordered_vector(TypeHandle type_handle) :
   _compare(Compare()),
   _vector(type_handle)
@@ -31,8 +31,8 @@ ordered_vector(TypeHandle type_handle) :
 //       Access: Public
 //  Description: 
 ////////////////////////////////////////////////////////////////////
-template<class Key, class Compare>
-INLINE ordered_vector<Key, Compare>::
+template<class Key, class Compare, class Vector>
+INLINE ordered_vector<Key, Compare, Vector>::
 ordered_vector(const Compare &compare, TypeHandle type_handle) :
   _compare(compare),
   _vector(type_handle)
@@ -44,9 +44,9 @@ ordered_vector(const Compare &compare, TypeHandle type_handle) :
 //       Access: Public
 //  Description: 
 ////////////////////////////////////////////////////////////////////
-template<class Key, class Compare>
-INLINE ordered_vector<Key, Compare>::
-ordered_vector(const ordered_vector<Key, Compare> &copy) :
+template<class Key, class Compare, class Vector>
+INLINE ordered_vector<Key, Compare, Vector>::
+ordered_vector(const ordered_vector<Key, Compare, Vector> &copy) :
   _compare(copy._compare),
   _vector(copy._vector)
 {
@@ -57,9 +57,9 @@ ordered_vector(const ordered_vector<Key, Compare> &copy) :
 //       Access: Public
 //  Description: 
 ////////////////////////////////////////////////////////////////////
-template<class Key, class Compare>
-INLINE ordered_vector<Key, Compare> &ordered_vector<Key, Compare>::
-operator = (const ordered_vector<Key, Compare> &copy) {
+template<class Key, class Compare, class Vector>
+INLINE ordered_vector<Key, Compare, Vector> &ordered_vector<Key, Compare, Vector>::
+operator = (const ordered_vector<Key, Compare, Vector> &copy) {
   _compare = copy._compare;
   _vector = copy._vector;
   return *this;
@@ -70,8 +70,8 @@ operator = (const ordered_vector<Key, Compare> &copy) {
 //       Access: Public
 //  Description: 
 ////////////////////////////////////////////////////////////////////
-template<class Key, class Compare>
-INLINE ordered_vector<Key, Compare>::
+template<class Key, class Compare, class Vector>
+INLINE ordered_vector<Key, Compare, Vector>::
 ~ordered_vector() {
 }
 
@@ -81,8 +81,8 @@ INLINE ordered_vector<Key, Compare>::
 //  Description: Returns the iterator that marks the first element in
 //               the ordered vector.
 ////////////////////////////////////////////////////////////////////
-template<class Key, class Compare>
-INLINE TYPENAME ordered_vector<Key, Compare>::ITERATOR ordered_vector<Key, Compare>::
+template<class Key, class Compare, class Vector>
+INLINE TYPENAME ordered_vector<Key, Compare, Vector>::ITERATOR ordered_vector<Key, Compare, Vector>::
 begin() {
   return _vector.begin();
 }
@@ -93,8 +93,8 @@ begin() {
 //  Description: Returns the iterator that marks the end of the
 //               ordered vector.
 ////////////////////////////////////////////////////////////////////
-template<class Key, class Compare>
-INLINE TYPENAME ordered_vector<Key, Compare>::ITERATOR ordered_vector<Key, Compare>::
+template<class Key, class Compare, class Vector>
+INLINE TYPENAME ordered_vector<Key, Compare, Vector>::ITERATOR ordered_vector<Key, Compare, Vector>::
 end() {
   return _vector.end();
 }
@@ -105,8 +105,8 @@ end() {
 //  Description: Returns the iterator that marks the first element in
 //               the ordered vector, when viewed in reverse order.
 ////////////////////////////////////////////////////////////////////
-template<class Key, class Compare>
-INLINE TYPENAME ordered_vector<Key, Compare>::REVERSE_ITERATOR ordered_vector<Key, Compare>::
+template<class Key, class Compare, class Vector>
+INLINE TYPENAME ordered_vector<Key, Compare, Vector>::REVERSE_ITERATOR ordered_vector<Key, Compare, Vector>::
 rbegin() {
   return _vector.rbegin();
 }
@@ -117,8 +117,8 @@ rbegin() {
 //  Description: Returns the iterator that marks the end of the
 //               ordered vector, when viewed in reverse order.
 ////////////////////////////////////////////////////////////////////
-template<class Key, class Compare>
-INLINE TYPENAME ordered_vector<Key, Compare>::REVERSE_ITERATOR ordered_vector<Key, Compare>::
+template<class Key, class Compare, class Vector>
+INLINE TYPENAME ordered_vector<Key, Compare, Vector>::REVERSE_ITERATOR ordered_vector<Key, Compare, Vector>::
 rend() {
   return _vector.rend();
 }
@@ -129,8 +129,8 @@ rend() {
 //  Description: Returns the iterator that marks the first element in
 //               the ordered vector.
 ////////////////////////////////////////////////////////////////////
-template<class Key, class Compare>
-INLINE TYPENAME ordered_vector<Key, Compare>::CONST_ITERATOR ordered_vector<Key, Compare>::
+template<class Key, class Compare, class Vector>
+INLINE TYPENAME ordered_vector<Key, Compare, Vector>::CONST_ITERATOR ordered_vector<Key, Compare, Vector>::
 begin() const {
   return _vector.begin();
 }
@@ -141,8 +141,8 @@ begin() const {
 //  Description: Returns the iterator that marks the end of the
 //               ordered vector.
 ////////////////////////////////////////////////////////////////////
-template<class Key, class Compare>
-INLINE TYPENAME ordered_vector<Key, Compare>::CONST_ITERATOR ordered_vector<Key, Compare>::
+template<class Key, class Compare, class Vector>
+INLINE TYPENAME ordered_vector<Key, Compare, Vector>::CONST_ITERATOR ordered_vector<Key, Compare, Vector>::
 end() const {
   return _vector.end();
 }
@@ -153,8 +153,8 @@ end() const {
 //  Description: Returns the iterator that marks the first element in
 //               the ordered vector, when viewed in reverse order.
 ////////////////////////////////////////////////////////////////////
-template<class Key, class Compare>
-INLINE TYPENAME ordered_vector<Key, Compare>::CONST_REVERSE_ITERATOR ordered_vector<Key, Compare>::
+template<class Key, class Compare, class Vector>
+INLINE TYPENAME ordered_vector<Key, Compare, Vector>::CONST_REVERSE_ITERATOR ordered_vector<Key, Compare, Vector>::
 rbegin() const {
   return _vector.rbegin();
 }
@@ -165,8 +165,8 @@ rbegin() const {
 //  Description: Returns the iterator that marks the end of the
 //               ordered vector, when viewed in reverse order.
 ////////////////////////////////////////////////////////////////////
-template<class Key, class Compare>
-INLINE TYPENAME ordered_vector<Key, Compare>::CONST_REVERSE_ITERATOR ordered_vector<Key, Compare>::
+template<class Key, class Compare, class Vector>
+INLINE TYPENAME ordered_vector<Key, Compare, Vector>::CONST_REVERSE_ITERATOR ordered_vector<Key, Compare, Vector>::
 rend() const {
   return _vector.rend();
 }
@@ -176,9 +176,9 @@ rend() const {
 //       Access: Public
 //  Description: Returns the nth element.
 ////////////////////////////////////////////////////////////////////
-template<class Key, class Compare>
-INLINE TYPENAME ordered_vector<Key, Compare>::REFERENCE ordered_vector<Key, Compare>::
-operator [] (TYPENAME ordered_vector<Key, Compare>::SIZE_TYPE n) {
+template<class Key, class Compare, class Vector>
+INLINE TYPENAME ordered_vector<Key, Compare, Vector>::REFERENCE ordered_vector<Key, Compare, Vector>::
+operator [] (TYPENAME ordered_vector<Key, Compare, Vector>::SIZE_TYPE n) {
   return _vector[n];
 }
 
@@ -187,9 +187,9 @@ operator [] (TYPENAME ordered_vector<Key, Compare>::SIZE_TYPE n) {
 //       Access: Public
 //  Description: Returns the nth element.
 ////////////////////////////////////////////////////////////////////
-template<class Key, class Compare>
-INLINE TYPENAME ordered_vector<Key, Compare>::CONST_REFERENCE ordered_vector<Key, Compare>::
-operator [] (TYPENAME ordered_vector<Key, Compare>::SIZE_TYPE n) const {
+template<class Key, class Compare, class Vector>
+INLINE TYPENAME ordered_vector<Key, Compare, Vector>::CONST_REFERENCE ordered_vector<Key, Compare, Vector>::
+operator [] (TYPENAME ordered_vector<Key, Compare, Vector>::SIZE_TYPE n) const {
   return _vector[n];
 }
 
@@ -198,8 +198,8 @@ operator [] (TYPENAME ordered_vector<Key, Compare>::SIZE_TYPE n) const {
 //       Access: Public
 //  Description: Returns the number of elements in the ordered vector.
 ////////////////////////////////////////////////////////////////////
-template<class Key, class Compare>
-INLINE TYPENAME ordered_vector<Key, Compare>::SIZE_TYPE ordered_vector<Key, Compare>::
+template<class Key, class Compare, class Vector>
+INLINE TYPENAME ordered_vector<Key, Compare, Vector>::SIZE_TYPE ordered_vector<Key, Compare, Vector>::
 size() const {
   return _vector.size();
 }
@@ -210,8 +210,8 @@ size() const {
 //  Description: Returns the maximum number of elements that can
 //               possibly be stored in an ordered vector.
 ////////////////////////////////////////////////////////////////////
-template<class Key, class Compare>
-INLINE TYPENAME ordered_vector<Key, Compare>::SIZE_TYPE ordered_vector<Key, Compare>::
+template<class Key, class Compare, class Vector>
+INLINE TYPENAME ordered_vector<Key, Compare, Vector>::SIZE_TYPE ordered_vector<Key, Compare, Vector>::
 max_size() const {
   return _vector.max_size();
 }
@@ -222,8 +222,8 @@ max_size() const {
 //  Description: Returns true if the ordered vector is empty, false
 //               otherwise.
 ////////////////////////////////////////////////////////////////////
-template<class Key, class Compare>
-INLINE bool ordered_vector<Key, Compare>::
+template<class Key, class Compare, class Vector>
+INLINE bool ordered_vector<Key, Compare, Vector>::
 empty() const {
   return _vector.empty();
 }
@@ -234,9 +234,9 @@ empty() const {
 //  Description: Returns true if the two ordered vectors are
 //               memberwise equivalent, false otherwise.
 ////////////////////////////////////////////////////////////////////
-template<class Key, class Compare>
-INLINE bool ordered_vector<Key, Compare>::
-operator == (const ordered_vector<Key, Compare> &other) const {
+template<class Key, class Compare, class Vector>
+INLINE bool ordered_vector<Key, Compare, Vector>::
+operator == (const ordered_vector<Key, Compare, Vector> &other) const {
   return _vector == other._vector;
 }
 
@@ -246,9 +246,9 @@ operator == (const ordered_vector<Key, Compare> &other) const {
 //  Description: Returns true if the two ordered vectors are not
 //               memberwise equivalent, false if they are.
 ////////////////////////////////////////////////////////////////////
-template<class Key, class Compare>
-INLINE bool ordered_vector<Key, Compare>::
-operator != (const ordered_vector<Key, Compare> &other) const {
+template<class Key, class Compare, class Vector>
+INLINE bool ordered_vector<Key, Compare, Vector>::
+operator != (const ordered_vector<Key, Compare, Vector> &other) const {
   return _vector != other._vector;
 }
 
@@ -259,9 +259,9 @@ operator != (const ordered_vector<Key, Compare> &other) const {
 //               lexicographically before the other one, false
 //               otherwise.
 ////////////////////////////////////////////////////////////////////
-template<class Key, class Compare>
-INLINE bool ordered_vector<Key, Compare>::
-operator < (const ordered_vector<Key, Compare> &other) const {
+template<class Key, class Compare, class Vector>
+INLINE bool ordered_vector<Key, Compare, Vector>::
+operator < (const ordered_vector<Key, Compare, Vector> &other) const {
   return _vector < other._vector;
 }
 
@@ -272,9 +272,9 @@ operator < (const ordered_vector<Key, Compare> &other) const {
 //               lexicographically after the other one, false
 //               otherwise.
 ////////////////////////////////////////////////////////////////////
-template<class Key, class Compare>
-INLINE bool ordered_vector<Key, Compare>::
-operator > (const ordered_vector<Key, Compare> &other) const {
+template<class Key, class Compare, class Vector>
+INLINE bool ordered_vector<Key, Compare, Vector>::
+operator > (const ordered_vector<Key, Compare, Vector> &other) const {
   return _vector > other._vector;
 }
 
@@ -285,9 +285,9 @@ operator > (const ordered_vector<Key, Compare> &other) const {
 //               lexicographically before the other one or is
 //               equivalent, false otherwise.
 ////////////////////////////////////////////////////////////////////
-template<class Key, class Compare>
-INLINE bool ordered_vector<Key, Compare>::
-operator <= (const ordered_vector<Key, Compare> &other) const {
+template<class Key, class Compare, class Vector>
+INLINE bool ordered_vector<Key, Compare, Vector>::
+operator <= (const ordered_vector<Key, Compare, Vector> &other) const {
   return _vector <= other._vector;
 }
 
@@ -298,9 +298,9 @@ operator <= (const ordered_vector<Key, Compare> &other) const {
 //               lexicographically after the other one or is
 //               equivalent, false otherwise.
 ////////////////////////////////////////////////////////////////////
-template<class Key, class Compare>
-INLINE bool ordered_vector<Key, Compare>::
-operator >= (const ordered_vector<Key, Compare> &other) const {
+template<class Key, class Compare, class Vector>
+INLINE bool ordered_vector<Key, Compare, Vector>::
+operator >= (const ordered_vector<Key, Compare, Vector> &other) const {
   return _vector >= other._vector;
 }
 
@@ -318,9 +318,9 @@ operator >= (const ordered_vector<Key, Compare> &other) const {
 //               original element), and the second componet is true if
 //               the insert operation has taken place.
 ////////////////////////////////////////////////////////////////////
-template<class Key, class Compare>
-INLINE pair<TYPENAME ordered_vector<Key, Compare>::ITERATOR, bool> ordered_vector<Key, Compare>::
-insert_unique(const TYPENAME ordered_vector<Key, Compare>::VALUE_TYPE &key) {
+template<class Key, class Compare, class Vector>
+INLINE pair<TYPENAME ordered_vector<Key, Compare, Vector>::ITERATOR, bool> ordered_vector<Key, Compare, Vector>::
+insert_unique(const TYPENAME ordered_vector<Key, Compare, Vector>::VALUE_TYPE &key) {
   TAU_PROFILE("ordered_vector::insert_unique(const value_type &)", " ", TAU_USER);
   ITERATOR position = find_insert_position(begin(), end(), key);
 #ifdef NDEBUG
@@ -351,9 +351,9 @@ insert_unique(const TYPENAME ordered_vector<Key, Compare>::VALUE_TYPE &key) {
 //               The return value is the iterator referencing the new
 //               element.
 ////////////////////////////////////////////////////////////////////
-template<class Key, class Compare>
-INLINE TYPENAME ordered_vector<Key, Compare>::ITERATOR ordered_vector<Key, Compare>::
-insert_nonunique(const TYPENAME ordered_vector<Key, Compare>::VALUE_TYPE &key) {
+template<class Key, class Compare, class Vector>
+INLINE TYPENAME ordered_vector<Key, Compare, Vector>::ITERATOR ordered_vector<Key, Compare, Vector>::
+insert_nonunique(const TYPENAME ordered_vector<Key, Compare, Vector>::VALUE_TYPE &key) {
   TAU_PROFILE("ordered_vector::insert_nonunique(const value_type &)", " ", TAU_USER);
   ITERATOR position = find_insert_position(begin(), end(), key);
   nassertr(position >= begin() && position <= end(), end());
@@ -371,10 +371,10 @@ insert_nonunique(const TYPENAME ordered_vector<Key, Compare>::VALUE_TYPE &key) {
 //               already verified that this is the correct sorting
 //               position; no checks are made.
 ////////////////////////////////////////////////////////////////////
-template<class Key, class Compare>
-INLINE TYPENAME ordered_vector<Key, Compare>::ITERATOR ordered_vector<Key, Compare>::
-insert_unverified(TYPENAME ordered_vector<Key, Compare>::ITERATOR position, 
-                  const TYPENAME ordered_vector<Key, Compare>::VALUE_TYPE &key) {
+template<class Key, class Compare, class Vector>
+INLINE TYPENAME ordered_vector<Key, Compare, Vector>::ITERATOR ordered_vector<Key, Compare, Vector>::
+insert_unverified(TYPENAME ordered_vector<Key, Compare, Vector>::ITERATOR position, 
+                  const TYPENAME ordered_vector<Key, Compare, Vector>::VALUE_TYPE &key) {
   TAU_PROFILE("ordered_vector::insert_unverified(iterator, const value_type &)", " ", TAU_USER);
   ITERATOR result = _vector.insert(position, key);
   return result;
@@ -386,9 +386,9 @@ insert_unverified(TYPENAME ordered_vector<Key, Compare>::ITERATOR position,
 //  Description: Removes the element indicated by the given iterator,
 //               and returns the next sequential iterator.
 ////////////////////////////////////////////////////////////////////
-template<class Key, class Compare>
-INLINE TYPENAME ordered_vector<Key, Compare>::ITERATOR ordered_vector<Key, Compare>::
-erase(TYPENAME ordered_vector<Key, Compare>::ITERATOR position) {
+template<class Key, class Compare, class Vector>
+INLINE TYPENAME ordered_vector<Key, Compare, Vector>::ITERATOR ordered_vector<Key, Compare, Vector>::
+erase(TYPENAME ordered_vector<Key, Compare, Vector>::ITERATOR position) {
   TAU_PROFILE("ordered_vector::erase(iterator)", " ", TAU_USER);
   SIZE_TYPE count = position - begin();
   _vector.erase(position);
@@ -401,9 +401,9 @@ erase(TYPENAME ordered_vector<Key, Compare>::ITERATOR position) {
 //  Description: Removes all elements matching the indicated key;
 //               returns the number of elements removed.
 ////////////////////////////////////////////////////////////////////
-template<class Key, class Compare>
-INLINE TYPENAME ordered_vector<Key, Compare>::SIZE_TYPE ordered_vector<Key, Compare>::
-erase(const TYPENAME ordered_vector<Key, Compare>::KEY_TYPE &key) {
+template<class Key, class Compare, class Vector>
+INLINE TYPENAME ordered_vector<Key, Compare, Vector>::SIZE_TYPE ordered_vector<Key, Compare, Vector>::
+erase(const TYPENAME ordered_vector<Key, Compare, Vector>::KEY_TYPE &key) {
   TAU_PROFILE("ordered_vector::erase(const key_type &)", " ", TAU_USER);
   pair<ITERATOR, ITERATOR> result = equal_range(key);
   SIZE_TYPE count = result.second - result.first;
@@ -417,10 +417,10 @@ erase(const TYPENAME ordered_vector<Key, Compare>::KEY_TYPE &key) {
 //  Description: Removes all elements indicated by the given iterator
 //               range.
 ////////////////////////////////////////////////////////////////////
-template<class Key, class Compare>
-INLINE void ordered_vector<Key, Compare>::
-erase(TYPENAME ordered_vector<Key, Compare>::ITERATOR first,
-      TYPENAME ordered_vector<Key, Compare>::ITERATOR last) {
+template<class Key, class Compare, class Vector>
+INLINE void ordered_vector<Key, Compare, Vector>::
+erase(TYPENAME ordered_vector<Key, Compare, Vector>::ITERATOR first,
+      TYPENAME ordered_vector<Key, Compare, Vector>::ITERATOR last) {
   TAU_PROFILE("ordered_vector::erase(iterator, iterator)", " ", TAU_USER);
   _vector.erase(first, last);
 }
@@ -430,8 +430,8 @@ erase(TYPENAME ordered_vector<Key, Compare>::ITERATOR first,
 //       Access: Public
 //  Description: Removes all elements from the ordered vector.
 ////////////////////////////////////////////////////////////////////
-template<class Key, class Compare>
-INLINE void ordered_vector<Key, Compare>::
+template<class Key, class Compare, class Vector>
+INLINE void ordered_vector<Key, Compare, Vector>::
 clear() {
   TAU_PROFILE("ordered_vector::clear()", " ", TAU_USER);
   _vector.erase(_vector.begin(), _vector.end());
@@ -445,9 +445,9 @@ clear() {
 //               is not.  If there are multiple elements matching the
 //               key, the particular iterator returned is not defined.
 ////////////////////////////////////////////////////////////////////
-template<class Key, class Compare>
-INLINE TYPENAME ordered_vector<Key, Compare>::ITERATOR ordered_vector<Key, Compare>::
-find(const TYPENAME ordered_vector<Key, Compare>::KEY_TYPE &key) {
+template<class Key, class Compare, class Vector>
+INLINE TYPENAME ordered_vector<Key, Compare, Vector>::ITERATOR ordered_vector<Key, Compare, Vector>::
+find(const TYPENAME ordered_vector<Key, Compare, Vector>::KEY_TYPE &key) {
   TAU_PROFILE("ordered_vector::find(const key_type &)", " ", TAU_USER);
   return nci(r_find(begin(), end(), end(), key));
 }
@@ -460,9 +460,9 @@ find(const TYPENAME ordered_vector<Key, Compare>::KEY_TYPE &key) {
 //               is not.  If there are multiple elements matching the
 //               key, the particular iterator returned is not defined.
 ////////////////////////////////////////////////////////////////////
-template<class Key, class Compare>
-INLINE TYPENAME ordered_vector<Key, Compare>::CONST_ITERATOR ordered_vector<Key, Compare>::
-find(const TYPENAME ordered_vector<Key, Compare>::KEY_TYPE &key) const {
+template<class Key, class Compare, class Vector>
+INLINE TYPENAME ordered_vector<Key, Compare, Vector>::CONST_ITERATOR ordered_vector<Key, Compare, Vector>::
+find(const TYPENAME ordered_vector<Key, Compare, Vector>::KEY_TYPE &key) const {
   TAU_PROFILE("ordered_vector::find(const key_type &)", " ", TAU_USER);
   return r_find(begin(), end(), end(), key);
 }
@@ -483,9 +483,9 @@ find(const TYPENAME ordered_vector<Key, Compare>::KEY_TYPE &key) const {
 //               The assumption is that == implies !Compare(a, b) and
 //               !Compare(b, a), but not necessarily the converse.
 ////////////////////////////////////////////////////////////////////
-template<class Key, class Compare>
-INLINE TYPENAME ordered_vector<Key, Compare>::ITERATOR ordered_vector<Key, Compare>::
-find_particular(const TYPENAME ordered_vector<Key, Compare>::KEY_TYPE &key) {
+template<class Key, class Compare, class Vector>
+INLINE TYPENAME ordered_vector<Key, Compare, Vector>::ITERATOR ordered_vector<Key, Compare, Vector>::
+find_particular(const TYPENAME ordered_vector<Key, Compare, Vector>::KEY_TYPE &key) {
   TAU_PROFILE("ordered_vector::find_particular(const key_type &)", " ", TAU_USER);
   return nci(r_find_particular(begin(), end(), end(), key));
 }
@@ -503,9 +503,9 @@ find_particular(const TYPENAME ordered_vector<Key, Compare>::KEY_TYPE &key) {
 //               multiple matches exist within the vector, the
 //               particular iterator returned is not defined./
 ////////////////////////////////////////////////////////////////////
-template<class Key, class Compare>
-INLINE TYPENAME ordered_vector<Key, Compare>::CONST_ITERATOR ordered_vector<Key, Compare>::
-find_particular(const TYPENAME ordered_vector<Key, Compare>::KEY_TYPE &key) const {
+template<class Key, class Compare, class Vector>
+INLINE TYPENAME ordered_vector<Key, Compare, Vector>::CONST_ITERATOR ordered_vector<Key, Compare, Vector>::
+find_particular(const TYPENAME ordered_vector<Key, Compare, Vector>::KEY_TYPE &key) const {
   TAU_PROFILE("ordered_vector::find_particular(const key_type &)", " ", TAU_USER);
   return r_find_particular(begin(), end(), end(), key);
 }
@@ -516,8 +516,8 @@ find_particular(const TYPENAME ordered_vector<Key, Compare>::KEY_TYPE &key) cons
 //  Description: Returns the number of elements that sort equivalent
 //               to the key that are in the vector.
 ////////////////////////////////////////////////////////////////////
-template<class Key, class Compare>
-INLINE TYPENAME ordered_vector<Key, Compare>::SIZE_TYPE ordered_vector<Key, Compare>::
+template<class Key, class Compare, class Vector>
+INLINE TYPENAME ordered_vector<Key, Compare, Vector>::SIZE_TYPE ordered_vector<Key, Compare, Vector>::
 count(const key_type &key) const {
   TAU_PROFILE("ordered_vector::count(const key_type &)", " ", TAU_USER);
   return r_count(begin(), end(), key);
@@ -529,9 +529,9 @@ count(const key_type &key) const {
 //  Description: Returns the iterator for the first element not less
 //               than key, or end() if all elements are less than key.
 ////////////////////////////////////////////////////////////////////
-template<class Key, class Compare>
-INLINE TYPENAME ordered_vector<Key, Compare>::ITERATOR ordered_vector<Key, Compare>::
-lower_bound(const TYPENAME ordered_vector<Key, Compare>::KEY_TYPE &key) {
+template<class Key, class Compare, class Vector>
+INLINE TYPENAME ordered_vector<Key, Compare, Vector>::ITERATOR ordered_vector<Key, Compare, Vector>::
+lower_bound(const TYPENAME ordered_vector<Key, Compare, Vector>::KEY_TYPE &key) {
   TAU_PROFILE("ordered_vector::lower_bound(const key_type &)", " ", TAU_USER);
   return nci(r_lower_bound(begin(), end(), key));
 }
@@ -542,9 +542,9 @@ lower_bound(const TYPENAME ordered_vector<Key, Compare>::KEY_TYPE &key) {
 //  Description: Returns the iterator for the first element not less
 //               than key, or end() if all elements are less than key.
 ////////////////////////////////////////////////////////////////////
-template<class Key, class Compare>
-INLINE TYPENAME ordered_vector<Key, Compare>::CONST_ITERATOR ordered_vector<Key, Compare>::
-lower_bound(const TYPENAME ordered_vector<Key, Compare>::KEY_TYPE &key) const {
+template<class Key, class Compare, class Vector>
+INLINE TYPENAME ordered_vector<Key, Compare, Vector>::CONST_ITERATOR ordered_vector<Key, Compare, Vector>::
+lower_bound(const TYPENAME ordered_vector<Key, Compare, Vector>::KEY_TYPE &key) const {
   TAU_PROFILE("ordered_vector::lower_bound(const key_type &)", " ", TAU_USER);
   return r_lower_bound(begin(), end(), key);
 }
@@ -556,9 +556,9 @@ lower_bound(const TYPENAME ordered_vector<Key, Compare>::KEY_TYPE &key) const {
 //               than key, or end() if no element is greater than
 //               key.
 ////////////////////////////////////////////////////////////////////
-template<class Key, class Compare>
-INLINE TYPENAME ordered_vector<Key, Compare>::ITERATOR ordered_vector<Key, Compare>::
-upper_bound(const TYPENAME ordered_vector<Key, Compare>::KEY_TYPE &key) {
+template<class Key, class Compare, class Vector>
+INLINE TYPENAME ordered_vector<Key, Compare, Vector>::ITERATOR ordered_vector<Key, Compare, Vector>::
+upper_bound(const TYPENAME ordered_vector<Key, Compare, Vector>::KEY_TYPE &key) {
   TAU_PROFILE("ordered_vector::upper_bound(const key_type &)", " ", TAU_USER);
   return nci(r_upper_bound(begin(), end(), key));
 }
@@ -570,9 +570,9 @@ upper_bound(const TYPENAME ordered_vector<Key, Compare>::KEY_TYPE &key) {
 //               than key, or end() if no element is greater than
 //               key.
 ////////////////////////////////////////////////////////////////////
-template<class Key, class Compare>
-INLINE TYPENAME ordered_vector<Key, Compare>::CONST_ITERATOR ordered_vector<Key, Compare>::
-upper_bound(const TYPENAME ordered_vector<Key, Compare>::KEY_TYPE &key) const {
+template<class Key, class Compare, class Vector>
+INLINE TYPENAME ordered_vector<Key, Compare, Vector>::CONST_ITERATOR ordered_vector<Key, Compare, Vector>::
+upper_bound(const TYPENAME ordered_vector<Key, Compare, Vector>::KEY_TYPE &key) const {
   TAU_PROFILE("ordered_vector::upper_bound(const key_type &)", " ", TAU_USER);
   return r_upper_bound(begin(), end(), key);
 }
@@ -582,13 +582,13 @@ upper_bound(const TYPENAME ordered_vector<Key, Compare>::KEY_TYPE &key) const {
 //       Access: Public
 //  Description: Returns the pair (lower_bound(key), upper_bound(key)).
 ////////////////////////////////////////////////////////////////////
-template<class Key, class Compare>
-INLINE pair<TYPENAME ordered_vector<Key, Compare>::ITERATOR, TYPENAME ordered_vector<Key, Compare>::ITERATOR> ordered_vector<Key, Compare>::
-equal_range(const TYPENAME ordered_vector<Key, Compare>::KEY_TYPE &key) {
+template<class Key, class Compare, class Vector>
+INLINE pair<TYPENAME ordered_vector<Key, Compare, Vector>::ITERATOR, TYPENAME ordered_vector<Key, Compare, Vector>::ITERATOR> ordered_vector<Key, Compare, Vector>::
+equal_range(const TYPENAME ordered_vector<Key, Compare, Vector>::KEY_TYPE &key) {
   TAU_PROFILE("ordered_vector::equal_range(const key_type &)", " ", TAU_USER);
-  pair<TYPENAME ordered_vector<Key, Compare>::CONST_ITERATOR, TYPENAME ordered_vector<Key, Compare>::CONST_ITERATOR> result;
+  pair<TYPENAME ordered_vector<Key, Compare, Vector>::CONST_ITERATOR, TYPENAME ordered_vector<Key, Compare, Vector>::CONST_ITERATOR> result;
   result = r_equal_range(begin(), end(), key);
-  return pair<TYPENAME ordered_vector<Key, Compare>::ITERATOR, TYPENAME ordered_vector<Key, Compare>::ITERATOR>(nci(result.first), nci(result.second));
+  return pair<TYPENAME ordered_vector<Key, Compare, Vector>::ITERATOR, TYPENAME ordered_vector<Key, Compare, Vector>::ITERATOR>(nci(result.first), nci(result.second));
 }
 
 ////////////////////////////////////////////////////////////////////
@@ -596,9 +596,9 @@ equal_range(const TYPENAME ordered_vector<Key, Compare>::KEY_TYPE &key) {
 //       Access: Public
 //  Description: Returns the pair (lower_bound(key), upper_bound(key)).
 ////////////////////////////////////////////////////////////////////
-template<class Key, class Compare>
-INLINE pair<TYPENAME ordered_vector<Key, Compare>::CONST_ITERATOR, TYPENAME ordered_vector<Key, Compare>::CONST_ITERATOR> ordered_vector<Key, Compare>::
-equal_range(const TYPENAME ordered_vector<Key, Compare>::KEY_TYPE &key) const {
+template<class Key, class Compare, class Vector>
+INLINE pair<TYPENAME ordered_vector<Key, Compare, Vector>::CONST_ITERATOR, TYPENAME ordered_vector<Key, Compare, Vector>::CONST_ITERATOR> ordered_vector<Key, Compare, Vector>::
+equal_range(const TYPENAME ordered_vector<Key, Compare, Vector>::KEY_TYPE &key) const {
   TAU_PROFILE("ordered_vector::equal_range(const key_type &)", " ", TAU_USER);
   return r_equal_range(begin(), end(), key);
 }
@@ -609,9 +609,9 @@ equal_range(const TYPENAME ordered_vector<Key, Compare>::KEY_TYPE &key) const {
 //  Description: Exchanges the contents of this vector and the other
 //               vector, in constant time (e.g., with a pointer swap).
 ////////////////////////////////////////////////////////////////////
-template<class Key, class Compare>
-INLINE void ordered_vector<Key, Compare>::
-swap(ordered_vector<Key, Compare> &copy) {
+template<class Key, class Compare, class Vector>
+INLINE void ordered_vector<Key, Compare, Vector>::
+swap(ordered_vector<Key, Compare, Vector> &copy) {
   TAU_PROFILE("ordered_vector::swap(ordered_vector &)", " ", TAU_USER);
   _vector.swap(copy._vector);
 }
@@ -623,9 +623,9 @@ swap(ordered_vector<Key, Compare> &copy) {
 //               ensures that the capacity of the vector is greater
 //               than or equal to n.
 ////////////////////////////////////////////////////////////////////
-template<class Key, class Compare>
-INLINE void ordered_vector<Key, Compare>::
-reserve(TYPENAME ordered_vector<Key, Compare>::SIZE_TYPE n) {
+template<class Key, class Compare, class Vector>
+INLINE void ordered_vector<Key, Compare, Vector>::
+reserve(TYPENAME ordered_vector<Key, Compare, Vector>::SIZE_TYPE n) {
   TAU_PROFILE("ordered_vector::reserve(size_type)", " ", TAU_USER);
   _vector.reserve(n);
 }
@@ -642,8 +642,8 @@ reserve(TYPENAME ordered_vector<Key, Compare>::SIZE_TYPE n) {
 //               This flavor of sort also eliminates repeated
 //               elements.
 ////////////////////////////////////////////////////////////////////
-template<class Key, class Compare>
-INLINE void ordered_vector<Key, Compare>::
+template<class Key, class Compare, class Vector>
+INLINE void ordered_vector<Key, Compare, Vector>::
 sort_unique() {
   TAU_PROFILE("ordered_vector::sort_unique()", " ", TAU_USER);
   sort(begin(), end(), _compare);
@@ -660,8 +660,8 @@ sort_unique() {
 //               written to the vector using the non-const iterators
 //               or has called push_back().
 ////////////////////////////////////////////////////////////////////
-template<class Key, class Compare>
-INLINE void ordered_vector<Key, Compare>::
+template<class Key, class Compare, class Vector>
+INLINE void ordered_vector<Key, Compare, Vector>::
 sort_nonunique() {
   TAU_PROFILE("ordered_vector::sort_nonunique()", " ", TAU_USER);
   stable_sort(begin(), end(), _compare);
@@ -675,8 +675,8 @@ sort_nonunique() {
 //               except to populate the vector the first time; be sure
 //               to call sort() after you have added all the elements.
 ////////////////////////////////////////////////////////////////////
-template<class Key, class Compare>
-INLINE void ordered_vector<Key, Compare>::
+template<class Key, class Compare, class Vector>
+INLINE void ordered_vector<Key, Compare, Vector>::
 push_back(const value_type &key) {
   TAU_PROFILE("ordered_vector::push_back()", " ", TAU_USER);
   _vector.push_back(key);
@@ -687,8 +687,8 @@ push_back(const value_type &key) {
 //       Access: Public
 //  Description: Removes the last element at the end of the vector.
 ////////////////////////////////////////////////////////////////////
-template<class Key, class Compare>
-INLINE void ordered_vector<Key, Compare>::
+template<class Key, class Compare, class Vector>
+INLINE void ordered_vector<Key, Compare, Vector>::
 pop_back() {
   TAU_PROFILE("ordered_vector::pop_back()", " ", TAU_USER);
   _vector.pop_back();
@@ -702,9 +702,9 @@ pop_back() {
 //               easy definition of const vs. non-const flavors of
 //               some of these methods.
 ////////////////////////////////////////////////////////////////////
-template<class Key, class Compare>
-INLINE TYPENAME ordered_vector<Key, Compare>::ITERATOR ordered_vector<Key, Compare>::
-nci(TYPENAME ordered_vector<Key, Compare>::CONST_ITERATOR i) {
+template<class Key, class Compare, class Vector>
+INLINE TYPENAME ordered_vector<Key, Compare, Vector>::ITERATOR ordered_vector<Key, Compare, Vector>::
+nci(TYPENAME ordered_vector<Key, Compare, Vector>::CONST_ITERATOR i) {
   return begin() + (i - begin());
 }
 
@@ -715,11 +715,11 @@ nci(TYPENAME ordered_vector<Key, Compare>::CONST_ITERATOR i) {
 //               vector to insert the indicated key, and returns the
 //               corresponding iterator.
 ////////////////////////////////////////////////////////////////////
-template<class Key, class Compare>
-INLINE TYPENAME ordered_vector<Key, Compare>::ITERATOR ordered_vector<Key, Compare>::
-find_insert_position(TYPENAME ordered_vector<Key, Compare>::ITERATOR first,
-                     TYPENAME ordered_vector<Key, Compare>::ITERATOR last,
-                     const TYPENAME ordered_vector<Key, Compare>::KEY_TYPE &key) {
+template<class Key, class Compare, class Vector>
+INLINE TYPENAME ordered_vector<Key, Compare, Vector>::ITERATOR ordered_vector<Key, Compare, Vector>::
+find_insert_position(TYPENAME ordered_vector<Key, Compare, Vector>::ITERATOR first,
+                     TYPENAME ordered_vector<Key, Compare, Vector>::ITERATOR last,
+                     const TYPENAME ordered_vector<Key, Compare, Vector>::KEY_TYPE &key) {
   ITERATOR result = r_find_insert_position(first, last, key);
   return result;
 }
@@ -729,10 +729,10 @@ find_insert_position(TYPENAME ordered_vector<Key, Compare>::ITERATOR first,
 //       Access: Public
 //  Description: 
 ////////////////////////////////////////////////////////////////////
-template<class Key, class Compare>
-INLINE ov_set<Key, Compare>::
+template<class Key, class Compare, class Vector>
+INLINE ov_set<Key, Compare, Vector>::
 ov_set(TypeHandle type_handle) :
-  ordered_vector<Key, Compare>(type_handle)
+  ordered_vector<Key, Compare, Vector>(type_handle)
 {
 }
 
@@ -741,10 +741,10 @@ ov_set(TypeHandle type_handle) :
 //       Access: Public
 //  Description: 
 ////////////////////////////////////////////////////////////////////
-template<class Key, class Compare>
-INLINE ov_set<Key, Compare>::
+template<class Key, class Compare, class Vector>
+INLINE ov_set<Key, Compare, Vector>::
 ov_set(const Compare &compare, TypeHandle type_handle) :
-  ordered_vector<Key, Compare>(compare, type_handle)
+  ordered_vector<Key, Compare, Vector>(compare, type_handle)
 {
 }
 
@@ -753,10 +753,10 @@ ov_set(const Compare &compare, TypeHandle type_handle) :
 //       Access: Public
 //  Description: 
 ////////////////////////////////////////////////////////////////////
-template<class Key, class Compare>
-INLINE ov_set<Key, Compare>::
-ov_set(const ov_set<Key, Compare> &copy) :
-  ordered_vector<Key, Compare>(copy)
+template<class Key, class Compare, class Vector>
+INLINE ov_set<Key, Compare, Vector>::
+ov_set(const ov_set<Key, Compare, Vector> &copy) :
+  ordered_vector<Key, Compare, Vector>(copy)
 {
 }
 
@@ -765,10 +765,10 @@ ov_set(const ov_set<Key, Compare> &copy) :
 //       Access: Public
 //  Description: 
 ////////////////////////////////////////////////////////////////////
-template<class Key, class Compare>
-INLINE ov_set<Key, Compare> &ov_set<Key, Compare>::
-operator = (const ov_set<Key, Compare> &copy) {
-  ordered_vector<Key, Compare>::operator = (copy);
+template<class Key, class Compare, class Vector>
+INLINE ov_set<Key, Compare, Vector> &ov_set<Key, Compare, Vector>::
+operator = (const ov_set<Key, Compare, Vector> &copy) {
+  ordered_vector<Key, Compare, Vector>::operator = (copy);
   return *this;
 }
 
@@ -777,11 +777,11 @@ operator = (const ov_set<Key, Compare> &copy) {
 //       Access: Public
 //  Description: Maps to insert_unique().
 ////////////////////////////////////////////////////////////////////
-template<class Key, class Compare>
-TYPENAME ov_set<Key, Compare>::ITERATOR ov_set<Key, Compare>::
-insert(TYPENAME ov_set<Key, Compare>::ITERATOR position, 
-       const TYPENAME ov_set<Key, Compare>::VALUE_TYPE &key) {
-  return ordered_vector<Key, Compare>::insert_unique(position, key);
+template<class Key, class Compare, class Vector>
+TYPENAME ov_set<Key, Compare, Vector>::ITERATOR ov_set<Key, Compare, Vector>::
+insert(TYPENAME ov_set<Key, Compare, Vector>::ITERATOR position, 
+       const TYPENAME ov_set<Key, Compare, Vector>::VALUE_TYPE &key) {
+  return ordered_vector<Key, Compare, Vector>::insert_unique(position, key);
 }
 
 ////////////////////////////////////////////////////////////////////
@@ -789,10 +789,10 @@ insert(TYPENAME ov_set<Key, Compare>::ITERATOR position,
 //       Access: Public
 //  Description: Maps to insert_unique().
 ////////////////////////////////////////////////////////////////////
-template<class Key, class Compare>
-INLINE pair<TYPENAME ov_set<Key, Compare>::ITERATOR, bool> ov_set<Key, Compare>::
-insert(const TYPENAME ov_set<Key, Compare>::VALUE_TYPE &key) {
-  return ordered_vector<Key, Compare>::insert_unique(key);
+template<class Key, class Compare, class Vector>
+INLINE pair<TYPENAME ov_set<Key, Compare, Vector>::ITERATOR, bool> ov_set<Key, Compare, Vector>::
+insert(const TYPENAME ov_set<Key, Compare, Vector>::VALUE_TYPE &key) {
+  return ordered_vector<Key, Compare, Vector>::insert_unique(key);
 }
 
 ////////////////////////////////////////////////////////////////////
@@ -800,10 +800,10 @@ insert(const TYPENAME ov_set<Key, Compare>::VALUE_TYPE &key) {
 //       Access: Public
 //  Description: Maps to sort_unique().
 ////////////////////////////////////////////////////////////////////
-template<class Key, class Compare>
-INLINE void ov_set<Key, Compare>::
+template<class Key, class Compare, class Vector>
+INLINE void ov_set<Key, Compare, Vector>::
 sort() {
-  ordered_vector<Key, Compare>::sort_unique();
+  ordered_vector<Key, Compare, Vector>::sort_unique();
 }
 
 ////////////////////////////////////////////////////////////////////
@@ -811,10 +811,10 @@ sort() {
 //       Access: Public
 //  Description: Maps to verify_list_unique().
 ////////////////////////////////////////////////////////////////////
-template<class Key, class Compare>
-INLINE bool ov_set<Key, Compare>::
+template<class Key, class Compare, class Vector>
+INLINE bool ov_set<Key, Compare, Vector>::
 verify_list() const {
-  return ordered_vector<Key, Compare>::verify_list_unique();
+  return ordered_vector<Key, Compare, Vector>::verify_list_unique();
 }
 
 ////////////////////////////////////////////////////////////////////
@@ -822,10 +822,10 @@ verify_list() const {
 //       Access: Public
 //  Description: 
 ////////////////////////////////////////////////////////////////////
-template<class Key, class Compare>
-INLINE ov_multiset<Key, Compare>::
+template<class Key, class Compare, class Vector>
+INLINE ov_multiset<Key, Compare, Vector>::
 ov_multiset(TypeHandle type_handle) :
-  ordered_vector<Key, Compare>(type_handle)
+  ordered_vector<Key, Compare, Vector>(type_handle)
 {
 }
 
@@ -834,10 +834,10 @@ ov_multiset(TypeHandle type_handle) :
 //       Access: Public
 //  Description: 
 ////////////////////////////////////////////////////////////////////
-template<class Key, class Compare>
-INLINE ov_multiset<Key, Compare>::
+template<class Key, class Compare, class Vector>
+INLINE ov_multiset<Key, Compare, Vector>::
 ov_multiset(const Compare &compare, TypeHandle type_handle) :
-  ordered_vector<Key, Compare>(compare, type_handle)
+  ordered_vector<Key, Compare, Vector>(compare, type_handle)
 {
 }
 
@@ -846,10 +846,10 @@ ov_multiset(const Compare &compare, TypeHandle type_handle) :
 //       Access: Public
 //  Description: 
 ////////////////////////////////////////////////////////////////////
-template<class Key, class Compare>
-INLINE ov_multiset<Key, Compare>::
-ov_multiset(const ov_multiset<Key, Compare> &copy) :
-  ordered_vector<Key, Compare>(copy)
+template<class Key, class Compare, class Vector>
+INLINE ov_multiset<Key, Compare, Vector>::
+ov_multiset(const ov_multiset<Key, Compare, Vector> &copy) :
+  ordered_vector<Key, Compare, Vector>(copy)
 {
 }
 
@@ -858,10 +858,10 @@ ov_multiset(const ov_multiset<Key, Compare> &copy) :
 //       Access: Public
 //  Description: 
 ////////////////////////////////////////////////////////////////////
-template<class Key, class Compare>
-INLINE ov_multiset<Key, Compare> &ov_multiset<Key, Compare>::
-operator = (const ov_multiset<Key, Compare> &copy) {
-  ordered_vector<Key, Compare>::operator = (copy);
+template<class Key, class Compare, class Vector>
+INLINE ov_multiset<Key, Compare, Vector> &ov_multiset<Key, Compare, Vector>::
+operator = (const ov_multiset<Key, Compare, Vector> &copy) {
+  ordered_vector<Key, Compare, Vector>::operator = (copy);
   return *this;
 }
 
@@ -870,11 +870,11 @@ operator = (const ov_multiset<Key, Compare> &copy) {
 //       Access: Public
 //  Description: Maps to insert_nonunique().
 ////////////////////////////////////////////////////////////////////
-template<class Key, class Compare>
-TYPENAME ov_multiset<Key, Compare>::ITERATOR ov_multiset<Key, Compare>::
-insert(TYPENAME ov_multiset<Key, Compare>::ITERATOR position, 
-       const TYPENAME ov_multiset<Key, Compare>::VALUE_TYPE &key) {
-  return ordered_vector<Key, Compare>::insert_nonunique(position, key);
+template<class Key, class Compare, class Vector>
+TYPENAME ov_multiset<Key, Compare, Vector>::ITERATOR ov_multiset<Key, Compare, Vector>::
+insert(TYPENAME ov_multiset<Key, Compare, Vector>::ITERATOR position, 
+       const TYPENAME ov_multiset<Key, Compare, Vector>::VALUE_TYPE &key) {
+  return ordered_vector<Key, Compare, Vector>::insert_nonunique(position, key);
 }
 
 ////////////////////////////////////////////////////////////////////
@@ -882,10 +882,10 @@ insert(TYPENAME ov_multiset<Key, Compare>::ITERATOR position,
 //       Access: Public
 //  Description: Maps to insert_nonunique().
 ////////////////////////////////////////////////////////////////////
-template<class Key, class Compare>
-INLINE TYPENAME ov_multiset<Key, Compare>::ITERATOR ov_multiset<Key, Compare>::
-insert(const TYPENAME ov_multiset<Key, Compare>::VALUE_TYPE &key) {
-  return ordered_vector<Key, Compare>::insert_nonunique(key);
+template<class Key, class Compare, class Vector>
+INLINE TYPENAME ov_multiset<Key, Compare, Vector>::ITERATOR ov_multiset<Key, Compare, Vector>::
+insert(const TYPENAME ov_multiset<Key, Compare, Vector>::VALUE_TYPE &key) {
+  return ordered_vector<Key, Compare, Vector>::insert_nonunique(key);
 }
 
 ////////////////////////////////////////////////////////////////////
@@ -893,10 +893,10 @@ insert(const TYPENAME ov_multiset<Key, Compare>::VALUE_TYPE &key) {
 //       Access: Public
 //  Description: Maps to sort_nonunique().
 ////////////////////////////////////////////////////////////////////
-template<class Key, class Compare>
-INLINE void ov_multiset<Key, Compare>::
+template<class Key, class Compare, class Vector>
+INLINE void ov_multiset<Key, Compare, Vector>::
 sort() {
-  ordered_vector<Key, Compare>::sort_nonunique();
+  ordered_vector<Key, Compare, Vector>::sort_nonunique();
 }
 
 ////////////////////////////////////////////////////////////////////
@@ -904,8 +904,8 @@ sort() {
 //       Access: Public
 //  Description: Maps to verify_list_nonunique().
 ////////////////////////////////////////////////////////////////////
-template<class Key, class Compare>
-INLINE bool ov_multiset<Key, Compare>::
+template<class Key, class Compare, class Vector>
+INLINE bool ov_multiset<Key, Compare, Vector>::
 verify_list() const {
-  return ordered_vector<Key, Compare>::verify_list_nonunique();
+  return ordered_vector<Key, Compare, Vector>::verify_list_nonunique();
 }
diff --git a/panda/src/express/ordered_vector.T b/panda/src/express/ordered_vector.T
index ad0e24b5a5..6a7100f90f 100644
--- a/panda/src/express/ordered_vector.T
+++ b/panda/src/express/ordered_vector.T
@@ -27,10 +27,10 @@
 //               already present, it is not inserted, and the iterator
 //               referencing the original value is returned.
 ////////////////////////////////////////////////////////////////////
-template<class Key, class Compare>
-TYPENAME ordered_vector<Key, Compare>::ITERATOR ordered_vector<Key, Compare>::
-insert_unique(TYPENAME ordered_vector<Key, Compare>::ITERATOR position, 
-              const TYPENAME ordered_vector<Key, Compare>::VALUE_TYPE &key) {
+template<class Key, class Compare, class Vector>
+TYPENAME ordered_vector<Key, Compare, Vector>::ITERATOR ordered_vector<Key, Compare, Vector>::
+insert_unique(TYPENAME ordered_vector<Key, Compare, Vector>::ITERATOR position, 
+              const TYPENAME ordered_vector<Key, Compare, Vector>::VALUE_TYPE &key) {
   TAU_PROFILE("ordered_vector::insert_unique(iterator, const value_type &)", " ", TAU_USER);
   if (position != end()) {
     // If we're not inserting at the end, the element we're
@@ -74,10 +74,10 @@ insert_unique(TYPENAME ordered_vector<Key, Compare>::ITERATOR position,
 //               This flavor of insert allows multiple copies of the
 //               same key to be inserted.
 ////////////////////////////////////////////////////////////////////
-template<class Key, class Compare>
-TYPENAME ordered_vector<Key, Compare>::ITERATOR ordered_vector<Key, Compare>::
-insert_nonunique(TYPENAME ordered_vector<Key, Compare>::ITERATOR position, 
-                 const TYPENAME ordered_vector<Key, Compare>::VALUE_TYPE &key) {
+template<class Key, class Compare, class Vector>
+TYPENAME ordered_vector<Key, Compare, Vector>::ITERATOR ordered_vector<Key, Compare, Vector>::
+insert_nonunique(TYPENAME ordered_vector<Key, Compare, Vector>::ITERATOR position, 
+                 const TYPENAME ordered_vector<Key, Compare, Vector>::VALUE_TYPE &key) {
   TAU_PROFILE("ordered_vector::insert_nonunique(iterator, const value_type &)", " ", TAU_USER);
   if (position != end()) {
     // If we're not inserting at the end, the element we're
@@ -107,8 +107,8 @@ insert_nonunique(TYPENAME ordered_vector<Key, Compare>::ITERATOR position,
 //               sorted correctly.  Returns true if this is the case;
 //               otherwise, returns false.
 ////////////////////////////////////////////////////////////////////
-template<class Key, class Compare>
-bool ordered_vector<Key, Compare>::
+template<class Key, class Compare, class Vector>
+bool ordered_vector<Key, Compare, Vector>::
 verify_list_unique() const {
   TAU_PROFILE("ordered_vector::verify_list_unique()", " ", TAU_USER);
   if (!empty()) {
@@ -134,8 +134,8 @@ verify_list_unique() const {
 //               sorted correctly.  Returns true if this is the case;
 //               otherwise, returns false.
 ////////////////////////////////////////////////////////////////////
-template<class Key, class Compare>
-bool ordered_vector<Key, Compare>::
+template<class Key, class Compare, class Vector>
+bool ordered_vector<Key, Compare, Vector>::
 verify_list_nonunique() const {
   TAU_PROFILE("ordered_vector::verify_list_nonunique()", " ", TAU_USER);
   if (!empty()) {
@@ -161,11 +161,11 @@ verify_list_nonunique() const {
 //  Description: The recursive implementation of
 //               find_insert_position().
 ////////////////////////////////////////////////////////////////////
-template<class Key, class Compare>
-TYPENAME ordered_vector<Key, Compare>::ITERATOR ordered_vector<Key, Compare>::
-r_find_insert_position(TYPENAME ordered_vector<Key, Compare>::ITERATOR first,
-                       TYPENAME ordered_vector<Key, Compare>::ITERATOR last,
-                       const TYPENAME ordered_vector<Key, Compare>::KEY_TYPE &key) {
+template<class Key, class Compare, class Vector>
+TYPENAME ordered_vector<Key, Compare, Vector>::ITERATOR ordered_vector<Key, Compare, Vector>::
+r_find_insert_position(TYPENAME ordered_vector<Key, Compare, Vector>::ITERATOR first,
+                       TYPENAME ordered_vector<Key, Compare, Vector>::ITERATOR last,
+                       const TYPENAME ordered_vector<Key, Compare, Vector>::KEY_TYPE &key) {
   if (first == last) {
     // The list is empty; the insert position is the last of the list.
     return last;
@@ -189,12 +189,12 @@ r_find_insert_position(TYPENAME ordered_vector<Key, Compare>::ITERATOR first,
 //       Access: Private
 //  Description: The recursive implementation of find().
 ////////////////////////////////////////////////////////////////////
-template<class Key, class Compare>
-TYPENAME ordered_vector<Key, Compare>::CONST_ITERATOR ordered_vector<Key, Compare>::
-r_find(TYPENAME ordered_vector<Key, Compare>::CONST_ITERATOR first,
-       TYPENAME ordered_vector<Key, Compare>::CONST_ITERATOR last,
-       TYPENAME ordered_vector<Key, Compare>::CONST_ITERATOR not_found,
-       const TYPENAME ordered_vector<Key, Compare>::KEY_TYPE &key) const {
+template<class Key, class Compare, class Vector>
+TYPENAME ordered_vector<Key, Compare, Vector>::CONST_ITERATOR ordered_vector<Key, Compare, Vector>::
+r_find(TYPENAME ordered_vector<Key, Compare, Vector>::CONST_ITERATOR first,
+       TYPENAME ordered_vector<Key, Compare, Vector>::CONST_ITERATOR last,
+       TYPENAME ordered_vector<Key, Compare, Vector>::CONST_ITERATOR not_found,
+       const TYPENAME ordered_vector<Key, Compare, Vector>::KEY_TYPE &key) const {
   if (first == last) {
     // The list is empty; the key is not on the list.
     return not_found;
@@ -222,12 +222,12 @@ r_find(TYPENAME ordered_vector<Key, Compare>::CONST_ITERATOR first,
 //       Access: Private
 //  Description: The recursive implementation of find_particular().
 ////////////////////////////////////////////////////////////////////
-template<class Key, class Compare>
-TYPENAME ordered_vector<Key, Compare>::CONST_ITERATOR ordered_vector<Key, Compare>::
-r_find_particular(TYPENAME ordered_vector<Key, Compare>::CONST_ITERATOR first,
-                  TYPENAME ordered_vector<Key, Compare>::CONST_ITERATOR last,
-                  TYPENAME ordered_vector<Key, Compare>::CONST_ITERATOR not_found,
-                  const TYPENAME ordered_vector<Key, Compare>::KEY_TYPE &key) const {
+template<class Key, class Compare, class Vector>
+TYPENAME ordered_vector<Key, Compare, Vector>::CONST_ITERATOR ordered_vector<Key, Compare, Vector>::
+r_find_particular(TYPENAME ordered_vector<Key, Compare, Vector>::CONST_ITERATOR first,
+                  TYPENAME ordered_vector<Key, Compare, Vector>::CONST_ITERATOR last,
+                  TYPENAME ordered_vector<Key, Compare, Vector>::CONST_ITERATOR not_found,
+                  const TYPENAME ordered_vector<Key, Compare, Vector>::KEY_TYPE &key) const {
   if (first == last) {
     // The list is empty; the key is not on the list.
     return not_found;
@@ -275,12 +275,12 @@ r_find_particular(TYPENAME ordered_vector<Key, Compare>::CONST_ITERATOR first,
 //       Access: Private
 //  Description: The recursive implementation of count().
 ////////////////////////////////////////////////////////////////////
-template<class Key, class Compare>
-TYPENAME ordered_vector<Key, Compare>::SIZE_TYPE ordered_vector<Key, Compare>::
-r_count(TYPENAME ordered_vector<Key, Compare>::CONST_ITERATOR first,
-        TYPENAME ordered_vector<Key, Compare>::CONST_ITERATOR last,
-        const TYPENAME ordered_vector<Key, Compare>::KEY_TYPE &key) const {
-  typedef pair<TYPENAME ordered_vector<Key, Compare>::CONST_ITERATOR, TYPENAME ordered_vector<Key, Compare>::CONST_ITERATOR> pair_type;
+template<class Key, class Compare, class Vector>
+TYPENAME ordered_vector<Key, Compare, Vector>::SIZE_TYPE ordered_vector<Key, Compare, Vector>::
+r_count(TYPENAME ordered_vector<Key, Compare, Vector>::CONST_ITERATOR first,
+        TYPENAME ordered_vector<Key, Compare, Vector>::CONST_ITERATOR last,
+        const TYPENAME ordered_vector<Key, Compare, Vector>::KEY_TYPE &key) const {
+  typedef pair<TYPENAME ordered_vector<Key, Compare, Vector>::CONST_ITERATOR, TYPENAME ordered_vector<Key, Compare, Vector>::CONST_ITERATOR> pair_type;
 
   if (first == last) {
     // The list is empty; the key is not on the list.
@@ -311,11 +311,11 @@ r_count(TYPENAME ordered_vector<Key, Compare>::CONST_ITERATOR first,
 //       Access: Private
 //  Description: The recursive implementation of lower_bound().
 ////////////////////////////////////////////////////////////////////
-template<class Key, class Compare>
-TYPENAME ordered_vector<Key, Compare>::CONST_ITERATOR ordered_vector<Key, Compare>::
-r_lower_bound(TYPENAME ordered_vector<Key, Compare>::CONST_ITERATOR first,
-              TYPENAME ordered_vector<Key, Compare>::CONST_ITERATOR last,
-              const TYPENAME ordered_vector<Key, Compare>::KEY_TYPE &key) const {
+template<class Key, class Compare, class Vector>
+TYPENAME ordered_vector<Key, Compare, Vector>::CONST_ITERATOR ordered_vector<Key, Compare, Vector>::
+r_lower_bound(TYPENAME ordered_vector<Key, Compare, Vector>::CONST_ITERATOR first,
+              TYPENAME ordered_vector<Key, Compare, Vector>::CONST_ITERATOR last,
+              const TYPENAME ordered_vector<Key, Compare, Vector>::KEY_TYPE &key) const {
   if (first == last) {
     // The list is empty; the key is not on the list.
     return last;
@@ -344,11 +344,11 @@ r_lower_bound(TYPENAME ordered_vector<Key, Compare>::CONST_ITERATOR first,
 //       Access: Private
 //  Description: The recursive implementation of upper_bound().
 ////////////////////////////////////////////////////////////////////
-template<class Key, class Compare>
-TYPENAME ordered_vector<Key, Compare>::CONST_ITERATOR ordered_vector<Key, Compare>::
-r_upper_bound(TYPENAME ordered_vector<Key, Compare>::CONST_ITERATOR first,
-              TYPENAME ordered_vector<Key, Compare>::CONST_ITERATOR last,
-              const TYPENAME ordered_vector<Key, Compare>::KEY_TYPE &key) const {
+template<class Key, class Compare, class Vector>
+TYPENAME ordered_vector<Key, Compare, Vector>::CONST_ITERATOR ordered_vector<Key, Compare, Vector>::
+r_upper_bound(TYPENAME ordered_vector<Key, Compare, Vector>::CONST_ITERATOR first,
+              TYPENAME ordered_vector<Key, Compare, Vector>::CONST_ITERATOR last,
+              const TYPENAME ordered_vector<Key, Compare, Vector>::KEY_TYPE &key) const {
   if (first == last) {
     // The list is empty; the key is not on the list.
     return last;
@@ -377,12 +377,12 @@ r_upper_bound(TYPENAME ordered_vector<Key, Compare>::CONST_ITERATOR first,
 //       Access: Private
 //  Description: The recursive implementation of equal_range().
 ////////////////////////////////////////////////////////////////////
-template<class Key, class Compare>
-pair<TYPENAME ordered_vector<Key, Compare>::CONST_ITERATOR, TYPENAME ordered_vector<Key, Compare>::CONST_ITERATOR> ordered_vector<Key, Compare>::
-r_equal_range(TYPENAME ordered_vector<Key, Compare>::CONST_ITERATOR first,
-              TYPENAME ordered_vector<Key, Compare>::CONST_ITERATOR last,
-              const TYPENAME ordered_vector<Key, Compare>::KEY_TYPE &key) const {
-  typedef pair<TYPENAME ordered_vector<Key, Compare>::CONST_ITERATOR, TYPENAME ordered_vector<Key, Compare>::CONST_ITERATOR> pair_type;
+template<class Key, class Compare, class Vector>
+pair<TYPENAME ordered_vector<Key, Compare, Vector>::CONST_ITERATOR, TYPENAME ordered_vector<Key, Compare, Vector>::CONST_ITERATOR> ordered_vector<Key, Compare, Vector>::
+r_equal_range(TYPENAME ordered_vector<Key, Compare, Vector>::CONST_ITERATOR first,
+              TYPENAME ordered_vector<Key, Compare, Vector>::CONST_ITERATOR last,
+              const TYPENAME ordered_vector<Key, Compare, Vector>::KEY_TYPE &key) const {
+  typedef pair<TYPENAME ordered_vector<Key, Compare, Vector>::CONST_ITERATOR, TYPENAME ordered_vector<Key, Compare, Vector>::CONST_ITERATOR> pair_type;
 
   if (first == last) {
     // The list is empty; the key is not on the list.
diff --git a/panda/src/express/ordered_vector.h b/panda/src/express/ordered_vector.h
index a481a43b37..705212b98d 100644
--- a/panda/src/express/ordered_vector.h
+++ b/panda/src/express/ordered_vector.h
@@ -21,15 +21,15 @@
 // on pc cygwin from  3 minutes to 17 seconds ?? really need to explore interigate to figure out what is 
 // going on ..
 //
-template<class Key, class Compare = less<int> > class ov_multiset
+template<class Key, class Compare = less<int>, class Vector = pvector<Key> > class ov_multiset
 {
 };
 
-template<class Key, class Compare = less<int> > class ov_set
+template<class Key, class Compare = less<int>, class Vector = pvector<Key> > class ov_set
 {
 };
 
-template<class Key, class Compare = less<int> > class ordered_vector
+template<class Key, class Compare = less<int>, class Vector = pvector<Key> > class ordered_vector
 {
 };
 
@@ -105,11 +105,8 @@ template<class Key, class Compare = less<int> > class ordered_vector
 //               (4) Random access into the set is easy with the []
 //               operator.
 ////////////////////////////////////////////////////////////////////
-template<class Key, class Compare = less<Key> >
+template<class Key, class Compare = less<Key>, class Vector = pvector<Key> >
 class ordered_vector {
-private:
-  typedef pvector<Key> Vector;
-  
 public:
   // Typedefs
   typedef Key KEY_TYPE;
@@ -152,8 +149,8 @@ public:
   INLINE ordered_vector(TypeHandle type_handle = ov_set_type_handle);
   INLINE ordered_vector(const Compare &compare,
                         TypeHandle type_handle = ov_set_type_handle);
-  INLINE ordered_vector(const ordered_vector<Key, Compare> &copy);
-  INLINE ordered_vector<Key, Compare> &operator = (const ordered_vector<Key, Compare> &copy);
+  INLINE ordered_vector(const ordered_vector<Key, Compare, Vector> &copy);
+  INLINE ordered_vector<Key, Compare, Vector> &operator = (const ordered_vector<Key, Compare, Vector> &copy);
   INLINE ~ordered_vector();
 
   // Iterator access.
@@ -177,13 +174,13 @@ public:
   INLINE bool empty() const;
 
   // Equivalence and lexicographical comparisons.
-  INLINE bool operator == (const ordered_vector<Key, Compare> &other) const;
-  INLINE bool operator != (const ordered_vector<Key, Compare> &other) const;
+  INLINE bool operator == (const ordered_vector<Key, Compare, Vector> &other) const;
+  INLINE bool operator != (const ordered_vector<Key, Compare, Vector> &other) const;
 
-  INLINE bool operator < (const ordered_vector<Key, Compare> &other) const;
-  INLINE bool operator > (const ordered_vector<Key, Compare> &other) const;
-  INLINE bool operator <= (const ordered_vector<Key, Compare> &other) const;
-  INLINE bool operator >= (const ordered_vector<Key, Compare> &other) const;
+  INLINE bool operator < (const ordered_vector<Key, Compare, Vector> &other) const;
+  INLINE bool operator > (const ordered_vector<Key, Compare, Vector> &other) const;
+  INLINE bool operator <= (const ordered_vector<Key, Compare, Vector> &other) const;
+  INLINE bool operator >= (const ordered_vector<Key, Compare, Vector> &other) const;
 
   // Insert operations.
   ITERATOR insert_unique(ITERATOR position, const VALUE_TYPE &key);
@@ -213,7 +210,7 @@ public:
   INLINE pair<CONST_ITERATOR, CONST_ITERATOR> equal_range(const KEY_TYPE &key) const;
 
   // Special operations.
-  INLINE void swap(ordered_vector<Key, Compare> &other);
+  INLINE void swap(ordered_vector<Key, Compare, Vector> &other);
   INLINE void reserve(SIZE_TYPE n);
   INLINE void sort_unique();
   INLINE void sort_nonunique();
@@ -273,17 +270,17 @@ private:
 //               standard STL set: one copy of each element is
 //               allowed.
 ////////////////////////////////////////////////////////////////////
-template<class Key, class Compare = less<Key> >
-class ov_set : public ordered_vector<Key, Compare> {
+template<class Key, class Compare = less<Key>, class Vector = pvector<Key> >
+class ov_set : public ordered_vector<Key, Compare, Vector> {
 public:
-  typedef TYPENAME ordered_vector<Key, Compare>::ITERATOR ITERATOR;
-  typedef TYPENAME ordered_vector<Key, Compare>::VALUE_TYPE VALUE_TYPE;
+  typedef TYPENAME ordered_vector<Key, Compare, Vector>::ITERATOR ITERATOR;
+  typedef TYPENAME ordered_vector<Key, Compare, Vector>::VALUE_TYPE VALUE_TYPE;
 
   INLINE ov_set(TypeHandle type_handle = ov_set_type_handle);
   INLINE ov_set(const Compare &compare,
                 TypeHandle type_handle = ov_set_type_handle);
-  INLINE ov_set(const ov_set<Key, Compare> &copy);
-  INLINE ov_set<Key, Compare> &operator = (const ov_set<Key, Compare> &copy);
+  INLINE ov_set(const ov_set<Key, Compare, Vector> &copy);
+  INLINE ov_set<Key, Compare, Vector> &operator = (const ov_set<Key, Compare, Vector> &copy);
 
   INLINE ITERATOR insert(ITERATOR position, const VALUE_TYPE &key0);
   INLINE pair<ITERATOR, bool> insert(const VALUE_TYPE &key0);
@@ -298,17 +295,17 @@ public:
 //               standard STL set: many copies of each element are
 //               allowed.
 ////////////////////////////////////////////////////////////////////
-template<class Key, class Compare = less<Key> >
-class ov_multiset : public ordered_vector<Key, Compare> {
+template<class Key, class Compare = less<Key>, class Vector = pvector<Key> >
+class ov_multiset : public ordered_vector<Key, Compare, Vector> {
 public:
-  typedef TYPENAME ordered_vector<Key, Compare>::ITERATOR ITERATOR;
-  typedef TYPENAME ordered_vector<Key, Compare>::VALUE_TYPE VALUE_TYPE;
+  typedef TYPENAME ordered_vector<Key, Compare, Vector>::ITERATOR ITERATOR;
+  typedef TYPENAME ordered_vector<Key, Compare, Vector>::VALUE_TYPE VALUE_TYPE;
 
   INLINE ov_multiset(TypeHandle type_handle = ov_set_type_handle);
   INLINE ov_multiset(const Compare &compare,
                      TypeHandle type_handle = ov_set_type_handle);
-  INLINE ov_multiset(const ov_multiset<Key, Compare> &copy);
-  INLINE ov_multiset<Key, Compare> &operator = (const ov_multiset<Key, Compare> &copy);
+  INLINE ov_multiset(const ov_multiset<Key, Compare, Vector> &copy);
+  INLINE ov_multiset<Key, Compare, Vector> &operator = (const ov_multiset<Key, Compare, Vector> &copy);
 
   INLINE ITERATOR insert(ITERATOR position, const VALUE_TYPE &key);
   INLINE ITERATOR insert(const VALUE_TYPE &key);
diff --git a/panda/src/express/password_hash.h b/panda/src/express/password_hash.h
index 1b07bc93bb..dbaa39fe15 100644
--- a/panda/src/express/password_hash.h
+++ b/panda/src/express/password_hash.h
@@ -23,8 +23,9 @@
 
 BEGIN_PUBLISH
 
-string password_hash(const string &password, const string &salt, 
-                     int iters, int keylen);
+EXPCL_PANDAEXPRESS string password_hash(const string &password,
+                                        const string &salt,
+                                        int iters, int keylen);
 
 END_PUBLISH
 
diff --git a/panda/src/express/pointerTo.I b/panda/src/express/pointerTo.I
index d17d6ed6e8..caaccbcd42 100644
--- a/panda/src/express/pointerTo.I
+++ b/panda/src/express/pointerTo.I
@@ -35,6 +35,32 @@ PointerTo(const PointerTo<T> &copy) :
 {
 }
 
+#ifdef USE_MOVE_SEMANTICS
+////////////////////////////////////////////////////////////////////
+//     Function: PointerTo::Move Constructor
+//       Access: Public
+//  Description:
+////////////////////////////////////////////////////////////////////
+template<class T>
+INLINE PointerTo<T>::
+PointerTo(PointerTo<T> &&from) NOEXCEPT :
+  PointerToBase<T>(move(from))
+{
+}
+
+////////////////////////////////////////////////////////////////////
+//     Function: PointerTo::Move Assignment Operator
+//       Access: Public
+//  Description:
+////////////////////////////////////////////////////////////////////
+template<class T>
+INLINE PointerTo<T> &PointerTo<T>::
+operator = (PointerTo<T> &&from) NOEXCEPT {
+  this->reassign(move(from));
+  return *this;
+}
+#endif  // USE_MOVE_SEMANTICS
+
 ////////////////////////////////////////////////////////////////////
 //     Function: PointerTo::Destructor
 //       Access: Public
@@ -166,6 +192,56 @@ ConstPointerTo(const ConstPointerTo<T> &copy) :
 {
 }
 
+#ifdef USE_MOVE_SEMANTICS
+////////////////////////////////////////////////////////////////////
+//     Function: ConstPointerTo::Move Constructor
+//       Access: Public
+//  Description:
+////////////////////////////////////////////////////////////////////
+template<class T>
+INLINE ConstPointerTo<T>::
+ConstPointerTo(PointerTo<T> &&from) NOEXCEPT :
+  PointerToBase<T>(move(from))
+{
+}
+
+////////////////////////////////////////////////////////////////////
+//     Function: ConstPointerTo::Move Constructor
+//       Access: Public
+//  Description:
+////////////////////////////////////////////////////////////////////
+template<class T>
+INLINE ConstPointerTo<T>::
+ConstPointerTo(ConstPointerTo<T> &&from) NOEXCEPT :
+  PointerToBase<T>(move(from))
+{
+}
+
+////////////////////////////////////////////////////////////////////
+//     Function: ConstPointerTo::Move Assignment Operator
+//       Access: Public
+//  Description:
+////////////////////////////////////////////////////////////////////
+template<class T>
+INLINE ConstPointerTo<T> &ConstPointerTo<T>::
+operator = (PointerTo<T> &&from) NOEXCEPT {
+  this->reassign(move(from));
+  return *this;
+}
+
+////////////////////////////////////////////////////////////////////
+//     Function: ConstPointerTo::Move Assignment Operator
+//       Access: Public
+//  Description:
+////////////////////////////////////////////////////////////////////
+template<class T>
+INLINE ConstPointerTo<T> &ConstPointerTo<T>::
+operator = (ConstPointerTo<T> &&from) NOEXCEPT {
+  this->reassign(move(from));
+  return *this;
+}
+#endif  // USE_MOVE_SEMANTICS
+
 ////////////////////////////////////////////////////////////////////
 //     Function: ConstPointerTo::Dereference operator
 //       Access: Public
diff --git a/panda/src/express/pointerTo.h b/panda/src/express/pointerTo.h
index b989b0f944..1597b94d41 100644
--- a/panda/src/express/pointerTo.h
+++ b/panda/src/express/pointerTo.h
@@ -85,6 +85,11 @@ PUBLISHED:
   INLINE ~PointerTo();
 
 public:
+#ifdef USE_MOVE_SEMANTICS
+  INLINE PointerTo(PointerTo<T> &&from) NOEXCEPT;
+  INLINE PointerTo<T> &operator = (PointerTo<T> &&from) NOEXCEPT;
+#endif
+
   INLINE To &operator *() const;
   INLINE To *operator -> () const;
   // MSVC.NET 2005 insists that we use T *, and not To *, here.
@@ -144,6 +149,13 @@ PUBLISHED:
   INLINE ~ConstPointerTo();
 
 public:
+#ifdef USE_MOVE_SEMANTICS
+  INLINE ConstPointerTo(PointerTo<T> &&from) NOEXCEPT;
+  INLINE ConstPointerTo(ConstPointerTo<T> &&from) NOEXCEPT;
+  INLINE ConstPointerTo<T> &operator = (PointerTo<T> &&from) NOEXCEPT;
+  INLINE ConstPointerTo<T> &operator = (ConstPointerTo<T> &&from) NOEXCEPT;
+#endif
+
   INLINE const To &operator *() const;
   INLINE const To *operator -> () const;
   INLINE operator const T *() const;
@@ -163,6 +175,20 @@ PUBLISHED:
 };
 
 
+// The existence of these functions makes it possible to sort vectors
+// of PointerTo objects without incurring the cost of unnecessary
+// reference count changes.  The performance difference is dramatic!
+template <class T>
+void swap(PointerTo<T> &one, PointerTo<T> &two) NOEXCEPT {
+  one.swap(two);
+}
+
+template <class T>
+void swap(ConstPointerTo<T> &one, ConstPointerTo<T> &two) NOEXCEPT {
+  one.swap(two);
+}
+
+
 // Finally, we'll define a couple of handy abbreviations to save on
 // all that wasted typing time.
 
diff --git a/panda/src/express/pointerToArray.I b/panda/src/express/pointerToArray.I
index 152276d1ff..c833954570 100644
--- a/panda/src/express/pointerToArray.I
+++ b/panda/src/express/pointerToArray.I
@@ -39,7 +39,7 @@ PointerToArray(TypeHandle type_handle) :
 //  Description: Return an empty array of size n
 ////////////////////////////////////////////////////////////////////
 template<class Element>
-INLINE PointerToArray<Element> 
+INLINE PointerToArray<Element>
 PointerToArray<Element>::empty_array(size_type n, TypeHandle type_handle) {
   PointerToArray<Element> temp(type_handle);
   temp.reassign(new ReferenceCountedVector<Element>(type_handle));
@@ -77,129 +77,6 @@ PointerToArray(const PointerToArray<Element> &copy) :
 {
 }
 
-#ifdef HAVE_PYTHON
-////////////////////////////////////////////////////////////////////
-//     Function: PointerToArray::Constructor
-//       Access: Published
-//  Description: This special constructor accepts a Python list of
-//               elements, or a Python string (or a bytes object,
-//               in Python 3), or any object that supports the
-//               Python buffer protocol.
-////////////////////////////////////////////////////////////////////
-template<class Element>
-PointerToArray<Element>::
-PointerToArray(PyObject *self, PyObject *source) :
-  PointerToArrayBase<Element>((ReferenceCountedVector<Element> *)NULL),
-  _type_handle(get_type_handle(Element))
-{
-  // We have to pre-initialize self's "this" pointer when we receive
-  // self in the constructor--the caller can't initialize this for us.
-  ((Dtool_PyInstDef *)self)->_ptr_to_object = this;
-
-#if PY_VERSION_HEX >= 0x02060000
-  if (PyObject_CheckBuffer(source)) {
-    // User passed a buffer object.
-    Py_buffer view;
-    if (PyObject_GetBuffer(source, &view, PyBUF_CONTIG_RO) == -1) {
-      PyErr_SetString(PyExc_TypeError, "PointerToArray constructor requires a contiguous buffer");
-      return;
-    }
-
-    if (view.itemsize != 1 && view.itemsize != sizeof(Element)) {
-      PyErr_SetString(PyExc_TypeError, "buffer.itemsize does not match PointerToArray element size");
-      return;
-    }
-
-    int num_elements = view.len / sizeof(Element);
-    insert(begin(), num_elements, Element());
-
-    if (view.len > 0) {
-      memcpy(p(), view.buf, view.len);
-    }
-
-    PyBuffer_Release(&view);
-    return;
-  }
-#endif
-
-  if (!PySequence_Check(source)) {
-    // If passed with a non-sequence, this isn't the right constructor.
-    PyErr_SetString(PyExc_TypeError, "PointerToArray constructor requires a sequence or buffer object");
-    return;
-  }
-
-  // If we were passed a Python string, then instead of storing it
-  // character-at-a-time, just load the whole string as a data
-  // buffer.
-#if PY_MAJOR_VERSION >= 3
-  if (PyBytes_Check(source)) {
-    int size = PyBytes_Size(source);
-    if (size % sizeof(Element) != 0) {
-      ostringstream stream;
-      stream << "Buffer not a multiple of " << sizeof(Element) << " bytes";
-      string str = stream.str();
-      PyErr_SetString(PyExc_ValueError, str.c_str());
-      return;
-    }
-      
-    int num_elements = size / sizeof(Element);
-    insert(begin(), num_elements, Element());
-
-    // Hope there aren't any constructors or destructors involved
-    // here.
-    if (size != 0) {
-      const char *data = PyBytes_AsString(source);
-      memcpy(p(), data, size);
-    }
-    return;
-  }
-#else
-  if (PyString_CheckExact(source)) {
-    int size = PyString_Size(source);
-    if (size % sizeof(Element) != 0) {
-      ostringstream stream;
-      stream << "Buffer not a multiple of " << sizeof(Element) << " bytes";
-      string str = stream.str();
-      PyErr_SetString(PyExc_ValueError, str.c_str());
-      return;
-    }
-      
-    int num_elements = size / sizeof(Element);
-    insert(begin(), num_elements, Element());
-
-    // Hope there aren't any constructors or destructors involved
-    // here.
-    if (size != 0) {
-      const char *data = PyString_AsString(source);
-      memcpy(p(), data, size);
-    }
-    return;
-  }
-#endif
-
-  // Now construct the internal list by copying the elements
-  // one-at-a-time from Python.
-  int size = PySequence_Size(source);
-  for (int i = 0; i < size; ++i) {
-    PyObject *item = PySequence_GetItem(source, i);
-    if (item == NULL) {
-      return;
-    }
-    PyObject *result = PyObject_CallMethod(self, (char *)"pushBack", (char *)"O", item);
-    Py_DECREF(item);
-    if (result == NULL) {
-      // Unable to add item--probably it wasn't of the appropriate type.
-      ostringstream stream;
-      stream << "Element " << i << " in sequence passed to PointerToArray constructor could not be added";
-      string str = stream.str();
-      PyErr_SetString(PyExc_TypeError, str.c_str());
-      return;
-    }
-    Py_DECREF(result);
-  }
-}
-#endif  // HAVE_PYTHON
-
 ////////////////////////////////////////////////////////////////////
 //     Function: PointerToArray::begin
 //       Access: Public
@@ -593,31 +470,6 @@ set_element(size_type n, const Element &value) {
   (*this)[n] = value;
 }
 
-////////////////////////////////////////////////////////////////////
-//     Function: PointerToArray::__getitem__
-//       Access: Published
-//  Description: Same as get_element(), this returns the nth element
-//               of the array.
-////////////////////////////////////////////////////////////////////
-template<class Element>
-INLINE const Element &PointerToArray<Element>::
-__getitem__(size_type n) const {
-  return (*this)[n];
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: PointerToArray::__setitem__
-//       Access: Published
-//  Description: Same as set_element(), this replaces the nth element
-//               of the array.
-////////////////////////////////////////////////////////////////////
-template<class Element>
-INLINE void PointerToArray<Element>::
-__setitem__(size_type n, const Element &value) {
-  nassertv(n < ((To *)(this->_void_ptr))->size());
-  (*this)[n] = value;
-}
-
 ////////////////////////////////////////////////////////////////////
 //     Function: PointerToArray::get_data
 //       Access: Published
@@ -884,23 +736,6 @@ ConstPointerToArray(const ConstPointerToArray<Element> &copy) :
 {
 }
 
-#ifdef HAVE_PYTHON
-////////////////////////////////////////////////////////////////////
-//     Function: ConstPointerToArray::Constructor
-//       Access: Public
-//  Description: This special constructor accepts a Python list of
-//               elements, or a Python string (or a bytes object,
-//               in Python 3).
-////////////////////////////////////////////////////////////////////
-template<class Element>
-INLINE ConstPointerToArray<Element>::
-ConstPointerToArray(PyObject *self, PyObject *source) :
-  PointerToArrayBase<Element>(PointerToArray<Element>(self, source)),
-  _type_handle(get_type_handle(Element))
-{
-}
-#endif  // HAVE_PYTHON
-
 ////////////////////////////////////////////////////////////////////
 //     Function: ConstPointerToArray::begin
 //       Access: Public
@@ -1158,18 +993,6 @@ get_element(size_type n) const {
   return (*this)[n];
 }
 
-////////////////////////////////////////////////////////////////////
-//     Function: ConstPointerToArray::__getitem__
-//       Access: Published
-//  Description: Same as get_element(), this returns the nth element
-//               of the array.
-////////////////////////////////////////////////////////////////////
-template<class Element>
-INLINE const Element &ConstPointerToArray<Element>::
-__getitem__(size_type n) const {
-  return (*this)[n];
-}
-
 ////////////////////////////////////////////////////////////////////
 //     Function: ConstPointerToArray::get_data
 //       Access: Published
@@ -1331,150 +1154,4 @@ clear() {
   ((ConstPointerToArray<Element> *)this)->reassign((ReferenceCountedVector<Element> *)NULL);
 }
 
-#ifdef HAVE_PYTHON
-#if PY_VERSION_HEX >= 0x02060000
-////////////////////////////////////////////////////////////////////
-//     Function: PointerToArray::__getbuffer__
-//       Access: Published
-//  Description: This is used to implement the buffer protocol, in
-//               order to allow efficient access to the array data
-//               through a Python multiview object.
-////////////////////////////////////////////////////////////////////
-template<class Element>
-INLINE int PointerToArray<Element>::
-__getbuffer__(PyObject *self, Py_buffer *view, int flags) {
-
-  const char *format = get_format_code(Element);
-  if (format == NULL) {
-    // Not supported.
-    return -1;
-  }
-
-  if (self != NULL) {
-    Py_INCREF(self);
-  }
-  view->obj = self;
-  view->buf = (void*) p();
-  view->len = size() * sizeof(Element);
-  view->readonly = 0;
-  view->itemsize = sizeof(Element);
-  view->format = NULL;
-  if ((flags & PyBUF_FORMAT) == PyBUF_FORMAT) {
-    view->format = (char*) format;
-  }
-  view->ndim = 1;
-  view->shape = NULL;
-  if ((flags & PyBUF_ND) == PyBUF_ND) {
-    // This leaks, which sucks, but __releasebuffer__ doesn't give us
-    // the same pointer, so we would need to store it elsewhere if we
-    // wanted to delete it there.  Eh, it's just an int, who cares.
-    view->shape = new Py_ssize_t(size());
-  }
-  view->strides = NULL;
-  if ((flags & PyBUF_STRIDES) == PyBUF_STRIDES) {
-    view->strides = &(view->itemsize);
-  }
-  view->suboffsets = NULL;
-
-  // Store a reference to ourselves on the Py_buffer object
-  // as a reminder that we have increased our refcount.
-  ref();
-  view->internal = (void*) this;
-
-  return 0;
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: PointerToArray::__releasebuffer__
-//       Access: Published
-//  Description: Releases the buffer allocated by __getbuffer__.
-////////////////////////////////////////////////////////////////////
-template<class Element>
-INLINE void PointerToArray<Element>::
-__releasebuffer__(PyObject *self, Py_buffer *view) const {
-  // Note: PyBuffer_Release automatically decrements view->obj.
-
-  if (view->internal != NULL) {
-    // Oh, right, let's not forget to unref this.
-    ((const PointerToArray<Element> *) view->internal)->unref();
-    view->internal = NULL;
-  }
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: ConstPointerToArray::__getbuffer__
-//       Access: Published
-//  Description: This is used to implement the buffer protocol, in
-//               order to allow efficient access to the array data
-//               through a Python multiview object.
-////////////////////////////////////////////////////////////////////
-template<class Element>
-INLINE int ConstPointerToArray<Element>::
-__getbuffer__(PyObject *self, Py_buffer *view, int flags) const {
-
-  if ((flags & PyBUF_WRITABLE) == PyBUF_WRITABLE) {
-    PyErr_SetString(PyExc_BufferError,
-                    "Object is not writable.");
-    return -1;
-  }
-
-  const char *format = get_format_code(Element);
-  if (format == NULL) {
-    // Not supported.
-    return -1;
-  }
-
-  if (self != NULL) {
-    Py_INCREF(self);
-  }
-  view->obj = self;
-  view->buf = (void*) p();
-  view->len = size() * sizeof(Element);
-  view->readonly = 1;
-  view->itemsize = sizeof(Element);
-  view->format = NULL;
-  if ((flags & PyBUF_FORMAT) == PyBUF_FORMAT) {
-    view->format = (char*) format;
-  }
-  view->ndim = 1;
-  view->shape = NULL;
-  if ((flags & PyBUF_ND) == PyBUF_ND) {
-    // This leaks, which sucks, but __releasebuffer__ doesn't give us
-    // the same pointer, so we would need to store it elsewhere if we
-    // wanted to delete it there.  Eh, it's just an int, who cares.
-    view->shape = new Py_ssize_t(size());
-  }
-  view->strides = NULL;
-  if ((flags & PyBUF_STRIDES) == PyBUF_STRIDES) {
-    view->strides = &(view->itemsize);
-  }
-  view->suboffsets = NULL;
-
-  // Store a reference to ourselves on the Py_buffer object
-  // as a reminder that we have increased our refcount.
-  ref();
-  view->internal = (void*) this;
-
-  return 0;
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: ConstPointerToArray::__releasebuffer__
-//       Access: Published
-//  Description: Releases the buffer allocated by __getbuffer__.
-////////////////////////////////////////////////////////////////////
-template<class Element>
-INLINE void ConstPointerToArray<Element>::
-__releasebuffer__(PyObject *self, Py_buffer *view) const {
-  // Note: PyBuffer_Release automatically decrements obj->view.
-
-  if (view->internal != NULL) {
-    // Oh, right, let's not forget to unref this.
-    ((const PointerToArray<Element> *) view->internal)->unref();
-    view->internal = NULL;
-  }
-}
-#endif  // PY_VERSION_HEX
-#endif  // HAVE_PYTHON
-
 #endif  // CPPPARSER
diff --git a/panda/src/express/pointerToArray.h b/panda/src/express/pointerToArray.h
index c5f545fbd3..78b504d202 100644
--- a/panda/src/express/pointerToArray.h
+++ b/panda/src/express/pointerToArray.h
@@ -67,9 +67,6 @@
 #include "pandabase.h"
 
 #include "pointerToArrayBase.h"
-#ifdef HAVE_PYTHON
-#include "py_panda.h"
-#endif
 
 #if (defined(WIN32_VC) || defined(WIN64_VC)) && !defined(__INTEL_COMPILER)
 // disable mysterious MSVC warning for static inline PTA::empty_array method
@@ -112,17 +109,15 @@ PUBLISHED:
   INLINE static PointerToArray<Element> empty_array(size_type n, TypeHandle type_handle = get_type_handle(Element));
   INLINE PointerToArray(const PointerToArray<Element> &copy);
 
-#ifdef HAVE_PYTHON
-  PointerToArray(PyObject *self, PyObject *source);
-#endif
+  EXTENSION(PointerToArray(PyObject *self, PyObject *source));
 
   INLINE size_type size() const;
   INLINE void push_back(const Element &x);
   INLINE void pop_back();
   INLINE const Element &get_element(size_type n) const;
   INLINE void set_element(size_type n, const Element &value);
-  INLINE const Element &__getitem__(size_type n) const;
-  INLINE void __setitem__(size_type n, const Element &value);
+  EXTENSION(const Element &__getitem__(size_type n) const);
+  EXTENSION(void __setitem__(size_type n, const Element &value));
   INLINE string get_data() const;
   INLINE void set_data(const string &data);
   INLINE string get_subdata(size_type n, size_type count) const;
@@ -132,8 +127,8 @@ PUBLISHED:
 
 #ifdef HAVE_PYTHON
 #if PY_VERSION_HEX >= 0x02060000
-  int __getbuffer__(PyObject *self, Py_buffer *view, int flags);
-  void __releasebuffer__(PyObject *self, Py_buffer *view) const;
+  EXTENSION(int __getbuffer__(PyObject *self, Py_buffer *view, int flags));
+  EXTENSION(void __releasebuffer__(PyObject *self, Py_buffer *view) const);
 #endif
 #endif
 
@@ -156,10 +151,6 @@ public:
   INLINE PointerToArray(size_type n, const Element &value, TypeHandle type_handle = get_type_handle(Element));
   INLINE PointerToArray(const PointerToArray<Element> &copy);
 
-#ifdef HAVE_PYTHON
-  PointerToArray(PyObject *self, PyObject *source);
-#endif
-
 public:
   // Duplicating the interface of vector.  The following member
   // functions are all const, because they do not reassign the
@@ -213,8 +204,6 @@ public:
   // Methods to help out Python and other high-level languages.
   INLINE const Element &get_element(size_type n) const;
   INLINE void set_element(size_type n, const Element &value);
-  INLINE const Element &__getitem__(size_type n) const;
-  INLINE void __setitem__(size_type n, const Element &value);
   INLINE string get_data() const;
   INLINE void set_data(const string &data);
   INLINE string get_subdata(size_type n, size_type count) const;
@@ -237,13 +226,6 @@ public:
   INLINE void node_ref() const;
   INLINE bool node_unref() const;
 
-#ifdef HAVE_PYTHON
-#if PY_VERSION_HEX >= 0x02060000
-  int __getbuffer__(PyObject *self, Py_buffer *view, int flags);
-  void __releasebuffer__(PyObject *self, Py_buffer *view) const;
-#endif
-#endif
-
   // Reassignment is by pointer, not memberwise as with a vector.
   INLINE PointerToArray<Element> &
   operator = (ReferenceCountedVector<Element> *ptr);
@@ -283,14 +265,12 @@ PUBLISHED:
   INLINE ConstPointerToArray(const PointerToArray<Element> &copy);
   INLINE ConstPointerToArray(const ConstPointerToArray<Element> &copy);
 
-#ifdef HAVE_PYTHON
-  INLINE ConstPointerToArray(PyObject *self, PyObject *source);
-#endif
+  EXTENSION(ConstPointerToArray(PyObject *self, PyObject *source));
 
   typedef TYPENAME pvector<Element>::size_type size_type;
   INLINE size_type size() const;
   INLINE const Element &get_element(size_type n) const;
-  INLINE const Element &__getitem__(size_type n) const;
+  EXTENSION(const Element &__getitem__(size_type n) const);
   INLINE string get_data() const;
   INLINE string get_subdata(size_type n, size_type count) const;
   INLINE int get_ref_count() const;
@@ -298,8 +278,8 @@ PUBLISHED:
 
 #ifdef HAVE_PYTHON
 #if PY_VERSION_HEX >= 0x02060000
-  int __getbuffer__(PyObject *self, Py_buffer *view, int flags) const;
-  void __releasebuffer__(PyObject *self, Py_buffer *view) const;
+  EXTENSION(int __getbuffer__(PyObject *self, Py_buffer *view, int flags) const);
+  EXTENSION(void __releasebuffer__(PyObject *self, Py_buffer *view) const);
 #endif
 #endif
 
@@ -325,10 +305,6 @@ PUBLISHED:
   INLINE ConstPointerToArray(const PointerToArray<Element> &copy);
   INLINE ConstPointerToArray(const ConstPointerToArray<Element> &copy);
 
-#ifdef HAVE_PYTHON
-  INLINE ConstPointerToArray(PyObject *self, PyObject *source);
-#endif
-
   // Duplicating the interface of vector.
 
   INLINE iterator begin() const;
@@ -361,7 +337,6 @@ PUBLISHED:
 
   // Methods to help out Python and other high-level languages.
   INLINE const Element &get_element(size_type n) const;
-  INLINE const Element &__getitem__(size_type n) const;
   INLINE string get_data() const;
   INLINE string get_subdata(size_type n, size_type count) const;
 
@@ -373,13 +348,6 @@ PUBLISHED:
   INLINE void node_ref() const;
   INLINE bool node_unref() const;
 
-#ifdef HAVE_PYTHON
-#if PY_VERSION_HEX >= 0x02060000
-  int __getbuffer__(PyObject *self, Py_buffer *view, int flags) const;
-  void __releasebuffer__(PyObject *self, Py_buffer *view) const;
-#endif
-#endif
-
   // Reassignment is by pointer, not memberwise as with a vector.
   INLINE ConstPointerToArray<Element> &
   operator = (ReferenceCountedVector<Element> *ptr);
@@ -408,36 +376,6 @@ private:
 #define PTA(type) PointerToArray< type >
 #define CPTA(type) ConstPointerToArray< type >
 
-#ifdef HAVE_PYTHON
-// This macro is used to map a data type to a format code
-// as used in the Python 'struct' and 'array' modules.
-#define get_format_code(type) _get_format_code((const type *)0)
-#define define_format_code(code, type) template<> \
-  INLINE const char *_get_format_code(const type *) { \
-    return code; \
-  }
-
-template<class T>
-INLINE const char *_get_format_code(const T *) {
-  return NULL;
-}
-
-define_format_code("c", char);
-define_format_code("b", signed char);
-define_format_code("B", unsigned char);
-define_format_code("h", short);
-define_format_code("H", unsigned short);
-define_format_code("i", int);
-define_format_code("I", unsigned int);
-define_format_code("l", long);
-define_format_code("L", unsigned long);
-define_format_code("q", long long);
-define_format_code("Q", unsigned long long);
-define_format_code("f", float);
-define_format_code("d", double);
-
-#endif  // HAVE_PYTHON
-
 #include "pointerToArray.I"
 
 #endif  // HAVE_POINTERTOARRAY_H
diff --git a/panda/src/express/pointerToArray_ext.I b/panda/src/express/pointerToArray_ext.I
new file mode 100644
index 0000000000..c53b0c3ee0
--- /dev/null
+++ b/panda/src/express/pointerToArray_ext.I
@@ -0,0 +1,321 @@
+// Filename: pointerToArray_ext.I
+// Created by:  rdb (08Feb15)
+//
+////////////////////////////////////////////////////////////////////
+//
+// 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."
+//
+////////////////////////////////////////////////////////////////////
+
+
+////////////////////////////////////////////////////////////////////
+//     Function: PointerToArray::__init__
+//       Access: Published
+//  Description: This special constructor accepts a Python list of
+//               elements, or a Python string (or a bytes object,
+//               in Python 3), or any object that supports the
+//               Python buffer protocol.
+////////////////////////////////////////////////////////////////////
+template<class Element>
+void Extension<PointerToArray<Element> >::
+__init__(PyObject *self, PyObject *source) {
+#if PY_VERSION_HEX >= 0x02060000
+  if (PyObject_CheckBuffer(source)) {
+    // User passed a buffer object.
+    Py_buffer view;
+    if (PyObject_GetBuffer(source, &view, PyBUF_CONTIG_RO) == -1) {
+      PyErr_SetString(PyExc_TypeError, "PointerToArray constructor requires a contiguous buffer");
+      return;
+    }
+
+    if (view.itemsize != 1 && view.itemsize != sizeof(Element)) {
+      PyErr_SetString(PyExc_TypeError, "buffer.itemsize does not match PointerToArray element size");
+      return;
+    }
+
+    int num_elements = view.len / sizeof(Element);
+    this->_this->insert(this->_this->begin(), num_elements, Element());
+
+    if (view.len > 0) {
+      memcpy(this->_this->p(), view.buf, view.len);
+    }
+
+    PyBuffer_Release(&view);
+    return;
+  }
+#endif
+
+  if (!PySequence_Check(source)) {
+    // If passed with a non-sequence, this isn't the right constructor.
+    PyErr_SetString(PyExc_TypeError, "PointerToArray constructor requires a sequence or buffer object");
+    return;
+  }
+
+  // If we were passed a Python string, then instead of storing it
+  // character-at-a-time, just load the whole string as a data
+  // buffer.
+#if PY_MAJOR_VERSION >= 3
+  if (PyBytes_Check(source)) {
+    int size = PyBytes_Size(source);
+    if (size % sizeof(Element) != 0) {
+      ostringstream stream;
+      stream << "Buffer not a multiple of " << sizeof(Element) << " bytes";
+      string str = stream.str();
+      PyErr_SetString(PyExc_ValueError, str.c_str());
+      return;
+    }
+
+    int num_elements = size / sizeof(Element);
+    this->_this->insert(this->_this->begin(), num_elements, Element());
+
+    // Hope there aren't any constructors or destructors involved
+    // here.
+    if (size != 0) {
+      const char *data = PyBytes_AsString(source);
+      memcpy(this->_this->p(), data, size);
+    }
+    return;
+  }
+#else
+  if (PyString_CheckExact(source)) {
+    int size = PyString_Size(source);
+    if (size % sizeof(Element) != 0) {
+      ostringstream stream;
+      stream << "Buffer not a multiple of " << sizeof(Element) << " bytes";
+      string str = stream.str();
+      PyErr_SetString(PyExc_ValueError, str.c_str());
+      return;
+    }
+
+    int num_elements = size / sizeof(Element);
+    this->_this->insert(this->_this->begin(), num_elements, Element());
+
+    // Hope there aren't any constructors or destructors involved
+    // here.
+    if (size != 0) {
+      const char *data = PyString_AsString(source);
+      memcpy(this->_this->p(), data, size);
+    }
+    return;
+  }
+#endif
+
+  // Now construct the internal list by copying the elements
+  // one-at-a-time from Python.
+  int size = PySequence_Size(source);
+  for (int i = 0; i < size; ++i) {
+    PyObject *item = PySequence_GetItem(source, i);
+    if (item == NULL) {
+      return;
+    }
+    PyObject *result = PyObject_CallMethod(self, (char *)"push_back", (char *)"O", item);
+    Py_DECREF(item);
+    if (result == NULL) {
+      // Unable to add item--probably it wasn't of the appropriate type.
+      ostringstream stream;
+      stream << "Element " << i << " in sequence passed to PointerToArray constructor could not be added";
+      string str = stream.str();
+      PyErr_SetString(PyExc_TypeError, str.c_str());
+      return;
+    }
+    Py_DECREF(result);
+  }
+}
+
+////////////////////////////////////////////////////////////////////
+//     Function: PointerToArray::__getitem__
+//       Access: Published
+//  Description: Same as get_element(), this returns the nth element
+//               of the array.
+////////////////////////////////////////////////////////////////////
+template<class Element>
+INLINE const Element &Extension<PointerToArray<Element> >::
+__getitem__(size_t n) const {
+  return this->_this->get_element(n);
+}
+
+////////////////////////////////////////////////////////////////////
+//     Function: PointerToArray::__setitem__
+//       Access: Published
+//  Description: Same as set_element(), this replaces the nth element
+//               of the array.
+////////////////////////////////////////////////////////////////////
+template<class Element>
+INLINE void Extension<PointerToArray<Element> >::
+__setitem__(size_t n, const Element &value) {
+  this->_this->set_element(n, value);
+}
+
+////////////////////////////////////////////////////////////////////
+//     Function: ConstPointerToArray::__init__
+//       Access: Public
+//  Description: This special constructor accepts a Python list of
+//               elements, or a Python string (or a bytes object,
+//               in Python 3).
+////////////////////////////////////////////////////////////////////
+template<class Element>
+INLINE void Extension<ConstPointerToArray<Element> >::
+__init__(PyObject *self, PyObject *source) {
+  new (this->_this) ConstPointerToArray<Element>(get_type_handle(Element));
+}
+
+////////////////////////////////////////////////////////////////////
+//     Function: ConstPointerToArray::__getitem__
+//       Access: Published
+//  Description: Same as get_element(), this returns the nth element
+//               of the array.
+////////////////////////////////////////////////////////////////////
+template<class Element>
+INLINE const Element &Extension<ConstPointerToArray<Element> >::
+__getitem__(size_t n) const {
+  return (*this->_this)[n];
+}
+
+#if PY_VERSION_HEX >= 0x02060000
+////////////////////////////////////////////////////////////////////
+//     Function: PointerToArray::__getbuffer__
+//       Access: Published
+//  Description: This is used to implement the buffer protocol, in
+//               order to allow efficient access to the array data
+//               through a Python multiview object.
+////////////////////////////////////////////////////////////////////
+template<class Element>
+INLINE int Extension<PointerToArray<Element> >::
+__getbuffer__(PyObject *self, Py_buffer *view, int flags) {
+
+  const char *format = get_format_code(Element);
+  if (format == NULL) {
+    // Not supported.
+    return -1;
+  }
+
+  if (self != NULL) {
+    Py_INCREF(self);
+  }
+  view->obj = self;
+  view->buf = (void*) this->_this->p();
+  view->len = this->_this->size() * sizeof(Element);
+  view->readonly = 0;
+  view->itemsize = sizeof(Element);
+  view->format = NULL;
+  if ((flags & PyBUF_FORMAT) == PyBUF_FORMAT) {
+    view->format = (char*) format;
+  }
+  view->ndim = 1;
+  view->shape = NULL;
+  if ((flags & PyBUF_ND) == PyBUF_ND) {
+    // This leaks, which sucks, but __releasebuffer__ doesn't give us
+    // the same pointer, so we would need to store it elsewhere if we
+    // wanted to delete it there.  Eh, it's just an int, who cares.
+    view->shape = new Py_ssize_t(this->_this->size());
+  }
+  view->strides = NULL;
+  if ((flags & PyBUF_STRIDES) == PyBUF_STRIDES) {
+    view->strides = &(view->itemsize);
+  }
+  view->suboffsets = NULL;
+
+  // Store a reference to ourselves on the Py_buffer object
+  // as a reminder that we have increased our refcount.
+  this->_this->ref();
+  view->internal = (void*) this->_this;
+
+  return 0;
+}
+
+////////////////////////////////////////////////////////////////////
+//     Function: PointerToArray::__releasebuffer__
+//       Access: Published
+//  Description: Releases the buffer allocated by __getbuffer__.
+////////////////////////////////////////////////////////////////////
+template<class Element>
+INLINE void Extension<PointerToArray<Element> >::
+__releasebuffer__(PyObject *self, Py_buffer *view) const {
+  // Note: PyBuffer_Release automatically decrements view->obj.
+
+  if (view->internal != NULL) {
+    // Oh, right, let's not forget to unref this.
+    ((const PointerToArray<Element> *) view->internal)->unref();
+    view->internal = NULL;
+  }
+}
+
+////////////////////////////////////////////////////////////////////
+//     Function: ConstPointerToArray::__getbuffer__
+//       Access: Published
+//  Description: This is used to implement the buffer protocol, in
+//               order to allow efficient access to the array data
+//               through a Python multiview object.
+////////////////////////////////////////////////////////////////////
+template<class Element>
+INLINE int Extension<ConstPointerToArray<Element> >::
+__getbuffer__(PyObject *self, Py_buffer *view, int flags) const {
+
+  if ((flags & PyBUF_WRITABLE) == PyBUF_WRITABLE) {
+    PyErr_SetString(PyExc_BufferError,
+                    "Object is not writable.");
+    return -1;
+  }
+
+  const char *format = get_format_code(Element);
+  if (format == NULL) {
+    // Not supported.
+    return -1;
+  }
+
+  if (self != NULL) {
+    Py_INCREF(self);
+  }
+  view->obj = self;
+  view->buf = (void*) this->_this->p();
+  view->len = this->_this->size() * sizeof(Element);
+  view->readonly = 1;
+  view->itemsize = sizeof(Element);
+  view->format = NULL;
+  if ((flags & PyBUF_FORMAT) == PyBUF_FORMAT) {
+    view->format = (char*) format;
+  }
+  view->ndim = 1;
+  view->shape = NULL;
+  if ((flags & PyBUF_ND) == PyBUF_ND) {
+    // This leaks, which sucks, but __releasebuffer__ doesn't give us
+    // the same pointer, so we would need to store it elsewhere if we
+    // wanted to delete it there.  Eh, it's just an int, who cares.
+    view->shape = new Py_ssize_t(this->_this->size());
+  }
+  view->strides = NULL;
+  if ((flags & PyBUF_STRIDES) == PyBUF_STRIDES) {
+    view->strides = &(view->itemsize);
+  }
+  view->suboffsets = NULL;
+
+  // Store a reference to ourselves on the Py_buffer object
+  // as a reminder that we have increased our refcount.
+  this->_this->ref();
+  view->internal = (void*) this->_this;
+
+  return 0;
+}
+
+////////////////////////////////////////////////////////////////////
+//     Function: ConstPointerToArray::__releasebuffer__
+//       Access: Published
+//  Description: Releases the buffer allocated by __getbuffer__.
+////////////////////////////////////////////////////////////////////
+template<class Element>
+INLINE void Extension<ConstPointerToArray<Element> >::
+__releasebuffer__(PyObject *self, Py_buffer *view) const {
+  // Note: PyBuffer_Release automatically decrements obj->view.
+
+  if (view->internal != NULL) {
+    // Oh, right, let's not forget to unref this.
+    ((const PointerToArray<Element> *) view->internal)->unref();
+    view->internal = NULL;
+  }
+}
+#endif  // PY_VERSION_HEX
diff --git a/panda/src/express/pointerToArray_ext.h b/panda/src/express/pointerToArray_ext.h
new file mode 100644
index 0000000000..b403ed4dc6
--- /dev/null
+++ b/panda/src/express/pointerToArray_ext.h
@@ -0,0 +1,100 @@
+// Filename: pointerToArray_ext.h
+// Created by:  rdb (08Feb15)
+//
+////////////////////////////////////////////////////////////////////
+//
+// 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 POINTERTOARRAY_EXT_H
+#define POINTERTOARRAY_EXT_H
+
+#ifndef CPPPARSER
+
+#include "extension.h"
+#include "py_panda.h"
+#include "pointerToArray.h"
+
+////////////////////////////////////////////////////////////////////
+//       Class : Extension<PointerToArray>
+// Description : This class defines the extension methods for
+//               PointerToArray, which are called instead of
+//               any C++ methods with the same prototype.
+//
+//               This is a little bit awkward because of the nested
+//               templating, but it does the job.
+////////////////////////////////////////////////////////////////////
+template<class Element>
+class Extension<PointerToArray<Element> > : public ExtensionBase<PointerToArray<Element> > {
+public:
+  INLINE void __init__(PyObject *self, PyObject *source);
+
+  INLINE const Element &__getitem__(size_t n) const;
+  INLINE void __setitem__(size_t n, const Element &value);
+
+#if PY_VERSION_HEX >= 0x02060000
+  INLINE int __getbuffer__(PyObject *self, Py_buffer *view, int flags);
+  INLINE void __releasebuffer__(PyObject *self, Py_buffer *view) const;
+#endif
+};
+
+////////////////////////////////////////////////////////////////////
+//       Class : Extension<ConstPointerToArray>
+// Description : This class defines the extension methods for
+//               ConstPointerToArray, which are called instead of
+//               any C++ methods with the same prototype.
+//
+//               This is a little bit awkward because of the nested
+//               templating, but it does the job.
+////////////////////////////////////////////////////////////////////
+template<class Element>
+class Extension<ConstPointerToArray<Element> > : public ExtensionBase<ConstPointerToArray<Element> > {
+public:
+  INLINE void __init__(PyObject *self, PyObject *source);
+
+  INLINE const Element &__getitem__(size_t n) const;
+
+#if PY_VERSION_HEX >= 0x02060000
+  INLINE int __getbuffer__(PyObject *self, Py_buffer *view, int flags) const;
+  INLINE void __releasebuffer__(PyObject *self, Py_buffer *view) const;
+#endif
+};
+
+// This macro is used to map a data type to a format code
+// as used in the Python 'struct' and 'array' modules.
+#define get_format_code(type) _get_format_code((const type *)0)
+#define define_format_code(code, type) template<> \
+  INLINE const char *_get_format_code(const type *) { \
+    return code; \
+  }
+
+template<class T>
+INLINE const char *_get_format_code(const T *) {
+  return NULL;
+}
+
+define_format_code("c", char);
+define_format_code("b", signed char);
+define_format_code("B", unsigned char);
+define_format_code("h", short);
+define_format_code("H", unsigned short);
+define_format_code("i", int);
+define_format_code("I", unsigned int);
+define_format_code("l", long);
+define_format_code("L", unsigned long);
+define_format_code("q", long long);
+define_format_code("Q", unsigned long long);
+define_format_code("f", float);
+define_format_code("d", double);
+
+#include "pointerToArray_ext.I"
+
+#endif  // CPPPARSER
+
+#endif  // HAVE_POINTERTOARRAY_EXT_H
diff --git a/panda/src/express/pointerToBase.I b/panda/src/express/pointerToBase.I
index df0b635093..783d59353e 100644
--- a/panda/src/express/pointerToBase.I
+++ b/panda/src/express/pointerToBase.I
@@ -46,6 +46,43 @@ INLINE PointerToBase<T>::
   reassign((To *)NULL);
 }
 
+#ifdef USE_MOVE_SEMANTICS
+////////////////////////////////////////////////////////////////////
+//     Function: PointerToBase::Move Constructor
+//       Access: Protected
+//  Description:
+////////////////////////////////////////////////////////////////////
+template<class T>
+INLINE PointerToBase<T>::
+PointerToBase(PointerToBase<T> &&from) NOEXCEPT {
+  _void_ptr = from._void_ptr;
+  from._void_ptr = (void *)NULL;
+}
+
+////////////////////////////////////////////////////////////////////
+//     Function: PointerToBase::reassign
+//       Access: Protected
+//  Description: This version of reassign is called when a PointerTo
+//               is assigned to this PointerTo as an rvalue.  In
+//               this case, we can steal the reference count from
+//               the other PointerTo, without needing to call ref()
+//               and unref() unnecessarily.
+////////////////////////////////////////////////////////////////////
+template<class T>
+INLINE void PointerToBase<T>::
+reassign(PointerToBase<T> &&from) NOEXCEPT {
+  To *old_ptr = (To *)this->_void_ptr;
+
+  this->_void_ptr = from._void_ptr;
+  from._void_ptr = NULL;
+
+  // Now delete the old pointer.
+  if (old_ptr != (To *)NULL) {
+    unref_delete(old_ptr);
+  }
+}
+#endif  // USE_MOVE_SEMANTICS
+
 ////////////////////////////////////////////////////////////////////
 //     Function: PointerToBase::reassign
 //       Access: Protected
diff --git a/panda/src/express/pointerToBase.h b/panda/src/express/pointerToBase.h
index dd8a610188..0828e300f8 100644
--- a/panda/src/express/pointerToBase.h
+++ b/panda/src/express/pointerToBase.h
@@ -38,6 +38,11 @@ protected:
   INLINE PointerToBase(const PointerToBase<T> &copy);
   INLINE ~PointerToBase();
 
+#ifdef USE_MOVE_SEMANTICS
+  INLINE PointerToBase(PointerToBase<T> &&from) NOEXCEPT;
+  INLINE void reassign(PointerToBase<To> &&from) NOEXCEPT;
+#endif
+
   INLINE void reassign(To *ptr);
   INLINE void reassign(const PointerToBase<To> &copy);
 
diff --git a/panda/src/express/pointerToVoid.I b/panda/src/express/pointerToVoid.I
index 0834b25f60..8080801837 100644
--- a/panda/src/express/pointerToVoid.I
+++ b/panda/src/express/pointerToVoid.I
@@ -105,3 +105,18 @@ operator != (const PointerToVoid &other) const {
   return _void_ptr != other._void_ptr;
 }
 
+////////////////////////////////////////////////////////////////////
+//     Function: PointerToVoid::swap
+//       Access: Public
+//  Description: Swaps the contents of this PointerTo with the other,
+//               without touching the reference counts.
+//
+//               For internal use only.  Use the global swap()
+//               function instead.
+////////////////////////////////////////////////////////////////////
+INLINE void PointerToVoid::
+swap(PointerToVoid &other) NOEXCEPT {
+  AtomicAdjust::Pointer temp = _void_ptr;
+  _void_ptr = other._void_ptr;
+  other._void_ptr = temp;
+}
diff --git a/panda/src/express/pointerToVoid.h b/panda/src/express/pointerToVoid.h
index 7b1a9ff335..d3a71d7c8b 100644
--- a/panda/src/express/pointerToVoid.h
+++ b/panda/src/express/pointerToVoid.h
@@ -20,6 +20,8 @@
 #include "memoryBase.h"
 #include "atomicAdjust.h"
 
+#include <algorithm>
+
 ////////////////////////////////////////////////////////////////////
 //       Class : PointerToVoid
 // Description : This is the non-template part of the base class for
@@ -52,6 +54,8 @@ public:
   INLINE bool operator == (const PointerToVoid &other) const;
   INLINE bool operator != (const PointerToVoid &other) const;
 
+  INLINE void swap(PointerToVoid &other) NOEXCEPT;
+
 protected:
   // Within the PointerToVoid class, we only store a void pointer.
   // This is actually the (To *) pointer that is typecast to (void *)
diff --git a/panda/src/express/trueClock.cxx b/panda/src/express/trueClock.cxx
index e6d9a73125..aeb2a28e56 100644
--- a/panda/src/express/trueClock.cxx
+++ b/panda/src/express/trueClock.cxx
@@ -30,7 +30,9 @@ TrueClock *TrueClock::_global_ptr = NULL;
 ////////////////////////////////////////////////////////////////////
 
 #include <sys/timeb.h>
-#define WIN32_LEAN_AND_MEAN
+#ifndef WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN 1
+#endif
 #include <windows.h>
 
 static const double _0001 = 1.0 / 1000.0;
diff --git a/panda/src/express/virtualFileSystem_ext.cxx b/panda/src/express/virtualFileSystem_ext.cxx
index 3f1c3f40f8..9de1786987 100644
--- a/panda/src/express/virtualFileSystem_ext.cxx
+++ b/panda/src/express/virtualFileSystem_ext.cxx
@@ -13,6 +13,7 @@
 ////////////////////////////////////////////////////////////////////
 
 #include "virtualFileSystem_ext.h"
+#include "vector_uchar.h"
 
 #ifdef HAVE_PYTHON
 
@@ -30,7 +31,7 @@
 ////////////////////////////////////////////////////////////////////
 PyObject *Extension<VirtualFileSystem>::
 read_file(const Filename &filename, bool auto_unwrap) const {
-  pvector<unsigned char> pv;
+  vector_uchar pv;
   bool okflag = _this->read_file(filename, pv, auto_unwrap);
   nassertr(okflag, NULL);
 
diff --git a/panda/src/express/windowsRegistry.cxx b/panda/src/express/windowsRegistry.cxx
index f186476dd1..60865ddfad 100755
--- a/panda/src/express/windowsRegistry.cxx
+++ b/panda/src/express/windowsRegistry.cxx
@@ -17,7 +17,9 @@
 #include "textEncoder.h"
 
 #if defined(WIN32_VC)
-#define WIN32_LEAN_AND_MEAN
+#ifndef WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN 1
+#endif
 #include <windows.h>
 
 ////////////////////////////////////////////////////////////////////
diff --git a/panda/src/framework/Sources.pp b/panda/src/framework/Sources.pp
index d19d1fd3d5..ff9614ddd1 100644
--- a/panda/src/framework/Sources.pp
+++ b/panda/src/framework/Sources.pp
@@ -15,8 +15,6 @@
     #define LOCAL_LIBS pandagl $[LOCAL_LIBS]
   #elif $[HAVE_DX9]
     #define LOCAL_LIBS pandadx9 $[LOCAL_LIBS]
-  #elif $[HAVE_DX8]
-    #define LOCAL_LIBS pandadx8 $[LOCAL_LIBS]
   #elif $[HAVE_TINYDISPLAY]
     #define LOCAL_LIBS p3tinydisplay $[LOCAL_LIBS]
   #endif
diff --git a/panda/src/framework/pandaFramework.cxx b/panda/src/framework/pandaFramework.cxx
index 9225931e8b..2f886bae29 100644
--- a/panda/src/framework/pandaFramework.cxx
+++ b/panda/src/framework/pandaFramework.cxx
@@ -37,7 +37,7 @@ LoaderOptions PandaFramework::_loader_options;
 ////////////////////////////////////////////////////////////////////
 //     Function: PandaFramework::Constructor
 //       Access: Public
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 PandaFramework::
 PandaFramework() :
@@ -63,7 +63,7 @@ PandaFramework() :
 ////////////////////////////////////////////////////////////////////
 //     Function: PandaFramework::Destructor
 //       Access: Public, Virtual
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 PandaFramework::
 ~PandaFramework() {
@@ -98,9 +98,6 @@ open_framework(int &argc, char **&argv) {
   #elif defined(HAVE_DX9)
   extern EXPCL_PANDADX9 void init_libpandadx9();
   init_libpandadx9();
-  #elif defined(HAVE_DX8)
-  extern EXPCL_PANDADX8 void init_libpandadx8();
-  init_libpandadx8();
   #elif defined(HAVE_TINYDISPLAY)
   extern EXPCL_TINYDISPLAY void init_libtinydisplay();
   init_libtinydisplay();
@@ -143,12 +140,6 @@ open_framework(int &argc, char **&argv) {
     _task_mgr.add(task);
   }
 
-  _highlight_wireframe = NodePath("wireframe");
-  _highlight_wireframe.set_render_mode_wireframe(1);
-  _highlight_wireframe.set_texture_off(1);
-  _highlight_wireframe.set_color(1.0f, 0.0f, 0.0f, 1.0f, 1);
-  _highlight_wireframe.set_attrib(DepthOffsetAttrib::make());
-
   if (!playback_session.empty()) {
     // If the config file so indicates, create a recorder and start it
     // playing.
@@ -158,7 +149,7 @@ open_framework(int &argc, char **&argv) {
     PT(GenericAsyncTask) task = new GenericAsyncTask("play_frame", task_play_frame, this);
     task->set_sort(55);
     _task_mgr.add(task);
-    
+
   } else if (!record_session.empty()) {
     // If the config file so indicates, create a recorder and start it
     // recording.
@@ -168,7 +159,7 @@ open_framework(int &argc, char **&argv) {
     PT(GenericAsyncTask) task = new GenericAsyncTask("record_frame", task_record_frame, this);
     task->set_sort(45);
     _task_mgr.add(task);
-  } 
+  }
 
   _event_handler.add_hook("window-event", event_window_event, this);
 }
@@ -263,7 +254,7 @@ get_mouse(GraphicsOutput *window) {
     GraphicsWindow *win = DCAST(GraphicsWindow, window);
     MouseAndKeyboard *mouse_node = new MouseAndKeyboard(win, 0, "mouse");
     mouse = data_root.attach_new_node(mouse_node);
-    
+
     RecorderController *recorder = get_recorder();
     if (recorder != (RecorderController *)NULL) {
       // If we're in recording or playback mode, associate a recorder.
@@ -272,7 +263,7 @@ get_mouse(GraphicsOutput *window) {
       recorder->add_recorder("mouse", mouse_recorder);
     }
   }
-    
+
   _mouses[window] = mouse;
 
   return mouse;
@@ -415,7 +406,7 @@ open_window(GraphicsPipe *pipe, GraphicsStateGuardian *gsg) {
   if (window_type == "offscreen") {
     flags = GraphicsPipe::BF_refuse_window;
   }
-  
+
   return open_window(props, flags, pipe, gsg);
 }
 
@@ -449,7 +440,7 @@ open_window(const WindowProperties &props, int flags,
   wf->set_perpixel(get_perpixel());
   wf->set_background_type(get_background_type());
 
-  GraphicsOutput *win = wf->open_window(props, flags, get_graphics_engine(), 
+  GraphicsOutput *win = wf->open_window(props, flags, get_graphics_engine(),
                                         pipe, gsg);
   _engine->open_windows();
   if (win != (GraphicsOutput *)NULL && !win->is_valid()) {
@@ -523,7 +514,7 @@ close_window(int n) {
   if (win != (GraphicsOutput *)NULL) {
     _engine->remove_window(win);
   }
-  
+
   wf->close_window();
   _windows.erase(_windows.begin() + n);
 }
@@ -544,7 +535,7 @@ close_all_windows() {
     if (win != (GraphicsOutput *)NULL) {
       _engine->remove_window(win);
     }
-    
+
     wf->close_window();
   }
 
@@ -602,7 +593,7 @@ void PandaFramework::
 report_frame_rate(ostream &out) const {
   double now = ClockObject::get_global_clock()->get_frame_time();
   double delta = now - _start_time;
-  
+
   int frame_count = ClockObject::get_global_clock()->get_frame_count();
   int num_frames = frame_count - _frame_count;
   if (num_frames > 0) {
@@ -787,13 +778,7 @@ set_highlight(const NodePath &node) {
   if (!_highlight.is_empty()) {
     framework_cat.info(false) << _highlight << "\n";
     _highlight.show_bounds();
-
-    // Also create a new instance of the highlighted geometry, as a
-    // sibling of itself, under the special highlight property.
-    if (_highlight.has_parent()) {
-      _highlight_wireframe.reparent_to(_highlight.get_parent());
-      _highlight.instance_to(_highlight_wireframe);
-    }
+    _highlight.set_render_mode_filled_wireframe(LColor(1.0f, 0.0f, 0.0f, 1.0f), 200);
   }
 }
 
@@ -806,11 +791,8 @@ void PandaFramework::
 clear_highlight() {
   if (!_highlight.is_empty()) {
     _highlight.hide_bounds();
+    _highlight.clear_render_mode();
     _highlight = NodePath();
-
-    // Clean up the special highlight instance.
-    _highlight_wireframe.detach_node();
-    _highlight_wireframe.get_children().detach();
   }
 }
 
@@ -959,7 +941,7 @@ clear_text() {
 //               window).
 ////////////////////////////////////////////////////////////////////
 void PandaFramework::
-event_esc(const Event *event, void *data) { 
+event_esc(const Event *event, void *data) {
   if (event->get_num_parameters() == 1) {
     EventParameter param = event->get_parameter(0);
     WindowFramework *wf;
@@ -1015,7 +997,13 @@ event_w(const Event *event, void *) {
     WindowFramework *wf;
     DCAST_INTO_V(wf, param.get_ptr());
 
-    wf->set_wireframe(!wf->get_wireframe());
+    if (!wf->get_wireframe()) {
+      wf->set_wireframe(true, true);
+    } else if (wf->get_wireframe_filled()) {
+      wf->set_wireframe(true, false);
+    } else {
+      wf->set_wireframe(false, false);
+    }
   }
 }
 
@@ -1227,7 +1215,7 @@ event_A(const Event *, void *data) {
 void PandaFramework::
 event_h(const Event *, void *data) {
   PandaFramework *self = (PandaFramework *)data;
-  
+
   if (self->has_highlight()) {
     self->clear_highlight();
   } else {
@@ -1289,13 +1277,6 @@ event_arrow_left(const Event *, void *data) {
       int index = parent.node()->find_child(node.node());
       nassertv(index >= 0);
       int sibling = index - 1;
-
-      if (sibling >= 0 && 
-          parent.node()->get_child(sibling) == self->_highlight_wireframe.node()) {
-        // Skip over the special highlight node.
-        sibling--;
-      }
-
       if (sibling >= 0) {
         self->set_highlight(NodePath(parent, parent.node()->get_child(sibling)));
       }
@@ -1322,13 +1303,6 @@ event_arrow_right(const Event *, void *data) {
       nassertv(index >= 0);
       int num_children = parent.node()->get_num_children();
       int sibling = index + 1;
-
-      if (sibling < num_children && 
-          parent.node()->get_child(sibling) == self->_highlight_wireframe.node()) {
-        // Skip over the special highlight node.
-        sibling++;
-      }
-      
       if (sibling < num_children) {
         self->set_highlight(NodePath(parent, parent.node()->get_child(sibling)));
       }
@@ -1416,11 +1390,11 @@ event_comma(const Event *event, void *) {
     case WindowFramework::BT_other:
     case WindowFramework::BT_none:
       break;
-      
+
     case WindowFramework::BT_white:
       wf->set_background_type(WindowFramework::BT_default);
       break;
-      
+
     default:
       wf->set_background_type((WindowFramework::BackgroundType)(wf->get_background_type() + 1));
     }
@@ -1450,8 +1424,8 @@ event_question(const Event *event, void *data) {
       // Build up a string to display.
       ostringstream help;
       KeyDefinitions::const_iterator ki;
-      for (ki = self->_key_definitions.begin(); 
-           ki != self->_key_definitions.end(); 
+      for (ki = self->_key_definitions.begin();
+           ki != self->_key_definitions.end();
            ++ki) {
         const KeyDefinition &keydef = (*ki);
         help << keydef._event_name << "\t" << keydef._description << "\n";
@@ -1513,7 +1487,7 @@ event_window_event(const Event *event, void *data) {
           self->close_window(window_index);
           window_index = self->find_window(win);
         }
-        
+
         // Free up the mouse for that window.
         self->remove_mouse(win);
 
diff --git a/panda/src/framework/windowFramework.I b/panda/src/framework/windowFramework.I
index 6cb7b50a6f..d729cc0019 100644
--- a/panda/src/framework/windowFramework.I
+++ b/panda/src/framework/windowFramework.I
@@ -33,7 +33,7 @@ get_panda_framework() const {
 ////////////////////////////////////////////////////////////////////
 INLINE GraphicsWindow *WindowFramework::
 get_graphics_window() const {
-  if (_window != (GraphicsOutput *)NULL && 
+  if (_window != (GraphicsOutput *)NULL &&
       _window->is_of_type(GraphicsWindow::get_class_type())) {
     return DCAST(GraphicsWindow, _window);
   }
@@ -117,6 +117,17 @@ get_wireframe() const {
   return _wireframe_enabled;
 }
 
+////////////////////////////////////////////////////////////////////
+//     Function: WindowFramework::get_wireframe_filled
+//       Access: Public
+//  Description: Returns the current state of the wireframe_filled
+//               flag.
+////////////////////////////////////////////////////////////////////
+INLINE bool WindowFramework::
+get_wireframe_filled() const {
+  return _wireframe_filled;
+}
+
 ////////////////////////////////////////////////////////////////////
 //     Function: WindowFramework::get_texture
 //       Access: Public
diff --git a/panda/src/framework/windowFramework.cxx b/panda/src/framework/windowFramework.cxx
index 5a8ca1b6b7..57505bb0d3 100644
--- a/panda/src/framework/windowFramework.cxx
+++ b/panda/src/framework/windowFramework.cxx
@@ -87,6 +87,7 @@ WindowFramework(PandaFramework *panda_framework) :
   _anim_controls_enabled = false;
   _anim_index = 0;
   _wireframe_enabled = false;
+  _wireframe_filled = false;
   _texture_enabled = true;
   _two_sided_enabled = false;
   _one_sided_reverse_enabled = false;
@@ -362,7 +363,7 @@ get_pixel_2d() {
     PGTop *top = new PGTop("pixel_2d");
     _pixel_2d = get_render_2d().attach_new_node(top);
     _pixel_2d.set_pos(-1, 0, 1);
-  
+
     if (_window->has_size()) {
       int x_size = _window->get_sbs_left_x_size();
       int y_size = _window->get_sbs_left_y_size();
@@ -653,7 +654,7 @@ load_model(const NodePath &parent, Filename filename) {
         // A texture object.  Not exactly an image, but certainly a
         // texture.
         is_image = true;
-        
+
       } else {
         TexturePool *texture_pool = TexturePool::get_global_ptr();
         if (texture_pool->get_texture_type(extension) != NULL) {
@@ -845,7 +846,7 @@ adjust_dimensions() {
     x_size = _window->get_sbs_left_x_size();
     y_size = _window->get_sbs_left_y_size();
   }
-  
+
   if (this_aspect_ratio == 0.0f) {
     // An aspect ratio of 0.0 means to try to infer it.
     this_aspect_ratio = 1.0f;
@@ -942,28 +943,42 @@ split_window(SplitType split_type) {
 //               rendering (false).
 ////////////////////////////////////////////////////////////////////
 void WindowFramework::
-set_wireframe(bool enable) {
-  if (enable == _wireframe_enabled) {
+set_wireframe(bool enable, bool filled) {
+  if (enable == _wireframe_enabled && filled == _wireframe_filled) {
     return;
   }
 
   NodePath render = get_render();
 
+  if (!_two_sided_enabled) {
+    render.clear_two_sided();
+  }
+
   if (enable) {
-    render.set_render_mode_wireframe(override_priority);
-    render.set_two_sided(true, override_priority);
+    if (filled) {
+      render.set_attrib(RenderModeAttrib::make(
+        RenderModeAttrib::M_filled_wireframe,
+        1.4f, false, LColor(1, 1, 1, .5f)),
+        override_priority);
+      // Darken the scene so that the wireframe is clearly visible,
+      // even when the scene is completely white.
+      render.set_color_scale(LColor(0.7f, 0.7f, 0.7f, 1), override_priority);
+    } else {
+      render.set_render_mode_wireframe(override_priority);
+      render.set_two_sided(true, override_priority);
+      render.clear_color_scale();
+    }
   } else {
     render.clear_render_mode();
-    if (!_two_sided_enabled) {
-      render.clear_two_sided();
-    }
     if (_one_sided_reverse_enabled) {
       CPT(RenderAttrib) attrib = CullFaceAttrib::make_reverse();
       render.node()->set_attrib(attrib);
     }
+    render.clear_color_scale();
   }
 
   _wireframe_enabled = enable;
+  _wireframe_filled = filled;
 }
 
 ////////////////////////////////////////////////////////////////////
@@ -1285,7 +1300,7 @@ load_image_as_model(const Filename &filename) {
   } else {
     framework_cat.warning()
       << "Texture size is 0 0: " << *tex << "\n";
-    
+
     left   = -scale;
     right  =  scale;
     top    =  scale;
@@ -1314,9 +1329,9 @@ load_image_as_model(const Filename &filename) {
     // Vertices and 3-d texture coordinates.
     vformat = GeomVertexFormat::register_format
       (new GeomVertexArrayFormat
-       (InternalName::get_vertex(), 3, 
+       (InternalName::get_vertex(), 3,
         GeomEnums::NT_stdfloat, GeomEnums::C_point,
-        InternalName::get_texcoord(), 3, 
+        InternalName::get_texcoord(), 3,
         GeomEnums::NT_stdfloat, GeomEnums::C_texcoord));
   }
 
@@ -1331,7 +1346,7 @@ load_image_as_model(const Filename &filename) {
     vertex.add_data3(LVertex::rfu(left, 0.02, bottom));
     vertex.add_data3(LVertex::rfu(right, 0.02, top));
     vertex.add_data3(LVertex::rfu(right, 0.02, bottom));
-    
+
     texcoord.add_data2(0.0f, tex_scale[1]);
     texcoord.add_data2(0.0f, 0.0f);
     texcoord.add_data2(tex_scale[0], tex_scale[1]);
diff --git a/panda/src/framework/windowFramework.h b/panda/src/framework/windowFramework.h
index 71520167e9..2ad042ed56 100644
--- a/panda/src/framework/windowFramework.h
+++ b/panda/src/framework/windowFramework.h
@@ -97,7 +97,7 @@ public:
                    const pvector<Filename> &files);
   NodePath load_model(const NodePath &parent, Filename filename);
   NodePath load_default_model(const NodePath &parent);
-  void loop_animations(int hierarchy_match_flags = 
+  void loop_animations(int hierarchy_match_flags =
                        PartGroup::HMF_ok_part_extra |
                        PartGroup::HMF_ok_anim_extra);
   void stagger_animations();
@@ -122,7 +122,7 @@ public:
   };
   WindowFramework *split_window(SplitType split_type = ST_default);
 
-  void set_wireframe(bool enable);
+  void set_wireframe(bool enable, bool filled=false);
   void set_texture(bool enable);
   void set_two_sided(bool enable);
   void set_one_sided_reverse(bool enable);
@@ -131,6 +131,7 @@ public:
   void set_background_type(BackgroundType type);
 
   INLINE bool get_wireframe() const;
+  INLINE bool get_wireframe_filled() const;
   INLINE bool get_texture() const;
   INLINE bool get_two_sided() const;
   INLINE bool get_one_sided_reverse() const;
@@ -150,7 +151,7 @@ private:
   void destroy_anim_controls();
   void update_anim_controls();
 
-  void setup_shuttle_button(const string &label, int index, 
+  void setup_shuttle_button(const string &label, int index,
                             EventHandler::EventCallbackFunction *func);
   void back_button();
   void pause_button();
@@ -194,12 +195,13 @@ private:
 
   NodePath _alight;
   NodePath _dlight;
-  
+
   bool _got_keyboard;
   bool _got_trackball;
   bool _got_lights;
 
   bool _wireframe_enabled;
+  bool _wireframe_filled;
   bool _texture_enabled;
   bool _two_sided_enabled;
   bool _one_sided_reverse_enabled;
@@ -210,7 +212,7 @@ private:
   PT(SceneGraphAnalyzerMeter) _scene_graph_analyzer_meter;
 
   BackgroundType _background_type;
-  
+
   static PT(TextFont) _shuttle_controls_font;
 
 public:
diff --git a/panda/src/glstuff/glCgShaderContext_src.I b/panda/src/glstuff/glCgShaderContext_src.I
index c989f99b63..243ed4c758 100755
--- a/panda/src/glstuff/glCgShaderContext_src.I
+++ b/panda/src/glstuff/glCgShaderContext_src.I
@@ -27,8 +27,7 @@ INLINE bool CLP(CgShaderContext)::
 valid() {
   if (_shader->get_error_flag()) return false;
   if (_shader->get_language() != Shader::SL_Cg) return false;
-  if (_cg_context) return true;
-  return false;
+  return (_cg_program != 0);
 }
 
 ////////////////////////////////////////////////////////////////////
diff --git a/panda/src/glstuff/glCgShaderContext_src.cxx b/panda/src/glstuff/glCgShaderContext_src.cxx
index c73659eda9..85b18b6f9d 100755
--- a/panda/src/glstuff/glCgShaderContext_src.cxx
+++ b/panda/src/glstuff/glCgShaderContext_src.cxx
@@ -40,63 +40,40 @@ TypeHandle CLP(CgShaderContext)::_type_handle;
 CLP(CgShaderContext)::
 CLP(CgShaderContext)(CLP(GraphicsStateGuardian) *glgsg, Shader *s) : ShaderContext(s) {
   _glgsg = glgsg;
-  _cg_context = 0;
-  _cg_vprogram = 0;
-  _cg_fprogram = 0;
-  _cg_gprogram = 0;
-  _cg_vprofile = CG_PROFILE_UNKNOWN;
-  _cg_fprofile = CG_PROFILE_UNKNOWN;
-  _cg_gprofile = CG_PROFILE_UNKNOWN;
+  _cg_program = 0;
+  _glsl_profile = false;
 
   nassertv(s->get_language() == Shader::SL_Cg);
 
+  CGcontext context = _glgsg->_cg_context;
+
   // Ask the shader to compile itself for us and
   // to give us the resulting Cg program objects.
-  if (!s->cg_compile_for(_glgsg->_shader_caps,
-                         _cg_context,
-                         _cg_vprogram,
-                         _cg_fprogram,
-                         _cg_gprogram,
-                         _cg_parameter_map)) {
+  if (!s->cg_compile_for(_glgsg->_shader_caps, context,
+                         _cg_program, _cg_parameter_map)) {
     return;
   }
 
   // Load the program.
-  if (_cg_vprogram != 0) {
-    _cg_vprofile = cgGetProgramProfile(_cg_vprogram);
-    cgGLLoadProgram(_cg_vprogram);
-    CGerror verror = cgGetError();
-    if (verror != CG_NO_ERROR) {
-      const char *str = cgGetErrorString(verror);
-      GLCAT.error()
-        << "Could not load Cg vertex program: " << s->get_filename(Shader::ST_vertex)
-        << " (" << cgGetProfileString(_cg_vprofile) << " " << str << ")\n";
-      release_resources();
-    }
-  }
+  if (_cg_program == 0) {
+    const char *str = cgGetErrorString(cgGetError());
+    GLCAT.error()
+      << "Could not combine Cg program: " << s->get_filename()
+      << " (" << str << ")\n";
+    release_resources();
 
-  if (_cg_fprogram != 0) {
-    _cg_fprofile = cgGetProgramProfile(_cg_fprogram);
-    cgGLLoadProgram(_cg_fprogram);
-    CGerror ferror = cgGetError();
-    if (ferror != CG_NO_ERROR) {
-      const char *str = cgGetErrorString(ferror);
-      GLCAT.error()
-        << "Could not load Cg fragment program: " << s->get_filename(Shader::ST_fragment)
-        << " (" << cgGetProfileString(_cg_fprofile) << " " << str << ")\n";
-      release_resources();
+  } else {
+    if (cgGetProgramProfile(_cg_program) == CG_PROFILE_GLSLC) {
+      _glsl_profile = true;
     }
-  }
 
-  if (_cg_gprogram != 0) {
-    _cg_gprofile = cgGetProgramProfile(_cg_gprogram);
-    cgGLLoadProgram(_cg_gprogram);
-    CGerror gerror = cgGetError();
-    if (gerror != CG_NO_ERROR) {
-      const char *str = cgGetErrorString(gerror);
+    cgGLLoadProgram(_cg_program);
+    CGerror error = cgGetError();
+    if (error != CG_NO_ERROR) {
+      const char *str = cgGetErrorString(error);
       GLCAT.error()
-        << "Could not load Cg geometry program: " << s->get_filename(Shader::ST_geometry)
-        << " (" << cgGetProfileString(_cg_gprofile) << " " << str << ")\n";
+        << "Could not load program: " << s->get_filename()
+        << " (" << str << ")\n";
       release_resources();
     }
   }
@@ -122,20 +99,14 @@ CLP(CgShaderContext)::
 ////////////////////////////////////////////////////////////////////
 void CLP(CgShaderContext)::
 release_resources() {
-  if (_cg_context) {
-    cgDestroyContext(_cg_context);
-    _cg_context  = 0;
-    // Do *NOT* destroy the programs here! It causes problems.
-//  if (_cg_vprogram != 0) cgDestroyProgram(_cg_vprogram);
-//  if (_cg_fprogram != 0) cgDestroyProgram(_cg_fprogram);
-//  if (_cg_gprogram != 0) cgDestroyProgram(_cg_gprogram);
-    _cg_vprogram = 0;
-    _cg_fprogram = 0;
-    _cg_gprogram = 0;
-    _cg_parameter_map.clear();
+  if (_cg_program != 0) {
+    cgDestroyProgram(_cg_program);
+    _cg_program = 0;
   }
+  _cg_parameter_map.clear();
   if (_glgsg) {
     _glgsg->report_my_gl_errors();
+
   } else if (glGetError() != GL_NO_ERROR) {
     GLCAT.error() << "GL error in ShaderContext destructor\n";
   }
@@ -155,25 +126,15 @@ release_resources() {
 ////////////////////////////////////////////////////////////////////
 void CLP(CgShaderContext)::
 bind(bool reissue_parameters) {
-  if (reissue_parameters) {
-    // Pass in k-parameters and transform-parameters
-    issue_parameters(Shader::SSD_general);
-  }
+  if (_cg_program != 0) {
+    if (reissue_parameters) {
+      // Pass in k-parameters and transform-parameters
+      issue_parameters(Shader::SSD_general);
+    }
 
-  if (_cg_context != 0) {
     // Bind the shaders.
-    if (_cg_vprogram != 0) {
-      cgGLEnableProfile(_cg_vprofile);
-      cgGLBindProgram(_cg_vprogram);
-    }
-    if (_cg_fprogram != 0) {
-      cgGLEnableProfile(_cg_fprofile);
-      cgGLBindProgram(_cg_fprogram);
-    }
-    if (_cg_gprogram != 0) {
-      cgGLEnableProfile(_cg_gprofile);
-      cgGLBindProgram(_cg_gprogram);
-    }
+    cgGLEnableProgramProfiles(_cg_program);
+    cgGLBindProgram(_cg_program);
 
     cg_report_errors();
     _glgsg->report_my_gl_errors();
@@ -187,18 +148,12 @@ bind(bool reissue_parameters) {
 ////////////////////////////////////////////////////////////////////
 void CLP(CgShaderContext)::
 unbind() {
-  if (_cg_context != 0) {
-    if (_cg_vprogram != 0) {
-      cgGLUnbindProgram(_cg_vprofile);
-      cgGLDisableProfile(_cg_vprofile);
-    }
-    if (_cg_fprogram != 0) {
-      cgGLUnbindProgram(_cg_fprofile);
-      cgGLDisableProfile(_cg_fprofile);
-    }
-    if (_cg_gprogram != 0) {
-      cgGLUnbindProgram(_cg_gprofile);
-      cgGLDisableProfile(_cg_gprofile);
+  if (_cg_program != 0) {
+    int num_domains = cgGetNumProgramDomains(_cg_program);
+    for (int i = 0; i < num_domains; ++i) {
+      CGprofile profile = cgGetProgramDomainProfile(_cg_program, i);
+      cgGLUnbindProgram(profile);
+      cgGLDisableProfile(profile);
     }
 
     cg_report_errors();
@@ -260,72 +215,132 @@ issue_parameters(int altered) {
       switch (ptr_data->_type) {
       case Shader::SPT_float:
         switch(_ptr._info._class) {
-        case Shader::SAC_scalar: cgSetParameter1fv(p,(float*)ptr_data->_ptr); continue;
+        case Shader::SAC_scalar:
+          cgSetParameter1fv(p, (float*)ptr_data->_ptr);
+          continue;
+
         case Shader::SAC_vector:
           switch (_ptr._info._type) {
-          case Shader::SAT_vec1: cgSetParameter1fv(p,(float*)ptr_data->_ptr); continue;
-          case Shader::SAT_vec2: cgSetParameter2fv(p,(float*)ptr_data->_ptr); continue;
-          case Shader::SAT_vec3: cgSetParameter3fv(p,(float*)ptr_data->_ptr); continue;
-          case Shader::SAT_vec4: cgSetParameter4fv(p,(float*)ptr_data->_ptr); continue;
-          default: nassertd(false) continue;
+          case Shader::SAT_vec1:
+            cgSetParameter1fv(p, (float*)ptr_data->_ptr);
+            continue;
+          case Shader::SAT_vec2:
+            cgSetParameter2fv(p, (float*)ptr_data->_ptr);
+            continue;
+          case Shader::SAT_vec3:
+            cgSetParameter3fv(p, (float*)ptr_data->_ptr);
+            continue;
+          case Shader::SAT_vec4:
+            cgSetParameter4fv(p, (float*)ptr_data->_ptr);
+            continue;
+          default:
+            nassertd(false) continue;
           }
-        case Shader::SAC_matrix: cgGLSetMatrixParameterfc(p,(float*)ptr_data->_ptr); continue;
-        case Shader::SAC_array: {
+          continue;
+
+        case Shader::SAC_matrix:
+          cgGLSetMatrixParameterfc(p, (float*)ptr_data->_ptr);
+          continue;
+
+        case Shader::SAC_array:
           switch (_ptr._info._subclass) {
           case Shader::SAC_scalar:
-            cgGLSetParameterArray1f(p,0,_ptr._dim[0],(float*)ptr_data->_ptr); continue;
+            cgGLSetParameterArray1f(p, 0, _ptr._dim[0], (float*)ptr_data->_ptr);
+            continue;
           case Shader::SAC_vector:
             switch (_ptr._dim[2]) {
-            case 1: cgGLSetParameterArray1f(p,0,_ptr._dim[0],(float*)ptr_data->_ptr); continue;
-            case 2: cgGLSetParameterArray2f(p,0,_ptr._dim[0],(float*)ptr_data->_ptr); continue;
-            case 3: cgGLSetParameterArray3f(p,0,_ptr._dim[0],(float*)ptr_data->_ptr); continue;
-            case 4: cgGLSetParameterArray4f(p,0,_ptr._dim[0],(float*)ptr_data->_ptr); continue;
+            case 1: cgGLSetParameterArray1f(p, 0, _ptr._dim[0], (float*)ptr_data->_ptr); continue;
+            case 2: cgGLSetParameterArray2f(p, 0, _ptr._dim[0], (float*)ptr_data->_ptr); continue;
+            case 3: cgGLSetParameterArray3f(p, 0, _ptr._dim[0], (float*)ptr_data->_ptr); continue;
+            case 4: cgGLSetParameterArray4f(p, 0, _ptr._dim[0], (float*)ptr_data->_ptr); continue;
+            default:
+              nassertd(_ptr._dim[2] > 0 && _ptr._dim[2] <= 4) continue;
             }
+            continue;
           case Shader::SAC_matrix:
-            cgGLSetMatrixParameterArrayfc(p,0,_ptr._dim[0],(float*)ptr_data->_ptr); continue;
+            cgGLSetMatrixParameterArrayfc(p, 0, _ptr._dim[0], (float*)ptr_data->_ptr);
+            continue;
+          default:
+            nassertd(false) continue;
           }
+        default:
+          nassertd(false) continue;
         }
-        }
+
       case Shader::SPT_double:
         switch(_ptr._info._class) {
-        case Shader::SAC_scalar: cgSetParameter1dv(p,(double*)ptr_data->_ptr); continue;
+        case Shader::SAC_scalar:
+          cgSetParameter1dv(p, (double*)ptr_data->_ptr);
+          continue;
+
         case Shader::SAC_vector:
-          switch(_ptr._info._type) {
-          case Shader::SAT_vec1: cgSetParameter1dv(p,(double*)ptr_data->_ptr); continue;
-          case Shader::SAT_vec2: cgSetParameter2dv(p,(double*)ptr_data->_ptr); continue;
-          case Shader::SAT_vec3: cgSetParameter3dv(p,(double*)ptr_data->_ptr); continue;
-          case Shader::SAT_vec4: cgSetParameter4dv(p,(double*)ptr_data->_ptr); continue;
-          default: nassertd(false) continue;
+          switch (_ptr._info._type) {
+          case Shader::SAT_vec1:
+            cgSetParameter1dv(p, (double*)ptr_data->_ptr);
+            continue;
+          case Shader::SAT_vec2:
+            cgSetParameter2dv(p, (double*)ptr_data->_ptr);
+            continue;
+          case Shader::SAT_vec3:
+            cgSetParameter3dv(p, (double*)ptr_data->_ptr);
+            continue;
+          case Shader::SAT_vec4:
+            cgSetParameter4dv(p, (double*)ptr_data->_ptr);
+            continue;
+          default:
+            nassertd(false) continue;
           }
-        case Shader::SAC_matrix: cgGLSetMatrixParameterdc(p,(double*)ptr_data->_ptr); continue;
-        case Shader::SAC_array: {
-          switch(_ptr._info._subclass) {
+          continue;
+
+        case Shader::SAC_matrix:
+          cgGLSetMatrixParameterdc(p, (double*)ptr_data->_ptr);
+          continue;
+
+        case Shader::SAC_array:
+          switch (_ptr._info._subclass) {
           case Shader::SAC_scalar:
-            cgGLSetParameterArray1d(p,0,_ptr._dim[0],(double*)ptr_data->_ptr); continue;
+            cgGLSetParameterArray1d(p, 0, _ptr._dim[0], (double*)ptr_data->_ptr);
+            continue;
           case Shader::SAC_vector:
-            switch(_ptr._dim[2]) {
-            case 1: cgGLSetParameterArray1d(p,0,_ptr._dim[0],(double*)ptr_data->_ptr); continue;
-            case 2: cgGLSetParameterArray2d(p,0,_ptr._dim[0],(double*)ptr_data->_ptr); continue;
-            case 3: cgGLSetParameterArray3d(p,0,_ptr._dim[0],(double*)ptr_data->_ptr); continue;
-            case 4: cgGLSetParameterArray4d(p,0,_ptr._dim[0],(double*)ptr_data->_ptr); continue;
+            switch (_ptr._dim[2]) {
+            case 1: cgGLSetParameterArray1d(p, 0, _ptr._dim[0], (double*)ptr_data->_ptr); continue;
+            case 2: cgGLSetParameterArray2d(p, 0, _ptr._dim[0], (double*)ptr_data->_ptr); continue;
+            case 3: cgGLSetParameterArray3d(p, 0, _ptr._dim[0], (double*)ptr_data->_ptr); continue;
+            case 4: cgGLSetParameterArray4d(p, 0, _ptr._dim[0], (double*)ptr_data->_ptr); continue;
+            default:
+              nassertd(_ptr._dim[2] > 0 && _ptr._dim[2] <= 4) continue;
             }
+            continue;
           case Shader::SAC_matrix:
-            cgGLSetMatrixParameterArraydc(p,0,_ptr._dim[0],(double*)ptr_data->_ptr); continue;
+            cgGLSetMatrixParameterArraydc(p, 0, _ptr._dim[0], (double*)ptr_data->_ptr);
+            continue;
+          default:
+            nassertd(false) continue;
           }
+        default:
+          nassertd(false) continue;
         }
-        }
+        continue;
+
       case Shader::SPT_int:
         switch(_ptr._info._class) {
-        case Shader::SAC_scalar: cgSetParameter1iv(p,(int*)ptr_data->_ptr); continue;
+        case Shader::SAC_scalar:
+          cgSetParameter1iv(p, (int*)ptr_data->_ptr);
+          continue;
         case Shader::SAC_vector:
           switch(_ptr._info._type) {
-          case Shader::SAT_vec1: cgSetParameter1iv(p,(int*)ptr_data->_ptr); continue;
-          case Shader::SAT_vec2: cgSetParameter2iv(p,(int*)ptr_data->_ptr); continue;
-          case Shader::SAT_vec3: cgSetParameter3iv(p,(int*)ptr_data->_ptr); continue;
-          case Shader::SAT_vec4: cgSetParameter4iv(p,(int*)ptr_data->_ptr); continue;
+          case Shader::SAT_vec1: cgSetParameter1iv(p, (int*)ptr_data->_ptr); continue;
+          case Shader::SAT_vec2: cgSetParameter2iv(p, (int*)ptr_data->_ptr); continue;
+          case Shader::SAT_vec3: cgSetParameter3iv(p, (int*)ptr_data->_ptr); continue;
+          case Shader::SAT_vec4: cgSetParameter4iv(p, (int*)ptr_data->_ptr); continue;
+          default:
+            nassertd(false) continue;
           }
+        default:
+          nassertd(false) continue;
         }
-      default: GLCAT.error() << _ptr._id._name << ":" << "unrecognized parameter type\n";
+      default:
+        GLCAT.error() << _ptr._id._name << ":" << "unrecognized parameter type\n";
         release_resources();
         return;
       }
@@ -396,7 +411,25 @@ disable_shader_vertex_arrays() {
   for (int i=0; i<(int)_shader->_var_spec.size(); i++) {
     CGparameter p = _cg_parameter_map[_shader->_var_spec[i]._id._seqno];
     if (p == 0) continue;
-    cgGLDisableClientState(p);
+
+    if (_glsl_profile && cgGetParameterBaseResource(p) == CG_ATTR0) {
+      int index = cgGetParameterResourceIndex(p);
+      if (index >= 8) {
+        _glgsg->_glClientActiveTexture(GL_TEXTURE0 + (index - 8));
+        glDisableClientState(GL_TEXTURE_COORD_ARRAY);
+
+      } else if (index == 0) {
+        glDisableClientState(GL_VERTEX_ARRAY);
+
+      } else if (index == 2) {
+        glDisableClientState(GL_NORMAL_ARRAY);
+
+      } else if (index == 3) {
+        glDisableClientState(GL_COLOR_ARRAY);
+      }
+    } else {
+      cgGLDisableClientState(p);
+    }
   }
 
   cg_report_errors();
@@ -464,20 +497,68 @@ update_shader_vertex_arrays(ShaderContext *prev, bool force) {
         CGparameter p = _cg_parameter_map[_shader->_var_spec[i]._id._seqno];
 
         if (numeric_type == GeomEnums::NT_packed_dabc) {
-          cgGLSetParameterPointer(p, GL_BGRA, GL_UNSIGNED_BYTE,
-                                  stride, client_pointer + start);
+          // Yes, this is a thing.
+          num_values = GL_BGRA;
+        }
+
+        // This is truly the most preposterous hack.  When using the GLSL
+        // profiles, cgGLSetParameterPointer relies on the the driver mapping
+        // standard attributes to fixed indices (and breaking the spec doing
+        // so), which only the NVIDIA drivers do.  Unbelievable.
+        if (_glsl_profile && cgGetParameterBaseResource(p) == CG_ATTR0) {
+          int index = cgGetParameterResourceIndex(p);
+          switch (index) {
+          case 0:  // gl_Vertex
+            glVertexPointer(num_values, _glgsg->get_numeric_type(numeric_type),
+                            stride, client_pointer + start);
+            glEnableClientState(GL_VERTEX_ARRAY);
+            break;
+
+          case 2:  // gl_Normal
+            glNormalPointer(_glgsg->get_numeric_type(numeric_type),
+                            stride, client_pointer + start);
+            glEnableClientState(GL_NORMAL_ARRAY);
+            break;
+
+          case 3:  // gl_Color
+            glColorPointer(num_values, _glgsg->get_numeric_type(numeric_type),
+                           stride, client_pointer + start);
+            glEnableClientState(GL_COLOR_ARRAY);
+            break;
+
+          case 4:  // gl_SecondaryColor
+            //glSecondaryColorPointer(num_values, _glgsg->get_numeric_type(numeric_type),
+            //                        stride, client_pointer + start);
+            //glEnableClientState(GL_SECONDARY_COLOR_ARRAY);
+            //break;
+          case 5:  // gl_FogCoord
+          case 6:  // PSIZE?
+          case 7:  // BLENDINDICES?
+          case 1:  // glWeightPointerARB?
+            GLCAT.error()
+              << "Unable to bind " << *name << " to "
+              << cgGetParameterResourceName(p) << "\n";
+            break;
+
+          default:
+            _glgsg->_glClientActiveTexture(GL_TEXTURE0 + (index - 8));
+            glTexCoordPointer(num_values, _glgsg->get_numeric_type(numeric_type),
+                              stride, client_pointer + start);
+            glEnableClientState(GL_TEXTURE_COORD_ARRAY);
+            break;
+          }
         } else {
           if (name == InternalName::get_normal() && num_values == 4) {
-            // In some cases, the normals are aligned to 4 values.
-            // This would cause an error on some rivers, so we tell it
-            // to use the first three values only.
+            // In some cases, the normals are aligned to 4 values.  We tell
+            // it to use three values exactly, otherwise we get the error:
+            // An unsupported GL extension was required to perform this operation.
             num_values = 3;
           }
-          cgGLSetParameterPointer(p,
-                                  num_values, _glgsg->get_numeric_type(numeric_type),
+          cgGLSetParameterPointer(p, num_values,
+                                  _glgsg->get_numeric_type(numeric_type),
                                   stride, client_pointer + start);
+          cgGLEnableClientState(p);
         }
-        cgGLEnableClientState(p);
       } else {
         CGparameter p = _cg_parameter_map[_shader->_var_spec[i]._id._seqno];
         cgGLDisableClientState(p);
@@ -506,6 +587,7 @@ disable_shader_texture_bindings() {
   for (int i=0; i<(int)_shader->_tex_spec.size(); i++) {
     CGparameter p = _cg_parameter_map[_shader->_tex_spec[i]._id._seqno];
     if (p == 0) continue;
+
     int texunit = cgGetParameterResourceIndex(p);
     _glgsg->_glActiveTexture(GL_TEXTURE0 + texunit);
 
@@ -527,7 +609,7 @@ disable_shader_texture_bindings() {
       glBindTexture(GL_TEXTURE_CUBE_MAP, 0);
     }
     // This is probably faster - but maybe not as safe?
-    // cgGLDisableTextureParameter(p);
+    //cgGLDisableTextureParameter(p);
   }
 #endif  // OPENGLES_2
 
diff --git a/panda/src/glstuff/glCgShaderContext_src.h b/panda/src/glstuff/glCgShaderContext_src.h
index 3e487fbe04..b5d45d4aaa 100755
--- a/panda/src/glstuff/glCgShaderContext_src.h
+++ b/panda/src/glstuff/glCgShaderContext_src.h
@@ -1,4 +1,4 @@
-// Filename: glShaderContext_src.h
+// Filename: glCgShaderContext_src.h
 // Created by: jyelon (01Sep05)
 //
 ////////////////////////////////////////////////////////////////////
@@ -51,15 +51,10 @@ public:
   INLINE bool uses_custom_texture_bindings(void);
 
 private:
-  CGcontext _cg_context;
-  CGprogram _cg_vprogram;
-  CGprogram _cg_fprogram;
-  CGprogram _cg_gprogram;
-  CGprofile _cg_vprofile;
-  CGprofile _cg_fprofile;
-  CGprofile _cg_gprofile;
+  CGprogram _cg_program;
+  bool _glsl_profile;
 
-  pvector <CGparameter> _cg_parameter_map;
+  pvector<CGparameter> _cg_parameter_map;
 
   CLP(GraphicsStateGuardian) *_glgsg;
 
diff --git a/panda/src/glstuff/glGraphicsBuffer_src.cxx b/panda/src/glstuff/glGraphicsBuffer_src.cxx
index 038bb6b8ef..30b39c55ba 100644
--- a/panda/src/glstuff/glGraphicsBuffer_src.cxx
+++ b/panda/src/glstuff/glGraphicsBuffer_src.cxx
@@ -445,18 +445,6 @@ rebuild_bitplanes() {
     if (_fbo[layer] == 0) {
       glgsg->_glGenFramebuffers(1, &_fbo[layer]);
 
-#ifndef OPENGLES
-      if (glgsg->_use_object_labels) {
-        if (num_fbos > 1) {
-          GLchar name[128];
-          GLsizei len = snprintf(name, 128, "%s[%d]", _name.c_str(), layer);
-          glgsg->_glObjectLabel(GL_FRAMEBUFFER, _fbo[layer], len, name);
-        } else {
-          glgsg->_glObjectLabel(GL_FRAMEBUFFER, _fbo[layer], _name.size(), _name.data());
-        }
-      }
-#endif
-
       if (_fbo[layer] == 0) {
         report_my_gl_errors();
         return;
@@ -464,6 +452,19 @@ rebuild_bitplanes() {
     }
     glgsg->bind_fbo(_fbo[layer]);
 
+#ifndef OPENGLES
+    if (glgsg->_use_object_labels) {
+      // Assign a label for OpenGL to use when displaying debug messages.
+      if (num_fbos > 1) {
+        GLchar name[128];
+        GLsizei len = snprintf(name, 128, "%s[%d]", _name.c_str(), layer);
+        glgsg->_glObjectLabel(GL_FRAMEBUFFER, _fbo[layer], len, name);
+      } else {
+        glgsg->_glObjectLabel(GL_FRAMEBUFFER, _fbo[layer], _name.size(), _name.data());
+      }
+    }
+#endif
+
     // For all slots, update the slot.
     if (_use_depth_stencil) {
       bind_slot(layer, rb_resize, attach, RTP_depth_stencil, GL_DEPTH_ATTACHMENT_EXT);
@@ -1393,9 +1394,7 @@ open_buffer() {
 ////////////////////////////////////////////////////////////////////
 void CLP(GraphicsBuffer)::
 close_buffer() {
-
   check_host_valid();
-  report_my_gl_errors();
 
   if (_gsg == 0) {
     return;
diff --git a/panda/src/glstuff/glGraphicsStateGuardian_src.I b/panda/src/glstuff/glGraphicsStateGuardian_src.I
index f776d69c2e..2831d5a3d3 100644
--- a/panda/src/glstuff/glGraphicsStateGuardian_src.I
+++ b/panda/src/glstuff/glGraphicsStateGuardian_src.I
@@ -171,6 +171,25 @@ maybe_gl_finish() const {
 #endif
 }
 
+////////////////////////////////////////////////////////////////////
+//     Function: GLGraphicsStateGuardian::has_extension
+//       Access: Published, Final
+//  Description: Returns true if the indicated extension is reported
+//               by the GL system, false otherwise.  The extension
+//               name is case-sensitive.
+////////////////////////////////////////////////////////////////////
+INLINE bool CLP(GraphicsStateGuardian)::
+has_extension(const string &extension) const {
+  bool has_ext = (_extensions.find(extension) != _extensions.end());
+#ifndef NDEBUG
+  if (GLCAT.is_debug()) {
+    GLCAT.debug()
+      << "HAS EXT " << extension << " " << has_ext << "\n";
+  }
+#endif
+  return has_ext;
+}
+
 ////////////////////////////////////////////////////////////////////
 //     Function: GLGraphicsStateGuardian::is_at_least_gl_version
 //       Access: Public
diff --git a/panda/src/glstuff/glGraphicsStateGuardian_src.cxx b/panda/src/glstuff/glGraphicsStateGuardian_src.cxx
index 86a0a3672a..0d0c019b65 100644
--- a/panda/src/glstuff/glGraphicsStateGuardian_src.cxx
+++ b/panda/src/glstuff/glGraphicsStateGuardian_src.cxx
@@ -316,6 +316,11 @@ CLP(GraphicsStateGuardian)(GraphicsEngine *engine, GraphicsPipe *pipe) :
   _force_flush = gl_force_flush;
 
   _scissor_enabled = false;
+  _scissor_attrib_active = false;
+
+#ifdef HAVE_CG
+  _cg_context = 0;
+#endif
 
 #ifdef DO_PSTATS
   if (gl_finish) {
@@ -549,8 +554,7 @@ reset() {
   }
 
 #ifndef OPENGLES
-  _primitive_restart_gl3 = false;
-  _primitive_restart_nv = false;
+  _explicit_primitive_restart = false;
   _glPrimitiveRestartIndex = NULL;
 
   if (gl_support_primitive_restart_index) {
@@ -562,19 +566,16 @@ reset() {
       _supported_geom_rendering |= Geom::GR_strip_cut_index;
 
     } else if (is_at_least_gl_version(3, 1)) {
-      _primitive_restart_gl3 = true;
+      // We have to use an explicit primitive restart enable/index.
+      _explicit_primitive_restart = true;
       _supported_geom_rendering |= Geom::GR_strip_cut_index;
 
       _glPrimitiveRestartIndex = (PFNGLPRIMITIVERESTARTINDEXPROC)
         get_extension_func("glPrimitiveRestartIndex");
 
-    } else if (has_extension("GL_NV_primitive_restart")) {
-      _primitive_restart_nv = true;
-      _supported_geom_rendering |= Geom::GR_strip_cut_index;
-
-      _glPrimitiveRestartIndex = (PFNGLPRIMITIVERESTARTINDEXPROC)
-        get_extension_func("glPrimitiveRestartIndexNV");
     }
+    // We used to have a case here for GL_NV_primitive_restart, but it
+    // seems to cause garbled geometry bugs on some drivers.
   }
 #endif
 
@@ -1086,15 +1087,19 @@ reset() {
     _supports_depth_texture = true;
   }
 
-  if (_supports_depth_texture &&
+  if (gl_support_shadow_filter &&
+      _supports_depth_texture &&
       has_extension("GL_ARB_shadow") &&
       has_extension("GL_ARB_fragment_program_shadow")) {
     _supports_shadow_filter = true;
   }
-  if (_gl_vendor.substr(0,3)=="ATI") {
+  // Actually, we can't keep forever disabling ARB_shadow on ATI cards,
+  // since they do work correctly now.  Maybe there is some feature
+  // level we can check somewhere?
+  /*if (_gl_vendor.substr(0,3)=="ATI") {
     // ATI drivers have never provided correct shadow support.
     _supports_shadow_filter = false;
-  }
+  }*/
 
   _supports_texture_combine =
     has_extension("GL_ARB_texture_env_combine") || is_at_least_gl_version(1, 3) || is_at_least_gles_version(1, 1);
@@ -1159,30 +1164,37 @@ reset() {
 
       // cgGLGetLatestProfile doesn't seem to return anything other
       // arbvp1/arbfp1 on non-NVIDIA cards, which is severely limiting.
-      // Actually, it seems that these profiles are horribly broken on these
-      // cards.  Let's not do this.
-      //if ((_shader_caps._active_vprofile == CG_PROFILE_ARBVP1 ||
-      //     _shader_caps._active_fprofile == CG_PROFILE_ARBFP1) &&
-      //    cgGLIsProfileSupported(CG_PROFILE_GLSLV) &&
-      //    cgGLIsProfileSupported(CG_PROFILE_GLSLF)) {
+      // So, if this happens, we set it to GLSL, which is
+      // usually supported on all cards.
+      // The GLSL profiles are horribly broken on non-NVIDIA cards, but
+      // I think I've worked around the issues sufficiently.
+      if ((_shader_caps._active_vprofile == CG_PROFILE_ARBVP1 ||
+           _shader_caps._active_fprofile == CG_PROFILE_ARBFP1) &&
+          cgGLIsProfileSupported(CG_PROFILE_GLSLV) &&
+          cgGLIsProfileSupported(CG_PROFILE_GLSLF)) {
 
-      //  // So, if this happens, we set it to GLSL, which is
-      //  // usually supported on all cards.
-      //  _shader_caps._active_vprofile = (int)CG_PROFILE_GLSLV;
-      //  _shader_caps._active_fprofile = (int)CG_PROFILE_GLSLF;
+        _shader_caps._active_vprofile = (int)CG_PROFILE_GLSLV;
+        _shader_caps._active_fprofile = (int)CG_PROFILE_GLSLF;
 #if CG_VERSION_NUM >= 2200
-      //  if (cgGLIsProfileSupported(CG_PROFILE_GLSLG)) {
-      //    _shader_caps._active_gprofile = (int)CG_PROFILE_GLSLG;
-      //  }
+        if (cgGLIsProfileSupported(CG_PROFILE_GLSLG)) {
+          _shader_caps._active_gprofile = (int)CG_PROFILE_GLSLG;
+        }
 #endif
-      //}
+      }
     }
     _shader_caps._ultimate_vprofile = (int)CG_PROFILE_VP40;
     _shader_caps._ultimate_fprofile = (int)CG_PROFILE_FP40;
     _shader_caps._ultimate_gprofile = (int)CG_PROFILE_GPU_GP;
 
-    _glBindProgram = (PFNGLBINDPROGRAMARBPROC)
-      get_extension_func("glBindProgramARB");
+    _cg_context = cgCreateContext();
+
+#if CG_VERSION_NUM >= 3100
+    // This just sounds like a good thing to do.
+    cgGLSetContextGLSLVersion(_cg_context, cgGLDetectGLSLVersion());
+    if (_shader_caps._active_vprofile == CG_PROFILE_GLSLV) {
+      cgGLSetContextOptimalOptions(_cg_context, CG_PROFILE_GLSLC);
+    }
+#endif
 
     // Bug workaround for radeons.
     if (_shader_caps._active_fprofile == CG_PROFILE_ARBFP1) {
@@ -1362,6 +1374,22 @@ reset() {
   }
 #endif
 
+  _supports_vertex_attrib_divisor = false;
+#ifndef OPENGLES
+  if (is_at_least_gl_version(3, 3)) {
+    _glVertexAttribDivisor = (PFNGLVERTEXATTRIBDIVISORPROC)
+      get_extension_func("glVertexAttribDivisor");
+
+    _supports_vertex_attrib_divisor = true;
+
+  } else if (has_extension("GL_ARB_instanced_arrays")) {
+    _glVertexAttribDivisor = (PFNGLVERTEXATTRIBDIVISORPROC)
+      get_extension_func("glVertexAttribDivisorARB");
+
+    _supports_vertex_attrib_divisor = true;
+  }
+#endif
+
 #ifdef OPENGLES_2
   // In OpenGL ES 2.x, FBO's are supported in the core.
   _supports_framebuffer_object = true;
@@ -2231,9 +2259,17 @@ reset() {
     }
 #endif  // CG_VERSION_NUM >= 2200
 
+#if CG_VERSION_NUM >= 3100
+    if (GLCAT.is_debug()) {
+      CGGLglslversion ver = cgGLGetContextGLSLVersion(_cg_context);
+      GLCAT.debug()
+        << "Cg GLSL version: " << cgGLGetGLSLVersionString(ver) << "\n";
+    }
+#endif
+
     GLCAT.debug()
-      << "\nCg vertex profile = " << cgGetProfileString(vertex_profile) << "  id = " << vertex_profile
-      << "\nCg pixel profile = " << cgGetProfileString(pixel_profile) << "  id = " << pixel_profile
+      << "\nCg latest vertex profile = " << cgGetProfileString(vertex_profile) << "  id = " << vertex_profile
+      << "\nCg latest pixel profile = " << cgGetProfileString(pixel_profile) << "  id = " << pixel_profile
       << "\nshader model = " << _shader_model
       << "\n";
   }
@@ -2287,6 +2323,7 @@ clear(DrawableRegion *clearable) {
     return;
   }
 
+  //XXX rdb: Is this line really necessary?
   set_state_and_transform(RenderState::make_empty(), _internal_transform);
 
   int mask = 0;
@@ -2414,6 +2451,7 @@ clear(DrawableRegion *clearable) {
   }
 
   if (clearable->get_clear_stencil_active()) {
+    glStencilMask(~0);
     glClearStencil(clearable->get_clear_stencil());
     mask |= GL_STENCIL_BUFFER_BIT;
   }
@@ -2468,6 +2506,8 @@ prepare_display_region(DisplayRegionPipelineReader *dr) {
   _draw_buffer_type |= _current_properties->get_aux_mask();
   set_draw_buffer(_draw_buffer_type);
 
+  int count = dr->get_num_regions();
+
   if (dr->get_scissor_enabled()) {
     if (GLCAT.is_spam()) {
       GLCAT.spam()
@@ -2475,6 +2515,7 @@ prepare_display_region(DisplayRegionPipelineReader *dr) {
     }
     glEnable(GL_SCISSOR_TEST);
     _scissor_enabled = true;
+    _scissor_array.resize(count);
   } else {
     if (GLCAT.is_spam()) {
       GLCAT.spam()
@@ -2482,27 +2523,35 @@ prepare_display_region(DisplayRegionPipelineReader *dr) {
     }
     glDisable(GL_SCISSOR_TEST);
     _scissor_enabled = false;
+    _scissor_array.clear();
   }
 
+  _scissor_attrib_active = false;
+
 #ifndef OPENGLES
   if (_supports_viewport_arrays) {
-    int count = dr->get_num_regions();
-    GLfloat *viewports = (GLfloat *)alloca(sizeof(GLfloat) * 4 * count);
-    GLint *scissors = (GLint *)alloca(sizeof(GLint) * 4 * count);
 
+    GLfloat *viewports = (GLfloat *)alloca(sizeof(GLfloat) * 4 * count);
+
+    // We store the scissor regions in a vector since we may need
+    // to switch back to it in do_issue_scissor.
     for (int i = 0; i < count; ++i) {
-      GLint *sr = scissors + i * 4;
+      LVecBase4i sr;
       dr->get_region_pixels(i, sr[0], sr[1], sr[2], sr[3]);
       GLfloat *vr = viewports + i * 4;
       vr[0] = (GLfloat) sr[0];
       vr[1] = (GLfloat) sr[1];
       vr[2] = (GLfloat) sr[2];
       vr[3] = (GLfloat) sr[3];
+      if (_scissor_enabled) {
+        _scissor_array[i] = sr;
+      }
     }
     _glViewportArrayv(0, count, viewports);
-    if (dr->get_scissor_enabled()) {
-      _glScissorArrayv(0, count, scissors);
+    if (_scissor_enabled) {
+      _glScissorArrayv(0, count, _scissor_array[0].get_data());
     }
+
     if (GLCAT.is_spam()) {
       GLCAT.spam()
         << "glViewportArrayv(0, " << count << ", [\n";
@@ -2511,12 +2560,12 @@ prepare_display_region(DisplayRegionPipelineReader *dr) {
         GLCAT.spam(false) << vr[0] << ", " << vr[1] << ", " << vr[2] << ", " << vr[3] << ",\n";
       }
       GLCAT.spam(false) << "])\n";
-      if (dr->get_scissor_enabled()) {
+      if (_scissor_enabled) {
         GLCAT.spam()
           << "glScissorArrayv(0, " << count << ", [\n";
         for (int i = 0; i < count; ++i) {
-          GLint *sr = scissors + i * 4;
-          GLCAT.spam(false) << sr[0] << ", " << sr[1] << ", " << sr[2] << ", " << sr[3] << ",\n";
+          const LVecBase4i &sr = _scissor_array[i];
+          GLCAT.spam(false) << sr << ",\n";
         }
       }
       GLCAT.spam(false) << "])\n";
@@ -2526,9 +2575,13 @@ prepare_display_region(DisplayRegionPipelineReader *dr) {
 #endif  // OPENGLES
   {
     glViewport(x, y, width, height);
-    if (dr->get_scissor_enabled()) {
+    if (_scissor_enabled) {
       glScissor(x, y, width, height);
+
+      _scissor_array.resize(1);
+      _scissor_array[0].set(x, y, width, height);
     }
+
     if (GLCAT.is_spam()) {
       GLCAT.spam()
         << "glViewport(" << x << ", " << y << ", " << width << ", " << height << ")\n";
@@ -2561,6 +2614,7 @@ clear_before_callback() {
   // texture stage is still set to stage 0.  CEGUI, in particular,
   // makes this assumption.
   _glActiveTexture(GL_TEXTURE0);
+  _glClientActiveTexture(GL_TEXTURE0);
 
   // Clear the bound sampler object, so that we do not inadvertently
   // override the callback's desired sampler settings.
@@ -2826,7 +2880,7 @@ end_frame(Thread *current_thread) {
 
   // Now is a good time to delete any pending display lists.
 #ifndef OPENGLES
-  {
+  if (display_lists) {
     LightMutexHolder holder(_lock);
     if (!_deleted_display_lists.empty()) {
       DeletedNames::iterator ddli;
@@ -2841,10 +2895,13 @@ end_frame(Thread *current_thread) {
       }
       _deleted_display_lists.clear();
     }
+  }
 
-    // And deleted queries, too, unless we're using query timers
-    // in which case we'll need to reuse lots of them.
-    if (!get_timer_queries_active() && !_deleted_queries.empty()) {
+  // And deleted queries, too, unless we're using query timers
+  // in which case we'll need to reuse lots of them.
+  if (_supports_occlusion_query && !get_timer_queries_active()) {
+    LightMutexHolder holder(_lock);
+    if (!_deleted_queries.empty()) {
       if (GLCAT.is_spam()) {
         DeletedNames::iterator dqi;
         for (dqi = _deleted_queries.begin();
@@ -3934,13 +3991,9 @@ draw_linestrips(const GeomPrimitivePipelineReader *reader, bool force) {
         (_supported_geom_rendering & GeomEnums::GR_strip_cut_index) != 0) {
       // One long triangle strip, connected by strip cut indices.
 #ifndef OPENGLES
-      if (_primitive_restart_gl3) {
+      if (_explicit_primitive_restart) {
         glEnable(GL_PRIMITIVE_RESTART);
         _glPrimitiveRestartIndex(reader->get_strip_cut_index());
-
-      } else if (_primitive_restart_nv) {
-        glEnableClientState(GL_PRIMITIVE_RESTART_NV);
-        _glPrimitiveRestartIndex(reader->get_strip_cut_index());
       }
 #endif  // !OPENGLES
 
@@ -3969,11 +4022,8 @@ draw_linestrips(const GeomPrimitivePipelineReader *reader, bool force) {
       }
 
 #ifndef OPENGLES
-      if (_primitive_restart_gl3) {
+      if (_explicit_primitive_restart) {
         glDisable(GL_PRIMITIVE_RESTART);
-
-      } else if (_primitive_restart_nv) {
-        glDisableClientState(GL_PRIMITIVE_RESTART_NV);
       }
 #endif  // !OPENGLES
     } else {
@@ -4170,8 +4220,8 @@ issue_memory_barrier(GLbitfield barriers) {
 
   PStatGPUTimer timer(this, _memory_barrier_pcollector);
 
-  if (GLCAT.is_debug()) {
-    GLCAT.debug() << "Issuing memory barriers:";
+  if (GLCAT.is_spam()) {
+    GLCAT.spam() << "Issuing memory barriers:";
   }
 
   _glMemoryBarrier(barriers);
@@ -4180,25 +4230,25 @@ issue_memory_barrier(GLbitfield barriers) {
   // the relevant lists of textures.
   if (barriers & GL_TEXTURE_FETCH_BARRIER_BIT) {
     _textures_needing_fetch_barrier.clear();
-    GLCAT.debug(false) << " texture_fetch";
+    GLCAT.spam(false) << " texture_fetch";
   }
 
   if (barriers & GL_SHADER_IMAGE_ACCESS_BARRIER_BIT) {
     _textures_needing_image_access_barrier.clear();
-    GLCAT.debug(false) << " shader_image_access";
+    GLCAT.spam(false) << " shader_image_access";
   }
 
   if (barriers & GL_TEXTURE_UPDATE_BARRIER_BIT) {
     _textures_needing_update_barrier.clear();
-    GLCAT.debug(false) << " texture_update";
+    GLCAT.spam(false) << " texture_update";
   }
 
   if (barriers & GL_FRAMEBUFFER_BARRIER_BIT) {
     _textures_needing_framebuffer_barrier.clear();
-    GLCAT.debug(false) << " framebuffer";
+    GLCAT.spam(false) << " framebuffer";
   }
 
-  GLCAT.debug(false) << "\n";
+  GLCAT.spam(false) << "\n";
 
   report_my_gl_errors();
 #endif  // OPENGLES
@@ -5096,6 +5146,9 @@ issue_timer_query(int pstats_index) {
     }
   }
 
+  // Issue the timestamp query.
+  _glQueryCounter(query->_index, GL_TIMESTAMP);
+
   if (_use_object_labels) {
     // Assign a label to it based on the PStatCollector name.
     const PStatClient *client = PStatClient::get_global_pstats();
@@ -5103,12 +5156,9 @@ issue_timer_query(int pstats_index) {
     _glObjectLabel(GL_QUERY, query->_index, name.size(), name.data());
   }
 
-  // Issue the timestamp query.
-  _glQueryCounter(query->_index, GL_TIMESTAMP);
+  _pending_timer_queries.push_back((TimerQueryContext *)query);
 
-  _pending_timer_queries.push_back(DCAST(TimerQueryContext, query));
-
-  return DCAST(TimerQueryContext, query);
+  return (TimerQueryContext *)query;
 
 #else
   return NULL;
@@ -5147,6 +5197,19 @@ make_geom_munger(const RenderState *state, Thread *current_thread) {
   return GeomMunger::register_munger(munger, current_thread);
 }
 
+////////////////////////////////////////////////////////////////////
+//     Function: GLGraphicsStateGuardian::compute_distance_to
+//       Access: Public, Virtual
+//  Description: This function will compute the distance to the
+//               indicated point, assumed to be in eye coordinates,
+//               from the camera plane.  The point is assumed to be
+//               in the GSG's internal coordinate system.
+////////////////////////////////////////////////////////////////////
+PN_stdfloat GLGraphicsStateGuardian::
+compute_distance_to(const LPoint3 &point) const {
+  return -point[2];
+}
+
 ////////////////////////////////////////////////////////////////////
 //     Function: GLGraphicsStateGuardian::framebuffer_copy_to_texture
 //       Access: Public, Virtual
@@ -5621,7 +5684,9 @@ do_issue_transform() {
 void CLP(GraphicsStateGuardian)::
 do_issue_shade_model() {
 #ifndef OPENGLES_2
-  const ShadeModelAttrib *target_shade_model = DCAST(ShadeModelAttrib, _target_rs->get_attrib_def(ShadeModelAttrib::get_class_slot()));
+  const ShadeModelAttrib *target_shade_model = (const ShadeModelAttrib *)
+    _target_rs->get_attrib_def(ShadeModelAttrib::get_class_slot());
+
   switch (target_shade_model->get_mode()) {
   case ShadeModelAttrib::M_smooth:
     glShadeModel(GL_SMOOTH);
@@ -5704,7 +5769,9 @@ do_issue_shader(bool state_has_changed) {
 ////////////////////////////////////////////////////////////////////
 void CLP(GraphicsStateGuardian)::
 do_issue_render_mode() {
-  const RenderModeAttrib *target_render_mode = DCAST(RenderModeAttrib, _target_rs->get_attrib_def(RenderModeAttrib::get_class_slot()));
+  const RenderModeAttrib *target_render_mode = (const RenderModeAttrib *)
+    _target_rs->get_attrib_def(RenderModeAttrib::get_class_slot());
+
   _render_mode = target_render_mode->get_mode();
   _point_size = target_render_mode->get_thickness();
   _point_perspective = target_render_mode->get_perspective();
@@ -5748,7 +5815,9 @@ do_issue_render_mode() {
 ////////////////////////////////////////////////////////////////////
 void CLP(GraphicsStateGuardian)::
 do_issue_antialias() {
-  const AntialiasAttrib *target_antialias = DCAST(AntialiasAttrib, _target_rs->get_attrib_def(AntialiasAttrib::get_class_slot()));
+  const AntialiasAttrib *target_antialias = (const AntialiasAttrib *)
+    _target_rs->get_attrib_def(AntialiasAttrib::get_class_slot());
+
   if (target_antialias->get_mode_type() == AntialiasAttrib::M_auto) {
     // In this special mode, we must enable antialiasing on a
     // case-by-case basis, because we enable it differently for
@@ -5814,7 +5883,9 @@ do_issue_antialias() {
 void CLP(GraphicsStateGuardian)::
 do_issue_rescale_normal() {
 #ifndef OPENGLES_2 // OpenGL ES 2.0 doesn't support rescaling normals.
-  const RescaleNormalAttrib *target_rescale_normal = DCAST(RescaleNormalAttrib, _target_rs->get_attrib_def(RescaleNormalAttrib::get_class_slot()));
+  const RescaleNormalAttrib *target_rescale_normal = (const RescaleNormalAttrib *)
+    _target_rs->get_attrib_def(RescaleNormalAttrib::get_class_slot());
+
   RescaleNormalAttrib::Mode mode = target_rescale_normal->get_mode();
 
   _auto_rescale_normal = false;
@@ -5866,7 +5937,9 @@ do_issue_rescale_normal() {
 ////////////////////////////////////////////////////////////////////
 void CLP(GraphicsStateGuardian)::
 do_issue_depth_test() {
-  const DepthTestAttrib *target_depth_test = DCAST(DepthTestAttrib, _target_rs->get_attrib_def(DepthTestAttrib::get_class_slot()));
+  const DepthTestAttrib *target_depth_test = (const DepthTestAttrib *)
+    _target_rs->get_attrib_def(DepthTestAttrib::get_class_slot());
+
   DepthTestAttrib::PandaCompareFunc mode = target_depth_test->get_mode();
   if (mode == DepthTestAttrib::M_none) {
     enable_depth_test(false);
@@ -5887,7 +5960,9 @@ do_issue_alpha_test() {
   if (_target_shader->get_flag(ShaderAttrib::F_subsume_alpha_test)) {
     enable_alpha_test(false);
   } else {
-    const AlphaTestAttrib *target_alpha_test = DCAST(AlphaTestAttrib, _target_rs->get_attrib_def(AlphaTestAttrib::get_class_slot()));
+    const AlphaTestAttrib *target_alpha_test = (const AlphaTestAttrib *)
+      _target_rs->get_attrib_def(AlphaTestAttrib::get_class_slot());
+
     AlphaTestAttrib::PandaCompareFunc mode = target_alpha_test->get_mode();
     if (mode == AlphaTestAttrib::M_none) {
       enable_alpha_test(false);
@@ -5908,7 +5983,9 @@ do_issue_alpha_test() {
 ////////////////////////////////////////////////////////////////////
 void CLP(GraphicsStateGuardian)::
 do_issue_depth_write() {
-  const DepthWriteAttrib *target_depth_write = DCAST(DepthWriteAttrib, _target_rs->get_attrib_def(DepthWriteAttrib::get_class_slot()));
+  const DepthWriteAttrib *target_depth_write = (const DepthWriteAttrib *)
+    _target_rs->get_attrib_def(DepthWriteAttrib::get_class_slot());
+
   DepthWriteAttrib::Mode mode = target_depth_write->get_mode();
   if (mode == DepthWriteAttrib::M_off) {
 #ifdef GSG_VERBOSE
@@ -5933,7 +6010,9 @@ do_issue_depth_write() {
 ////////////////////////////////////////////////////////////////////
 void CLP(GraphicsStateGuardian)::
 do_issue_cull_face() {
-  const CullFaceAttrib *target_cull_face = DCAST(CullFaceAttrib, _target_rs->get_attrib_def(CullFaceAttrib::get_class_slot()));
+  const CullFaceAttrib *target_cull_face = (const CullFaceAttrib *)
+    _target_rs->get_attrib_def(CullFaceAttrib::get_class_slot());
+
   CullFaceAttrib::Mode mode = target_cull_face->get_effective_mode();
 
   switch (mode) {
@@ -5963,7 +6042,9 @@ do_issue_cull_face() {
 ////////////////////////////////////////////////////////////////////
 void CLP(GraphicsStateGuardian)::
 do_issue_fog() {
-  const FogAttrib *target_fog = DCAST(FogAttrib, _target_rs->get_attrib_def(FogAttrib::get_class_slot()));
+  const FogAttrib *target_fog = (const FogAttrib *)
+    _target_rs->get_attrib_def(FogAttrib::get_class_slot());
+
   if (!target_fog->is_off()) {
     enable_fog(true);
     Fog *fog = target_fog->get_fog();
@@ -5982,7 +6063,9 @@ do_issue_fog() {
 ////////////////////////////////////////////////////////////////////
 void CLP(GraphicsStateGuardian)::
 do_issue_depth_offset() {
-  const DepthOffsetAttrib *target_depth_offset = DCAST(DepthOffsetAttrib, _target_rs->get_attrib_def(DepthOffsetAttrib::get_class_slot()));
+  const DepthOffsetAttrib *target_depth_offset = (const DepthOffsetAttrib *)
+     _target_rs->get_attrib_def(DepthOffsetAttrib::get_class_slot());
+
   int offset = target_depth_offset->get_offset();
 
   if (offset != 0) {
@@ -6023,7 +6106,8 @@ do_issue_material() {
   static Material empty;
   const Material *material;
 
-  const MaterialAttrib *target_material = DCAST(MaterialAttrib, _target_rs->get_attrib_def(MaterialAttrib::get_class_slot()));
+  const MaterialAttrib *target_material = (const MaterialAttrib *)
+    _target_rs->get_attrib_def(MaterialAttrib::get_class_slot());
 
   if (target_material == (MaterialAttrib *)NULL ||
       target_material->is_off()) {
@@ -6130,7 +6214,8 @@ do_issue_blending() {
   // all the other blending-related stuff doesn't matter.  If the
   // device doesn't support color-write, we use blending tricks
   // to effectively disable color write.
-  const ColorWriteAttrib *target_color_write = DCAST(ColorWriteAttrib, _target_rs->get_attrib_def(ColorWriteAttrib::get_class_slot()));
+  const ColorWriteAttrib *target_color_write = (const ColorWriteAttrib *)
+    _target_rs->get_attrib_def(ColorWriteAttrib::get_class_slot());
 
   unsigned int color_channels =
     target_color_write->get_channels() & _color_write_mask;
@@ -6160,11 +6245,13 @@ do_issue_blending() {
   }
 
 
-  const ColorBlendAttrib *target_color_blend = DCAST(ColorBlendAttrib, _target_rs->get_attrib_def(ColorBlendAttrib::get_class_slot()));
+  const ColorBlendAttrib *target_color_blend = (const ColorBlendAttrib *)
+    _target_rs->get_attrib_def(ColorBlendAttrib::get_class_slot());
   CPT(ColorBlendAttrib) color_blend = target_color_blend;
   ColorBlendAttrib::Mode color_blend_mode = target_color_blend->get_mode();
 
-  const TransparencyAttrib *target_transparency = DCAST(TransparencyAttrib, _target_rs->get_attrib_def(TransparencyAttrib::get_class_slot()));
+  const TransparencyAttrib *target_transparency = (const TransparencyAttrib *)
+    _target_rs->get_attrib_def(TransparencyAttrib::get_class_slot());
   TransparencyAttrib::Mode transparency_mode = target_transparency->get_mode();
 
   _color_blend_involves_color_scale = color_blend->involves_color_scale();
@@ -6718,27 +6805,6 @@ report_extensions() const {
   }
 }
 
-////////////////////////////////////////////////////////////////////
-//     Function: GLGraphicsStateGuardian::has_extension
-//       Access: Protected
-//  Description: Returns true if the indicated extension is reported
-//               by the GL system, false otherwise.  The extension
-//               name is case-sensitive.
-////////////////////////////////////////////////////////////////////
-bool CLP(GraphicsStateGuardian)::
-has_extension(const string &extension) const {
-
-  bool state;
-
-  state = _extensions.find(extension) != _extensions.end();
-  if (GLCAT.is_debug()) {
-    GLCAT.debug()
-      << "HAS EXT " << extension << " " << state << "\n";
-  }
-
-  return state;
-}
-
 ////////////////////////////////////////////////////////////////////
 //     Function: GLGraphicsStateGuardian::get_extension_func
 //       Access: Public
@@ -8715,23 +8781,11 @@ set_state_and_transform(const RenderState *target,
   }
   _target_rs = target;
 
-  _target_shader = DCAST(ShaderAttrib, _target_rs->get_attrib_def(ShaderAttrib::get_class_slot()));
+  _target_shader = (const ShaderAttrib *)
+    _target_rs->get_attrib_def(ShaderAttrib::get_class_slot());
 #ifndef OPENGLES
   _instance_count = _target_shader->get_instance_count();
 #endif
-#ifndef OPENGLES_1
-  if (_target_shader->auto_shader()) {
-    // If we don't have a generated shader, make sure we have a ShaderGenerator, then generate the shader.
-    CPT(RenderState) shader = _target_rs->get_auto_shader_state();
-    if (shader->_generated_shader == NULL) {
-      if (_shader_generator == NULL) {
-        _shader_generator = new ShaderGenerator(this, _scene_setup->get_display_region()->get_window());
-      }
-      const_cast<RenderState*>(shader.p())->_generated_shader = DCAST(ShaderAttrib, _shader_generator->synthesize_shader(shader));
-    }
-    _target_shader = DCAST(ShaderAttrib, shader->_generated_shader);
-  }
-#endif
 
   int alpha_test_slot = AlphaTestAttrib::get_class_slot();
   if (_target_rs->get_attrib(alpha_test_slot) != _state_rs->get_attrib(alpha_test_slot) ||
@@ -8757,6 +8811,11 @@ set_state_and_transform(const RenderState *target,
     //PStatGPUTimer timer(this, _draw_set_state_clip_plane_pcollector);
     do_issue_clip_plane();
     _state_mask.set_bit(clip_plane_slot);
+#ifndef OPENGLES_1
+    if (_current_shader_context) {
+      _current_shader_context->issue_parameters(Shader::SSD_clip_planes);
+    }
+#endif
   }
 
   int color_slot = ColorAttrib::get_class_slot();
@@ -8935,6 +8994,11 @@ set_state_and_transform(const RenderState *target,
     //PStatGPUTimer timer(this, _draw_set_state_light_pcollector);
     do_issue_light();
     _state_mask.set_bit(light_slot);
+#ifndef OPENGLES_1
+    if (_current_shader_context) {
+      _current_shader_context->issue_parameters(Shader::SSD_light);
+    }
+#endif
   }
 
   int stencil_slot = StencilAttrib::get_class_slot();
@@ -8979,6 +9043,12 @@ set_state_and_transform(const RenderState *target,
 ////////////////////////////////////////////////////////////////////
 void CLP(GraphicsStateGuardian)::
 free_pointers() {
+#ifdef HAVE_CG
+  if (_cg_context != 0) {
+    cgDestroyContext(_cg_context);
+    _cg_context = 0;
+  }
+#endif
 }
 
 ////////////////////////////////////////////////////////////////////
@@ -9542,7 +9612,9 @@ do_issue_tex_matrix() {
 
     glMatrixMode(GL_TEXTURE);
 
-    const TexMatrixAttrib *target_tex_matrix = DCAST(TexMatrixAttrib, _target_rs->get_attrib_def(TexMatrixAttrib::get_class_slot()));
+    const TexMatrixAttrib *target_tex_matrix = (const TexMatrixAttrib *)
+      _target_rs->get_attrib_def(TexMatrixAttrib::get_class_slot());
+
     if (target_tex_matrix->has_stage(stage)) {
       GLPf(LoadMatrix)(target_tex_matrix->get_mat(stage).get_data());
     } else {
@@ -9608,7 +9680,7 @@ do_issue_tex_gen() {
     TexGenAttrib::Mode mode = _target_tex_gen->get_mode(stage);
     switch (mode) {
     case TexGenAttrib::M_off:
-    case TexGenAttrib::M_light_vector:
+    case TexGenAttrib::M_unused2:
       break;
 
     case TexGenAttrib::M_eye_sphere_map:
@@ -11870,7 +11942,8 @@ do_issue_stencil() {
     return;
   }
 
-  const StencilAttrib *stencil = DCAST(StencilAttrib, _target_rs->get_attrib(StencilAttrib::get_class_slot()));
+  const StencilAttrib *stencil = (const StencilAttrib *)
+    _target_rs->get_attrib(StencilAttrib::get_class_slot());
 
   if (stencil != (const StencilAttrib *)NULL) {
     // DEBUG
@@ -11958,7 +12031,8 @@ do_issue_stencil() {
 ////////////////////////////////////////////////////////////////////
 void CLP(GraphicsStateGuardian)::
 do_issue_scissor() {
-  const ScissorAttrib *target_scissor = DCAST(ScissorAttrib, _target_rs->get_attrib_def(ScissorAttrib::get_class_slot()));
+  const ScissorAttrib *target_scissor = (const ScissorAttrib *)
+    _target_rs->get_attrib_def(ScissorAttrib::get_class_slot());
 
   if (!target_scissor->is_off()) {
     // A non-off ScissorAttrib means to override the scissor setting
@@ -11984,5 +12058,30 @@ do_issue_scissor() {
         << "glScissor(" << x << ", " << y << ", " << width << ", " << height << ")\n";
     }
     glScissor(x, y, width, height);
+
+    _scissor_attrib_active = true;
+
+  } else if (_scissor_attrib_active) {
+    _scissor_attrib_active = false;
+
+    if (_scissor_array.size() > 0) {
+      // Scissoring is enabled on the display region.
+      // Revert to the scissor state specified in the DisplayRegion.
+      if (_supports_viewport_arrays) {
+        _glScissorArrayv(0, _scissor_array.size(), _scissor_array[0].get_data());
+      } else {
+        const LVecBase4i sr = _scissor_array[0];
+        glScissor(sr[0], sr[1], sr[2], sr[3]);
+      }
+
+    } else if (_scissor_enabled) {
+      // The display region had no scissor enabled.  Disable scissoring.
+      if (GLCAT.is_spam()) {
+        GLCAT.spam()
+          << "glDisable(GL_SCISSOR_TEST)\n";
+      }
+      glDisable(GL_SCISSOR_TEST);
+      _scissor_enabled = false;
+    }
   }
 }
diff --git a/panda/src/glstuff/glGraphicsStateGuardian_src.h b/panda/src/glstuff/glGraphicsStateGuardian_src.h
index f89a84600b..97efe35586 100644
--- a/panda/src/glstuff/glGraphicsStateGuardian_src.h
+++ b/panda/src/glstuff/glGraphicsStateGuardian_src.h
@@ -182,6 +182,7 @@ typedef void (APIENTRYP PFNGLVALIDATEPROGRAMPROC) (GLuint program);
 typedef void (APIENTRYP PFNGLVERTEXATTRIBPOINTERPROC) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid *pointer);
 typedef void (APIENTRYP PFNGLVERTEXATTRIBIPOINTERPROC) (GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
 typedef void (APIENTRYP PFNGLVERTEXATTRIBLPOINTERPROC) (GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBDIVISORPROC) (GLuint index, GLuint divisor);
 #endif  // OPENGLES_1
 #ifndef OPENGLES
 typedef void (APIENTRYP PFNGLGENSAMPLERSPROC) (GLsizei count, GLuint *samplers);
@@ -326,6 +327,8 @@ public:
   virtual PT(GeomMunger) make_geom_munger(const RenderState *state,
                                           Thread *current_thread);
 
+  virtual PN_stdfloat compute_distance_to(const LPoint3 &point) const;
+
   virtual void clear(DrawableRegion *region);
 
   virtual bool framebuffer_copy_to_texture
@@ -403,7 +406,7 @@ protected:
   void save_extensions(const char *extensions);
   virtual void get_extra_extensions();
   void report_extensions() const;
-  bool has_extension(const string &extension) const;
+  INLINE virtual bool has_extension(const string &extension) const FINAL;
   INLINE bool is_at_least_gl_version(int major_version, int minor_version) const;
   INLINE bool is_at_least_gles_version(int major_version, int minor_version) const;
   void *get_extension_func(const char *name);
@@ -550,6 +553,8 @@ protected:
   bool _point_perspective;
   bool _vertex_blending_enabled;
   bool _scissor_enabled;
+  bool _scissor_attrib_active;
+  epvector<LVecBase4i> _scissor_array;
 
 #ifndef OPENGLES_1
   PT(Shader) _current_shader;
@@ -563,11 +568,17 @@ protected:
   static PT(Shader)  _default_shader;
 #endif
 
+#ifdef HAVE_CG
+  CGcontext _cg_context;
+#endif
+
 #ifdef SUPPORT_IMMEDIATE_MODE
   CLP(ImmediateModeSender) _sender;
   bool _use_sender;
 #endif  // SUPPORT_IMMEDIATE_MODE
 
+  bool _supports_vertex_attrib_divisor;
+
   // Cache the data necessary to bind each particular light each
   // frame, so if we bind a given light multiple times, we only have
   // to compute its data once.
@@ -614,8 +625,7 @@ public:
 
 #ifndef OPENGLES
   PFNGLPRIMITIVERESTARTINDEXPROC _glPrimitiveRestartIndex;
-  bool _primitive_restart_gl3;
-  bool _primitive_restart_nv;
+  bool _explicit_primitive_restart;
 #endif
 
   bool _supports_vertex_blend;
@@ -782,6 +792,7 @@ public:
   PFNGLVERTEXATTRIBPOINTERPROC _glVertexAttribPointer;
   PFNGLVERTEXATTRIBIPOINTERPROC _glVertexAttribIPointer;
   PFNGLVERTEXATTRIBLPOINTERPROC _glVertexAttribLPointer;
+  PFNGLVERTEXATTRIBDIVISORPROC _glVertexAttribDivisor;
 #endif  // OPENGLES_1
 #ifndef OPENGLES
   PFNGLGENSAMPLERSPROC _glGenSamplers;
diff --git a/panda/src/glstuff/glShaderContext_src.cxx b/panda/src/glstuff/glShaderContext_src.cxx
index 4aca23a373..e6a0d4551e 100755
--- a/panda/src/glstuff/glShaderContext_src.cxx
+++ b/panda/src/glstuff/glShaderContext_src.cxx
@@ -412,6 +412,39 @@ CLP(ShaderContext)(CLP(GraphicsStateGuardian) *glgsg, Shader *s) : ShaderContext
             s->_mat_spec.push_back(bind);
             continue;
           }
+          if (noprefix == "ClipPlane") {
+            for (int i = 0; i < param_size; ++i) {
+              Shader::ShaderMatSpec bind;
+              bind._id = arg_id;
+              bind._id._seqno = seqno++;
+              bind._piece = Shader::SMP_row3;
+              bind._func = Shader::SMF_first;
+              bind._index = i;
+              bind._part[0] = Shader::SMO_apiview_clipplane_i;
+              bind._arg[0] = NULL;
+              bind._dep[0] = Shader::SSD_general | Shader::SSD_clip_planes;
+              bind._part[1] = Shader::SMO_identity;
+              bind._arg[1] = NULL;
+              bind._dep[1] = Shader::SSD_NONE;
+              s->_mat_spec.push_back(bind);
+              _glsl_parameter_map.push_back(p + i);
+            }
+            continue;
+          }
+          if (noprefix == "LightModel.ambient") {
+            Shader::ShaderMatSpec bind;
+            bind._id = arg_id;
+            bind._piece = Shader::SMP_row3;
+            bind._func = Shader::SMF_first;
+            bind._part[0] = Shader::SMO_light_ambient;
+            bind._arg[0] = NULL;
+            bind._dep[0] = Shader::SSD_general | Shader::SSD_light;
+            bind._part[1] = Shader::SMO_identity;
+            bind._arg[1] = NULL;
+            bind._dep[1] = Shader::SSD_NONE;
+            s->_mat_spec.push_back(bind);
+            continue;
+          }
           GLCAT.error() << "Unrecognized uniform name '" << param_name_cstr << "'!\n";
           continue;
 
@@ -565,7 +598,8 @@ CLP(ShaderContext)(CLP(GraphicsStateGuardian) *glgsg, Shader *s) : ShaderContext
               bind._arg[1] = NULL;
               bind._dep[1] = Shader::SSD_NONE;
               s->_mat_spec.push_back(bind);
-              continue; }
+              continue;
+            }
             case GL_FLOAT_MAT4: {
               Shader::ShaderMatSpec bind;
               bind._id = arg_id;
@@ -578,7 +612,43 @@ CLP(ShaderContext)(CLP(GraphicsStateGuardian) *glgsg, Shader *s) : ShaderContext
               bind._arg[1] = NULL;
               bind._dep[1] = Shader::SSD_NONE;
               s->_mat_spec.push_back(bind);
-              continue; }
+              continue;
+            }
+            case GL_FLOAT:
+            case GL_FLOAT_VEC2:
+            case GL_FLOAT_VEC3:
+            case GL_FLOAT_VEC4: {
+              PT(InternalName) iname = InternalName::make(param_name);
+              if (iname->get_parent() != InternalName::get_root()) {
+                // It might be something like an attribute of a shader
+                // input, like a light parameter.  It might also just be
+                // a custom struct parameter.  We can't know yet, sadly.
+                Shader::ShaderMatSpec bind;
+                bind._id = arg_id;
+                switch (param_type) {
+                case GL_FLOAT:
+                  bind._piece = Shader::SMP_row3x1;
+                  break;
+                case GL_FLOAT_VEC2:
+                  bind._piece = Shader::SMP_row3x2;
+                  break;
+                case GL_FLOAT_VEC3:
+                  bind._piece = Shader::SMP_row3x3;
+                  break;
+                default:
+                  bind._piece = Shader::SMP_row3;
+                }
+                bind._func = Shader::SMF_first;
+                bind._part[0] = Shader::SMO_vec_constant_x_attrib;
+                bind._arg[0] = iname;
+                bind._dep[0] = Shader::SSD_general | Shader::SSD_shaderinputs;
+                bind._part[1] = Shader::SMO_identity;
+                bind._arg[1] = NULL;
+                bind._dep[1] = Shader::SSD_NONE;
+                s->_mat_spec.push_back(bind);
+                continue;
+              } // else fall through
+            }
             case GL_BOOL:
             case GL_BOOL_VEC2:
             case GL_BOOL_VEC3:
@@ -586,11 +656,7 @@ CLP(ShaderContext)(CLP(GraphicsStateGuardian) *glgsg, Shader *s) : ShaderContext
             case GL_INT:
             case GL_INT_VEC2:
             case GL_INT_VEC3:
-            case GL_INT_VEC4:
-            case GL_FLOAT:
-            case GL_FLOAT_VEC2:
-            case GL_FLOAT_VEC3:
-            case GL_FLOAT_VEC4: {
+            case GL_INT_VEC4: {
               Shader::ShaderPtrSpec bind;
               bind._id = arg_id;
               switch (param_type) {
@@ -734,6 +800,7 @@ CLP(ShaderContext)(CLP(GraphicsStateGuardian) *glgsg, Shader *s) : ShaderContext
       bind._id = arg_id;
       bind._name = NULL;
       bind._append_uv = -1;
+      bind._elements = 1;
 
       if (param_name.substr(0, 3) == "gl_") {
         // Not all drivers return -1 in glGetAttribLocation
@@ -792,6 +859,24 @@ CLP(ShaderContext)(CLP(GraphicsStateGuardian) *glgsg, Shader *s) : ShaderContext
         GLCAT.error() << "Unrecognized vertex attrib '" << param_name << "'!\n";
         continue;
       }
+
+      // Get the number of bind points.
+      switch (param_type) {
+      case GL_FLOAT_MAT3:
+      case GL_DOUBLE_MAT3:
+        bind._elements = 3 * param_size;
+        break;
+
+      case GL_FLOAT_MAT4:
+      case GL_DOUBLE_MAT4:
+        bind._elements = 4 * param_size;
+        break;
+
+      default:
+        bind._elements = param_size;
+        break;
+      }
+
       s->_var_spec.push_back(bind);
     }
   }
@@ -998,7 +1083,12 @@ disable_shader_vertex_arrays() {
   for (int i=0; i<(int)_shader->_var_spec.size(); i++) {
     const Shader::ShaderVarSpec &bind = _shader->_var_spec[i];
     const GLint p = _glsl_parameter_map[bind._id._seqno];
-    _glgsg->_glDisableVertexAttribArray(p);
+    if (_glgsg->_supports_vertex_attrib_divisor) {
+      _glgsg->_glVertexAttribDivisor(p, 0);
+    }
+    for (int i = 0; i < bind._elements; ++i) {
+      _glgsg->_glDisableVertexAttribArray(p + i);
+    }
   }
 
   _glgsg->report_my_gl_errors();
@@ -1050,33 +1140,47 @@ update_shader_vertex_arrays(ShaderContext *prev, bool force) {
           name = name->append(texname->get_basename());
         }
       }
-      const GLint p = _glsl_parameter_map[bind._id._seqno];
+      GLint p = _glsl_parameter_map[bind._id._seqno];
 
-      if (_glgsg->_data_reader->get_array_info(name,
-                                               array_reader, num_values, numeric_type,
-                                               start, stride)) {
+      int num_elements, element_stride, divisor;
+      if (_glgsg->_data_reader->get_array_info(name, array_reader,
+                                               num_values, numeric_type,
+                                               start, stride, divisor,
+                                               num_elements, element_stride)) {
         const unsigned char *client_pointer;
         if (!_glgsg->setup_array_data(client_pointer, array_reader, force)) {
           return false;
         }
+        client_pointer += start;
 
-        _glgsg->_glEnableVertexAttribArray(p);
+        for (int i = 0; i < num_elements; ++i) {
+          _glgsg->_glEnableVertexAttribArray(p);
 
 #ifndef OPENGLES
-        if (bind._integer) {
-          _glgsg->_glVertexAttribIPointer(p, num_values, _glgsg->get_numeric_type(numeric_type),
-                                          stride, client_pointer + start);
-        } else
+          if (bind._integer) {
+            _glgsg->_glVertexAttribIPointer(p, num_values, _glgsg->get_numeric_type(numeric_type),
+                                            stride, client_pointer);
+          } else
 #endif
-        if (numeric_type == GeomEnums::NT_packed_dabc) {
-          _glgsg->_glVertexAttribPointer(p, GL_BGRA, GL_UNSIGNED_BYTE,
-                                         GL_TRUE, stride, client_pointer + start);
-        } else {
-          _glgsg->_glVertexAttribPointer(p, num_values, _glgsg->get_numeric_type(numeric_type),
-                                         GL_TRUE, stride, client_pointer + start);
+          if (numeric_type == GeomEnums::NT_packed_dabc) {
+            _glgsg->_glVertexAttribPointer(p, GL_BGRA, GL_UNSIGNED_BYTE,
+                                           GL_TRUE, stride, client_pointer);
+          } else {
+            _glgsg->_glVertexAttribPointer(p, num_values, _glgsg->get_numeric_type(numeric_type),
+                                           GL_TRUE, stride, client_pointer);
+          }
+
+          if (_glgsg->_supports_vertex_attrib_divisor) {
+            _glgsg->_glVertexAttribDivisor(p, divisor);
+          }
+
+          ++p;
+          client_pointer += element_stride;
         }
       } else {
-        _glgsg->_glDisableVertexAttribArray(p);
+        for (int i = 0; i < bind._elements; ++i) {
+          _glgsg->_glDisableVertexAttribArray(p + i);
+        }
       }
     }
   }
@@ -1290,14 +1394,7 @@ update_shader_texture_bindings(ShaderContext *prev) {
       view += stage->get_tex_view_offset();
     }
 
-    if (_shader->_tex_spec[i]._suffix != 0) {
-      // The suffix feature is inefficient. It is a temporary hack.
-      if (tex == 0) {
-        continue;
-      }
-      tex = tex->load_related(_shader->_tex_spec[i]._suffix);
-    }
-    if ((tex == 0) || (tex->get_texture_type() != _shader->_tex_spec[i]._desired_type)) {
+    if (tex == NULL || tex->get_texture_type() != _shader->_tex_spec[i]._desired_type) {
       continue;
     }
 
@@ -1369,18 +1466,57 @@ update_shader_texture_bindings(ShaderContext *prev) {
 //  Description: This subroutine prints the infolog for a shader.
 ////////////////////////////////////////////////////////////////////
 void CLP(ShaderContext)::
-glsl_report_shader_errors(GLuint shader) {
+glsl_report_shader_errors(GLuint shader, Shader::ShaderType type) {
   char *info_log;
   GLint length = 0;
   GLint num_chars  = 0;
 
   _glgsg->_glGetShaderiv(shader, GL_INFO_LOG_LENGTH, &length);
 
-  if (length > 1) {
-    info_log = (char *) alloca(length);
-    _glgsg->_glGetShaderInfoLog(shader, length, &num_chars, info_log);
-    if (strcmp(info_log, "Success.\n") != 0 && strcmp(info_log, "No errors.\n") != 0) {
-      GLCAT.error(false) << info_log << "\n";
+  if (length <= 1) {
+    return;
+  }
+
+  info_log = (char *) alloca(length);
+  _glgsg->_glGetShaderInfoLog(shader, length, &num_chars, info_log);
+  if (strcmp(info_log, "Success.\n") == 0 ||
+      strcmp(info_log, "No errors.\n") == 0) {
+    return;
+  }
+
+  // Parse the errors so that we can substitute in actual file
+  // locations instead of source indices.
+  istringstream log(info_log);
+  string line;
+  while (getline(log, line)) {
+    int fileno, lineno;
+    int prefixlen = 0;
+
+    // First is AMD/Intel driver syntax, second is NVIDIA syntax.
+    if (sscanf(line.c_str(), "ERROR: %d:%d: %n", &fileno, &lineno, &prefixlen) == 2
+        && prefixlen > 0) {
+
+      Filename fn = _shader->get_filename_from_index(fileno, type);
+      GLCAT.error(false)
+        << "ERROR: " << fn << ":" << lineno << ": " << (line.c_str() + prefixlen) << "\n";
+
+    } else if (sscanf(line.c_str(), "WARNING: %d:%d: %n", &fileno, &lineno, &prefixlen) == 2
+        && prefixlen > 0) {
+
+      Filename fn = _shader->get_filename_from_index(fileno, type);
+      GLCAT.warning(false)
+        << "WARNING: " << fn << ":" << lineno << ": " << (line.c_str() + prefixlen) << "\n";
+
+
+    } else if (sscanf(line.c_str(), "%d(%d) : %n", &fileno, &lineno, &prefixlen) == 2
+               && prefixlen > 0) {
+
+      Filename fn = _shader->get_filename_from_index(fileno, type);
+      GLCAT.error(false)
+        << fn << "(" << lineno << ") : " << (line.c_str() + prefixlen) << "\n";
+
+    } else {
+      GLCAT.error(false) << line << "\n";
     }
   }
 }
@@ -1468,9 +1604,9 @@ glsl_compile_shader(Shader::ShaderType type) {
 
   if (status != GL_TRUE) {
     GLCAT.error()
-      << "An error occurred while compiling shader "
-      << _shader->get_filename(type) << "\n";
-    glsl_report_shader_errors(handle);
+      << "An error occurred while compiling GLSL shader "
+      << _shader->get_filename(type) << ":\n";
+    glsl_report_shader_errors(handle, type);
     _glgsg->_glDeleteShader(handle);
     _glgsg->report_my_gl_errors();
     return false;
@@ -1478,6 +1614,10 @@ glsl_compile_shader(Shader::ShaderType type) {
 
   _glgsg->_glAttachShader(_glsl_program, handle);
   _glsl_shaders.push_back(handle);
+
+  // There might be warnings, so report those.
+  glsl_report_shader_errors(handle, type);
+
   return true;
 }
 
@@ -1538,10 +1678,10 @@ glsl_compile_and_link() {
   }
 
   // There might be warnings, so report those.
-  GLSLShaders::const_iterator it;
-  for (it = _glsl_shaders.begin(); it != _glsl_shaders.end(); ++it) {
-    glsl_report_shader_errors(*it);
-  }
+  //GLSLShaders::const_iterator it;
+  //for (it = _glsl_shaders.begin(); it != _glsl_shaders.end(); ++it) {
+  //  glsl_report_shader_errors(*it);
+  //}
 
   // If we requested to retrieve the shader, we should indicate that before linking.
 #if !defined(NDEBUG) && !defined(OPENGLES)
@@ -1555,11 +1695,14 @@ glsl_compile_and_link() {
   GLint status;
   _glgsg->_glGetProgramiv(_glsl_program, GL_LINK_STATUS, &status);
   if (status != GL_TRUE) {
-    GLCAT.error() << "An error occurred while linking shader program!\n";
+    GLCAT.error() << "An error occurred while linking GLSL shader program!\n";
     glsl_report_program_errors(_glsl_program);
     return false;
   }
 
+  // Report any warnings.
+  glsl_report_program_errors(_glsl_program);
+
   // Dump the binary if requested.
 #if !defined(NDEBUG) && !defined(OPENGLES)
   if (gl_dump_compiled_shaders && _glgsg->_supports_get_program_binary) {
diff --git a/panda/src/glstuff/glShaderContext_src.h b/panda/src/glstuff/glShaderContext_src.h
index d7715d8c30..7def61d924 100755
--- a/panda/src/glstuff/glShaderContext_src.h
+++ b/panda/src/glstuff/glShaderContext_src.h
@@ -73,7 +73,7 @@ private:
 
   bool _uses_standard_vertex_arrays;
 
-  void glsl_report_shader_errors(GLuint shader);
+  void glsl_report_shader_errors(GLuint shader, Shader::ShaderType type);
   void glsl_report_program_errors(GLuint program);
   bool glsl_compile_shader(Shader::ShaderType type);
   bool glsl_compile_and_link();
diff --git a/panda/src/glstuff/glTimerQueryContext_src.cxx b/panda/src/glstuff/glTimerQueryContext_src.cxx
index 59c5f874a8..29fbe53f5a 100644
--- a/panda/src/glstuff/glTimerQueryContext_src.cxx
+++ b/panda/src/glstuff/glTimerQueryContext_src.cxx
@@ -30,9 +30,14 @@ CLP(TimerQueryContext)::
 ~CLP(TimerQueryContext)() {
   if (_index != 0) {
     // Tell the GSG to recycle this index when it gets around to it.
-    LightMutexHolder holder(_glgsg->_lock);
-    _glgsg->_deleted_queries.push_back(_index);
-    _index = 0;
+    // If it has already shut down, though, too bad.  This means we
+    // never get to free this index, but presumably the app is
+    // already shutting down anyway.
+    if (!_glgsg.was_deleted()) {
+      LightMutexHolder holder(_glgsg->_lock);
+      _glgsg->_deleted_queries.push_back(_index);
+      _index = 0;
+    }
   }
 }
 
diff --git a/panda/src/glstuff/glTimerQueryContext_src.h b/panda/src/glstuff/glTimerQueryContext_src.h
index ce4248ffd1..aeff8b1b50 100644
--- a/panda/src/glstuff/glTimerQueryContext_src.h
+++ b/panda/src/glstuff/glTimerQueryContext_src.h
@@ -42,7 +42,7 @@ public:
   virtual double get_timestamp() const;
 
   GLuint _index;
-  CLP(GraphicsStateGuardian) *_glgsg;
+  WPT(CLP(GraphicsStateGuardian)) _glgsg;
 
 public:
   static TypeHandle get_class_type() {
diff --git a/panda/src/glstuff/glmisc_src.cxx b/panda/src/glstuff/glmisc_src.cxx
index ae6af9b740..9ea8411923 100644
--- a/panda/src/glstuff/glmisc_src.cxx
+++ b/panda/src/glstuff/glmisc_src.cxx
@@ -265,6 +265,13 @@ ConfigVariableBool gl_support_sampler_objects
             "objects.  Set to false if you suspect a bug in the "
             "driver implementation."));
 
+ConfigVariableBool gl_support_shadow_filter
+  ("gl-support-shadow-filter", true,
+   PRC_DESC("Disable this if you suspect a bug in the driver "
+            "implementation of ARB_shadow.  Particularly, older ATI "
+            "cards suffered from a broken implementation of the "
+            "shadow map filtering features."));
+
 extern ConfigVariableBool gl_parallel_arrays;
 
 void CLP(init_classes)() {
diff --git a/panda/src/glstuff/glmisc_src.h b/panda/src/glstuff/glmisc_src.h
index 1cd46f68db..02f093a6c5 100644
--- a/panda/src/glstuff/glmisc_src.h
+++ b/panda/src/glstuff/glmisc_src.h
@@ -74,6 +74,7 @@ extern ConfigVariableBool gl_enable_memory_barriers;
 extern ConfigVariableBool gl_vertex_array_objects;
 extern ConfigVariableBool gl_support_primitive_restart_index;
 extern ConfigVariableBool gl_support_sampler_objects;
+extern ConfigVariableBool gl_support_shadow_filter;
 
 extern EXPCL_GL void CLP(init_classes)();
 
diff --git a/panda/src/gobj/Sources.pp b/panda/src/gobj/Sources.pp
index 8b71bfac5a..7ac03ff431 100644
--- a/panda/src/gobj/Sources.pp
+++ b/panda/src/gobj/Sources.pp
@@ -8,7 +8,8 @@
   #define LOCAL_LIBS \
     p3pstatclient p3event p3linmath p3mathutil p3pnmimage p3gsgbase p3putil
 
-  #define COMBINED_SOURCES $[TARGET]_composite1.cxx $[TARGET]_composite2.cxx 
+  #define COMBINED_SOURCES $[TARGET]_composite1.cxx $[TARGET]_composite2.cxx \
+                           $[TARGET]_ext_composite.cxx
 
   #define SOURCES \
     adaptiveLru.I adaptiveLru.h \
@@ -30,7 +31,7 @@
     geomLinestrips.h \
     geomPoints.h \
     geomVertexArrayData.h geomVertexArrayData.I \
-    geomVertexArrayData_ext.h geomVertexArrayData_ext.cxx \
+    geomVertexArrayData_ext.h \
     geomVertexArrayFormat.h geomVertexArrayFormat.I \
     geomCacheEntry.h geomCacheEntry.I \
     geomCacheManager.h geomCacheManager.I \
@@ -43,7 +44,7 @@
     geomVertexWriter.h geomVertexWriter.I \
     indexBufferContext.I indexBufferContext.h \
     internalName.I internalName.h \
-    internalName_ext.h internalName_ext.cxx \
+    internalName_ext.h \
     lens.h lens.I \
     material.I material.h materialPool.I materialPool.h  \
     matrixLens.I matrixLens.h \
@@ -82,7 +83,7 @@
     vertexSlider.I vertexSlider.h \
     vertexTransform.I vertexTransform.h \
     videoTexture.I videoTexture.h
-    
+
   #define INCLUDED_SOURCES \
     adaptiveLru.cxx \
     animateVerticesRequest.cxx \
@@ -103,6 +104,7 @@
     geomLinestrips.cxx \
     geomPoints.cxx \
     geomVertexArrayData.cxx \
+    geomVertexArrayData_ext.cxx \
     geomVertexArrayFormat.cxx \
     geomCacheEntry.cxx \
     geomCacheManager.cxx \
@@ -116,6 +118,7 @@
     indexBufferContext.cxx \
     material.cxx  \
     internalName.cxx \
+    internalName_ext.cxx \
     lens.cxx  \
     materialPool.cxx matrixLens.cxx \
     occlusionQueryContext.cxx \
@@ -131,6 +134,7 @@
     sliderTable.cxx \
     texture.cxx \
     textureCollection.cxx \
+    textureCollection_ext.cxx \
     textureContext.cxx \
     texturePeeker.cxx \
     texturePool.cxx \
diff --git a/panda/src/gobj/config_gobj.cxx b/panda/src/gobj/config_gobj.cxx
index 7cf460e5f1..ce1cdce7c6 100644
--- a/panda/src/gobj/config_gobj.cxx
+++ b/panda/src/gobj/config_gobj.cxx
@@ -69,6 +69,7 @@
 
 Configure(config_gobj);
 NotifyCategoryDef(gobj, "");
+NotifyCategoryDef(shader, "");
 
 ConfigVariableInt max_texture_dimension
 ("max-texture-dimension", -1,
@@ -541,6 +542,22 @@ ConfigVariableString cg_glsl_version
           "glslv, glslf or glslg profiles.  Use this when you are having "
           "problems with these profiles.  Example values are 120 or 150."));
 
+ConfigVariableBool glsl_preprocess
+("glsl-preprocess", true,
+ PRC_DESC("If this is enabled, Panda looks for lines starting with "
+          "#pragma include when loading a GLSL shader and processes "
+          "it appropriately.  This can be useful if you have code that "
+          "is shared between multiple shaders.  Set this to false if "
+          "you have no need for this feature or if you do your own "
+          "preprocessing of GLSL shaders."));
+
+ConfigVariableInt glsl_include_recursion_limit
+("glsl-include-recursion-limit", 10,
+ PRC_DESC("This sets a limit on how many nested #pragma include "
+          "directives that Panda will follow when glsl-preprocess is "
+          "enabled.  This is used to prevent infinite recursion when "
+          "two shader files include each other."));
+
 ConfigureFn(config_gobj) {
   AnimateVerticesRequest::init_type();
   BufferContext::init_type();
diff --git a/panda/src/gobj/config_gobj.h b/panda/src/gobj/config_gobj.h
index a0ce3e1c8e..df8824b68b 100644
--- a/panda/src/gobj/config_gobj.h
+++ b/panda/src/gobj/config_gobj.h
@@ -27,6 +27,7 @@
 #include "autoTextureScale.h"
 
 NotifyCategoryDecl(gobj, EXPCL_PANDA_GOBJ, EXPTP_PANDA_GOBJ);
+NotifyCategoryDecl(shader, EXPCL_PANDA_GOBJ, EXPTP_PANDA_GOBJ);
 
 BEGIN_PUBLISH
 enum ShaderUtilization {
@@ -104,5 +105,7 @@ extern EXPCL_PANDA_GOBJ ConfigVariableInt lens_geom_segments;
 extern EXPCL_PANDA_GOBJ ConfigVariableBool stereo_lens_old_convergence;
 
 extern EXPCL_PANDA_GOBJ ConfigVariableString cg_glsl_version;
+extern EXPCL_PANDA_GOBJ ConfigVariableBool glsl_preprocess;
+extern EXPCL_PANDA_GOBJ ConfigVariableInt glsl_include_recursion_limit;
 
 #endif
diff --git a/panda/src/gobj/geom.I b/panda/src/gobj/geom.I
index acf7b61745..41bdfb4528 100644
--- a/panda/src/gobj/geom.I
+++ b/panda/src/gobj/geom.I
@@ -380,14 +380,15 @@ clear_bounds() {
 ////////////////////////////////////////////////////////////////////
 INLINE void Geom::
 calc_tight_bounds(LPoint3 &min_point, LPoint3 &max_point,
-                  bool &found_any, 
+                  bool &found_any,
                   const GeomVertexData *vertex_data,
                   bool got_mat, const LMatrix4 &mat,
                   Thread *current_thread) const {
   CDReader cdata(_cycler, current_thread);
-  
-  do_calc_tight_bounds(min_point, max_point, found_any, 
-                       vertex_data, got_mat, mat, 
+
+  PN_stdfloat sq_radius;
+  do_calc_tight_bounds(min_point, max_point, sq_radius, found_any,
+                       vertex_data, got_mat, mat,
                        InternalName::get_vertex(),
                        cdata, current_thread);
 }
@@ -408,8 +409,9 @@ calc_tight_bounds(LPoint3 &min_point, LPoint3 &max_point,
 INLINE void Geom::
 calc_tight_bounds(LPoint3 &min_point, LPoint3 &max_point,
                   bool &found_any, Thread *current_thread) const {
+
   calc_tight_bounds(min_point, max_point, found_any,
-                    get_vertex_data(current_thread), false, 
+                    get_vertex_data(current_thread), false,
                     LMatrix4::ident_mat(),
                     current_thread);
 }
@@ -422,15 +424,16 @@ calc_tight_bounds(LPoint3 &min_point, LPoint3 &max_point,
 ////////////////////////////////////////////////////////////////////
 INLINE void Geom::
 calc_tight_bounds(LPoint3 &min_point, LPoint3 &max_point,
-                  bool &found_any, 
+                  bool &found_any,
                   const GeomVertexData *vertex_data,
                   bool got_mat, const LMatrix4 &mat,
                   const InternalName *column_name,
                   Thread *current_thread) const {
   CDReader cdata(_cycler, current_thread);
-  
-  do_calc_tight_bounds(min_point, max_point, found_any, 
-                       vertex_data, got_mat, mat, 
+
+  PN_stdfloat sq_radius;
+  do_calc_tight_bounds(min_point, max_point, sq_radius, found_any,
+                       vertex_data, got_mat, mat,
                        column_name, cdata, current_thread);
 }
 
@@ -450,7 +453,7 @@ mark_internal_bounds_stale(CData *cdata) {
 ////////////////////////////////////////////////////////////////////
 //     Function: Geom::CDataCache::Constructor
 //       Access: Public
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 INLINE Geom::CDataCache::
 CDataCache() :
@@ -463,7 +466,7 @@ CDataCache() :
 ////////////////////////////////////////////////////////////////////
 //     Function: Geom::CDataCache::Copy Constructor
 //       Access: Public
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 INLINE Geom::CDataCache::
 CDataCache(const Geom::CDataCache &copy) :
@@ -500,7 +503,7 @@ set_result(const Geom *geom_result, const GeomVertexData *data_result) {
 ////////////////////////////////////////////////////////////////////
 //     Function: Geom::CacheKey::Constructor
 //       Access: Public
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 INLINE Geom::CacheKey::
 CacheKey(const GeomVertexData *source_data, const GeomMunger *modifier) :
@@ -509,6 +512,32 @@ CacheKey(const GeomVertexData *source_data, const GeomMunger *modifier) :
 {
 }
 
+////////////////////////////////////////////////////////////////////
+//     Function: Geom::CacheKey::Copy Constructor
+//       Access: Public
+//  Description:
+////////////////////////////////////////////////////////////////////
+INLINE Geom::CacheKey::
+CacheKey(const CacheKey &copy) :
+  _source_data(copy._source_data),
+  _modifier(copy._modifier)
+{
+}
+
+#ifdef USE_MOVE_SEMANTICS
+////////////////////////////////////////////////////////////////////
+//     Function: Geom::CacheKey::Copy Constructor
+//       Access: Public
+//  Description:
+////////////////////////////////////////////////////////////////////
+INLINE Geom::CacheKey::
+CacheKey(CacheKey &&from) NOEXCEPT :
+  _source_data(move(from._source_data)),
+  _modifier(move(from._modifier))
+{
+}
+#endif  // USE_MOVE_SEMANTICS
+
 ////////////////////////////////////////////////////////////////////
 //     Function: Geom::CacheKey::operator <
 //       Access: Public
@@ -531,7 +560,7 @@ operator < (const CacheKey &other) const {
 ////////////////////////////////////////////////////////////////////
 //     Function: Geom::CacheEntry::Constructor
 //       Access: Public
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 INLINE Geom::CacheEntry::
 CacheEntry(Geom *source, const GeomVertexData *source_data,
@@ -541,6 +570,31 @@ CacheEntry(Geom *source, const GeomVertexData *source_data,
 {
 }
 
+////////////////////////////////////////////////////////////////////
+//     Function: Geom::CacheEntry::Copy Constructor
+//       Access: Public
+//  Description:
+////////////////////////////////////////////////////////////////////
+INLINE Geom::CacheEntry::
+CacheEntry(Geom *source, const Geom::CacheKey &key) :
+  _source(source),
+  _key(key)
+{
+}
+
+#ifdef USE_MOVE_SEMANTICS
+////////////////////////////////////////////////////////////////////
+//     Function: Geom::CacheEntry::Move Constructor
+//       Access: Public
+//  Description:
+////////////////////////////////////////////////////////////////////
+INLINE Geom::CacheEntry::
+CacheEntry(Geom *source, Geom::CacheKey &&key) NOEXCEPT :
+  _source(source),
+  _key(move(key))
+{
+}
+#endif  // USE_MOVE_SEMANTICS
 
 ////////////////////////////////////////////////////////////////////
 //     Function: Geom::CData::Constructor
@@ -667,7 +721,7 @@ get_current_thread() const {
 ////////////////////////////////////////////////////////////////////
 //     Function: GeomPipelineReader::get_primitive_type
 //       Access: Public
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 INLINE GeomPipelineReader::PrimitiveType GeomPipelineReader::
 get_primitive_type() const {
@@ -677,7 +731,7 @@ get_primitive_type() const {
 ////////////////////////////////////////////////////////////////////
 //     Function: GeomPipelineReader::get_shade_model
 //       Access: Public
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 INLINE GeomPipelineReader::ShadeModel GeomPipelineReader::
 get_shade_model() const {
@@ -687,7 +741,7 @@ get_shade_model() const {
 ////////////////////////////////////////////////////////////////////
 //     Function: GeomPipelineReader::get_geom_rendering
 //       Access: Public
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 INLINE int GeomPipelineReader::
 get_geom_rendering() const {
@@ -697,7 +751,7 @@ get_geom_rendering() const {
 ////////////////////////////////////////////////////////////////////
 //     Function: GeomPipelineReader::get_usage_hint
 //       Access: Public
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 INLINE GeomPipelineReader::UsageHint GeomPipelineReader::
 get_usage_hint() const {
@@ -708,7 +762,7 @@ get_usage_hint() const {
 ////////////////////////////////////////////////////////////////////
 //     Function: GeomPipelineReader::get_vertex_data
 //       Access: Public
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 INLINE CPT(GeomVertexData) GeomPipelineReader::
 get_vertex_data() const {
@@ -718,7 +772,7 @@ get_vertex_data() const {
 ////////////////////////////////////////////////////////////////////
 //     Function: GeomPipelineReader::get_num_primitives
 //       Access: Public
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 INLINE int GeomPipelineReader::
 get_num_primitives() const {
@@ -728,7 +782,7 @@ get_num_primitives() const {
 ////////////////////////////////////////////////////////////////////
 //     Function: GeomPipelineReader::get_primitive
 //       Access: Public
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 INLINE CPT(GeomPrimitive) GeomPipelineReader::
 get_primitive(int i) const {
@@ -739,7 +793,7 @@ get_primitive(int i) const {
 ////////////////////////////////////////////////////////////////////
 //     Function: GeomPipelineReader::get_modified
 //       Access: Public
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 INLINE UpdateSeq GeomPipelineReader::
 get_modified() const {
diff --git a/panda/src/gobj/geom.cxx b/panda/src/gobj/geom.cxx
index da20e629b4..92ef2e063f 100644
--- a/panda/src/gobj/geom.cxx
+++ b/panda/src/gobj/geom.cxx
@@ -48,7 +48,7 @@ make_cow_copy() {
 ////////////////////////////////////////////////////////////////////
 //     Function: Geom::Constructor
 //       Access: Published
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 Geom::
 Geom(const GeomVertexData *data) {
@@ -68,7 +68,7 @@ Geom(const GeomVertexData *data) {
 Geom::
 Geom(const Geom &copy) :
   CopyOnWriteObject(copy),
-  _cycler(copy._cycler)  
+  _cycler(copy._cycler)
 {
 }
 
@@ -98,7 +98,7 @@ operator = (const Geom &copy) {
 ////////////////////////////////////////////////////////////////////
 //     Function: Geom::Destructor
 //       Access: Published, Virtual
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 Geom::
 ~Geom() {
@@ -224,7 +224,7 @@ offset_vertices(const GeomVertexData *data, int offset) {
       gobj_cat.warning()
         << *prim << " is invalid for " << *data << ":\n";
       prim->write(gobj_cat.warning(false), 4);
-      
+
       all_is_valid = false;
     }
 #endif
@@ -272,9 +272,9 @@ make_nonindexed(bool composite_only) {
     // making nonindexed, since there's no particular advantage to
     // having indexed points (as opposed to, say, indexed triangles or
     // indexed lines).
-    if (primitive->is_indexed() && 
-        (primitive->is_composite() || 
-         primitive->is_exact_type(GeomPoints::get_class_type()) || 
+    if (primitive->is_indexed() &&
+        (primitive->is_composite() ||
+         primitive->is_exact_type(GeomPoints::get_class_type()) ||
          !composite_only)) {
       primitive->make_nonindexed(new_data, orig_data);
       ++num_changed;
@@ -720,11 +720,11 @@ unify_in_place(int max_indices, bool preserve_order) {
       // Copy prim into smaller prims, no one of which has more than
       // max_indices vertices.
       int i = 0;
-      
+
       while (i < prim->get_num_primitives()) {
         PT(GeomPrimitive) smaller = prim->make_copy();
         smaller->clear_vertices();
-        while (i < prim->get_num_primitives() && 
+        while (i < prim->get_num_primitives() &&
                smaller->get_num_vertices() + prim->get_primitive_num_vertices(i) < max_indices) {
           int start = prim->get_primitive_start(i);
           int end = prim->get_primitive_end(i);
@@ -732,13 +732,13 @@ unify_in_place(int max_indices, bool preserve_order) {
             smaller->add_vertex(prim->get_vertex(n));
           }
           smaller->close_primitive();
-          
+
           ++i;
         }
-      
+
         cdata->_primitives.push_back(smaller.p());
       }
-      
+
     } else {
       // The prim has few enough vertices; keep it.
       cdata->_primitives.push_back(prim);
@@ -887,7 +887,7 @@ get_num_bytes() const {
 
   int num_bytes = sizeof(Geom);
   Primitives::const_iterator pi;
-  for (pi = cdata->_primitives.begin(); 
+  for (pi = cdata->_primitives.begin();
        pi != cdata->_primitives.end();
        ++pi) {
     num_bytes += (*pi).get_read_pointer()->get_num_bytes();
@@ -914,7 +914,7 @@ request_resident() const {
   bool resident = true;
 
   Primitives::const_iterator pi;
-  for (pi = cdata->_primitives.begin(); 
+  for (pi = cdata->_primitives.begin();
        pi != cdata->_primitives.end();
        ++pi) {
     if (!(*pi).get_read_pointer()->request_resident()) {
@@ -942,11 +942,11 @@ void Geom::
 transform_vertices(const LMatrix4 &mat) {
   PT(GeomVertexData) new_data = modify_vertex_data();
   CPT(GeomVertexFormat) format = new_data->get_format();
-  
+
   int ci;
   for (ci = 0; ci < format->get_num_points(); ci++) {
     GeomVertexRewriter data(new_data, format->get_point(ci));
-    
+
     while (!data.is_at_end()) {
       const LPoint3 &point = data.get_data3();
       data.set_data3(point * mat);
@@ -954,7 +954,7 @@ transform_vertices(const LMatrix4 &mat) {
   }
   for (ci = 0; ci < format->get_num_vectors(); ci++) {
     GeomVertexRewriter data(new_data, format->get_vector(ci));
-    
+
     while (!data.is_at_end()) {
       const LVector3 &vector = data.get_data3();
       data.set_data3(normalize(vector * mat));
@@ -1036,7 +1036,7 @@ get_nested_vertices(Thread *current_thread) const {
 ////////////////////////////////////////////////////////////////////
 //     Function: Geom::output
 //       Access: Published, Virtual
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 void Geom::
 output(ostream &out) const {
@@ -1046,7 +1046,7 @@ output(ostream &out) const {
   int num_faces = 0;
   pset<TypeHandle> types;
   Primitives::const_iterator pi;
-  for (pi = cdata->_primitives.begin(); 
+  for (pi = cdata->_primitives.begin();
        pi != cdata->_primitives.end();
        ++pi) {
     CPT(GeomPrimitive) prim = (*pi).get_read_pointer();
@@ -1065,7 +1065,7 @@ output(ostream &out) const {
 ////////////////////////////////////////////////////////////////////
 //     Function: Geom::write
 //       Access: Published, Virtual
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 void Geom::
 write(ostream &out, int indent_level) const {
@@ -1073,7 +1073,7 @@ write(ostream &out, int indent_level) const {
 
   // Get a list of the primitive types contained within this object.
   Primitives::const_iterator pi;
-  for (pi = cdata->_primitives.begin(); 
+  for (pi = cdata->_primitives.begin();
        pi != cdata->_primitives.end();
        ++pi) {
     (*pi).get_read_pointer()->write(out, indent_level);
@@ -1228,7 +1228,7 @@ release_all() {
 //               rendered.
 ////////////////////////////////////////////////////////////////////
 GeomContext *Geom::
-prepare_now(PreparedGraphicsObjects *prepared_objects, 
+prepare_now(PreparedGraphicsObjects *prepared_objects,
             GraphicsStateGuardianBase *gsg) {
   Contexts::const_iterator ci;
   ci = _contexts.find(prepared_objects);
@@ -1304,10 +1304,11 @@ compute_internal_bounds(Geom::CData *cdata, Thread *current_thread) const {
 
   // Now actually compute the bounding volume.  We do this by using
   // calc_tight_bounds to determine our box first.
-  LPoint3 min, max;
+  LPoint3 pmin, pmax;
+  PN_stdfloat sq_center_dist;
   bool found_any = false;
-  do_calc_tight_bounds(min, max, found_any, vertex_data,
-                       false, LMatrix4::ident_mat(), 
+  do_calc_tight_bounds(pmin, pmax, sq_center_dist, found_any,
+                       vertex_data, false, LMatrix4::ident_mat(),
                        InternalName::get_vertex(),
                        cdata, current_thread);
 
@@ -1318,22 +1319,83 @@ compute_internal_bounds(Geom::CData *cdata, Thread *current_thread) const {
 
   if (found_any) {
     // Then we put the bounding volume around both of those points.
-    if (btype == BoundingVolume::BT_sphere) {
-      // The user specifically requested a BoundingSphere, so oblige.
-      BoundingBox box(min, max);
-      box.local_object();
+    PN_stdfloat avg_box_area;
+    switch (btype) {
+    case BoundingVolume::BT_best:
+    case BoundingVolume::BT_fastest:
+    case BoundingVolume::BT_default:
+      {
+        // When considering a box, calculate (roughly) the average area
+        // of the sides.  We will use this to determine whether a sphere
+        // or box is a better fit.
+        PN_stdfloat min_extent = min(pmax[0] - pmin[0],
+                                 min(pmax[1] - pmin[1],
+                                     pmax[2] - pmin[2]));
+        PN_stdfloat max_extent = max(pmax[0] - pmin[0],
+                                 max(pmax[1] - pmin[1],
+                                     pmax[2] - pmin[2]));
+        avg_box_area = ((min_extent * min_extent) + (max_extent * max_extent)) / 2;
+      }
+      //  Fall through
+    case BoundingVolume::BT_sphere:
+      {
+        // Determine the best radius for a bounding sphere.
+        LPoint3 aabb_center = (pmin + pmax) * 0.5f;
+        PN_stdfloat best_sq_radius = (pmax - aabb_center).length_squared();
 
-      PT(BoundingSphere) sphere = new BoundingSphere;
-      sphere->extend_by(&box);
-      cdata->_internal_bounds = sphere;
+        if (btype != BoundingVolume::BT_fastest &&
+            aabb_center.length_squared() / best_sq_radius >= (0.2f * 0.2f)) {
+          // Hmm, this is an off-center model.  Maybe we can do a better
+          // job by calculating the bounding sphere from the AABB center.
 
-    } else {
-      // The user requested a BoundingBox, or did not specify.
-      cdata->_internal_bounds = new BoundingBox(min, max);
+          PN_stdfloat better_sq_radius;
+          bool found_any = false;
+          do_calc_sphere_radius(aabb_center, better_sq_radius, found_any,
+                                vertex_data, cdata, current_thread);
+
+          if (found_any && better_sq_radius <= best_sq_radius) {
+            // Great.  This is as good a sphere as we're going to get.
+            if (btype == BoundingVolume::BT_best &&
+                avg_box_area < better_sq_radius * MathNumbers::pi) {
+              // But the box is better, anyway.  Use that instead.
+              cdata->_internal_bounds = new BoundingBox(pmin, pmax);
+              break;
+            }
+            cdata->_internal_bounds =
+              new BoundingSphere(aabb_center, csqrt(better_sq_radius));
+            break;
+          }
+        }
+
+        if (btype != BoundingVolume::BT_sphere &&
+            avg_box_area < sq_center_dist * MathNumbers::pi) {
+          // A box is probably a tighter fit.
+          cdata->_internal_bounds = new BoundingBox(pmin, pmax);
+          break;
+
+        } else if (sq_center_dist <= best_sq_radius) {
+          // No, but a sphere centered on the origin is apparently
+          // still better than a sphere around the bounding box.
+          cdata->_internal_bounds =
+            new BoundingSphere(LPoint3::origin(), csqrt(sq_center_dist));
+          break;
+
+        } else if (btype == BoundingVolume::BT_sphere) {
+          // This is the worst sphere we can make, which is why we will only
+          // do it when the user specifically requests a sphere.
+          cdata->_internal_bounds =
+            new BoundingSphere(aabb_center, csqrt(best_sq_radius));
+          break;
+        }
+      }
+      // Fall through.
+
+    case BoundingVolume::BT_box:
+      cdata->_internal_bounds = new BoundingBox(pmin, pmax);
     }
 
     Primitives::const_iterator pi;
-    for (pi = cdata->_primitives.begin(); 
+    for (pi = cdata->_primitives.begin();
          pi != cdata->_primitives.end();
          ++pi) {
       CPT(GeomPrimitive) prim = (*pi).get_read_pointer();
@@ -1360,18 +1422,38 @@ compute_internal_bounds(Geom::CData *cdata, Thread *current_thread) const {
 ////////////////////////////////////////////////////////////////////
 void Geom::
 do_calc_tight_bounds(LPoint3 &min_point, LPoint3 &max_point,
-                     bool &found_any, 
+                     PN_stdfloat &sq_center_dist, bool &found_any,
                      const GeomVertexData *vertex_data,
                      bool got_mat, const LMatrix4 &mat,
                      const InternalName *column_name,
                      const CData *cdata, Thread *current_thread) const {
   Primitives::const_iterator pi;
-  for (pi = cdata->_primitives.begin(); 
+  for (pi = cdata->_primitives.begin();
        pi != cdata->_primitives.end();
        ++pi) {
     CPT(GeomPrimitive) prim = (*pi).get_read_pointer();
-    prim->calc_tight_bounds(min_point, max_point, found_any, vertex_data,
-                            got_mat, mat, column_name, current_thread);
+    prim->calc_tight_bounds(min_point, max_point, sq_center_dist,
+                            found_any, vertex_data, got_mat, mat,
+                            column_name, current_thread);
+  }
+}
+
+////////////////////////////////////////////////////////////////////
+//     Function: Geom::do_calc_sphere_radius
+//       Access: Private
+//  Description:
+////////////////////////////////////////////////////////////////////
+void Geom::
+do_calc_sphere_radius(const LPoint3 &center, PN_stdfloat &sq_radius,
+                      bool &found_any, const GeomVertexData *vertex_data,
+                      const CData *cdata, Thread *current_thread) const {
+  Primitives::const_iterator pi;
+  for (pi = cdata->_primitives.begin();
+       pi != cdata->_primitives.end();
+       ++pi) {
+    CPT(GeomPrimitive) prim = (*pi).get_read_pointer();
+    prim->calc_sphere_radius(center, sq_radius, found_any,
+                             vertex_data, current_thread);
   }
 }
 
@@ -1412,7 +1494,7 @@ check_will_be_valid(const GeomVertexData *vertex_data) const {
   CDReader cdata(_cycler);
 
   Primitives::const_iterator pi;
-  for (pi = cdata->_primitives.begin(); 
+  for (pi = cdata->_primitives.begin();
        pi != cdata->_primitives.end();
        ++pi) {
     if (!(*pi).get_read_pointer()->check_valid(vertex_data)) {
@@ -1432,10 +1514,10 @@ void Geom::
 reset_usage_hint(Geom::CData *cdata) {
   cdata->_usage_hint = UH_unspecified;
   Primitives::const_iterator pi;
-  for (pi = cdata->_primitives.begin(); 
+  for (pi = cdata->_primitives.begin();
        pi != cdata->_primitives.end();
        ++pi) {
-    cdata->_usage_hint = min(cdata->_usage_hint, 
+    cdata->_usage_hint = min(cdata->_usage_hint,
                              (*pi).get_read_pointer()->get_usage_hint());
   }
   cdata->_got_usage_hint = true;
@@ -1450,7 +1532,7 @@ void Geom::
 reset_geom_rendering(Geom::CData *cdata) {
   cdata->_geom_rendering = 0;
   Primitives::const_iterator pi;
-  for (pi = cdata->_primitives.begin(); 
+  for (pi = cdata->_primitives.begin();
        pi != cdata->_primitives.end();
        ++pi) {
     cdata->_geom_rendering |= (*pi).get_read_pointer()->get_geom_rendering();
@@ -1626,7 +1708,7 @@ fillin(DatagramIterator &scan, BamReader *manager) {
 ////////////////////////////////////////////////////////////////////
 //     Function: Geom::CDataCache::Destructor
 //       Access: Public, Virtual
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 Geom::CDataCache::
 ~CDataCache() {
@@ -1661,11 +1743,11 @@ evict_callback() {
 ////////////////////////////////////////////////////////////////////
 //     Function: Geom::CacheEntry::output
 //       Access: Public, Virtual
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 void Geom::CacheEntry::
 output(ostream &out) const {
-  out << "geom " << (void *)_source << ", " 
+  out << "geom " << (void *)_source << ", "
       << (const void *)_key._modifier;
 }
 
@@ -1777,7 +1859,7 @@ check_usage_hint() const {
 #ifdef DO_PIPELINING
       unref_delete((CycleData *)_cdata);
 #endif
-      Geom::CDWriter fresh_cdata(((Geom *)_object.p())->_cycler, 
+      Geom::CDWriter fresh_cdata(((Geom *)_object.p())->_cycler,
                                  false, _current_thread);
       ((GeomPipelineReader *)this)->_cdata = fresh_cdata;
 #ifdef DO_PIPELINING
@@ -1802,12 +1884,12 @@ check_usage_hint() const {
 ////////////////////////////////////////////////////////////////////
 //     Function: GeomPipelineReader::check_valid
 //       Access: Public
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 bool GeomPipelineReader::
 check_valid(const GeomVertexDataPipelineReader *data_reader) const {
   Geom::Primitives::const_iterator pi;
-  for (pi = _cdata->_primitives.begin(); 
+  for (pi = _cdata->_primitives.begin();
        pi != _cdata->_primitives.end();
        ++pi) {
     CPT(GeomPrimitive) primitive = (*pi).get_read_pointer();
@@ -1820,7 +1902,7 @@ check_valid(const GeomVertexDataPipelineReader *data_reader) const {
 
   return true;
 }
-  
+
 ////////////////////////////////////////////////////////////////////
 //     Function: GeomPipelineReader::draw
 //       Access: Public
@@ -1833,7 +1915,7 @@ draw(GraphicsStateGuardianBase *gsg, const GeomMunger *munger,
   bool all_ok = gsg->begin_draw_primitives(this, munger, data_reader, force);
   if (all_ok) {
     Geom::Primitives::const_iterator pi;
-    for (pi = _cdata->_primitives.begin(); 
+    for (pi = _cdata->_primitives.begin();
          pi != _cdata->_primitives.end();
          ++pi) {
       CPT(GeomPrimitive) primitive = (*pi).get_read_pointer();
diff --git a/panda/src/gobj/geom.h b/panda/src/gobj/geom.h
index af0eca41a0..09091b2b0d 100644
--- a/panda/src/gobj/geom.h
+++ b/panda/src/gobj/geom.h
@@ -142,24 +142,24 @@ PUBLISHED:
   bool release(PreparedGraphicsObjects *prepared_objects);
   int release_all();
 
-  GeomContext *prepare_now(PreparedGraphicsObjects *prepared_objects, 
+  GeomContext *prepare_now(PreparedGraphicsObjects *prepared_objects,
                            GraphicsStateGuardianBase *gsg);
 
 public:
-  bool draw(GraphicsStateGuardianBase *gsg, 
+  bool draw(GraphicsStateGuardianBase *gsg,
             const GeomMunger *munger,
             const GeomVertexData *vertex_data,
             bool force, Thread *current_thread) const;
-  
+
   INLINE void calc_tight_bounds(LPoint3 &min_point, LPoint3 &max_point,
-                                bool &found_any, 
+                                bool &found_any,
                                 const GeomVertexData *vertex_data,
                                 bool got_mat, const LMatrix4 &mat,
                                 Thread *current_thread) const;
   INLINE void calc_tight_bounds(LPoint3 &min_point, LPoint3 &max_point,
                                 bool &found_any, Thread *current_thread) const;
   INLINE void calc_tight_bounds(LPoint3 &min_point, LPoint3 &max_point,
-                                bool &found_any, 
+                                bool &found_any,
                                 const GeomVertexData *vertex_data,
                                 bool got_mat, const LMatrix4 &mat,
                                 const InternalName *column_name,
@@ -174,12 +174,17 @@ private:
   void compute_internal_bounds(CData *cdata, Thread *current_thread) const;
 
   void do_calc_tight_bounds(LPoint3 &min_point, LPoint3 &max_point,
-                            bool &found_any, 
+                            PN_stdfloat &sq_center_dist, bool &found_any,
                             const GeomVertexData *vertex_data,
                             bool got_mat, const LMatrix4 &mat,
                             const InternalName *column_name,
                             const CData *cdata, Thread *current_thread) const;
 
+  void do_calc_sphere_radius(const LPoint3 &center,
+                             PN_stdfloat &sq_radius, bool &found_any,
+                             const GeomVertexData *vertex_data,
+                             const CData *cdata, Thread *current_thread) const;
+
   void clear_prepared(PreparedGraphicsObjects *prepared_objects);
   bool check_will_be_valid(const GeomVertexData *vertex_data) const;
 
@@ -220,7 +225,7 @@ private:
     Geom *_source;  // A back pointer to the containing Geom
     const Geom *_geom_result;  // ref-counted if not NULL and not same as _source
     CPT(GeomVertexData) _data_result;
-    
+
   public:
     static TypeHandle get_class_type() {
       return _type_handle;
@@ -228,7 +233,7 @@ private:
     static void init_type() {
       register_type(_type_handle, "Geom::CDataCache");
     }
-    
+
   private:
     static TypeHandle _type_handle;
   };
@@ -245,6 +250,10 @@ public:
   public:
     INLINE CacheKey(const GeomVertexData *source_data,
                     const GeomMunger *modifier);
+    INLINE CacheKey(const CacheKey &copy);
+#ifdef USE_MOVE_SEMANTICS
+    INLINE CacheKey(CacheKey &&from) NOEXCEPT;
+#endif
     INLINE bool operator < (const CacheKey &other) const;
 
     CPT(GeomVertexData) _source_data;
@@ -253,9 +262,13 @@ public:
   // It is not clear why MSVC7 needs this class to be public.
   class CacheEntry : public GeomCacheEntry {
   public:
-    INLINE CacheEntry(Geom *source, 
+    INLINE CacheEntry(Geom *source,
                       const GeomVertexData *source_data,
                       const GeomMunger *modifier);
+    INLINE CacheEntry(Geom *source, const CacheKey &key);
+#ifdef USE_MOVE_SEMANTICS
+    INLINE CacheEntry(Geom *source, CacheKey &&key) NOEXCEPT;
+#endif
     ALLOC_DELETED_CHAIN(CacheEntry);
 
     virtual void evict_callback();
@@ -265,7 +278,7 @@ public:
     CacheKey _key;
 
     PipelineCycler<CDataCache> _cycler;
-    
+
   public:
     static TypeHandle get_class_type() {
       return _type_handle;
@@ -275,7 +288,7 @@ public:
       register_type(_type_handle, "Geom::CacheEntry",
                     GeomCacheEntry::get_class_type());
     }
-    
+
   private:
     static TypeHandle _type_handle;
   };
@@ -304,13 +317,13 @@ private:
     UsageHint _usage_hint;
     bool _got_usage_hint;
     UpdateSeq _modified;
-  
+
     CPT(BoundingVolume) _internal_bounds;
     int _nested_vertices;
     bool _internal_bounds_stale;
     BoundingVolume::BoundsType _bounds_type;
     CPT(BoundingVolume) _user_bounds;
-    
+
   public:
     static TypeHandle get_class_type() {
       return _type_handle;
@@ -318,11 +331,11 @@ private:
     static void init_type() {
       register_type(_type_handle, "Geom::CData");
     }
-    
+
   private:
     static TypeHandle _type_handle;
   };
- 
+
   PipelineCycler<CData> _cycler;
   typedef CycleDataLockedReader<CData> CDLockedReader;
   typedef CycleDataReader<CData> CDReader;
diff --git a/panda/src/gobj/geomEnums.cxx b/panda/src/gobj/geomEnums.cxx
index 4116a84c67..e105b0c246 100644
--- a/panda/src/gobj/geomEnums.cxx
+++ b/panda/src/gobj/geomEnums.cxx
@@ -19,7 +19,7 @@
 
 ////////////////////////////////////////////////////////////////////
 //     Function: GeomEnums::UsageHint output operator
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 ostream &
 operator << (ostream &out, GeomEnums::UsageHint usage_hint) {
@@ -45,7 +45,7 @@ operator << (ostream &out, GeomEnums::UsageHint usage_hint) {
 
 ////////////////////////////////////////////////////////////////////
 //     Function: GeomEnums::UsageHint input operator
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 istream &
 operator >> (istream &in, GeomEnums::UsageHint &usage_hint) {
@@ -73,32 +73,32 @@ operator >> (istream &in, GeomEnums::UsageHint &usage_hint) {
 
 ////////////////////////////////////////////////////////////////////
 //     Function: GeomEnums::NumericType output operator
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 ostream &
 operator << (ostream &out, GeomEnums::NumericType numeric_type) {
   switch (numeric_type) {
   case GeomEnums::NT_uint8:
     return out << "uint8";
-    
+
   case GeomEnums::NT_uint16:
     return out << "uint16";
-    
+
   case GeomEnums::NT_uint32:
     return out << "uint32";
-    
+
   case GeomEnums::NT_packed_dcba:
     return out << "packed_dcba";
-    
+
   case GeomEnums::NT_packed_dabc:
     return out << "packed_dabc";
-    
+
   case GeomEnums::NT_float32:
     return out << "float32";
-    
+
   case GeomEnums::NT_float64:
     return out << "float64";
-    
+
   case GeomEnums::NT_stdfloat:
     return out << "stdfloat";
   }
@@ -108,7 +108,7 @@ operator << (ostream &out, GeomEnums::NumericType numeric_type) {
 
 ////////////////////////////////////////////////////////////////////
 //     Function: GeomEnums::Contents output operator
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 ostream &
 operator << (ostream &out, GeomEnums::Contents contents) {
@@ -136,6 +136,9 @@ operator << (ostream &out, GeomEnums::Contents contents) {
 
   case GeomEnums::C_morph_delta:
     return out << "morph_delta";
+
+  case GeomEnums::C_matrix:
+    return out << "matrix";
   }
 
   return out << "**invalid contents (" << (int)contents << ")**";
diff --git a/panda/src/gobj/geomEnums.h b/panda/src/gobj/geomEnums.h
index ffa4d14515..62265cfc23 100644
--- a/panda/src/gobj/geomEnums.h
+++ b/panda/src/gobj/geomEnums.h
@@ -134,11 +134,6 @@ PUBLISHED:
 
     // The union of the above shade model types.
     GR_shade_model_bits     = 0x06000,
-
-    // If there is a TexGenAttrib in effect with M_light_vector
-    // enabled, meaning we need to generate the tangent space light
-    // vector as the texture coordinates.
-    GR_texcoord_light_vector = 0x08000,
   };
 
   // The shade model specifies whether the per-vertex colors and
@@ -202,6 +197,10 @@ PUBLISHED:
     C_color,        // 3- or 4-component color, ordered R, G, B, [A]
     C_index,        // An index value into some other table
     C_morph_delta,  // A delta from some base value, defining a blend shape
+
+    // A transformation matrix.  This is typically three or four
+    // columns, but we pretend it's only one for convenience.
+    C_matrix,
   };
 
   // The type of animation data that is represented by a particular
diff --git a/panda/src/gobj/geomMunger.cxx b/panda/src/gobj/geomMunger.cxx
index 4848f48c72..8ce1175c5d 100644
--- a/panda/src/gobj/geomMunger.cxx
+++ b/panda/src/gobj/geomMunger.cxx
@@ -27,7 +27,7 @@ PStatCollector GeomMunger::_munge_pcollector("*:Munge");
 ////////////////////////////////////////////////////////////////////
 //     Function: GeomMunger::Constructor
 //       Access: Public
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 GeomMunger::
 GeomMunger(GraphicsStateGuardianBase *gsg) :
@@ -44,7 +44,7 @@ GeomMunger(GraphicsStateGuardianBase *gsg) :
 ////////////////////////////////////////////////////////////////////
 //     Function: GeomMunger::Copy Constructor
 //       Access: Public
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 GeomMunger::
 GeomMunger(const GeomMunger &copy) :
@@ -60,7 +60,7 @@ GeomMunger(const GeomMunger &copy) :
 ////////////////////////////////////////////////////////////////////
 //     Function: GeomMunger::Copy Assignment Operator
 //       Access: Public
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 void GeomMunger::
 operator = (const GeomMunger &copy) {
@@ -70,7 +70,7 @@ operator = (const GeomMunger &copy) {
 ////////////////////////////////////////////////////////////////////
 //     Function: GeomMunger::Destructor
 //       Access: Public, Virtual
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 GeomMunger::
 ~GeomMunger() {
@@ -96,7 +96,7 @@ remove_data(const GeomVertexData *data) {
 //       Access: Public
 //  Description: Applies the indicated munger to the geom and its
 //               data, and returns a (possibly different) geom and
-//               data, according to the munger's whim.  
+//               data, according to the munger's whim.
 //
 //               The assumption is that for a particular geom and a
 //               particular munger, the result will always be the
@@ -110,13 +110,12 @@ remove_data(const GeomVertexData *data) {
 bool GeomMunger::
 munge_geom(CPT(Geom) &geom, CPT(GeomVertexData) &data,
            bool force, Thread *current_thread) {
-  CPT(GeomVertexData) source_data = data;
 
   // Look up the munger in the geom's cache--maybe we've recently
   // applied it.
   PT(Geom::CacheEntry) entry;
 
-  Geom::CacheKey key(source_data, this);
+  Geom::CacheKey key(data, this);
 
   geom->_cache_lock.acquire();
   Geom::Cache::const_iterator ci = geom->_cache.find(&key);
@@ -126,12 +125,12 @@ munge_geom(CPT(Geom) &geom, CPT(GeomVertexData) &data,
     entry = (*ci).second;
     geom->_cache_lock.release();
     nassertr(entry->_source == geom, false);
-    
+
     // Here's an element in the cache for this computation.  Record a
     // cache hit, so this element will stay in the cache a while
     // longer.
     entry->refresh(current_thread);
-    
+
     // Now check that it's fresh.
     Geom::CDCacheReader cdata(entry->_cycler, current_thread);
     if (cdata->_source == geom &&
@@ -139,12 +138,12 @@ munge_geom(CPT(Geom) &geom, CPT(GeomVertexData) &data,
         geom->get_modified(current_thread) <= cdata->_geom_result->get_modified(current_thread) &&
         data->get_modified(current_thread) <= cdata->_data_result->get_modified(current_thread)) {
       // The cache entry is still good; use it.
-      
+
       geom = cdata->_geom_result;
       data = cdata->_data_result;
       return true;
     }
-    
+
     // The cache entry is stale, but we'll recompute it below.  Note
     // that there's a small race condition here; another thread might
     // recompute the cache at the same time.  No big deal, since it'll
@@ -166,7 +165,12 @@ munge_geom(CPT(Geom) &geom, CPT(GeomVertexData) &data,
   // Record the new result in the cache.
   if (entry == (Geom::CacheEntry *)NULL) {
     // Create a new entry for the result.
-    entry = new Geom::CacheEntry(orig_geom, source_data, this);
+#ifdef USE_MOVE_SEMANTICS
+    // We don't need the key anymore, move the pointers into the CacheEntry.
+    entry = new Geom::CacheEntry(orig_geom, move(key));
+#else
+    entry = new Geom::CacheEntry(orig_geom, key);
+#endif
     {
       LightMutexHolder holder(orig_geom->_cache_lock);
       bool inserted = orig_geom->_cache.insert(Geom::Cache::value_type(&entry->_key, entry)).second;
@@ -176,7 +180,7 @@ munge_geom(CPT(Geom) &geom, CPT(GeomVertexData) &data,
         return true;
       }
     }
-  
+
     // And tell the cache manager about the new entry.  (It might
     // immediately request a delete from the cache of the thing we
     // just added.)
@@ -198,7 +202,7 @@ munge_geom(CPT(Geom) &geom, CPT(GeomVertexData) &data,
 //               exists just to cast away the const pointer.
 ////////////////////////////////////////////////////////////////////
 CPT(GeomVertexFormat) GeomMunger::
-do_munge_format(const GeomVertexFormat *format, 
+do_munge_format(const GeomVertexFormat *format,
                 const GeomVertexAnimationSpec &animation) {
   nassertr(_is_registered, NULL);
   nassertr(format->is_registered(), NULL);
@@ -248,7 +252,7 @@ munge_data_impl(const GeomVertexData *data) {
   nassertr(_is_registered, NULL);
 
   CPT(GeomVertexFormat) orig_format = data->get_format();
-  CPT(GeomVertexFormat) new_format = 
+  CPT(GeomVertexFormat) new_format =
     munge_format(orig_format, orig_format->get_animation());
 
   if (new_format == orig_format) {
@@ -384,7 +388,7 @@ make_registry() {
     _registry = new Registry;
   }
 }
- 
+
 ////////////////////////////////////////////////////////////////////
 //     Function: GeomMunger::do_register
 //       Access: Private
@@ -408,7 +412,7 @@ do_register(Thread *current_thread) {
 
   _is_registered = true;
 }
- 
+
 ////////////////////////////////////////////////////////////////////
 //     Function: GeomMunger::do_unregister
 //       Access: Private
@@ -430,7 +434,7 @@ do_unregister() {
 ////////////////////////////////////////////////////////////////////
 //     Function: GeomMunger::CacheEntry::output
 //       Access: Public, Virtual
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 void GeomMunger::CacheEntry::
 output(ostream &out) const {
@@ -440,7 +444,7 @@ output(ostream &out) const {
 ////////////////////////////////////////////////////////////////////
 //     Function: GeomMunger::Registry::Constructor
 //       Access: Public
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 GeomMunger::Registry::
 Registry() {
diff --git a/panda/src/gobj/geomPrimitive.cxx b/panda/src/gobj/geomPrimitive.cxx
index bf70afcdd0..ede9dc71a6 100644
--- a/panda/src/gobj/geomPrimitive.cxx
+++ b/panda/src/gobj/geomPrimitive.cxx
@@ -295,11 +295,14 @@ add_consecutive_vertices(int start, int num_vertices) {
   }
 
   PT(GeomVertexArrayData) array_obj = cdata->_vertices.get_write_pointer();
+  int old_num_rows = array_obj->get_num_rows();
+  array_obj->set_num_rows(old_num_rows + num_vertices);
+
   GeomVertexWriter index(array_obj, 0);
-  index.set_row_unsafe(array_obj->get_num_rows());
+  index.set_row_unsafe(old_num_rows);
 
   for (int v = start; v <= end; ++v) {
-    index.add_data1i(v);
+    index.set_data1i(v);
   }
 
   cdata->_modified = Geom::get_next_modified();
@@ -1019,11 +1022,13 @@ make_points() const {
 
   // Now construct a new index array with just those bits.
   PT(GeomVertexArrayData) new_vertices = make_index_data();
+  new_vertices->unclean_set_num_rows(bits.get_num_on_bits());
+
   GeomVertexWriter new_index(new_vertices, 0);
   int p = bits.get_lowest_on_bit();
   while (p != -1) {
     while (bits.get_bit(p)) {
-      new_index.add_data1i(p);
+      new_index.set_data1i(p);
       ++p;
     }
     int q = bits.get_next_higher_different_bit(p);
@@ -1699,10 +1704,14 @@ get_strip_cut_index(NumericType index_type) {
 //               points are found.  It is the caller's responsibility
 //               to initialize min_point, max_point, and found_any
 //               before calling this function.
+//               It also sets sq_center_dist, which is the square of
+//               the maximum distance of the points to the center.
+//               This can be useful when deciding whether a sphere
+//               volume might be more appropriate.
 ////////////////////////////////////////////////////////////////////
 void GeomPrimitive::
 calc_tight_bounds(LPoint3 &min_point, LPoint3 &max_point,
-                  bool &found_any,
+                  PN_stdfloat &sq_center_dist, bool &found_any,
                   const GeomVertexData *vertex_data,
                   bool got_mat, const LMatrix4 &mat,
                   const InternalName *column_name,
@@ -1714,54 +1723,84 @@ calc_tight_bounds(LPoint3 &min_point, LPoint3 &max_point,
   }
 
   CDReader cdata(_cycler, current_thread);
+  int i = 0;
 
   if (cdata->_vertices.is_null()) {
     // Nonindexed case.
     nassertv(cdata->_num_vertices != -1);
+    if (cdata->_num_vertices == 0) {
+      return;
+    }
+
     if (got_mat) {
-      for (int i = 0; i < cdata->_num_vertices; i++) {
+      if (!found_any) {
+        reader.set_row_unsafe(cdata->_first_vertex);
+        LPoint3 first_vertex = mat.xform_point(reader.get_data3());
+        min_point = first_vertex;
+        max_point = first_vertex;
+        sq_center_dist = first_vertex.length_squared();
+        found_any = true;
+        ++i;
+      }
+
+      for (; i < cdata->_num_vertices; ++i) {
         reader.set_row_unsafe(cdata->_first_vertex + i);
         LPoint3 vertex = mat.xform_point(reader.get_data3());
 
-        if (found_any) {
-          min_point.set(min(min_point[0], vertex[0]),
-                        min(min_point[1], vertex[1]),
-                        min(min_point[2], vertex[2]));
-          max_point.set(max(max_point[0], vertex[0]),
-                        max(max_point[1], vertex[1]),
-                        max(max_point[2], vertex[2]));
-        } else {
-          min_point = vertex;
-          max_point = vertex;
-          found_any = true;
-        }
+        min_point.set(min(min_point[0], vertex[0]),
+                      min(min_point[1], vertex[1]),
+                      min(min_point[2], vertex[2]));
+        max_point.set(max(max_point[0], vertex[0]),
+                      max(max_point[1], vertex[1]),
+                      max(max_point[2], vertex[2]));
+        sq_center_dist = max(sq_center_dist, vertex.length_squared());
       }
     } else {
-      for (int i = 0; i < cdata->_num_vertices; i++) {
+      if (!found_any) {
+        reader.set_row_unsafe(cdata->_first_vertex);
+        const LVecBase3 &first_vertex = reader.get_data3();
+        min_point = first_vertex;
+        max_point = first_vertex;
+        sq_center_dist = first_vertex.length_squared();
+        found_any = true;
+        ++i;
+      }
+
+      for (; i < cdata->_num_vertices; ++i) {
         reader.set_row_unsafe(cdata->_first_vertex + i);
         const LVecBase3 &vertex = reader.get_data3();
 
-        if (found_any) {
-          min_point.set(min(min_point[0], vertex[0]),
-                        min(min_point[1], vertex[1]),
-                        min(min_point[2], vertex[2]));
-          max_point.set(max(max_point[0], vertex[0]),
-                        max(max_point[1], vertex[1]),
-                        max(max_point[2], vertex[2]));
-        } else {
-          min_point = vertex;
-          max_point = vertex;
-          found_any = true;
-        }
+        min_point.set(min(min_point[0], vertex[0]),
+                      min(min_point[1], vertex[1]),
+                      min(min_point[2], vertex[2]));
+        max_point.set(max(max_point[0], vertex[0]),
+                      max(max_point[1], vertex[1]),
+                      max(max_point[2], vertex[2]));
+        sq_center_dist = max(sq_center_dist, vertex.length_squared());
       }
     }
 
   } else {
     // Indexed case.
     GeomVertexReader index(cdata->_vertices.get_read_pointer(), 0, current_thread);
+    if (index.is_at_end()) {
+      return;
+    }
+
     int strip_cut_index = get_strip_cut_index(cdata->_index_type);
 
     if (got_mat) {
+      if (!found_any) {
+        int first_index = index.get_data1i();
+        nassertv(first_index != strip_cut_index);
+        reader.set_row_unsafe(first_index);
+        LPoint3 first_vertex = mat.xform_point(reader.get_data3());
+        min_point = first_vertex;
+        max_point = first_vertex;
+        sq_center_dist = first_vertex.length_squared();
+        found_any = true;
+      }
+
       while (!index.is_at_end()) {
         int ii = index.get_data1i();
         if (ii == strip_cut_index) {
@@ -1770,20 +1809,26 @@ calc_tight_bounds(LPoint3 &min_point, LPoint3 &max_point,
         reader.set_row_unsafe(ii);
         LPoint3 vertex = mat.xform_point(reader.get_data3());
 
-        if (found_any) {
-          min_point.set(min(min_point[0], vertex[0]),
-                        min(min_point[1], vertex[1]),
-                        min(min_point[2], vertex[2]));
-          max_point.set(max(max_point[0], vertex[0]),
-                        max(max_point[1], vertex[1]),
-                        max(max_point[2], vertex[2]));
-        } else {
-          min_point = vertex;
-          max_point = vertex;
-          found_any = true;
-        }
+        min_point.set(min(min_point[0], vertex[0]),
+                      min(min_point[1], vertex[1]),
+                      min(min_point[2], vertex[2]));
+        max_point.set(max(max_point[0], vertex[0]),
+                      max(max_point[1], vertex[1]),
+                      max(max_point[2], vertex[2]));
+        sq_center_dist = max(sq_center_dist, vertex.length_squared());
       }
     } else {
+      if (!found_any) {
+        int first_index = index.get_data1i();
+        nassertv(first_index != strip_cut_index);
+        reader.set_row_unsafe(first_index);
+        const LVecBase3 &first_vertex = reader.get_data3();
+        min_point = first_vertex;
+        max_point = first_vertex;
+        sq_center_dist = first_vertex.length_squared();
+        found_any = true;
+      }
+
       while (!index.is_at_end()) {
         int ii = index.get_data1i();
         if (ii == strip_cut_index) {
@@ -1792,23 +1837,81 @@ calc_tight_bounds(LPoint3 &min_point, LPoint3 &max_point,
         reader.set_row_unsafe(ii);
         const LVecBase3 &vertex = reader.get_data3();
 
-        if (found_any) {
-          min_point.set(min(min_point[0], vertex[0]),
-                        min(min_point[1], vertex[1]),
-                        min(min_point[2], vertex[2]));
-          max_point.set(max(max_point[0], vertex[0]),
-                        max(max_point[1], vertex[1]),
-                        max(max_point[2], vertex[2]));
-        } else {
-          min_point = vertex;
-          max_point = vertex;
-          found_any = true;
-        }
+        min_point.set(min(min_point[0], vertex[0]),
+                      min(min_point[1], vertex[1]),
+                      min(min_point[2], vertex[2]));
+        max_point.set(max(max_point[0], vertex[0]),
+                      max(max_point[1], vertex[1]),
+                      max(max_point[2], vertex[2]));
+        sq_center_dist = max(sq_center_dist, vertex.length_squared());
       }
     }
   }
 }
 
+////////////////////////////////////////////////////////////////////
+//     Function: GeomPrimitive::calc_sphere_radius
+//       Access: Public, Virtual
+//  Description: Expands radius so that a sphere with the given
+//               center point fits all of the vertices.
+//
+//               The center point is assumed to already have been
+//               transformed by the matrix, if one is given.
+////////////////////////////////////////////////////////////////////
+void GeomPrimitive::
+calc_sphere_radius(const LPoint3 &center, PN_stdfloat &sq_radius,
+                   bool &found_any, const GeomVertexData *vertex_data,
+                   Thread *current_thread) const {
+  GeomVertexReader reader(vertex_data, InternalName::get_vertex(), current_thread);
+  if (!reader.has_column()) {
+    // No vertex data.
+    return;
+  }
+
+  if (!found_any) {
+    sq_radius = 0.0;
+  }
+
+  CDReader cdata(_cycler, current_thread);
+
+  if (cdata->_vertices.is_null()) {
+    // Nonindexed case.
+    nassertv(cdata->_num_vertices != -1);
+    if (cdata->_num_vertices == 0) {
+      return;
+    }
+    found_any = true;
+
+    for (int i = 0; i < cdata->_num_vertices; ++i) {
+      reader.set_row_unsafe(cdata->_first_vertex + i);
+      const LVecBase3 &vertex = reader.get_data3();
+
+      sq_radius = max(sq_radius, (vertex - center).length_squared());
+    }
+
+  } else {
+    // Indexed case.
+    GeomVertexReader index(cdata->_vertices.get_read_pointer(), 0, current_thread);
+    if (index.is_at_end()) {
+      return;
+    }
+    found_any = true;
+
+    int strip_cut_index = get_strip_cut_index(cdata->_index_type);
+
+    while (!index.is_at_end()) {
+      int ii = index.get_data1i();
+      if (ii == strip_cut_index) {
+        continue;
+      }
+      reader.set_row_unsafe(ii);
+      const LVecBase3 &vertex = reader.get_data3();
+
+      sq_radius = max(sq_radius, (vertex - center).length_squared());
+    }
+  }
+}
+
 ////////////////////////////////////////////////////////////////////
 //     Function: GeomPrimitive::decompose_impl
 //       Access: Protected, Virtual
@@ -1922,10 +2025,14 @@ recompute_minmax(GeomPrimitive::CData *cdata) {
       cdata->_mins = make_index_data();
       cdata->_maxs = make_index_data();
 
-      GeomVertexWriter mins(cdata->_mins.get_write_pointer(), 0);
-      mins.reserve_num_rows(cdata->_ends.size());
-      GeomVertexWriter maxs(cdata->_maxs.get_write_pointer(), 0);
-      maxs.reserve_num_rows(cdata->_ends.size());
+      GeomVertexArrayData *mins_data = cdata->_mins.get_write_pointer();
+      GeomVertexArrayData *maxs_data = cdata->_maxs.get_write_pointer();
+
+      mins_data->unclean_set_num_rows(cdata->_ends.size());
+      maxs_data->unclean_set_num_rows(cdata->_ends.size());
+
+      GeomVertexWriter mins(mins_data, 0);
+      GeomVertexWriter maxs(maxs_data, 0);
 
       int pi = 0;
 
@@ -1952,8 +2059,8 @@ recompute_minmax(GeomPrimitive::CData *cdata) {
           }
           vertex = index.get_data1i();
 
-          mins.add_data1i(min_prim);
-          maxs.add_data1i(max_prim);
+          mins.set_data1i(min_prim);
+          maxs.set_data1i(max_prim);
           min_prim = vertex;
           max_prim = vertex;
           ++pi;
@@ -1968,8 +2075,8 @@ recompute_minmax(GeomPrimitive::CData *cdata) {
         cdata->_max_vertex = max(cdata->_max_vertex, vertex);
       }
 
-      mins.add_data1i(min_prim);
-      maxs.add_data1i(max_prim);
+      mins.set_data1i(min_prim);
+      maxs.set_data1i(max_prim);
       nassertv(mins.get_array_data()->get_num_rows() == (int)cdata->_ends.size());
 
     } else {
@@ -2011,10 +2118,13 @@ do_make_indexed(CData *cdata) {
 
     nassertv(cdata->_num_vertices != -1);
     cdata->_vertices = make_index_data();
-    GeomVertexWriter index(cdata->_vertices.get_write_pointer(), 0);
-    index.reserve_num_rows(cdata->_num_vertices);
+
+    GeomVertexArrayData *array_data = cdata->_vertices.get_write_pointer();
+    array_data->unclean_set_num_rows(cdata->_num_vertices);
+    GeomVertexWriter index(array_data, 0);
+
     for (int i = 0; i < cdata->_num_vertices; ++i) {
-      index.add_data1i(i + cdata->_first_vertex);
+      index.set_data1i(i + cdata->_first_vertex);
     }
     cdata->_num_vertices = -1;
   }
@@ -2335,6 +2445,17 @@ get_num_primitives() const {
 ////////////////////////////////////////////////////////////////////
 bool GeomPrimitivePipelineReader::
 check_valid(const GeomVertexDataPipelineReader *data_reader) const {
-  return get_num_vertices() == 0 ||
-    get_max_vertex() < data_reader->get_num_rows();
+  if (get_num_vertices() != 0  &&
+      get_max_vertex() >= data_reader->get_num_rows()) {
+
+#ifndef NDEBUG
+    gobj_cat.error()
+      << get_object()->get_type() << " references vertices up to "
+      << get_max_vertex() << ", but GeomVertexData has only "
+      << data_reader->get_num_rows() << " rows!\n";
+#endif
+    return false;
+  }
+
+  return true;
 }
diff --git a/panda/src/gobj/geomPrimitive.h b/panda/src/gobj/geomPrimitive.h
index 298ea6dd90..3a1e1fff55 100644
--- a/panda/src/gobj/geomPrimitive.h
+++ b/panda/src/gobj/geomPrimitive.h
@@ -207,12 +207,17 @@ public:
                     bool force) const=0;
 
   void calc_tight_bounds(LPoint3 &min_point, LPoint3 &max_point,
-                         bool &found_any,
+                         PN_stdfloat &sq_center_dist, bool &found_any,
                          const GeomVertexData *vertex_data,
                          bool got_mat, const LMatrix4 &mat,
                          const InternalName *column_name,
                          Thread *current_thread) const;
 
+  void calc_sphere_radius(const LPoint3 &center,
+                          PN_stdfloat &sq_radius, bool &found_any,
+                          const GeomVertexData *vertex_data,
+                          Thread *current_thread) const;
+
 protected:
   virtual CPT(GeomPrimitive) decompose_impl() const;
   virtual CPT(GeomVertexArrayData) rotate_impl() const;
diff --git a/panda/src/gobj/geomVertexArrayFormat.I b/panda/src/gobj/geomVertexArrayFormat.I
index 6a51a54b15..f813084c96 100644
--- a/panda/src/gobj/geomVertexArrayFormat.I
+++ b/panda/src/gobj/geomVertexArrayFormat.I
@@ -106,6 +106,33 @@ set_pad_to(int pad_to) {
   _stride = ((_stride + _pad_to - 1) / _pad_to) * _pad_to;
 }
 
+////////////////////////////////////////////////////////////////////
+//     Function: GeomVertexArrayFormat::get_divisor
+//       Access: Published
+//  Description: Returns the divisor attribute for the data in this
+//               array.  If 0, it contains per-vertex data.  If 1,
+//               it contains per-instance data.  If higher than 1,
+//               the read row is advanced for each n instances.
+////////////////////////////////////////////////////////////////////
+INLINE int GeomVertexArrayFormat::
+get_divisor() const {
+  return _divisor;
+}
+
+////////////////////////////////////////////////////////////////////
+//     Function: GeomVertexArrayFormat::set_divisor
+//       Access: Published
+//  Description: Set this to 0 to indicate that this array contains
+//               per-vertex data, or to 1 to indicate that it
+//               contains per-instance data.  If higher than 1,
+//               the read row is advanced for each n instances.
+////////////////////////////////////////////////////////////////////
+INLINE void GeomVertexArrayFormat::
+set_divisor(int divisor) {
+  nassertv(divisor >= 0);
+  _divisor = divisor;
+}
+
 ////////////////////////////////////////////////////////////////////
 //     Function: GeomVertexArrayFormat::get_total_bytes
 //       Access: Published
diff --git a/panda/src/gobj/geomVertexArrayFormat.cxx b/panda/src/gobj/geomVertexArrayFormat.cxx
index 1c2877b1f3..7f1deaff61 100644
--- a/panda/src/gobj/geomVertexArrayFormat.cxx
+++ b/panda/src/gobj/geomVertexArrayFormat.cxx
@@ -28,7 +28,7 @@ TypeHandle GeomVertexArrayFormat::_type_handle;
 ////////////////////////////////////////////////////////////////////
 //     Function: GeomVertexArrayFormat::Constructor
 //       Access: Published
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 GeomVertexArrayFormat::
 GeomVertexArrayFormat() :
@@ -36,6 +36,7 @@ GeomVertexArrayFormat() :
   _stride(0),
   _total_bytes(0),
   _pad_to(1),
+  _divisor(0),
   _columns_unsorted(false)
 {
 }
@@ -43,103 +44,107 @@ GeomVertexArrayFormat() :
 ////////////////////////////////////////////////////////////////////
 //     Function: GeomVertexArrayFormat::Constructor
 //       Access: Published
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 GeomVertexArrayFormat::
-GeomVertexArrayFormat(InternalName *name0, int num_components0,
+GeomVertexArrayFormat(CPT_InternalName name0, int num_components0,
                       GeomVertexArrayFormat::NumericType numeric_type0,
                       GeomVertexArrayFormat::Contents contents0) :
   _is_registered(false),
   _stride(0),
   _total_bytes(0),
   _pad_to(1),
+  _divisor(0),
   _columns_unsorted(false)
 {
-  add_column(name0, num_components0, numeric_type0, contents0);
+  add_column(MOVE(name0), num_components0, numeric_type0, contents0);
 }
 
 ////////////////////////////////////////////////////////////////////
 //     Function: GeomVertexArrayFormat::Constructor
 //       Access: Published
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 GeomVertexArrayFormat::
-GeomVertexArrayFormat(InternalName *name0, int num_components0,
+GeomVertexArrayFormat(CPT_InternalName name0, int num_components0,
                       GeomVertexArrayFormat::NumericType numeric_type0,
                       GeomVertexArrayFormat::Contents contents0,
-                      InternalName *name1, int num_components1,
+                      CPT_InternalName name1, int num_components1,
                       GeomVertexArrayFormat::NumericType numeric_type1,
                       GeomVertexArrayFormat::Contents contents1) :
   _is_registered(false),
   _stride(0),
   _total_bytes(0),
   _pad_to(1),
+  _divisor(0),
   _columns_unsorted(false)
 {
-  add_column(name0, num_components0, numeric_type0, contents0);
-  add_column(name1, num_components1, numeric_type1, contents1);
+  add_column(MOVE(name0), num_components0, numeric_type0, contents0);
+  add_column(MOVE(name1), num_components1, numeric_type1, contents1);
 }
 
 ////////////////////////////////////////////////////////////////////
 //     Function: GeomVertexArrayFormat::Constructor
 //       Access: Published
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 GeomVertexArrayFormat::
-GeomVertexArrayFormat(InternalName *name0, int num_components0,
+GeomVertexArrayFormat(CPT_InternalName name0, int num_components0,
                       GeomVertexArrayFormat::NumericType numeric_type0,
                       GeomVertexArrayFormat::Contents contents0,
-                      InternalName *name1, int num_components1,
+                      CPT_InternalName name1, int num_components1,
                       GeomVertexArrayFormat::NumericType numeric_type1,
                       GeomVertexArrayFormat::Contents contents1,
-                      InternalName *name2, int num_components2,
+                      CPT_InternalName name2, int num_components2,
                       GeomVertexArrayFormat::NumericType numeric_type2,
                       GeomVertexArrayFormat::Contents contents2) :
   _is_registered(false),
   _stride(0),
   _total_bytes(0),
   _pad_to(1),
+  _divisor(0),
   _columns_unsorted(false)
 {
-  add_column(name0, num_components0, numeric_type0, contents0);
-  add_column(name1, num_components1, numeric_type1, contents1);
-  add_column(name2, num_components2, numeric_type2, contents2);
+  add_column(MOVE(name0), num_components0, numeric_type0, contents0);
+  add_column(MOVE(name1), num_components1, numeric_type1, contents1);
+  add_column(MOVE(name2), num_components2, numeric_type2, contents2);
 }
 
 ////////////////////////////////////////////////////////////////////
 //     Function: GeomVertexArrayFormat::Constructor
 //       Access: Published
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 GeomVertexArrayFormat::
-GeomVertexArrayFormat(InternalName *name0, int num_components0,
+GeomVertexArrayFormat(CPT_InternalName name0, int num_components0,
                       GeomVertexArrayFormat::NumericType numeric_type0,
                       GeomVertexArrayFormat::Contents contents0,
-                      InternalName *name1, int num_components1,
+                      CPT_InternalName name1, int num_components1,
                       GeomVertexArrayFormat::NumericType numeric_type1,
                       GeomVertexArrayFormat::Contents contents1,
-                      InternalName *name2, int num_components2,
+                      CPT_InternalName name2, int num_components2,
                       GeomVertexArrayFormat::NumericType numeric_type2,
                       GeomVertexArrayFormat::Contents contents2,
-                      InternalName *name3, int num_components3,
+                      CPT_InternalName name3, int num_components3,
                       GeomVertexArrayFormat::NumericType numeric_type3,
                       GeomVertexArrayFormat::Contents contents3) :
   _is_registered(false),
   _stride(0),
   _total_bytes(0),
   _pad_to(1),
+  _divisor(0),
   _columns_unsorted(false)
 {
-  add_column(name0, num_components0, numeric_type0, contents0);
-  add_column(name1, num_components1, numeric_type1, contents1);
-  add_column(name2, num_components2, numeric_type2, contents2);
-  add_column(name3, num_components3, numeric_type3, contents3);
+  add_column(MOVE(name0), num_components0, numeric_type0, contents0);
+  add_column(MOVE(name1), num_components1, numeric_type1, contents1);
+  add_column(MOVE(name2), num_components2, numeric_type2, contents2);
+  add_column(MOVE(name3), num_components3, numeric_type3, contents3);
 }
 
 ////////////////////////////////////////////////////////////////////
 //     Function: GeomVertexArrayFormat::Copy Constructor
 //       Access: Published
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 GeomVertexArrayFormat::
 GeomVertexArrayFormat(const GeomVertexArrayFormat &copy) :
@@ -147,6 +152,7 @@ GeomVertexArrayFormat(const GeomVertexArrayFormat &copy) :
   _stride(copy._stride),
   _total_bytes(copy._total_bytes),
   _pad_to(copy._pad_to),
+  _divisor(copy._divisor),
   _columns_unsorted(copy._columns_unsorted)
 {
   Columns::const_iterator dti;
@@ -158,7 +164,7 @@ GeomVertexArrayFormat(const GeomVertexArrayFormat &copy) :
 ////////////////////////////////////////////////////////////////////
 //     Function: GeomVertexArrayFormat::Copy Assignment Operator
 //       Access: Published
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 void GeomVertexArrayFormat::
 operator = (const GeomVertexArrayFormat &copy) {
@@ -166,6 +172,7 @@ operator = (const GeomVertexArrayFormat &copy) {
   _stride = copy._stride;
   _total_bytes = copy._total_bytes;
   _pad_to = copy._pad_to;
+  _divisor = copy._divisor;
 
   _columns.clear();
   _columns_by_name.clear();
@@ -175,11 +182,11 @@ operator = (const GeomVertexArrayFormat &copy) {
     add_column(*(*dti));
   }
 }
-  
+
 ////////////////////////////////////////////////////////////////////
 //     Function: GeomVertexArrayFormat::Destructor
 //       Access: Published, Virtual
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 GeomVertexArrayFormat::
 ~GeomVertexArrayFormat() {
@@ -228,15 +235,15 @@ unref() const {
 //               type.
 ////////////////////////////////////////////////////////////////////
 int GeomVertexArrayFormat::
-add_column(InternalName *name, int num_components, 
-           GeomVertexArrayFormat::NumericType numeric_type, 
+add_column(CPT_InternalName name, int num_components,
+           GeomVertexArrayFormat::NumericType numeric_type,
            GeomVertexArrayFormat::Contents contents, int start,
            int column_alignment) {
   if (start < 0) {
     start = _total_bytes;
   }
 
-  return add_column(GeomVertexColumn(name, num_components, numeric_type, contents, 
+  return add_column(GeomVertexColumn(MOVE(name), num_components, numeric_type, contents,
                                      start, column_alignment));
 }
 
@@ -500,7 +507,7 @@ count_unused_space() const {
 ////////////////////////////////////////////////////////////////////
 //     Function: GeomVertexArrayFormat::output
 //       Access: Published
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 void GeomVertexArrayFormat::
 output(ostream &out) const {
@@ -526,7 +533,7 @@ output(ostream &out) const {
 ////////////////////////////////////////////////////////////////////
 //     Function: GeomVertexArrayFormat::write
 //       Access: Published
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 void GeomVertexArrayFormat::
 write(ostream &out, int indent_level) const {
@@ -537,7 +544,7 @@ write(ostream &out, int indent_level) const {
   for (ci = _columns.begin(); ci != _columns.end(); ++ci) {
     const GeomVertexColumn *column = (*ci);
     indent(out, indent_level + 2)
-      << *column 
+      << *column
       << " " << column->get_numeric_type()
       << " " << column->get_contents()
       << " start at " << column->get_start() << "\n";
@@ -547,7 +554,7 @@ write(ostream &out, int indent_level) const {
 ////////////////////////////////////////////////////////////////////
 //     Function: GeomVertexArrayFormat::write_with_data
 //       Access: Published
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 void GeomVertexArrayFormat::
 write_with_data(ostream &out, int indent_level,
@@ -568,7 +575,7 @@ write_with_data(ostream &out, int indent_level,
       reader.set_column(0, column);
       const LVecBase4f &d = reader.get_data4f();
 
-      indent(out, indent_level + 2) 
+      indent(out, indent_level + 2)
         << *column->get_name();
       for (int v = 0; v < num_values; v++) {
         out << " " << d[v];
@@ -658,7 +665,7 @@ get_format_string(bool pad) const {
 ////////////////////////////////////////////////////////////////////
 //     Function: GeomVertexArrayFormat::compare_to
 //       Access: Public
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 int GeomVertexArrayFormat::
 compare_to(const GeomVertexArrayFormat &other) const {
@@ -671,6 +678,9 @@ compare_to(const GeomVertexArrayFormat &other) const {
   if (_pad_to != other._pad_to) {
     return _pad_to - other._pad_to;
   }
+  if (_divisor != other._divisor) {
+    return _divisor - other._divisor;
+  }
   if (_columns.size() != other._columns.size()) {
     return (int)_columns.size() - (int)other._columns.size();
   }
@@ -720,7 +730,7 @@ do_register() {
   nassertv(!_is_registered);
   _is_registered = true;
 }
- 
+
 ////////////////////////////////////////////////////////////////////
 //     Function: GeomVertexArrayFormat::do_unregister
 //       Access: Private
@@ -756,6 +766,7 @@ write_datagram(BamWriter *manager, Datagram &dg) {
   dg.add_uint16(_stride);
   dg.add_uint16(_total_bytes);
   dg.add_uint8(_pad_to);
+  dg.add_uint16(_divisor);
 
   consider_sort_columns();
 
@@ -845,6 +856,11 @@ fillin(DatagramIterator &scan, BamReader *manager) {
   _stride = scan.get_uint16();
   _total_bytes = scan.get_uint16();
   _pad_to = scan.get_uint8();
+  if (manager->get_file_minor_ver() > 36) {
+    _divisor = scan.get_uint16();
+  } else {
+    _divisor = 0;
+  }
 
   int num_columns = scan.get_uint16();
   _columns.reserve(num_columns);
@@ -859,7 +875,7 @@ fillin(DatagramIterator &scan, BamReader *manager) {
 ////////////////////////////////////////////////////////////////////
 //     Function: GeomVertexArrayFormat::Registry::Constructor
 //       Access: Public
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 GeomVertexArrayFormat::Registry::
 Registry() {
@@ -890,7 +906,7 @@ register_format(GeomVertexArrayFormat *format) {
   // a zero reference count and is not added into the map below, it
   // will be automatically deleted when this function returns.
   PT(GeomVertexArrayFormat) pt_format = format;
-  
+
   GeomVertexArrayFormat *new_format;
   {
     LightMutexHolder holder(_lock);
diff --git a/panda/src/gobj/geomVertexArrayFormat.h b/panda/src/gobj/geomVertexArrayFormat.h
index 56a9d066ab..9e150d596b 100644
--- a/panda/src/gobj/geomVertexArrayFormat.h
+++ b/panda/src/gobj/geomVertexArrayFormat.h
@@ -50,29 +50,29 @@ class BamReader;
 //               data may be piggybacked into the data record simply
 //               by choosing a unique name.
 ////////////////////////////////////////////////////////////////////
-class EXPCL_PANDA_GOBJ GeomVertexArrayFormat : public TypedWritableReferenceCount, public GeomEnums {
+class EXPCL_PANDA_GOBJ GeomVertexArrayFormat FINAL : public TypedWritableReferenceCount, public GeomEnums {
 PUBLISHED:
   GeomVertexArrayFormat();
   GeomVertexArrayFormat(const GeomVertexArrayFormat &copy);
-  GeomVertexArrayFormat(InternalName *name0, int num_components0,
+  GeomVertexArrayFormat(CPT_InternalName name0, int num_components0,
                         NumericType numeric_type0, Contents contents0);
-  GeomVertexArrayFormat(InternalName *name0, int num_components0,
+  GeomVertexArrayFormat(CPT_InternalName name0, int num_components0,
                         NumericType numeric_type0, Contents contents0,
-                        InternalName *name1, int num_components1,
+                        CPT_InternalName name1, int num_components1,
                         NumericType numeric_type1, Contents contents1);
-  GeomVertexArrayFormat(InternalName *name0, int num_components0,
+  GeomVertexArrayFormat(CPT_InternalName name0, int num_components0,
                         NumericType numeric_type0, Contents contents0,
-                        InternalName *name1, int num_components1,
+                        CPT_InternalName name1, int num_components1,
                         NumericType numeric_type1, Contents contents1,
-                        InternalName *name2, int num_components2,
+                        CPT_InternalName name2, int num_components2,
                         NumericType numeric_type2, Contents contents2);
-  GeomVertexArrayFormat(InternalName *name0, int num_components0,
+  GeomVertexArrayFormat(CPT_InternalName name0, int num_components0,
                         NumericType numeric_type0, Contents contents0,
-                        InternalName *name1, int num_components1,
+                        CPT_InternalName name1, int num_components1,
                         NumericType numeric_type1, Contents contents1,
-                        InternalName *name2, int num_components2,
+                        CPT_InternalName name2, int num_components2,
                         NumericType numeric_type2, Contents contents2,
-                        InternalName *name3, int num_components3,
+                        CPT_InternalName name3, int num_components3,
                         NumericType numeric_type3, Contents contents3);
   void operator = (const GeomVertexArrayFormat &copy);
   ~GeomVertexArrayFormat();
@@ -88,9 +88,12 @@ PUBLISHED:
   INLINE int get_pad_to() const;
   INLINE void set_pad_to(int pad_to);
 
+  INLINE int get_divisor() const;
+  INLINE void set_divisor(int divisor);
+
   INLINE int get_total_bytes() const;
 
-  int add_column(InternalName *name, int num_components,
+  int add_column(CPT_InternalName name, int num_components,
                  NumericType numeric_type, Contents contents,
                  int start = -1, int column_alignment = 0);
   int add_column(const GeomVertexColumn &column);
@@ -112,7 +115,7 @@ PUBLISHED:
 
   void output(ostream &out) const;
   void write(ostream &out, int indent_level = 0) const;
-  void write_with_data(ostream &out, int indent_level, 
+  void write_with_data(ostream &out, int indent_level,
                        const GeomVertexArrayData *array_data) const;
 
   string get_format_string(bool pad = true) const;
@@ -135,6 +138,7 @@ private:
   int _stride;
   int _total_bytes;
   int _pad_to;
+  int _divisor;
 
   typedef pvector<GeomVertexColumn *> Columns;
   Columns _columns;
diff --git a/panda/src/gobj/geomVertexColumn.I b/panda/src/gobj/geomVertexColumn.I
index e74e47d7d2..f2646a0fb0 100644
--- a/panda/src/gobj/geomVertexColumn.I
+++ b/panda/src/gobj/geomVertexColumn.I
@@ -28,13 +28,13 @@ GeomVertexColumn() :
 ////////////////////////////////////////////////////////////////////
 //     Function: GeomVertexColumn::Constructor
 //       Access: Published
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 INLINE GeomVertexColumn::
-GeomVertexColumn(InternalName *name, int num_components,
+GeomVertexColumn(CPT_InternalName name, int num_components,
                  NumericType numeric_type, Contents contents,
                  int start, int column_alignment) :
-  _name(name),
+  _name(MOVE(name)),
   _num_components(num_components),
   _numeric_type(numeric_type),
   _contents(contents),
@@ -48,7 +48,7 @@ GeomVertexColumn(InternalName *name, int num_components,
 ////////////////////////////////////////////////////////////////////
 //     Function: GeomVertexColumn::Copy Constructor
 //       Access: Published
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 INLINE GeomVertexColumn::
 GeomVertexColumn(const GeomVertexColumn &copy) :
@@ -66,7 +66,7 @@ GeomVertexColumn(const GeomVertexColumn &copy) :
 ////////////////////////////////////////////////////////////////////
 //     Function: GeomVertexColumn::Destructor
 //       Access: Published
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 INLINE GeomVertexColumn::
 ~GeomVertexColumn() {
@@ -82,7 +82,7 @@ INLINE GeomVertexColumn::
 //               system-defined field types.  Only the system-defined
 //               field types are used for the actual rendering.
 ////////////////////////////////////////////////////////////////////
-INLINE InternalName *GeomVertexColumn::
+INLINE const InternalName *GeomVertexColumn::
 get_name() const {
   return _name;
 }
@@ -116,6 +116,17 @@ get_num_values() const {
   return _num_values;
 }
 
+////////////////////////////////////////////////////////////////////
+//     Function: GeomVertexColumn::get_num_elements
+//       Access: Published
+//  Description: Returns the number of times this column is repeated.
+//               This is usually 1, except for matrices.
+////////////////////////////////////////////////////////////////////
+INLINE int GeomVertexColumn::
+get_num_elements() const {
+  return _num_elements;
+}
+
 ////////////////////////////////////////////////////////////////////
 //     Function: GeomVertexColumn::get_numeric_type
 //       Access: Published
@@ -165,6 +176,18 @@ get_column_alignment() const {
   return _column_alignment;
 }
 
+////////////////////////////////////////////////////////////////////
+//     Function: GeomVertexColumn::get_element_stride
+//       Access: Published
+//  Description: This value is only relevant for matrix types.
+//               Returns the number of bytes to add to access the
+//               next row of the matrix.
+////////////////////////////////////////////////////////////////////
+INLINE int GeomVertexColumn::
+get_element_stride() const {
+  return _element_stride;
+}
+
 ////////////////////////////////////////////////////////////////////
 //     Function: GeomVertexColumn::get_component_bytes
 //       Access: Published
@@ -311,7 +334,7 @@ operator == (const GeomVertexColumn &other) const {
 ////////////////////////////////////////////////////////////////////
 //     Function: GeomVertexColumn::operator !=
 //       Access: Public
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 INLINE bool GeomVertexColumn::
 operator != (const GeomVertexColumn &other) const {
@@ -328,7 +351,7 @@ operator != (const GeomVertexColumn &other) const {
 ////////////////////////////////////////////////////////////////////
 INLINE bool GeomVertexColumn::
 operator < (const GeomVertexColumn &other) const {
-  if (_start != other._start) { 
+  if (_start != other._start) {
     return _start < other._start;
   }
   if (_total_bytes < other._total_bytes) {
@@ -359,7 +382,7 @@ maybe_scale_color_f(unsigned int value) {
     return (float)value;
   }
 }
-    
+
 ////////////////////////////////////////////////////////////////////
 //     Function: GeomVertexColumn::Packer::maybe_scale_color_f
 //       Access: Public
@@ -371,11 +394,11 @@ maybe_scale_color_f(unsigned int a, unsigned int b) {
   if (_column->get_contents() == C_color) {
     _v2.set((float)a / 255.0f,
             (float)b / 255.0f);
-  } else {    
+  } else {
     _v2.set((float)a, (float)b);
   }
 }
-    
+
 ////////////////////////////////////////////////////////////////////
 //     Function: GeomVertexColumn::Packer::maybe_scale_color_f
 //       Access: Public
@@ -388,11 +411,11 @@ maybe_scale_color_f(unsigned int a, unsigned int b, unsigned int c) {
     _v3.set((float)a / 255.0f,
             (float)b / 255.0f,
             (float)c / 255.0f);
-  } else {    
+  } else {
     _v3.set((float)a, (float)b, (float)c);
   }
 }
-    
+
 ////////////////////////////////////////////////////////////////////
 //     Function: GeomVertexColumn::Packer::maybe_scale_color_f
 //       Access: Public
@@ -411,7 +434,6 @@ maybe_scale_color_f(unsigned int a, unsigned int b, unsigned int c,
     _v4.set((float)a, (float)b, (float)c, (float)d);
   }
 }
-    
 
 ////////////////////////////////////////////////////////////////////
 //     Function: GeomVertexColumn::Packer::maybe_unscale_color_f
@@ -429,7 +451,7 @@ maybe_unscale_color_f(float data) {
     return (unsigned int)data;
   }
 }
-    
+
 ////////////////////////////////////////////////////////////////////
 //     Function: GeomVertexColumn::Packer::maybe_unscale_color_f
 //       Access: Public
@@ -447,7 +469,7 @@ maybe_unscale_color_f(const LVecBase2f &data) {
     _b = (unsigned int)data[1];
   }
 }
-    
+
 ////////////////////////////////////////////////////////////////////
 //     Function: GeomVertexColumn::Packer::maybe_unscale_color_f
 //       Access: Public
@@ -467,7 +489,7 @@ maybe_unscale_color_f(const LVecBase3f &data) {
     _c = (unsigned int)data[2];
   }
 }
-    
+
 ////////////////////////////////////////////////////////////////////
 //     Function: GeomVertexColumn::Packer::maybe_unscale_color_f
 //       Access: Public
@@ -506,7 +528,7 @@ maybe_scale_color_d(unsigned int value) {
     return (double)value;
   }
 }
-    
+
 ////////////////////////////////////////////////////////////////////
 //     Function: GeomVertexColumn::Packer::maybe_scale_color_d
 //       Access: Public
@@ -518,11 +540,11 @@ maybe_scale_color_d(unsigned int a, unsigned int b) {
   if (_column->get_contents() == C_color) {
     _v2d.set((double)a / 255.0,
              (double)b / 255.0);
-  } else {    
+  } else {
     _v2d.set((double)a, (double)b);
   }
 }
-    
+
 ////////////////////////////////////////////////////////////////////
 //     Function: GeomVertexColumn::Packer::maybe_scale_color_d
 //       Access: Public
@@ -535,11 +557,11 @@ maybe_scale_color_d(unsigned int a, unsigned int b, unsigned int c) {
     _v3d.set((double)a / 255.0,
              (double)b / 255.0,
              (double)c / 255.0);
-  } else {    
+  } else {
     _v3d.set((double)a, (double)b, (double)c);
   }
 }
-    
+
 ////////////////////////////////////////////////////////////////////
 //     Function: GeomVertexColumn::Packer::maybe_scale_color_d
 //       Access: Public
@@ -558,7 +580,6 @@ maybe_scale_color_d(unsigned int a, unsigned int b, unsigned int c,
     _v4d.set((double)a, (double)b, (double)c, (double)d);
   }
 }
-    
 
 ////////////////////////////////////////////////////////////////////
 //     Function: GeomVertexColumn::Packer::maybe_unscale_color_d
@@ -576,7 +597,7 @@ maybe_unscale_color_d(double data) {
     return (unsigned int)data;
   }
 }
-    
+
 ////////////////////////////////////////////////////////////////////
 //     Function: GeomVertexColumn::Packer::maybe_unscale_color_d
 //       Access: Public
@@ -594,7 +615,7 @@ maybe_unscale_color_d(const LVecBase2d &data) {
     _b = (unsigned int)data[1];
   }
 }
-    
+
 ////////////////////////////////////////////////////////////////////
 //     Function: GeomVertexColumn::Packer::maybe_unscale_color_d
 //       Access: Public
@@ -614,7 +635,7 @@ maybe_unscale_color_d(const LVecBase3d &data) {
     _c = (unsigned int)data[2];
   }
 }
-    
+
 ////////////////////////////////////////////////////////////////////
 //     Function: GeomVertexColumn::Packer::maybe_unscale_color_d
 //       Access: Public
diff --git a/panda/src/gobj/geomVertexColumn.cxx b/panda/src/gobj/geomVertexColumn.cxx
index d629121ffc..1698384d07 100644
--- a/panda/src/gobj/geomVertexColumn.cxx
+++ b/panda/src/gobj/geomVertexColumn.cxx
@@ -168,6 +168,7 @@ setup() {
   nassertv(_num_components > 0 && _start >= 0);
 
   _num_values = _num_components;
+  _num_elements = 1;
 
   if (_numeric_type == NT_stdfloat) {
     if (vertices_float64) {
@@ -209,6 +210,10 @@ setup() {
     break;
   }
 
+  if (_contents == C_matrix) {
+    _num_elements = _num_components;
+  }
+
   if (_column_alignment < 1) {
     // The default column alignment is to align to the individual
     // numeric components, or to vertex_column_alignment, whichever is
@@ -219,7 +224,8 @@ setup() {
   // Enforce the column alignment requirements on the _start byte.
   _start = ((_start + _column_alignment - 1) / _column_alignment) * _column_alignment;
 
-  _total_bytes = _component_bytes * _num_components;
+  _element_stride = _component_bytes * _num_components;
+  _total_bytes = _element_stride * _num_elements;
 
   if (_packer != NULL) {
     delete _packer;
@@ -334,7 +340,6 @@ make_packer() const {
       break;
     }
     return new Packer_color;
-
   default:
     // Otherwise, we just read it as a generic value.
     switch (get_numeric_type()) {
diff --git a/panda/src/gobj/geomVertexColumn.h b/panda/src/gobj/geomVertexColumn.h
index 88384c4909..ab3ddf9f4f 100644
--- a/panda/src/gobj/geomVertexColumn.h
+++ b/panda/src/gobj/geomVertexColumn.h
@@ -38,24 +38,25 @@ class GeomVertexWriter;
 //               to completely define a particular array structure.
 ////////////////////////////////////////////////////////////////////
 class EXPCL_PANDA_GOBJ GeomVertexColumn : public GeomEnums {
-PUBLISHED:
 private:
   INLINE GeomVertexColumn();
 PUBLISHED:
-  INLINE GeomVertexColumn(InternalName *name, int num_components,
+  INLINE GeomVertexColumn(CPT_InternalName name, int num_components,
                           NumericType numeric_type, Contents contents,
                           int start, int column_alignment = 0);
   INLINE GeomVertexColumn(const GeomVertexColumn &copy);
   void operator = (const GeomVertexColumn &copy);
   INLINE ~GeomVertexColumn();
 
-  INLINE InternalName *get_name() const;
+  INLINE const InternalName *get_name() const;
   INLINE int get_num_components() const;
   INLINE int get_num_values() const;
+  INLINE int get_num_elements() const;
   INLINE NumericType get_numeric_type() const;
   INLINE Contents get_contents() const;
   INLINE int get_start() const;
   INLINE int get_column_alignment() const;
+  INLINE int get_element_stride() const;
   INLINE int get_component_bytes() const;
   INLINE int get_total_bytes() const;
   INLINE bool has_homogeneous_coord() const;
@@ -93,13 +94,15 @@ public:
   void fillin(DatagramIterator &scan, BamReader *manager);
 
 private:
-  PT(InternalName) _name;
+  CPT_InternalName _name;
   int _num_components;
   int _num_values;
+  int _num_elements;
   NumericType _numeric_type;
   Contents _contents;
   int _start;
   int _column_alignment;
+  int _element_stride;
   int _component_bytes;
   int _total_bytes;
   Packer *_packer;
@@ -137,7 +140,7 @@ private:
     virtual void set_data2d(unsigned char *pointer, const LVecBase2d &data);
     virtual void set_data3d(unsigned char *pointer, const LVecBase3d &data);
     virtual void set_data4d(unsigned char *pointer, const LVecBase4d &data);
-    
+
     virtual void set_data1i(unsigned char *pointer, int data);
     virtual void set_data2i(unsigned char *pointer, const LVecBase2i &data);
     virtual void set_data3i(unsigned char *pointer, const LVecBase3i &data);
diff --git a/panda/src/gobj/geomVertexData.I b/panda/src/gobj/geomVertexData.I
index e489566fe6..9478e08fa7 100644
--- a/panda/src/gobj/geomVertexData.I
+++ b/panda/src/gobj/geomVertexData.I
@@ -98,12 +98,10 @@ get_num_rows() const {
 //               was changed, false if the object already contained n
 //               rows (or if there was some error).
 //
-//               Although this method is Published, application code
-//               only very rarely has any need to call it.  Instead,
-//               you should use the GeomVertexWriter to build up the
-//               rows in a GeomVertexData object automatically,
-//               without need to explicitly set the number of
-//               rows.
+//               This can be used when you know exactly how many
+//               rows you will be needing.  It is faster than
+//               reserve_num_rows().  Also see unclean_set_num_rows()
+//               if you are planning to fill in all the data yourself.
 //
 //               Don't call this in a downstream thread unless you
 //               don't mind it blowing away other changes you might
@@ -129,12 +127,9 @@ set_num_rows(int n) {
 //               anyway; it provides a tiny performance boost over
 //               set_num_rows().
 //
-//               Although this method is Published, application code
-//               only very rarely has any need to call it.  Instead,
-//               you should use the GeomVertexWriter to build up the
-//               rows in a GeomVertexData object automatically,
-//               without need to explicitly set the number of
-//               rows.
+//               This can be used when you know exactly how many
+//               rows you will be needing.  It is faster than
+//               reserve_num_rows().
 ////////////////////////////////////////////////////////////////////
 INLINE bool GeomVertexData::
 unclean_set_num_rows(int n) {
@@ -152,6 +147,10 @@ unclean_set_num_rows(int n) {
 //               This is a performance optimization only; it is
 //               especially useful when you know ahead of time that
 //               you will be adding n rows to the data.
+//
+//               If you know exactly how many rows you will be
+//               needing, it is significantly faster to use
+//               set_num_rows() or unclean_set_num_rows() instead.
 ////////////////////////////////////////////////////////////////////
 INLINE bool GeomVertexData::
 reserve_num_rows(int n) {
@@ -414,7 +413,7 @@ INLINE int GeomVertexData::
 add_transform(TransformTable *table, const VertexTransform *transform,
               TransformMap &already_added) {
   pair<TransformMap::iterator, bool> result = already_added.insert(TransformMap::value_type(transform, table->get_num_transforms()));
-  
+
   if (result.second) {
     table->add_transform(transform);
   }
@@ -425,7 +424,7 @@ add_transform(TransformTable *table, const VertexTransform *transform,
 ////////////////////////////////////////////////////////////////////
 //     Function: GeomVertexData::CDataCache::Constructor
 //       Access: Public
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 INLINE GeomVertexData::CDataCache::
 CDataCache() {
@@ -434,7 +433,7 @@ CDataCache() {
 ////////////////////////////////////////////////////////////////////
 //     Function: GeomVertexData::CDataCache::Copy Constructor
 //       Access: Public
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 INLINE GeomVertexData::CDataCache::
 CDataCache(const GeomVertexData::CDataCache &copy) :
@@ -445,7 +444,7 @@ CDataCache(const GeomVertexData::CDataCache &copy) :
 ////////////////////////////////////////////////////////////////////
 //     Function: GeomVertexData::CacheKey::Constructor
 //       Access: Public
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 INLINE GeomVertexData::CacheKey::
 CacheKey(const GeomVertexFormat *modifier) :
@@ -453,6 +452,30 @@ CacheKey(const GeomVertexFormat *modifier) :
 {
 }
 
+////////////////////////////////////////////////////////////////////
+//     Function: GeomVertexData::CacheKey::Copy Constructor
+//       Access: Public
+//  Description:
+////////////////////////////////////////////////////////////////////
+INLINE GeomVertexData::CacheKey::
+CacheKey(const CacheKey &copy) :
+  _modifier(copy._modifier)
+{
+}
+
+#ifdef USE_MOVE_SEMANTICS
+////////////////////////////////////////////////////////////////////
+//     Function: GeomVertexData::CacheKey::Move Constructor
+//       Access: Public
+//  Description:
+////////////////////////////////////////////////////////////////////
+INLINE GeomVertexData::CacheKey::
+CacheKey(CacheKey &&from) NOEXCEPT :
+  _modifier(move(from._modifier))
+{
+}
+#endif  // USE_MOVE_SEMANTICS
+
 ////////////////////////////////////////////////////////////////////
 //     Function: GeomVertexData::CacheKey::operator <
 //       Access: Public
@@ -466,7 +489,7 @@ operator < (const CacheKey &other) const {
 ////////////////////////////////////////////////////////////////////
 //     Function: GeomVertexData::CacheEntry::Constructor
 //       Access: Public
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 INLINE GeomVertexData::CacheEntry::
 CacheEntry(GeomVertexData *source, const GeomVertexFormat *modifier) :
@@ -475,6 +498,32 @@ CacheEntry(GeomVertexData *source, const GeomVertexFormat *modifier) :
 {
 }
 
+////////////////////////////////////////////////////////////////////
+//     Function: GeomVertexData::CacheEntry::Copy Constructor
+//       Access: Public
+//  Description:
+////////////////////////////////////////////////////////////////////
+INLINE GeomVertexData::CacheEntry::
+CacheEntry(GeomVertexData *source, const CacheKey &key) :
+  _source(source),
+  _key(key)
+{
+}
+
+#ifdef USE_MOVE_SEMANTICS
+////////////////////////////////////////////////////////////////////
+//     Function: GeomVertexData::CacheEntry::Move Constructor
+//       Access: Public
+//  Description:
+////////////////////////////////////////////////////////////////////
+INLINE GeomVertexData::CacheEntry::
+CacheEntry(GeomVertexData *source, CacheKey &&key) NOEXCEPT :
+  _source(source),
+  _key(move(key))
+{
+}
+#endif  // USE_MOVE_SEMANTICS
+
 ////////////////////////////////////////////////////////////////////
 //     Function: GeomVertexData::CData::Constructor
 //       Access: Public
@@ -511,7 +560,7 @@ CData(const GeomVertexData::CData &copy) :
 //  Description:
 ////////////////////////////////////////////////////////////////////
 INLINE GeomVertexDataPipelineBase::
-GeomVertexDataPipelineBase(GeomVertexData *object, 
+GeomVertexDataPipelineBase(GeomVertexData *object,
                            Thread *current_thread,
                            GeomVertexData::CData *cdata) :
   _object(object),
@@ -560,7 +609,7 @@ get_current_thread() const {
 ////////////////////////////////////////////////////////////////////
 //     Function: GeomVertexDataPipelineBase::get_usage_hint
 //       Access: Public
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 INLINE GeomVertexDataPipelineBase::UsageHint GeomVertexDataPipelineBase::
 get_usage_hint() const {
@@ -570,7 +619,7 @@ get_usage_hint() const {
 ////////////////////////////////////////////////////////////////////
 //     Function: GeomVertexDataPipelineBase::get_format
 //       Access: Public
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 INLINE const GeomVertexFormat *GeomVertexDataPipelineBase::
 get_format() const {
@@ -580,7 +629,7 @@ get_format() const {
 ////////////////////////////////////////////////////////////////////
 //     Function: GeomVertexDataPipelineBase::has_column
 //       Access: Public
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 INLINE bool GeomVertexDataPipelineBase::
 has_column(const InternalName *name) const {
@@ -590,7 +639,7 @@ has_column(const InternalName *name) const {
 ////////////////////////////////////////////////////////////////////
 //     Function: GeomVertexDataPipelineBase::get_num_arrays
 //       Access: Public
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 INLINE int GeomVertexDataPipelineBase::
 get_num_arrays() const {
@@ -600,7 +649,7 @@ get_num_arrays() const {
 ////////////////////////////////////////////////////////////////////
 //     Function: GeomVertexDataPipelineBase::get_array
 //       Access: Public
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 INLINE CPT(GeomVertexArrayData) GeomVertexDataPipelineBase::
 get_array(int i) const {
@@ -611,7 +660,7 @@ get_array(int i) const {
 ////////////////////////////////////////////////////////////////////
 //     Function: GeomVertexDataPipelineBase::get_transform_table
 //       Access: Public
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 INLINE const TransformTable *GeomVertexDataPipelineBase::
 get_transform_table() const {
@@ -621,7 +670,7 @@ get_transform_table() const {
 ////////////////////////////////////////////////////////////////////
 //     Function: GeomVertexDataPipelineBase::get_transform_blend_table
 //       Access: Public
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 INLINE CPT(TransformBlendTable) GeomVertexDataPipelineBase::
 get_transform_blend_table() const {
@@ -631,7 +680,7 @@ get_transform_blend_table() const {
 ////////////////////////////////////////////////////////////////////
 //     Function: GeomVertexDataPipelineBase::get_slider_table
 //       Access: Public
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 INLINE const SliderTable *GeomVertexDataPipelineBase::
 get_slider_table() const {
@@ -641,7 +690,7 @@ get_slider_table() const {
 ////////////////////////////////////////////////////////////////////
 //     Function: GeomVertexDataPipelineBase::get_modified
 //       Access: Public
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 INLINE UpdateSeq GeomVertexDataPipelineBase::
 get_modified() const {
@@ -654,7 +703,7 @@ get_modified() const {
 //  Description:
 ////////////////////////////////////////////////////////////////////
 INLINE GeomVertexDataPipelineReader::
-GeomVertexDataPipelineReader(const GeomVertexData *object, 
+GeomVertexDataPipelineReader(const GeomVertexData *object,
                              Thread *current_thread) :
   GeomVertexDataPipelineBase((GeomVertexData *)object, current_thread,
                              (GeomVertexData::CData *)object->_cycler.read_unlocked(current_thread)),
@@ -668,7 +717,7 @@ GeomVertexDataPipelineReader(const GeomVertexData *object,
 //  Description: Don't attempt to copy these objects.
 ////////////////////////////////////////////////////////////////////
 INLINE GeomVertexDataPipelineReader::
-GeomVertexDataPipelineReader(const GeomVertexDataPipelineReader &copy) : 
+GeomVertexDataPipelineReader(const GeomVertexDataPipelineReader &copy) :
   GeomVertexDataPipelineBase(copy)
 {
   nassertv(false);
@@ -710,7 +759,7 @@ get_object() const {
 ////////////////////////////////////////////////////////////////////
 //     Function: GeomVertexDataPipelineReader::check_array_readers
 //       Access: Public
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 INLINE void GeomVertexDataPipelineReader::
 check_array_readers() const {
@@ -722,7 +771,7 @@ check_array_readers() const {
 ////////////////////////////////////////////////////////////////////
 //     Function: GeomVertexDataPipelineReader::get_array_reader
 //       Access: Public
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 INLINE const GeomVertexArrayDataHandle *GeomVertexDataPipelineReader::
 get_array_reader(int i) const {
@@ -734,7 +783,7 @@ get_array_reader(int i) const {
 ////////////////////////////////////////////////////////////////////
 //     Function: GeomVertexDataPipelineReader::has_vertex
 //       Access: Public
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 INLINE bool GeomVertexDataPipelineReader::
 has_vertex() const {
@@ -744,7 +793,7 @@ has_vertex() const {
 ////////////////////////////////////////////////////////////////////
 //     Function: GeomVertexDataPipelineReader::is_vertex_transformed
 //       Access: Public
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 INLINE bool GeomVertexDataPipelineReader::
 is_vertex_transformed() const {
@@ -759,7 +808,7 @@ is_vertex_transformed() const {
 ////////////////////////////////////////////////////////////////////
 //     Function: GeomVertexDataPipelineReader::has_normal
 //       Access: Public
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 INLINE bool GeomVertexDataPipelineReader::
 has_normal() const {
@@ -769,7 +818,7 @@ has_normal() const {
 ////////////////////////////////////////////////////////////////////
 //     Function: GeomVertexDataPipelineReader::has_color
 //       Access: Public
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 INLINE bool GeomVertexDataPipelineReader::
 has_color() const {
@@ -782,7 +831,7 @@ has_color() const {
 //  Description:
 ////////////////////////////////////////////////////////////////////
 INLINE GeomVertexDataPipelineWriter::
-GeomVertexDataPipelineWriter(GeomVertexData *object, bool force_to_0, 
+GeomVertexDataPipelineWriter(GeomVertexData *object, bool force_to_0,
                              Thread *current_thread) :
   GeomVertexDataPipelineBase(object, current_thread,
                              object->_cycler.write_upstream(force_to_0, current_thread)),
@@ -803,7 +852,7 @@ GeomVertexDataPipelineWriter(GeomVertexData *object, bool force_to_0,
 //  Description: Don't attempt to copy these objects.
 ////////////////////////////////////////////////////////////////////
 INLINE GeomVertexDataPipelineWriter::
-GeomVertexDataPipelineWriter(const GeomVertexDataPipelineWriter &copy) : 
+GeomVertexDataPipelineWriter(const GeomVertexDataPipelineWriter &copy) :
   GeomVertexDataPipelineBase(copy)
 {
   nassertv(false);
@@ -845,7 +894,7 @@ get_object() const {
 ////////////////////////////////////////////////////////////////////
 //     Function: GeomVertexDataPipelineWriter::check_array_writers
 //       Access: Public
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 INLINE void GeomVertexDataPipelineWriter::
 check_array_writers() const {
@@ -857,7 +906,7 @@ check_array_writers() const {
 ////////////////////////////////////////////////////////////////////
 //     Function: GeomVertexDataPipelineWriter::get_array_writer
 //       Access: Public
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 INLINE GeomVertexArrayDataHandle *GeomVertexDataPipelineWriter::
 get_array_writer(int i) const {
diff --git a/panda/src/gobj/geomVertexData.cxx b/panda/src/gobj/geomVertexData.cxx
index 08e6fdc200..7a265b66a0 100644
--- a/panda/src/gobj/geomVertexData.cxx
+++ b/panda/src/gobj/geomVertexData.cxx
@@ -64,7 +64,7 @@ make_cow_copy() {
 ////////////////////////////////////////////////////////////////////
 //     Function: GeomVertexData::Constructor
 //       Access: Published
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 GeomVertexData::
 GeomVertexData(const string &name,
@@ -97,7 +97,7 @@ GeomVertexData(const string &name,
 ////////////////////////////////////////////////////////////////////
 //     Function: GeomVertexData::Copy Constructor
 //       Access: Published
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 GeomVertexData::
 GeomVertexData(const GeomVertexData &copy) :
@@ -127,7 +127,7 @@ GeomVertexData(const GeomVertexData &copy) :
 //               and it allows you to specify a different format.
 ////////////////////////////////////////////////////////////////////
 GeomVertexData::
-GeomVertexData(const GeomVertexData &copy, 
+GeomVertexData(const GeomVertexData &copy,
                const GeomVertexFormat *format) :
   CopyOnWriteObject(copy),
   _name(copy._name),
@@ -159,7 +159,7 @@ GeomVertexData(const GeomVertexData &copy,
   }
   CLOSE_ITERATE_ALL_STAGES(_cycler);
 }
-  
+
 ////////////////////////////////////////////////////////////////////
 //     Function: GeomVertexData::Copy Assignment Operator
 //       Access: Published
@@ -186,14 +186,14 @@ operator = (const GeomVertexData &copy) {
     cdata->_modified = Geom::get_next_modified();
     cdata->_animated_vertices = NULL;
     cdata->_animated_vertices_modified = UpdateSeq();
-  } 
+  }
   CLOSE_ITERATE_ALL_STAGES(_cycler);
 }
 
 ////////////////////////////////////////////////////////////////////
 //     Function: GeomVertexData::Destructor
 //       Access: Published, Virtual
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 GeomVertexData::
 ~GeomVertexData() {
@@ -369,7 +369,7 @@ unclean_set_format(const GeomVertexFormat *format) {
   // Assign the new format.
   cdataw->_format = format;
 
-  for (int ai = 0; ai < cdataw->_arrays.size(); ++ai) {
+  for (size_t ai = 0; ai < cdataw->_arrays.size(); ++ai) {
     PT(GeomVertexArrayData) array_obj = cdataw->_arrays[ai].get_write_pointer();
     array_obj->_array_format = format->get_array(ai);
   }
@@ -564,22 +564,22 @@ copy_from(const GeomVertexData *source, bool keep_data_objects,
   pset<int> done_arrays;
 
   for (source_i = 0; source_i < num_arrays; ++source_i) {
-    const GeomVertexArrayFormat *source_array_format = 
+    const GeomVertexArrayFormat *source_array_format =
       source_format->get_array(source_i);
 
     bool array_done = false;
 
     int dest_num_arrays = dest_format->get_num_arrays();
-    for (int dest_i = 0; 
-         dest_i < dest_num_arrays && !array_done; 
+    for (int dest_i = 0;
+         dest_i < dest_num_arrays && !array_done;
          ++dest_i) {
-      const GeomVertexArrayFormat *dest_array_format = 
+      const GeomVertexArrayFormat *dest_array_format =
         dest_format->get_array(dest_i);
       if (dest_array_format->is_data_subset_of(*source_array_format)) {
         // Great!  Just use the same data for this one.
         if (keep_data_objects) {
-          // Copy the data, but keep the same GeomVertexArrayData object.  
-          
+          // Copy the data, but keep the same GeomVertexArrayData object.
+
           PT(GeomVertexArrayData) dest_data = modify_array(dest_i);
           CPT(GeomVertexArrayData) source_data = source->get_array(source_i);
           dest_data->modify_handle()->copy_data_from(source_data->get_handle());
@@ -613,9 +613,9 @@ copy_from(const GeomVertexData *source, bool keep_data_objects,
       int dest_i = dest_format->get_array_with(source_column->get_name());
       if (dest_i >= 0 && done_arrays.count(dest_i) == 0) {
         // The data type exists in the new format; we have to copy it.
-        const GeomVertexArrayFormat *dest_array_format = 
+        const GeomVertexArrayFormat *dest_array_format =
           dest_format->get_array(dest_i);
-        const GeomVertexColumn *dest_column = 
+        const GeomVertexColumn *dest_column =
           dest_array_format->get_column(source_column->get_name());
         nassertv(dest_column != (const GeomVertexColumn *)NULL);
 
@@ -625,12 +625,12 @@ copy_from(const GeomVertexData *source, bool keep_data_objects,
           PT(GeomVertexArrayDataHandle) dest_handle = dest_array_obj->modify_handle();
           unsigned char *dest_array_data = dest_handle->get_write_pointer();
 
-          bytewise_copy(dest_array_data + dest_column->get_start(), 
+          bytewise_copy(dest_array_data + dest_column->get_start(),
                         dest_array_format->get_stride(),
                         array_data + source_column->get_start(), source_array_format->get_stride(),
                         source_column, num_rows);
 
-        } else if (dest_column->is_packed_argb() && 
+        } else if (dest_column->is_packed_argb() &&
                    source_column->is_uint8_rgba()) {
           // A common special case: OpenGL color to DirectX color.
           PT(GeomVertexArrayData) dest_array_obj = modify_array(dest_i);
@@ -638,12 +638,12 @@ copy_from(const GeomVertexData *source, bool keep_data_objects,
           unsigned char *dest_array_data = dest_handle->get_write_pointer();
 
           uint8_rgba_to_packed_argb
-            (dest_array_data + dest_column->get_start(), 
+            (dest_array_data + dest_column->get_start(),
              dest_array_format->get_stride(),
              array_data + source_column->get_start(), source_array_format->get_stride(),
              num_rows);
 
-        } else if (dest_column->is_uint8_rgba() && 
+        } else if (dest_column->is_uint8_rgba() &&
                    source_column->is_packed_argb()) {
           // Another common special case: DirectX color to OpenGL
           // color.
@@ -652,7 +652,7 @@ copy_from(const GeomVertexData *source, bool keep_data_objects,
           unsigned char *dest_array_data = dest_handle->get_write_pointer();
 
           packed_argb_to_uint8_rgba
-            (dest_array_data + dest_column->get_start(), 
+            (dest_array_data + dest_column->get_start(),
              dest_array_format->get_stride(),
              array_data + source_column->get_start(), source_array_format->get_stride(),
              num_rows);
@@ -661,7 +661,7 @@ copy_from(const GeomVertexData *source, bool keep_data_objects,
           // A generic copy.
           if (gobj_cat.is_debug()) {
             gobj_cat.debug()
-              << "generic copy " << *dest_column << " from " 
+              << "generic copy " << *dest_column << " from "
               << *source_column << "\n";
           }
           GeomVertexWriter to(this);
@@ -695,13 +695,13 @@ copy_from(const GeomVertexData *source, bool keep_data_objects,
           GeomVertexWriter weight(this, InternalName::get_transform_weight());
           GeomVertexWriter index(this, InternalName::get_transform_index());
           GeomVertexReader from(source, InternalName::get_transform_blend());
-        
+
           while (!from.is_at_end()) {
             const TransformBlend &blend = blend_table->get_blend(from.get_data1i());
             LVecBase4 weights = LVecBase4::zero();
             LVecBase4i indices(0, 0, 0, 0);
             nassertv(blend.get_num_transforms() <= 4);
-            
+
             for (int i = 0; i < blend.get_num_transforms(); i++) {
               weights[i] = blend.get_weight(i);
               indices[i] = add_transform(transform_table, blend.get_transform(i),
@@ -717,11 +717,11 @@ copy_from(const GeomVertexData *source, bool keep_data_objects,
           // use the same n transforms, in the same order, for each vertex.
           GeomVertexWriter weight(this, InternalName::get_transform_weight());
           GeomVertexReader from(source, InternalName::get_transform_blend());
-        
+
           while (!from.is_at_end()) {
             const TransformBlend &blend = blend_table->get_blend(from.get_data1i());
             LVecBase4 weights = LVecBase4::zero();
-            
+
             for (int i = 0; i < blend.get_num_transforms(); i++) {
               int index = add_transform(transform_table, blend.get_transform(i),
                                         already_added);
@@ -733,7 +733,7 @@ copy_from(const GeomVertexData *source, bool keep_data_objects,
             }
           }
         }
-        
+
         clear_transform_blend_table();
         set_transform_table(TransformTable::register_table(transform_table));
       }
@@ -754,7 +754,7 @@ copy_from(const GeomVertexData *source, bool keep_data_objects,
 //               have recently made in an upstream thread.
 ////////////////////////////////////////////////////////////////////
 void GeomVertexData::
-copy_row_from(int dest_row, const GeomVertexData *source, 
+copy_row_from(int dest_row, const GeomVertexData *source,
               int source_row, Thread *current_thread) {
   const GeomVertexFormat *source_format = source->get_format();
   const GeomVertexFormat *dest_format = get_format();
@@ -842,7 +842,7 @@ convert_to(const GeomVertexFormat *new_format) const {
   }
   PStatTimer timer(_convert_pcollector);
 
-  PT(GeomVertexData) new_data = 
+  PT(GeomVertexData) new_data =
     new GeomVertexData(get_name(), new_format, get_usage_hint());
   new_data->set_transform_blend_table(get_transform_blend_table());
   new_data->set_slider_table(get_slider_table());
@@ -852,7 +852,12 @@ convert_to(const GeomVertexFormat *new_format) const {
   // Record the new result in the cache.
   if (entry == (CacheEntry *)NULL) {
     // Create a new entry for the result.
-    entry = new CacheEntry((GeomVertexData *)this, new_format);
+#ifdef USE_MOVE_SEMANTICS
+    // We don't need the key anymore, move the pointers into the CacheEntry.
+    entry = new CacheEntry((GeomVertexData *)this, move(key));
+#else
+    entry = new CacheEntry((GeomVertexData *)this, key);
+#endif
     {
       LightMutexHolder holder(_cache_lock);
       bool inserted = ((GeomVertexData *)this)->_cache.insert(Cache::value_type(&entry->_key, entry)).second;
@@ -862,7 +867,7 @@ convert_to(const GeomVertexFormat *new_format) const {
         return new_data;
       }
     }
-    
+
     // And tell the cache manager about the new entry.  (It might
     // immediately request a delete from the cache of the thing we
     // just added.)
@@ -876,7 +881,6 @@ convert_to(const GeomVertexFormat *new_format) const {
   return new_data;
 }
 
-
 ////////////////////////////////////////////////////////////////////
 //     Function: GeomVertexData::scale_color
 //       Access: Published
@@ -888,7 +892,7 @@ convert_to(const GeomVertexFormat *new_format) const {
 ////////////////////////////////////////////////////////////////////
 CPT(GeomVertexData) GeomVertexData::
 scale_color(const LVecBase4 &color_scale) const {
-  const GeomVertexColumn *old_column = 
+  const GeomVertexColumn *old_column =
     get_format()->get_column(InternalName::get_color());
   if (old_column == (GeomVertexColumn *)NULL) {
     return this;
@@ -965,7 +969,7 @@ scale_color(const LVecBase4 &color_scale, int num_components,
 ////////////////////////////////////////////////////////////////////
 CPT(GeomVertexData) GeomVertexData::
 set_color(const LColor &color) const {
-  const GeomVertexColumn *old_column = 
+  const GeomVertexColumn *old_column =
     get_format()->get_column(InternalName::get_color());
   if (old_column == (GeomVertexColumn *)NULL) {
     return this;
@@ -1026,7 +1030,7 @@ set_color(const LColor &color, int num_components,
 ////////////////////////////////////////////////////////////////////
 CPT(GeomVertexData) GeomVertexData::
 reverse_normals() const {
-  const GeomVertexColumn *old_column = 
+  const GeomVertexColumn *old_column =
     get_format()->get_column(InternalName::get_normal());
   if (old_column == (GeomVertexColumn *)NULL) {
     return this;
@@ -1094,16 +1098,16 @@ animate_vertices(bool force, Thread *current_thread) const {
     PStatTimer timer2(((GeomVertexData *)this)->_blends_pcollector, current_thread);
     if (!cdata->_transform_blend_table.is_null()) {
       if (cdata->_slider_table != (SliderTable *)NULL) {
-        modified = 
+        modified =
           max(cdata->_transform_blend_table.get_read_pointer()->get_modified(current_thread),
               cdata->_slider_table->get_modified(current_thread));
       } else {
         modified = cdata->_transform_blend_table.get_read_pointer()->get_modified(current_thread);
       }
-      
+
     } else if (cdata->_slider_table != (SliderTable *)NULL) {
       modified = cdata->_slider_table->get_modified(current_thread);
-      
+
     } else {
       // No transform blend table or slider table--ergo, no vertex
       // animation.
@@ -1185,7 +1189,7 @@ transform_vertices(const LMatrix4 &mat, int begin_row, int end_row) {
     GeomVertexRewriter data(this, format->get_point(ci));
     do_transform_point_column(format, data, mat, begin_row, end_row);
   }
-  
+
   for (ci = 0; ci < format->get_num_vectors(); ci++) {
     GeomVertexRewriter data(this, format->get_vector(ci));
     do_transform_vector_column(format, data, mat, begin_row, end_row);
@@ -1208,7 +1212,7 @@ bytewise_copy(unsigned char *to, int to_stride,
       << ", " << (const void *)from << ", " << from_stride
       << ", " << *from_type << ", " << num_records << ")\n";
   }
-  if (to_stride == from_type->get_total_bytes() && 
+  if (to_stride == from_type->get_total_bytes() &&
       from_stride == from_type->get_total_bytes()) {
     // Fantastic!  It's just a linear array of this one data type.
     // Copy the whole thing all at once.
@@ -1257,32 +1261,32 @@ replace_column(InternalName *name, int num_components,
       // just drop the whole array.
       new_format->remove_array(old_type_array);
       removed_type_array = true;
-      
+
     } else {
       // Remove the description for the type, but don't bother to
       // repack the array.
       array_format->remove_column(name);
     }
   }
-    
+
   // Now define a new array to contain just the type.
   int new_type_array = -1;
   if (num_components != 0) {
-    PT(GeomVertexArrayFormat) type_array_format = 
+    PT(GeomVertexArrayFormat) type_array_format =
       new GeomVertexArrayFormat(name, num_components, numeric_type, contents);
     new_type_array = new_format->add_array(type_array_format);
   }
 
-  CPT(GeomVertexFormat) format = 
+  CPT(GeomVertexFormat) format =
     GeomVertexFormat::register_format(new_format);
 
   if (gobj_cat.is_debug()) {
     gobj_cat.debug()
       << "Replacing data type " << *name << "; converting "
-      << get_num_rows() << " rows from " 
+      << get_num_rows() << " rows from "
       << *cdata->_format << " to " << *format << "\n";
   }
-  
+
   PT(GeomVertexData) new_data = new GeomVertexData(*this, format);
 
   int j = 0;
@@ -1320,7 +1324,7 @@ replace_column(InternalName *name, int num_components,
 ////////////////////////////////////////////////////////////////////
 //     Function: GeomVertexData::output
 //       Access: Published
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 void GeomVertexData::
 output(ostream &out) const {
@@ -1333,7 +1337,7 @@ output(ostream &out) const {
 ////////////////////////////////////////////////////////////////////
 //     Function: GeomVertexData::write
 //       Access: Published
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 void GeomVertexData::
 write(ostream &out, int indent_level) const {
@@ -1369,16 +1373,16 @@ describe_vertex(ostream &out, int row) const {
   if (format->get_animation().get_animation_type() == AT_panda) {
     tb_table = get_transform_blend_table();
   }
-  
+
   int num_columns = format->get_num_columns();
   for (int ci = 0; ci < num_columns; ++ci) {
     int ai = format->get_array_with(ci);
     const GeomVertexColumn *column = format->get_column(ci);
     reader.set_column(ai, column);
-    
+
     int num_values = min(column->get_num_values(), 4);
     const LVecBase4 &d = reader.get_data4();
-    
+
     out << "  " << *column->get_name();
     for (int v = 0; v < num_values; v++) {
       out << " " << d[v];
@@ -1545,7 +1549,7 @@ update_animated_vertices(GeomVertexData::CData *cdata, Thread *current_thread) {
 
   if (cdata->_animated_vertices == (GeomVertexData *)NULL) {
     new_format = orig_format->get_post_animated_format();
-    cdata->_animated_vertices = 
+    cdata->_animated_vertices =
       new GeomVertexData(get_name(), new_format,
                          min(get_usage_hint(), UH_dynamic));
   }
@@ -1670,7 +1674,7 @@ update_animated_vertices(GeomVertexData::CData *cdata, Thread *current_thread) {
 
     CPT(GeomVertexArrayFormat) blend_array_format = orig_format->get_array(blend_array_index);
 
-    if (blend_array_format->get_stride() == 2 && 
+    if (blend_array_format->get_stride() == 2 &&
         blend_array_format->get_column(0)->get_component_bytes() == 2) {
       // The blend indices are a table of ushorts.  Optimize this
       // common case.
@@ -1688,11 +1692,11 @@ update_animated_vertices(GeomVertexData::CData *cdata, Thread *current_thread) {
 
           int first_vertex = begin;
           int first_bi = blendt[first_vertex];
-          
+
           while (first_vertex < end) {
             // At this point, first_vertex is the first of a series of
             // vertices that shares the blend index first_bi.
-            
+
             // Scan for the end of this series of vertices--we're
             // looking for the next vertex with a different blend index.
             int next_vertex = first_vertex;
@@ -1705,13 +1709,13 @@ update_animated_vertices(GeomVertexData::CData *cdata, Thread *current_thread) {
               }
               ++next_vertex;
             }
-            
+
             // We've just reached the end of the vertices with a matching
             // blend index.  Transform all those vertices as a block.
             LMatrix4 mat;
             tb_table->get_blend(first_bi).get_blend(mat, current_thread);
             new_data->do_transform_point_column(new_format, data, mat, first_vertex, next_vertex);
-            
+
             first_vertex = next_vertex;
             first_bi = next_bi;
           }
@@ -1728,11 +1732,11 @@ update_animated_vertices(GeomVertexData::CData *cdata, Thread *current_thread) {
 
           int first_vertex = begin;
           int first_bi = blendt[first_vertex];
-          
+
           while (first_vertex < end) {
             // At this point, first_vertex is the first of a series of
             // vertices that shares the blend index first_bi.
-            
+
             // Scan for the end of this series of vertices--we're
             // looking for the next vertex with a different blend index.
             int next_vertex = first_vertex;
@@ -1745,13 +1749,13 @@ update_animated_vertices(GeomVertexData::CData *cdata, Thread *current_thread) {
               }
               ++next_vertex;
             }
-            
+
             // We've just reached the end of the vertices with a matching
             // blend index.  Transform all those vertices as a block.
             LMatrix4 mat;
             tb_table->get_blend(first_bi).get_blend(mat, current_thread);
             new_data->do_transform_vector_column(new_format, data, mat, first_vertex, next_vertex);
-            
+
             first_vertex = next_vertex;
             first_bi = next_bi;
           }
@@ -1773,14 +1777,14 @@ update_animated_vertices(GeomVertexData::CData *cdata, Thread *current_thread) {
           int end = rows.get_subrange_end(i);
           nassertv(begin < end);
           blendi.set_row_unsafe(begin);
-          
+
           int first_vertex = begin;
           int first_bi = blendi.get_data1i();
-          
+
           while (first_vertex < end) {
             // At this point, first_vertex is the first of a series of
             // vertices that shares the blend index first_bi.
-            
+
             // Scan for the end of this series of vertices--we're
             // looking for the next vertex with a different blend index.
             int next_vertex = first_vertex;
@@ -1793,13 +1797,13 @@ update_animated_vertices(GeomVertexData::CData *cdata, Thread *current_thread) {
               }
               ++next_vertex;
             }
-            
+
             // We've just reached the end of the vertices with a matching
             // blend index.  Transform all those vertices as a block.
             LMatrix4 mat;
             tb_table->get_blend(first_bi).get_blend(mat, current_thread);
             new_data->do_transform_point_column(new_format, data, mat, first_vertex, next_vertex);
-            
+
             first_vertex = next_vertex;
             first_bi = next_bi;
           }
@@ -1814,14 +1818,14 @@ update_animated_vertices(GeomVertexData::CData *cdata, Thread *current_thread) {
           int end = rows.get_subrange_end(i);
           nassertv(begin != end);
           blendi.set_row_unsafe(begin);
-          
+
           int first_vertex = begin;
           int first_bi = blendi.get_data1i();
-          
+
           while (first_vertex < end) {
             // At this point, first_vertex is the first of a series of
             // vertices that shares the blend index first_bi.
-            
+
             // Scan for the end of this series of vertices--we're
             // looking for the next vertex with a different blend index.
             int next_vertex = first_vertex;
@@ -1834,13 +1838,13 @@ update_animated_vertices(GeomVertexData::CData *cdata, Thread *current_thread) {
               }
               ++next_vertex;
             }
-            
+
             // We've just reached the end of the vertices with a matching
             // blend index.  Transform all those vertices as a block.
             LMatrix4 mat;
             tb_table->get_blend(first_bi).get_blend(mat, current_thread);
             new_data->do_transform_vector_column(new_format, data, mat, first_vertex, next_vertex);
-            
+
             first_vertex = next_vertex;
             first_bi = next_bi;
           }
@@ -1880,11 +1884,11 @@ do_transform_point_column(const GeomVertexFormat *format, GeomVertexRewriter &da
     } else {
       table_xform_vecbase4f(datat, num_rows, stride, matf);
     }
-    
+
   } else if (num_values == 4) {
     // Use the GeomVertexRewriter to adjust the 4-component
     // points.
-  
+
     data.set_row_unsafe(begin_row);
     for (int j = begin_row; j < end_row; ++j) {
       LPoint4 vertex = data.get_data4();
@@ -2110,7 +2114,7 @@ finalize(BamReader *manager) {
   CDWriter cdata(_cycler, true);
 
   for (size_t i = 0; i < cdata->_arrays.size(); ++i) {
-    CPT(GeomVertexFormat) new_format = 
+    CPT(GeomVertexFormat) new_format =
       GeomVertexFormat::register_format(cdata->_format);
     manager->change_pointer(cdata->_format, new_format);
     cdata->_format = new_format;
@@ -2124,14 +2128,14 @@ finalize(BamReader *manager) {
   }
 
   if (cdata->_transform_table != (TransformTable *)NULL) {
-    CPT(TransformTable) new_transform_table = 
+    CPT(TransformTable) new_transform_table =
       TransformTable::register_table(cdata->_transform_table);
     manager->change_pointer(cdata->_transform_table, new_transform_table);
     cdata->_transform_table = new_transform_table;
   }
 
   if (cdata->_slider_table != (SliderTable *)NULL) {
-    CPT(SliderTable) new_slider_table = 
+    CPT(SliderTable) new_slider_table =
       SliderTable::register_table(cdata->_slider_table);
     manager->change_pointer(cdata->_slider_table, new_slider_table);
     cdata->_slider_table = new_slider_table;
@@ -2181,11 +2185,11 @@ evict_callback() {
 ////////////////////////////////////////////////////////////////////
 //     Function: GeomVertexData::CacheEntry::output
 //       Access: Public, Virtual
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 void GeomVertexData::CacheEntry::
 output(ostream &out) const {
-  out << "vertex data " << (void *)_source << " to " 
+  out << "vertex data " << (void *)_source << " to "
       << *_key._modifier;
 }
 
@@ -2236,7 +2240,7 @@ complete_pointers(TypedWritable **p_list, BamReader *manager) {
 
   Arrays::iterator ai;
   for (ai = _arrays.begin(); ai != _arrays.end(); ++ai) {
-    (*ai) = DCAST(GeomVertexArrayData, p_list[pi++]);    
+    (*ai) = DCAST(GeomVertexArrayData, p_list[pi++]);
   }
 
   _transform_table = DCAST(TransformTable, p_list[pi++]);
@@ -2295,7 +2299,7 @@ fillin(DatagramIterator &scan, BamReader *manager) {
 ////////////////////////////////////////////////////////////////////
 //     Function: GeomVertexDataPipelineBase::get_num_bytes
 //       Access: Public
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 int GeomVertexDataPipelineBase::
 get_num_bytes() const {
@@ -2312,7 +2316,7 @@ get_num_bytes() const {
 ////////////////////////////////////////////////////////////////////
 //     Function: GeomVertexDataPipelineReader::get_num_rows
 //       Access: Published
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 int GeomVertexDataPipelineReader::
 get_num_rows() const {
@@ -2332,13 +2336,13 @@ get_num_rows() const {
 ////////////////////////////////////////////////////////////////////
 //     Function: GeomVertexDataPipelineReader::get_array_info
 //       Access: Public
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 bool GeomVertexDataPipelineReader::
-get_array_info(const InternalName *name, 
+get_array_info(const InternalName *name,
                const GeomVertexArrayDataHandle *&array_reader,
-               int &num_values, 
-               GeomVertexDataPipelineReader::NumericType &numeric_type, 
+               int &num_values,
+               GeomVertexDataPipelineReader::NumericType &numeric_type,
                int &start, int &stride) const {
   nassertr(_got_array_readers, false);
   int array_index;
@@ -2354,15 +2358,44 @@ get_array_info(const InternalName *name,
   return false;
 }
 
+////////////////////////////////////////////////////////////////////
+//     Function: GeomVertexDataPipelineReader::get_array_info
+//       Access: Public
+//  Description:
+////////////////////////////////////////////////////////////////////
+bool GeomVertexDataPipelineReader::
+get_array_info(const InternalName *name,
+               const GeomVertexArrayDataHandle *&array_reader,
+               int &num_values,
+               GeomVertexDataPipelineReader::NumericType &numeric_type,
+               int &start, int &stride, int &divisor,
+               int &num_elements, int &element_stride) const {
+  nassertr(_got_array_readers, false);
+  int array_index;
+  const GeomVertexColumn *column;
+  if (_cdata->_format->get_array_info(name, array_index, column)) {
+    array_reader = _array_readers[array_index];
+    num_values = column->get_num_values();
+    numeric_type = column->get_numeric_type();
+    start = column->get_start();
+    stride = _cdata->_format->get_array(array_index)->get_stride();
+    divisor = _cdata->_format->get_array(array_index)->get_divisor();
+    num_elements = column->get_num_elements();
+    element_stride = column->get_element_stride();
+    return true;
+  }
+  return false;
+}
+
 ////////////////////////////////////////////////////////////////////
 //     Function: GeomVertexDataPipelineReader::get_vertex_info
 //       Access: Public
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 bool GeomVertexDataPipelineReader::
 get_vertex_info(const GeomVertexArrayDataHandle *&array_reader,
-                int &num_values, 
-                GeomVertexDataPipelineReader::NumericType &numeric_type, 
+                int &num_values,
+                GeomVertexDataPipelineReader::NumericType &numeric_type,
                 int &start, int &stride) const {
   nassertr(_got_array_readers, false);
   int array_index = _cdata->_format->get_vertex_array_index();
@@ -2382,11 +2415,11 @@ get_vertex_info(const GeomVertexArrayDataHandle *&array_reader,
 ////////////////////////////////////////////////////////////////////
 //     Function: GeomVertexDataPipelineReader::get_normal_info
 //       Access: Public
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 bool GeomVertexDataPipelineReader::
 get_normal_info(const GeomVertexArrayDataHandle *&array_reader,
-                GeomVertexDataPipelineReader::NumericType &numeric_type, 
+                GeomVertexDataPipelineReader::NumericType &numeric_type,
                 int &start, int &stride) const {
   nassertr(_got_array_readers, false);
   int array_index = _cdata->_format->get_normal_array_index();
@@ -2405,12 +2438,12 @@ get_normal_info(const GeomVertexArrayDataHandle *&array_reader,
 ////////////////////////////////////////////////////////////////////
 //     Function: GeomVertexDataPipelineReader::get_color_info
 //       Access: Public
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 bool GeomVertexDataPipelineReader::
 get_color_info(const GeomVertexArrayDataHandle *&array_reader,
-               int &num_values, 
-               GeomVertexDataPipelineReader::NumericType &numeric_type, 
+               int &num_values,
+               GeomVertexDataPipelineReader::NumericType &numeric_type,
                int &start, int &stride) const {
   nassertr(_got_array_readers, false);
   int array_index = _cdata->_format->get_color_array_index();
@@ -2430,7 +2463,7 @@ get_color_info(const GeomVertexArrayDataHandle *&array_reader,
 ////////////////////////////////////////////////////////////////////
 //     Function: GeomVertexDataPipelineReader::make_array_readers
 //       Access: Private
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 void GeomVertexDataPipelineReader::
 make_array_readers() {
@@ -2449,7 +2482,7 @@ make_array_readers() {
 ////////////////////////////////////////////////////////////////////
 //     Function: GeomVertexDataPipelineReader::delete_array_readers
 //       Access: Private
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 void GeomVertexDataPipelineReader::
 delete_array_readers() {
@@ -2462,7 +2495,7 @@ delete_array_readers() {
 ////////////////////////////////////////////////////////////////////
 //     Function: GeomVertexDataPipelineWriter::get_num_rows
 //       Access: Published
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 int GeomVertexDataPipelineWriter::
 get_num_rows() const {
@@ -2482,7 +2515,7 @@ get_num_rows() const {
 ////////////////////////////////////////////////////////////////////
 //     Function: GeomVertexDataPipelineWriter::set_num_rows
 //       Access: Public
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 bool GeomVertexDataPipelineWriter::
 set_num_rows(int n) {
@@ -2510,10 +2543,10 @@ set_num_rows(int n) {
     // (1, 1, 1, 1), for the programmer's convenience.
     GeomVertexArrayDataHandle *array_writer = _array_writers[color_array];
     const GeomVertexArrayFormat *array_format = array_writer->get_array_format();
-    const GeomVertexColumn *column = 
+    const GeomVertexColumn *column =
       array_format->get_column(InternalName::get_color());
     int stride = array_format->get_stride();
-    unsigned char *start = 
+    unsigned char *start =
       array_writer->get_write_pointer() + column->get_start();
     unsigned char *stop = start + array_writer->get_data_size_bytes();
     unsigned char *pointer = start + stride * orig_color_rows;
@@ -2554,7 +2587,7 @@ set_num_rows(int n) {
     case NT_stdfloat:
       // Shouldn't have this type in the format.
       nassertr(false, false);
-    }          
+    }
   }
 
   if (any_changed) {
@@ -2569,7 +2602,7 @@ set_num_rows(int n) {
 ////////////////////////////////////////////////////////////////////
 //     Function: GeomVertexDataPipelineWriter::unclean_set_num_rows
 //       Access: Public
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 bool GeomVertexDataPipelineWriter::
 unclean_set_num_rows(int n) {
@@ -2598,7 +2631,7 @@ unclean_set_num_rows(int n) {
 ////////////////////////////////////////////////////////////////////
 //     Function: GeomVertexDataPipelineWriter::reserve_num_rows
 //       Access: Public
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 bool GeomVertexDataPipelineWriter::
 reserve_num_rows(int n) {
@@ -2619,7 +2652,7 @@ reserve_num_rows(int n) {
 ////////////////////////////////////////////////////////////////////
 //     Function: GeomVertexDataPipelineWriter::modify_array
 //       Access: Public
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 PT(GeomVertexArrayData) GeomVertexDataPipelineWriter::
 modify_array(int i) {
@@ -2642,7 +2675,7 @@ modify_array(int i) {
 ////////////////////////////////////////////////////////////////////
 //     Function: GeomVertexDataPipelineWriter::set_array
 //       Access: Public
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 void GeomVertexDataPipelineWriter::
 set_array(int i, const GeomVertexArrayData *array) {
@@ -2660,7 +2693,7 @@ set_array(int i, const GeomVertexArrayData *array) {
 ////////////////////////////////////////////////////////////////////
 //     Function: GeomVertexDataPipelineWriter::make_array_writers
 //       Access: Private
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 void GeomVertexDataPipelineWriter::
 make_array_writers() {
@@ -2683,7 +2716,7 @@ make_array_writers() {
 ////////////////////////////////////////////////////////////////////
 //     Function: GeomVertexDataPipelineWriter::delete_array_writers
 //       Access: Private
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 void GeomVertexDataPipelineWriter::
 delete_array_writers() {
diff --git a/panda/src/gobj/geomVertexData.h b/panda/src/gobj/geomVertexData.h
index 152446878d..9bcdd7daec 100644
--- a/panda/src/gobj/geomVertexData.h
+++ b/panda/src/gobj/geomVertexData.h
@@ -78,10 +78,10 @@ private:
   GeomVertexData();
 protected:
   virtual PT(CopyOnWriteObject) make_cow_copy();
-  
+
 PUBLISHED:
   GeomVertexData(const string &name,
-                 const GeomVertexFormat *format, 
+                 const GeomVertexFormat *format,
                  UsageHint usage_hint);
   GeomVertexData(const GeomVertexData &copy);
   GeomVertexData(const GeomVertexData &copy,
@@ -136,17 +136,17 @@ PUBLISHED:
 
   void copy_from(const GeomVertexData *source, bool keep_data_objects,
                  Thread *current_thread = Thread::get_current_thread());
-  void copy_row_from(int dest_row, const GeomVertexData *source, 
+  void copy_row_from(int dest_row, const GeomVertexData *source,
                      int source_row, Thread *current_thread);
   CPT(GeomVertexData) convert_to(const GeomVertexFormat *new_format) const;
-  CPT(GeomVertexData) 
+  CPT(GeomVertexData)
     scale_color(const LVecBase4 &color_scale) const;
-  CPT(GeomVertexData) 
+  CPT(GeomVertexData)
     scale_color(const LVecBase4 &color_scale, int num_components,
                 NumericType numeric_type, Contents contents) const;
-  CPT(GeomVertexData) 
+  CPT(GeomVertexData)
     set_color(const LColor &color) const;
-  CPT(GeomVertexData) 
+  CPT(GeomVertexData)
     set_color(const LColor &color, int num_components,
               NumericType numeric_type, Contents contents) const;
 
@@ -157,7 +157,7 @@ PUBLISHED:
   void transform_vertices(const LMatrix4 &mat);
   void transform_vertices(const LMatrix4 &mat, int begin_row, int end_row);
 
-  PT(GeomVertexData) 
+  PT(GeomVertexData)
     replace_column(InternalName *name, int num_components,
                    NumericType numeric_type, Contents contents) const;
 
@@ -191,7 +191,7 @@ private:
                             int num_records);
 
   typedef pmap<const VertexTransform *, int> TransformMap;
-  INLINE static int 
+  INLINE static int
   add_transform(TransformTable *table, const VertexTransform *transform,
                 TransformMap &already_added);
 
@@ -212,7 +212,7 @@ private:
     }
 
     CPT(GeomVertexData) _result;
-    
+
   public:
     static TypeHandle get_class_type() {
       return _type_handle;
@@ -220,7 +220,7 @@ private:
     static void init_type() {
       register_type(_type_handle, "GeomVertexData::CDataCache");
     }
-    
+
   private:
     static TypeHandle _type_handle;
   };
@@ -236,15 +236,24 @@ public:
   class EXPCL_PANDA_GOBJ CacheKey {
   public:
     INLINE CacheKey(const GeomVertexFormat *modifier);
+    INLINE CacheKey(const CacheKey &copy);
+#ifdef USE_MOVE_SEMANTICS
+    INLINE CacheKey(CacheKey &&from) NOEXCEPT;
+#endif
+
     INLINE bool operator < (const CacheKey &other) const;
 
     CPT(GeomVertexFormat) _modifier;
   };
-  // It is not clear why MSVC7 needs this class to be public.  
+  // It is not clear why MSVC7 needs this class to be public.
   class EXPCL_PANDA_GOBJ CacheEntry : public GeomCacheEntry {
   public:
     INLINE CacheEntry(GeomVertexData *source,
                       const GeomVertexFormat *modifier);
+    INLINE CacheEntry(GeomVertexData *source, const CacheKey &key);
+#ifdef USE_MOVE_SEMANTICS
+    INLINE CacheEntry(GeomVertexData *source, CacheKey &&key) NOEXCEPT;
+#endif
     ALLOC_DELETED_CHAIN(CacheEntry);
 
     virtual void evict_callback();
@@ -254,7 +263,7 @@ public:
     CacheKey _key;
 
     PipelineCycler<CDataCache> _cycler;
-    
+
   public:
     static TypeHandle get_class_type() {
       return _type_handle;
@@ -264,7 +273,7 @@ public:
       register_type(_type_handle, "GeomVertexData::CacheEntry",
                     GeomCacheEntry::get_class_type());
     }
-    
+
   private:
     static TypeHandle _type_handle;
   };
@@ -294,7 +303,7 @@ private:
     PT(GeomVertexData) _animated_vertices;
     UpdateSeq _animated_vertices_modified;
     UpdateSeq _modified;
-    
+
   public:
     static TypeHandle get_class_type() {
       return _type_handle;
@@ -302,7 +311,7 @@ private:
     static void init_type() {
       register_type(_type_handle, "GeomVertexData::CData");
     }
-    
+
   private:
     static TypeHandle _type_handle;
   };
@@ -323,11 +332,11 @@ private:
                                  const LMatrix4 &mat, int begin_row, int end_row);
   void do_transform_vector_column(const GeomVertexFormat *format, GeomVertexRewriter &data,
                                   const LMatrix4 &mat, int begin_row, int end_row);
-  static void table_xform_point3f(unsigned char *datat, size_t num_rows, 
+  static void table_xform_point3f(unsigned char *datat, size_t num_rows,
                                   size_t stride, const LMatrix4f &matf);
-  static void table_xform_vector3f(unsigned char *datat, size_t num_rows, 
+  static void table_xform_vector3f(unsigned char *datat, size_t num_rows,
                                    size_t stride, const LMatrix4f &matf);
-  static void table_xform_vecbase4f(unsigned char *datat, size_t num_rows, 
+  static void table_xform_vecbase4f(unsigned char *datat, size_t num_rows,
                                     size_t stride, const LMatrix4f &matf);
 
   static PStatCollector _convert_pcollector;
@@ -386,7 +395,7 @@ private:
 ////////////////////////////////////////////////////////////////////
 class EXPCL_PANDA_GOBJ GeomVertexDataPipelineBase : public GeomEnums {
 protected:
-  INLINE GeomVertexDataPipelineBase(GeomVertexData *object, 
+  INLINE GeomVertexDataPipelineBase(GeomVertexData *object,
                                     Thread *current_thread,
                                     GeomVertexData::CData *cdata);
 
@@ -436,15 +445,21 @@ public:
   INLINE const GeomVertexArrayDataHandle *get_array_reader(int i) const;
   int get_num_rows() const;
 
-  bool get_array_info(const InternalName *name, 
+  bool get_array_info(const InternalName *name,
                       const GeomVertexArrayDataHandle *&array_reader,
-                      int &num_values, NumericType &numeric_type, 
+                      int &num_values, NumericType &numeric_type,
                       int &start, int &stride) const;
 
+  bool get_array_info(const InternalName *name,
+                      const GeomVertexArrayDataHandle *&array_reader,
+                      int &num_values, NumericType &numeric_type,
+                      int &start, int &stride, int &divisor,
+                      int &num_elements, int &element_stride) const;
+
   INLINE bool has_vertex() const;
   INLINE bool is_vertex_transformed() const;
   bool get_vertex_info(const GeomVertexArrayDataHandle *&array_reader,
-                       int &num_values, NumericType &numeric_type, 
+                       int &num_values, NumericType &numeric_type,
                        int &start, int &stride) const;
 
   INLINE bool has_normal() const;
@@ -454,7 +469,7 @@ public:
 
   INLINE bool has_color() const;
   bool get_color_info(const GeomVertexArrayDataHandle *&array_reader,
-                      int &num_values, NumericType &numeric_type, 
+                      int &num_values, NumericType &numeric_type,
                       int &start, int &stride) const;
 
 private:
diff --git a/panda/src/gobj/geomVertexFormat.I b/panda/src/gobj/geomVertexFormat.I
index 1c6012fb2b..0026fae224 100644
--- a/panda/src/gobj/geomVertexFormat.I
+++ b/panda/src/gobj/geomVertexFormat.I
@@ -236,7 +236,7 @@ get_texcoord(int n) const {
 INLINE int GeomVertexFormat::
 get_num_morphs() const {
   nassertr(_is_registered, 0);
-  
+
   return _morphs.size();
 }
 
diff --git a/panda/src/gobj/geomVertexFormat.cxx b/panda/src/gobj/geomVertexFormat.cxx
index 610f06c70d..b0fd53515c 100644
--- a/panda/src/gobj/geomVertexFormat.cxx
+++ b/panda/src/gobj/geomVertexFormat.cxx
@@ -26,7 +26,7 @@ TypeHandle GeomVertexFormat::_type_handle;
 ////////////////////////////////////////////////////////////////////
 //     Function: GeomVertexFormat::Constructor
 //       Access: Published
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 GeomVertexFormat::
 GeomVertexFormat() :
@@ -38,7 +38,7 @@ GeomVertexFormat() :
 ////////////////////////////////////////////////////////////////////
 //     Function: GeomVertexFormat::Constructor
 //       Access: Published
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 GeomVertexFormat::
 GeomVertexFormat(const GeomVertexArrayFormat *array_format) :
@@ -51,7 +51,7 @@ GeomVertexFormat(const GeomVertexArrayFormat *array_format) :
 ////////////////////////////////////////////////////////////////////
 //     Function: GeomVertexFormat::Copy Constructor
 //       Access: Published
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 GeomVertexFormat::
 GeomVertexFormat(const GeomVertexFormat &copy) :
@@ -65,7 +65,7 @@ GeomVertexFormat(const GeomVertexFormat &copy) :
 ////////////////////////////////////////////////////////////////////
 //     Function: GeomVertexFormat::Copy Assignment Operator
 //       Access: Published
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 void GeomVertexFormat::
 operator = (const GeomVertexFormat &copy) {
@@ -78,7 +78,7 @@ operator = (const GeomVertexFormat &copy) {
 ////////////////////////////////////////////////////////////////////
 //     Function: GeomVertexFormat::Destructor
 //       Access: Published, Virtual
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 GeomVertexFormat::
 ~GeomVertexFormat() {
@@ -109,7 +109,6 @@ unref() const {
   return false;
 }
 
-
 ////////////////////////////////////////////////////////////////////
 //     Function: GeomVertexFormat::get_post_animated_format
 //       Access: Published
@@ -129,7 +128,7 @@ get_post_animated_format() const {
   if (_post_animated_format == (GeomVertexFormat *)NULL) {
     PT(GeomVertexFormat) new_format = new GeomVertexFormat(*this);
     new_format->remove_column(InternalName::get_transform_blend());
-    
+
     int num_morphs = get_num_morphs();
     for (int mi = 0; mi < num_morphs; mi++) {
       CPT(InternalName) delta_name = get_morph_delta(mi);
@@ -138,7 +137,7 @@ get_post_animated_format() const {
 
     new_format->_animation.set_none();
 
-    CPT(GeomVertexFormat) registered = 
+    CPT(GeomVertexFormat) registered =
       GeomVertexFormat::register_format(new_format);
     ((GeomVertexFormat *)this)->_post_animated_format = registered;
     if (_post_animated_format != this) {
@@ -215,13 +214,13 @@ get_union_format(const GeomVertexFormat *other) const {
           if (column_b != (GeomVertexColumn *)NULL &&
               column_b->get_total_bytes() > column_a->get_total_bytes()) {
             // Column b is larger.  Keep it.
-            new_array->add_column(column_b->get_name(), 
+            new_array->add_column(column_b->get_name(),
                                   column_b->get_num_components(),
                                   column_b->get_numeric_type(),
                                   column_b->get_contents());
           } else {
             // Column a is larger.  Keep it.
-            new_array->add_column(column_a->get_name(), 
+            new_array->add_column(column_a->get_name(),
                                   column_a->get_num_components(),
                                   column_a->get_numeric_type(),
                                   column_a->get_contents());
@@ -242,13 +241,13 @@ get_union_format(const GeomVertexFormat *other) const {
           if (column_b != (GeomVertexColumn *)NULL &&
               column_b->get_total_bytes() > column_a->get_total_bytes()) {
             // Column b is larger.  Keep it.
-            new_array->add_column(column_b->get_name(), 
+            new_array->add_column(column_b->get_name(),
                                   column_b->get_num_components(),
                                   column_b->get_numeric_type(),
                                   column_b->get_contents());
           } else {
             // Column a is larger.  Keep it.
-            new_array->add_column(column_a->get_name(), 
+            new_array->add_column(column_a->get_name(),
                                   column_a->get_num_components(),
                                   column_a->get_numeric_type(),
                                   column_a->get_contents());
@@ -517,7 +516,7 @@ get_column(const InternalName *name) const {
     if (ai != _columns_by_name.end()) {
       int array_index = (*ai).second._array_index;
       int column_index = (*ai).second._column_index;
-      
+
       nassertr(array_index >= 0 && array_index < (int)_arrays.size(), NULL);
       return _arrays[array_index]->get_column(column_index);
     }
@@ -628,7 +627,7 @@ maybe_align_columns_for_animation() {
 ////////////////////////////////////////////////////////////////////
 //     Function: GeomVertexFormat::output
 //       Access: Published
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 void GeomVertexFormat::
 output(ostream &out) const {
@@ -654,7 +653,7 @@ output(ostream &out) const {
 ////////////////////////////////////////////////////////////////////
 //     Function: GeomVertexFormat::write
 //       Access: Published
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 void GeomVertexFormat::
 write(ostream &out, int indent_level) const {
@@ -673,10 +672,10 @@ write(ostream &out, int indent_level) const {
 ////////////////////////////////////////////////////////////////////
 //     Function: GeomVertexFormat::write_with_data
 //       Access: Published
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 void GeomVertexFormat::
-write_with_data(ostream &out, int indent_level, 
+write_with_data(ostream &out, int indent_level,
                 const GeomVertexData *data) const {
   indent(out, indent_level)
     << data->get_num_rows() << " rows.\n";
@@ -725,7 +724,7 @@ get_array_info(const InternalName *name, int &array_index,
 ////////////////////////////////////////////////////////////////////
 //     Function: GeomVertexFormat::compare_to
 //       Access: Public
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 int GeomVertexFormat::
 compare_to(const GeomVertexFormat &other) const {
@@ -760,7 +759,7 @@ make_registry() {
     _registry->make_standard_formats();
   }
 }
- 
+
 ////////////////////////////////////////////////////////////////////
 //     Function: GeomVertexFormat::do_register
 //       Access: Private
@@ -813,7 +812,7 @@ do_register() {
   // Go back through the index now and identify the points, vectors,
   // and morph descriptions, so we can quickly look these up later.
   DataTypesByName::iterator ni;
-  for (ni = _columns_by_name.begin(); 
+  for (ni = _columns_by_name.begin();
        ni != _columns_by_name.end();
        ++ni) {
     const DataTypeRecord &record = (*ni).second;
@@ -840,8 +839,8 @@ do_register() {
         // It's a morph description.
         MorphRecord morph;
         morph._delta = column->get_name();
-        
-        // The delta name must be of the form "basename.morph.slidername".  
+
+        // The delta name must be of the form "basename.morph.slidername".
         int n = morph._delta->find_ancestor("morph");
         if (n < 0) {
           gobj_cat.warning()
@@ -850,10 +849,10 @@ do_register() {
         } else {
           morph._slider = InternalName::make(morph._delta->get_net_basename(n - 1));
           morph._base = morph._delta->get_ancestor(n + 1);
-          
+
           if (_columns_by_name.find(morph._base) == _columns_by_name.end()) {
             gobj_cat.warning()
-              << "vertex format defines " 
+              << "vertex format defines "
               << *column->get_name() << " but does not define "
               << *morph._base << "\n";
           } else {
@@ -879,7 +878,7 @@ do_register() {
   get_array_info(InternalName::get_color(), _color_array_index,
                  _color_column);
 }
- 
+
 ////////////////////////////////////////////////////////////////////
 //     Function: GeomVertexFormat::do_unregister
 //       Access: Private
@@ -896,7 +895,7 @@ do_unregister() {
   _texcoords.clear();
   _morphs.clear();
 
-  if (_post_animated_format != (GeomVertexFormat *)NULL && 
+  if (_post_animated_format != (GeomVertexFormat *)NULL &&
       _post_animated_format != this) {
     unref_delete(_post_animated_format);
   }
@@ -997,7 +996,7 @@ fillin(DatagramIterator &scan, BamReader *manager) {
 ////////////////////////////////////////////////////////////////////
 //     Function: GeomVertexFormat::Registry::Constructor
 //       Access: Public
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 GeomVertexFormat::Registry::
 Registry() {
@@ -1006,32 +1005,32 @@ Registry() {
 ////////////////////////////////////////////////////////////////////
 //     Function: GeomVertexFormat::Registry::make_standard_formats
 //       Access: Public
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 void GeomVertexFormat::Registry::
 make_standard_formats() {
   _v3 = register_format(new GeomVertexArrayFormat
-                        (InternalName::get_vertex(), 3, 
+                        (InternalName::get_vertex(), 3,
                          NT_stdfloat, C_point));
 
   _v3n3 = register_format(new GeomVertexArrayFormat
-                          (InternalName::get_vertex(), 3, 
+                          (InternalName::get_vertex(), 3,
                            NT_stdfloat, C_point,
-                           InternalName::get_normal(), 3, 
+                           InternalName::get_normal(), 3,
                            NT_stdfloat, C_vector));
 
   _v3t2 = register_format(new GeomVertexArrayFormat
-                          (InternalName::get_vertex(), 3, 
+                          (InternalName::get_vertex(), 3,
                            NT_stdfloat, C_point,
-                           InternalName::get_texcoord(), 2, 
+                           InternalName::get_texcoord(), 2,
                            NT_stdfloat, C_texcoord));
 
   _v3n3t2 = register_format(new GeomVertexArrayFormat
-                            (InternalName::get_vertex(), 3, 
+                            (InternalName::get_vertex(), 3,
                              NT_stdfloat, C_point,
                              InternalName::get_normal(), 3,
                              NT_stdfloat, C_vector,
-                             InternalName::get_texcoord(), 2, 
+                             InternalName::get_texcoord(), 2,
                              NT_stdfloat, C_texcoord));
 
   // Define the DirectX-style packed color formats
diff --git a/panda/src/gobj/geomVertexFormat.h b/panda/src/gobj/geomVertexFormat.h
index aad2ae68a3..ba2faf2c36 100644
--- a/panda/src/gobj/geomVertexFormat.h
+++ b/panda/src/gobj/geomVertexFormat.h
@@ -58,7 +58,7 @@ class GeomMunger;
 //               standard and/or user-defined columns in your custom
 //               GeomVertexFormat constructions.
 ////////////////////////////////////////////////////////////////////
-class EXPCL_PANDA_GOBJ GeomVertexFormat : public TypedWritableReferenceCount, public GeomEnums {
+class EXPCL_PANDA_GOBJ GeomVertexFormat FINAL : public TypedWritableReferenceCount, public GeomEnums {
 PUBLISHED:
   GeomVertexFormat();
   GeomVertexFormat(const GeomVertexArrayFormat *array_format);
@@ -96,7 +96,7 @@ PUBLISHED:
   int get_array_with(const InternalName *name) const;
   const GeomVertexColumn *get_column(const InternalName *name) const;
   INLINE bool has_column(const InternalName *name) const;
-  
+
   MAKE_SEQ(get_columns, get_num_columns, get_column);
 
   void remove_column(const InternalName *name, bool keep_empty_array = false);
@@ -126,7 +126,7 @@ PUBLISHED:
 
   void output(ostream &out) const;
   void write(ostream &out, int indent_level = 0) const;
-  void write_with_data(ostream &out, int indent_level, 
+  void write_with_data(ostream &out, int indent_level,
                        const GeomVertexData *data) const;
 
   // Some standard vertex formats.  No particular requirement to use
@@ -138,10 +138,11 @@ PUBLISHED:
   INLINE static const GeomVertexFormat *get_v3t2();
   INLINE static const GeomVertexFormat *get_v3n3t2();
 
-  // These formats, with the DirectX-style packed color, are not
-  // supported directly by OpenGL.  If you use them, the
-  // GLGraphicsStateGuardian will automatically convert to OpenGL
-  // form (with a small runtime overhead).
+  // These formats, with the DirectX-style packed color, may not be
+  // supported directly by OpenGL.  If you use them and the driver
+  // does not support them, the GLGraphicsStateGuardian will
+  // automatically convert to native OpenGL form (with a small
+  // runtime overhead).
   INLINE static const GeomVertexFormat *get_v3cp();
   INLINE static const GeomVertexFormat *get_v3cpt2();
   INLINE static const GeomVertexFormat *get_v3n3cp();
@@ -202,16 +203,16 @@ private:
   int _color_array_index;
   const GeomVertexColumn *_color_column;
 
-  typedef pvector< CPT(InternalName) > Columns;
+  typedef pvector<CPT_InternalName> Columns;
   Columns _points;
   Columns _vectors;
   Columns _texcoords;
 
   class MorphRecord {
   public:
-    CPT(InternalName) _slider;
-    CPT(InternalName) _base;
-    CPT(InternalName) _delta;
+    CPT_InternalName _slider;
+    CPT_InternalName _base;
+    CPT_InternalName _delta;
   };
   typedef pvector<MorphRecord> Morphs;
   Morphs _morphs;
@@ -236,12 +237,12 @@ private:
     CPT(GeomVertexFormat) _v3n3;
     CPT(GeomVertexFormat) _v3t2;
     CPT(GeomVertexFormat) _v3n3t2;
-    
+
     CPT(GeomVertexFormat) _v3cp;
     CPT(GeomVertexFormat) _v3n3cp;
     CPT(GeomVertexFormat) _v3cpt2;
     CPT(GeomVertexFormat) _v3n3cpt2;
-    
+
     CPT(GeomVertexFormat) _v3c4;
     CPT(GeomVertexFormat) _v3n3c4;
     CPT(GeomVertexFormat) _v3c4t2;
diff --git a/panda/src/gobj/geomVertexReader.I b/panda/src/gobj/geomVertexReader.I
index 1c19429d51..cd64794139 100644
--- a/panda/src/gobj/geomVertexReader.I
+++ b/panda/src/gobj/geomVertexReader.I
@@ -52,31 +52,14 @@ GeomVertexReader(const GeomVertexData *vertex_data,
 //               reader specifically to process the named data type.
 ////////////////////////////////////////////////////////////////////
 INLINE GeomVertexReader::
-GeomVertexReader(const GeomVertexData *vertex_data, const string &name,
+GeomVertexReader(const GeomVertexData *vertex_data,
+                 CPT_InternalName name,
                  Thread *current_thread) :
   _vertex_data(vertex_data),
   _current_thread(current_thread)
 {
   initialize();
-  set_column(name);
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: GeomVertexReader::Constructor
-//       Access: Published
-//  Description: Constructs a new reader to process the vertices of
-//               the indicated data object.  This flavor creates the
-//               reader specifically to process the named data type.
-////////////////////////////////////////////////////////////////////
-INLINE GeomVertexReader::
-GeomVertexReader(const GeomVertexData *vertex_data, 
-                 const InternalName *name,
-                 Thread *current_thread) :
-  _vertex_data(vertex_data),
-  _current_thread(current_thread)
-{
-  initialize();
-  set_column(name);
+  set_column(MOVE(name));
 }
 
 ////////////////////////////////////////////////////////////////////
@@ -317,25 +300,7 @@ set_column(int column) {
 //               false otherwise.
 ////////////////////////////////////////////////////////////////////
 INLINE bool GeomVertexReader::
-set_column(const string &name) {
-  return set_column(InternalName::make(name));
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: GeomVertexReader::set_column
-//       Access: Published
-//  Description: Sets up the reader to use the data type with the
-//               indicated name.
-//
-//               This also resets the read row number to the start row
-//               (the same value passed to a previous call to
-//               set_row(), or 0 if set_row() was never called.)
-//
-//               The return value is true if the data type is valid,
-//               false otherwise.
-////////////////////////////////////////////////////////////////////
-INLINE bool GeomVertexReader::
-set_column(const InternalName *name) {
+set_column(CPT_InternalName name) {
   if (_vertex_data != (const GeomVertexData *)NULL) {
     GeomVertexDataPipelineReader reader(_vertex_data, _current_thread);
     reader.check_array_readers();
@@ -524,6 +489,62 @@ get_data4f() {
   return _packer->get_data4f(inc_pointer());
 }
 
+////////////////////////////////////////////////////////////////////
+//     Function: GeomVertexReader::get_matrix3f
+//       Access: Published
+//  Description: Returns the 3-by-3 matrix associated with the read
+//               row and advances the read row.  This is a special
+//               method that only works when the column in question
+//               contains a matrix of an appropriate size.
+////////////////////////////////////////////////////////////////////
+INLINE LMatrix3f GeomVertexReader::
+get_matrix3f() {
+  nassertr(has_column() &&
+           _packer->_column->get_contents() == C_matrix &&
+           _packer->_column->get_num_elements() >= 3,
+           LMatrix3f::ident_mat());
+
+  size_t col_stride = _packer->_column->get_element_stride();
+  const unsigned char *pointer = inc_pointer();
+
+  LMatrix3f mat;
+  mat.set_row(0, _packer->get_data3f(pointer));
+  pointer += col_stride;
+  mat.set_row(1, _packer->get_data3f(pointer));
+  pointer += col_stride;
+  mat.set_row(2, _packer->get_data3f(pointer));
+  return mat;
+}
+
+////////////////////////////////////////////////////////////////////
+//     Function: GeomVertexReader::get_matrix4f
+//       Access: Published
+//  Description: Returns the 4-by-4 matrix associated with the read
+//               row and advances the read row.  This is a special
+//               method that only works when the column in question
+//               contains a matrix of an appropriate size.
+////////////////////////////////////////////////////////////////////
+INLINE LMatrix4f GeomVertexReader::
+get_matrix4f() {
+  nassertr(has_column() &&
+           _packer->_column->get_contents() == C_matrix &&
+           _packer->_column->get_num_elements() >= 4,
+           LMatrix4f::ident_mat());
+
+  size_t col_stride = _packer->_column->get_element_stride();
+  const unsigned char *pointer = inc_pointer();
+
+  LMatrix4f mat;
+  mat.set_row(0, _packer->get_data4f(pointer));
+  pointer += col_stride;
+  mat.set_row(1, _packer->get_data4f(pointer));
+  pointer += col_stride;
+  mat.set_row(2, _packer->get_data4f(pointer));
+  pointer += col_stride;
+  mat.set_row(3, _packer->get_data4f(pointer));
+  return mat;
+}
+
 ////////////////////////////////////////////////////////////////////
 //     Function: GeomVertexReader::get_data1d
 //       Access: Published
@@ -576,6 +597,62 @@ get_data4d() {
   return _packer->get_data4d(inc_pointer());
 }
 
+////////////////////////////////////////////////////////////////////
+//     Function: GeomVertexReader::get_matrix3d
+//       Access: Published
+//  Description: Returns the 3-by-3 matrix associated with the read
+//               row and advances the read row.  This is a special
+//               method that only works when the column in question
+//               contains a matrix of an appropriate size.
+////////////////////////////////////////////////////////////////////
+INLINE LMatrix3d GeomVertexReader::
+get_matrix3d() {
+  nassertr(has_column() &&
+           _packer->_column->get_contents() == C_matrix &&
+           _packer->_column->get_num_elements() >= 3,
+           LMatrix3d::ident_mat());
+
+  size_t col_stride = _packer->_column->get_element_stride();
+  const unsigned char *pointer = inc_pointer();
+
+  LMatrix3d mat;
+  mat.set_row(0, _packer->get_data3d(pointer));
+  pointer += col_stride;
+  mat.set_row(1, _packer->get_data3d(pointer));
+  pointer += col_stride;
+  mat.set_row(2, _packer->get_data3d(pointer));
+  return mat;
+}
+
+////////////////////////////////////////////////////////////////////
+//     Function: GeomVertexReader::get_matrix4d
+//       Access: Published
+//  Description: Returns the 4-by-4 matrix associated with the read
+//               row and advances the read row.  This is a special
+//               method that only works when the column in question
+//               contains a matrix of an appropriate size.
+////////////////////////////////////////////////////////////////////
+INLINE LMatrix4d GeomVertexReader::
+get_matrix4d() {
+  nassertr(has_column() &&
+           _packer->_column->get_contents() == C_matrix &&
+           _packer->_column->get_num_elements() >= 4,
+           LMatrix4d::ident_mat());
+
+  size_t col_stride = _packer->_column->get_element_stride();
+  const unsigned char *pointer = inc_pointer();
+
+  LMatrix4d mat;
+  mat.set_row(0, _packer->get_data4d(pointer));
+  pointer += col_stride;
+  mat.set_row(1, _packer->get_data4d(pointer));
+  pointer += col_stride;
+  mat.set_row(2, _packer->get_data4d(pointer));
+  pointer += col_stride;
+  mat.set_row(3, _packer->get_data4d(pointer));
+  return mat;
+}
+
 ////////////////////////////////////////////////////////////////////
 //     Function: GeomVertexReader::get_data1
 //       Access: Published
@@ -640,6 +717,40 @@ get_data4() {
 #endif
 }
 
+////////////////////////////////////////////////////////////////////
+//     Function: GeomVertexReader::get_matrix3
+//       Access: Published
+//  Description: Returns the 3-by-3 matrix associated with the read
+//               row and advances the read row.  This is a special
+//               method that only works when the column in question
+//               contains a matrix of an appropriate size.
+////////////////////////////////////////////////////////////////////
+INLINE LMatrix3 GeomVertexReader::
+get_matrix3() {
+#ifndef STDFLOAT_DOUBLE
+  return get_matrix3f();
+#else
+  return get_matrix3d();
+#endif
+}
+
+////////////////////////////////////////////////////////////////////
+//     Function: GeomVertexReader::get_matrix4
+//       Access: Published
+//  Description: Returns the 4-by-4 matrix associated with the read
+//               row and advances the read row.  This is a special
+//               method that only works when the column in question
+//               contains a matrix of an appropriate size.
+////////////////////////////////////////////////////////////////////
+INLINE LMatrix4 GeomVertexReader::
+get_matrix4() {
+#ifndef STDFLOAT_DOUBLE
+  return get_matrix4f();
+#else
+  return get_matrix4d();
+#endif
+}
+
 ////////////////////////////////////////////////////////////////////
 //     Function: GeomVertexReader::get_data1i
 //       Access: Published
diff --git a/panda/src/gobj/geomVertexReader.h b/panda/src/gobj/geomVertexReader.h
index d2f8611dfb..04f7a9a823 100644
--- a/panda/src/gobj/geomVertexReader.h
+++ b/panda/src/gobj/geomVertexReader.h
@@ -59,14 +59,11 @@ PUBLISHED:
   INLINE GeomVertexReader(const GeomVertexData *vertex_data,
                           Thread *current_thread = Thread::get_current_thread());
   INLINE GeomVertexReader(const GeomVertexData *vertex_data,
-                          const string &name,
-                          Thread *current_thread = Thread::get_current_thread());
-  INLINE GeomVertexReader(const GeomVertexData *vertex_data,
-                          const InternalName *name,
+                          CPT_InternalName name,
                           Thread *current_thread = Thread::get_current_thread());
   INLINE GeomVertexReader(const GeomVertexArrayData *array_data,
                           Thread *current_thread = Thread::get_current_thread());
-  INLINE GeomVertexReader(const GeomVertexArrayData *array_data, 
+  INLINE GeomVertexReader(const GeomVertexArrayData *array_data,
                           int column,
                           Thread *current_thread = Thread::get_current_thread());
 
@@ -90,8 +87,7 @@ PUBLISHED:
   INLINE bool get_force() const;
 
   INLINE bool set_column(int column);
-  INLINE bool set_column(const string &name);
-  INLINE bool set_column(const InternalName *name);
+  INLINE bool set_column(CPT_InternalName name);
   bool set_column(int array, const GeomVertexColumn *column);
 
   INLINE void clear();
@@ -110,16 +106,22 @@ PUBLISHED:
   INLINE const LVecBase2f &get_data2f();
   INLINE const LVecBase3f &get_data3f();
   INLINE const LVecBase4f &get_data4f();
+  INLINE LMatrix3f get_matrix3f();
+  INLINE LMatrix4f get_matrix4f();
 
   INLINE double get_data1d();
   INLINE const LVecBase2d &get_data2d();
   INLINE const LVecBase3d &get_data3d();
   INLINE const LVecBase4d &get_data4d();
+  INLINE LMatrix3d get_matrix3d();
+  INLINE LMatrix4d get_matrix4d();
 
   INLINE PN_stdfloat get_data1();
   INLINE const LVecBase2 &get_data2();
   INLINE const LVecBase3 &get_data3();
   INLINE const LVecBase4 &get_data4();
+  INLINE LMatrix3 get_matrix3();
+  INLINE LMatrix4 get_matrix4();
 
   INLINE int get_data1i();
   INLINE const LVecBase2i &get_data2i();
diff --git a/panda/src/gobj/geomVertexRewriter.I b/panda/src/gobj/geomVertexRewriter.I
index ca9408f2da..89f6a55743 100644
--- a/panda/src/gobj/geomVertexRewriter.I
+++ b/panda/src/gobj/geomVertexRewriter.I
@@ -49,28 +49,12 @@ GeomVertexRewriter(GeomVertexData *vertex_data, Thread *current_thread) :
 //               rewriter specifically to process the named data type.
 ////////////////////////////////////////////////////////////////////
 INLINE GeomVertexRewriter::
-GeomVertexRewriter(GeomVertexData *vertex_data, const string &name,
+GeomVertexRewriter(GeomVertexData *vertex_data, CPT_InternalName name,
                    Thread *current_thread) :
   GeomVertexWriter(vertex_data, current_thread),
   GeomVertexReader(vertex_data, current_thread)
 {
-  set_column(name);
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: GeomVertexRewriter::Constructor
-//       Access: Published
-//  Description: Constructs a new rewriter to process the vertices of
-//               the indicated data object.  This flavor creates the
-//               rewriter specifically to process the named data type.
-////////////////////////////////////////////////////////////////////
-INLINE GeomVertexRewriter::
-GeomVertexRewriter(GeomVertexData *vertex_data, const InternalName *name,
-                   Thread *current_thread) :
-  GeomVertexWriter(vertex_data, current_thread),
-  GeomVertexReader(vertex_data, current_thread)
-{
-  set_column(name);
+  set_column(MOVE(name));
 }
 
 ////////////////////////////////////////////////////////////////////
@@ -237,30 +221,11 @@ set_column(int column) {
 //               false otherwise.
 ////////////////////////////////////////////////////////////////////
 INLINE bool GeomVertexRewriter::
-set_column(const string &name) {
-  return set_column(InternalName::make(name));
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: GeomVertexRewriter::set_column
-//       Access: Published
-//  Description: Sets up the rewriter to use the data type with the
-//               indicated name.
-//
-//               This also resets both the read and write row
-//               numbers to the start row (the same value passed to
-//               a previous call to set_row(), or 0 if set_row()
-//               was never called.)
-//
-//               The return value is true if the data type is valid,
-//               false otherwise.
-////////////////////////////////////////////////////////////////////
-INLINE bool GeomVertexRewriter::
-set_column(const InternalName *name) {
+set_column(CPT_InternalName name) {
   // It's important to invoke the writer first, then the reader.  See
   // set_row().
   GeomVertexWriter::set_column(name);
-  return GeomVertexReader::set_column(name);
+  return GeomVertexReader::set_column(MOVE(name));
 }
 
 ////////////////////////////////////////////////////////////////////
diff --git a/panda/src/gobj/geomVertexRewriter.h b/panda/src/gobj/geomVertexRewriter.h
index efd6e11b56..5e180b357e 100644
--- a/panda/src/gobj/geomVertexRewriter.h
+++ b/panda/src/gobj/geomVertexRewriter.h
@@ -41,11 +41,10 @@ PUBLISHED:
   INLINE GeomVertexRewriter(Thread *current_thread = Thread::get_current_thread());
   INLINE GeomVertexRewriter(GeomVertexData *vertex_data, Thread *current_thread = Thread::get_current_thread());
   INLINE GeomVertexRewriter(GeomVertexData *vertex_data,
-                            const string &name, Thread *current_thread = Thread::get_current_thread());
-  INLINE GeomVertexRewriter(GeomVertexData *vertex_data,
-                            const InternalName *name, Thread *current_thread = Thread::get_current_thread());
+                            CPT_InternalName name,
+                            Thread *current_thread = Thread::get_current_thread());
   INLINE GeomVertexRewriter(GeomVertexArrayData *array_data, Thread *current_thread = Thread::get_current_thread());
-  INLINE GeomVertexRewriter(GeomVertexArrayData *array_data, 
+  INLINE GeomVertexRewriter(GeomVertexArrayData *array_data,
                             int column, Thread *current_thread = Thread::get_current_thread());
   INLINE GeomVertexRewriter(const GeomVertexRewriter &copy);
   INLINE void operator = (const GeomVertexRewriter &copy);
@@ -58,8 +57,7 @@ PUBLISHED:
   INLINE Thread *get_current_thread() const;
 
   INLINE bool set_column(int column);
-  INLINE bool set_column(const string &name);
-  INLINE bool set_column(const InternalName *name);
+  INLINE bool set_column(CPT_InternalName name);
   INLINE bool set_column(int array, const GeomVertexColumn *column);
 
   INLINE void clear();
diff --git a/panda/src/gobj/geomVertexWriter.I b/panda/src/gobj/geomVertexWriter.I
index 5c63dc46a9..66a9f4ee6d 100644
--- a/panda/src/gobj/geomVertexWriter.I
+++ b/panda/src/gobj/geomVertexWriter.I
@@ -51,30 +51,13 @@ GeomVertexWriter(GeomVertexData *vertex_data, Thread *current_thread) :
 //               writer specifically to process the named data type.
 ////////////////////////////////////////////////////////////////////
 INLINE GeomVertexWriter::
-GeomVertexWriter(GeomVertexData *vertex_data, const string &name,
+GeomVertexWriter(GeomVertexData *vertex_data, CPT_InternalName name,
                  Thread *current_thread) :
   _vertex_data(vertex_data),
   _current_thread(current_thread)
 {
   initialize();
-  set_column(name);
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: GeomVertexWriter::Constructor
-//       Access: Published
-//  Description: Constructs a new writer to process the vertices of
-//               the indicated data object.  This flavor creates the
-//               writer specifically to process the named data type.
-////////////////////////////////////////////////////////////////////
-INLINE GeomVertexWriter::
-GeomVertexWriter(GeomVertexData *vertex_data, const InternalName *name,
-                 Thread *current_thread) :
-  _vertex_data(vertex_data),
-  _current_thread(current_thread)
-{
-  initialize();
-  set_column(name);
+  set_column(MOVE(name));
 }
 
 ////////////////////////////////////////////////////////////////////
@@ -131,7 +114,7 @@ GeomVertexWriter(GeomVertexDataPipelineWriter *data_writer,
 ////////////////////////////////////////////////////////////////////
 //     Function: GeomVertexWriter::Copy Constructor
 //       Access: Published
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 INLINE GeomVertexWriter::
 GeomVertexWriter(const GeomVertexWriter &copy) :
@@ -152,7 +135,7 @@ GeomVertexWriter(const GeomVertexWriter &copy) :
 ////////////////////////////////////////////////////////////////////
 //     Function: GeomVertexWriter::Copy Assignment Operator
 //       Access: Published
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 INLINE void GeomVertexWriter::
 operator = (const GeomVertexWriter &copy) {
@@ -172,7 +155,7 @@ operator = (const GeomVertexWriter &copy) {
 ////////////////////////////////////////////////////////////////////
 //     Function: GeomVertexWriter::Destructor
 //       Access: Published
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 INLINE GeomVertexWriter::
 ~GeomVertexWriter() {
@@ -268,24 +251,6 @@ set_column(int column) {
   return false;
 }
 
-////////////////////////////////////////////////////////////////////
-//     Function: GeomVertexWriter::set_column
-//       Access: Published
-//  Description: Sets up the writer to use the data type with the
-//               indicated name.
-//
-//               This also resets the write row number to the start
-//               row (the same value passed to a previous call to
-//               set_row(), or 0 if set_row() was never called.)
-//
-//               The return value is true if the data type is valid,
-//               false otherwise.
-////////////////////////////////////////////////////////////////////
-INLINE bool GeomVertexWriter::
-set_column(const string &name) {
-  return set_column(InternalName::make(name));
-}
-
 ////////////////////////////////////////////////////////////////////
 //     Function: GeomVertexWriter::set_column
 //       Access: Published
@@ -300,7 +265,7 @@ set_column(const string &name) {
 //               false otherwise.
 ////////////////////////////////////////////////////////////////////
 INLINE bool GeomVertexWriter::
-set_column(const InternalName *name) {
+set_column(CPT_InternalName name) {
   if (_vertex_data != (GeomVertexData *)NULL) {
     GeomVertexDataPipelineWriter writer(_vertex_data, true, _current_thread);
     writer.check_array_writers();
@@ -538,6 +503,60 @@ set_data4f(const LVecBase4f &data) {
   _packer->set_data4f(inc_pointer(), data);
 }
 
+////////////////////////////////////////////////////////////////////
+//     Function: GeomVertexWriter::set_matrix3f
+//       Access: Published
+//  Description: Sets the write row to a 3-by-3 matrix, and advances
+//               the write row.  This is a special method that can
+//               only be used on matrix columns.
+//
+//               It is an error for the write row to advance past
+//               the end of data.
+////////////////////////////////////////////////////////////////////
+INLINE void GeomVertexWriter::
+set_matrix3f(const LMatrix3f &mat) {
+  nassertv(has_column() &&
+           _packer->_column->get_contents() == C_matrix &&
+           _packer->_column->get_num_elements() == 3);
+
+  size_t col_stride = _packer->_column->get_element_stride();
+  unsigned char *pointer = inc_pointer();
+
+  _packer->set_data3f(pointer, mat.get_row(0));
+  pointer += col_stride;
+  _packer->set_data3f(pointer, mat.get_row(1));
+  pointer += col_stride;
+  _packer->set_data3f(pointer, mat.get_row(2));
+}
+
+////////////////////////////////////////////////////////////////////
+//     Function: GeomVertexWriter::set_matrix4f
+//       Access: Published
+//  Description: Sets the write row to a 4-by-4 matrix, and advances
+//               the write row.  This is a special method that can
+//               only be used on matrix columns.
+//
+//               It is an error for the write row to advance past
+//               the end of data.
+////////////////////////////////////////////////////////////////////
+INLINE void GeomVertexWriter::
+set_matrix4f(const LMatrix4f &mat) {
+  nassertv(has_column() &&
+           _packer->_column->get_contents() == C_matrix &&
+           _packer->_column->get_num_elements() == 4);
+
+  size_t col_stride = _packer->_column->get_element_stride();
+  unsigned char *pointer = inc_pointer();
+
+  _packer->set_data4f(pointer, mat.get_row(0));
+  pointer += col_stride;
+  _packer->set_data4f(pointer, mat.get_row(1));
+  pointer += col_stride;
+  _packer->set_data4f(pointer, mat.get_row(2));
+  pointer += col_stride;
+  _packer->set_data4f(pointer, mat.get_row(3));
+}
+
 ////////////////////////////////////////////////////////////////////
 //     Function: GeomVertexWriter::set_data1d
 //       Access: Published
@@ -640,6 +659,60 @@ set_data4d(const LVecBase4d &data) {
   _packer->set_data4d(inc_pointer(), data);
 }
 
+////////////////////////////////////////////////////////////////////
+//     Function: GeomVertexWriter::set_matrix3d
+//       Access: Published
+//  Description: Sets the write row to a 3-by-3 matrix, and advances
+//               the write row.  This is a special method that can
+//               only be used on matrix columns.
+//
+//               It is an error for the write row to advance past
+//               the end of data.
+////////////////////////////////////////////////////////////////////
+INLINE void GeomVertexWriter::
+set_matrix3d(const LMatrix3d &mat) {
+  nassertv(has_column() &&
+           _packer->_column->get_contents() == C_matrix &&
+           _packer->_column->get_num_elements() == 3);
+
+  size_t col_stride = _packer->_column->get_element_stride();
+  unsigned char *pointer = inc_pointer();
+
+  _packer->set_data3d(pointer, mat.get_row(0));
+  pointer += col_stride;
+  _packer->set_data3d(pointer, mat.get_row(1));
+  pointer += col_stride;
+  _packer->set_data3d(pointer, mat.get_row(2));
+}
+
+////////////////////////////////////////////////////////////////////
+//     Function: GeomVertexWriter::set_matrix4d
+//       Access: Published
+//  Description: Sets the write row to a 4-by-4 matrix, and advances
+//               the write row.  This is a special method that can
+//               only be used on matrix columns.
+//
+//               It is an error for the write row to advance past
+//               the end of data.
+////////////////////////////////////////////////////////////////////
+INLINE void GeomVertexWriter::
+set_matrix4d(const LMatrix4d &mat) {
+  nassertv(has_column() &&
+           _packer->_column->get_contents() == C_matrix &&
+           _packer->_column->get_num_elements() == 4);
+
+  size_t col_stride = _packer->_column->get_element_stride();
+  unsigned char *pointer = inc_pointer();
+
+  _packer->set_data4d(pointer, mat.get_row(0));
+  pointer += col_stride;
+  _packer->set_data4d(pointer, mat.get_row(1));
+  pointer += col_stride;
+  _packer->set_data4d(pointer, mat.get_row(2));
+  pointer += col_stride;
+  _packer->set_data4d(pointer, mat.get_row(3));
+}
+
 ////////////////////////////////////////////////////////////////////
 //     Function: GeomVertexWriter::set_data1
 //       Access: Published
@@ -766,6 +839,44 @@ set_data4(const LVecBase4 &data) {
 #endif
 }
 
+////////////////////////////////////////////////////////////////////
+//     Function: GeomVertexWriter::set_matrix3
+//       Access: Published
+//  Description: Sets the write row to a 3-by-3 matrix, and advances
+//               the write row.  This is a special method that can
+//               only be used on matrix columns.
+//
+//               It is an error for the write row to advance past
+//               the end of data.
+////////////////////////////////////////////////////////////////////
+INLINE void GeomVertexWriter::
+set_matrix3(const LMatrix3 &mat) {
+#ifndef STDFLOAT_DOUBLE
+  set_matrix3f(mat);
+#else
+  set_matrix3d(mat);
+#endif
+}
+
+////////////////////////////////////////////////////////////////////
+//     Function: GeomVertexWriter::set_matrix4
+//       Access: Published
+//  Description: Sets the write row to a 4-by-4 matrix, and advances
+//               the write row.  This is a special method that can
+//               only be used on matrix columns.
+//
+//               It is an error for the write row to advance past
+//               the end of data.
+////////////////////////////////////////////////////////////////////
+INLINE void GeomVertexWriter::
+set_matrix4(const LMatrix4 &mat) {
+#ifndef STDFLOAT_DOUBLE
+  set_matrix4f(mat);
+#else
+  set_matrix4d(mat);
+#endif
+}
+
 ////////////////////////////////////////////////////////////////////
 //     Function: GeomVertexWriter::set_data1i
 //       Access: Published
@@ -1012,6 +1123,60 @@ add_data4f(const LVecBase4f &data) {
   _packer->set_data4f(inc_add_pointer(), data);
 }
 
+////////////////////////////////////////////////////////////////////
+//     Function: GeomVertexWriter::add_matrix3f
+//       Access: Published
+//  Description: Sets the write row to a 3-by-3 matrix, and advances
+//               the write row.  This is a special method that can
+//               only be used on matrix columns.
+//
+//               If the write row advances past the end of data,
+//               implicitly adds a new row to the data.
+////////////////////////////////////////////////////////////////////
+INLINE void GeomVertexWriter::
+add_matrix3f(const LMatrix3f &mat) {
+  nassertv(has_column() &&
+           _packer->_column->get_contents() == C_matrix &&
+           _packer->_column->get_num_elements() == 3);
+
+  size_t col_stride = _packer->_column->get_element_stride();
+  unsigned char *pointer = inc_add_pointer();
+
+  _packer->set_data3f(pointer, mat.get_row(0));
+  pointer += col_stride;
+  _packer->set_data3f(pointer, mat.get_row(1));
+  pointer += col_stride;
+  _packer->set_data3f(pointer, mat.get_row(2));
+}
+
+////////////////////////////////////////////////////////////////////
+//     Function: GeomVertexWriter::add_matrix4f
+//       Access: Published
+//  Description: Sets the write row to a 4-by-4 matrix, and advances
+//               the write row.  This is a special method that can
+//               only be used on matrix columns.
+//
+//               If the write row advances past the end of data,
+//               implicitly adds a new row to the data.
+////////////////////////////////////////////////////////////////////
+INLINE void GeomVertexWriter::
+add_matrix4f(const LMatrix4f &mat) {
+  nassertv(has_column() &&
+           _packer->_column->get_contents() == C_matrix &&
+           _packer->_column->get_num_elements() == 4);
+
+  size_t col_stride = _packer->_column->get_element_stride();
+  unsigned char *pointer = inc_add_pointer();
+
+  _packer->set_data4f(pointer, mat.get_row(0));
+  pointer += col_stride;
+  _packer->set_data4f(pointer, mat.get_row(1));
+  pointer += col_stride;
+  _packer->set_data4f(pointer, mat.get_row(2));
+  pointer += col_stride;
+  _packer->set_data4f(pointer, mat.get_row(3));
+}
+
 ////////////////////////////////////////////////////////////////////
 //     Function: GeomVertexWriter::add_data1d
 //       Access: Published
@@ -1114,6 +1279,60 @@ add_data4d(const LVecBase4d &data) {
   _packer->set_data4d(inc_add_pointer(), data);
 }
 
+////////////////////////////////////////////////////////////////////
+//     Function: GeomVertexWriter::add_matrix3d
+//       Access: Published
+//  Description: Sets the write row to a 3-by-3 matrix, and advances
+//               the write row.  This is a special method that can
+//               only be used on matrix columns.
+//
+//               If the write row advances past the end of data,
+//               implicitly adds a new row to the data.
+////////////////////////////////////////////////////////////////////
+INLINE void GeomVertexWriter::
+add_matrix3d(const LMatrix3d &mat) {
+  nassertv(has_column() &&
+           _packer->_column->get_contents() == C_matrix &&
+           _packer->_column->get_num_elements() == 3);
+
+  size_t col_stride = _packer->_column->get_element_stride();
+  unsigned char *pointer = inc_add_pointer();
+
+  _packer->set_data3d(pointer, mat.get_row(0));
+  pointer += col_stride;
+  _packer->set_data3d(pointer, mat.get_row(1));
+  pointer += col_stride;
+  _packer->set_data3d(pointer, mat.get_row(2));
+}
+
+////////////////////////////////////////////////////////////////////
+//     Function: GeomVertexWriter::add_matrix4d
+//       Access: Published
+//  Description: Sets the write row to a 4-by-4 matrix, and advances
+//               the write row.  This is a special method that can
+//               only be used on matrix columns.
+//
+//               If the write row advances past the end of data,
+//               implicitly adds a new row to the data.
+////////////////////////////////////////////////////////////////////
+INLINE void GeomVertexWriter::
+add_matrix4d(const LMatrix4d &mat) {
+  nassertv(has_column() &&
+           _packer->_column->get_contents() == C_matrix &&
+           _packer->_column->get_num_elements() == 4);
+
+  size_t col_stride = _packer->_column->get_element_stride();
+  unsigned char *pointer = inc_add_pointer();
+
+  _packer->set_data4d(pointer, mat.get_row(0));
+  pointer += col_stride;
+  _packer->set_data4d(pointer, mat.get_row(1));
+  pointer += col_stride;
+  _packer->set_data4d(pointer, mat.get_row(2));
+  pointer += col_stride;
+  _packer->set_data4d(pointer, mat.get_row(3));
+}
+
 ////////////////////////////////////////////////////////////////////
 //     Function: GeomVertexWriter::add_data1
 //       Access: Published
@@ -1240,6 +1459,44 @@ add_data4(const LVecBase4 &data) {
 #endif
 }
 
+////////////////////////////////////////////////////////////////////
+//     Function: GeomVertexWriter::add_matrix3
+//       Access: Published
+//  Description: Sets the write row to a 3-by-3 matrix, and advances
+//               the write row.  This is a special method that can
+//               only be used on matrix columns.
+//
+//               If the write row advances past the end of data,
+//               implicitly adds a new row to the data.
+////////////////////////////////////////////////////////////////////
+INLINE void GeomVertexWriter::
+add_matrix3(const LMatrix3 &mat) {
+#ifndef STDFLOAT_DOUBLE
+  add_matrix3f(mat);
+#else
+  add_matrix3d(mat);
+#endif
+}
+
+////////////////////////////////////////////////////////////////////
+//     Function: GeomVertexWriter::add_matrix4
+//       Access: Published
+//  Description: Sets the write row to a 4-by-4 matrix, and advances
+//               the write row.  This is a special method that can
+//               only be used on matrix columns.
+//
+//               If the write row advances past the end of data,
+//               implicitly adds a new row to the data.
+////////////////////////////////////////////////////////////////////
+INLINE void GeomVertexWriter::
+add_matrix4(const LMatrix4 &mat) {
+#ifndef STDFLOAT_DOUBLE
+  add_matrix4f(mat);
+#else
+  add_matrix4d(mat);
+#endif
+}
+
 ////////////////////////////////////////////////////////////////////
 //     Function: GeomVertexWriter::add_data1i
 //       Access: Published
diff --git a/panda/src/gobj/geomVertexWriter.h b/panda/src/gobj/geomVertexWriter.h
index 2109353757..2a22f78f1f 100644
--- a/panda/src/gobj/geomVertexWriter.h
+++ b/panda/src/gobj/geomVertexWriter.h
@@ -26,7 +26,7 @@
 //       Class : GeomVertexWriter
 // Description : This object provides a high-level interface for
 //               quickly writing a sequence of numeric values from a
-//               vertex table. 
+//               vertex table.
 //
 //               This object can be used both to replace existing
 //               vertices in the table, or to extend the table with
@@ -72,14 +72,11 @@ PUBLISHED:
   INLINE GeomVertexWriter(GeomVertexData *vertex_data,
                           Thread *current_thread = Thread::get_current_thread());
   INLINE GeomVertexWriter(GeomVertexData *vertex_data,
-                          const string &name,
-                          Thread *current_thread = Thread::get_current_thread());
-  INLINE GeomVertexWriter(GeomVertexData *vertex_data,
-                          const InternalName *name,
+                          CPT_InternalName name,
                           Thread *current_thread = Thread::get_current_thread());
   INLINE GeomVertexWriter(GeomVertexArrayData *array_data,
                           Thread *current_thread = Thread::get_current_thread());
-  INLINE GeomVertexWriter(GeomVertexArrayData *array_data, 
+  INLINE GeomVertexWriter(GeomVertexArrayData *array_data,
                           int column,
                           Thread *current_thread = Thread::get_current_thread());
 
@@ -99,8 +96,7 @@ PUBLISHED:
   INLINE Thread *get_current_thread() const;
 
   INLINE bool set_column(int column);
-  INLINE bool set_column(const string &name);
-  INLINE bool set_column(const InternalName *name);
+  INLINE bool set_column(CPT_InternalName name);
   bool set_column(int array, const GeomVertexColumn *column);
   INLINE void clear();
   bool reserve_num_rows(int num_rows);
@@ -123,6 +119,8 @@ PUBLISHED:
   INLINE void set_data3f(const LVecBase3f &data);
   INLINE void set_data4f(float x, float y, float z, float w);
   INLINE void set_data4f(const LVecBase4f &data);
+  INLINE void set_matrix3f(const LMatrix3f &mat);
+  INLINE void set_matrix4f(const LMatrix4f &mat);
 
   INLINE void set_data1d(double data);
   INLINE void set_data2d(double x, double y);
@@ -131,6 +129,8 @@ PUBLISHED:
   INLINE void set_data3d(const LVecBase3d &data);
   INLINE void set_data4d(double x, double y, double z, double w);
   INLINE void set_data4d(const LVecBase4d &data);
+  INLINE void set_matrix3d(const LMatrix3d &mat);
+  INLINE void set_matrix4d(const LMatrix4d &mat);
 
   INLINE void set_data1(PN_stdfloat data);
   INLINE void set_data2(PN_stdfloat x, PN_stdfloat y);
@@ -139,6 +139,8 @@ PUBLISHED:
   INLINE void set_data3(const LVecBase3 &data);
   INLINE void set_data4(PN_stdfloat x, PN_stdfloat y, PN_stdfloat z, PN_stdfloat w);
   INLINE void set_data4(const LVecBase4 &data);
+  INLINE void set_matrix3(const LMatrix3 &mat);
+  INLINE void set_matrix4(const LMatrix4 &mat);
 
   INLINE void set_data1i(int data);
   INLINE void set_data2i(int a, int b);
@@ -158,6 +160,8 @@ PUBLISHED:
   INLINE void add_data3f(const LVecBase3f &data);
   INLINE void add_data4f(float x, float y, float z, float w);
   INLINE void add_data4f(const LVecBase4f &data);
+  INLINE void add_matrix3f(const LMatrix3f &mat);
+  INLINE void add_matrix4f(const LMatrix4f &mat);
 
   INLINE void add_data1d(double data);
   INLINE void add_data2d(double x, double y);
@@ -166,6 +170,8 @@ PUBLISHED:
   INLINE void add_data3d(const LVecBase3d &data);
   INLINE void add_data4d(double x, double y, double z, double w);
   INLINE void add_data4d(const LVecBase4d &data);
+  INLINE void add_matrix3d(const LMatrix3d &mat);
+  INLINE void add_matrix4d(const LMatrix4d &mat);
 
   INLINE void add_data1(PN_stdfloat data);
   INLINE void add_data2(PN_stdfloat x, PN_stdfloat y);
@@ -174,6 +180,8 @@ PUBLISHED:
   INLINE void add_data3(const LVecBase3 &data);
   INLINE void add_data4(PN_stdfloat x, PN_stdfloat y, PN_stdfloat z, PN_stdfloat w);
   INLINE void add_data4(const LVecBase4 &data);
+  INLINE void add_matrix3(const LMatrix3 &mat);
+  INLINE void add_matrix4(const LMatrix4 &mat);
 
   INLINE void add_data1i(int data);
   INLINE void add_data2i(int a, int b);
@@ -213,7 +221,7 @@ private:
   PT(GeomVertexData) _vertex_data;
   int _array;
   PT(GeomVertexArrayData) _array_data;
-    
+
   Thread *_current_thread;
   GeomVertexColumn::Packer *_packer;
   int _stride;
diff --git a/panda/src/gobj/internalName.I b/panda/src/gobj/internalName.I
index 0c2dacccd3..2b8669ff5a 100644
--- a/panda/src/gobj/internalName.I
+++ b/panda/src/gobj/internalName.I
@@ -12,9 +12,10 @@
 //
 ////////////////////////////////////////////////////////////////////
 
+
 ////////////////////////////////////////////////////////////////////
 //     Function: InternalName::make
-//       Access: Published, Static
+//       Access: Public, Static
 //  Description: The public interface for constructing an InternalName
 //               pointer.  This will return a new InternalName
 //               representing the indicated name, if this is the first
@@ -32,6 +33,34 @@ make(const string &name) {
   return get_root()->append(name);
 }
 
+////////////////////////////////////////////////////////////////////
+//     Function: InternalName::make
+//       Access: Public, Static
+//  Description: This version of make() is defined such as to accept
+//               mostly string literals, which may be string pooled
+//               by the compiler.  This allows us to make an
+//               additional optimization.
+//
+//               This constructor is also used for fixed-size arrays,
+//               since there is no neat way to catch string literals
+//               only.  Presumably people aren't using InternalName
+//               in that way.
+////////////////////////////////////////////////////////////////////
+template<int N>
+INLINE PT(InternalName) InternalName::
+make(const char (&literal)[N]) {
+  LightMutexHolder holder(_literal_table_lock);
+  LiteralTable::const_iterator it = _literal_table.find(literal);
+
+  if (it == _literal_table.end()) {
+    PT(InternalName) name = get_root()->append(literal);
+    _literal_table.insert(LiteralTable::value_type(literal, name));
+    return name;
+  } else {
+    return it->second;
+  }
+}
+
 ////////////////////////////////////////////////////////////////////
 //     Function: InternalName::get_parent
 //       Access: Published
@@ -430,10 +459,147 @@ get_view() {
 ////////////////////////////////////////////////////////////////////
 //     Function: InternalName::output operator
 //       Access: Public
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 INLINE ostream &
 operator << (ostream &out, const InternalName &tcn) {
   tcn.output(out);
   return out;
 }
+
+#ifndef CPPPARSER
+////////////////////////////////////////////////////////////////////
+//     Function: CPT_InternalName::Constructor
+//       Access: Public
+//  Description:
+////////////////////////////////////////////////////////////////////
+INLINE CPT_InternalName::
+CPT_InternalName(const InternalName *ptr) :
+  ConstPointerTo<InternalName>(ptr)
+{
+}
+
+////////////////////////////////////////////////////////////////////
+//     Function: CPT_InternalName::Copy Constructor
+//       Access: Public
+//  Description:
+////////////////////////////////////////////////////////////////////
+INLINE CPT_InternalName::
+CPT_InternalName(const PointerTo<InternalName> &copy) :
+  ConstPointerTo<InternalName>(copy)
+{
+}
+
+////////////////////////////////////////////////////////////////////
+//     Function: CPT_InternalName::Copy Constructor
+//       Access: Public
+//  Description:
+////////////////////////////////////////////////////////////////////
+INLINE CPT_InternalName::
+CPT_InternalName(const ConstPointerTo<InternalName> &copy) :
+  ConstPointerTo<InternalName>(copy)
+{
+}
+
+////////////////////////////////////////////////////////////////////
+//     Function: CPT_InternalName::Conversion Constructor
+//       Access: Public
+//  Description:
+////////////////////////////////////////////////////////////////////
+INLINE CPT_InternalName::
+CPT_InternalName(const string &name) :
+  ConstPointerTo<InternalName>(InternalName::make(name))
+{
+}
+
+////////////////////////////////////////////////////////////////////
+//     Function: CPT_InternalName::Conversion Constructor
+//       Access: Public
+//  Description:
+////////////////////////////////////////////////////////////////////
+template<int N>
+INLINE CPT_InternalName::
+CPT_InternalName(const char (&literal)[N]) :
+  ConstPointerTo<InternalName>(InternalName::make(literal))
+{
+}
+
+#ifdef USE_MOVE_SEMANTICS
+////////////////////////////////////////////////////////////////////
+//     Function: CPT_InternalName::Move Constructor
+//       Access: Public
+//  Description:
+////////////////////////////////////////////////////////////////////
+INLINE CPT_InternalName::
+CPT_InternalName(PointerTo<InternalName> &&from) NOEXCEPT :
+  ConstPointerTo<InternalName>(move(from))
+{
+}
+
+////////////////////////////////////////////////////////////////////
+//     Function: CPT_InternalName::Move Constructor
+//       Access: Public
+//  Description:
+////////////////////////////////////////////////////////////////////
+INLINE CPT_InternalName::
+CPT_InternalName(ConstPointerTo<InternalName> &&from) NOEXCEPT :
+  ConstPointerTo<InternalName>(move(from))
+{
+}
+
+////////////////////////////////////////////////////////////////////
+//     Function: CPT_InternalName::Move Assignment Operator
+//       Access: Public
+//  Description:
+////////////////////////////////////////////////////////////////////
+INLINE CPT_InternalName &CPT_InternalName::
+operator = (PointerTo<InternalName> &&from) NOEXCEPT {
+  this->reassign(move(from));
+  return *this;
+}
+
+////////////////////////////////////////////////////////////////////
+//     Function: CPT_InternalName::Move Assignment Operator
+//       Access: Public
+//  Description:
+////////////////////////////////////////////////////////////////////
+INLINE CPT_InternalName &CPT_InternalName::
+operator = (ConstPointerTo<InternalName> &&from) NOEXCEPT {
+  this->reassign(move(from));
+  return *this;
+}
+#endif  // USE_MOVE_SEMANTICS
+
+////////////////////////////////////////////////////////////////////
+//     Function: CPT_InternalName::Assignment operator
+//       Access: Published
+//  Description:
+////////////////////////////////////////////////////////////////////
+INLINE CPT_InternalName &CPT_InternalName::
+operator = (const To *ptr) {
+  this->reassign((To *)ptr);
+  return *this;
+}
+
+////////////////////////////////////////////////////////////////////
+//     Function: CPT_InternalName::Assignment operator
+//       Access: Published
+//  Description:
+////////////////////////////////////////////////////////////////////
+INLINE CPT_InternalName &CPT_InternalName::
+operator = (const PointerTo<InternalName> &copy) {
+  this->reassign((const ConstPointerTo<InternalName> &)copy);
+  return *this;
+}
+
+////////////////////////////////////////////////////////////////////
+//     Function: CPT_InternalName::Assignment operator
+//       Access: Published
+//  Description:
+////////////////////////////////////////////////////////////////////
+INLINE CPT_InternalName &CPT_InternalName::
+operator = (const ConstPointerTo<InternalName> &copy) {
+  this->reassign((const ConstPointerTo<InternalName> &)copy);
+  return *this;
+}
+#endif  // CPPPARSER
diff --git a/panda/src/gobj/internalName.cxx b/panda/src/gobj/internalName.cxx
index 856fdcd403..c6f57af3ac 100644
--- a/panda/src/gobj/internalName.cxx
+++ b/panda/src/gobj/internalName.cxx
@@ -47,6 +47,9 @@ TypeHandle InternalName::_texcoord_type_handle;
 InternalName::PyInternTable InternalName::_py_intern_table;
 #endif
 
+InternalName::LiteralTable InternalName::_literal_table;
+LightMutex InternalName::_literal_table_lock;
+
 ////////////////////////////////////////////////////////////////////
 //     Function: InternalName::Constructor
 //       Access: Private
@@ -225,7 +228,7 @@ get_ancestor(int n) const {
 
   } else {
     return get_root();
-  } 
+  }
 }
 
 ////////////////////////////////////////////////////////////////////
@@ -267,13 +270,13 @@ get_net_basename(int n) const {
 
   } else {
     return _basename;
-  } 
+  }
 }
 
 ////////////////////////////////////////////////////////////////////
 //     Function: InternalName::output
 //       Access: Published
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 void InternalName::
 output(ostream &out) const {
@@ -366,7 +369,7 @@ make_from_bam(const FactoryParams &params) {
   // it later.
   me->ref();
   manager->register_finalize(me);
-  
+
   return me.p();
 }
 
@@ -393,7 +396,7 @@ make_texcoord_from_bam(const FactoryParams &params) {
 
   me->ref();
   manager->register_finalize(me);
-  
+
   return me.p();
 }
 
diff --git a/panda/src/gobj/internalName.h b/panda/src/gobj/internalName.h
index 82c570dcbb..079f7a29da 100644
--- a/panda/src/gobj/internalName.h
+++ b/panda/src/gobj/internalName.h
@@ -21,6 +21,7 @@
 #include "pointerTo.h"
 #include "pmap.h"
 #include "lightMutex.h"
+#include "lightMutexHolder.h"
 
 class FactoryParams;
 
@@ -39,13 +40,16 @@ class FactoryParams;
 //               one or more other names, or by giving it a source
 //               string directly.
 ////////////////////////////////////////////////////////////////////
-class EXPCL_PANDA_GOBJ InternalName : public TypedWritableReferenceCount {
+class EXPCL_PANDA_GOBJ InternalName FINAL : public TypedWritableReferenceCount {
 private:
   InternalName(InternalName *parent, const string &basename);
 
 public:
   INLINE static PT(InternalName) make(const string &name);
 
+  template<int N>
+  INLINE static PT(InternalName) make(const char (&literal)[N]);
+
 PUBLISHED:
   virtual ~InternalName();
   virtual bool unref() const;
@@ -91,6 +95,8 @@ PUBLISHED:
   INLINE static PT(InternalName) get_view();
 
 #ifdef HAVE_PYTHON
+  // These versions are exposed to Python, which have additional logic
+  // to map from Python interned strings.
 #if PY_MAJOR_VERSION >= 3
   EXTENSION(static PT(InternalName) make(PyUnicodeObject *str));
 #else
@@ -114,6 +120,10 @@ private:
   NameTable _name_table;
   LightMutex _name_table_lock;
 
+  typedef phash_map<const char *, PT(InternalName), pointer_hash> LiteralTable;
+  static LiteralTable _literal_table;
+  static LightMutex _literal_table_lock;
+
   static PT(InternalName) _root;
   static PT(InternalName) _error;
   static PT(InternalName) _default;
@@ -171,7 +181,46 @@ private:
 
 INLINE ostream &operator << (ostream &out, const InternalName &tcn);
 
+////////////////////////////////////////////////////////////////////
+//       Class : CPT_InternalName
+// Description : This is a const pointer to an InternalName, and
+//               should be used in lieu of a CPT(InternalName) in
+//               function arguments.  The extra feature that it
+//               offers is that it has a constructor to automatically
+//               convert from a string, so that strings are coerced
+//               by the compiler when passed to such a function.
+////////////////////////////////////////////////////////////////////
+#ifdef CPPPARSER
+// This construct confuses interrogate, so we give it a typedef.
+typedef const InternalName *CPT_InternalName;
+#else
+class CPT_InternalName : public ConstPointerTo<InternalName> {
+public:
+  INLINE CPT_InternalName(const To *ptr = (const To *)NULL);
+  INLINE CPT_InternalName(const PointerTo<InternalName> &copy);
+  INLINE CPT_InternalName(const ConstPointerTo<InternalName> &copy);
+  INLINE CPT_InternalName(const string &name);
+
+  template<int N>
+  INLINE CPT_InternalName(const char (&literal)[N]);
+
+#ifdef USE_MOVE_SEMANTICS
+  INLINE CPT_InternalName(PointerTo<InternalName> &&from) NOEXCEPT;
+  INLINE CPT_InternalName(ConstPointerTo<InternalName> &&from) NOEXCEPT;
+  INLINE CPT_InternalName &operator = (PointerTo<InternalName> &&from) NOEXCEPT;
+  INLINE CPT_InternalName &operator = (ConstPointerTo<InternalName> &&from) NOEXCEPT;
+#endif  // USE_MOVE_SEMANTICS
+
+  INLINE CPT_InternalName &operator = (const To *ptr);
+  INLINE CPT_InternalName &operator = (const PointerTo<InternalName> &copy);
+  INLINE CPT_InternalName &operator = (const ConstPointerTo<InternalName> &copy);
+};
+
+INLINE void swap(CPT_InternalName &one, CPT_InternalName &two) NOEXCEPT {
+  one.swap(two);
+}
+#endif  // CPPPARSER
+
 #include "internalName.I"
 
 #endif
-
diff --git a/panda/src/gobj/p3gobj_ext_composite.cxx b/panda/src/gobj/p3gobj_ext_composite.cxx
new file mode 100644
index 0000000000..33584e701b
--- /dev/null
+++ b/panda/src/gobj/p3gobj_ext_composite.cxx
@@ -0,0 +1,3 @@
+#include "internalName_ext.cxx"
+#include "geomVertexArrayData_ext.cxx"
+#include "textureCollection_ext.cxx"
diff --git a/panda/src/gobj/preparedGraphicsObjects.cxx b/panda/src/gobj/preparedGraphicsObjects.cxx
index 233e4ce9fe..ee694450aa 100644
--- a/panda/src/gobj/preparedGraphicsObjects.cxx
+++ b/panda/src/gobj/preparedGraphicsObjects.cxx
@@ -1538,7 +1538,11 @@ begin_frame(GraphicsStateGuardianBase *gsg, Thread *current_thread) {
        qibi != _enqueued_index_buffers.end();
        ++qibi) {
     GeomPrimitive *data = (*qibi);
-    data->prepare_now(this, gsg);
+    // We need this check because the actual index data may
+    // not actually have propagated to the draw thread yet.
+    if (data->is_indexed()) {
+      data->prepare_now(this, gsg);
+    }
   }
 
   _enqueued_index_buffers.clear();
diff --git a/panda/src/gobj/shader.I b/panda/src/gobj/shader.I
index b33c3d1ff0..e101a07dfc 100755
--- a/panda/src/gobj/shader.I
+++ b/panda/src/gobj/shader.I
@@ -21,31 +21,35 @@
 ////////////////////////////////////////////////////////////////////
 INLINE Filename Shader::
 get_filename(const ShaderType &type) const {
-  if (_filename->_separate && type == ST_none) {
+  if (_filename._separate && type != ST_none) {
     switch (type) {
       case ST_vertex:
-        return _filename->_vertex;
+        return _filename._vertex;
         break;
       case ST_fragment:
-        return _filename->_fragment;
+        return _filename._fragment;
         break;
       case ST_geometry:
-        return _filename->_geometry;
+        return _filename._geometry;
         break;
       case ST_tess_control:
-        return _text->_tess_control;
+        return _filename._tess_control;
         break;
       case ST_tess_evaluation:
-        return _text->_tess_evaluation;
+        return _filename._tess_evaluation;
         break;
       case ST_compute:
-        return _text->_compute;
+        return _filename._compute;
         break;
       default:
-        return _filename->_shared;
+        return _filename._shared;
     }
+  } else if (!_filename._shared.empty()) {
+    return _filename._shared;
+
   } else {
-    return _filename->_shared;
+    // Um, better than nothing?
+    return _filename._vertex;
   }
 }
 
@@ -56,32 +60,32 @@ get_filename(const ShaderType &type) const {
 ////////////////////////////////////////////////////////////////////
 INLINE const string &Shader::
 get_text(const ShaderType &type) const {
-  if (_text->_separate) {
-    nassertr(type != ST_none || !_text->_shared.empty(), _text->_shared);
+  if (_text._separate) {
+    nassertr(type != ST_none || !_text._shared.empty(), _text._shared);
     switch (type) {
       case ST_vertex:
-        return _text->_vertex;
+        return _text._vertex;
         break;
       case ST_fragment:
-        return _text->_fragment;
+        return _text._fragment;
         break;
       case ST_geometry:
-        return _text->_geometry;
+        return _text._geometry;
         break;
       case ST_tess_control:
-        return _text->_tess_control;
+        return _text._tess_control;
         break;
       case ST_tess_evaluation:
-        return _text->_tess_evaluation;
+        return _text._tess_evaluation;
         break;
       case ST_compute:
-        return _text->_compute;
+        return _text._compute;
         break;
       default:
-        return _text->_shared;
+        return _text._shared;
     }
   } else {
-    return _text->_shared;
+    return _text._shared;
   }
 }
 
@@ -115,7 +119,7 @@ set_shader_utilization(ShaderUtilization sut) {
 //  Description: This flag returns SUT_none, SUT_basic, or
 //               SUT_advanced and controls the automatic generation
 //               of shaders.  It is initialized from the config
-//               variable of the same name, but it can be 
+//               variable of the same name, but it can be
 //               subsequently adjusted.
 ////////////////////////////////////////////////////////////////////
 INLINE ShaderUtilization Shader::
@@ -154,7 +158,7 @@ get_language() const {
 ////////////////////////////////////////////////////////////////////
 //  Function: Shader::ShaderCapabilities Constructor
 //  Access: Public
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 INLINE Shader::ShaderCaps::
 ShaderCaps() {
@@ -164,7 +168,7 @@ ShaderCaps() {
 ////////////////////////////////////////////////////////////////////
 //  Function: Shader::ShaderCapabilities::operator ==
 //  Access: Public
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 INLINE bool Shader::ShaderCaps::
 operator == (const ShaderCaps &other) const {
@@ -184,10 +188,10 @@ operator == (const ShaderCaps &other) const {
 ////////////////////////////////////////////////////////////////////
 //  Function: Shader::ShaderPtrData Constructor
 //  Access:
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 INLINE Shader::ShaderPtrData::
-ShaderPtrData() : 
+ShaderPtrData() :
   _ptr(NULL),
   _type(SPT_unknown),
   _updated(true),
@@ -198,7 +202,7 @@ ShaderPtrData() :
 ////////////////////////////////////////////////////////////////////
 //  Function: Shader::ShaderPtrData Constructor
 //  Access:
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 INLINE Shader::ShaderPtrData::
 ShaderPtrData(const PTA_float &ptr):
@@ -213,7 +217,7 @@ ShaderPtrData(const PTA_float &ptr):
 ////////////////////////////////////////////////////////////////////
 //  Function: Shader::ShaderPtrData Constructor
 //  Access:
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 INLINE Shader::ShaderPtrData::
 ShaderPtrData(const PTA_LMatrix4f &ptr):
@@ -228,7 +232,7 @@ ShaderPtrData(const PTA_LMatrix4f &ptr):
 ////////////////////////////////////////////////////////////////////
 //  Function: Shader::ShaderPtrData Constructor
 //  Access:
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 INLINE Shader::ShaderPtrData::
 ShaderPtrData(const PTA_LMatrix3f &ptr):
@@ -243,7 +247,7 @@ ShaderPtrData(const PTA_LMatrix3f &ptr):
 ////////////////////////////////////////////////////////////////////
 //  Function: Shader::ShaderPtrData Constructor
 //  Access:
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 INLINE Shader::ShaderPtrData::
 ShaderPtrData(const PTA_LVecBase4f &ptr):
@@ -258,7 +262,7 @@ ShaderPtrData(const PTA_LVecBase4f &ptr):
 ////////////////////////////////////////////////////////////////////
 //  Function: Shader::ShaderPtrData Constructor
 //  Access:
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 INLINE Shader::ShaderPtrData::
 ShaderPtrData(const PTA_LVecBase3f &ptr):
@@ -273,7 +277,7 @@ ShaderPtrData(const PTA_LVecBase3f &ptr):
 ////////////////////////////////////////////////////////////////////
 //  Function: Shader::ShaderPtrData Constructor
 //  Access:
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 INLINE Shader::ShaderPtrData::
 ShaderPtrData(const PTA_LVecBase2f &ptr):
@@ -288,7 +292,7 @@ ShaderPtrData(const PTA_LVecBase2f &ptr):
 ////////////////////////////////////////////////////////////////////
 //  Function: Shader::ShaderPtrData Constructor
 //  Access:
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 INLINE Shader::ShaderPtrData::
 ShaderPtrData(const LVecBase4f &vec) :
@@ -306,7 +310,7 @@ ShaderPtrData(const LVecBase4f &vec) :
 ////////////////////////////////////////////////////////////////////
 //  Function: Shader::ShaderPtrData Constructor
 //  Access:
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 INLINE Shader::ShaderPtrData::
 ShaderPtrData(const LVecBase3f &vec) :
@@ -324,7 +328,7 @@ ShaderPtrData(const LVecBase3f &vec) :
 ////////////////////////////////////////////////////////////////////
 //  Function: Shader::ShaderPtrData Constructor
 //  Access:
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 INLINE Shader::ShaderPtrData::
 ShaderPtrData(const LVecBase2f &vec) :
@@ -342,7 +346,7 @@ ShaderPtrData(const LVecBase2f &vec) :
 ////////////////////////////////////////////////////////////////////
 //  Function: Shader::ShaderPtrData Constructor
 //  Access:
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 INLINE Shader::ShaderPtrData::
 ShaderPtrData(const LMatrix4f &mat) :
@@ -360,7 +364,7 @@ ShaderPtrData(const LMatrix4f &mat) :
 ////////////////////////////////////////////////////////////////////
 //  Function: Shader::ShaderPtrData Constructor
 //  Access:
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 INLINE Shader::ShaderPtrData::
 ShaderPtrData(const LMatrix3f &mat) :
@@ -378,7 +382,7 @@ ShaderPtrData(const LMatrix3f &mat) :
 ////////////////////////////////////////////////////////////////////
 //  Function: Shader::ShaderPtrData Constructor
 //  Access:
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 INLINE Shader::ShaderPtrData::
 ShaderPtrData(const PTA_double &ptr):
@@ -393,7 +397,7 @@ ShaderPtrData(const PTA_double &ptr):
 ////////////////////////////////////////////////////////////////////
 //  Function: Shader::ShaderPtrData Constructor
 //  Access:
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 INLINE Shader::ShaderPtrData::
 ShaderPtrData(const PTA_LMatrix4d &ptr):
@@ -408,7 +412,7 @@ ShaderPtrData(const PTA_LMatrix4d &ptr):
 ////////////////////////////////////////////////////////////////////
 //  Function: Shader::ShaderPtrData Constructor
 //  Access:
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 INLINE Shader::ShaderPtrData::
 ShaderPtrData(const PTA_LMatrix3d &ptr):
@@ -423,7 +427,7 @@ ShaderPtrData(const PTA_LMatrix3d &ptr):
 ////////////////////////////////////////////////////////////////////
 //  Function: Shader::ShaderPtrData Constructor
 //  Access:
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 INLINE Shader::ShaderPtrData::
 ShaderPtrData(const PTA_LVecBase4d &ptr):
@@ -438,7 +442,7 @@ ShaderPtrData(const PTA_LVecBase4d &ptr):
 ////////////////////////////////////////////////////////////////////
 //  Function: Shader::ShaderPtrData Constructor
 //  Access:
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 INLINE Shader::ShaderPtrData::
 ShaderPtrData(const PTA_LVecBase3d &ptr):
@@ -453,7 +457,7 @@ ShaderPtrData(const PTA_LVecBase3d &ptr):
 ////////////////////////////////////////////////////////////////////
 //  Function: Shader::ShaderPtrData Constructor
 //  Access:
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 INLINE Shader::ShaderPtrData::
 ShaderPtrData(const PTA_LVecBase2d &ptr):
@@ -468,7 +472,7 @@ ShaderPtrData(const PTA_LVecBase2d &ptr):
 ////////////////////////////////////////////////////////////////////
 //  Function: Shader::ShaderPtrData Constructor
 //  Access:
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 INLINE Shader::ShaderPtrData::
 ShaderPtrData(const LVecBase4d &vec) :
@@ -486,7 +490,7 @@ ShaderPtrData(const LVecBase4d &vec) :
 ////////////////////////////////////////////////////////////////////
 //  Function: Shader::ShaderPtrData Constructor
 //  Access:
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 INLINE Shader::ShaderPtrData::
 ShaderPtrData(const LVecBase3d &vec) :
@@ -504,7 +508,7 @@ ShaderPtrData(const LVecBase3d &vec) :
 ////////////////////////////////////////////////////////////////////
 //  Function: Shader::ShaderPtrData Constructor
 //  Access:
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 INLINE Shader::ShaderPtrData::
 ShaderPtrData(const LVecBase2d &vec) :
@@ -522,7 +526,7 @@ ShaderPtrData(const LVecBase2d &vec) :
 ////////////////////////////////////////////////////////////////////
 //  Function: Shader::ShaderPtrData Constructor
 //  Access:
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 INLINE Shader::ShaderPtrData::
 ShaderPtrData(const LMatrix4d &mat) :
@@ -540,7 +544,7 @@ ShaderPtrData(const LMatrix4d &mat) :
 ////////////////////////////////////////////////////////////////////
 //  Function: Shader::ShaderPtrData Constructor
 //  Access:
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 INLINE Shader::ShaderPtrData::
 ShaderPtrData(const LMatrix3d &mat) :
@@ -558,7 +562,7 @@ ShaderPtrData(const LMatrix3d &mat) :
 ////////////////////////////////////////////////////////////////////
 //  Function: Shader::ShaderPtrData Constructor
 //  Access:
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 INLINE Shader::ShaderPtrData::
 ShaderPtrData(const PTA_int &ptr):
@@ -573,7 +577,7 @@ ShaderPtrData(const PTA_int &ptr):
 ////////////////////////////////////////////////////////////////////
 //  Function: Shader::ShaderPtrData Constructor
 //  Access:
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 INLINE Shader::ShaderPtrData::
 ShaderPtrData(const PTA_LVecBase4i &ptr):
@@ -588,7 +592,7 @@ ShaderPtrData(const PTA_LVecBase4i &ptr):
 ////////////////////////////////////////////////////////////////////
 //  Function: Shader::ShaderPtrData Constructor
 //  Access:
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 INLINE Shader::ShaderPtrData::
 ShaderPtrData(const PTA_LVecBase3i &ptr):
@@ -603,7 +607,7 @@ ShaderPtrData(const PTA_LVecBase3i &ptr):
 ////////////////////////////////////////////////////////////////////
 //  Function: Shader::ShaderPtrData Constructor
 //  Access:
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 INLINE Shader::ShaderPtrData::
 ShaderPtrData(const PTA_LVecBase2i &ptr):
@@ -618,7 +622,7 @@ ShaderPtrData(const PTA_LVecBase2i &ptr):
 ////////////////////////////////////////////////////////////////////
 //  Function: Shader::ShaderPtrData Constructor
 //  Access:
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 INLINE Shader::ShaderPtrData::
 ShaderPtrData(const LVecBase4i &vec) :
@@ -636,7 +640,7 @@ ShaderPtrData(const LVecBase4i &vec) :
 ////////////////////////////////////////////////////////////////////
 //  Function: Shader::ShaderPtrData Constructor
 //  Access:
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 INLINE Shader::ShaderPtrData::
 ShaderPtrData(const LVecBase3i &vec) :
@@ -654,7 +658,7 @@ ShaderPtrData(const LVecBase3i &vec) :
 ////////////////////////////////////////////////////////////////////
 //  Function: Shader::ShaderPtrData Constructor
 //  Access:
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 INLINE Shader::ShaderPtrData::
 ShaderPtrData(const LVecBase2i &vec) :
@@ -753,8 +757,8 @@ ShaderFile(const string &shared) :
 //  Description:
 ////////////////////////////////////////////////////////////////////
 INLINE Shader::ShaderFile::
-ShaderFile(const string &vertex, 
-           const string &fragment, 
+ShaderFile(const string &vertex,
+           const string &fragment,
            const string &geometry,
            const string &tess_control,
            const string &tess_evaluation) :
@@ -811,3 +815,62 @@ read_datagram(DatagramIterator &scan) {
     _shared = scan.get_string();
   }
 }
+
+////////////////////////////////////////////////////////////////////
+//     Function: Shader::ShaderFile::operator <
+//       Access: Public
+//  Description: Ordering operator
+////////////////////////////////////////////////////////////////////
+INLINE bool Shader::ShaderFile::
+operator < (const Shader::ShaderFile &other) const {
+  if (_separate != other._separate) {
+    return (!_separate && other._separate);
+  }
+  if (_shared != other._shared) {
+    return (_shared < other._shared);
+  }
+  if (_vertex != other._vertex) {
+    return (_vertex < other._vertex);
+  }
+  if (_fragment != other._fragment) {
+    return (_fragment < other._fragment);
+  }
+  if (_geometry != other._geometry) {
+    return (_geometry < other._geometry);
+  }
+  if (_tess_control != other._tess_control) {
+    return (_tess_control < other._tess_control);
+  }
+  if (_tess_evaluation != other._tess_evaluation) {
+    return (_tess_evaluation < other._tess_evaluation);
+  }
+  if (_compute != other._compute) {
+    return (_compute < other._compute);
+  }
+  return false;
+}
+
+////////////////////////////////////////////////////////////////////
+//     Function: Shader::get_filename_from_index
+//       Access: Public
+//  Description: Returns the filename of the included shader with
+//               the given source file index (as recorded in the
+//               #line statement in r_preprocess_source).  We use
+//               this to associate error messages with included files.
+////////////////////////////////////////////////////////////////////
+INLINE Filename Shader::
+get_filename_from_index(int index, ShaderType type) const {
+  if (index == 0) {
+    Filename fn = get_filename(type);
+    if (!fn.empty()) {
+      return fn;
+    }
+  } else if (glsl_preprocess && index > 2048 &&
+             (index - 2048) < (int)_included_files.size()) {
+    return _included_files[index - 2048];
+  }
+  // Must be a mistake.  Quietly put back the integer.
+  char str[32];
+  sprintf(str, "%d", index);
+  return Filename(str);
+}
diff --git a/panda/src/gobj/shader.cxx b/panda/src/gobj/shader.cxx
index 1482613b4f..ced776921d 100755
--- a/panda/src/gobj/shader.cxx
+++ b/panda/src/gobj/shader.cxx
@@ -17,6 +17,7 @@
 #include "shader.h"
 #include "preparedGraphicsObjects.h"
 #include "virtualFileSystem.h"
+#include "config_util.h"
 
 #ifdef HAVE_CG
 #include <Cg/cg.h>
@@ -29,6 +30,10 @@ Shader::ShaderCaps Shader::_default_caps;
 int Shader::_shaders_generated;
 ShaderUtilization Shader::_shader_utilization = SUT_unspecified;
 
+#ifdef HAVE_CG
+CGcontext Shader::_cg_context = 0;
+#endif
+
 ////////////////////////////////////////////////////////////////////
 //     Function: Shader::cp_report_error
 //       Access: Public
@@ -36,8 +41,8 @@ ShaderUtilization Shader::_shader_utilization = SUT_unspecified;
 //               of the specified parameter.
 ////////////////////////////////////////////////////////////////////
 void Shader::
-cp_report_error(ShaderArgInfo &p, const string &msg) { 
-  
+cp_report_error(ShaderArgInfo &p, const string &msg) {
+
   string vstr;
   if (p._varying) {
     vstr = "varying ";
@@ -96,7 +101,7 @@ cp_report_error(ShaderArgInfo &p, const string &msg) {
   }
 
   Filename fn = get_filename(p._id._type);
-  p._cat->error() << fn << ": " << vstr << dstr << tstr << 
+  p._cat->error() << fn << ": " << vstr << dstr << tstr <<
     p._id._name << ": " << msg << "\n";
 }
 
@@ -201,7 +206,7 @@ cp_errchk_parameter_float(ShaderArgInfo &p, int lo, int hi)
 ////////////////////////////////////////////////////////////////////
 //     Function: Shader::cp_errchk_parameter_ptr
 //       Access: Public, Static
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 bool Shader::
 cp_errchk_parameter_ptr(ShaderArgInfo &p) {
@@ -215,7 +220,7 @@ cp_errchk_parameter_ptr(ShaderArgInfo &p) {
     case SAC_vector: return true;
     case SAC_matrix: return true;
     default:
-      string msg = "unsupported array subclass."; 
+      string msg = "unsupported array subclass.";
       cp_report_error(p, msg);
       return false;
     }
@@ -421,7 +426,7 @@ cp_dependency(ShaderMatInput inp) {
       (inp == SMO_satten_x) ||
       (inp == SMO_mat_constant_x) ||
       (inp == SMO_vec_constant_x) ||
-      (inp == SMO_clipplane_x) ||
+      (inp == SMO_vec_constant_x_attrib) ||
       (inp == SMO_view_x_to_view) ||
       (inp == SMO_view_to_view_x) ||
       (inp == SMO_apiview_x_to_view) ||
@@ -432,6 +437,19 @@ cp_dependency(ShaderMatInput inp) {
       (inp == SMO_view_to_apiclip_x)) {
     dep |= SSD_shaderinputs;
   }
+  if ((inp == SMO_light_ambient) ||
+      (inp == SMO_light_source_i_attrib)) {
+    dep |= SSD_light;
+  }
+  if ((inp == SMO_light_product_i_ambient) ||
+      (inp == SMO_light_product_i_diffuse) ||
+      (inp == SMO_light_product_i_specular)) {
+    dep |= (SSD_light | SSD_material);
+  }
+  if ((inp == SMO_clipplane_x) ||
+      (inp == SMO_apiview_clipplane_i)) {
+    dep |= SSD_clip_planes;
+  }
 
   return dep;
 }
@@ -477,48 +495,56 @@ cp_optimize_mat_spec(ShaderMatSpec &spec) {
 ////////////////////////////////////////////////////////////////////
 //     Function: Shader::cg_recurse_parameters
 //       Access: Public
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
-void Shader::cg_recurse_parameters(CGparameter parameter, 
-    const ShaderType& type, bool& success) {
+void Shader::
+cg_recurse_parameters(CGparameter parameter, const ShaderType &type,
+                      bool &success) {
 
-  if (parameter == 0)
+  if (parameter == 0) {
     return;
+  }
 
   do {
-    int                arg_dim[]    = {1,0,0};
-    ShaderArgDir       arg_dir      = cg_parameter_dir(parameter);
-    ShaderArgType      arg_type     = cg_parameter_type(parameter);
-    ShaderArgClass     arg_class    = cg_parameter_class(parameter);
-    ShaderArgClass     arg_subclass = arg_class;
+    if (cgIsParameterReferenced(parameter)) {
+      int                arg_dim[]    = {1,0,0};
+      ShaderArgDir       arg_dir      = cg_parameter_dir(parameter);
+      ShaderArgType      arg_type     = cg_parameter_type(parameter);
+      ShaderArgClass     arg_class    = cg_parameter_class(parameter);
+      ShaderArgClass     arg_subclass = arg_class;
 
-    CGenum vbl = cgGetParameterVariability(parameter);
+      CGenum vbl = cgGetParameterVariability(parameter);
 
-    if ((vbl==CG_VARYING)||(vbl==CG_UNIFORM)) {
-      switch (cgGetParameterType(parameter)) {
-        case CG_STRUCT:
-          cg_recurse_parameters(
-            cgGetFirstStructParameter(parameter), type, success);
-          break;
+      if ((vbl==CG_VARYING)||(vbl==CG_UNIFORM)) {
+        switch (cgGetParameterType(parameter)) {
+          case CG_STRUCT:
+            cg_recurse_parameters(
+              cgGetFirstStructParameter(parameter), type, success);
+            break;
 
-        case CG_ARRAY:
-          arg_type = cg_parameter_type(cgGetArrayParameter(parameter, 0));
-          arg_subclass = cg_parameter_class(cgGetArrayParameter(parameter, 0));
+          case CG_ARRAY:
+            arg_type = cg_parameter_type(cgGetArrayParameter(parameter, 0));
+            arg_subclass = cg_parameter_class(cgGetArrayParameter(parameter, 0));
 
-          arg_dim[0]  = cgGetArraySize(parameter, 0);
+            arg_dim[0]  = cgGetArraySize(parameter, 0);
 
-        default: {
-          arg_dim[1] = cgGetParameterRows(parameter);
-          arg_dim[2] = cgGetParameterColumns(parameter);
+          default: {
+            arg_dim[1] = cgGetParameterRows(parameter);
+            arg_dim[2] = cgGetParameterColumns(parameter);
 
-          ShaderArgId id;
-          id._name = cgGetParameterName(parameter);
-          id._type  = type;
-          id._seqno = -1;
-          success &= compile_parameter(id, arg_class, arg_subclass, arg_type, 
-              arg_dir, (vbl == CG_VARYING), arg_dim, gobj_cat.get_safe_ptr()); break;
+            ShaderArgId id;
+            id._name = cgGetParameterName(parameter);
+            id._type  = type;
+            id._seqno = -1;
+            success &= compile_parameter(id, arg_class, arg_subclass, arg_type,
+                arg_dir, (vbl == CG_VARYING), arg_dim, shader_cat.get_safe_ptr()); break;
+          }
         }
       }
+    } else if (shader_cat.is_debug()) {
+      shader_cat.debug()
+        << "Parameter " << cgGetParameterName(parameter)
+        << " is unreferenced within shader " << get_filename(type) << "\n";
     }
   } while((parameter = cgGetNextParameter(parameter))!= 0);
 }
@@ -560,15 +586,15 @@ compile_parameter(const ShaderArgId        &arg_id,
   // It could be inside a struct, strip off
   // everything before the last dot.
   size_t loc = p._id._name.find_last_of('.');
-  
+
   string basename (p._id._name);
   string struct_name  ("");
-  
-  if (loc < string::npos) { 
+
+  if (loc < string::npos) {
     basename = p._id._name.substr(loc + 1);
     struct_name =  p._id._name.substr(0,loc+1);
   }
-  
+
   // Split it at the underscores.
   vector_string pieces;
   tokenize(basename, pieces, "_");
@@ -623,7 +649,7 @@ compile_parameter(const ShaderArgId        &arg_id,
     }
 
     bind._name = InternalName::get_root();
-    for (int i = 1; i < pieces.size(); ++i) {
+    for (size_t i = 1; i < pieces.size(); ++i) {
       bind._name = bind._name->append(pieces[i]);
     }
     _var_spec.push_back(bind);
@@ -1084,8 +1110,10 @@ compile_parameter(const ShaderArgId        &arg_id,
       cp_report_error(p, "Invalid type for a tex-parameter");
       return false;
     }
-    if (pieces.size()==3) {
+    if (pieces.size() == 3) {
       bind._suffix = InternalName::make(((string)"-") + pieces[2]);
+      shader_cat.warning()
+        << "Parameter " << p._id._name << ": use of a texture suffix is deprecated.\n";
     }
     _tex_spec.push_back(bind);
     return true;
@@ -1144,21 +1172,21 @@ compile_parameter(const ShaderArgId        &arg_id,
   }
 
   // Fetch uniform parameters without prefix
-  
+
   if ((!cp_errchk_parameter_in(p)) ||
       (!cp_errchk_parameter_uniform(p))) {
     return false;
   }
   bool k_prefix  = false;
-  
+
   // solve backward compatibility issue
   if (pieces[0] == "k") {
     k_prefix = true;
     basename = basename.substr(2);
   }
-  
+
   PT(InternalName) kinputname = InternalName::make(struct_name + basename);
-  
+
   switch (p._class) {
   case SAC_vector:
   case SAC_matrix:
@@ -1166,7 +1194,7 @@ compile_parameter(const ShaderArgId        &arg_id,
   case SAC_array: {
     if (!cp_errchk_parameter_ptr(p))
       return false;
-  
+
     ShaderPtrSpec bind;
     bind._id      = arg_id;
     bind._arg     = kinputname;
@@ -1372,10 +1400,6 @@ cg_release_resources() {
     cgDestroyProgram(_cg_gprogram);
     _cg_gprogram = 0;
   }
-  if (_cg_context != 0) {
-    cgDestroyContext(_cg_context);
-    _cg_context = 0;
-  }
 }
 
 ////////////////////////////////////////////////////////////////////
@@ -1384,7 +1408,8 @@ cg_release_resources() {
 //  Description: xyz
 ////////////////////////////////////////////////////////////////////
 CGprogram Shader::
-cg_compile_entry_point(const char *entry, const ShaderCaps &caps, ShaderType type) {
+cg_compile_entry_point(const char *entry, const ShaderCaps &caps,
+                       CGcontext context, ShaderType type) {
   CGprogram prog;
   CGerror err;
   const char *compiler_args[100];
@@ -1439,22 +1464,22 @@ cg_compile_entry_point(const char *entry, const ShaderCaps &caps, ShaderType typ
 
   if ((active != (int)CG_PROFILE_UNKNOWN) && (active != ultimate)) {
     // Print out some debug information about what we're doing.
-    if (gobj_cat.is_debug()) {
-      gobj_cat.debug()
+    if (shader_cat.is_debug()) {
+      shader_cat.debug()
         << "Compiling Cg shader " << get_filename(type) << " with entry point " << entry
         << " and active profile " << cgGetProfileString((CGprofile) active) << "\n";
 
       if (nargs > 0) {
-        gobj_cat.debug() << "Using compiler arguments:";
+        shader_cat.debug() << "Using compiler arguments:";
         for (int i = 0; i < nargs; ++i) {
-          gobj_cat.debug(false) << " " << compiler_args[i];
+          shader_cat.debug(false) << " " << compiler_args[i];
         }
-        gobj_cat.debug(false) << "\n";
+        shader_cat.debug(false) << "\n";
       }
     }
 
     // Compile the shader with the active profile.
-    prog = cgCreateProgram(_cg_context, CG_SOURCE, text.c_str(),
+    prog = cgCreateProgram(context, CG_SOURCE, text.c_str(),
                            (CGprofile)active, entry, (const char **)compiler_args);
     err = cgGetError();
     if (err == CG_NO_ERROR) {
@@ -1463,43 +1488,48 @@ cg_compile_entry_point(const char *entry, const ShaderCaps &caps, ShaderType typ
     if (prog != 0) {
       cgDestroyProgram(prog);
     }
-    if (gobj_cat.is_debug()) {
-      gobj_cat.debug()
+    if (shader_cat.is_debug()) {
+      shader_cat.debug()
         << "Compilation with active profile failed: " << cgGetErrorString(err) << "\n";
     }
   }
 
-  if (gobj_cat.is_debug()) {
-    gobj_cat.debug()
+  if (shader_cat.is_debug()) {
+    shader_cat.debug()
       << "Compiling Cg shader " << get_filename(type) << " with entry point " << entry
       << " and ultimate profile " << cgGetProfileString((CGprofile) ultimate) << "\n";
   }
 
   // The active profile failed, so recompile it with the ultimate profile.
-  prog = cgCreateProgram(_cg_context, CG_SOURCE, text.c_str(),
+  prog = cgCreateProgram(context, CG_SOURCE, text.c_str(),
                          (CGprofile)ultimate, entry, (const char **)NULL);
+
+  // Extract the output listing.
   err = cgGetError();
+  const char *listing = cgGetLastListing(context);
+
+  if (err == CG_NO_ERROR && listing != NULL && strlen(listing) > 1) {
+    shader_cat.warning()
+      << "Encountered warnings during compilation of " << get_filename(type)
+      << ":\n" << listing;
+
+  } else if (err == CG_COMPILER_ERROR) {
+    shader_cat.error()
+      << "Failed to compile Cg shader " << get_filename(type);
+    if (listing != NULL) {
+      shader_cat.error(false) << ":\n" << listing;
+    } else {
+      shader_cat.error(false) << "!\n";
+    }
+  }
+
   if (err == CG_NO_ERROR) {
     return prog;
   }
-  if (err == CG_COMPILER_ERROR) {
-    // A compiler error has occurred.  Extract the error messages.
-    string listing = cgGetLastListing(_cg_context);
-    vector_string errlines;
-    tokenize(listing, errlines, "\n");
-    for (int i = 0; i < (int) errlines.size(); ++i) {
-      string line = trim(errlines[i]);
-      if (line != "") {
-        gobj_cat.error() << get_filename(type) << ": " << errlines[i] << "\n";
-      }
-    }
-  } else {
-    gobj_cat.error() << get_filename(type) << ": " << cgGetErrorString(err) << "\n";
-  }
+
   if (prog != 0) {
     cgDestroyProgram(prog);
   }
-
   return 0;
 }
 
@@ -1511,29 +1541,11 @@ cg_compile_entry_point(const char *entry, const ShaderCaps &caps, ShaderType typ
 //               variables _cg_context, _cg_vprogram, _cg_fprogram.
 ////////////////////////////////////////////////////////////////////
 bool Shader::
-cg_compile_shader(const ShaderCaps &caps) {
-
-  // If we already tried compiling for this set of caps, there's no point
-  // trying again.  Just return the results of the previous compile.
-  if (caps == _cg_last_caps) {
-    if (_cg_context == 0) {
-      return false;
-    } else {
-      return true;
-    }
-  }
-
+cg_compile_shader(const ShaderCaps &caps, CGcontext context) {
   _cg_last_caps = caps;
 
-  _cg_context = cgCreateContext();
-
-  if (_cg_context == 0) {
-    gobj_cat.error() << "Could not create a Cg context object.\n";
-    return false;
-  }
-
-  if (!_text->_separate || !_text->_vertex.empty()) {
-    _cg_vprogram = cg_compile_entry_point("vshader", caps, ST_vertex);
+  if (!_text._separate || !_text._vertex.empty()) {
+    _cg_vprogram = cg_compile_entry_point("vshader", caps, context, ST_vertex);
     if (_cg_vprogram == 0) {
       cg_release_resources();
       return false;
@@ -1541,8 +1553,8 @@ cg_compile_shader(const ShaderCaps &caps) {
     _cg_vprofile = cgGetProgramProfile(_cg_vprogram);
   }
 
-  if (!_text->_separate || !_text->_fragment.empty()) {
-    _cg_fprogram = cg_compile_entry_point("fshader", caps, ST_fragment);
+  if (!_text._separate || !_text._fragment.empty()) {
+    _cg_fprogram = cg_compile_entry_point("fshader", caps, context, ST_fragment);
     if (_cg_fprogram == 0) {
       cg_release_resources();
       return false;
@@ -1550,8 +1562,8 @@ cg_compile_shader(const ShaderCaps &caps) {
     _cg_fprofile = cgGetProgramProfile(_cg_fprogram);
   }
 
-  if ((_text->_separate && !_text->_geometry.empty()) || (!_text->_separate && _text->_shared.find("gshader") != string::npos)) {
-    _cg_gprogram = cg_compile_entry_point("gshader", caps, ST_geometry);
+  if ((_text._separate && !_text._geometry.empty()) || (!_text._separate && _text._shared.find("gshader") != string::npos)) {
+    _cg_gprogram = cg_compile_entry_point("gshader", caps, context, ST_geometry);
     if (_cg_gprogram == 0) {
       cg_release_resources();
       return false;
@@ -1560,34 +1572,34 @@ cg_compile_shader(const ShaderCaps &caps) {
   }
 
   if (_cg_vprogram == 0 && _cg_fprogram == 0 && _cg_gprogram == 0) {
-    gobj_cat.error() << "Shader must at least have one program!\n";
+    shader_cat.error() << "Shader must at least have one program!\n";
     cg_release_resources();
     return false;
   }
 
   // DEBUG: output the generated program
-  if (gobj_cat.is_debug()) {
+  if (shader_cat.is_debug()) {
     const char *vertex_program;
     const char *fragment_program;
     const char *geometry_program;
 
     if (_cg_vprogram != 0) {
-      gobj_cat.debug()
+      shader_cat.debug()
         << "Cg vertex profile: " << cgGetProfileString((CGprofile)_cg_vprofile) << "\n";
       vertex_program = cgGetProgramString(_cg_vprogram, CG_COMPILED_PROGRAM);
-      gobj_cat.debug() << vertex_program << "\n";
+      shader_cat.debug() << vertex_program << "\n";
     }
     if (_cg_fprogram != 0) {
-      gobj_cat.debug()
+      shader_cat.debug()
         << "Cg fragment profile: " << cgGetProfileString((CGprofile)_cg_fprofile) << "\n";
       fragment_program = cgGetProgramString(_cg_fprogram, CG_COMPILED_PROGRAM);
-      gobj_cat.debug() << fragment_program << "\n";
+      shader_cat.debug() << fragment_program << "\n";
     }
     if (_cg_gprogram != 0) {
-      gobj_cat.debug()
+      shader_cat.debug()
         << "Cg geometry profile: " << cgGetProfileString((CGprofile)_cg_gprofile) << "\n";
       geometry_program = cgGetProgramString(_cg_gprogram, CG_COMPILED_PROGRAM);
-      gobj_cat.debug() << geometry_program << "\n";
+      shader_cat.debug() << geometry_program << "\n";
     }
   }
 
@@ -1603,11 +1615,10 @@ bool Shader::
 cg_analyze_entry_point(CGprogram prog, ShaderType type) {
   bool success = true;
 
-  cg_recurse_parameters(cgGetFirstParameter(prog, CG_PROGRAM),type,success);
+  cg_recurse_parameters(cgGetFirstParameter(prog, CG_PROGRAM), type, success);
   return success;
 }
 
-
 ////////////////////////////////////////////////////////////////////
 //     Function: Shader::cg_analyze_shader
 //       Access: Private
@@ -1643,7 +1654,18 @@ cg_analyze_entry_point(CGprogram prog, ShaderType type) {
 bool Shader::
 cg_analyze_shader(const ShaderCaps &caps) {
 
-  if (!cg_compile_shader(caps)) {
+  // Make sure we have a context for analyzing the shader.
+  if (_cg_context == 0) {
+    _cg_context = cgCreateContext();
+    if (_cg_context == 0) {
+      shader_cat.error()
+        << "Could not create a Cg context object: "
+        << cgGetErrorString(cgGetError()) << "\n";
+      return false;
+    }
+  }
+
+  if (!cg_compile_shader(caps, _cg_context)) {
     return false;
   }
 
@@ -1656,7 +1678,7 @@ cg_analyze_shader(const ShaderCaps &caps) {
   }
 
   if (_var_spec.size() != 0) {
-    gobj_cat.error() << "Cannot use vtx parameters in an fshader\n";
+    shader_cat.error() << "Cannot use vtx parameters in an fshader\n";
     cg_release_resources();
     clear_parameters();
     return false;
@@ -1691,7 +1713,7 @@ cg_analyze_shader(const ShaderCaps &caps) {
   }
 
   for (int i=0; i<(int)_ptr_spec.size(); i++) {
-    _ptr_spec[i]._id._seqno = seqno++; 
+    _ptr_spec[i]._id._seqno = seqno++;
     _ptr_spec[i]._info._id = _ptr_spec[i]._id;
   }
 
@@ -1779,26 +1801,19 @@ cg_analyze_shader(const ShaderCaps &caps) {
 ////////////////////////////////////////////////////////////////////
 CGprogram Shader::
 cg_program_from_shadertype(ShaderType type) {
-  CGprogram prog;
-
   switch (type) {
-    case ST_vertex:
-      prog = _cg_vprogram;
-      break;
+  case ST_vertex:
+    return _cg_vprogram;
 
-    case ST_fragment:
-      prog = _cg_fprogram;
-      break;
+  case ST_fragment:
+    return _cg_fprogram;
 
-    case ST_geometry:
-      prog = _cg_gprogram;
-      break;
+  case ST_geometry:
+    return _cg_gprogram;
 
-    default:
-      prog = 0;
-  };
-
-  return prog;
+  default:
+    return 0;
+  }
 }
 
 ////////////////////////////////////////////////////////////////////
@@ -1810,26 +1825,18 @@ cg_program_from_shadertype(ShaderType type) {
 //               longer own them.
 ////////////////////////////////////////////////////////////////////
 bool Shader::
-cg_compile_for(const ShaderCaps &caps,
-               CGcontext &ctx,
-               CGprogram &vprogram,
-               CGprogram &fprogram,
-               CGprogram &gprogram,
-               pvector<CGparameter> &map) {
+cg_compile_for(const ShaderCaps &caps, CGcontext context,
+               CGprogram &combined_program, pvector<CGparameter> &map) {
 
   // Initialize the return values to empty.
-  ctx = 0;
-  vprogram = 0;
-  fprogram = 0;
-  gprogram = 0;
-
+  combined_program = 0;
   map.clear();
 
   // Make sure the shader is compiled for the target caps.
   // Most of the time, it will already be - this is usually a no-op.
 
   _default_caps = caps;
-  if (!cg_compile_shader(caps)) {
+  if (!cg_compile_shader(caps, context)) {
     return false;
   }
 
@@ -1837,26 +1844,42 @@ cg_compile_for(const ShaderCaps &caps,
   // active one, it means the active one isn't powerful enough to
   // compile the shader.
   if (_cg_vprogram != 0 && _cg_vprofile != caps._active_vprofile) {
-    gobj_cat.error() << "Cg vertex program not supported by profile "
+    shader_cat.error() << "Cg vertex program not supported by profile "
       << cgGetProfileString((CGprofile) caps._active_vprofile) << ": "
       << get_filename(ST_vertex) << ". Try choosing a different profile.\n";
     return false;
   }
   if (_cg_fprogram != 0 && _cg_fprofile != caps._active_fprofile) {
-    gobj_cat.error() << "Cg fragment program not supported by profile "
+    shader_cat.error() << "Cg fragment program not supported by profile "
       << cgGetProfileString((CGprofile) caps._active_fprofile) << ": "
       << get_filename(ST_fragment) << ". Try choosing a different profile.\n";
     return false;
   }
   if (_cg_gprogram != 0 && _cg_gprofile != caps._active_gprofile) {
-    gobj_cat.error() << "Cg geometry program not supported by profile "
+    shader_cat.error() << "Cg geometry program not supported by profile "
       << cgGetProfileString((CGprofile) caps._active_gprofile) << ": "
       << get_filename(ST_geometry) << ". Try choosing a different profile.\n";
     return false;
   }
 
-  // Build a parameter map.
+  // Gather the programs we will be combining.
+  pvector<CGprogram> programs;
+  if (_cg_vprogram != 0) {
+    programs.push_back(_cg_vprogram);
+  }
+  if (_cg_fprogram != 0) {
+    programs.push_back(_cg_fprogram);
+  }
+  if (_cg_gprogram != 0) {
+    programs.push_back(_cg_gprogram);
+  }
 
+  // Combine the programs.  This can be more optimal than loading them
+  // individually, and it is even necessary for some profiles
+  // (particularly GLSL profiles on non-NVIDIA GPUs).
+  combined_program = cgCombinePrograms(programs.size(), &programs[0]);
+
+  // Build a parameter map.
   int n_mat = (int)_mat_spec.size();
   int n_tex = (int)_tex_spec.size();
   int n_var = (int)_var_spec.size();
@@ -1864,46 +1887,103 @@ cg_compile_for(const ShaderCaps &caps,
 
   map.resize(n_mat + n_tex + n_var + n_ptr);
 
-  for (int i=0; i<n_mat; i++) {
+  // This is a bit awkward, we have to go in and seperate out the
+  // combined program, since all the parameter bindings have changed.
+  CGprogram programs_by_type[ST_COUNT];
+  for (int i = 0; i < cgGetNumProgramDomains(combined_program); ++i) {
+    // Conveniently, the CGdomain enum overlaps with ShaderType.
+    CGprogram program = cgGetProgramDomainProgram(combined_program, i);
+    programs_by_type[cgGetProgramDomain(program)] = program;
+  }
+
+  for (int i = 0; i < n_mat; ++i) {
     const ShaderArgId &id = _mat_spec[i]._id;
-
-    CGprogram prog = cg_program_from_shadertype(id._type);  // CG2 CHANGE
-    map[id._seqno] = cgGetNamedParameter(prog, id._name.c_str());
+    map[id._seqno] = cgGetNamedParameter(programs_by_type[id._type], id._name.c_str());
   }
-  for (int i=0; i<n_tex; i++) {
+
+  for (int i = 0; i < n_tex; ++i) {
     const ShaderArgId &id = _tex_spec[i]._id;
-    CGprogram prog = cg_program_from_shadertype(id._type);  // CG2 CHANGE
-    map[id._seqno] = cgGetNamedParameter(prog, id._name.c_str());
-    if (cgGetParameterBaseResource(map[id._seqno]) == CG_UNDEFINED) {
-      map[id._seqno] = 0;
-    }
-  }
-  for (int i=0; i<n_var; i++) {
-    const ShaderArgId &id = _var_spec[i]._id;
+    CGparameter p = cgGetNamedParameter(programs_by_type[id._type], id._name.c_str());
 
-    CGprogram prog = cg_program_from_shadertype(id._type);      // CG2 CHANGE
-    map[id._seqno] = cgGetNamedParameter(prog, id._name.c_str());
-    if (cgGetParameterBaseResource(map[id._seqno]) == CG_UNDEFINED) {
-      map[id._seqno] = 0;
+    if (shader_cat.is_debug()) {
+      const char *resource = cgGetParameterResourceName(p);
+      if (resource != NULL) {
+        shader_cat.debug() << "Texture parameter " << id._name
+                         << " is bound to resource " << resource << "\n";
+      }
     }
+    map[id._seqno] = p;
   }
-  for (int i=0; i<n_ptr; i++) { 
+
+  for (int i = 0; i < n_var; ++i) {
+    const ShaderArgId &id = _var_spec[i]._id;
+    CGparameter p = cgGetNamedParameter(programs_by_type[id._type], id._name.c_str());
+
+    const char *resource = cgGetParameterResourceName(p);
+    if (shader_cat.is_debug() && resource != NULL) {
+      shader_cat.debug()
+        << "Varying parameter " << id._name << " is bound to resource "
+        << cgGetParameterResourceName(p) << "\n";
+    }
+
+    if (cgGetParameterBaseResource(p) == CG_UNDEFINED) {
+      // I really don't know what this means, but it happens when I
+      // use the NORMAL0 semantic instead of NORMAL, or POSITION0
+      // instead of POSITION, etc.  Not catching this results in a
+      // continuous stream of errors at the renderer side.
+      shader_cat.error()
+        << "Varying parameter " << id._name;
+
+      const char *semantic = cgGetParameterSemantic(p);
+      if (semantic != NULL) {
+        shader_cat.error(false) << " : " << semantic;
+      }
+      if (resource != NULL) {
+        shader_cat.error(false) << " (bound to resource " << resource << ")";
+      }
+      shader_cat.error(false) << " is invalid!\n";
+
+#ifndef NDEBUG
+      // Let's try to give the developer a hint...
+      if (semantic != NULL) {
+        if (strcmp(semantic, "POSITION0") == 0) {
+          shader_cat.error() << "Try using the semantic POSITION instead of POSITION0.\n";
+        } else if (strcmp(semantic, "NORMAL0") == 0) {
+          shader_cat.error() << "Try using the semantic NORMAL instead of NORMAL0.\n";
+        } else if (strcmp(semantic, "DIFFUSE0") == 0) {
+          shader_cat.error() << "Try using the semantic DIFFUSE instead of DIFFUSE0.\n";
+        } else if (strcmp(semantic, "SPECULAR0") == 0) {
+          shader_cat.error() << "Try using the semantic SPECULAR instead of SPECULAR0.\n";
+        } else if (strcmp(semantic, "FOGCOORD0") == 0) {
+          shader_cat.error() << "Try using the semantic FOGCOORD instead of FOGCOORD0.\n";
+        } else if (strcmp(semantic, "PSIZE0") == 0) {
+          shader_cat.error() << "Try using the semantic PSIZE instead of PSIZE0.\n";
+        }
+      }
+#endif  // NDEBUG
+      p = 0;
+    }
+    map[id._seqno] = p;
+  }
+
+  for (int i = 0; i < n_ptr; ++i) {
     const ShaderArgId &id = _ptr_spec[i]._id;
-    
-    CGprogram prog = cg_program_from_shadertype(id._type);  // CG2 CHANGE
-    map[id._seqno] = cgGetNamedParameter(prog, id._name.c_str());
+    map[id._seqno] = cgGetNamedParameter(programs_by_type[id._type], id._name.c_str());
   }
 
   // Transfer ownership of the compiled shader.
-  ctx = _cg_context;
-  vprogram = _cg_vprogram;
-  fprogram = _cg_fprogram;
-  gprogram = _cg_gprogram;
-
-  _cg_context = 0;
-  _cg_vprogram = 0;
-  _cg_fprogram = 0;
-  _cg_gprogram = 0;
+  if (_cg_vprogram != 0) {
+    cgDestroyProgram(_cg_vprogram);
+    _cg_vprogram = 0;
+  }
+  if (_cg_fprogram != 0) {
+    cgDestroyProgram(_cg_fprogram);
+    _cg_fprogram = 0;
+  }
+  if (_cg_gprogram != 0) {
+    cgDestroyProgram(_cg_gprogram);
+    _cg_gprogram = 0;
+  }
 
   _cg_last_caps.clear();
 
@@ -1915,19 +1995,17 @@ cg_compile_for(const ShaderCaps &caps,
 //     Function: Shader::Constructor
 //       Access: Private
 //  Description: Construct a Shader that will be filled in using
-//               fillin() later.
+//               fillin() or read() later.
 ////////////////////////////////////////////////////////////////////
 Shader::
-Shader() :
+Shader(ShaderLanguage lang) :
   _error_flag(false),
-  _text(NULL),
-  _filename(NULL),
   _parse(0),
   _loaded(false),
-  _language(SL_none)
+  _language(lang),
+  _last_modified(0)
 {
 #ifdef HAVE_CG
-  _cg_context = 0;
   _cg_vprogram = 0;
   _cg_fprogram = 0;
   _cg_gprogram = 0;
@@ -1949,82 +2027,319 @@ Shader() :
 }
 
 ////////////////////////////////////////////////////////////////////
-//     Function: Shader::Constructor
+//     Function: Shader::read
 //       Access: Private
-//  Description: Construct a Shader.
+//  Description: Reads the shader from the given filename(s).
+//               Returns a boolean indicating success or failure.
 ////////////////////////////////////////////////////////////////////
-Shader::
-Shader(CPT(ShaderFile) filename, CPT(ShaderFile) text, const ShaderLanguage &lang) :
-  _error_flag(false),
-  _text(text),
-  _filename(filename),
-  _parse(0),
-  _loaded(false),
-  _language(lang)
-{
-#ifdef HAVE_CG
-  _cg_context = 0;
-  _cg_vprogram = 0;
-  _cg_fprogram = 0;
-  _cg_gprogram = 0;
-  _cg_vprofile = CG_PROFILE_UNKNOWN;
-  _cg_fprofile = CG_PROFILE_UNKNOWN;
-  _cg_gprofile = CG_PROFILE_UNKNOWN;
-  if (_default_caps._ultimate_vprofile == 0 || _default_caps._ultimate_vprofile == CG_PROFILE_UNKNOWN) {
-    _default_caps._active_vprofile = CG_PROFILE_UNKNOWN;
-    _default_caps._active_fprofile = CG_PROFILE_UNKNOWN;
-    _default_caps._active_gprofile = CG_PROFILE_UNKNOWN;
-    _default_caps._ultimate_vprofile = cgGetProfile("glslv");
-    _default_caps._ultimate_fprofile = cgGetProfile("glslf");
-    _default_caps._ultimate_gprofile = cgGetProfile("glslg");
-    if (_default_caps._ultimate_gprofile == CG_PROFILE_UNKNOWN) {
-      _default_caps._ultimate_gprofile = cgGetProfile("gp4gp");
-    }
-  }
-#endif
-  
-  // Determine which language the shader is written in.
-  if (_language == SL_none) {
-    string header;
-    parse_init();
-    parse_line(header, true, true);
-    if (header == "//Cg") {
-      _language = SL_Cg;
-    } else if (header == "//GLSL") {
-      _language = SL_GLSL;
-    }
-  }
-  
-  if (_language == SL_Cg) {
-#ifdef HAVE_CG
-    if (!_text->_separate) {
-      cg_get_profile_from_header(_default_caps);
+bool Shader::
+read(const ShaderFile &sfile) {
+  _text._separate = sfile._separate;
+
+  if (sfile._separate) {
+    if (_language == SL_none) {
+      shader_cat.error()
+        << "No shader language was specified!\n";
+      return false;
     }
 
-    if (!cg_analyze_shader(_default_caps)) {
-      _error_flag = true;
+    if (!sfile._vertex.empty() && !do_read_source(_text._vertex, sfile._vertex)) {
+      return false;
     }
-#else
-    gobj_cat.error()
-      << "Tried to load Cg shader, but no Cg support is enabled.\n";
-#endif
-  } else if (_language == SL_GLSL) {
-    // All of the important stuff is done in glShaderContext,
-    // to avoid gobj getting a dependency on OpenGL.
-    if (!_text->_separate) {
-      gobj_cat.error()
+    if (!sfile._fragment.empty() && !do_read_source(_text._fragment, sfile._fragment)) {
+      return false;
+    }
+    if (!sfile._geometry.empty() && !do_read_source(_text._geometry, sfile._geometry)) {
+      return false;
+    }
+    if (!sfile._tess_control.empty() && !do_read_source(_text._tess_control, sfile._tess_control)) {
+      return false;
+    }
+    if (!sfile._tess_evaluation.empty() && !do_read_source(_text._tess_evaluation, sfile._tess_evaluation)) {
+      return false;
+    }
+    if (!sfile._compute.empty() && !do_read_source(_text._compute, sfile._compute)) {
+      return false;
+    }
+    _filename = sfile;
+
+  } else {
+    if (!do_read_source(_text._shared, sfile._shared)) {
+      return false;
+    }
+    _filename = sfile;
+
+    // Determine which language the shader is written in.
+    if (_language == SL_none) {
+      string header;
+      parse_init();
+      parse_line(header, true, true);
+      if (header == "//Cg") {
+        _language = SL_Cg;
+      } else {
+        shader_cat.error()
+          << "Unable to determine shader language of " << sfile._shared << "\n";
+        return false;
+      }
+    } else if (_language == SL_GLSL) {
+      shader_cat.error()
         << "GLSL shaders must have separate shader bodies!\n";
-      _error_flag = true;
+      return false;
+    }
+
+    // Determine which language the shader is written in.
+    if (_language == SL_Cg) {
+#ifdef HAVE_CG
+      cg_get_profile_from_header(_default_caps);
+
+      if (!cg_analyze_shader(_default_caps)) {
+        shader_cat.error()
+          << "Shader encountered an error.\n";
+        return false;
+      }
+#else
+      shader_cat.error()
+        << "Tried to load Cg shader, but no Cg support is enabled.\n";
+#endif
+    } else {
+      shader_cat.error()
+        << "Shader is not in a supported shader-language.\n";
+      return false;
+    }
+  }
+
+  _loaded = true;
+  return true;
+}
+
+////////////////////////////////////////////////////////////////////
+//     Function: Shader::do_read_source
+//       Access: Private
+//  Description: Reads the shader file from the given path into the
+//               given string.
+//
+//               Returns false if there was an error with this shader
+//               bad enough to consider it 'invalid'.
+////////////////////////////////////////////////////////////////////
+bool Shader::
+do_read_source(string &into, const Filename &fn) {
+  if (_language == SL_GLSL && glsl_preprocess) {
+    // Preprocess the GLSL file as we read it.
+    set<Filename> open_files;
+    ostringstream sstr;
+    if (!r_preprocess_source(sstr, fn, Filename(), open_files)) {
+      return false;
+    }
+    into = sstr.str();
+
+  } else {
+    shader_cat.info() << "Reading shader file: " << fn << "\n";
+
+    VirtualFileSystem *vfs = VirtualFileSystem::get_global_ptr();
+    PT(VirtualFile) vf = vfs->find_file(fn, get_model_path());
+    if (vf == NULL) {
+      shader_cat.error()
+        << "Could not find shader file: " << fn << "\n";
+      return false;
+    }
+
+    if (!vf->read_file(into, true)) {
+      shader_cat.error()
+        << "Could not read shader file: " << fn << "\n";
+      return false;
+    }
+
+    _last_modified = max(_last_modified, vf->get_timestamp());
+    _source_files.push_back(vf->get_filename());
+  }
+  return true;
+}
+
+////////////////////////////////////////////////////////////////////
+//     Function: Shader::r_preprocess_source
+//       Access: Private
+//  Description: Loads a given GLSL file line by line, and processes
+//               any #pragma include and once statements.
+//
+//               The set keeps track of which files we have already
+//               included, for checking recursive includes.
+////////////////////////////////////////////////////////////////////
+bool Shader::
+r_preprocess_source(ostream &out, const Filename &fn,
+                    const Filename &source_dir,
+                    set<Filename> &once_files, int depth) {
+
+  if (depth > glsl_include_recursion_limit) {
+    shader_cat.error()
+      << "#pragma include nested too deeply\n";
+    return false;
+  }
+
+  DSearchPath path(get_model_path());
+  if (!source_dir.empty()) {
+    path.prepend_directory(source_dir);
+  }
+
+  VirtualFileSystem *vfs = VirtualFileSystem::get_global_ptr();
+  PT(VirtualFile) vf = vfs->find_file(fn, path);
+  if (vf == NULL) {
+    shader_cat.error()
+      << "Could not find shader file: " << fn << "\n";
+    return false;
+  }
+
+  Filename full_fn = vf->get_filename();
+  if (once_files.find(full_fn) != once_files.end()) {
+    // If this file had a #pragma once, just move on.
+    return true;
+  }
+
+  istream *source = vf->open_read_file(true);
+  if (source == NULL) {
+    shader_cat.error()
+      << "Could not open shader file: " << fn << "\n";
+    return false;
+  }
+
+  _last_modified = max(_last_modified, vf->get_timestamp());
+  _source_files.push_back(full_fn);
+
+  // We give each file an unique index.  This is so that we can identify
+  // a particular shader in the error output.  We offset them by 2048
+  // so that they are more recognizable.  GLSL doesn't give us anything
+  // more useful than that, unfortunately.
+  //
+  // Don't do this for the top-level file, though.  We don't want
+  // anything to get in before a potential #version directive.
+  int fileno = 0;
+  if (depth > 0) {
+    fileno = 2048 + _included_files.size();
+    // Write it into the vector so that we can substitute it later
+    // when we are parsing the GLSL error log.  Don't store the full
+    // filename because it would just be too long to display.
+    _included_files.push_back(fn);
+
+    out << "#line 1 " << fileno << " // " << fn << "\n";
+    if (shader_cat.is_debug()) {
+      shader_cat.debug()
+        << "Preprocessing shader include " << fileno << ": " << fn << "\n";
     }
   } else {
-    gobj_cat.error()
-      << "Shader is not in a supported shader-language.\n";
-    _error_flag = true;
+    shader_cat.info()
+      << "Preprocessing shader file: " << fn << "\n";
   }
-  if (_error_flag) {
-    gobj_cat.error()
-      << "Shader encountered an error.\n";
+
+  // Iterate over the lines for things we may need to preprocess.
+  string line;
+  bool had_include = false;
+  int lineno = 0;
+  while (getline(*source, line)) {
+    // We always forward the actual line - the GLSL compiler will
+    // silently ignore #pragma lines anyway.
+    ++lineno;
+    out << line << "\n";
+
+    // Check if this line contains a #pragma.
+    char pragma[64];
+    if (line.size() < 8 ||
+        sscanf(line.c_str(), " # pragma %63s", pragma) != 1) {
+
+      // One exception: check for an #endif after an include.  We have
+      // to restore the line number in case the include happened under
+      // an #if block.
+      int nread = 0;
+      if (had_include && sscanf(line.c_str(), " # endif %n", &nread) == 0 && nread >= 6) {
+        out << "#line " << (lineno + 1) << " " << fileno << "\n";
+      }
+      continue;
+    }
+
+    int nread = 0;
+    if (strcmp(pragma, "include") == 0) {
+      // Allow both double quotes and angle brackets.
+      Filename incfn, source_dir;
+      {
+        char incfile[2048];
+        if (sscanf(line.c_str(), " # pragma%*[ \t]include \"%2047[^\"]\" %n", incfile, &nread) == 1
+            && nread == line.size()) {
+          // A regular include, with double quotes.  Probably a local file.
+          source_dir = full_fn.get_dirname();
+          incfn = incfile;
+
+        } else if (sscanf(line.c_str(), " # pragma%*[ \t]include <%2047[^\"]> %n", incfile, &nread) == 1
+            && nread == line.size()) {
+          // Angled includes are also OK, but we don't search in the
+          // directory of the source file.
+          incfn = incfile;
+
+        } else {
+          // Couldn't parse it.
+          shader_cat.error()
+            << "Malformed #pragma include at line " << lineno
+            << " of file " << fn << ":\n  " << line << "\n";
+          return false;
+        }
+      }
+
+      // OK, great.  Process the include.
+      if (!r_preprocess_source(out, incfn, source_dir, once_files, depth + 1)) {
+        // An error occurred.  Pass on the failure.
+        shader_cat.error(false) << "included at line "
+          << lineno << " of file " << fn << ":\n  " << line << "\n";
+        return false;
+      }
+
+      // Restore the line counter.
+      out << "#line " << (lineno + 1) << " " << fileno << " // " << fn << "\n";
+      had_include = true;
+
+    } else if (strcmp(pragma, "once") == 0) {
+      // Do a stricter syntax check, just to be extra safe.
+      if (sscanf(line.c_str(), " # pragma%*[ \t]once %n", &nread) != 0 ||
+          nread != line.size()) {
+        shader_cat.error()
+          << "Malformed #pragma once at line " << lineno
+          << " of file " << fn << ":\n  " << line << "\n";
+        return false;
+      }
+
+      once_files.insert(full_fn);
+
+    } else if (strcmp(pragma, "optionNV") == 0) {
+      // This is processed by NVIDIA drivers.  Don't touch it.
+
+    } else {
+      shader_cat.warning()
+        << "Ignoring unknown pragma directive \"" << pragma << "\" at line "
+        << lineno << " of file " << fn << ":\n  " << line << "\n";
+    }
   }
+
+  vf->close_read_file(source);
+  return true;
+}
+
+////////////////////////////////////////////////////////////////////
+//     Function: Shader::check_modified
+//       Access: Private
+//  Description: Checks whether the shader or any of its dependent
+//               files were modified on disk.
+////////////////////////////////////////////////////////////////////
+bool Shader::
+check_modified() const {
+  VirtualFileSystem *vfs = VirtualFileSystem::get_global_ptr();
+
+  pvector<Filename>::const_iterator it;
+  for (it = _source_files.begin(); it != _source_files.end(); ++it) {
+    const Filename &fn = (*it);
+
+    PT(VirtualFile) vfile = vfs->get_file(fn, true);
+    if (vfile == (VirtualFile *)NULL || vfile->get_timestamp() > _last_modified) {
+      return true;
+    }
+  }
+
+  return false;
 }
 
 #ifdef HAVE_CG
@@ -2166,11 +2481,14 @@ cg_get_profile_from_header(ShaderCaps& caps) {
 Shader::
 ~Shader() {
   release_all();
-  if (_loaded) {
+  // Note: don't try to erase ourselves from the table.  It currently
+  // keeps a reference forever, and so the only place where this
+  // constructor is called is in the destructor of the table itself.
+  /*if (_loaded) {
     _load_table.erase(_filename);
   } else {
     _make_table.erase(_text);
-  }
+  }*/
 }
 
 ////////////////////////////////////////////////////////////////////
@@ -2179,25 +2497,28 @@ Shader::
 //  Description: Loads the shader with the given filename.
 ////////////////////////////////////////////////////////////////////
 PT(Shader) Shader::
-load(const Filename &file, const ShaderLanguage &lang) {
-  PT(ShaderFile) sfile =  new ShaderFile(file);
+load(const Filename &file, ShaderLanguage lang) {
+  ShaderFile sfile(file);
   ShaderTable::const_iterator i = _load_table.find(sfile);
   if (i != _load_table.end() && (lang == SL_none || lang == i->second->_language)) {
-    return i->second;
+    // But check that someone hasn't modified it in the meantime.
+    if (i->second->check_modified()) {
+      shader_cat.info()
+        << "Shader " << file << " was modified on disk, reloading.\n";
+    } else {
+      shader_cat.debug()
+        << "Shader " << file << " was found in shader cache.\n";
+      return i->second;
+    }
   }
-  PT(ShaderFile) sbody = new ShaderFile("");
 
-  VirtualFileSystem *vfs = VirtualFileSystem::get_global_ptr();
-  if (!vfs->read_file(file, sbody->_shared, true)) {
-    gobj_cat.error()
-      << "Could not read shader file: " << file << "\n";
+  PT(Shader) shader = new Shader(lang);
+  if (!shader->read(sfile)) {
     return NULL;
   }
 
-  PT(Shader) result = new Shader(sfile, sbody, lang);
-  result->_loaded = true;
-  _load_table[sfile] = result;
-  return result;
+  _load_table[sfile] = shader;
+  return shader;
 }
 
 ////////////////////////////////////////////////////////////////////
@@ -2207,47 +2528,30 @@ load(const Filename &file, const ShaderLanguage &lang) {
 //               programs separately.
 ////////////////////////////////////////////////////////////////////
 PT(Shader) Shader::
-load(const ShaderLanguage &lang, const Filename &vertex, 
-     const Filename &fragment, const Filename &geometry, 
+load(ShaderLanguage lang, const Filename &vertex,
+     const Filename &fragment, const Filename &geometry,
      const Filename &tess_control, const Filename &tess_evaluation) {
-  PT(ShaderFile) sfile = new ShaderFile(vertex, fragment, geometry, tess_control, tess_evaluation);
+  ShaderFile sfile(vertex, fragment, geometry, tess_control, tess_evaluation);
   ShaderTable::const_iterator i = _load_table.find(sfile);
   if (i != _load_table.end() && (lang == SL_none || lang == i->second->_language)) {
-    return i->second;
+    // But check that someone hasn't modified it in the meantime.
+    if (i->second->check_modified()) {
+      shader_cat.info()
+        << "Shader was modified on disk, reloading.\n";
+    } else {
+      shader_cat.debug()
+        << "Shader was found in shader cache.\n";
+      return i->second;
+    }
   }
 
-  PT(ShaderFile) sbody = new ShaderFile("", "", "", "", "");
-  VirtualFileSystem *vfs = VirtualFileSystem::get_global_ptr();
-  if (!vertex.empty() && !vfs->read_file(vertex, sbody->_vertex, true)) {
-    gobj_cat.error()
-      << "Could not read vertex shader file: " << vertex << "\n";
-    return NULL;
-  }
-  if (!fragment.empty() && !vfs->read_file(fragment, sbody->_fragment, true)) {
-    gobj_cat.error()
-      << "Could not read fragment shader file: " << fragment << "\n";
-    return NULL;
-  }
-  if (!geometry.empty() && !vfs->read_file(geometry, sbody->_geometry, true)) {
-    gobj_cat.error()
-      << "Could not read geometry shader file: " << geometry << "\n";
-    return NULL;
-  }
-  if (!tess_control.empty() && !vfs->read_file(tess_control, sbody->_tess_control, true)) {
-    gobj_cat.error()
-      << "Could not read tess_control shader file: " << tess_control << "\n";
-    return NULL;
-  }
-  if (!tess_evaluation.empty() && !vfs->read_file(tess_evaluation, sbody->_tess_evaluation, true)) {
-    gobj_cat.error()
-      << "Could not read tess_evaluation shader file: " << tess_evaluation << "\n";
+  PT(Shader) shader = new Shader(lang);
+  if (!shader->read(sfile)) {
     return NULL;
   }
 
-  PT(Shader) result = new Shader(sfile, sbody, lang);
-  result->_loaded = true;
-  _load_table[sfile] = result;
-  return result;
+  _load_table[sfile] = shader;
+  return shader;
 }
 
 ////////////////////////////////////////////////////////////////////
@@ -2256,26 +2560,37 @@ load(const ShaderLanguage &lang, const Filename &vertex,
 //  Description: Loads a compute shader.
 ////////////////////////////////////////////////////////////////////
 PT(Shader) Shader::
-load_compute(const ShaderLanguage &lang, const Filename &fn) {
-  PT(ShaderFile) sfile = new ShaderFile(fn);
-  ShaderTable::const_iterator i = _load_table.find(sfile);
-  if (i != _load_table.end() && (lang == SL_none || lang == i->second->_language)) {
-    return i->second;
-  }
-
-  PT(ShaderFile) sbody = new ShaderFile;
-  sbody->_separate = true;
-  VirtualFileSystem *vfs = VirtualFileSystem::get_global_ptr();
-  if (!vfs->read_file(fn, sbody->_compute, true)) {
-    gobj_cat.error()
-      << "Could not read compute shader file: " << fn << "\n";
+load_compute(ShaderLanguage lang, const Filename &fn) {
+  if (lang != SL_GLSL) {
+    shader_cat.error()
+      << "Only GLSL compute shaders are currently supported.\n";
     return NULL;
   }
 
-  PT(Shader) result = new Shader(sfile, sbody, lang);
-  result->_loaded = true;
-  _load_table[sfile] = result;
-  return result;
+  ShaderFile sfile;
+  sfile._separate = true;
+  sfile._compute = fn;
+
+  ShaderTable::const_iterator i = _load_table.find(sfile);
+  if (i != _load_table.end() && (lang == SL_none || lang == i->second->_language)) {
+    // But check that someone hasn't modified it in the meantime.
+    if (i->second->check_modified()) {
+      shader_cat.info()
+        << "Compute shader " << fn << " was modified on disk, reloading.\n";
+    } else {
+      shader_cat.debug()
+        << "Compute shader " << fn << " was found in shader cache.\n";
+      return i->second;
+    }
+  }
+
+  PT(Shader) shader = new Shader(lang);
+  if (!shader->read(sfile)) {
+    return NULL;
+  }
+
+  _load_table[sfile] = shader;
+  return shader;
 }
 
 //////////////////////////////////////////////////////////////////////
@@ -2284,30 +2599,61 @@ load_compute(const ShaderLanguage &lang, const Filename &fn) {
 //  Description: Loads the shader, using the string as shader body.
 //////////////////////////////////////////////////////////////////////
 PT(Shader) Shader::
-make(const string &body, const ShaderLanguage &lang) {
-  PT(ShaderFile) sbody = new ShaderFile(body);
+make(const string &body, ShaderLanguage lang) {
+  if (lang == SL_GLSL) {
+    shader_cat.error()
+      << "GLSL shaders must have separate shader bodies!\n";
+    return NULL;
+
+  } else if (lang == SL_none) {
+    shader_cat.warning()
+      << "Shader::make() now requires an explicit shader language.  Assuming Cg.\n";
+    lang = SL_Cg;
+  }
+#ifndef HAVE_CG
+  if (lang == SL_Cg) {
+    shader_cat.error() << "Support for Cg shaders is not enabled.\n";
+    return NULL;
+  }
+#endif
+
+  ShaderFile sbody(body);
   ShaderTable::const_iterator i = _make_table.find(sbody);
   if (i != _make_table.end() && (lang == SL_none || lang == i->second->_language)) {
     return i->second;
   }
 
-  PT(ShaderFile) sfile = new ShaderFile("created-shader");
-  PT(Shader) result = new Shader(sfile, sbody, lang);
-  _make_table[sbody] = result;
+  PT(Shader) shader = new Shader(lang);
+  shader->_filename = ShaderFile("created-shader");
+  shader->_text = sbody;
+
+#ifdef HAVE_CG
+  if (lang == SL_Cg) {
+    shader->cg_get_profile_from_header(_default_caps);
+
+    if (!shader->cg_analyze_shader(_default_caps)) {
+      shader_cat.error()
+        << "Shader encountered an error.\n";
+      return NULL;
+    }
+  }
+#endif
+
+  _make_table[sbody] = shader;
 
   if (dump_generated_shaders) {
     ostringstream fns;
     int index = _shaders_generated ++;
     fns << "genshader" << index;
     string fn = fns.str();
-    gobj_cat.warning() << "Dumping shader: " << fn << "\n";
+    shader_cat.warning() << "Dumping shader: " << fn << "\n";
 
     pofstream s;
     s.open(fn.c_str(), ios::out | ios::trunc);
     s << body;
     s.close();
   }
-  return result;
+  return shader;
 }
 
 //////////////////////////////////////////////////////////////////////
@@ -2316,20 +2662,45 @@ make(const string &body, const ShaderLanguage &lang) {
 //  Description: Loads the shader, using the strings as shader bodies.
 //////////////////////////////////////////////////////////////////////
 PT(Shader) Shader::
-make(const ShaderLanguage &lang, const string &vertex, const string &fragment, 
-     const string &geometry, const string &tess_control, 
+make(ShaderLanguage lang, const string &vertex, const string &fragment,
+     const string &geometry, const string &tess_control,
      const string &tess_evaluation) {
-  PT(ShaderFile) sbody = new ShaderFile(vertex, fragment, geometry, tess_control, tess_evaluation);
+#ifndef HAVE_CG
+  if (lang == SL_Cg) {
+    shader_cat.error() << "Support for Cg shaders is not enabled.\n";
+    return NULL;
+  }
+#endif
+  if (lang == SL_none) {
+    shader_cat.error()
+      << "Shader::make() requires an explicit shader language.\n";
+    return NULL;
+  }
+
+  ShaderFile sbody(vertex, fragment, geometry, tess_control, tess_evaluation);
 
   ShaderTable::const_iterator i = _make_table.find(sbody);
   if (i != _make_table.end() && (lang == SL_none || lang == i->second->_language)) {
     return i->second;
   }
 
-  PT(ShaderFile) sfile = new ShaderFile("created-shader");
-  PT(Shader) result = new Shader(sfile, sbody, lang);
-  _make_table[sbody] = result;
-  return result;
+  PT(Shader) shader = new Shader(lang);
+  shader->_filename = ShaderFile("created-shader");
+  shader->_text = sbody;
+
+#ifdef HAVE_CG
+  if (lang == SL_Cg) {
+    if (!shader->cg_analyze_shader(_default_caps)) {
+      shader_cat.error()
+        << "Shader encountered an error.\n";
+      return NULL;
+    }
+  }
+#endif
+
+
+  _make_table[sbody] = shader;
+  return shader;
 }
 
 //////////////////////////////////////////////////////////////////////
@@ -2338,20 +2709,28 @@ make(const ShaderLanguage &lang, const string &vertex, const string &fragment,
 //  Description: Loads the compute shader from the given string.
 //////////////////////////////////////////////////////////////////////
 PT(Shader) Shader::
-make_compute(const ShaderLanguage &lang, const string &body) {
-  PT(ShaderFile) sbody = new ShaderFile;
-  sbody->_separate = true;
-  sbody->_compute = body;
+make_compute(ShaderLanguage lang, const string &body) {
+  if (lang != SL_GLSL) {
+    shader_cat.error()
+      << "Only GLSL compute shaders are currently supported.\n";
+    return NULL;
+  }
+
+  ShaderFile sbody;
+  sbody._separate = true;
+  sbody._compute = body;
 
   ShaderTable::const_iterator i = _make_table.find(sbody);
   if (i != _make_table.end() && (lang == SL_none || lang == i->second->_language)) {
     return i->second;
   }
 
-  PT(ShaderFile) sfile = new ShaderFile("created-shader");
-  PT(Shader) result = new Shader(sfile, sbody, lang);
-  _make_table[sbody] = result;
-  return result;
+  PT(Shader) shader = new Shader(lang);
+  shader->_filename = ShaderFile("created-shader");
+  shader->_text = sbody;
+
+  _make_table[sbody] = shader;
+  return shader;
 }
 
 ////////////////////////////////////////////////////////////////////
@@ -2374,11 +2753,11 @@ parse_init() {
 ////////////////////////////////////////////////////////////////////
 void Shader::
 parse_line(string &result, bool lt, bool rt) {
-  nassertv(!_text->_separate);
-  int len = _text->_shared.size();
+  nassertv(!_text._separate);
+  int len = _text._shared.size();
   int head = _parse;
   int tail = head;
-  while ((tail < len) && (_text->_shared[tail] != '\n')) {
+  while ((tail < len) && (_text._shared[tail] != '\n')) {
     tail++;
   }
   if (tail < len) {
@@ -2387,10 +2766,10 @@ parse_line(string &result, bool lt, bool rt) {
     _parse = tail;
   }
   if (lt) {
-    while ((head < tail)&&(isspace(_text->_shared[head]))) head++;
-    while ((tail > head)&&(isspace(_text->_shared[tail-1]))) tail--;
+    while ((head < tail)&&(isspace(_text._shared[head]))) head++;
+    while ((tail > head)&&(isspace(_text._shared[tail-1]))) tail--;
   }
-  result = _text->_shared.substr(head, tail-head);
+  result = _text._shared.substr(head, tail-head);
 }
 
 ////////////////////////////////////////////////////////////////////
@@ -2403,20 +2782,20 @@ parse_line(string &result, bool lt, bool rt) {
 ////////////////////////////////////////////////////////////////////
 void Shader::
 parse_upto(string &result, string pattern, bool include) {
-  nassertv(!_text->_separate);
+  nassertv(!_text._separate);
   GlobPattern endpat(pattern);
   int start = _parse;
   int last = _parse;
-  while (_parse < (int)(_text->_shared.size())) {
+  while (_parse < (int)(_text._shared.size())) {
     string t;
     parse_line(t, true, true);
     if (endpat.matches(t)) break;
     last = _parse;
   }
   if (include) {
-    result = _text->_shared.substr(start, _parse - start);
+    result = _text._shared.substr(start, _parse - start);
   } else {
-    result = _text->_shared.substr(start, last - start);
+    result = _text._shared.substr(start, last - start);
   }
 }
 
@@ -2428,8 +2807,8 @@ parse_upto(string &result, string pattern, bool include) {
 ////////////////////////////////////////////////////////////////////
 void Shader::
 parse_rest(string &result) {
-  nassertv(!_text->_separate);
-  result = _text->_shared.substr(_parse, _text->_shared.size() - _parse);
+  nassertv(!_text._separate);
+  result = _text._shared.substr(_parse, _text._shared.size() - _parse);
 }
 
 ////////////////////////////////////////////////////////////////////
@@ -2440,7 +2819,7 @@ parse_rest(string &result) {
 ////////////////////////////////////////////////////////////////////
 bool Shader::
 parse_eof() {
-  return (int)_text->_shared.size() == _parse;
+  return (int)_text._shared.size() == _parse;
 }
 
 ////////////////////////////////////////////////////////////////////
@@ -2595,7 +2974,7 @@ release_all() {
 void Shader::ShaderCaps::
 clear() {
   _supports_glsl = false;
-  
+
 #ifdef HAVE_CG
   _active_vprofile = CG_PROFILE_UNKNOWN;
   _active_fprofile = CG_PROFILE_UNKNOWN;
@@ -2629,8 +3008,8 @@ void Shader::
 write_datagram(BamWriter *manager, Datagram &dg) {
   dg.add_uint8(_language);
   dg.add_bool(_loaded);
-  _filename->write_datagram(dg);
-  _text->write_datagram(dg);
+  _filename.write_datagram(dg);
+  _text.write_datagram(dg);
 }
 
 ////////////////////////////////////////////////////////////////////
@@ -2643,7 +3022,7 @@ write_datagram(BamWriter *manager, Datagram &dg) {
 ////////////////////////////////////////////////////////////////////
 TypedWritable *Shader::
 make_from_bam(const FactoryParams &params) {
-  Shader *attrib = new Shader;
+  Shader *attrib = new Shader(SL_none);
   DatagramIterator scan;
   BamReader *manager;
 
@@ -2663,12 +3042,6 @@ void Shader::
 fillin(DatagramIterator &scan, BamReader *manager) {
   _language = (ShaderLanguage) scan.get_uint8();
   _loaded = scan.get_bool();
-
-  PT(ShaderFile) filename = new ShaderFile;
-  filename->read_datagram(scan);
-  _filename = filename;
-
-  PT(ShaderFile) text = new ShaderFile;
-  text->read_datagram(scan);
-  _text = text;
+  _filename.read_datagram(scan);
+  _text.read_datagram(scan);
 }
diff --git a/panda/src/gobj/shader.h b/panda/src/gobj/shader.h
index e62435d6a0..805e2ea4f6 100755
--- a/panda/src/gobj/shader.h
+++ b/panda/src/gobj/shader.h
@@ -63,6 +63,7 @@ PUBLISHED:
     ST_tess_control,
     ST_tess_evaluation,
     ST_compute,
+    ST_COUNT
   };
 
   enum AutoShaderSwitch {
@@ -81,20 +82,20 @@ PUBLISHED:
     bit_AutoShaderShadow = 4, // bit for AS_shadow
   };
 
-  static PT(Shader) load(const Filename &file, const ShaderLanguage &lang = SL_none);
-  static PT(Shader) make(const string &body, const ShaderLanguage &lang = SL_none);
-  static PT(Shader) load(const ShaderLanguage &lang, 
-                         const Filename &vertex, const Filename &fragment, 
+  static PT(Shader) load(const Filename &file, ShaderLanguage lang = SL_none);
+  static PT(Shader) make(const string &body, ShaderLanguage lang = SL_none);
+  static PT(Shader) load(ShaderLanguage lang,
+                         const Filename &vertex, const Filename &fragment,
                          const Filename &geometry = "",
                          const Filename &tess_control = "",
                          const Filename &tess_evaluation = "");
-  static PT(Shader) load_compute(const ShaderLanguage &lang, const Filename &fn);
-  static PT(Shader) make(const ShaderLanguage &lang, 
-                         const string &vertex, const string &fragment, 
+  static PT(Shader) load_compute(ShaderLanguage lang, const Filename &fn);
+  static PT(Shader) make(ShaderLanguage lang,
+                         const string &vertex, const string &fragment,
                          const string &geometry = "",
                          const string &tess_control = "",
                          const string &tess_evaluation = "");
-  static PT(Shader) make_compute(const ShaderLanguage &lang, const string &body);
+  static PT(Shader) make_compute(ShaderLanguage lang, const string &body);
 
   INLINE Filename get_filename(const ShaderType &type = ST_none) const;
   INLINE const string &get_text(const ShaderType &type = ST_none) const;
@@ -110,7 +111,7 @@ PUBLISHED:
   bool release(PreparedGraphicsObjects *prepared_objects);
   int release_all();
 
-  ShaderContext *prepare_now(PreparedGraphicsObjects *prepared_objects, 
+  ShaderContext *prepare_now(PreparedGraphicsObjects *prepared_objects,
                              GraphicsStateGuardianBase *gsg);
 
 public:
@@ -172,6 +173,19 @@ public:
     SMO_frame_time,
     SMO_frame_delta,
 
+    SMO_mat_constant_x_attrib,
+    SMO_vec_constant_x_attrib,
+
+    SMO_light_ambient,
+    SMO_light_source_i_attrib,
+
+    SMO_light_product_i_ambient,
+    SMO_light_product_i_diffuse,
+    SMO_light_product_i_specular,
+
+    // SMO_clipplane_x is world coords, GLSL needs eye coords
+    SMO_apiview_clipplane_i,
+
     SMO_INVALID
   };
 
@@ -249,6 +263,8 @@ public:
     SSD_material      = 0x010,
     SSD_shaderinputs  = 0x020,
     SSD_fog           = 0x040,
+    SSD_light         = 0x080,
+    SSD_clip_planes   = 0x100,
   };
 
   enum ShaderBug {
@@ -295,7 +311,7 @@ public:
     void *_ptr;
     ShaderPtrType _type;
     bool _updated;
-    int _size; //number of elements vec3[4]=12
+    size_t _size; //number of elements vec3[4]=12
 
   public:
     INLINE ShaderPtrData();
@@ -336,13 +352,14 @@ public:
   };
 
   struct ShaderMatSpec {
+    LMatrix4          _cache[2];
+    LMatrix4          _value;
     ShaderArgId       _id;
     ShaderMatFunc     _func;
     ShaderMatInput    _part[2];
     PT(InternalName)  _arg[2];
     int               _dep[2];
-    LMatrix4          _cache[2];
-    LMatrix4          _value;
+    int               _index;
     ShaderMatPiece    _piece;
   };
 
@@ -358,6 +375,7 @@ public:
     ShaderArgId       _id;
     PT(InternalName)  _name;
     int               _append_uv;
+    int               _elements;
     bool              _integer;
   };
 
@@ -407,6 +425,8 @@ public:
     INLINE void write_datagram(Datagram &dg) const;
     INLINE void read_datagram(DatagramIterator &source);
 
+    INLINE bool operator < (const ShaderFile &other) const;
+
   public:
     bool _separate;
     string _shared;
@@ -464,18 +484,19 @@ public:
 
   void clear_parameters();
 
-#ifdef HAVE_CG
 private:
+#ifdef HAVE_CG
   ShaderArgClass cg_parameter_class(CGparameter p);
   ShaderArgType cg_parameter_type(CGparameter p);
   ShaderArgDir cg_parameter_dir(CGparameter p);
 
-  CGprogram cg_compile_entry_point(const char *entry, const ShaderCaps &caps, ShaderType type = ST_vertex);
+  CGprogram cg_compile_entry_point(const char *entry, const ShaderCaps &caps,
+                                   CGcontext context, ShaderType type);
 
   bool cg_analyze_entry_point(CGprogram prog, ShaderType type);
 
   bool cg_analyze_shader(const ShaderCaps &caps);
-  bool cg_compile_shader(const ShaderCaps &caps);
+  bool cg_compile_shader(const ShaderCaps &caps, CGcontext context);
   void cg_release_resources();
   void cg_report_errors();
 
@@ -484,7 +505,7 @@ private:
   void cg_get_profile_from_header(ShaderCaps &caps);
 
   ShaderCaps _cg_last_caps;
-  CGcontext  _cg_context;
+  static CGcontext  _cg_context;
   CGprogram  _cg_vprogram;
   CGprogram  _cg_fprogram;
   CGprogram  _cg_gprogram;
@@ -496,10 +517,8 @@ private:
   CGprogram cg_program_from_shadertype(ShaderType type);
 
 public:
-
-  bool cg_compile_for(const ShaderCaps &caps, CGcontext &ctx,
-                      CGprogram &vprogram, CGprogram &fprogram,
-                      CGprogram &gprogram, pvector<CGparameter> &map);
+  bool cg_compile_for(const ShaderCaps &caps, CGcontext context,
+                      CGprogram &combined_program, pvector<CGparameter> &map);
 
 #endif
 
@@ -510,19 +529,25 @@ public:
   pvector <ShaderVarSpec> _var_spec;
 
   bool _error_flag;
-  CPT(ShaderFile) _text;
+  ShaderFile _text;
 
 protected:
-  CPT(ShaderFile) _filename;
+  ShaderFile _filename;
   int _parse;
   bool _loaded;
   ShaderLanguage _language;
+  pvector<Filename> _included_files;
+
+  // Stores full paths, and includes the fullpaths of the shaders
+  // themselves as well as the includes.
+  pvector<Filename> _source_files;
+  time_t _last_modified;
 
   static ShaderCaps _default_caps;
   static ShaderUtilization _shader_utilization;
   static int _shaders_generated;
 
-  typedef pmap < CPT(ShaderFile), Shader * > ShaderTable;
+  typedef pmap<ShaderFile, PT(Shader)> ShaderTable;
 
   static ShaderTable _load_table;
   static ShaderTable _make_table;
@@ -536,12 +561,21 @@ protected:
 private:
   void clear_prepared(PreparedGraphicsObjects *prepared_objects);
 
-  Shader();
+  Shader(ShaderLanguage lang);
+
+  bool read(const ShaderFile &sfile);
+  bool do_read_source(string &into, const Filename &fn);
+  bool r_preprocess_source(ostream &out, const Filename &fn,
+                           const Filename &source_dir,
+                           set<Filename> &open_files, int depth = 0);
+
+  bool check_modified() const;
 
 public:
-  Shader(CPT(ShaderFile) name, CPT(ShaderFile) text, const ShaderLanguage &lang = SL_none);
   ~Shader();
 
+  INLINE Filename get_filename_from_index(int index, ShaderType type) const;
+
 public:
   static void register_with_read_factory();
   virtual void write_datagram(BamWriter *manager, Datagram &dg);
diff --git a/panda/src/gobj/texture.cxx b/panda/src/gobj/texture.cxx
index b67fb9eae8..d44903e921 100644
--- a/panda/src/gobj/texture.cxx
+++ b/panda/src/gobj/texture.cxx
@@ -1713,6 +1713,19 @@ write(ostream &out, int indent_level) const {
   case F_rgb32:
     out << "rgb32";
     break;
+
+  case F_r8i:
+    out << "r8i";
+    break;
+  case F_rg8i:
+    out << "rg8i";
+    break;
+  case F_rgb8i:
+    out << "rgb8i";
+    break;
+  case F_rgba8i:
+    out << "rgba8i";
+    break;
   }
 
   if (cdata->_compression != CM_default) {
@@ -2110,6 +2123,14 @@ format_format(Format format) {
     return "rg32";
   case F_rgb32:
     return "rgb32";
+  case F_r8i:
+    return "r8i";
+  case F_rg8i:
+    return "rg8i";
+  case F_rgb8i:
+    return "rgb8i";
+  case F_rgba8i:
+    return "rgba8i";
   }
   return "**invalid**";
 }
@@ -3304,7 +3325,7 @@ do_load_one(CData *cdata, const PfmFile &pfm, const string &name, int z, int n,
 ////////////////////////////////////////////////////////////////////
 bool Texture::
 do_load_sub_image(CData *cdata, const PNMImage &image, int x, int y, int z, int n) {
-  nassertr(n >= 0 && n < cdata->_ram_images.size(), false);
+  nassertr(n >= 0 && (size_t)n < cdata->_ram_images.size(), false);
 
   int tex_x_size = do_get_expected_mipmap_x_size(cdata, n);
   int tex_y_size = do_get_expected_mipmap_y_size(cdata, n);
@@ -4357,11 +4378,11 @@ do_make_ram_mipmap_image(CData *cdata, int n) {
   if (cdata->_has_clear_color) {
     // Fill the image with the clear color.
     unsigned char pixel[16];
-    const int pixel_size = do_get_clear_data(cdata, pixel);
+    const size_t pixel_size = (size_t)do_get_clear_data(cdata, pixel);
     nassertr(pixel_size > 0, cdata->_ram_images[n]._image);
 
     unsigned char *image_data = cdata->_ram_images[n]._image;
-    for (int i = 0; i < image_size; i += pixel_size) {
+    for (size_t i = 0; i < image_size; i += pixel_size) {
       memcpy(image_data + i, pixel, pixel_size);
     }
   }
@@ -5121,6 +5142,7 @@ do_set_format(CData *cdata, Texture::Format format) {
   case F_sluminance:
   case F_r32i:
   case F_r32:
+  case F_r8i:
     cdata->_num_components = 1;
     break;
 
@@ -5129,6 +5151,7 @@ do_set_format(CData *cdata, Texture::Format format) {
   case F_rg16:
   case F_sluminance_alpha:
   case F_rg32:
+  case F_rg8i:
     cdata->_num_components = 2;
     break;
 
@@ -5140,6 +5163,7 @@ do_set_format(CData *cdata, Texture::Format format) {
   case F_rgb16:
   case F_srgb:
   case F_rgb32:
+  case F_rgb8i:
     cdata->_num_components = 3;
     break;
 
@@ -5152,6 +5176,7 @@ do_set_format(CData *cdata, Texture::Format format) {
   case F_rgba16:
   case F_rgba32:
   case F_srgb_alpha:
+  case F_rgba8i:
     cdata->_num_components = 4;
     break;
   }
diff --git a/panda/src/gobj/textureCollection.cxx b/panda/src/gobj/textureCollection.cxx
index 6bddb5f199..40e8651edb 100644
--- a/panda/src/gobj/textureCollection.cxx
+++ b/panda/src/gobj/textureCollection.cxx
@@ -49,79 +49,6 @@ operator = (const TextureCollection &copy) {
   _textures = copy._textures;
 }
 
-#ifdef HAVE_PYTHON
-////////////////////////////////////////////////////////////////////
-//     Function: TextureCollection::Constructor
-//       Access: Published
-//  Description: This special constructor accepts a Python list of
-//               Textures.  Since this constructor accepts a generic
-//               PyObject *, it should be the last constructor listed
-//               in the class record.
-////////////////////////////////////////////////////////////////////
-TextureCollection::
-TextureCollection(PyObject *self, PyObject *sequence) {
-  // We have to pre-initialize self's "this" pointer when we receive
-  // self in the constructor--the caller can't initialize this for us.
-  ((Dtool_PyInstDef *)self)->_ptr_to_object = this;
-
-  if (!PySequence_Check(sequence)) {
-    // If passed with a non-sequence, this isn't the right constructor.
-    PyErr_SetString(PyExc_TypeError, "TextureCollection constructor requires a sequence");
-    return;
-  }
-
-  int size = PySequence_Size(sequence);
-  for (int i = 0; i < size; ++i) {
-    PyObject *item = PySequence_GetItem(sequence, i);
-    if (item == NULL) {
-      return;
-    }
-    PyObject *result = PyObject_CallMethod(self, (char *)"add_texture", (char *)"O", item);
-    Py_DECREF(item);
-    if (result == NULL) {
-      // Unable to add item--probably it wasn't of the appropriate type.
-      ostringstream stream;
-      stream << "Element " << i << " in sequence passed to TextureCollection constructor could not be added";
-      string str = stream.str();
-      PyErr_SetString(PyExc_TypeError, str.c_str());
-      return;
-    }
-    Py_DECREF(result);
-  }
-}
-#endif  // HAVE_PYTHON
-
-#ifdef HAVE_PYTHON
-////////////////////////////////////////////////////////////////////
-//     Function: TextureCollection::__reduce__
-//       Access: Published
-//  Description: This special Python method is implement to provide
-//               support for the pickle module.
-////////////////////////////////////////////////////////////////////
-PyObject *TextureCollection::
-__reduce__(PyObject *self) const {
-  // Here we will return a 4-tuple: (Class, (args), None, iterator),
-  // where iterator is an iterator that will yield successive
-  // Textures.
-
-  // We should return at least a 2-tuple, (Class, (args)): the
-  // necessary class object whose constructor we should call
-  // (e.g. this), and the arguments necessary to reconstruct this
-  // object.
-
-  PyObject *this_class = PyObject_Type(self);
-  if (this_class == NULL) {
-    return NULL;
-  }
-
-  // Since a TextureCollection is itself an iterator, we can simply
-  // pass it as the fourth tuple component.
-  PyObject *result = Py_BuildValue("(O()OO)", this_class, Py_None, self);
-  Py_DECREF(this_class);
-  return result;
-}
-#endif  // HAVE_PYTHON
-
 ////////////////////////////////////////////////////////////////////
 //     Function: TextureCollection::add_texture
 //       Access: Published
@@ -270,6 +197,18 @@ clear() {
   _textures.clear();
 }
 
+////////////////////////////////////////////////////////////////////
+//     Function: TextureCollection::reserve
+//       Access: Published
+//  Description: This is a hint to Panda to allocate enough memory
+//               to hold the given number of NodePaths, if you know
+//               ahead of time how many you will be adding.
+////////////////////////////////////////////////////////////////////
+void TextureCollection::
+reserve(size_t num) {
+  _textures.reserve(num);
+}
+
 ////////////////////////////////////////////////////////////////////
 //     Function: TextureCollection::find_texture
 //       Access: Published
diff --git a/panda/src/gobj/textureCollection.h b/panda/src/gobj/textureCollection.h
index 38d3dc6faa..9be7b78f88 100644
--- a/panda/src/gobj/textureCollection.h
+++ b/panda/src/gobj/textureCollection.h
@@ -32,8 +32,8 @@ PUBLISHED:
   INLINE ~TextureCollection();
 
 #ifdef HAVE_PYTHON
-  TextureCollection(PyObject *self, PyObject *sequence);
-  PyObject *__reduce__(PyObject *self) const;
+  EXTENSION(TextureCollection(PyObject *self, PyObject *sequence));
+  EXTENSION(PyObject *__reduce__(PyObject *self) const);
 #endif
 
   void add_texture(Texture *texture);
@@ -43,6 +43,7 @@ PUBLISHED:
   void remove_duplicate_textures();
   bool has_texture(Texture *texture) const;
   void clear();
+  void reserve(size_t num);
 
   Texture *find_texture(const string &name) const;
 
@@ -74,5 +75,3 @@ INLINE ostream &operator << (ostream &out, const TextureCollection &col) {
 #include "textureCollection.I"
 
 #endif
-
-
diff --git a/panda/src/gobj/textureCollection_ext.cxx b/panda/src/gobj/textureCollection_ext.cxx
new file mode 100644
index 0000000000..e90295430b
--- /dev/null
+++ b/panda/src/gobj/textureCollection_ext.cxx
@@ -0,0 +1,94 @@
+// Filename: textureCollection_ext.cxx
+// Created by:  rdb (11Feb15)
+//
+////////////////////////////////////////////////////////////////////
+//
+// 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 "textureCollection_ext.h"
+
+#ifdef HAVE_PYTHON
+
+#ifndef CPPPARSER
+extern struct Dtool_PyTypedObject Dtool_Texture;
+#endif
+
+////////////////////////////////////////////////////////////////////
+//     Function: TextureCollection::__init__
+//       Access: Published
+//  Description: This special constructor accepts a Python list of
+//               Textures.  Since this constructor accepts a generic
+//               PyObject *, it should be the last constructor listed
+//               in the class record.
+////////////////////////////////////////////////////////////////////
+void Extension<TextureCollection>::
+__init__(PyObject *self, PyObject *sequence) {
+  PyObject *fast = PySequence_Fast(sequence, "TextureCollection constructor requires a sequence");
+  if (fast == NULL) {
+    return;
+  }
+
+  Py_ssize_t size = PySequence_Fast_GET_SIZE(fast);
+  _this->reserve(size);
+
+  for (int i = 0; i < size; ++i) {
+    PyObject *item = PySequence_Fast_GET_ITEM(fast, i);
+    if (item == NULL) {
+      return;
+    }
+
+    Texture *tex;
+    DTOOL_Call_ExtractThisPointerForType(item, &Dtool_Texture, (void **)&tex);
+    if (tex == (Texture *)NULL) {
+      // Unable to add item--probably it wasn't of the appropriate type.
+      ostringstream stream;
+      stream << "Element " << i << " in sequence passed to TextureCollection constructor is not a Texture";
+      string str = stream.str();
+      PyErr_SetString(PyExc_TypeError, str.c_str());
+      Py_DECREF(fast);
+      return;
+    } else {
+      _this->add_texture(tex);
+    }
+  }
+
+  Py_DECREF(fast);
+}
+
+////////////////////////////////////////////////////////////////////
+//     Function: TextureCollection::__reduce__
+//       Access: Published
+//  Description: This special Python method is implement to provide
+//               support for the pickle module.
+////////////////////////////////////////////////////////////////////
+PyObject *Extension<TextureCollection>::
+__reduce__(PyObject *self) const {
+  // Here we will return a 4-tuple: (Class, (args), None, iterator),
+  // where iterator is an iterator that will yield successive
+  // Textures.
+
+  // We should return at least a 2-tuple, (Class, (args)): the
+  // necessary class object whose constructor we should call
+  // (e.g. this), and the arguments necessary to reconstruct this
+  // object.
+
+  PyObject *this_class = PyObject_Type(self);
+  if (this_class == NULL) {
+    return NULL;
+  }
+
+  // Since a TextureCollection is itself an iterator, we can simply
+  // pass it as the fourth tuple component.
+  PyObject *result = Py_BuildValue("(O()OO)", this_class, Py_None, self);
+  Py_DECREF(this_class);
+  return result;
+}
+
+#endif  // HAVE_PYTHON
diff --git a/panda/src/gobj/textureCollection_ext.h b/panda/src/gobj/textureCollection_ext.h
new file mode 100644
index 0000000000..2818782e6a
--- /dev/null
+++ b/panda/src/gobj/textureCollection_ext.h
@@ -0,0 +1,42 @@
+// Filename: textureCollection_ext.h
+// Created by:  rdb (11Feb15)
+//
+////////////////////////////////////////////////////////////////////
+//
+// 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 TEXTURECOLLECTION_EXT_H
+#define TEXTURECOLLECTION_EXT_H
+
+#include "dtoolbase.h"
+
+#ifdef HAVE_PYTHON
+
+#include "extension.h"
+#include "textureCollection.h"
+#include "py_panda.h"
+
+////////////////////////////////////////////////////////////////////
+//       Class : Extension<TextureCollection>
+// Description : This class defines the extension methods for
+//               TextureCollection, which are called instead of
+//               any C++ methods with the same prototype.
+////////////////////////////////////////////////////////////////////
+template<>
+class Extension<TextureCollection> : public ExtensionBase<TextureCollection> {
+public:
+  void __init__(PyObject *self, PyObject *sequence);
+
+  PyObject *__reduce__(PyObject *self) const;
+};
+
+#endif  // HAVE_PYTHON
+
+#endif  // TEXTURECOLLECTION_EXT_H
diff --git a/panda/src/gobj/transformBlend.cxx b/panda/src/gobj/transformBlend.cxx
index d450392fe2..d26c43c24f 100644
--- a/panda/src/gobj/transformBlend.cxx
+++ b/panda/src/gobj/transformBlend.cxx
@@ -109,7 +109,7 @@ limit_transforms(int max_transforms) {
     return;
   }
 
-  while (_entries.size() > max_transforms) {
+  while ((int)_entries.size() > max_transforms) {
     // Repeatedly find and remove the least-important transform.
     nassertv(!_entries.empty());
     Entries::iterator ei_least = _entries.begin();
diff --git a/panda/src/gobj/vertexDataPage.h b/panda/src/gobj/vertexDataPage.h
index a6a6e4eafb..7553cdd9f1 100644
--- a/panda/src/gobj/vertexDataPage.h
+++ b/panda/src/gobj/vertexDataPage.h
@@ -114,7 +114,7 @@ private:
   typedef pdeque<VertexDataPage *> PendingPages;
 
   class PageThreadManager;
-  class PageThread : public Thread {
+  class EXPCL_PANDA_GOBJ PageThread : public Thread {
   public:
     PageThread(PageThreadManager *manager, const string &name);
 
@@ -132,7 +132,7 @@ private:
   };
   typedef pvector<PT(PageThread) > PageThreads;
 
-  class PageThreadManager : public ReferenceCount {
+  class EXPCL_PANDA_GOBJ PageThreadManager : public ReferenceCount {
   public:
     PageThreadManager(int num_threads);
     void add_page(VertexDataPage *page, RamClass ram_class);
@@ -176,7 +176,7 @@ private:
 
   // We build up a temporary linked list of these while deflating
   // (compressing) the vertex data in-memory.
-  class DeflatePage {
+  class EXPCL_PANDA_GOBJ DeflatePage {
   public:
     DeflatePage() {
       _used_size = 0;
diff --git a/panda/src/gobj/vertexDataSaveFile.h b/panda/src/gobj/vertexDataSaveFile.h
index 948d8a7ba8..be943ff179 100644
--- a/panda/src/gobj/vertexDataSaveFile.h
+++ b/panda/src/gobj/vertexDataSaveFile.h
@@ -21,7 +21,9 @@
 #include "pmutex.h"
 
 #if defined(_WIN32)
-#define WIN32_LEAN_AND_MEAN
+#ifndef WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN 1
+#endif
 #include <windows.h>
 #endif
 
diff --git a/panda/src/grutil/frameRateMeter.cxx b/panda/src/grutil/frameRateMeter.cxx
index 7e4f779a8b..58457c01a7 100644
--- a/panda/src/grutil/frameRateMeter.cxx
+++ b/panda/src/grutil/frameRateMeter.cxx
@@ -21,6 +21,7 @@
 #include "depthTestAttrib.h"
 #include "depthWriteAttrib.h"
 #include "pStatTimer.h"
+#include "omniBoundingVolume.h"
 #include <stdio.h>  // For sprintf/snprintf
 
 PStatCollector FrameRateMeter::_show_fps_pcollector("*:Show fps");
@@ -30,12 +31,19 @@ TypeHandle FrameRateMeter::_type_handle;
 ////////////////////////////////////////////////////////////////////
 //     Function: FrameRateMeter::Constructor
 //       Access: Published
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 FrameRateMeter::
-FrameRateMeter(const string &name) : TextNode(name) {
+FrameRateMeter(const string &name) :
+  TextNode(name),
+  _last_aspect_ratio(-1) {
+
   set_cull_callback();
 
+  // Don't do frustum culling, as the text will always be in view.
+  set_bounds(new OmniBoundingVolume());
+  set_final(true);
+
   Thread *current_thread = Thread::get_current_thread();
 
   _show_milliseconds = frame_rate_meter_milliseconds;
@@ -53,13 +61,13 @@ FrameRateMeter(const string &name) : TextNode(name) {
   // the calculation within TextAssembler.
   PN_stdfloat height = 1.0f;
   TextFont *font = get_font();
-  if (font != NULL){ 
+  if (font != NULL){
     height = font->get_line_height() * 0.8;
   }
 
   set_align(A_right);
-  set_transform(LMatrix4::scale_mat(frame_rate_meter_scale) * 
-                LMatrix4::translate_mat(LVector3::rfu(1.0f - frame_rate_meter_side_margins * frame_rate_meter_scale, 0.0f, 1.0f - frame_rate_meter_scale * height)));
+  set_transform(LMatrix4::scale_mat(frame_rate_meter_scale) *
+                LMatrix4::translate_mat(LVector3::rfu(-frame_rate_meter_side_margins * frame_rate_meter_scale, 0.0f, -frame_rate_meter_scale * height)));
   set_card_color(0.0f, 0.0f, 0.0f, 0.4);
   set_card_as_margin(frame_rate_meter_side_margins, frame_rate_meter_side_margins, 0.1f, 0.0f);
   //  set_usage_hint(Geom::UH_client);
@@ -70,7 +78,7 @@ FrameRateMeter(const string &name) : TextNode(name) {
 ////////////////////////////////////////////////////////////////////
 //     Function: FrameRateMeter::Destructor
 //       Access: Published, Virtual
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 FrameRateMeter::
 ~FrameRateMeter() {
@@ -99,25 +107,31 @@ setup_window(GraphicsOutput *window) {
   _root.node()->set_attrib(dw, 1);
   _root.set_material_off(1);
   _root.set_two_sided(1, 1);
-    
+
+  // If we don't set this explicitly, Panda will cause it to be rendered
+  // in a back-to-front cull bin, which will cause the bounding volume
+  // to be computed unnecessarily.  Saves a little bit of overhead.
+  _root.set_bin("unsorted", 0);
+
   // Create a display region that covers the entire window.
   _display_region = _window->make_mono_display_region();
   _display_region->set_sort(frame_rate_meter_layer_sort);
-    
+
   // Finally, we need a camera to associate with the display region.
   PT(Camera) camera = new Camera("frame_rate_camera");
   NodePath camera_np = _root.attach_new_node(camera);
-    
+
   PT(Lens) lens = new OrthographicLens;
-  
-  static const PN_stdfloat left = -1.0f;
-  static const PN_stdfloat right = 1.0f;
-  static const PN_stdfloat bottom = -1.0f;
-  static const PN_stdfloat top = 1.0f;
+
+  // We choose these values such that we can place the text against (0, 0).
+  static const PN_stdfloat left = -2.0f;
+  static const PN_stdfloat right = 0.0f;
+  static const PN_stdfloat bottom = -2.0f;
+  static const PN_stdfloat top = 0.0f;
   lens->set_film_size(right - left, top - bottom);
   lens->set_film_offset((right + left) * 0.5, (top + bottom) * 0.5);
   lens->set_near_far(-1000, 1000);
-  
+
   camera->set_lens(lens);
   camera->set_scene(_root);
   _display_region->set_camera(camera_np);
@@ -170,7 +184,23 @@ cull_callback(CullTraverser *trav, CullTraverserData &data) {
 
   // Statistics
   PStatTimer timer(_show_fps_pcollector, current_thread);
-  
+
+  // This is probably a good time to check if the aspect ratio on
+  // the window has changed.
+  int width = _display_region->get_pixel_width();
+  int height = _display_region->get_pixel_height();
+  PN_stdfloat aspect_ratio = 1;
+  if (width != 0 && height != 0) {
+    aspect_ratio = (PN_stdfloat)height / (PN_stdfloat)width;
+  }
+
+  // Scale the transform by the calculated aspect ratio.
+  if (aspect_ratio != _last_aspect_ratio) {
+    _aspect_ratio_transform = TransformState::make_scale(LVecBase3(aspect_ratio, 1, 1));
+    _last_aspect_ratio = aspect_ratio;
+  }
+  data._net_transform = data._net_transform->compose(_aspect_ratio_transform);
+
   // Check to see if it's time to update.
   double now = _clock_object->get_frame_time(current_thread);
   double elapsed = now - _last_update;
diff --git a/panda/src/grutil/frameRateMeter.h b/panda/src/grutil/frameRateMeter.h
index 2f95bbaf72..e688b6da86 100644
--- a/panda/src/grutil/frameRateMeter.h
+++ b/panda/src/grutil/frameRateMeter.h
@@ -77,6 +77,9 @@ private:
   string _text_pattern;
   ClockObject *_clock_object;
 
+  PN_stdfloat _last_aspect_ratio;
+  CPT(TransformState) _aspect_ratio_transform;
+
   static PStatCollector _show_fps_pcollector;
 
 public:
diff --git a/panda/src/grutil/pipeOcclusionCullTraverser.cxx b/panda/src/grutil/pipeOcclusionCullTraverser.cxx
index e5783b069b..3ade43d8f0 100644
--- a/panda/src/grutil/pipeOcclusionCullTraverser.cxx
+++ b/panda/src/grutil/pipeOcclusionCullTraverser.cxx
@@ -76,7 +76,7 @@ static ConfigVariableInt occlusion_depth_bits
 ////////////////////////////////////////////////////////////////////
 //     Function: PipeOcclusionCullTraverser::Constructor
 //       Access: Published
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 PipeOcclusionCullTraverser::
 PipeOcclusionCullTraverser(GraphicsOutput *host) {
@@ -103,7 +103,7 @@ PipeOcclusionCullTraverser(GraphicsOutput *host) {
     win_prop.set_size(occlusion_size[0], occlusion_size[1]);
   }
 
-  _buffer = engine->make_output(pipe, "occlusion", 0, fb_prop, win_prop, 
+  _buffer = engine->make_output(pipe, "occlusion", 0, fb_prop, win_prop,
                                 GraphicsPipe::BF_refuse_window,
                                 gsg, host->get_host());
   nassertv(_buffer != (GraphicsOutput *)NULL);
@@ -125,7 +125,7 @@ PipeOcclusionCullTraverser(GraphicsOutput *host) {
 ////////////////////////////////////////////////////////////////////
 //     Function: PipeOcclusionCullTraverser::Copy Constructor
 //       Access: Published
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 PipeOcclusionCullTraverser::
 PipeOcclusionCullTraverser(const PipeOcclusionCullTraverser &copy) :
@@ -137,7 +137,7 @@ PipeOcclusionCullTraverser(const PipeOcclusionCullTraverser &copy) :
 ////////////////////////////////////////////////////////////////////
 //     Function: PipeOcclusionCullTraverser::set_scene
 //       Access: Published, Virtual
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 void PipeOcclusionCullTraverser::
 set_scene(SceneSetup *scene_setup, GraphicsStateGuardianBase *gsgbase,
@@ -154,7 +154,7 @@ set_scene(SceneSetup *scene_setup, GraphicsStateGuardianBase *gsgbase,
 
   Thread *current_thread = get_current_thread();
   if (!_buffer->begin_frame(GraphicsOutput::FM_render, current_thread)) {
-    cerr << "begin_frame failed\n";
+    grutil_cat.error() << "begin_frame failed\n";
     return;
   }
   _buffer->clear(current_thread);
@@ -166,7 +166,7 @@ set_scene(SceneSetup *scene_setup, GraphicsStateGuardianBase *gsgbase,
 
   _scene = new SceneSetup(*scene_setup);
   _scene->set_display_region(_display_region);
-  _scene->set_viewport_size(_display_region->get_pixel_width(), 
+  _scene->set_viewport_size(_display_region->get_pixel_width(),
                             _display_region->get_pixel_height());
 
   if (_scene->get_cull_center() != _scene->get_camera_path()) {
@@ -177,13 +177,22 @@ set_scene(SceneSetup *scene_setup, GraphicsStateGuardianBase *gsgbase,
     NodePath scene_parent = _scene->get_scene_root().get_parent(current_thread);
     CPT(TransformState) camera_transform = cull_center.get_transform(scene_parent, current_thread);
     CPT(TransformState) world_transform = scene_parent.get_transform(cull_center, current_thread);
+    CPT(TransformState) cs_world_transform = _scene->get_cs_transform()->compose(world_transform);
     _scene->set_camera_transform(camera_transform);
     _scene->set_world_transform(world_transform);
+    _scene->set_cs_world_transform(cs_world_transform);
+
+    // We use this to recover the original net_transform.
+    _inv_cs_world_transform = cs_world_transform->get_inverse();
+  } else {
+    _inv_cs_world_transform = _scene->get_cs_world_transform()->get_inverse();
   }
-    
+
+  nassertv(_scene->get_cs_transform() == scene_setup->get_cs_transform());
+
   gsg->set_scene(_scene);
   if (!gsg->begin_scene()) {
-    cerr << "begin_scene failed\n";
+    grutil_cat.error() << "begin_scene failed\n";
     return;
   }
 
@@ -202,7 +211,7 @@ set_scene(SceneSetup *scene_setup, GraphicsStateGuardianBase *gsgbase,
 
   _current_query = NULL;
   _next_query = NULL;
-  
+
   // Begin by rendering all the occluders into our internal scene.
   PStatTimer timer2(_draw_occlusion_pcollector);
   _internal_trav->traverse(_scene->get_scene_root());
@@ -299,7 +308,7 @@ get_texture() {
 ////////////////////////////////////////////////////////////////////
 //     Function: PipeOcclusionCullTraverser::is_in_view
 //       Access: Protected, Virtual
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 bool PipeOcclusionCullTraverser::
 is_in_view(CullTraverserData &data) {
@@ -335,12 +344,12 @@ is_in_view(CullTraverserData &data) {
 
     CPT(BoundingVolume) vol = node_reader->get_bounds();
     CPT(TransformState) net_transform = data.get_net_transform(this);
-    CPT(TransformState) modelview_transform;
+    CPT(TransformState) internal_transform;
 
     CPT(Geom) geom;
-    if (get_volume_viz(vol, geom, net_transform, modelview_transform)) {
-      _next_query = 
-        perform_occlusion_test(geom, net_transform, modelview_transform);
+    if (get_volume_viz(vol, geom, net_transform, internal_transform)) {
+      _next_query =
+        perform_occlusion_test(geom, net_transform, internal_transform);
     }
   }
 
@@ -408,12 +417,12 @@ record_object(CullableObject *object, const CullTraverser *traverser) {
   } else {
     // Issue an occlusion test for this object.
     CPT(BoundingVolume) vol = object->_geom->get_bounds(current_thread);
-    CPT(TransformState) net_transform = object->_net_transform;
-    CPT(TransformState) modelview_transform;
+    CPT(TransformState) net_transform = _inv_cs_world_transform->compose(object->_internal_transform);
+    CPT(TransformState) internal_transform;
     CPT(Geom) geom;
-    if (get_volume_viz(vol, geom, net_transform, modelview_transform)) {
-      pobj._query = 
-        perform_occlusion_test(geom, net_transform, modelview_transform);
+    if (get_volume_viz(vol, geom, net_transform, internal_transform)) {
+      pobj._query =
+        perform_occlusion_test(geom, net_transform, internal_transform);
     }
   }
 
@@ -437,7 +446,7 @@ make_sphere() {
   PT(GeomVertexData) vdata = new GeomVertexData
     ("occlusion_sphere", GeomVertexFormat::get_v3(), Geom::UH_static);
   GeomVertexWriter vertex(vdata, InternalName::get_vertex());
-  
+
   PT(GeomTristrips) strip = new GeomTristrips(Geom::UH_stream);
   for (int sl = 0; sl < num_slices; ++sl) {
     PN_stdfloat longitude0 = (PN_stdfloat)sl / (PN_stdfloat)num_slices;
@@ -449,11 +458,11 @@ make_sphere() {
       vertex.add_data3(compute_sphere_point(latitude, longitude1));
     }
     vertex.add_data3(compute_sphere_point(1.0, longitude0));
-    
+
     strip->add_next_vertices(num_stacks * 2);
     strip->close_primitive();
   }
-  
+
   _sphere_geom = new Geom(vdata);
   _sphere_geom->add_primitive(strip);
 }
@@ -462,7 +471,7 @@ make_sphere() {
 //     Function: PipeOcclusionCullTraverser::compute_sphere_point
 //       Access: Private, Static
 //  Description: Returns a point on the surface of the unit sphere.
-//               latitude and longitude range from 0.0 to 1.0.  
+//               latitude and longitude range from 0.0 to 1.0.
 ////////////////////////////////////////////////////////////////////
 LVertex PipeOcclusionCullTraverser::
 compute_sphere_point(PN_stdfloat latitude, PN_stdfloat longitude) {
@@ -487,7 +496,7 @@ make_box() {
   PT(GeomVertexData) vdata = new GeomVertexData
     ("occlusion_box", GeomVertexFormat::get_v3(), Geom::UH_static);
   GeomVertexWriter vertex(vdata, InternalName::get_vertex());
-  
+
   vertex.add_data3(0.0f, 0.0f, 0.0f);
   vertex.add_data3(0.0f, 0.0f, 1.0f);
   vertex.add_data3(0.0f, 1.0f, 0.0f);
@@ -496,7 +505,7 @@ make_box() {
   vertex.add_data3(1.0f, 0.0f, 1.0f);
   vertex.add_data3(1.0f, 1.0f, 0.0f);
   vertex.add_data3(1.0f, 1.0f, 1.0f);
-    
+
   PT(GeomTriangles) tris = new GeomTriangles(Geom::UH_static);
   tris->add_vertices(0, 4, 5);
   tris->close_primitive();
@@ -522,7 +531,7 @@ make_box() {
   tris->close_primitive();
   tris->add_vertices(2, 4, 0);
   tris->close_primitive();
-  
+
   _box_geom = new Geom(vdata);
   _box_geom->add_primitive(tris);
 }
@@ -554,14 +563,14 @@ make_solid_test_state() {
 //               transform to the bounding volume.  On exit (when
 //               return value is true), it will be composed with a
 //               suitable local transform to render the bounding
-//               volume properly, and modelview_transform will also be
+//               volume properly, and internal_transform will also be
 //               filled with the appropriate transform.
 ////////////////////////////////////////////////////////////////////
 bool PipeOcclusionCullTraverser::
-get_volume_viz(const BoundingVolume *vol, 
+get_volume_viz(const BoundingVolume *vol,
                CPT(Geom) &geom,  // OUT
                CPT(TransformState) &net_transform, // IN-OUT
-               CPT(TransformState) &modelview_transform  // OUT
+               CPT(TransformState) &internal_transform  // OUT
                ) {
   if (vol->is_infinite() || vol->is_empty()) {
     return false;
@@ -569,13 +578,14 @@ get_volume_viz(const BoundingVolume *vol,
 
   if (vol->is_exact_type(BoundingSphere::get_class_type())) {
     const BoundingSphere *sphere = DCAST(BoundingSphere, vol);
-    CPT(TransformState) local_transform = 
+    CPT(TransformState) local_transform =
       TransformState::make_pos_hpr_scale(sphere->get_center(),
                                          LVecBase3(0, 0, 0),
                                          sphere->get_radius());
     net_transform = net_transform->compose(local_transform);
 
-    modelview_transform = _internal_trav->get_world_transform()->compose(net_transform);
+    CPT(TransformState) modelview_transform =
+      _internal_trav->get_world_transform()->compose(net_transform);
 
     // See if the bounding sphere is clipped by the near plane.  If it
     // is, the occlusion test may fail, so we won't bother performing
@@ -587,19 +597,24 @@ get_volume_viz(const BoundingVolume *vol,
       return false;
     }
 
+    // Construct the internal transform for the internal traverser.
+    internal_transform = _internal_trav->get_scene()->
+      get_cs_transform()->compose(modelview_transform);
+
     // The sphere looks good.
     geom = _sphere_geom;
     return true;
 
   } else if (vol->is_exact_type(BoundingBox::get_class_type())) {
     const BoundingBox *box = DCAST(BoundingBox, vol);
-    CPT(TransformState) local_transform = 
+    CPT(TransformState) local_transform =
       TransformState::make_pos_hpr_scale(box->get_minq(),
                                          LVecBase3(0, 0, 0),
                                          box->get_maxq() - box->get_minq());
     net_transform = net_transform->compose(local_transform);
 
-    modelview_transform = _internal_trav->get_world_transform()->compose(net_transform);
+    CPT(TransformState) modelview_transform =
+      _internal_trav->get_world_transform()->compose(net_transform);
 
     // See if the bounding box is clipped by the near plane.  If it
     // is, the occlusion test may fail, so we won't bother performing
@@ -623,6 +638,10 @@ get_volume_viz(const BoundingVolume *vol,
       }
     }
 
+    // Construct the internal transform for the internal traverser.
+    internal_transform = _internal_trav->get_scene()->
+      get_cs_transform()->compose(modelview_transform);
+
     // The box looks good.
     geom = _box_geom;
     return true;
@@ -640,7 +659,7 @@ get_volume_viz(const BoundingVolume *vol,
 ////////////////////////////////////////////////////////////////////
 PT(OcclusionQueryContext) PipeOcclusionCullTraverser::
 perform_occlusion_test(const Geom *geom, const TransformState *net_transform,
-                       const TransformState *modelview_transform) {
+                       const TransformState *internal_transform) {
   _occlusion_tests_pcollector.add_level(1);
   PStatTimer timer(_test_occlusion_pcollector);
 
@@ -648,9 +667,8 @@ perform_occlusion_test(const Geom *geom, const TransformState *net_transform,
 
   gsg->begin_occlusion_query();
 
-  CullableObject *viz = 
-    new CullableObject(geom, _solid_test_state,
-                       net_transform, modelview_transform, get_scene());
+  CullableObject *viz =
+    new CullableObject(geom, _solid_test_state, internal_transform);
 
   static ConfigVariableBool test_occlude("test-occlude", false);
   if (test_occlude) {
@@ -658,16 +676,16 @@ perform_occlusion_test(const Geom *geom, const TransformState *net_transform,
   } else {
     _internal_cull_handler->record_object(viz, _internal_trav);
   }
-  
+
   PT(OcclusionQueryContext) query = gsg->end_occlusion_query();
-    
+
   if (show_occlusion) {
     // Show the results of the occlusion.  To do this, we need to get
     // the results of the query immediately.  This will stall the
     // pipe, but we're rendering a debug effect, so we don't mind too
     // much.
     int num_fragments = query->get_num_fragments();
-    show_results(num_fragments, geom, net_transform, modelview_transform);
+    show_results(num_fragments, geom, net_transform, internal_transform);
   }
 
   return query;
@@ -680,18 +698,18 @@ perform_occlusion_test(const Geom *geom, const TransformState *net_transform,
 //               test for a particular bounding volume.
 ////////////////////////////////////////////////////////////////////
 void PipeOcclusionCullTraverser::
-show_results(int num_fragments, const Geom *geom, 
-             const TransformState *net_transform, 
-             const TransformState *modelview_transform) {
+show_results(int num_fragments, const Geom *geom,
+             const TransformState *net_transform,
+             const TransformState *internal_transform) {
   LColor color;
   if (num_fragments == 0) {
     // Magenta: culled
-    color.set(0.8f, 0.0f, 1.0f, 0.4);
+    color.set(0.8f, 0.0f, 1.0f, 0.4f);
   } else {
     // Yellow: visible
-    color.set(1.0f, 1.0f, 0.5f, 0.4);
+    color.set(1.0f, 1.0f, 0.5f, 0.4f);
   }
-  
+
   CPT(RenderState) state = RenderState::make
     (DepthWriteAttrib::make(DepthWriteAttrib::M_off),
      DepthTestAttrib::make(DepthTestAttrib::M_less),
@@ -700,15 +718,13 @@ show_results(int num_fragments, const Geom *geom,
 
   GraphicsStateGuardian *gsg = _buffer->get_gsg();
 
-  CullableObject *internal_viz = 
-    new CullableObject(geom, state,
-                       net_transform, modelview_transform, get_scene());
+  CullableObject *internal_viz =
+    new CullableObject(geom, state, internal_transform);
   _internal_cull_handler->record_object(internal_viz, _internal_trav);
 
   // Also render the viz in the main scene.
-  modelview_transform = get_world_transform()->compose(net_transform);
-  CullableObject *main_viz = 
-    new CullableObject(geom, state,
-                       net_transform, modelview_transform, get_scene());
+  internal_transform = get_scene()->get_cs_world_transform()->compose(net_transform);
+  CullableObject *main_viz =
+    new CullableObject(geom, state, internal_transform);
   _true_cull_handler->record_object(main_viz, this);
 }
diff --git a/panda/src/grutil/pipeOcclusionCullTraverser.h b/panda/src/grutil/pipeOcclusionCullTraverser.h
index fb8636c79d..35bd72159f 100644
--- a/panda/src/grutil/pipeOcclusionCullTraverser.h
+++ b/panda/src/grutil/pipeOcclusionCullTraverser.h
@@ -75,19 +75,19 @@ private:
 
   void make_solid_test_state();
 
-  bool get_volume_viz(const BoundingVolume *vol, 
+  bool get_volume_viz(const BoundingVolume *vol,
                       CPT(Geom) &geom,  // OUT
                       CPT(TransformState) &net_transform, // IN-OUT
-                      CPT(TransformState) &modelview_transform  // OUT
+                      CPT(TransformState) &internal_transform  // OUT
                       );
-  PT(OcclusionQueryContext) 
-    perform_occlusion_test(const Geom *geom, 
+  PT(OcclusionQueryContext)
+    perform_occlusion_test(const Geom *geom,
                            const TransformState *net_transform,
-                           const TransformState *modelview_transform);
+                           const TransformState *internal_transform);
 
-  void show_results(int num_fragments, const Geom *geom, 
-                    const TransformState *net_transform, 
-                    const TransformState *modelview_transform);
+  void show_results(int num_fragments, const Geom *geom,
+                    const TransformState *net_transform,
+                    const TransformState *internal_transform);
 private:
   bool _live;
 
@@ -98,6 +98,7 @@ private:
 
   PT(SceneSetup) _scene;
   PT(CullTraverser) _internal_trav;
+  CPT(TransformState) _inv_cs_world_transform;
 
   CullHandler *_internal_cull_handler;
   CullHandler *_true_cull_handler;
@@ -157,4 +158,4 @@ private:
 #endif
 
 
-  
+
diff --git a/panda/src/gsgbase/graphicsStateGuardianBase.h b/panda/src/gsgbase/graphicsStateGuardianBase.h
index d3252b4b74..436c169ee0 100644
--- a/panda/src/gsgbase/graphicsStateGuardianBase.h
+++ b/panda/src/gsgbase/graphicsStateGuardianBase.h
@@ -198,9 +198,9 @@ public:
   // inconvenient to declare each of those types to be friends of this
   // class.
 
-  virtual bool begin_draw_primitives(const GeomPipelineReader *geom_reader, 
+  virtual bool begin_draw_primitives(const GeomPipelineReader *geom_reader,
                                      const GeomMunger *munger,
-                                     const GeomVertexDataPipelineReader *data_reader, 
+                                     const GeomVertexDataPipelineReader *data_reader,
                                      bool force)=0;
   virtual bool draw_triangles(const GeomPrimitivePipelineReader *reader, bool force)=0;
   virtual bool draw_tristrips(const GeomPrimitivePipelineReader *reader, bool force)=0;
@@ -218,7 +218,7 @@ public:
 
   virtual CoordinateSystem get_internal_coordinate_system() const=0;
 
-  virtual void bind_light(PointLight *light_obj, const NodePath &light, 
+  virtual void bind_light(PointLight *light_obj, const NodePath &light,
                           int light_id) { }
   virtual void bind_light(DirectionalLight *light_obj, const NodePath &light,
                           int light_id) { }
diff --git a/panda/src/linmath/Sources.pp b/panda/src/linmath/Sources.pp
index 92c6916504..e4134e688e 100644
--- a/panda/src/linmath/Sources.pp
+++ b/panda/src/linmath/Sources.pp
@@ -12,6 +12,7 @@
      aa_luse.h \
      compose_matrix.h compose_matrix_src.I  \
      compose_matrix_src.cxx compose_matrix_src.h config_linmath.h  \
+     configVariableColor.h configVariableColor.I \
      coordinateSystem.h dbl2fltnames.h dblnames.h \
      deg_2_rad.h deg_2_rad.I \
      flt2dblnames.h fltnames.h intnames.h lcast_to.h lcast_to_src.h  \
@@ -43,8 +44,8 @@
      mathNumbers.h mathNumbers.I 
     
   #define INCLUDED_SOURCES \
-     compose_matrix.cxx config_linmath.cxx coordinateSystem.cxx  \
-     lmatrix.cxx \
+     compose_matrix.cxx config_linmath.cxx configVariableColor.cxx \
+     coordinateSystem.cxx lmatrix.cxx \
      lorientation.cxx lpoint2.cxx  \
      lpoint3.cxx lpoint4.cxx lquaternion.cxx lrotation.cxx  \
      luse.cxx lvecBase2.cxx lvecBase3.cxx lvecBase4.cxx  \
@@ -53,7 +54,9 @@
   #define INSTALL_HEADERS \
     aa_luse.h \
     compose_matrix.h compose_matrix_src.I \
-    compose_matrix_src.h config_linmath.h coordinateSystem.h \
+    compose_matrix_src.h config_linmath.h \
+    configVariableColor.h configVariableColor.I \
+    coordinateSystem.h \
     dbl2fltnames.h dblnames.h \
     deg_2_rad.h deg_2_rad.I \
     flt2dblnames.h fltnames.h intnames.h lcast_to.h lcast_to_src.I lcast_to_src.h \
diff --git a/panda/src/linmath/configVariableColor.I b/panda/src/linmath/configVariableColor.I
new file mode 100644
index 0000000000..a686c988c5
--- /dev/null
+++ b/panda/src/linmath/configVariableColor.I
@@ -0,0 +1,182 @@
+// Filename: configVariableColor.I
+// Created by:  rdb (02Feb14)
+//
+////////////////////////////////////////////////////////////////////
+//
+// 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."
+//
+////////////////////////////////////////////////////////////////////
+
+
+////////////////////////////////////////////////////////////////////
+//     Function: ConfigVariableColor::Constructor
+//       Access: Published
+//  Description:
+////////////////////////////////////////////////////////////////////
+INLINE ConfigVariableColor::
+ConfigVariableColor(const string &name) :
+  ConfigVariable(name, VT_color),
+  _local_modified(initial_invalid_cache()),
+  _cache(0, 0, 0, 1)
+{
+  _core->set_used();
+}
+
+////////////////////////////////////////////////////////////////////
+//     Function: ConfigVariableColor::Constructor
+//       Access: Published
+//  Description:
+////////////////////////////////////////////////////////////////////
+INLINE ConfigVariableColor::
+ConfigVariableColor(const string &name, const LColor &default_value,
+                    const string &description, int flags) :
+#ifdef PRC_SAVE_DESCRIPTIONS
+  ConfigVariable(name, ConfigVariableCore::VT_color, description, flags),
+#else
+  ConfigVariable(name, ConfigVariableCore::VT_color, string(), flags),
+#endif
+  _local_modified(initial_invalid_cache()),
+  _cache(0, 0, 0, 1)
+{
+  set_default_value(default_value);
+  _core->set_used();
+}
+
+////////////////////////////////////////////////////////////////////
+//     Function: ConfigVariableColor::Constructor
+//       Access: Published
+//  Description:
+////////////////////////////////////////////////////////////////////
+INLINE ConfigVariableColor::
+ConfigVariableColor(const string &name, const string &default_value,
+                    const string &description, int flags) :
+#ifdef PRC_SAVE_DESCRIPTIONS
+  ConfigVariable(name, ConfigVariableCore::VT_color, description, flags),
+#else
+  ConfigVariable(name, ConfigVariableCore::VT_color, string(), flags),
+#endif
+  _local_modified(initial_invalid_cache()),
+  _cache(0, 0, 0, 1)
+{
+  _core->set_default_value(default_value);
+  _core->set_used();
+}
+
+////////////////////////////////////////////////////////////////////
+//     Function: ConfigVariableColor::operator =
+//       Access: Published
+//  Description: Reassigns the variable's local value.
+////////////////////////////////////////////////////////////////////
+INLINE void ConfigVariableColor::
+operator = (const LColor &value) {
+  set_value(value);
+}
+
+////////////////////////////////////////////////////////////////////
+//     Function: ConfigVariableColor::typecast operator
+//       Access: Published
+//  Description: Returns the variable's value.
+////////////////////////////////////////////////////////////////////
+INLINE ConfigVariableColor::
+operator const LColor & () const {
+  return get_value();
+}
+
+////////////////////////////////////////////////////////////////////
+//     Function: ConfigVariableColor::operator []
+//       Access: Published
+//  Description: Returns the value of the color's nth component
+//               (which is not necessarily the same thing as the
+//               variable's nth word).
+////////////////////////////////////////////////////////////////////
+INLINE PN_stdfloat ConfigVariableColor::
+operator [] (int n) const {
+  return get_value()[n];
+}
+
+////////////////////////////////////////////////////////////////////
+//     Function: ConfigVariableColor::set_value
+//       Access: Published
+//  Description: Reassigns the variable's local value.
+////////////////////////////////////////////////////////////////////
+INLINE void ConfigVariableColor::
+set_value(const LColor &color) {
+  set_string_value("");
+  set_double_word(0, color[0]);
+  set_double_word(1, color[1]);
+  set_double_word(2, color[2]);
+  set_double_word(3, color[3]);
+}
+
+////////////////////////////////////////////////////////////////////
+//     Function: ConfigVariableColor::get_value
+//       Access: Published
+//  Description: Returns the variable's value.
+////////////////////////////////////////////////////////////////////
+INLINE const LColor &ConfigVariableColor::
+get_value() const {
+  TAU_PROFILE("const LColor &ConfigVariableColor::get_value() const", " ", TAU_USER);
+  if (!is_cache_valid(_local_modified)) {
+    mark_cache_valid(_local_modified);
+
+    switch (get_num_words()) {
+    case 1:
+      _cache.set(get_double_word(0), get_double_word(0), get_double_word(0), 1);
+      break;
+
+    case 2:
+      _cache.set(get_double_word(0), get_double_word(0), get_double_word(0), get_double_word(1));
+      break;
+
+    case 3:
+      _cache.set(get_double_word(0), get_double_word(1), get_double_word(2), 1);
+      break;
+
+    case 4:
+      _cache.set(get_double_word(0), get_double_word(1), get_double_word(2), get_double_word(3));
+      break;
+
+    default:
+      prc_cat->warning()
+        << "Invalid color value for ConfigVariable "
+        << get_name() << ": " << get_string_value() << "\n";
+    }
+  }
+  return _cache;
+}
+
+////////////////////////////////////////////////////////////////////
+//     Function: ConfigVariableColor::get_default_value
+//       Access: Published
+//  Description: Returns the variable's default value.
+////////////////////////////////////////////////////////////////////
+INLINE LColor ConfigVariableColor::
+get_default_value() const {
+  const ConfigDeclaration *decl = ConfigVariable::get_default_value();
+  if (decl != (ConfigDeclaration *)NULL) {
+    switch (decl->get_num_words()) {
+    case 1:
+      return LColor(decl->get_double_word(0), decl->get_double_word(0),
+                    decl->get_double_word(0), 1);
+    case 2:
+      return LColor(decl->get_double_word(0), decl->get_double_word(0),
+                    decl->get_double_word(0), decl->get_double_word(1));
+    case 3:
+      return LColor(decl->get_double_word(0), decl->get_double_word(1),
+                    decl->get_double_word(2), 1);
+    case 4:
+      return LColor(decl->get_double_word(0), decl->get_double_word(1),
+                    decl->get_double_word(2), decl->get_double_word(3));
+    default:
+      prc_cat->warning()
+        << "Invalid default color value for ConfigVariable "
+        << get_name() << ": " << decl->get_string_value() << "\n";
+    }
+  }
+  return LColor(0, 0, 0, 1);
+}
diff --git a/panda/src/dxgsg8/wdxGraphicsBuffer8.I b/panda/src/linmath/configVariableColor.cxx
similarity index 51%
rename from panda/src/dxgsg8/wdxGraphicsBuffer8.I
rename to panda/src/linmath/configVariableColor.cxx
index a2a4185d0c..3d4ea47a7d 100644
--- a/panda/src/dxgsg8/wdxGraphicsBuffer8.I
+++ b/panda/src/linmath/configVariableColor.cxx
@@ -1,5 +1,5 @@
-// Filename: wdxGraphicsBuffer8.I
-// Created by:  zhao (29Sep12)
+// Filename: configVariableColor.cxx
+// Created by:  rdb (02Feb14)
 //
 ////////////////////////////////////////////////////////////////////
 //
@@ -12,16 +12,17 @@
 //
 ////////////////////////////////////////////////////////////////////
 
+#include "configVariableColor.h"
+
 ////////////////////////////////////////////////////////////////////
-//     Function: wdxGraphicsBuffer8::get_supports_render_texture
-//       Access: Published, Virtual
-//  Description: Returns true if this particular GraphicsOutput can
-//               render directly into a texture, or false if it must
-//               always copy-to-texture at the end of each frame to
-//               achieve this effect.
+//     Function: ConfigVariableColor::set_default_value
+//       Access: Private
+//  Description:
 ////////////////////////////////////////////////////////////////////
-INLINE bool wdxGraphicsBuffer8::
-get_supports_render_texture() const {
-  // DX8 buffers can always bind-to-texture.
-  return true;
+void ConfigVariableColor::
+set_default_value(const LColor &default_value) {
+  ostringstream strm;
+  strm << default_value;
+
+  _core->set_default_value(strm.str());
 }
diff --git a/panda/src/linmath/configVariableColor.h b/panda/src/linmath/configVariableColor.h
new file mode 100644
index 0000000000..76b8adf6b3
--- /dev/null
+++ b/panda/src/linmath/configVariableColor.h
@@ -0,0 +1,69 @@
+// Filename: configVariableColor.h
+// Created by:  rdb (02Feb14)
+//
+////////////////////////////////////////////////////////////////////
+//
+// 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 CONFIGVARIABLECOLOR_H
+#define CONFIGVARIABLECOLOR_H
+
+#include "dtoolbase.h"
+#include "config_linmath.h"
+#include "config_prc.h"
+#include "configVariable.h"
+#include "luse.h"
+
+////////////////////////////////////////////////////////////////////
+//       Class : ConfigVariableColor
+// Description : This is a convenience class to specialize
+//               ConfigVariable as a set of floating-point types
+//               representing a color value.
+//
+//               It interprets the color differently depending on
+//               how many words were specified: if only one, it
+//               is interpreted as a shade of gray with alpha 1.
+//               If two values were specified, a grayscale and
+//               alpha pair.  If three, a set of R, G, B values
+//               with alpha 1, and if four, a complete RGBA color.
+//
+//               This isn't defined in dtool because it relies on
+//               the LColor class, which is defined in linmath.
+////////////////////////////////////////////////////////////////////
+class EXPCL_PANDA_LINMATH ConfigVariableColor : public ConfigVariable {
+PUBLISHED:
+  INLINE ConfigVariableColor(const string &name);
+  INLINE ConfigVariableColor(const string &name, const LColor &default_value,
+                             const string &description = string(),
+                             int flags = 0);
+  INLINE ConfigVariableColor(const string &name, const string &default_value,
+                             const string &description = string(),
+                             int flags = 0);
+
+  INLINE void operator = (const LColor &value);
+  INLINE operator const LColor & () const;
+
+  INLINE PN_stdfloat operator [] (int n) const;
+
+  INLINE void set_value(const LColor &value);
+  INLINE const LColor &get_value() const;
+  INLINE LColor get_default_value() const;
+
+private:
+  void set_default_value(const LColor &default_value);
+
+private:
+  mutable AtomicAdjust::Integer _local_modified;
+  mutable LColor _cache;
+};
+
+#include "configVariableColor.I"
+
+#endif
diff --git a/panda/src/linmath/lmatrix3_src.I b/panda/src/linmath/lmatrix3_src.I
index 6b12ee6642..402dbbaba4 100644
--- a/panda/src/linmath/lmatrix3_src.I
+++ b/panda/src/linmath/lmatrix3_src.I
@@ -385,6 +385,17 @@ is_nan() const {
     cnan(_m(2, 0)) || cnan(_m(2, 1)) || cnan(_m(2, 2));
 }
 
+////////////////////////////////////////////////////////////////////
+//     Function: LMatrix3::is_identity
+//       Access: Public
+//  Description: Returns true if this is (close enough to) the
+//               identity matrix, false otherwise.
+////////////////////////////////////////////////////////////////////
+INLINE_LINMATH bool FLOATNAME(LMatrix3)::
+is_identity() const {
+  return almost_equal(ident_mat(), NEARLY_ZERO(FLOATTYPE));
+}
+
 ////////////////////////////////////////////////////////////////////
 //     Function: LMatrix3::get_cell
 //       Access: Published
@@ -504,7 +515,7 @@ operator == (const FLOATNAME(LMatrix3) &other) const {
 ////////////////////////////////////////////////////////////////////
 INLINE_LINMATH bool FLOATNAME(LMatrix3)::
 operator != (const FLOATNAME(LMatrix3) &other) const {
-  return !operator == (other);
+  return compare_to(other) != 0;
 }
 
 ////////////////////////////////////////////////////////////////////
diff --git a/panda/src/linmath/lmatrix3_src.cxx b/panda/src/linmath/lmatrix3_src.cxx
index b5352a11cb..6906aa503f 100644
--- a/panda/src/linmath/lmatrix3_src.cxx
+++ b/panda/src/linmath/lmatrix3_src.cxx
@@ -77,7 +77,7 @@ set_scale_shear_mat(const FLOATNAME(LVecBase3) &scale,
           shear._v(1) * scale._v(2), shear._v(2) * scale._v(2), scale._v(2));
     }
     break;
-    
+
   case CS_zup_left:
     if (temp_hpr_fix) {
       set(scale._v(0), shear._v(0) * scale._v(0), 0.0f,
@@ -89,7 +89,7 @@ set_scale_shear_mat(const FLOATNAME(LVecBase3) &scale,
           -shear._v(1) * scale._v(2), -shear._v(2) * scale._v(2), scale._v(2));
     }
     break;
-    
+
   case CS_yup_right:
     if (temp_hpr_fix) {
       set(scale._v(0), 0.0f, shear._v(1) * scale._v(0),
@@ -101,7 +101,7 @@ set_scale_shear_mat(const FLOATNAME(LVecBase3) &scale,
           shear._v(1) * scale._v(2), 0.0f, scale._v(2));
     }
     break;
-    
+
   case CS_yup_left:
     if (temp_hpr_fix) {
       set(scale._v(0), 0.0f, -shear._v(1) * scale._v(0),
@@ -113,7 +113,7 @@ set_scale_shear_mat(const FLOATNAME(LVecBase3) &scale,
           -shear._v(1) * scale._v(2), 0.0f, scale._v(2));
     }
     break;
-    
+
   case CS_default:
   case CS_invalid:
   default:
@@ -352,6 +352,9 @@ set_rotate_mat_normaxis(FLOATTYPE angle, const FLOATNAME(LVecBase3) &axis,
 bool FLOATNAME(LMatrix3)::
 almost_equal(const FLOATNAME(LMatrix3) &other, FLOATTYPE threshold) const {
   TAU_PROFILE("bool LMatrix3::almost_equal(const LMatrix3 &, FLOATTYPE)", " ", TAU_USER);
+#ifdef HAVE_EIGEN
+  return ((_m - other._m).cwiseAbs().maxCoeff() < NEARLY_ZERO(FLOATTYPE));
+#else
   return (IS_THRESHOLD_EQUAL((*this)(0, 0), other(0, 0), threshold) &&
           IS_THRESHOLD_EQUAL((*this)(0, 1), other(0, 1), threshold) &&
           IS_THRESHOLD_EQUAL((*this)(0, 2), other(0, 2), threshold) &&
@@ -361,9 +364,9 @@ almost_equal(const FLOATNAME(LMatrix3) &other, FLOATTYPE threshold) const {
           IS_THRESHOLD_EQUAL((*this)(2, 0), other(2, 0), threshold) &&
           IS_THRESHOLD_EQUAL((*this)(2, 1), other(2, 1), threshold) &&
           IS_THRESHOLD_EQUAL((*this)(2, 2), other(2, 2), threshold));
+#endif
 }
 
-
 ////////////////////////////////////////////////////////////////////
 //     Function: LMatrix3::output
 //       Access: Published
@@ -440,7 +443,7 @@ void FLOATNAME(LMatrix3)::
 write_datagram_fixed(Datagram &destination) const {
   for (int i = 0; i < 3; ++i) {
     for (int j = 0; j < 3; ++j) {
-#if FLOATTOKEN == 'f' 
+#if FLOATTOKEN == 'f'
       destination.add_float32(get_cell(i,j));
 #else
       destination.add_float64(get_cell(i,j));
diff --git a/panda/src/linmath/lmatrix3_src.h b/panda/src/linmath/lmatrix3_src.h
index 4ce9a5c148..c132a58e1e 100644
--- a/panda/src/linmath/lmatrix3_src.h
+++ b/panda/src/linmath/lmatrix3_src.h
@@ -99,6 +99,7 @@ PUBLISHED:
   INLINE_LINMATH static int size();
 
   INLINE_LINMATH bool is_nan() const;
+  INLINE_LINMATH bool is_identity() const;
 
   INLINE_LINMATH FLOATTYPE get_cell(int row, int col) const;
   INLINE_LINMATH void set_cell(int row, int col, FLOATTYPE value);
@@ -247,28 +248,28 @@ PUBLISHED:
     scale_mat(FLOATTYPE sx, FLOATTYPE sy, FLOATTYPE sz);
 
   INLINE_LINMATH void
-    set_shear_mat(const FLOATNAME(LVecBase3) &shear, 
+    set_shear_mat(const FLOATNAME(LVecBase3) &shear,
                   CoordinateSystem cs = CS_default);
 
   static INLINE_LINMATH FLOATNAME(LMatrix3)
-    shear_mat(const FLOATNAME(LVecBase3) &shear, 
+    shear_mat(const FLOATNAME(LVecBase3) &shear,
               CoordinateSystem cs = CS_default);
   static INLINE_LINMATH FLOATNAME(LMatrix3)
-    shear_mat(FLOATTYPE shxy, FLOATTYPE shxz, FLOATTYPE shyz, 
+    shear_mat(FLOATTYPE shxy, FLOATTYPE shxz, FLOATTYPE shyz,
               CoordinateSystem cs = CS_default);
 
   void
     set_scale_shear_mat(const FLOATNAME(LVecBase3) &scale,
-                        const FLOATNAME(LVecBase3) &shear, 
+                        const FLOATNAME(LVecBase3) &shear,
                         CoordinateSystem cs = CS_default);
 
   static INLINE_LINMATH FLOATNAME(LMatrix3)
     scale_shear_mat(const FLOATNAME(LVecBase3) &scale,
-                    const FLOATNAME(LVecBase3) &shear, 
+                    const FLOATNAME(LVecBase3) &shear,
                     CoordinateSystem cs = CS_default);
   static INLINE_LINMATH FLOATNAME(LMatrix3)
     scale_shear_mat(FLOATTYPE sx, FLOATTYPE sy, FLOATTYPE sz,
-                    FLOATTYPE shxy, FLOATTYPE shxz, FLOATTYPE shyz, 
+                    FLOATTYPE shxy, FLOATTYPE shxz, FLOATTYPE shyz,
                     CoordinateSystem cs = CS_default);
 
   static const FLOATNAME(LMatrix3) &convert_mat(CoordinateSystem from,
diff --git a/panda/src/linmath/lmatrix4_src.I b/panda/src/linmath/lmatrix4_src.I
index 38fe84b0ad..9dc886c22b 100644
--- a/panda/src/linmath/lmatrix4_src.I
+++ b/panda/src/linmath/lmatrix4_src.I
@@ -616,6 +616,18 @@ is_nan() const {
     cnan(_m(3, 0)) || cnan(_m(3, 1)) || cnan(_m(3, 2)) || cnan(_m(3, 3));
 }
 
+////////////////////////////////////////////////////////////////////
+//     Function: LMatrix4::is_identity
+//       Access: Public
+//  Description: Returns true if this is (close enough to) the
+//               identity matrix, false otherwise.
+////////////////////////////////////////////////////////////////////
+INLINE_LINMATH bool FLOATNAME(LMatrix4)::
+is_identity() const {
+  // Eigen has isIdentity, but it seems to be twice as slow as this.
+  return almost_equal(ident_mat(), NEARLY_ZERO(FLOATTYPE));
+}
+
 ////////////////////////////////////////////////////////////////////
 //     Function: LMatrix4::get_cell
 //       Access: Public
@@ -735,7 +747,7 @@ operator == (const FLOATNAME(LMatrix4) &other) const {
 ////////////////////////////////////////////////////////////////////
 INLINE_LINMATH bool FLOATNAME(LMatrix4)::
 operator != (const FLOATNAME(LMatrix4) &other) const {
-  return !operator == (other);
+  return compare_to(other) != 0;
 }
 
 ////////////////////////////////////////////////////////////////////
diff --git a/panda/src/linmath/lmatrix4_src.cxx b/panda/src/linmath/lmatrix4_src.cxx
index cf8fabcc58..4123fd17aa 100644
--- a/panda/src/linmath/lmatrix4_src.cxx
+++ b/panda/src/linmath/lmatrix4_src.cxx
@@ -182,7 +182,7 @@ set_rotate_mat(FLOATTYPE angle, const FLOATNAME(LVecBase3) &axis,
   FLOATTYPE length_sq = axis_0 * axis_0 + axis_1 * axis_1 + axis_2 * axis_2;
   nassertv(length_sq != 0.0f);
   FLOATTYPE recip_length = 1.0f/csqrt(length_sq);
-  
+
   axis_0 *= recip_length;
   axis_1 *= recip_length;
   axis_2 *= recip_length;
@@ -288,11 +288,16 @@ set_rotate_mat_normaxis(FLOATTYPE angle, const FLOATNAME(LVecBase3) &axis,
 //     Function: LMatrix4::almost_equal
 //       Access: Public
 //  Description: Returns true if two matrices are memberwise equal
-//               within a specified tolerance.
+//               within a specified tolerance.  This is faster than
+//               the equivalence operator as this doesn't have to
+//               guarantee that it is transitive.
 ////////////////////////////////////////////////////////////////////
 bool FLOATNAME(LMatrix4)::
 almost_equal(const FLOATNAME(LMatrix4) &other, FLOATTYPE threshold) const {
   TAU_PROFILE("bool LMatrix4::almost_equal(const LMatrix4 &, FLOATTYPE)", " ", TAU_USER);
+#ifdef HAVE_EIGEN
+  return ((_m - other._m).cwiseAbs().maxCoeff() < NEARLY_ZERO(FLOATTYPE));
+#else
   return (IS_THRESHOLD_EQUAL((*this)(0, 0), other(0, 0), threshold) &&
           IS_THRESHOLD_EQUAL((*this)(0, 1), other(0, 1), threshold) &&
           IS_THRESHOLD_EQUAL((*this)(0, 2), other(0, 2), threshold) &&
@@ -309,9 +314,9 @@ almost_equal(const FLOATNAME(LMatrix4) &other, FLOATTYPE threshold) const {
           IS_THRESHOLD_EQUAL((*this)(3, 1), other(3, 1), threshold) &&
           IS_THRESHOLD_EQUAL((*this)(3, 2), other(3, 2), threshold) &&
           IS_THRESHOLD_EQUAL((*this)(3, 3), other(3, 3), threshold));
+#endif
 }
 
-
 ////////////////////////////////////////////////////////////////////
 //     Function: LMatrix4::output
 //       Access: Public
@@ -520,7 +525,7 @@ void FLOATNAME(LMatrix4)::
 write_datagram_fixed(Datagram &destination) const {
   for (int i = 0; i < 4; ++i) {
     for (int j = 0; j < 4; ++j) {
-#if FLOATTOKEN == 'f' 
+#if FLOATTOKEN == 'f'
       destination.add_float32(get_cell(i,j));
 #else
       destination.add_float64(get_cell(i,j));
diff --git a/panda/src/linmath/lmatrix4_src.h b/panda/src/linmath/lmatrix4_src.h
index ccb770cb4d..370b82d6c0 100644
--- a/panda/src/linmath/lmatrix4_src.h
+++ b/panda/src/linmath/lmatrix4_src.h
@@ -107,6 +107,7 @@ PUBLISHED:
   INLINE_LINMATH static int size();
 
   INLINE_LINMATH bool is_nan() const;
+  INLINE_LINMATH bool is_identity() const;
 
   INLINE_LINMATH FLOATTYPE get_cell(int row, int col) const;
   INLINE_LINMATH void set_cell(int row, int col, FLOATTYPE value);
@@ -205,13 +206,13 @@ PUBLISHED:
   INLINE_LINMATH void
     set_scale_mat(const FLOATNAME(LVecBase3) &scale);
   INLINE_LINMATH void
-    set_shear_mat(const FLOATNAME(LVecBase3) &shear, 
+    set_shear_mat(const FLOATNAME(LVecBase3) &shear,
                   CoordinateSystem cs = CS_default);
   INLINE_LINMATH void
     set_scale_shear_mat(const FLOATNAME(LVecBase3) &scale,
-                        const FLOATNAME(LVecBase3) &shear, 
+                        const FLOATNAME(LVecBase3) &shear,
                         CoordinateSystem cs = CS_default);
-  
+
   INLINE_LINMATH static FLOATNAME(LMatrix4)
     translate_mat(const FLOATNAME(LVecBase3) &trans);
   INLINE_LINMATH static FLOATNAME(LMatrix4)
@@ -232,19 +233,19 @@ PUBLISHED:
     scale_mat(FLOATTYPE scale);
 
   static INLINE_LINMATH FLOATNAME(LMatrix4)
-    shear_mat(const FLOATNAME(LVecBase3) &shear, 
+    shear_mat(const FLOATNAME(LVecBase3) &shear,
               CoordinateSystem cs = CS_default);
   static INLINE_LINMATH FLOATNAME(LMatrix4)
-    shear_mat(FLOATTYPE shxy, FLOATTYPE shxz, FLOATTYPE shyz, 
+    shear_mat(FLOATTYPE shxy, FLOATTYPE shxz, FLOATTYPE shyz,
               CoordinateSystem cs = CS_default);
 
   static INLINE_LINMATH FLOATNAME(LMatrix4)
     scale_shear_mat(const FLOATNAME(LVecBase3) &scale,
-                    const FLOATNAME(LVecBase3) &shear, 
+                    const FLOATNAME(LVecBase3) &shear,
                     CoordinateSystem cs = CS_default);
   static INLINE_LINMATH FLOATNAME(LMatrix4)
     scale_shear_mat(FLOATTYPE sx, FLOATTYPE sy, FLOATTYPE sz,
-                    FLOATTYPE shxy, FLOATTYPE shxz, FLOATTYPE shyz, 
+                    FLOATTYPE shxy, FLOATTYPE shxz, FLOATTYPE shyz,
                     CoordinateSystem cs = CS_default);
 
   INLINE_LINMATH static const FLOATNAME(LMatrix4) &y_to_z_up_mat();
diff --git a/panda/src/linmath/lpoint2_ext_src.I b/panda/src/linmath/lpoint2_ext_src.I
index d6deaa3a8b..3b66477d6d 100644
--- a/panda/src/linmath/lpoint2_ext_src.I
+++ b/panda/src/linmath/lpoint2_ext_src.I
@@ -12,12 +12,6 @@
 //
 ////////////////////////////////////////////////////////////////////
 
-#ifndef CPPPARSER
-IMPORT_THIS struct Dtool_PyTypedObject FLOATNAME(Dtool_LPoint2);
-IMPORT_THIS struct Dtool_PyTypedObject FLOATNAME(Dtool_LPoint3);
-IMPORT_THIS struct Dtool_PyTypedObject FLOATNAME(Dtool_LPoint4);
-#endif
-
 #ifdef FLOATTYPE_IS_INT
 #if PY_MAJOR_VERSION >= 3
 #define PY_FROM_FLOATTYPE PyLong_FromLong
@@ -47,6 +41,12 @@ python_repr(ostream &out, const string &class_name) const {
 ////////////////////////////////////////////////////////////////////
 INLINE_LINMATH PyObject *Extension<FLOATNAME(LPoint2)>::
 __getattr__(const string &attr_name) const {
+#ifndef CPPPARSER
+  extern struct Dtool_PyTypedObject FLOATNAME(Dtool_LPoint2);
+  extern struct Dtool_PyTypedObject FLOATNAME(Dtool_LPoint3);
+  extern struct Dtool_PyTypedObject FLOATNAME(Dtool_LPoint4);
+#endif
+
   // Validate the attribute name.
   for (string::const_iterator it = attr_name.begin(); it < attr_name.end(); it++) {
     if (*it != 'x' && *it != 'y') {
diff --git a/panda/src/linmath/lpoint3_ext_src.I b/panda/src/linmath/lpoint3_ext_src.I
index 583c4ff55a..2eaca34737 100644
--- a/panda/src/linmath/lpoint3_ext_src.I
+++ b/panda/src/linmath/lpoint3_ext_src.I
@@ -12,12 +12,6 @@
 //
 ////////////////////////////////////////////////////////////////////
 
-#ifndef CPPPARSER
-IMPORT_THIS struct Dtool_PyTypedObject FLOATNAME(Dtool_LPoint2);
-IMPORT_THIS struct Dtool_PyTypedObject FLOATNAME(Dtool_LPoint3);
-IMPORT_THIS struct Dtool_PyTypedObject FLOATNAME(Dtool_LPoint4);
-#endif
-
 #ifdef FLOATTYPE_IS_INT
 #if PY_MAJOR_VERSION >= 3
 #define PY_FROM_FLOATTYPE PyLong_FromLong
@@ -48,6 +42,12 @@ python_repr(ostream &out, const string &class_name) const {
 ////////////////////////////////////////////////////////////////////
 INLINE_LINMATH PyObject *Extension<FLOATNAME(LPoint3)>::
 __getattr__(const string &attr_name) const {
+#ifndef CPPPARSER
+  extern struct Dtool_PyTypedObject FLOATNAME(Dtool_LPoint2);
+  extern struct Dtool_PyTypedObject FLOATNAME(Dtool_LPoint3);
+  extern struct Dtool_PyTypedObject FLOATNAME(Dtool_LPoint4);
+#endif
+
   // Validate the attribute name.
   for (string::const_iterator it = attr_name.begin(); it < attr_name.end(); it++) {
     if (*it < 'x' || *it > 'z') {
diff --git a/panda/src/linmath/lpoint4_ext_src.I b/panda/src/linmath/lpoint4_ext_src.I
index c34af5986e..9a89e56a0a 100644
--- a/panda/src/linmath/lpoint4_ext_src.I
+++ b/panda/src/linmath/lpoint4_ext_src.I
@@ -12,12 +12,6 @@
 //
 ////////////////////////////////////////////////////////////////////
 
-#ifndef CPPPARSER
-IMPORT_THIS struct Dtool_PyTypedObject FLOATNAME(Dtool_LPoint2);
-IMPORT_THIS struct Dtool_PyTypedObject FLOATNAME(Dtool_LPoint3);
-IMPORT_THIS struct Dtool_PyTypedObject FLOATNAME(Dtool_LPoint4);
-#endif
-
 #ifdef FLOATTYPE_IS_INT
 #if PY_MAJOR_VERSION >= 3
 #define PY_FROM_FLOATTYPE PyLong_FromLong
@@ -49,6 +43,12 @@ python_repr(ostream &out, const string &class_name) const {
 ////////////////////////////////////////////////////////////////////
 INLINE_LINMATH PyObject *Extension<FLOATNAME(LPoint4)>::
 __getattr__(const string &attr_name) const {
+#ifndef CPPPARSER
+  extern struct Dtool_PyTypedObject FLOATNAME(Dtool_LPoint2);
+  extern struct Dtool_PyTypedObject FLOATNAME(Dtool_LPoint3);
+  extern struct Dtool_PyTypedObject FLOATNAME(Dtool_LPoint4);
+#endif
+
   // Validate the attribute name.
   for (string::const_iterator it = attr_name.begin(); it < attr_name.end(); it++) {
     if (*it < 'w' || *it > 'z') {
diff --git a/panda/src/linmath/lvecBase2_ext_src.I b/panda/src/linmath/lvecBase2_ext_src.I
index 7910b6aec3..2d771a9d0a 100644
--- a/panda/src/linmath/lvecBase2_ext_src.I
+++ b/panda/src/linmath/lvecBase2_ext_src.I
@@ -12,13 +12,6 @@
 //
 ////////////////////////////////////////////////////////////////////
 
-
-#ifndef CPPPARSER
-IMPORT_THIS struct Dtool_PyTypedObject FLOATNAME(Dtool_LVecBase2);
-IMPORT_THIS struct Dtool_PyTypedObject FLOATNAME(Dtool_LVecBase3);
-IMPORT_THIS struct Dtool_PyTypedObject FLOATNAME(Dtool_LVecBase4);
-#endif
-
 #ifdef FLOATTYPE_IS_INT
 #if PY_MAJOR_VERSION >= 3
 #define PYNUMBER_FLOATTYPE PyNumber_Long
@@ -97,6 +90,12 @@ __reduce__(PyObject *self) const {
 ////////////////////////////////////////////////////////////////////
 INLINE_LINMATH PyObject *Extension<FLOATNAME(LVecBase2)>::
 __getattr__(const string &attr_name) const {
+#ifndef CPPPARSER
+  extern struct Dtool_PyTypedObject FLOATNAME(Dtool_LVecBase2);
+  extern struct Dtool_PyTypedObject FLOATNAME(Dtool_LVecBase3);
+  extern struct Dtool_PyTypedObject FLOATNAME(Dtool_LVecBase4);
+#endif
+
   // Validate the attribute name.
   for (string::const_iterator it = attr_name.begin(); it < attr_name.end(); it++) {
     if (*it != 'x' && *it != 'y') {
diff --git a/panda/src/linmath/lvecBase3_ext_src.I b/panda/src/linmath/lvecBase3_ext_src.I
index 3e99e9e3e7..438e8ca4ec 100644
--- a/panda/src/linmath/lvecBase3_ext_src.I
+++ b/panda/src/linmath/lvecBase3_ext_src.I
@@ -12,13 +12,6 @@
 //
 ////////////////////////////////////////////////////////////////////
 
-
-#ifndef CPPPARSER
-IMPORT_THIS struct Dtool_PyTypedObject FLOATNAME(Dtool_LVecBase2);
-IMPORT_THIS struct Dtool_PyTypedObject FLOATNAME(Dtool_LVecBase3);
-IMPORT_THIS struct Dtool_PyTypedObject FLOATNAME(Dtool_LVecBase4);
-#endif
-
 #ifdef FLOATTYPE_IS_INT
 #if PY_MAJOR_VERSION >= 3
 #define PYNUMBER_FLOATTYPE PyNumber_Long
@@ -98,6 +91,12 @@ __reduce__(PyObject *self) const {
 ////////////////////////////////////////////////////////////////////
 INLINE_LINMATH PyObject *Extension<FLOATNAME(LVecBase3)>::
 __getattr__(const string &attr_name) const {
+#ifndef CPPPARSER
+  extern struct Dtool_PyTypedObject FLOATNAME(Dtool_LVecBase2);
+  extern struct Dtool_PyTypedObject FLOATNAME(Dtool_LVecBase3);
+  extern struct Dtool_PyTypedObject FLOATNAME(Dtool_LVecBase4);
+#endif
+
   // Validate the attribute name.
   for (string::const_iterator it = attr_name.begin(); it < attr_name.end(); it++) {
     if (*it < 'x' || *it > 'z') {
diff --git a/panda/src/linmath/lvecBase4_ext_src.I b/panda/src/linmath/lvecBase4_ext_src.I
index ddb1f71e1d..444ce5f7a2 100644
--- a/panda/src/linmath/lvecBase4_ext_src.I
+++ b/panda/src/linmath/lvecBase4_ext_src.I
@@ -12,13 +12,6 @@
 //
 ////////////////////////////////////////////////////////////////////
 
-
-#ifndef CPPPARSER
-IMPORT_THIS struct Dtool_PyTypedObject FLOATNAME(Dtool_LVecBase2);
-IMPORT_THIS struct Dtool_PyTypedObject FLOATNAME(Dtool_LVecBase3);
-IMPORT_THIS struct Dtool_PyTypedObject FLOATNAME(Dtool_LVecBase4);
-#endif
-
 #ifdef FLOATTYPE_IS_INT
 #if PY_MAJOR_VERSION >= 3
 #define PYNUMBER_FLOATTYPE PyNumber_Long
@@ -99,6 +92,12 @@ __reduce__(PyObject *self) const {
 ////////////////////////////////////////////////////////////////////
 INLINE_LINMATH PyObject *Extension<FLOATNAME(LVecBase4)>::
 __getattr__(const string &attr_name) const {
+#ifndef CPPPARSER
+  extern struct Dtool_PyTypedObject FLOATNAME(Dtool_LVecBase2);
+  extern struct Dtool_PyTypedObject FLOATNAME(Dtool_LVecBase3);
+  extern struct Dtool_PyTypedObject FLOATNAME(Dtool_LVecBase4);
+#endif
+
   // Validate the attribute name.
   for (string::const_iterator it = attr_name.begin(); it < attr_name.end(); it++) {
     if (*it < 'w' || *it > 'z') {
diff --git a/panda/src/linmath/lvector2_ext_src.I b/panda/src/linmath/lvector2_ext_src.I
index 3fb1284ddd..42db030bce 100644
--- a/panda/src/linmath/lvector2_ext_src.I
+++ b/panda/src/linmath/lvector2_ext_src.I
@@ -12,12 +12,6 @@
 //
 ////////////////////////////////////////////////////////////////////
 
-#ifndef CPPPARSER
-IMPORT_THIS struct Dtool_PyTypedObject FLOATNAME(Dtool_LVector2);
-IMPORT_THIS struct Dtool_PyTypedObject FLOATNAME(Dtool_LVector3);
-IMPORT_THIS struct Dtool_PyTypedObject FLOATNAME(Dtool_LVector4);
-#endif
-
 #ifdef FLOATTYPE_IS_INT
 #if PY_MAJOR_VERSION >= 3
 #define PY_FROM_FLOATTYPE PyLong_FromLong
@@ -47,6 +41,12 @@ python_repr(ostream &out, const string &class_name) const {
 ////////////////////////////////////////////////////////////////////
 INLINE_LINMATH PyObject *Extension<FLOATNAME(LVector2)>::
 __getattr__(const string &attr_name) const {
+#ifndef CPPPARSER
+  extern struct Dtool_PyTypedObject FLOATNAME(Dtool_LVector2);
+  extern struct Dtool_PyTypedObject FLOATNAME(Dtool_LVector3);
+  extern struct Dtool_PyTypedObject FLOATNAME(Dtool_LVector4);
+#endif
+
   // Validate the attribute name.
   for (string::const_iterator it = attr_name.begin(); it < attr_name.end(); it++) {
     if (*it != 'x' && *it != 'y') {
diff --git a/panda/src/linmath/lvector3_ext_src.I b/panda/src/linmath/lvector3_ext_src.I
index 183e633a76..6aa0897546 100644
--- a/panda/src/linmath/lvector3_ext_src.I
+++ b/panda/src/linmath/lvector3_ext_src.I
@@ -12,12 +12,6 @@
 //
 ////////////////////////////////////////////////////////////////////
 
-#ifndef CPPPARSER
-IMPORT_THIS struct Dtool_PyTypedObject FLOATNAME(Dtool_LVector2);
-IMPORT_THIS struct Dtool_PyTypedObject FLOATNAME(Dtool_LVector3);
-IMPORT_THIS struct Dtool_PyTypedObject FLOATNAME(Dtool_LVector4);
-#endif
-
 #ifdef FLOATTYPE_IS_INT
 #if PY_MAJOR_VERSION >= 3
 #define PY_FROM_FLOATTYPE PyLong_FromLong
@@ -48,6 +42,12 @@ python_repr(ostream &out, const string &class_name) const {
 ////////////////////////////////////////////////////////////////////
 INLINE_LINMATH PyObject *Extension<FLOATNAME(LVector3)>::
 __getattr__(const string &attr_name) const {
+#ifndef CPPPARSER
+  extern struct Dtool_PyTypedObject FLOATNAME(Dtool_LVector2);
+  extern struct Dtool_PyTypedObject FLOATNAME(Dtool_LVector3);
+  extern struct Dtool_PyTypedObject FLOATNAME(Dtool_LVector4);
+#endif
+
   // Validate the attribute name.
   for (string::const_iterator it = attr_name.begin(); it < attr_name.end(); it++) {
     if (*it < 'x' || *it > 'z') {
diff --git a/panda/src/linmath/lvector4_ext_src.I b/panda/src/linmath/lvector4_ext_src.I
index f22510fc49..fa96998001 100644
--- a/panda/src/linmath/lvector4_ext_src.I
+++ b/panda/src/linmath/lvector4_ext_src.I
@@ -12,12 +12,6 @@
 //
 ////////////////////////////////////////////////////////////////////
 
-#ifndef CPPPARSER
-IMPORT_THIS struct Dtool_PyTypedObject FLOATNAME(Dtool_LVector2);
-IMPORT_THIS struct Dtool_PyTypedObject FLOATNAME(Dtool_LVector3);
-IMPORT_THIS struct Dtool_PyTypedObject FLOATNAME(Dtool_LVector4);
-#endif
-
 #ifdef FLOATTYPE_IS_INT
 #if PY_MAJOR_VERSION >= 3
 #define PY_FROM_FLOATTYPE PyLong_FromLong
@@ -49,6 +43,12 @@ python_repr(ostream &out, const string &class_name) const {
 ////////////////////////////////////////////////////////////////////
 INLINE_LINMATH PyObject *Extension<FLOATNAME(LVector4)>::
 __getattr__(const string &attr_name) const {
+#ifndef CPPPARSER
+  extern struct Dtool_PyTypedObject FLOATNAME(Dtool_LVector2);
+  extern struct Dtool_PyTypedObject FLOATNAME(Dtool_LVector3);
+  extern struct Dtool_PyTypedObject FLOATNAME(Dtool_LVector4);
+#endif
+
   // Validate the attribute name.
   for (string::const_iterator it = attr_name.begin(); it < attr_name.end(); it++) {
     if (*it < 'w' || *it > 'z') {
diff --git a/panda/src/linmath/p3linmath_composite2.cxx b/panda/src/linmath/p3linmath_composite2.cxx
index b742520c05..a5f57ea20f 100644
--- a/panda/src/linmath/p3linmath_composite2.cxx
+++ b/panda/src/linmath/p3linmath_composite2.cxx
@@ -1,5 +1,6 @@
 
 #include "compose_matrix.cxx"
+#include "configVariableColor.cxx"
 #include "config_linmath.cxx"
 #include "coordinateSystem.cxx"
 #include "lmatrix.cxx"
diff --git a/panda/src/mathutil/boundingVolume.cxx b/panda/src/mathutil/boundingVolume.cxx
index a6a70d50d6..48ca7a8bab 100644
--- a/panda/src/mathutil/boundingVolume.cxx
+++ b/panda/src/mathutil/boundingVolume.cxx
@@ -182,6 +182,9 @@ string_bounds_type(const string &str) {
   } else if (strcmp(str.c_str(), "best") == 0) {
     return BT_best;
 
+  } else if (strcmp(str.c_str(), "fastest") == 0) {
+    return BT_fastest;
+
   } else if (strcmp(str.c_str(), "sphere") == 0) {
     return BT_sphere;
 
@@ -521,6 +524,9 @@ operator << (ostream &out, BoundingVolume::BoundsType type) {
   case BoundingVolume::BT_best:
     return out << "best";
 
+  case BoundingVolume::BT_fastest:
+    return out << "fastest";
+
   case BoundingVolume::BT_sphere:
     return out << "sphere";
 
diff --git a/panda/src/mathutil/boundingVolume.h b/panda/src/mathutil/boundingVolume.h
index bf15e4d908..ef7663ad2f 100644
--- a/panda/src/mathutil/boundingVolume.h
+++ b/panda/src/mathutil/boundingVolume.h
@@ -106,6 +106,7 @@ PUBLISHED:
     BT_best,
     BT_sphere,
     BT_box,
+    BT_fastest,
   };
 
 public:
diff --git a/panda/src/mathutil/config_mathutil.N b/panda/src/mathutil/config_mathutil.N
index 491a404161..1c3ec9e9a6 100644
--- a/panda/src/mathutil/config_mathutil.N
+++ b/panda/src/mathutil/config_mathutil.N
@@ -66,3 +66,5 @@ forcetype PointerToBase<ReferenceCountedVector<LVecBase2i> >
 forcetype PointerToArrayBase<LVecBase2i>
 forcetype PTA_LVecBase2i
 forcetype CPTA_LVecBase2i
+
+forceinclude "pointerToArray_ext.h"
diff --git a/panda/src/mathutil/config_mathutil.cxx b/panda/src/mathutil/config_mathutil.cxx
index 598c83b112..28c916d3bd 100644
--- a/panda/src/mathutil/config_mathutil.cxx
+++ b/panda/src/mathutil/config_mathutil.cxx
@@ -50,7 +50,9 @@ ConfigVariableEnum<BoundingVolume::BoundsType> bounds_type
 ("bounds-type", BoundingVolume::BT_sphere,
  PRC_DESC("Specify the type of bounding volume that is created automatically "
           "by Panda to enclose geometry.  Use 'sphere' or 'box', or use "
-          "'best' to let Panda decide which is most appropriate."));
+          "'best' to let Panda decide which is most appropriate.  You can "
+          "also use 'fastest' if you don't want Panda to waste much time "
+          "computing the most optimal bounding volume."));
 
 ////////////////////////////////////////////////////////////////////
 //     Function: init_libmathutil
diff --git a/panda/src/mathutil/triangulator.cxx b/panda/src/mathutil/triangulator.cxx
index d0a40ebc83..74fb752708 100644
--- a/panda/src/mathutil/triangulator.cxx
+++ b/panda/src/mathutil/triangulator.cxx
@@ -287,7 +287,7 @@ cleanup_polygon_indices(vector_int &polygon) {
   // First, check for index bounds.
   size_t pi = 0;
   while (pi < polygon.size()) {
-    if (polygon[pi] >= 0 && polygon[pi] < _vertices.size()) {
+    if (polygon[pi] >= 0 && (size_t)polygon[pi] < _vertices.size()) {
       // This vertex is OK.
       ++pi;
     } else {
diff --git a/panda/src/movies/microphoneAudioDS.cxx b/panda/src/movies/microphoneAudioDS.cxx
index be8a55b658..7215e29365 100644
--- a/panda/src/movies/microphoneAudioDS.cxx
+++ b/panda/src/movies/microphoneAudioDS.cxx
@@ -22,7 +22,9 @@
 
 #ifdef HAVE_DIRECTCAM
 
-#define WIN32_LEAN_AND_MEAN 
+#ifndef WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN 1
+#endif
 
 #undef Configure
 
@@ -33,9 +35,7 @@
 //       Class : MicrophoneAudioDS
 // Description : The directshow implementation of microphones.
 ////////////////////////////////////////////////////////////////////
-
-class MicrophoneAudioDS : public MicrophoneAudio
-{
+class MicrophoneAudioDS : public MicrophoneAudio {
 public:
   static void find_all_microphones_ds();
   friend void find_all_microphones_ds();
@@ -56,7 +56,7 @@ private:
   typedef pvector <AudioBuf> AudioBuffers;
 
   static void delete_buffers(AudioBuffers &buffers);
-  
+
   friend class MicrophoneAudioCursorDS;
 
 public:
@@ -90,7 +90,7 @@ public:
   typedef MicrophoneAudioDS::AudioBuffers AudioBuffers;
   MicrophoneAudioCursorDS(MicrophoneAudioDS *src, AudioBuffers &bufs, HWAVEIN hwav);
   virtual ~MicrophoneAudioCursorDS();
-  
+
   AudioBuffers _buffers;
   HWAVEIN _hwavein;
   int _samples_per_buffer;
@@ -105,7 +105,7 @@ public:
   HWAVEIN _handle;
   int     _next;    // Which buffer is the next one to read from.
   int     _offset;  // How many samples to skip in the buffer.
-  
+
 public:
   static TypeHandle get_class_type() {
     return _type_handle;
@@ -129,7 +129,7 @@ TypeHandle MicrophoneAudioCursorDS::_type_handle;
 ////////////////////////////////////////////////////////////////////
 //     Function: MicrophoneAudioDS::find_all_microphones_ds
 //       Access: Public, Static
-//  Description: Finds all DirectShow microphones and adds them to 
+//  Description: Finds all DirectShow microphones and adds them to
 //               the global list _all_microphones.
 ////////////////////////////////////////////////////////////////////
 void MicrophoneAudioDS::
@@ -205,7 +205,7 @@ delete_buffers(AudioBuffers &buffers) {
 ////////////////////////////////////////////////////////////////////
 PT(MovieAudioCursor) MicrophoneAudioDS::
 open() {
-  
+
   // Allocate the buffers. 64 buffers, not quite 1/20 sec each.
   int samples;
   switch (_rate) {
@@ -248,7 +248,7 @@ open() {
     nassert_raise("Could not allocate audio input buffers.");
     return NULL;
   }
-  
+
   WAVEFORMATEX format;
   format.wFormatTag = WAVE_FORMAT_PCM;
   format.nChannels = _channels;
@@ -260,7 +260,7 @@ open() {
 
   HWAVEIN hwav;
   MMRESULT stat = waveInOpen(&hwav, _device_id, &format, NULL, NULL, CALLBACK_NULL);
-  
+
   if (stat != MMSYSERR_NOERROR) {
     delete_buffers(buffers);
     nassert_raise("Could not open audio input device.");
@@ -284,7 +284,7 @@ open() {
     waveInClose(hwav);
     delete_buffers(buffers);
     nassert_raise("Could not start recording on input device.");
-    return NULL;    
+    return NULL;
   }
   return new MicrophoneAudioCursorDS(this, buffers, hwav);
 }
@@ -292,7 +292,7 @@ open() {
 ////////////////////////////////////////////////////////////////////
 //     Function: MicrophoneAudioCursorDS::Constructor
 //       Access: Published
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 MicrophoneAudioCursorDS::
 MicrophoneAudioCursorDS(MicrophoneAudioDS *src, AudioBuffers &bufs, HWAVEIN hwav) :
@@ -314,7 +314,7 @@ MicrophoneAudioCursorDS(MicrophoneAudioDS *src, AudioBuffers &bufs, HWAVEIN hwav
 ////////////////////////////////////////////////////////////////////
 //     Function: MicrophoneAudioCursorDS::cleanup
 //       Access: Published
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 void MicrophoneAudioCursorDS::
 cleanup() {
@@ -330,7 +330,7 @@ cleanup() {
 ////////////////////////////////////////////////////////////////////
 //     Function: MicrophoneAudioCursorDS::Destructor
 //       Access: Published
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 MicrophoneAudioCursorDS::
 ~MicrophoneAudioCursorDS() {
@@ -340,7 +340,7 @@ MicrophoneAudioCursorDS::
 ////////////////////////////////////////////////////////////////////
 //     Function: MicrophoneAudioCursorDS::read_samples
 //       Access: Published
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 void MicrophoneAudioCursorDS::
 read_samples(int n, PN_int16 *data) {
@@ -351,19 +351,19 @@ read_samples(int n, PN_int16 *data) {
       if ((_buffers[index]._header->dwFlags & WHDR_DONE)==0) {
         break;
       }
-      
+
       // Find start of data in buffer.
       PN_int16 *src = (PN_int16*)(_buffers[index]._storage);
       src += (_offset * _audio_channels);
-      
+
       // Decide how many samples to extract from this buffer.
       int samples = _samples_per_buffer;
       samples -= _offset;
       if (samples > n) samples = n;
-      
+
       // Copy data to output buffer.
       memcpy(data, src, samples * 2 * _audio_channels);
-      
+
       // Advance pointers.
       data += samples * _audio_channels;
       n -= samples;
@@ -397,7 +397,7 @@ read_samples(int n, PN_int16 *data) {
 ////////////////////////////////////////////////////////////////////
 //     Function: MicrophoneAudioCursorDS::ready
 //       Access: Published
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 int MicrophoneAudioCursorDS::
 ready() const {
diff --git a/panda/src/nativenet/buffered_datagramconnection.h b/panda/src/nativenet/buffered_datagramconnection.h
index 2bc949cbcc..2ea996d7e5 100755
--- a/panda/src/nativenet/buffered_datagramconnection.h
+++ b/panda/src/nativenet/buffered_datagramconnection.h
@@ -11,6 +11,7 @@
 //  3. Handle Framing and Unframing properly ..
 //
 ////////////////////////////////////////////////////////////////////
+
 #include "pandabase.h"
 #include "socket_base.h"
 #include "datagram.h"
@@ -19,9 +20,12 @@
 #include "buffered_datagramwriter.h"
 #include "config_nativenet.h"
 
+#ifdef HAVE_PYTHON
+#include "py_panda.h"
+#endif
 
 ////////////////////////////////////////////////////////////////
-// there are 3 states   
+// there are 3 states
 //
 //      1. Socket not even assigned,,,,
 //      2. Socket Assigned and trying to get a active connect open
diff --git a/panda/src/net/connectionManager.h b/panda/src/net/connectionManager.h
index 7021842e9e..8a9878a335 100644
--- a/panda/src/net/connectionManager.h
+++ b/panda/src/net/connectionManager.h
@@ -67,7 +67,7 @@ PUBLISHED:
 
   static string get_host_name();
 
-  class Interface {
+  class EXPCL_PANDA_NET Interface {
   PUBLISHED:
     const string &get_name() const { return _name; }
     const string &get_mac_address() const { return _mac_address; }
diff --git a/panda/src/ode/odeGeom_ext.cxx b/panda/src/ode/odeGeom_ext.cxx
index c9b2cd5320..6e248f6404 100644
--- a/panda/src/ode/odeGeom_ext.cxx
+++ b/panda/src/ode/odeGeom_ext.cxx
@@ -31,19 +31,19 @@
 #ifdef HAVE_PYTHON
 
 #ifndef CPPPARSER
-extern EXPCL_PANDAODE Dtool_PyTypedObject Dtool_OdeBoxGeom;
-//extern EXPCL_PANDAODE Dtool_PyTypedObject Dtool_OdeConvexGeom;
-extern EXPCL_PANDAODE Dtool_PyTypedObject Dtool_OdeGeom;
-extern EXPCL_PANDAODE Dtool_PyTypedObject Dtool_OdeHashSpace;
-extern EXPCL_PANDAODE Dtool_PyTypedObject Dtool_OdeCappedCylinderGeom;
-//extern EXPCL_PANDAODE Dtool_PyTypedObject Dtool_OdeHeightfieldGeom;
-extern EXPCL_PANDAODE Dtool_PyTypedObject Dtool_OdePlaneGeom;
-extern EXPCL_PANDAODE Dtool_PyTypedObject Dtool_OdeQuadTreeSpace;
-extern EXPCL_PANDAODE Dtool_PyTypedObject Dtool_OdeRayGeom;
-extern EXPCL_PANDAODE Dtool_PyTypedObject Dtool_OdeSimpleSpace;
-extern EXPCL_PANDAODE Dtool_PyTypedObject Dtool_OdeSpace;
-extern EXPCL_PANDAODE Dtool_PyTypedObject Dtool_OdeSphereGeom;
-extern EXPCL_PANDAODE Dtool_PyTypedObject Dtool_OdeTriMeshGeom;
+extern Dtool_PyTypedObject Dtool_OdeBoxGeom;
+//extern Dtool_PyTypedObject Dtool_OdeConvexGeom;
+extern Dtool_PyTypedObject Dtool_OdeGeom;
+extern Dtool_PyTypedObject Dtool_OdeHashSpace;
+extern Dtool_PyTypedObject Dtool_OdeCappedCylinderGeom;
+//extern Dtool_PyTypedObject Dtool_OdeHeightfieldGeom;
+extern Dtool_PyTypedObject Dtool_OdePlaneGeom;
+extern Dtool_PyTypedObject Dtool_OdeQuadTreeSpace;
+extern Dtool_PyTypedObject Dtool_OdeRayGeom;
+extern Dtool_PyTypedObject Dtool_OdeSimpleSpace;
+extern Dtool_PyTypedObject Dtool_OdeSpace;
+extern Dtool_PyTypedObject Dtool_OdeSphereGeom;
+extern Dtool_PyTypedObject Dtool_OdeTriMeshGeom;
 #endif
 
 ////////////////////////////////////////////////////////////////////
diff --git a/panda/src/ode/odeJoint_ext.cxx b/panda/src/ode/odeJoint_ext.cxx
index 871eb09c78..93253fec3e 100644
--- a/panda/src/ode/odeJoint_ext.cxx
+++ b/panda/src/ode/odeJoint_ext.cxx
@@ -30,18 +30,18 @@
 #include "odePlane2dJoint.h"
 
 #ifndef CPPPARSER
-extern EXPCL_PANDAODE Dtool_PyTypedObject Dtool_OdeJoint;
-extern EXPCL_PANDAODE Dtool_PyTypedObject Dtool_OdeBallJoint;
-extern EXPCL_PANDAODE Dtool_PyTypedObject Dtool_OdeHingeJoint;
-extern EXPCL_PANDAODE Dtool_PyTypedObject Dtool_OdeSliderJoint;
-extern EXPCL_PANDAODE Dtool_PyTypedObject Dtool_OdeContactJoint;
-extern EXPCL_PANDAODE Dtool_PyTypedObject Dtool_OdeUniversalJoint;
-extern EXPCL_PANDAODE Dtool_PyTypedObject Dtool_OdeHinge2Joint;
-extern EXPCL_PANDAODE Dtool_PyTypedObject Dtool_OdeFixedJoint;
-extern EXPCL_PANDAODE Dtool_PyTypedObject Dtool_OdeNullJoint;
-extern EXPCL_PANDAODE Dtool_PyTypedObject Dtool_OdeAMotorJoint;
-extern EXPCL_PANDAODE Dtool_PyTypedObject Dtool_OdeLMotorJoint;
-extern EXPCL_PANDAODE Dtool_PyTypedObject Dtool_OdePlane2dJoint;
+extern Dtool_PyTypedObject Dtool_OdeJoint;
+extern Dtool_PyTypedObject Dtool_OdeBallJoint;
+extern Dtool_PyTypedObject Dtool_OdeHingeJoint;
+extern Dtool_PyTypedObject Dtool_OdeSliderJoint;
+extern Dtool_PyTypedObject Dtool_OdeContactJoint;
+extern Dtool_PyTypedObject Dtool_OdeUniversalJoint;
+extern Dtool_PyTypedObject Dtool_OdeHinge2Joint;
+extern Dtool_PyTypedObject Dtool_OdeFixedJoint;
+extern Dtool_PyTypedObject Dtool_OdeNullJoint;
+extern Dtool_PyTypedObject Dtool_OdeAMotorJoint;
+extern Dtool_PyTypedObject Dtool_OdeLMotorJoint;
+extern Dtool_PyTypedObject Dtool_OdePlane2dJoint;
 #endif
 
 ////////////////////////////////////////////////////////////////////
diff --git a/panda/src/ode/odeSpace_ext.cxx b/panda/src/ode/odeSpace_ext.cxx
index 8baa7aabb1..78c52a06bf 100644
--- a/panda/src/ode/odeSpace_ext.cxx
+++ b/panda/src/ode/odeSpace_ext.cxx
@@ -24,10 +24,10 @@
 #include "odeQuadTreeSpace.h"
 
 #ifndef CPPPARSER
-extern EXPCL_PANDAODE Dtool_PyTypedObject Dtool_OdeHashSpace;
-extern EXPCL_PANDAODE Dtool_PyTypedObject Dtool_OdeSimpleSpace;
-extern EXPCL_PANDAODE Dtool_PyTypedObject Dtool_OdeSpace;
-extern EXPCL_PANDAODE Dtool_PyTypedObject Dtool_OdeQuadTreeSpace;
+extern Dtool_PyTypedObject Dtool_OdeHashSpace;
+extern Dtool_PyTypedObject Dtool_OdeSimpleSpace;
+extern Dtool_PyTypedObject Dtool_OdeSpace;
+extern Dtool_PyTypedObject Dtool_OdeQuadTreeSpace;
 #endif
 
 PyObject *Extension<OdeSpace>::_python_callback = NULL;
diff --git a/panda/src/ode/odeTriMeshData.h b/panda/src/ode/odeTriMeshData.h
index 70b6eaa4dd..e126fcb8c5 100755
--- a/panda/src/ode/odeTriMeshData.h
+++ b/panda/src/ode/odeTriMeshData.h
@@ -28,9 +28,11 @@
 #include "geomTriangles.h"
 #include "geomTristrips.h"
 
+#include "config_ode.h"
+
 ////////////////////////////////////////////////////////////////////
 //       Class : OdeTriMeshData
-// Description : 
+// Description :
 ////////////////////////////////////////////////////////////////////
 class EXPCL_PANDAODE OdeTriMeshData : public TypedReferenceCount {
 public:
@@ -54,7 +56,7 @@ PUBLISHED:
   virtual ~OdeTriMeshData();
 
   void destroy();
-  
+
   // INLINE void set(int data_id, void* in_data);
   // INLINE void* get(int data_id);
   // INLINE void get_buffer(unsigned char** buf, int* buf_len) const;
@@ -63,7 +65,7 @@ PUBLISHED:
   virtual void write(ostream &out = cout, unsigned int indent=0) const;
   void write_faces(ostream &out) const;
 
-public: 
+public:
   INLINE void build_single(const void* vertices, int vertex_stride, int vertex_count, \
                            const void* indices, int index_count, int tri_stride);
   INLINE void build_single1(const void* vertices, int vertex_stride, int vertex_count, \
@@ -96,7 +98,7 @@ private:
   void process_model(const NodePath& model, bool &use_normals);
   void process_geom_node(const GeomNode *geomNode);
   void process_geom(const Geom *geom);
-  void process_primitive(const GeomPrimitive *primitive, 
+  void process_primitive(const GeomPrimitive *primitive,
                          CPT(GeomVertexData) vData);
   void analyze(const GeomNode *geomNode);
   void analyze(const Geom *geom);
@@ -104,15 +106,15 @@ private:
 
   OdeTriMeshData(const OdeTriMeshData &other);
   void operator = (const OdeTriMeshData &other);
-  
+
 protected:
-  struct StridedVertex{
+  struct StridedVertex {
     dReal Vertex[3];
-  };  
-  struct StridedTri{
+  };
+  struct StridedTri {
     int Indices[3];
   };
-  struct FaceNormal{
+  struct FaceNormal {
     dVector3 Normal;
   };
 
diff --git a/panda/src/parametrics/curveFitter.h b/panda/src/parametrics/curveFitter.h
index c5c67138f3..bf6a21c43d 100644
--- a/panda/src/parametrics/curveFitter.h
+++ b/panda/src/parametrics/curveFitter.h
@@ -32,7 +32,7 @@ class NurbsCurve;
 //       Class : CurveFitter
 // Description :
 ////////////////////////////////////////////////////////////////////
-class CurveFitter {
+class EXPCL_PANDA_GOBJ CurveFitter {
 PUBLISHED:
   CurveFitter();
   ~CurveFitter();
diff --git a/panda/src/parametrics/hermiteCurve.h b/panda/src/parametrics/hermiteCurve.h
index 124913fb23..ea45316f87 100644
--- a/panda/src/parametrics/hermiteCurve.h
+++ b/panda/src/parametrics/hermiteCurve.h
@@ -49,7 +49,7 @@ END_PUBLISH //]
 // Description : A single CV of a Hermite curve.  Hermite curve CV's
 //               include an in and out tangent, as well as a position.
 ////////////////////////////////////////////////////////////////////
-class HermiteCurveCV {
+class EXPCL_PANDA_PARAMETRICS HermiteCurveCV {
 public:
   HermiteCurveCV();
   HermiteCurveCV(const HermiteCurveCV &c);
@@ -85,7 +85,7 @@ public:
 //               list of the CV's that are used to define the curve
 //               (since the CubicCurveseg class doesn't retain these).
 ////////////////////////////////////////////////////////////////////
-class HermiteCurve : public PiecewiseCurve {
+class EXPCL_PANDA_PARAMETRICS HermiteCurve : public PiecewiseCurve {
 PUBLISHED:
   HermiteCurve();
   HermiteCurve(const ParametricCurve &pc);
diff --git a/panda/src/parametrics/ropeNode.cxx b/panda/src/parametrics/ropeNode.cxx
index 0c65a0d6b9..eaf0ef48ed 100644
--- a/panda/src/parametrics/ropeNode.cxx
+++ b/panda/src/parametrics/ropeNode.cxx
@@ -167,15 +167,15 @@ cull_callback(CullTraverser *trav, CullTraverserData &data) {
         case RM_thread:
           render_thread(trav, data, result);
           break;
-          
+
         case RM_tape:
           render_tape(trav, data, result);
           break;
-          
+
         case RM_billboard:
           render_billboard(trav, data, result);
           break;
-          
+
         case RM_tube:
           render_tube(trav, data, result);
           break;
@@ -183,7 +183,7 @@ cull_callback(CullTraverser *trav, CullTraverserData &data) {
       }
     }
   }
-  
+
   return true;
 }
 
@@ -205,7 +205,7 @@ is_renderable() const {
 ////////////////////////////////////////////////////////////////////
 //     Function: RopeNode::output
 //       Access: Public, Virtual
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 void RopeNode::
 output(ostream &out) const {
@@ -221,7 +221,7 @@ output(ostream &out) const {
 ////////////////////////////////////////////////////////////////////
 //     Function: RopeNode::write
 //       Access: Public, Virtual
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 void RopeNode::
 write(ostream &out, int indent_level) const {
@@ -258,8 +258,8 @@ compute_internal_bounds(CPT(BoundingVolume) &internal_bounds,
                         int &internal_vertices,
                         int pipeline_stage,
                         Thread *current_thread) const {
-  PT(BoundingVolume) bounds = 
-    do_recompute_bounds(NodePath((PandaNode *)this), pipeline_stage, 
+  PT(BoundingVolume) bounds =
+    do_recompute_bounds(NodePath((PandaNode *)this), pipeline_stage,
                         current_thread);
 
   internal_bounds = bounds;
@@ -304,7 +304,7 @@ get_format(bool support_normals) const {
 //  Description: Does the actual internal recompute.
 ////////////////////////////////////////////////////////////////////
 PT(BoundingVolume) RopeNode::
-do_recompute_bounds(const NodePath &rel_to, int pipeline_stage, 
+do_recompute_bounds(const NodePath &rel_to, int pipeline_stage,
                     Thread *current_thread) const {
   // TODO: fix the bounds so that it properly reflects the indicated
   // pipeline stage.  At the moment, we cheat and get some of the
@@ -312,7 +312,7 @@ do_recompute_bounds(const NodePath &rel_to, int pipeline_stage,
 
   // First, get ourselves a fresh, empty bounding volume.
   PT(BoundingVolume) bound = new BoundingSphere;
-  
+
   NurbsCurveEvaluator *curve = get_curve();
   if (curve != (NurbsCurveEvaluator *)NULL) {
     NurbsCurveEvaluator::Vert3Array verts;
@@ -326,7 +326,7 @@ do_recompute_bounds(const NodePath &rel_to, int pipeline_stage,
         (*vi) = LPoint3(*vi) * mat;
       }
     }
-    
+
     GeometricBoundingVolume *gbv;
     DCAST_INTO_R(gbv, bound, bound);
     gbv->around(&verts[0], &verts[0] + verts.size());
@@ -349,7 +349,7 @@ do_recompute_bounds(const NodePath &rel_to, int pipeline_stage,
 //               per-vertex thickness.
 ////////////////////////////////////////////////////////////////////
 void RopeNode::
-render_thread(CullTraverser *trav, CullTraverserData &data, 
+render_thread(CullTraverser *trav, CullTraverserData &data,
               NurbsCurveResult *result) const {
   CurveSegments curve_segments;
   int num_curve_verts = get_connected_segments(curve_segments, result);
@@ -370,21 +370,19 @@ render_thread(CullTraverser *trav, CullTraverserData &data,
     lines->add_vertex(vi + 1);
     lines->close_primitive();
   }
-  
+
   PT(Geom) geom = new Geom(vdata);
   geom->add_primitive(lines);
-  
+
   CPT(RenderAttrib) thick = RenderModeAttrib::make(RenderModeAttrib::M_unchanged, get_thickness());
   CPT(RenderState) state = data._state->add_attrib(thick);
   if (get_use_vertex_color()) {
     state = state->add_attrib(ColorAttrib::make_vertex());
   }
-  
-  CullableObject *object = 
+
+  CullableObject *object =
     new CullableObject(geom, state,
-                       data.get_net_transform(trav),
-                       data.get_modelview_transform(trav),
-                       trav->get_scene());
+                       data.get_internal_transform(trav));
   trav->get_cull_handler()->record_object(object, trav);
 }
 
@@ -399,7 +397,7 @@ render_thread(CullTraverser *trav, CullTraverserData &data,
 //               determines the width of the triangle strips.
 ////////////////////////////////////////////////////////////////////
 void RopeNode::
-render_tape(CullTraverser *trav, CullTraverserData &data, 
+render_tape(CullTraverser *trav, CullTraverserData &data,
             NurbsCurveResult *result) const {
   CurveSegments curve_segments;
   int num_curve_verts = get_connected_segments(curve_segments, result);
@@ -409,8 +407,8 @@ render_tape(CullTraverser *trav, CullTraverserData &data,
   // either side.
   PT(GeomVertexData) vdata = new GeomVertexData
     ("rope", get_format(false), Geom::UH_stream);
-  
-  compute_billboard_vertices(vdata, -get_tube_up(), 
+
+  compute_billboard_vertices(vdata, -get_tube_up(),
                              curve_segments, num_curve_verts, result);
 
   // Since this will be a nonindexed primitive, no need to pre-reserve
@@ -419,11 +417,11 @@ render_tape(CullTraverser *trav, CullTraverserData &data,
   CurveSegments::const_iterator si;
   for (si = curve_segments.begin(); si != curve_segments.end(); ++si) {
     const CurveSegment &segment = (*si);
-    
+
     strip->add_next_vertices(segment.size() * 2);
     strip->close_primitive();
   }
-  
+
   PT(Geom) geom = new Geom(vdata);
   geom->add_primitive(strip);
 
@@ -431,12 +429,10 @@ render_tape(CullTraverser *trav, CullTraverserData &data,
   if (get_use_vertex_color()) {
     state = state->add_attrib(ColorAttrib::make_vertex());
   }
-  
-  CullableObject *object = 
+
+  CullableObject *object =
     new CullableObject(geom, state,
-                       data.get_net_transform(trav),
-                       data.get_modelview_transform(trav),
-                       trav->get_scene());
+                       data.get_internal_transform(trav));
   trav->get_cull_handler()->record_object(object, trav);
 }
 
@@ -451,7 +447,7 @@ render_tape(CullTraverser *trav, CullTraverserData &data,
 //               determines the width of the triangle strips.
 ////////////////////////////////////////////////////////////////////
 void RopeNode::
-render_billboard(CullTraverser *trav, CullTraverserData &data, 
+render_billboard(CullTraverser *trav, CullTraverserData &data,
                  NurbsCurveResult *result) const {
   const TransformState *net_transform = data.get_net_transform(trav);
   const TransformState *camera_transform = trav->get_camera_transform();
@@ -468,21 +464,21 @@ render_billboard(CullTraverser *trav, CullTraverserData &data,
   // either side.
   PT(GeomVertexData) vdata = new GeomVertexData
     ("rope", get_format(false), Geom::UH_stream);
-  
-  compute_billboard_vertices(vdata, camera_vec, 
+
+  compute_billboard_vertices(vdata, camera_vec,
                              curve_segments, num_curve_verts, result);
-  
+
   // Since this will be a nonindexed primitive, no need to pre-reserve
   // the number of vertices.
   PT(GeomTristrips) strip = new GeomTristrips(Geom::UH_stream);
   CurveSegments::const_iterator si;
   for (si = curve_segments.begin(); si != curve_segments.end(); ++si) {
     const CurveSegment &segment = (*si);
-    
+
     strip->add_next_vertices(segment.size() * 2);
     strip->close_primitive();
   }
-  
+
   PT(Geom) geom = new Geom(vdata);
   geom->add_primitive(strip);
 
@@ -490,12 +486,10 @@ render_billboard(CullTraverser *trav, CullTraverserData &data,
   if (get_use_vertex_color()) {
     state = state->add_attrib(ColorAttrib::make_vertex());
   }
-  
-  CullableObject *object = 
+
+  CullableObject *object =
     new CullableObject(geom, state,
-                       data.get_net_transform(trav),
-                       data.get_modelview_transform(trav),
-                       trav->get_scene());
+                       data.get_internal_transform(trav));
   trav->get_cull_handler()->record_object(object, trav);
 }
 
@@ -509,7 +503,7 @@ render_billboard(CullTraverser *trav, CullTraverserData &data,
 //               determines the diameter of the tube.
 ////////////////////////////////////////////////////////////////////
 void RopeNode::
-render_tube(CullTraverser *trav, CullTraverserData &data, 
+render_tube(CullTraverser *trav, CullTraverserData &data,
             NurbsCurveResult *result) const {
   CurveSegments curve_segments;
   int num_curve_verts = get_connected_segments(curve_segments, result);
@@ -522,10 +516,10 @@ render_tube(CullTraverser *trav, CullTraverserData &data,
 
   PT(GeomVertexData) vdata = new GeomVertexData
     ("rope", get_format(true), Geom::UH_stream);
-  
-  compute_tube_vertices(vdata, num_verts_per_slice, 
+
+  compute_tube_vertices(vdata, num_verts_per_slice,
                         curve_segments, num_curve_verts, result);
-  
+
   // Finally, go through and build up the index array, to tie all the
   // triangle strips together.  This is difficult to pre-calculate the
   // number of vertices we'll use, so we'll just let it dynamically
@@ -535,20 +529,20 @@ render_tube(CullTraverser *trav, CullTraverserData &data,
   CurveSegments::const_iterator si;
   for (si = curve_segments.begin(); si != curve_segments.end(); ++si) {
     const CurveSegment &segment = (*si);
-    
+
     for (int s = 0; s < num_slices; ++s) {
       int s1 = (s + 1) % num_verts_per_slice;
-      
+
       for (size_t j = 0; j < segment.size(); ++j) {
         strip->add_vertex((vi + j) * num_verts_per_slice + s);
         strip->add_vertex((vi + j) * num_verts_per_slice + s1);
       }
-      
+
       strip->close_primitive();
     }
     vi += (int)segment.size();
   }
-  
+
   PT(Geom) geom = new Geom(vdata);
   geom->add_primitive(strip);
 
@@ -556,12 +550,10 @@ render_tube(CullTraverser *trav, CullTraverserData &data,
   if (get_use_vertex_color()) {
     state = state->add_attrib(ColorAttrib::make_vertex());
   }
-  
-  CullableObject *object = 
+
+  CullableObject *object =
     new CullableObject(geom, state,
-                       data.get_net_transform(trav),
-                       data.get_modelview_transform(trav),
-                       trav->get_scene());
+                       data.get_internal_transform(trav));
   trav->get_cull_handler()->record_object(object, trav);
 }
 
@@ -598,7 +590,7 @@ get_connected_segments(RopeNode::CurveSegments &curve_segments,
     LPoint3 point;
     result->eval_segment_point(segment, 0.0f, point);
 
-    if (curve_segment == (CurveSegment *)NULL || 
+    if (curve_segment == (CurveSegment *)NULL ||
         !point.almost_equal(last_point)) {
       // If the first point of this segment is different from the last
       // point of the previous segment, end the previous segment and
@@ -610,13 +602,13 @@ get_connected_segments(RopeNode::CurveSegments &curve_segments,
       vtx._p = point;
       vtx._t = result->get_segment_t(segment, 0.0f);
       if (use_vertex_color) {
-        result->eval_segment_extended_points(segment, 0.0f, 
-                                             get_vertex_color_dimension(), 
+        result->eval_segment_extended_points(segment, 0.0f,
+                                             get_vertex_color_dimension(),
                                              &vtx._c[0], 4);
       }
       if (use_vertex_thickness) {
-        vtx._thickness = 
-          result->eval_segment_extended_point(segment, 0.0f, 
+        vtx._thickness =
+          result->eval_segment_extended_point(segment, 0.0f,
                                               get_vertex_thickness_dimension());
       }
 
@@ -632,13 +624,13 @@ get_connected_segments(RopeNode::CurveSegments &curve_segments,
       result->eval_segment_point(segment, t, vtx._p);
       vtx._t = result->get_segment_t(segment, t);
       if (use_vertex_color) {
-        result->eval_segment_extended_points(segment, t, 
+        result->eval_segment_extended_points(segment, t,
                                              get_vertex_color_dimension(),
                                              &vtx._c[0], 4);
       }
       if (use_vertex_thickness) {
-        vtx._thickness = 
-          result->eval_segment_extended_point(segment, t, 
+        vtx._thickness =
+          result->eval_segment_extended_point(segment, t,
                                               get_vertex_thickness_dimension());
       }
 
@@ -868,7 +860,7 @@ compute_tube_vertices(GeomVertexData *vdata,
 //               point in the segment.
 ////////////////////////////////////////////////////////////////////
 void RopeNode::
-compute_tangent(LVector3 &tangent, const RopeNode::CurveSegment &segment, 
+compute_tangent(LVector3 &tangent, const RopeNode::CurveSegment &segment,
                 size_t j, NurbsCurveResult *result) {
   // First, try to evaluate the tangent at the curve.  This gives
   // better results at the ends at the endpoints where the tangent
@@ -908,17 +900,17 @@ compute_uv_t(PN_stdfloat &dist, const RopeNode::UVMode &uv_mode,
   switch (uv_mode) {
   case UV_none:
     return 0.0f;
-    
+
   case UV_parametric:
     return segment[j]._t * uv_scale;
-    
+
   case UV_distance:
     if (j != 0) {
       LVector3 vec = segment[j]._p - segment[j - 1]._p;
       dist += vec.length();
     }
     return dist * uv_scale;
-    
+
   case UV_distance2:
     if (j != 0) {
       LVector3 vec = segment[j]._p - segment[j - 1]._p;
@@ -929,7 +921,7 @@ compute_uv_t(PN_stdfloat &dist, const RopeNode::UVMode &uv_mode,
 
   return 0.0f;
 }
-  
+
 ////////////////////////////////////////////////////////////////////
 //     Function: RopeNode::register_with_read_factory
 //       Access: Public, Static
diff --git a/panda/src/parametrics/sheetNode.cxx b/panda/src/parametrics/sheetNode.cxx
index ce6da994f4..dd2fc4199b 100644
--- a/panda/src/parametrics/sheetNode.cxx
+++ b/panda/src/parametrics/sheetNode.cxx
@@ -155,13 +155,13 @@ cull_callback(CullTraverser *trav, CullTraverserData &data) {
     NurbsSurfaceEvaluator *surface = get_surface();
     if (surface != (NurbsSurfaceEvaluator *)NULL) {
       PT(NurbsSurfaceResult) result = surface->evaluate(data._node_path.get_node_path());
-      
+
       if (result->get_num_u_segments() > 0 && result->get_num_v_segments() > 0) {
         render_sheet(trav, data, result);
       }
     }
   }
-  
+
   return true;
 }
 
@@ -183,7 +183,7 @@ is_renderable() const {
 ////////////////////////////////////////////////////////////////////
 //     Function: SheetNode::output
 //       Access: Public, Virtual
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 void SheetNode::
 output(ostream &out) const {
@@ -199,7 +199,7 @@ output(ostream &out) const {
 ////////////////////////////////////////////////////////////////////
 //     Function: SheetNode::write
 //       Access: Public, Virtual
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 void SheetNode::
 write(ostream &out, int indent_level) const {
@@ -241,8 +241,8 @@ compute_internal_bounds(CPT(BoundingVolume) &internal_bounds,
                         int &internal_vertices,
                         int pipeline_stage,
                         Thread *current_thread) const {
-  PT(BoundingVolume) bounds = 
-    do_recompute_bounds(NodePath((PandaNode *)this), pipeline_stage, 
+  PT(BoundingVolume) bounds =
+    do_recompute_bounds(NodePath((PandaNode *)this), pipeline_stage,
                         current_thread);
 
   internal_bounds = bounds;
@@ -255,7 +255,7 @@ compute_internal_bounds(CPT(BoundingVolume) &internal_bounds,
 //  Description: Does the actual internal recompute.
 ////////////////////////////////////////////////////////////////////
 PT(BoundingVolume) SheetNode::
-do_recompute_bounds(const NodePath &rel_to, int pipeline_stage, 
+do_recompute_bounds(const NodePath &rel_to, int pipeline_stage,
                     Thread *current_thread) const {
   // TODO: fix the bounds so that it properly reflects the indicated
   // pipeline stage.  At the moment, we cheat and get some of the
@@ -263,12 +263,12 @@ do_recompute_bounds(const NodePath &rel_to, int pipeline_stage,
 
   // First, get ourselves a fresh, empty bounding volume.
   PT(BoundingVolume) bound = new BoundingSphere;
-  
+
   NurbsSurfaceEvaluator *surface = get_surface();
   if (surface != (NurbsSurfaceEvaluator *)NULL) {
     NurbsSurfaceEvaluator::Vert3Array verts;
     get_surface()->get_vertices(verts, rel_to);
-    
+
     GeometricBoundingVolume *gbv;
     DCAST_INTO_R(gbv, bound, bound);
     gbv->around(&verts[0], &verts[0] + verts.size());
@@ -283,7 +283,7 @@ do_recompute_bounds(const NodePath &rel_to, int pipeline_stage,
 //               length.
 ////////////////////////////////////////////////////////////////////
 void SheetNode::
-render_sheet(CullTraverser *trav, CullTraverserData &data, 
+render_sheet(CullTraverser *trav, CullTraverserData &data,
              NurbsSurfaceResult *result) {
   bool use_vertex_color = get_use_vertex_color();
 
@@ -312,12 +312,12 @@ render_sheet(CullTraverser *trav, CullTraverserData &data,
     for (int uni = 0; uni <= num_u_verts; uni++) {
       PN_stdfloat u0 = (PN_stdfloat)uni / (PN_stdfloat)num_u_verts;
       PN_stdfloat u0_tc = result->get_segment_u(ui, u0);
-      
+
       for (int vi = 0; vi < num_v_segments; vi++) {
         for (int vni = 0; vni < num_v_verts; vni++) {
           PN_stdfloat v = (PN_stdfloat)vni / (PN_stdfloat)(num_v_verts - 1);
           PN_stdfloat v_tc = result->get_segment_v(vi, v);
-          
+
           LPoint3 point;
           LVector3 norm;
           result->eval_segment_point(ui, vi, u0, v, point);
@@ -325,7 +325,7 @@ render_sheet(CullTraverser *trav, CullTraverserData &data,
           vertex.add_data3(point);
           normal.add_data3(norm);
           texcoord.add_data2(u0_tc, v_tc);
-          
+
           if (use_vertex_color) {
             LColor c0;
             result->eval_segment_extended_points(ui, vi, u0, v, 0, &c0[0], 4);
@@ -336,7 +336,7 @@ render_sheet(CullTraverser *trav, CullTraverserData &data,
     }
   }
   nassertv(vdata->get_num_rows() == expected_num_vertices);
-  
+
   PT(GeomTristrips) strip = new GeomTristrips(Geom::UH_stream);
 
   int expected_num_tristrips = num_u_segments * num_u_verts * num_v_segments;
@@ -364,7 +364,7 @@ render_sheet(CullTraverser *trav, CullTraverserData &data,
     }
   }
   nassertv(strip->get_num_vertices() == expected_prim_vertices);
-  
+
   PT(Geom) geom = new Geom(vdata);
   geom->add_primitive(strip);
 
@@ -372,12 +372,10 @@ render_sheet(CullTraverser *trav, CullTraverserData &data,
   if (use_vertex_color) {
     state = state->add_attrib(ColorAttrib::make_vertex());
   }
-  
-  CullableObject *object = 
+
+  CullableObject *object =
     new CullableObject(geom, state,
-                       data.get_net_transform(trav),
-                       data.get_modelview_transform(trav),
-                       trav->get_scene());
+                       data.get_internal_transform(trav));
   trav->get_cull_handler()->record_object(object, trav);
 }
 
diff --git a/panda/src/pgraph/Sources.pp b/panda/src/pgraph/Sources.pp
index b03f0386aa..51e0bdb0fa 100644
--- a/panda/src/pgraph/Sources.pp
+++ b/panda/src/pgraph/Sources.pp
@@ -46,7 +46,6 @@
     depthOffsetAttrib.I depthOffsetAttrib.h \
     depthTestAttrib.I depthTestAttrib.h \
     depthWriteAttrib.I depthWriteAttrib.h \
-    eventStorePandaNode.I eventStorePandaNode.h \
     findApproxLevelEntry.I findApproxLevelEntry.h \
     findApproxPath.I findApproxPath.h \
     fog.I fog.h \
@@ -74,7 +73,7 @@
     nodePath.I nodePath.h nodePath.cxx \
     nodePath_ext.I nodePath_ext.h \
     nodePathCollection.I nodePathCollection.h \
-    nodePathCollection_ext.I nodePathCollection_ext.h \
+    nodePathCollection_ext.h \
     nodePathComponent.I nodePathComponent.h \
     occluderEffect.I occluderEffect.h \
     occluderNode.I occluderNode.h \
@@ -113,7 +112,7 @@
     weakNodePath.I weakNodePath.h \
     workingNodePath.I workingNodePath.h \
     nodePath_ext.h nodePath_ext.I \
-    nodePathCollection_ext.h nodePathCollection_ext.I \
+    nodePathCollection_ext.h \
     pandaNode_ext.h \
     renderState_ext.h \
     transformState_ext.h
@@ -155,7 +154,6 @@
     depthOffsetAttrib.cxx \
     depthTestAttrib.cxx \
     depthWriteAttrib.cxx \
-    eventStorePandaNode.cxx \
     findApproxLevelEntry.cxx \
     findApproxPath.cxx \
     fog.cxx \
@@ -258,7 +256,6 @@
     depthOffsetAttrib.I depthOffsetAttrib.h \
     depthTestAttrib.I depthTestAttrib.h \
     depthWriteAttrib.I depthWriteAttrib.h \
-    eventStorePandaNode.I eventStorePandaNode.h \
     fog.I fog.h \
     fogAttrib.I fogAttrib.h \
     geomDrawCallbackData.I geomDrawCallbackData.h \
diff --git a/panda/src/pgraph/config_pgraph.cxx b/panda/src/pgraph/config_pgraph.cxx
index 840ce5ba4e..18b85ea77c 100644
--- a/panda/src/pgraph/config_pgraph.cxx
+++ b/panda/src/pgraph/config_pgraph.cxx
@@ -37,7 +37,6 @@
 #include "depthOffsetAttrib.h"
 #include "depthTestAttrib.h"
 #include "depthWriteAttrib.h"
-#include "eventStorePandaNode.h"
 #include "findApproxLevelEntry.h"
 #include "fog.h"
 #include "fogAttrib.h"
@@ -106,7 +105,8 @@ ConfigVariableBool fake_view_frustum_cull
 ("fake-view-frustum-cull", false,
  PRC_DESC("Set this true to cause culling to be performed by rendering the "
           "object in red wireframe, rather than actually culling it.  This "
-          "helps make culling errors obvious."));
+          "helps make culling errors obvious.  This variable only has an "
+          "effect when Panda is not compiled for a release build."));
 
 ConfigVariableBool clip_plane_cull
 ("clip-plane-cull", true,
@@ -168,15 +168,6 @@ ConfigVariableBool compose_componentwise
           "operations when possible.  If this is false, the compositions "
           "are always computed by matrix."));
 
-ConfigVariableBool uniquify_matrix
-("uniquify-matrix", true,
- PRC_DESC("Set this true to look up arbitarary 4x4 transform matrices in the "
-          "cache, to ensure that two differently-computed transforms that "
-          "happen to encode the same matrix will be "
-          "collapsed into a single pointer.  Nowadays, "
-          "with the transforms stored in a hashtable, we're generally better "
-          "off with this set true."));
-
 ConfigVariableBool paranoid_const
 ("paranoid-const", false,
  PRC_DESC("Set this true to double-check that nothing is inappropriately "
@@ -257,12 +248,12 @@ ConfigVariableBool retransform_sprites
           "necessary in order for fog to work correctly on the sprites."));
 
 ConfigVariableBool depth_offset_decals
-("depth-offset-decals", false,
+("depth-offset-decals", true,
  PRC_DESC("Set this true to allow decals to be implemented via the advanced "
           "depth offset feature, if supported, instead of via the traditional "
-          "(and slower) two-pass approach.  This is false by default "
-          "because it appears that many graphics drivers have issues with "
-          "their depth offset implementation."));
+          "(and slower) two-pass approach.  This is currently the only method "
+          "by which decals are implemented in Panda3D, and as such, this "
+          "setting is ignored."));
 
 ConfigVariableInt max_collect_vertices
 ("max-collect-vertices", 65534,
@@ -422,7 +413,6 @@ init_libpgraph() {
   DepthOffsetAttrib::init_type();
   DepthTestAttrib::init_type();
   DepthWriteAttrib::init_type();
-  EventStorePandaNode::init_type();
   FindApproxLevelEntry::init_type();
   Fog::init_type();
   FogAttrib::init_type();
diff --git a/panda/src/pgraph/config_pgraph.h b/panda/src/pgraph/config_pgraph.h
index 3595917bae..a7158b5a86 100644
--- a/panda/src/pgraph/config_pgraph.h
+++ b/panda/src/pgraph/config_pgraph.h
@@ -41,7 +41,6 @@ extern ConfigVariableBool no_unsupported_copy;
 extern ConfigVariableBool allow_unrelated_wrt;
 extern ConfigVariableBool paranoid_compose;
 extern ConfigVariableBool compose_componentwise;
-extern ConfigVariableBool uniquify_matrix;
 extern ConfigVariableBool paranoid_const;
 extern ConfigVariableBool auto_break_cycles;
 extern EXPCL_PANDA_PGRAPH ConfigVariableBool garbage_collect_states;
diff --git a/panda/src/pgraph/cullBin.I b/panda/src/pgraph/cullBin.I
index 9017049980..3e78aca5ed 100644
--- a/panda/src/pgraph/cullBin.I
+++ b/panda/src/pgraph/cullBin.I
@@ -26,7 +26,6 @@ CullBin(const CullBin &copy) :
   _cull_this_pcollector(copy._cull_this_pcollector),
   _draw_this_pcollector(copy._draw_this_pcollector)
 {
-  check_flash_color();
 }
 
 ////////////////////////////////////////////////////////////////////
@@ -44,7 +43,6 @@ CullBin(const string &name, CullBin::BinType bin_type,
   _cull_this_pcollector(_cull_bin_pcollector, name),
   _draw_this_pcollector(draw_region_pcollector, name)
 {
-  check_flash_color();
 }
 
 ////////////////////////////////////////////////////////////////////
@@ -66,26 +64,3 @@ INLINE CullBin::BinType CullBin::
 get_bin_type() const {
   return _bin_type;
 }
-
-////////////////////////////////////////////////////////////////////
-//     Function: CullBin::has_flash_color
-//       Access: Public
-//  Description: Returns true if this bin has a flash color configured
-//               via the flash-bin-binname config directive, or false
-//               otherwise.
-////////////////////////////////////////////////////////////////////
-INLINE bool CullBin::
-has_flash_color() const {
-  return _has_flash_color;
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: CullBin::get_flash_color
-//       Access: Public
-//  Description: If has_flash_color returns true, this returns the
-//               color specified.
-////////////////////////////////////////////////////////////////////
-INLINE const LColor &CullBin::
-get_flash_color() const {
-  return _flash_color;
-}
diff --git a/panda/src/pgraph/cullBin.cxx b/panda/src/pgraph/cullBin.cxx
index 3c16739197..7ce254d5b3 100644
--- a/panda/src/pgraph/cullBin.cxx
+++ b/panda/src/pgraph/cullBin.cxx
@@ -27,7 +27,7 @@ TypeHandle CullBin::_type_handle;
 ////////////////////////////////////////////////////////////////////
 //     Function: CullBin::Destructor
 //       Access: Public, Virtual
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 CullBin::
 ~CullBin() {
@@ -87,44 +87,10 @@ make_result_graph() {
   return root_node;
 }
 
-////////////////////////////////////////////////////////////////////
-//     Function: CullBin::check_flash_color
-//       Access: Private
-//  Description: Checks the config variables for a user variable of
-//               the name flash-bin-binname.  If found, it defines the
-//               r g b color to flash geometry in this bin.
-////////////////////////////////////////////////////////////////////
-void CullBin::
-check_flash_color() {
-#ifdef NDEBUG
-  _has_flash_color = false;
-#else
-  ConfigVariableDouble flash_bin
-    ("flash-bin-" + _name, "", "", ConfigVariable::F_dynamic);
-  if (flash_bin.get_num_words() == 0) {
-    _has_flash_color = false;
-
-  } else if (flash_bin.get_num_words() == 3) {
-    _has_flash_color = true;
-    _flash_color.set(flash_bin[0], flash_bin[1], flash_bin[2], 1.0f);
-
-  } else if (flash_bin.get_num_words() == 4) {
-    _has_flash_color = true;
-    _flash_color.set(flash_bin[0], flash_bin[1], flash_bin[2], flash_bin[3]);
-
-  } else {
-    _has_flash_color = false;
-    pgraph_cat.warning()
-      << "Invalid value for flash-bin-" << _name << ": " 
-      << flash_bin.get_string_value() << "\n";
-  }
-#endif  // NDEBUG
-}
-
 ////////////////////////////////////////////////////////////////////
 //     Function: CullBin::ResultGraphBuilder::Constructor
 //       Access: Public
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 CullBin::ResultGraphBuilder::
 ResultGraphBuilder(PandaNode *root_node) :
@@ -142,13 +108,12 @@ ResultGraphBuilder(PandaNode *root_node) :
 ////////////////////////////////////////////////////////////////////
 void CullBin::ResultGraphBuilder::
 add_object(CullableObject *object) {
-  if (_current_transform != object->_modelview_transform || 
-      _current_state != object->_state || 
-      object->is_fancy()) {
+  if (_current_transform != object->_internal_transform ||
+      _current_state != object->_state) {
     // Create a new GeomNode to hold the net transform and state.  We
     // choose to create a new GeomNode for each new state, to make it
     // clearer to the observer when the state changes.
-    _current_transform = object->_modelview_transform;
+    _current_transform = object->_internal_transform;
     _current_state = object->_state;
     _current_node = new GeomNode("object_" + format_string(_object_index));
     _root_node->add_child(_current_node);
@@ -157,57 +122,13 @@ add_object(CullableObject *object) {
   }
 
   record_one_object(_current_node, object);
-
-  if (object->get_next() != (CullableObject *)NULL) {
-    // Collect the decal base pieces.
-    CullableObject *base = object->get_next();
-    while (base != (CullableObject *)NULL && base->_geom != (Geom *)NULL) {
-      record_one_object(_current_node, base);
-      base = base->get_next();
-    }
-
-    if (base != (CullableObject *)NULL) {
-      // Now, collect all the decals.
-      _current_node->set_effect(DecalEffect::make());
-      int decal_index = 0;
-
-      CPT(TransformState) transform;
-      CPT(RenderState) state;
-      PT(GeomNode) decal_node;
-      CullableObject *decal = base->get_next();
-      while (decal != (CullableObject *)NULL) {
-        if (transform != decal->_modelview_transform || 
-            state != decal->_state || 
-            decal->get_next() != (CullableObject *)NULL) {
-          // Create a new GeomNode to hold the net transform.
-          transform = decal->_modelview_transform;
-          state = decal->_state;
-          decal_node = new GeomNode("decal_" + format_string(decal_index));
-          _current_node->add_child(decal_node);
-          decal_node->set_transform(transform);
-          decal_node->set_state(state);
-        }
-        
-        record_one_object(decal_node, decal);
-        decal = decal->get_next();
-        ++decal_index;
-      }
-    }
-
-    // Reset the current node pointer for next time so the decal root
-    // will remain in its own node.
-    _current_node.clear();
-    _current_transform.clear();
-    _current_state.clear();
-  }
-
   ++_object_index;
 }
 
 ////////////////////////////////////////////////////////////////////
 //     Function: CullBin::ResultGraphBuilder::record_one_object
 //       Access: Private
-//  Description: Records a single object, without regard to decalling.
+//  Description: Records a single object.
 ////////////////////////////////////////////////////////////////////
 void CullBin::ResultGraphBuilder::
 record_one_object(GeomNode *node, CullableObject *object) {
diff --git a/panda/src/pgraph/cullBin.h b/panda/src/pgraph/cullBin.h
index 0f813df7b1..e93f7bed9b 100644
--- a/panda/src/pgraph/cullBin.h
+++ b/panda/src/pgraph/cullBin.h
@@ -77,9 +77,6 @@ protected:
   BinType _bin_type;
   GraphicsStateGuardianBase *_gsg;
 
-  bool _has_flash_color;
-  LColor _flash_color;
-
   // Used in make_result_graph() and fill_result_graph().
   class ResultGraphBuilder {
   public:
diff --git a/panda/src/pgraph/cullBinManager.I b/panda/src/pgraph/cullBinManager.I
index 50e43c66d5..94aa3fc0da 100644
--- a/panda/src/pgraph/cullBinManager.I
+++ b/panda/src/pgraph/cullBinManager.I
@@ -284,3 +284,76 @@ set_bin_active(const string &name, bool active) {
   nassertv(bin_index != -1);
   set_bin_active(bin_index, active);
 }
+
+#ifndef NDEBUG
+////////////////////////////////////////////////////////////////////
+//     Function: CullBinManager::get_bin_flash_active
+//       Access: Published
+//  Description: Returns true if the bin with the given bin_index is
+//               configured to flash at a predetermined color (where
+//               bin_index was retrieved by get_bin() or find_bin()).
+//
+//               This method is not available in release builds.
+////////////////////////////////////////////////////////////////////
+INLINE bool CullBinManager::
+get_bin_flash_active(int bin_index) const {
+  nassertr(bin_index >= 0 && bin_index < (int)_bin_definitions.size(), false);
+  return _bin_definitions[bin_index]._flash_active;
+}
+
+////////////////////////////////////////////////////////////////////
+//     Function: CullBinManager::get_bin_flash_color
+//       Access: Published
+//  Description: Returns the color that this bin has been configured
+//               to flash to, if configured.
+//
+//               This method is not available in release builds.
+////////////////////////////////////////////////////////////////////
+INLINE const LColor &CullBinManager::
+get_bin_flash_color(int bin_index) const {
+  nassertr(bin_index >= 0 && bin_index < (int)_bin_definitions.size(), LColor::zero());
+  return _bin_definitions[bin_index]._flash_color;
+}
+
+////////////////////////////////////////////////////////////////////
+//     Function: CullBinManager::set_bin_flash_active
+//       Access: Published
+//  Description: When set to true, the given bin_index is configured
+//               to flash at a predetermined color (where
+//               bin_index was retrieved by get_bin() or find_bin()).
+//
+//               This method is not available in release builds.
+////////////////////////////////////////////////////////////////////
+INLINE void CullBinManager::
+set_bin_flash_active(int bin_index, bool active) {
+  nassertv(bin_index >= 0 && bin_index < (int)_bin_definitions.size());
+  _bin_definitions[bin_index]._flash_active = active;
+}
+
+////////////////////////////////////////////////////////////////////
+//     Function: CullBinManager::set_bin_flash_color
+//       Access: Published
+//  Description: Changes the flash color for the given bin index.
+
+//               This method is not available in release builds.
+////////////////////////////////////////////////////////////////////
+INLINE void CullBinManager::
+set_bin_flash_color(int bin_index, const LColor &color) {
+  nassertv(bin_index >= 0 && bin_index < (int)_bin_definitions.size());
+  _bin_definitions[bin_index]._flash_color = color;
+}
+#endif  // NDEBUG
+
+////////////////////////////////////////////////////////////////////
+//     Function: CullBinManager::get_global_ptr
+//       Access: Published, Static
+//  Description: Returns the pointer to the global CullBinManager
+//               object.
+////////////////////////////////////////////////////////////////////
+INLINE CullBinManager *CullBinManager::
+get_global_ptr() {
+  if (_global_ptr == (CullBinManager *)NULL) {
+    _global_ptr = new CullBinManager;
+  }
+  return _global_ptr;
+}
diff --git a/panda/src/pgraph/cullBinManager.cxx b/panda/src/pgraph/cullBinManager.cxx
index f87a7d6094..9223035f82 100644
--- a/panda/src/pgraph/cullBinManager.cxx
+++ b/panda/src/pgraph/cullBinManager.cxx
@@ -17,7 +17,7 @@
 #include "cullResult.h"
 #include "config_pgraph.h"
 #include "string_utils.h"
-
+#include "configVariableColor.h"
 
 CullBinManager *CullBinManager::_global_ptr = (CullBinManager *)NULL;
 
@@ -109,6 +109,18 @@ add_bin(const string &name, BinType type, int sort) {
   def._sort = sort;
   def._active = true;
 
+#ifndef NDEBUG
+  // Check if there was a flash color configured for this bin name.
+  ConfigVariableColor flash_bin
+    ("flash-bin-" + name, "", "", ConfigVariable::F_dynamic);
+  if (flash_bin.get_num_words() == 0) {
+    def._flash_active = false;
+  } else {
+    def._flash_active = true;
+    def._flash_color = flash_bin.get_value();
+  }
+#endif
+
   _bins_by_name.insert(BinsByName::value_type(name, new_bin_index));
   _sorted_bins.push_back(new_bin_index);
   _bins_are_sorted = false;
@@ -133,7 +145,7 @@ remove_bin(int bin_index) {
   nassertv(_bin_definitions[bin_index]._in_use);
 
   _bin_definitions[bin_index]._in_use = false;
-  SortedBins::iterator si = 
+  SortedBins::iterator si =
     find(_sorted_bins.begin(), _sorted_bins.end(), bin_index);
   nassertv(si != _sorted_bins.end());
   _sorted_bins.erase(si);
@@ -142,7 +154,7 @@ remove_bin(int bin_index) {
   // Now we have to make sure all of the data objects in the world
   // that had cached this bin index or have a bin object are correctly
   // updated.
-  
+
   // First, tell all the RenderStates in the world to reset their bin
   // index cache.
   RenderState::bin_removed(bin_index);
@@ -170,7 +182,7 @@ find_bin(const string &name) const {
 ////////////////////////////////////////////////////////////////////
 //     Function: CullBinManager::write
 //       Access: Published
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 void CullBinManager::
 write(ostream &out) const {
@@ -185,20 +197,6 @@ write(ostream &out) const {
   }
 }
 
-////////////////////////////////////////////////////////////////////
-//     Function: CullBinManager::get_global_ptr
-//       Access: Published, Static
-//  Description: Returns the pointer to the global CullBinManager
-//               object.
-////////////////////////////////////////////////////////////////////
-CullBinManager *CullBinManager::
-get_global_ptr() {
-  if (_global_ptr == (CullBinManager *)NULL) {
-    _global_ptr = new CullBinManager;
-  }
-  return _global_ptr;
-}
-
 ////////////////////////////////////////////////////////////////////
 //     Function: CullBinManager::make_new_bin
 //       Access: Public
@@ -260,11 +258,11 @@ do_sort_bins() {
 void CullBinManager::
 setup_initial_bins() {
   ConfigVariableList cull_bin
-    ("cull-bin", 
+    ("cull-bin",
      PRC_DESC("Creates a new cull bin by name, with the specified properties.  "
               "This is a string in three tokens, separated by whitespace: "
               "'bin_name sort type'."));
-  
+
   // First, add all of the bins specified in the Configrc file.
   int num_bins = cull_bin.get_num_unique_values();
 
@@ -351,26 +349,26 @@ parse_bin_type(const string &bin_type) {
 
 ////////////////////////////////////////////////////////////////////
 //     Function: CullBinManager::BinType output operator
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 ostream &
 operator << (ostream &out, CullBinManager::BinType bin_type) {
   switch (bin_type) {
   case CullBinManager::BT_invalid:
     return out << "invalid";
-    
+
   case CullBinManager::BT_unsorted:
     return out << "unsorted";
-    
+
   case CullBinManager::BT_state_sorted:
     return out << "state_sorted";
-    
+
   case CullBinManager::BT_back_to_front:
     return out << "back_to_front";
-    
+
   case CullBinManager::BT_front_to_back:
     return out << "front_to_back";
-    
+
   case CullBinManager::BT_fixed:
     return out << "fixed";
   }
diff --git a/panda/src/pgraph/cullBinManager.h b/panda/src/pgraph/cullBinManager.h
index 75007b8025..4e6adf0821 100644
--- a/panda/src/pgraph/cullBinManager.h
+++ b/panda/src/pgraph/cullBinManager.h
@@ -65,9 +65,16 @@ PUBLISHED:
   INLINE void set_bin_active(int bin_index, bool active);
   INLINE void set_bin_active(const string &name, bool active);
 
+#ifndef NDEBUG
+  INLINE bool get_bin_flash_active(int bin_index) const;
+  INLINE const LColor &get_bin_flash_color(int bin_index) const;
+  INLINE void set_bin_flash_active(int bin_index, bool active);
+  INLINE void set_bin_flash_color(int bin_index, const LColor &color);
+#endif
+
   void write(ostream &out) const;
 
-  static CullBinManager *get_global_ptr();
+  INLINE static CullBinManager *get_global_ptr();
 
 public:
   // This interface is only intended to be used by CullResult.
@@ -77,7 +84,7 @@ public:
   // This defines the factory interface for defining constructors to
   // bin types (the implementations are in the cull directory, not
   // here in pgraph, so we can't call the constructors directly).
-  typedef CullBin *BinConstructor(const string &name, 
+  typedef CullBin *BinConstructor(const string &name,
                                   GraphicsStateGuardianBase *gsg,
                                   const PStatCollector &draw_region_pcollector);
 
@@ -90,13 +97,17 @@ private:
 
   class EXPCL_PANDA_PGRAPH BinDefinition {
   public:
+#ifndef NDEBUG
+    LColorf _flash_color;
+    bool _flash_active;
+#endif
     bool _in_use;
     string _name;
     BinType _type;
     int _sort;
     bool _active;
   };
-  typedef pvector<BinDefinition> BinDefinitions;
+  typedef epvector<BinDefinition> BinDefinitions;
   BinDefinitions _bin_definitions;
 
   class SortBins {
diff --git a/panda/src/pgraph/cullHandler.cxx b/panda/src/pgraph/cullHandler.cxx
index 02c657595c..2bbe56924c 100644
--- a/panda/src/pgraph/cullHandler.cxx
+++ b/panda/src/pgraph/cullHandler.cxx
@@ -22,7 +22,7 @@
 ////////////////////////////////////////////////////////////////////
 //     Function: CullHandler::Constructor
 //       Access: Public
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 CullHandler::
 CullHandler() {
@@ -31,7 +31,7 @@ CullHandler() {
 ////////////////////////////////////////////////////////////////////
 //     Function: CullHandler::Destructor
 //       Access: Public, Virtual
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 CullHandler::
 ~CullHandler() {
@@ -50,7 +50,7 @@ CullHandler::
 ////////////////////////////////////////////////////////////////////
 void CullHandler::
 record_object(CullableObject *object, const CullTraverser *traverser) {
-  nout << *object->_geom << " " << *object->_modelview_transform << " " 
+  nout << *object->_geom << " " << *object->_internal_transform << " "
        << *object->_state << "\n";
   delete object;
 }
@@ -65,4 +65,3 @@ record_object(CullableObject *object, const CullTraverser *traverser) {
 void CullHandler::
 end_traverse() {
 }
-
diff --git a/panda/src/pgraph/cullPlanes.cxx b/panda/src/pgraph/cullPlanes.cxx
index cc02bab922..d923974baf 100644
--- a/panda/src/pgraph/cullPlanes.cxx
+++ b/panda/src/pgraph/cullPlanes.cxx
@@ -13,12 +13,12 @@
 ////////////////////////////////////////////////////////////////////
 
 #include "cullPlanes.h"
+#include "cullTraverser.h"
 #include "cullTraverserData.h"
 #include "clipPlaneAttrib.h"
 #include "occluderEffect.h"
 #include "boundingBox.h"
 
-
 ////////////////////////////////////////////////////////////////////
 //     Function: CullPlanes::make_empty
 //       Access: Public, Static
@@ -116,11 +116,11 @@ apply_state(const CullTraverser *trav, const CullTraverserData *data,
           if (net_transform == (TransformState *)NULL) {
             net_transform = data->get_net_transform(trav);
           }
-          
+
           PlaneNode *plane_node = DCAST(PlaneNode, clip_plane.node());
-          CPT(TransformState) new_transform = 
+          CPT(TransformState) new_transform =
             net_transform->invert_compose(clip_plane.get_net_transform());
-          
+
           LPlane plane = plane_node->get_plane() * new_transform->get_mat();
           new_planes->_planes[clip_plane] = new BoundingPlane(-plane);
         }
@@ -174,17 +174,17 @@ apply_state(const CullTraverser *trav, const CullTraverserData *data,
         ccp[2] = occluder_node->get_vertex(2) * composed_mat;
         ccp[3] = occluder_node->get_vertex(3) * composed_mat;
 
-        LPoint3 ccp_min(min(min(ccp[0][0], ccp[1][0]), 
+        LPoint3 ccp_min(min(min(ccp[0][0], ccp[1][0]),
                      min(ccp[2][0], ccp[3][0])),
-                 min(min(ccp[0][1], ccp[1][1]), 
+                 min(min(ccp[0][1], ccp[1][1]),
                      min(ccp[2][1], ccp[3][1])),
-                 min(min(ccp[0][2], ccp[1][2]), 
+                 min(min(ccp[0][2], ccp[1][2]),
                      min(ccp[2][2], ccp[3][2])));
-        LPoint3 ccp_max(max(max(ccp[0][0], ccp[1][0]), 
+        LPoint3 ccp_max(max(max(ccp[0][0], ccp[1][0]),
                      max(ccp[2][0], ccp[3][0])),
-                 max(max(ccp[0][1], ccp[1][1]), 
+                 max(max(ccp[0][1], ccp[1][1]),
                      max(ccp[2][1], ccp[3][1])),
-                 max(max(ccp[0][2], ccp[1][2]), 
+                 max(max(ccp[0][2], ccp[1][2]),
                      max(ccp[2][2], ccp[3][2])));
 
         occluder_gbv = new BoundingBox(ccp_min, ccp_max);
@@ -209,7 +209,7 @@ apply_state(const CullTraverser *trav, const CullTraverserData *data,
         points_near[2] = occluder_node->get_vertex(2) * occluder_mat_cull;
         points_near[3] = occluder_node->get_vertex(3) * occluder_mat_cull;
         LPlane plane(points_near[0], points_near[1], points_near[2]);
-        
+
         if (plane.get_normal().dot(LVector3::forward()) >= 0.0) {
           if (occluder_node->is_double_sided()) {
             swap(points_near[0], points_near[3]);
@@ -294,22 +294,21 @@ apply_state(const CullTraverser *trav, const CullTraverserData *data,
 
         // With these points, construct the bounding frustum of the
         // occluded region.
-        PT(BoundingHexahedron) frustum = 
-          new BoundingHexahedron(points_far[1], points_far[2], points_far[3], points_far[0],  
+        PT(BoundingHexahedron) frustum =
+          new BoundingHexahedron(points_far[1], points_far[2], points_far[3], points_far[0],
                                  points_near[1], points_near[2], points_near[3], points_near[0]);
 
         new_planes->_occluders[occluder] = frustum;
-        
+
         if (show_occluder_volumes) {
           // Draw the frustum for visualization.
           nassertr(net_transform != NULL, new_planes);
-          trav->draw_bounding_volume(frustum, net_transform, 
-                                     data->get_modelview_transform(trav));
+          trav->draw_bounding_volume(frustum, data->get_internal_transform(trav));
         }
       }
     }
   }
-    
+
   return new_planes;
 }
 
@@ -330,13 +329,13 @@ apply_state(const CullTraverser *trav, const CullTraverserData *data,
 CPT(CullPlanes) CullPlanes::
 do_cull(int &result, CPT(RenderState) &state,
         const GeometricBoundingVolume *node_gbv) const {
-  result = 
+  result =
     BoundingVolume::IF_all | BoundingVolume::IF_possible | BoundingVolume::IF_some;
 
   CPT(ClipPlaneAttrib) orig_cpa = DCAST(ClipPlaneAttrib, state->get_attrib(ClipPlaneAttrib::get_class_slot()));
 
   CPT(CullPlanes) new_planes = this;
-  
+
   if (orig_cpa == (ClipPlaneAttrib *)NULL) {
     // If there are no clip planes in the state, the node is completely
     // in front of all zero of the clip planes.  (This can happen if
@@ -385,7 +384,7 @@ do_cull(int &result, CPT(RenderState) &state,
       // The node is completely in front of this occluder.  We don't
       // need to consider this occluder ever again for any descendents of
       // this node.
-      
+
       // Reverse the sense of the test, because an occluder volume is
       // the inverse of a cull plane volume: it describes the volume
       // that is to be culled, not the volume that is to be kept.
@@ -403,7 +402,7 @@ do_cull(int &result, CPT(RenderState) &state,
 
     result &= occluder_result;
   }
-    
+
   return new_planes;
 }
 
@@ -456,11 +455,11 @@ remove_occluder(const NodePath &occluder) const {
 ////////////////////////////////////////////////////////////////////
 //     Function: CullPlanes::write
 //       Access: Public
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 void CullPlanes::
 write(ostream &out) const {
-  out << "CullPlanes (" << _planes.size() << " planes and " 
+  out << "CullPlanes (" << _planes.size() << " planes and "
       << _occluders.size() << " occluders):\n";
   Planes::const_iterator pi;
   for (pi = _planes.begin(); pi != _planes.end(); ++pi) {
diff --git a/panda/src/pgraph/cullResult.I b/panda/src/pgraph/cullResult.I
index 50a4147b70..36a54b786e 100644
--- a/panda/src/pgraph/cullResult.I
+++ b/panda/src/pgraph/cullResult.I
@@ -39,3 +39,35 @@ get_bin(int bin_index) {
   }
   return make_new_bin(bin_index);
 }
+
+////////////////////////////////////////////////////////////////////
+//     Function: CullResult::check_flash_bin
+//       Access: Private
+//  Description: If the user configured flash-bin-binname, then update
+//               the object's state to flash all the geometry in the
+//               bin.
+////////////////////////////////////////////////////////////////////
+INLINE void CullResult::
+check_flash_bin(CPT(RenderState) &state, CullBinManager *bin_manager, int bin_index) {
+#ifndef NDEBUG
+  if (bin_manager->get_bin_flash_active(bin_index)) {
+    apply_flash_color(state, bin_manager->get_bin_flash_color(bin_index));
+  }
+#endif
+}
+
+////////////////////////////////////////////////////////////////////
+//     Function: CullResult::check_flash_transparency
+//       Access: Private
+//  Description: If the user configured show-transparency, then
+//               update the object's state to flash the current
+//               geometry with the specified color.
+////////////////////////////////////////////////////////////////////
+INLINE void CullResult::
+check_flash_transparency(CPT(RenderState) &state, const LColor &color) {
+#ifndef NDEBUG
+  if (_show_transparency) {
+    apply_flash_color(state, color);
+  }
+#endif
+}
diff --git a/panda/src/pgraph/cullResult.cxx b/panda/src/pgraph/cullResult.cxx
index 4868d46529..a7cab23a8b 100644
--- a/panda/src/pgraph/cullResult.cxx
+++ b/panda/src/pgraph/cullResult.cxx
@@ -26,27 +26,29 @@
 #include "renderState.h"
 #include "clockObject.h"
 #include "config_pgraph.h"
+#include "depthOffsetAttrib.h"
+#include "colorBlendAttrib.h"
 
 TypeHandle CullResult::_type_handle;
 
 // This value is used instead of 1.0 to represent the alpha level of a
 // pixel that is to be considered "opaque" for the purposes of M_dual.
-
+//
 // Ideally, 1.0 is the only correct value for this.  Realistically, we
 // have to fudge it lower for two reasons:
-
+//
 // (1) The modelers tend to paint textures with very slight
 // transparency levels in places that are not intended to be
 // transparent, without realizing it.  These very faint transparency
 // regions are normally (almost) invisible, but when rendered with
 // M_dual they may be revealed as regions of poor alpha sorting.
-
+//
 // (2) There seems to be some problem in DX where, in certain
 // circumstances apparently related to automatic texture management,
 // it spontaneously drops out the bottom two bits of an eight-bit
 // alpha channel, causing a value of 255 to become a value of 252
 // instead.
-
+//
 // We use 256 as the denominator here (instead of, say, 255) because a
 // fractional power of two will have a terminating representation in
 // base 2, and thus will be more likely to have a precise value in
@@ -57,7 +59,7 @@ static const double bin_color_flash_rate = 1.0;  // 1 state change per second
 ////////////////////////////////////////////////////////////////////
 //     Function: CullResult::Constructor
 //       Access: Public
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 CullResult::
 CullResult(GraphicsStateGuardianBase *gsg,
@@ -68,6 +70,10 @@ CullResult(GraphicsStateGuardianBase *gsg,
 #ifdef DO_MEMORY_USAGE
   MemoryUsage::update_type(this, get_class_type());
 #endif
+
+#ifndef NDEBUG
+  _show_transparency = show_transparency.get_value();
+#endif
 }
 
 ////////////////////////////////////////////////////////////////////
@@ -87,7 +93,7 @@ make_next() const {
 
   for (size_t i = 0; i < _bins.size(); ++i) {
     CullBin *old_bin = _bins[i];
-    if (old_bin == (CullBin *)NULL || 
+    if (old_bin == (CullBin *)NULL ||
         old_bin->get_bin_type() != bin_manager->get_bin_type(i)) {
       new_result->_bins.push_back((CullBin *)NULL);
     } else {
@@ -114,29 +120,28 @@ add_object(CullableObject *object, const CullTraverser *traverser) {
 
   bool force = !traverser->get_effective_incomplete_render();
   Thread *current_thread = traverser->get_current_thread();
+  CullBinManager *bin_manager = CullBinManager::get_global_ptr();
 
   // Check to see if there's a special transparency setting.
   const RenderState *state = object->_state;
   nassertv(state != (const RenderState *)NULL);
 
-  const TransparencyAttrib *trans = DCAST(TransparencyAttrib, state->get_attrib(TransparencyAttrib::get_class_slot()));
+  const TransparencyAttrib *trans = (const TransparencyAttrib *)
+    state->get_attrib(TransparencyAttrib::get_class_slot());
+
   if (trans != (const TransparencyAttrib *)NULL) {
     switch (trans->get_mode()) {
     case TransparencyAttrib::M_alpha:
       // M_alpha implies an alpha-write test, so we don't waste time
       // writing 0-valued pixels.
       object->_state = state->compose(get_alpha_state());
-#ifndef NDEBUG
       check_flash_transparency(object->_state, flash_alpha_color);
-#endif
       break;
 
     case TransparencyAttrib::M_binary:
       // M_binary is implemented by explicitly setting the alpha test.
       object->_state = state->compose(get_binary_state());
-#ifndef NDEBUG
       check_flash_transparency(object->_state, flash_binary_color);
-#endif
       break;
 
     case TransparencyAttrib::M_multisample:
@@ -146,9 +151,7 @@ add_object(CullableObject *object, const CullTraverser *traverser) {
       if (!_gsg->get_supports_multisample()) {
         object->_state = state->compose(get_binary_state());
       }
-#ifndef NDEBUG
       check_flash_transparency(object->_state, flash_multisample_color);
-#endif
       break;
 
     case TransparencyAttrib::M_dual:
@@ -166,38 +169,37 @@ add_object(CullableObject *object, const CullTraverser *traverser) {
       // later.  This means we must copy the object and add it to
       // both bins.  We can only do this if we do not have an
       // explicit bin already applied; otherwise, M_dual falls back
-      // to M_alpha. 
+      // to M_alpha.
       {
-        const CullBinAttrib *bin_attrib = DCAST(CullBinAttrib, state->get_attrib(CullBinAttrib::get_class_slot()));
-        if (bin_attrib == (CullBinAttrib *)NULL || 
+        const CullBinAttrib *bin_attrib = (const CullBinAttrib *)
+          state->get_attrib(CullBinAttrib::get_class_slot());
+
+        if (bin_attrib == (CullBinAttrib *)NULL ||
             bin_attrib->get_bin_name().empty()) {
-          // We make a copy of the object to draw the transparent part
-          // without decals; this gets placed in the transparent bin.
+          // We make a copy of the object to draw the transparent part;
+          // this gets placed in the transparent bin.
 #ifndef NDEBUG
-          if (m_dual_transparent) 
+          if (m_dual_transparent)
 #endif
             {
               CullableObject *transparent_part = new CullableObject(*object);
-              CPT(RenderState) transparent_state = object->has_decals() ? 
-                get_dual_transparent_state_decals() : 
-                get_dual_transparent_state();
+              CPT(RenderState) transparent_state = get_dual_transparent_state();
               transparent_part->_state = state->compose(transparent_state);
               if (transparent_part->munge_geom
                   (_gsg, _gsg->get_geom_munger(transparent_part->_state, current_thread),
                    traverser, force)) {
-                CullBin *bin = get_bin(transparent_part->_state->get_bin_index());
+                int transparent_bin_index = transparent_part->_state->get_bin_index();
+                CullBin *bin = get_bin(transparent_bin_index);
                 nassertv(bin != (CullBin *)NULL);
-#ifndef NDEBUG
-                check_flash_bin(transparent_part->_state, bin);
-#endif
+                check_flash_bin(transparent_part->_state, bin_manager, transparent_bin_index);
                 bin->add_object(transparent_part, current_thread);
               } else {
                 delete transparent_part;
               }
             }
-          
-          // Now we can draw the opaque part, with decals.  This will
-          // end up in the opaque bin.
+
+          // Now we can draw the opaque part.  This will end up in
+          // the opaque bin.
           object->_state = state->compose(get_dual_opaque_state());
 #ifndef NDEBUG
           if (!m_dual_opaque) {
@@ -210,19 +212,41 @@ add_object(CullableObject *object, const CullTraverser *traverser) {
         // M_alpha.
       }
       break;
-      
+
     default:
       // Other kinds of transparency need no special handling.
       break;
     }
   }
 
-  CullBin *bin = get_bin(object->_state->get_bin_index());
-  nassertv(bin != (CullBin *)NULL);
+  // Check for a special wireframe setting.
+  const RenderModeAttrib *rmode = (const RenderModeAttrib *)
+    object->_state->get_attrib(RenderModeAttrib::get_class_slot());
+  if (rmode != (const RenderModeAttrib *)NULL) {
+    if (rmode->get_mode() == RenderModeAttrib::M_filled_wireframe) {
+      CullableObject *wireframe_part = new CullableObject(*object);
+      wireframe_part->_state = get_wireframe_overlay_state(rmode);
 
-#ifndef NDEBUG
-  check_flash_bin(object->_state, bin);
-#endif
+      if (wireframe_part->munge_geom
+          (_gsg, _gsg->get_geom_munger(wireframe_part->_state, current_thread),
+           traverser, force)) {
+        int wireframe_bin_index = bin_manager->find_bin("fixed");
+        CullBin *bin = get_bin(wireframe_bin_index);
+        nassertv(bin != (CullBin *)NULL);
+        check_flash_bin(wireframe_part->_state, bin_manager, wireframe_bin_index);
+        bin->add_object(wireframe_part, current_thread);
+      } else {
+        delete wireframe_part;
+      }
+
+      object->_state = object->_state->set_attrib(RenderModeAttrib::make(RenderModeAttrib::M_filled));
+    }
+  }
+
+  int bin_index = object->_state->get_bin_index();
+  CullBin *bin = get_bin(bin_index);
+  nassertv(bin != (CullBin *)NULL);
+  check_flash_bin(object->_state, bin_manager, bin_index);
 
   // Munge vertices as needed for the GSG's requirements, and the
   // object's current state.
@@ -348,16 +372,20 @@ make_new_bin(int bin_index) {
   CullBinManager *bin_manager = CullBinManager::get_global_ptr();
   PT(CullBin) bin = bin_manager->make_new_bin(bin_index, _gsg,
                                               _draw_region_pcollector);
-  if (bin != (CullBin *)NULL) {
+  CullBin *bin_ptr = bin.p();
+
+  if (bin_ptr != (CullBin *)NULL) {
     // Now store it in the vector.
     while (bin_index >= (int)_bins.size()) {
       _bins.push_back((CullBin *)NULL);
     }
     nassertr(bin_index >= 0 && bin_index < (int)_bins.size(), NULL);
-    _bins[bin_index] = bin;
+
+    // Prevent unnecessary ref/unref by swapping the PointerTos.
+    swap(_bins[bin_index], bin);
   }
 
-  return bin;
+  return bin_ptr;
 }
 
 ////////////////////////////////////////////////////////////////////
@@ -394,57 +422,32 @@ get_binary_state() {
   return state;
 }
 
+#ifndef NDEBUG
 ////////////////////////////////////////////////////////////////////
-//     Function: CullResult::check_flash_bin
+//     Function: CullResult::apply_flash_color
 //       Access: Private
-//  Description: If the user configured flash-bin-binname, then update
-//               the object's state to flash all the geometry in the
-//               bin.
+//  Description: Update the object's state to flash the geometry
+//               with a solid color.
 ////////////////////////////////////////////////////////////////////
 void CullResult::
-check_flash_bin(CPT(RenderState) &state, CullBin *bin) {
-  if (bin->has_flash_color()) {
-    int cycle = (int)(ClockObject::get_global_clock()->get_frame_time() * bin_color_flash_rate);
-    if ((cycle & 1) == 0) {
-      state = state->remove_attrib(TextureAttrib::get_class_slot());
-      state = state->remove_attrib(LightAttrib::get_class_slot());
-      state = state->remove_attrib(ColorScaleAttrib::get_class_slot());
-      state = state->remove_attrib(FogAttrib::get_class_slot());
-      state = state->add_attrib(ColorAttrib::make_flat(bin->get_flash_color()),
-                                RenderState::get_max_priority());
-    }
-  }
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: CullResult::check_flash_transparency
-//       Access: Private
-//  Description: If the user configured show-transparency, then
-//               update the object's state to flash the current
-//               geometry with the specified color.
-////////////////////////////////////////////////////////////////////
-void CullResult::
-check_flash_transparency(CPT(RenderState) &state, const LColor &transparency) {
-  if (show_transparency) {
-    int cycle = (int)(ClockObject::get_global_clock()->get_frame_time() * bin_color_flash_rate);
-    if ((cycle & 1) == 0) {
-      state = state->remove_attrib(TextureAttrib::get_class_slot());
-      state = state->remove_attrib(LightAttrib::get_class_slot());
-      state = state->remove_attrib(ColorScaleAttrib::get_class_slot());
-      state = state->remove_attrib(FogAttrib::get_class_slot());
-      state = state->add_attrib(ColorAttrib::make_flat(transparency),
-                                RenderState::get_max_priority());
-    }
+apply_flash_color(CPT(RenderState) &state, const LColor &flash_color) {
+  int cycle = (int)(ClockObject::get_global_clock()->get_frame_time() * bin_color_flash_rate);
+  if ((cycle & 1) == 0) {
+    state = state->remove_attrib(TextureAttrib::get_class_slot());
+    state = state->remove_attrib(LightAttrib::get_class_slot());
+    state = state->remove_attrib(ColorScaleAttrib::get_class_slot());
+    state = state->remove_attrib(FogAttrib::get_class_slot());
+    state = state->add_attrib(ColorAttrib::make_flat(flash_color),
+                              RenderState::get_max_priority());
   }
 }
+#endif  // NDEBUG
 
 ////////////////////////////////////////////////////////////////////
 //     Function: CullResult::get_dual_transparent_state
 //       Access: Private
 //  Description: Returns a RenderState that renders only the
 //               transparent parts of an object, in support of M_dual.
-//               This state is suitable only for objects that do not
-//               contain decals.
 ////////////////////////////////////////////////////////////////////
 CPT(RenderState) CullResult::
 get_dual_transparent_state() {
@@ -454,10 +457,7 @@ get_dual_transparent_state() {
     // and hence filling up the depth buffer with large empty spaces
     // that may obscure other things.  However, this does mean we draw
     // pixels twice where the alpha == 1.0 (since they were already
-    // drawn in the opaque pass).  This is not normally a problem,
-    // except when we are using decals; in the case of decals, we
-    // don't want to draw the 1.0 pixels again, since these are the
-    // ones that may have been decaled onto.
+    // drawn in the opaque pass).  This is not normally a problem.
     state = RenderState::make(AlphaTestAttrib::make(AlphaTestAttrib::M_greater, 0.0f),
                               TransparencyAttrib::make(TransparencyAttrib::M_alpha),
                               DepthWriteAttrib::make(DepthWriteAttrib::M_off),
@@ -487,47 +487,6 @@ get_dual_transparent_state() {
   return state;
 }
 
-////////////////////////////////////////////////////////////////////
-//     Function: CullResult::get_dual_transparent_state_decals
-//       Access: Private
-//  Description: Returns a RenderState that renders only the
-//               transparent parts of an object, but suitable for
-//               objects that contain decals.
-////////////////////////////////////////////////////////////////////
-CPT(RenderState) CullResult::
-get_dual_transparent_state_decals() {
-  static CPT(RenderState) state = NULL;
-  if (state == (const RenderState *)NULL) {
-    // This is exactly the same as above except here we make the alpha
-    // test of < 1.0 instead of > 0.0.  This makes us draw big empty
-    // pixels where the alpha values are 0.0, but we don't overwrite
-    // the decals where the pixels are 1.0.
-    state = RenderState::make(AlphaTestAttrib::make(AlphaTestAttrib::M_less, dual_opaque_level),
-                              TransparencyAttrib::make(TransparencyAttrib::M_alpha),
-                              DepthWriteAttrib::make(DepthWriteAttrib::M_off),
-                              RenderState::get_max_priority());
-  }
-
-#ifndef NDEBUG
-  if (m_dual_flash) {
-    int cycle = (int)(ClockObject::get_global_clock()->get_frame_time() * bin_color_flash_rate);
-    if ((cycle & 1) == 0) {
-      static CPT(RenderState) flash_state = NULL;
-      if (flash_state == (const RenderState *)NULL) {
-        flash_state = state->add_attrib(ColorAttrib::make_flat(LColor(0.8f, 0.2, 0.2, 1.0f)),
-                                        RenderState::get_max_priority());
-        flash_state = flash_state->add_attrib(ColorScaleAttrib::make(LVecBase4(1.0f, 1.0f, 1.0f, 1.0f)),
-                                              RenderState::get_max_priority());
-
-      }
-      return flash_state;
-    }
-  }
-#endif  // NDEBUG
-
-  return state;
-}
-
 ////////////////////////////////////////////////////////////////////
 //     Function: CullResult::get_dual_opaque_state
 //       Access: Private
@@ -563,3 +522,22 @@ get_dual_opaque_state() {
   return state;
 }
 
+////////////////////////////////////////////////////////////////////
+//     Function: CullResult::get_wireframe_overlay_state
+//       Access: Private
+//  Description: Returns a RenderState that renders only the
+//               wireframe part of an M_filled_wireframe model.
+////////////////////////////////////////////////////////////////////
+CPT(RenderState) CullResult::
+get_wireframe_overlay_state(const RenderModeAttrib *rmode) {
+  return RenderState::make(
+    DepthOffsetAttrib::make(1, 0, 0.99999f),
+    ColorAttrib::make_flat(rmode->get_wireframe_color()),
+    ColorBlendAttrib::make(ColorBlendAttrib::M_add,
+                           ColorBlendAttrib::O_incoming_alpha,
+                           ColorBlendAttrib::O_one_minus_incoming_alpha),
+    RenderModeAttrib::make(RenderModeAttrib::M_wireframe,
+                           rmode->get_thickness(),
+                           rmode->get_perspective()));
+}
+
diff --git a/panda/src/pgraph/cullResult.h b/panda/src/pgraph/cullResult.h
index 06b7c1a17b..e24264e469 100644
--- a/panda/src/pgraph/cullResult.h
+++ b/panda/src/pgraph/cullResult.h
@@ -17,6 +17,7 @@
 
 #include "pandabase.h"
 #include "cullBin.h"
+#include "cullBinManager.h"
 #include "renderState.h"
 #include "cullableObject.h"
 #include "geomMunger.h"
@@ -26,12 +27,11 @@
 #include "pset.h"
 #include "pmap.h"
 
-
-class GraphicsStateGuardianBase;
 class CullTraverser;
-class TransformState;
+class GraphicsStateGuardianBase;
 class RenderState;
 class SceneSetup;
+class TransformState;
 
 ////////////////////////////////////////////////////////////////////
 //       Class : CullResult
@@ -66,21 +66,30 @@ public:
 
 private:
   CullBin *make_new_bin(int bin_index);
-  void check_flash_bin(CPT(RenderState) &state, CullBin *bin);
-  void check_flash_transparency(CPT(RenderState) &state, const LColor &color);
+
+  INLINE void check_flash_bin(CPT(RenderState) &state, CullBinManager *bin_manager, int bin_index);
+  INLINE void check_flash_transparency(CPT(RenderState) &state, const LColor &color);
+
+#ifndef NDEBUG
+  void apply_flash_color(CPT(RenderState) &state, const LColor &flash_color);
+#endif
 
   static CPT(RenderState) get_alpha_state();
   static CPT(RenderState) get_binary_state();
   static CPT(RenderState) get_dual_transparent_state();
-  static CPT(RenderState) get_dual_transparent_state_decals();
   static CPT(RenderState) get_dual_opaque_state();
+  static CPT(RenderState) get_wireframe_overlay_state(const RenderModeAttrib *rmode);
 
   GraphicsStateGuardianBase *_gsg;
   PStatCollector _draw_region_pcollector;
-  
+
   typedef pvector< PT(CullBin) > Bins;
   Bins _bins;
 
+#ifndef NDEBUG
+  bool _show_transparency;
+#endif
+
 public:
   static TypeHandle get_class_type() {
     return _type_handle;
@@ -90,7 +99,7 @@ public:
     register_type(_type_handle, "CullResult",
                   ReferenceCount::get_class_type());
   }
-  
+
 private:
   static TypeHandle _type_handle;
 };
@@ -99,5 +108,3 @@ private:
 
 #endif
 
-
-  
diff --git a/panda/src/pgraph/cullTraverser.I b/panda/src/pgraph/cullTraverser.I
index 7ee69834e2..76df04145a 100644
--- a/panda/src/pgraph/cullTraverser.I
+++ b/panda/src/pgraph/cullTraverser.I
@@ -110,12 +110,12 @@ get_initial_state() const {
 ////////////////////////////////////////////////////////////////////
 //     Function: CullTraverser::get_depth_offset_decals
 //       Access: Published
-//  Description: Returns the depth_offset_decals flag.  See
-//               set_depth_offset_decals().
+//  Description: Returns true, as depth offsets are the only way
+//               that we implement decals nowadays.
 ////////////////////////////////////////////////////////////////////
 INLINE bool CullTraverser::
 get_depth_offset_decals() const {
-  return _depth_offset_decals;
+  return true;
 }
 
 ////////////////////////////////////////////////////////////////////
@@ -199,7 +199,7 @@ get_cull_handler() const {
 ////////////////////////////////////////////////////////////////////
 //     Function: CullTraverser::set_portal_clipper
 //       Access: Published
-//  Description: Specifies _portal_clipper object pointer that 
+//  Description: Specifies _portal_clipper object pointer that
 //               subsequent traverse() or traverse_below may use.
 ////////////////////////////////////////////////////////////////////
 INLINE void CullTraverser::
@@ -245,3 +245,63 @@ flush_level() {
   _geoms_pcollector.flush_level();
   _geoms_occluded_pcollector.flush_level();
 }
+
+////////////////////////////////////////////////////////////////////
+//     Function: CullTraverser::do_traverse
+//       Access: Protected
+//  Description: This is implemented inline to reduce recursion.
+////////////////////////////////////////////////////////////////////
+INLINE void CullTraverser::
+do_traverse(CullTraverserData &data) {
+  if (is_in_view(data)) {
+    if (pgraph_cat.is_spam()) {
+      pgraph_cat.spam()
+        << "\n" << data._node_path
+        << " " << data._draw_mask << "\n";
+    }
+
+    PandaNodePipelineReader *node_reader = data.node_reader();
+    int fancy_bits = node_reader->get_fancy_bits();
+
+    if ((fancy_bits & (PandaNode::FB_transform |
+                       PandaNode::FB_state |
+                       PandaNode::FB_effects |
+                       PandaNode::FB_tag |
+                       PandaNode::FB_draw_mask |
+                       PandaNode::FB_cull_callback)) == 0 &&
+        data._cull_planes->is_empty()) {
+      // Nothing interesting in this node; just move on.
+
+    } else {
+      // Something in this node is worth taking a closer look.
+      const RenderEffects *node_effects = node_reader->get_effects();
+      if (node_effects->has_show_bounds()) {
+        // If we should show the bounding volume for this node, make it
+        // up now.
+        show_bounds(data, node_effects->has_show_tight_bounds());
+      }
+
+      data.apply_transform_and_state(this);
+
+      const FogAttrib *fog = (const FogAttrib *)
+        node_reader->get_state()->get_attrib(FogAttrib::get_class_slot());
+
+      if (fog != (const FogAttrib *)NULL && fog->get_fog() != (Fog *)NULL) {
+        // If we just introduced a FogAttrib here, call adjust_to_camera()
+        // now.  This maybe isn't the perfect time to call it, but it's
+        // good enough; and at this time we have all the information we
+        // need for it.
+        fog->get_fog()->adjust_to_camera(get_camera_transform());
+      }
+
+      if (fancy_bits & PandaNode::FB_cull_callback) {
+        PandaNode *node = data.node();
+        if (!node->cull_callback(this, data)) {
+          return;
+        }
+      }
+    }
+
+    traverse_below(data);
+  }
+}
diff --git a/panda/src/pgraph/cullTraverser.cxx b/panda/src/pgraph/cullTraverser.cxx
index 308d52f3b7..2a92792e03 100644
--- a/panda/src/pgraph/cullTraverser.cxx
+++ b/panda/src/pgraph/cullTraverser.cxx
@@ -17,7 +17,6 @@
 #include "cullTraverserData.h"
 #include "transformState.h"
 #include "renderState.h"
-#include "fogAttrib.h"
 #include "colorAttrib.h"
 #include "renderModeAttrib.h"
 #include "cullFaceAttrib.h"
@@ -47,7 +46,7 @@ TypeHandle CullTraverser::_type_handle;
 ////////////////////////////////////////////////////////////////////
 //     Function: CullTraverser::Constructor
 //       Access: Published
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 CullTraverser::
 CullTraverser() :
@@ -65,7 +64,7 @@ CullTraverser() :
 ////////////////////////////////////////////////////////////////////
 //     Function: CullTraverser::Copy Constructor
 //       Access: Published
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 CullTraverser::
 CullTraverser(const CullTraverser &copy) :
@@ -76,7 +75,6 @@ CullTraverser(const CullTraverser &copy) :
   _has_tag_state_key(copy._has_tag_state_key),
   _tag_state_key(copy._tag_state_key),
   _initial_state(copy._initial_state),
-  _depth_offset_decals(copy._depth_offset_decals),
   _view_frustum(copy._view_frustum),
   _cull_handler(copy._cull_handler),
   _portal_clipper(copy._portal_clipper),
@@ -98,7 +96,6 @@ set_scene(SceneSetup *scene_setup, GraphicsStateGuardianBase *gsg,
   _gsg = gsg;
 
   _initial_state = scene_setup->get_initial_state();
-  _depth_offset_decals = _gsg->depth_offset_decals() && depth_offset_decals;
 
   _current_thread = Thread::get_current_thread();
 
@@ -129,44 +126,44 @@ traverse(const NodePath &root) {
     PT(BoundingVolume) bv = _scene_setup->get_lens()->make_bounds();
     if (bv != (BoundingVolume *)NULL &&
         bv->is_of_type(GeometricBoundingVolume::get_class_type())) {
-      
+
       local_frustum = DCAST(GeometricBoundingVolume, bv);
     }
-      
+
     // This local_frustum is in camera space
     PortalClipper portal_viewer(local_frustum, _scene_setup);
     if (debug_portal_cull) {
       portal_viewer.draw_camera_frustum();
     }
-    
+
     // Store this pointer in this
     set_portal_clipper(&portal_viewer);
 
     CullTraverserData data(root, TransformState::make_identity(),
-                           _initial_state, _view_frustum, 
+                           _initial_state, _view_frustum,
                            _current_thread);
-    
+
     traverse(data);
-    
+
     // Finally add the lines to be drawn
     if (debug_portal_cull) {
       portal_viewer.draw_lines();
     }
-    
+
     // Render the frustum relative to the cull center.
     NodePath cull_center = _scene_setup->get_cull_center();
     CPT(TransformState) transform = cull_center.get_transform(root);
-    
+
     CullTraverserData my_data(data, portal_viewer._previous);
     my_data._net_transform = my_data._net_transform->compose(transform);
     traverse(my_data);
 
   } else {
     CullTraverserData data(root, TransformState::make_identity(),
-                           _initial_state, _view_frustum, 
+                           _initial_state, _view_frustum,
                            _current_thread);
-    
-    traverse(data);
+
+    do_traverse(data);
   }
 }
 
@@ -179,55 +176,7 @@ traverse(const NodePath &root) {
 ////////////////////////////////////////////////////////////////////
 void CullTraverser::
 traverse(CullTraverserData &data) {
-  if (is_in_view(data)) {
-    if (pgraph_cat.is_spam()) {
-      pgraph_cat.spam() 
-        << "\n" << data._node_path
-        << " " << data._draw_mask << "\n";
-    }
-
-    PandaNodePipelineReader *node_reader = data.node_reader();
-    int fancy_bits = node_reader->get_fancy_bits();
-
-    if ((fancy_bits & (PandaNode::FB_transform |
-                       PandaNode::FB_state |
-                       PandaNode::FB_effects |
-                       PandaNode::FB_tag |
-                       PandaNode::FB_draw_mask |
-                       PandaNode::FB_cull_callback)) == 0 &&
-        data._cull_planes->is_empty()) {
-      // Nothing interesting in this node; just move on.
-      traverse_below(data);
-
-    } else {
-      // Something in this node is worth taking a closer look.
-      const RenderEffects *node_effects = node_reader->get_effects();
-      if (node_effects->has_show_bounds()) {
-        // If we should show the bounding volume for this node, make it
-        // up now.
-        show_bounds(data, node_effects->has_show_tight_bounds());
-      }
-      
-      data.apply_transform_and_state(this);
-      
-      const FogAttrib *fog = DCAST(FogAttrib, node_reader->get_state()->get_attrib(FogAttrib::get_class_slot()));
-      if (fog != (const FogAttrib *)NULL && fog->get_fog() != (Fog *)NULL) {
-        // If we just introduced a FogAttrib here, call adjust_to_camera()
-        // now.  This maybe isn't the perfect time to call it, but it's
-        // good enough; and at this time we have all the information we
-        // need for it.
-        fog->get_fog()->adjust_to_camera(get_camera_transform());
-      }
-      
-      if (fancy_bits & PandaNode::FB_cull_callback) {
-        PandaNode *node = data.node();
-        if (!node->cull_callback(this, data)) {
-          return;
-        }
-      }
-      traverse_below(data);
-    }
-  }
+  do_traverse(data);
 }
 
 ////////////////////////////////////////////////////////////////////
@@ -243,21 +192,12 @@ traverse_below(CullTraverserData &data) {
   PandaNodePipelineReader *node_reader = data.node_reader();
   PandaNode *node = data.node();
 
-  bool this_node_hidden = data.is_this_node_hidden(this);
+  if (!data.is_this_node_hidden(_camera_mask)) {
+    node->add_for_draw(this, data);
 
-  const RenderEffects *node_effects = node_reader->get_effects();
-  bool has_decal = !this_node_hidden && node_effects->has_decal();
-  if (has_decal && !_depth_offset_decals) {
-    // Start the three-pass decal rendering if we're not using
-    // DepthOffsetAttribs to implement decals.
-    start_decal(data);
-    
-  } else {
-    if (!this_node_hidden) {
-      node->add_for_draw(this, data);
-    }
-
-    if (has_decal) {
+    // Check for a decal effect.
+    const RenderEffects *node_effects = node_reader->get_effects();
+    if (node_effects->has_decal()) {
       // If we *are* implementing decals with DepthOffsetAttribs,
       // apply it now, so that each child of this node gets offset by
       // a tiny amount.
@@ -270,24 +210,24 @@ traverse_below(CullTraverserData &data) {
       }
 #endif
     }
+  }
 
-    // Now visit all the node's children.
-    PandaNode::Children children = node_reader->get_children();
-    node_reader->release();
-    int num_children = children.get_num_children();
-    if (node->has_selective_visibility()) {
-      int i = node->get_first_visible_child();
-      while (i < num_children) {
-        CullTraverserData next_data(data, children.get_child(i));
-        traverse(next_data);
-        i = node->get_next_visible_child(i);
-      }
-      
-    } else {
-      for (int i = 0; i < num_children; i++) {
-        CullTraverserData next_data(data, children.get_child(i));
-        traverse(next_data);
-      }
+  // Now visit all the node's children.
+  PandaNode::Children children = node_reader->get_children();
+  node_reader->release();
+  int num_children = children.get_num_children();
+  if (node->has_selective_visibility()) {
+    int i = node->get_first_visible_child();
+    while (i < num_children) {
+      CullTraverserData next_data(data, children.get_child(i));
+      do_traverse(next_data);
+      i = node->get_next_visible_child(i);
+    }
+
+  } else {
+    for (int i = 0; i < num_children; i++) {
+      CullTraverserData next_data(data, children.get_child(i));
+      do_traverse(next_data);
     }
   }
 }
@@ -311,21 +251,20 @@ end_traverse() {
 //               bounding volume.
 ////////////////////////////////////////////////////////////////////
 void CullTraverser::
-draw_bounding_volume(const BoundingVolume *vol, 
-                     const TransformState *net_transform,
-                     const TransformState *modelview_transform) const {
+draw_bounding_volume(const BoundingVolume *vol,
+                     const TransformState *internal_transform) const {
   PT(Geom) bounds_viz = make_bounds_viz(vol);
-  
+
   if (bounds_viz != (Geom *)NULL) {
     _geoms_pcollector.add_level(2);
-    CullableObject *outer_viz = 
-      new CullableObject(bounds_viz, get_bounds_outer_viz_state(), 
-                         net_transform, modelview_transform, get_scene());
+    CullableObject *outer_viz =
+      new CullableObject(bounds_viz, get_bounds_outer_viz_state(),
+                         internal_transform);
     _cull_handler->record_object(outer_viz, this);
-    
-    CullableObject *inner_viz = 
-      new CullableObject(bounds_viz, get_bounds_inner_viz_state(), 
-                         net_transform, modelview_transform, get_scene());
+
+    CullableObject *inner_viz =
+      new CullableObject(bounds_viz, get_bounds_inner_viz_state(),
+                         internal_transform);
     _cull_handler->record_object(inner_viz, this);
   }
 }
@@ -352,34 +291,30 @@ is_in_view(CullTraverserData &data) {
 void CullTraverser::
 show_bounds(CullTraverserData &data, bool tight) {
   PandaNode *node = data.node();
-  CPT(TransformState) net_transform = data.get_net_transform(this);
-  CPT(TransformState) modelview_transform = data.get_modelview_transform(this);
+  CPT(TransformState) internal_transform = data.get_internal_transform(this);
 
   if (tight) {
     PT(Geom) bounds_viz = make_tight_bounds_viz(node);
 
     if (bounds_viz != (Geom *)NULL) {
       _geoms_pcollector.add_level(1);
-      CullableObject *outer_viz = 
-        new CullableObject(bounds_viz, get_bounds_outer_viz_state(), 
-                           net_transform, modelview_transform,
-                           get_scene());
+      CullableObject *outer_viz =
+        new CullableObject(bounds_viz, get_bounds_outer_viz_state(),
+                           internal_transform);
       _cull_handler->record_object(outer_viz, this);
     }
-    
+
   } else {
-    draw_bounding_volume(node->get_bounds(),
-                         net_transform, modelview_transform);
+    draw_bounding_volume(node->get_bounds(), internal_transform);
 
     if (node->is_geom_node()) {
       // Also show the bounding volumes of included Geoms.
-      net_transform = net_transform->compose(node->get_transform());
-      modelview_transform = modelview_transform->compose(node->get_transform());
+      internal_transform = internal_transform->compose(node->get_transform());
       GeomNode *gnode = DCAST(GeomNode, node);
       int num_geoms = gnode->get_num_geoms();
       for (int i = 0; i < num_geoms; ++i) {
-        draw_bounding_volume(gnode->get_geom(i)->get_bounds(), 
-                             net_transform, modelview_transform);
+        draw_bounding_volume(gnode->get_geom(i)->get_bounds(),
+                             internal_transform);
       }
     }
   }
@@ -407,7 +342,7 @@ make_bounds_viz(const BoundingVolume *vol) {
       ("bounds", GeomVertexFormat::get_v3(),
        Geom::UH_stream);
     GeomVertexWriter vertex(vdata, InternalName::get_vertex());
-    
+
     PT(GeomTristrips) strip = new GeomTristrips(Geom::UH_stream);
     for (int sl = 0; sl < num_slices; ++sl) {
       PN_stdfloat longitude0 = (PN_stdfloat)sl / (PN_stdfloat)num_slices;
@@ -419,11 +354,11 @@ make_bounds_viz(const BoundingVolume *vol) {
         vertex.add_data3(compute_point(sphere, latitude, longitude1));
       }
       vertex.add_data3(compute_point(sphere, 1.0, longitude0));
-      
+
       strip->add_next_vertices(num_stacks * 2);
       strip->close_primitive();
     }
-    
+
     geom = new Geom(vdata);
     geom->add_primitive(strip);
 
@@ -438,7 +373,7 @@ make_bounds_viz(const BoundingVolume *vol) {
     for (int i = 0; i < 8; ++i ) {
       vertex.add_data3(fvol->get_point(i));
     }
-    
+
     PT(GeomLines) lines = new GeomLines(Geom::UH_stream);
     lines->add_vertices(0, 1); lines->close_primitive();
     lines->add_vertices(1, 2); lines->close_primitive();
@@ -472,7 +407,7 @@ make_bounds_viz(const BoundingVolume *vol) {
     for (int i = 0; i < 8; ++i ) {
       vertex.add_data3(box.get_point(i));
     }
-    
+
     PT(GeomTriangles) tris = new GeomTriangles(Geom::UH_stream);
     tris->add_vertices(0, 4, 5);
     tris->close_primitive();
@@ -533,7 +468,7 @@ make_tight_bounds_viz(PandaNode *node) const {
       Geom::UH_stream);
     GeomVertexWriter vertex(vdata, InternalName::get_vertex(),
                             _current_thread);
-    
+
     vertex.add_data3(n[0], n[1], n[2]);
     vertex.add_data3(n[0], n[1], x[2]);
     vertex.add_data3(n[0], x[1], n[2]);
@@ -542,7 +477,7 @@ make_tight_bounds_viz(PandaNode *node) const {
     vertex.add_data3(x[0], n[1], x[2]);
     vertex.add_data3(x[0], x[1], n[2]);
     vertex.add_data3(x[0], x[1], x[2]);
-  
+
     PT(GeomLinestrips) strip = new GeomLinestrips(Geom::UH_stream);
 
     // We wind one long linestrip around the wireframe cube.  This
@@ -564,7 +499,7 @@ make_tight_bounds_viz(PandaNode *node) const {
     strip->add_vertex(5);
     strip->add_vertex(1);
     strip->close_primitive();
-      
+
     geom = new Geom(vdata);
     geom->add_primitive(strip);
   }
@@ -576,10 +511,10 @@ make_tight_bounds_viz(PandaNode *node) const {
 //     Function: CullTraverser::compute_point
 //       Access: Private, Static
 //  Description: Returns a point on the surface of the sphere.
-//               latitude and longitude range from 0.0 to 1.0.  
+//               latitude and longitude range from 0.0 to 1.0.
 ////////////////////////////////////////////////////////////////////
 LVertex CullTraverser::
-compute_point(const BoundingSphere *sphere, 
+compute_point(const BoundingSphere *sphere,
               PN_stdfloat latitude, PN_stdfloat longitude) {
   PN_stdfloat s1, c1;
   csincos(latitude * MathNumbers::pi, &s1, &c1);
@@ -648,231 +583,3 @@ get_depth_offset_state() {
   }
   return state;
 }
-
-
-////////////////////////////////////////////////////////////////////
-//     Function: CullTraverser::start_decal
-//       Access: Private
-//  Description: Collects a base node and all of the decals applied to
-//               it.  This involves recursing below the base GeomNode
-//               to find all the decal geoms.
-////////////////////////////////////////////////////////////////////
-void CullTraverser::
-start_decal(const CullTraverserData &data) {
-  PandaNode *node = data.node();
-  if (!node->is_geom_node()) {
-    pgraph_cat.error()
-      << "DecalEffect applied to " << *node << ", not a GeomNode.\n";
-    return;
-  }
-
-  const PandaNodePipelineReader *node_reader = data.node_reader();
-
-  // Build a chain of CullableObjects.  The head of the chain will be
-  // all of the base Geoms in order, followed by an empty
-  // CullableObject node, followed by all of the decal Geoms, in
-  // order.
-
-  // Since the CullableObject is a linked list which gets built in
-  // LIFO order, we start with the decals.
-  CullableObject *decals = (CullableObject *)NULL;
-  PandaNode::Children cr = node_reader->get_children();
-  int num_children = cr.get_num_children();
-  if (node->has_selective_visibility()) {
-    int i = node->get_first_visible_child();
-    while (i < num_children) {
-      CullTraverserData next_data(data, cr.get_child(i));
-      decals = r_get_decals(next_data, decals);
-      i = node->get_next_visible_child(i);
-    }
-    
-  } else {
-    for (int i = num_children - 1; i >= 0; i--) {
-      CullTraverserData next_data(data, cr.get_child(i));
-      decals = r_get_decals(next_data, decals);
-    }
-  }
-
-  // Now create a new, empty CullableObject to separate the decals
-  // from the non-decals.
-  CullableObject *separator = new CullableObject;
-  separator->set_next(decals);
-
-  // And now get the base Geoms, again in reverse order.
-  CullableObject *object = separator;
-  GeomNode *geom_node = DCAST(GeomNode, node);
-  GeomNode::Geoms geoms = geom_node->get_geoms();
-  int num_geoms = geoms.get_num_geoms();
-  _geoms_pcollector.add_level(num_geoms);
-  CPT(TransformState) net_transform = data.get_net_transform(this);
-  CPT(TransformState) modelview_transform = data.get_modelview_transform(this);
-  CPT(TransformState) internal_transform = _scene_setup->get_cs_transform()->compose(modelview_transform);
-  
-  for (int i = num_geoms - 1; i >= 0; i--) {
-    const Geom *geom = geoms.get_geom(i);
-    if (geom->is_empty()) {
-      continue;
-    }
-
-    CPT(RenderState) state = data._state->compose(geoms.get_geom_state(i));
-    if (state->has_cull_callback() && !state->cull_callback(this, data)) {
-      // Cull.
-      continue;
-    }
-    
-    // Cull the Geom bounding volume against the view frustum
-    // and/or the cull planes.  Don't bother unless we've got more
-    // than one Geom, since otherwise the bounding volume of the
-    // GeomNode is (probably) the same as that of the one Geom,
-    // and we've already culled against that.
-    if (num_geoms > 1) {
-      if (data._view_frustum != (GeometricBoundingVolume *)NULL) {
-        // Cull the individual Geom against the view frustum.
-        CPT(BoundingVolume) geom_volume = geom->get_bounds();
-        const GeometricBoundingVolume *geom_gbv =
-          DCAST(GeometricBoundingVolume, geom_volume);
-        
-        int result = data._view_frustum->contains(geom_gbv);
-        if (result == BoundingVolume::IF_no_intersection) {
-          // Cull this Geom.
-          continue;
-        }
-      }
-      if (!data._cull_planes->is_empty()) {
-        // Also cull the Geom against the cull planes.
-        CPT(BoundingVolume) geom_volume = geom->get_bounds();
-        const GeometricBoundingVolume *geom_gbv =
-          DCAST(GeometricBoundingVolume, geom_volume);
-        int result;
-        data._cull_planes->do_cull(result, state, geom_gbv);
-        if (result == BoundingVolume::IF_no_intersection) {
-          // Cull.
-          continue;
-        }
-      }
-    }
-
-    CullableObject *next = object;
-    object =
-      new CullableObject(geom, state, net_transform, 
-                         modelview_transform, internal_transform);
-    object->set_next(next);
-  }
-
-  if (object != separator) {
-    // Finally, send the whole list down to the CullHandler for
-    // processing.  The first Geom in the node now represents the
-    // overall state.
-    _cull_handler->record_object(object, this);
-  } else {
-    // Never mind; there's nothing to render.
-    delete object;
-  }
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: CullTraverser::r_get_decals
-//       Access: Private
-//  Description: Recursively gets all the decals applied to a
-//               particular GeomNode.  These are built into a
-//               CullableObject list in LIFO order (so that the
-//               traversing the list will extract them in the order
-//               they were encountered in the scene graph).
-////////////////////////////////////////////////////////////////////
-CullableObject *CullTraverser::
-r_get_decals(CullTraverserData &data, CullableObject *decals) {
-  if (is_in_view(data)) {
-    PandaNodePipelineReader *node_reader = data.node_reader();
-    PandaNode *node = data.node();
-
-    const RenderEffects *node_effects = node_reader->get_effects();
-    if (node_effects->has_show_bounds()) {
-      // If we should show the bounding volume for this node, make it
-      // up now.
-      show_bounds(data, node_effects->has_show_tight_bounds());
-    }
-
-    data.apply_transform_and_state(this);
-
-    // First, visit all of the node's children.
-    int num_children = node_reader->get_num_children();
-    if (node->has_selective_visibility()) {
-      int i = node->get_first_visible_child();
-      while (i < num_children) {
-        CullTraverserData next_data(data, node_reader->get_child(i));
-        decals = r_get_decals(next_data, decals);
-        i = node->get_next_visible_child(i);
-      }
-      
-    } else {
-      for (int i = num_children - 1; i >= 0; i--) {
-        CullTraverserData next_data(data, node_reader->get_child(i));
-        decals = r_get_decals(next_data, decals);
-      }
-    }
-
-    // Now, tack on any geoms within the node.
-    if (node->is_geom_node()) {
-      GeomNode *geom_node = DCAST(GeomNode, node);
-      GeomNode::Geoms geoms = geom_node->get_geoms();
-      int num_geoms = geoms.get_num_geoms();
-      _geoms_pcollector.add_level(num_geoms);
-      CPT(TransformState) net_transform = data.get_net_transform(this);
-      CPT(TransformState) modelview_transform = data.get_modelview_transform(this);
-      CPT(TransformState) internal_transform = _scene_setup->get_cs_transform()->compose(modelview_transform);
-
-      for (int i = num_geoms - 1; i >= 0; i--) {
-        const Geom *geom = geoms.get_geom(i);
-        if (geom->is_empty()) {
-          continue;
-        }
-
-        CPT(RenderState) state = data._state->compose(geoms.get_geom_state(i));
-        if (state->has_cull_callback() && !state->cull_callback(this, data)) {
-          // Cull.
-          continue;
-        }
-
-        // Cull the Geom bounding volume against the view frustum
-        // and/or the cull planes.  Don't bother unless we've got more
-        // than one Geom, since otherwise the bounding volume of the
-        // GeomNode is (probably) the same as that of the one Geom,
-        // and we've already culled against that.
-        if (num_geoms > 1) {
-          if (data._view_frustum != (GeometricBoundingVolume *)NULL) {
-            // Cull the individual Geom against the view frustum.
-            CPT(BoundingVolume) geom_volume = geom->get_bounds();
-            const GeometricBoundingVolume *geom_gbv =
-              DCAST(GeometricBoundingVolume, geom_volume);
-
-            int result = data._view_frustum->contains(geom_gbv);
-            if (result == BoundingVolume::IF_no_intersection) {
-              // Cull this Geom.
-              continue;
-            }
-          }
-          if (!data._cull_planes->is_empty()) {
-            // Also cull the Geom against the cull planes.
-            CPT(BoundingVolume) geom_volume = geom->get_bounds();
-            const GeometricBoundingVolume *geom_gbv =
-              DCAST(GeometricBoundingVolume, geom_volume);
-            int result;
-            data._cull_planes->do_cull(result, state, geom_gbv);
-            if (result == BoundingVolume::IF_no_intersection) {
-              // Cull.
-              continue;
-            }
-          }
-        }
-
-        CullableObject *next = decals;
-        decals =
-          new CullableObject(geom, state, net_transform, 
-                             modelview_transform, internal_transform);
-        decals->set_next(next);
-      }
-    }
-  }
-
-  return decals;
-}
diff --git a/panda/src/pgraph/cullTraverser.h b/panda/src/pgraph/cullTraverser.h
index 5100b0e7eb..a174be5b3d 100644
--- a/panda/src/pgraph/cullTraverser.h
+++ b/panda/src/pgraph/cullTraverser.h
@@ -27,6 +27,7 @@
 #include "drawMask.h"
 #include "typedReferenceCount.h"
 #include "pStatCollector.h"
+#include "fogAttrib.h"
 
 class GraphicsStateGuardian;
 class PandaNode;
@@ -87,11 +88,12 @@ PUBLISHED:
 
   INLINE static void flush_level();
 
-  void draw_bounding_volume(const BoundingVolume *vol, 
-                            const TransformState *net_transform,
-                            const TransformState *modelview_transform) const;
+  void draw_bounding_volume(const BoundingVolume *vol,
+                            const TransformState *internal_transform) const;
 
 protected:
+  INLINE void do_traverse(CullTraverserData &data);
+
   virtual bool is_in_view(CullTraverserData &data);
 
 public:
@@ -105,7 +107,7 @@ private:
   void show_bounds(CullTraverserData &data, bool tight);
   static PT(Geom) make_bounds_viz(const BoundingVolume *vol);
   PT(Geom) make_tight_bounds_viz(PandaNode *node) const;
-  static LVertex compute_point(const BoundingSphere *sphere, 
+  static LVertex compute_point(const BoundingSphere *sphere,
                                PN_stdfloat latitude, PN_stdfloat longitude);
   static CPT(RenderState) get_bounds_outer_viz_state();
   static CPT(RenderState) get_bounds_inner_viz_state();
@@ -121,12 +123,11 @@ private:
   bool _has_tag_state_key;
   string _tag_state_key;
   CPT(RenderState) _initial_state;
-  bool _depth_offset_decals;
   PT(GeometricBoundingVolume) _view_frustum;
   CullHandler *_cull_handler;
   PortalClipper *_portal_clipper;
   bool _effective_incomplete_render;
-  
+
 public:
   static TypeHandle get_class_type() {
     return _type_handle;
@@ -145,9 +146,8 @@ private:
   static TypeHandle _type_handle;
 };
 
+#include "cullTraverserData.h"
+
 #include "cullTraverser.I"
 
 #endif
-
-
-  
diff --git a/panda/src/pgraph/cullTraverserData.I b/panda/src/pgraph/cullTraverserData.I
index acd2ababfb..5cd227322d 100644
--- a/panda/src/pgraph/cullTraverserData.I
+++ b/panda/src/pgraph/cullTraverserData.I
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////
 //     Function: CullTraverserData::Constructor
 //       Access: Public
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 INLINE CullTraverserData::
 CullTraverserData(const NodePath &start,
@@ -29,16 +29,18 @@ CullTraverserData(const NodePath &start,
   _state(state),
   _view_frustum(view_frustum),
   _cull_planes(CullPlanes::make_empty()),
-  _draw_mask(DrawMask::all_on())
+  _draw_mask(DrawMask::all_on()),
+  _portal_depth(0)
 {
-  _node_reader.check_bounds();
-  _portal_depth = 0;
+  // Only update the bounding volume if we're going to end up needing it.
+  bool check_bounds = (view_frustum != (GeometricBoundingVolume *)NULL);
+  _node_reader.check_cached(check_bounds);
 }
 
 ////////////////////////////////////////////////////////////////////
 //     Function: CullTraverserData::Copy Constructor
 //       Access: Public
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 INLINE CullTraverserData::
 CullTraverserData(const CullTraverserData &copy) :
@@ -56,7 +58,7 @@ CullTraverserData(const CullTraverserData &copy) :
 ////////////////////////////////////////////////////////////////////
 //     Function: CullTraverserData::Copy Assignment Operator
 //       Access: Public
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 INLINE void CullTraverserData::
 operator = (const CullTraverserData &copy) {
@@ -84,16 +86,19 @@ CullTraverserData(const CullTraverserData &parent, PandaNode *child) :
   _state(parent._state),
   _view_frustum(parent._view_frustum),
   _cull_planes(parent._cull_planes),
-  _draw_mask(parent._draw_mask)
+  _draw_mask(parent._draw_mask),
+  _portal_depth(parent._portal_depth)
 {
-  _node_reader.check_bounds();
-  _portal_depth = parent._portal_depth;
+  // Only update the bounding volume if we're going to end up needing it.
+  bool check_bounds = !_cull_planes->is_empty() ||
+                    (_view_frustum != (GeometricBoundingVolume *)NULL);
+  _node_reader.check_cached(check_bounds);
 }
 
 ////////////////////////////////////////////////////////////////////
 //     Function: CullTraverserData::Destructor
 //       Access: Public
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 INLINE CullTraverserData::
 ~CullTraverserData() {
@@ -131,6 +136,28 @@ node_reader() const {
   return &_node_reader;
 }
 
+////////////////////////////////////////////////////////////////////
+//     Function: CullTraverserData::get_modelview_transform
+//       Access: Published
+//  Description: Returns the modelview transform: the relative
+//               transform from the camera to the model.
+////////////////////////////////////////////////////////////////////
+INLINE CPT(TransformState) CullTraverserData::
+get_modelview_transform(const CullTraverser *trav) const {
+  return trav->get_world_transform()->compose(_net_transform);
+}
+
+////////////////////////////////////////////////////////////////////
+//     Function: CullTraverserData::get_internal_transform
+//       Access: Published
+//  Description: Returns the internal transform: the modelview
+//               transform in the GSG's internal coordinate system.
+////////////////////////////////////////////////////////////////////
+INLINE CPT(TransformState) CullTraverserData::
+get_internal_transform(const CullTraverser *trav) const {
+  return trav->get_scene()->get_cs_world_transform()->compose(_net_transform);
+}
+
 ////////////////////////////////////////////////////////////////////
 //     Function: CullTraverserData::get_net_transform
 //       Access: Published
@@ -185,7 +212,7 @@ is_in_view(const DrawMask &camera_mask) {
 //               rendered.
 ////////////////////////////////////////////////////////////////////
 INLINE bool CullTraverserData::
-is_this_node_hidden(const CullTraverser *trav) const {
+is_this_node_hidden(const DrawMask &camera_mask) const {
   return (_draw_mask & PandaNode::get_overall_bit()).is_zero() ||
-    (_draw_mask & trav->get_camera_mask()).is_zero();
+    (_draw_mask & camera_mask).is_zero();
 }
diff --git a/panda/src/pgraph/cullTraverserData.cxx b/panda/src/pgraph/cullTraverserData.cxx
index a103cb2903..ce665e4806 100644
--- a/panda/src/pgraph/cullTraverserData.cxx
+++ b/panda/src/pgraph/cullTraverserData.cxx
@@ -28,17 +28,6 @@
 #include "renderState.h"
 
 
-////////////////////////////////////////////////////////////////////
-//     Function: CullTraverserData::get_modelview_transform
-//       Access: Published
-//  Description: Returns the modelview transform: the relative
-//               transform from the camera to the model.
-////////////////////////////////////////////////////////////////////
-CPT(TransformState) CullTraverserData::
-get_modelview_transform(const CullTraverser *trav) const {
-  return trav->get_world_transform()->compose(_net_transform);
-}
-
 ////////////////////////////////////////////////////////////////////
 //     Function: CullTraverserData::apply_transform_and_state
 //       Access: Published
@@ -50,7 +39,7 @@ void CullTraverserData::
 apply_transform_and_state(CullTraverser *trav) {
   CPT(RenderState) node_state = _node_reader.get_state();
 
-  if (trav->has_tag_state_key() && 
+  if (trav->has_tag_state_key() &&
       _node_reader.has_tag(trav->get_tag_state_key())) {
     // Here's a node that has been tagged with the special key for our
     // current camera.  This indicates some special state transition
@@ -74,8 +63,8 @@ apply_transform_and_state(CullTraverser *trav) {
 //               data.  This also evaluates billboards, etc.
 ////////////////////////////////////////////////////////////////////
 void CullTraverserData::
-apply_transform_and_state(CullTraverser *trav, 
-                          CPT(TransformState) node_transform, 
+apply_transform_and_state(CullTraverser *trav,
+                          CPT(TransformState) node_transform,
                           CPT(RenderState) node_state,
                           CPT(RenderEffects) node_effects,
                           const RenderAttrib *off_clip_planes) {
@@ -98,7 +87,7 @@ apply_transform_and_state(CullTraverser *trav,
         _cull_planes = CullPlanes::make_empty();
 
       } else {
-        CPT(TransformState) inv_transform = 
+        CPT(TransformState) inv_transform =
           node_transform->invert_compose(TransformState::make_identity());
 
         // Copy the bounding volumes for the frustums so we can
@@ -116,7 +105,7 @@ apply_transform_and_state(CullTraverser *trav,
   _state = _state->compose(node_state);
 
   if (clip_plane_cull) {
-    _cull_planes = _cull_planes->apply_state(trav, this, 
+    _cull_planes = _cull_planes->apply_state(trav, this,
                                              DCAST(ClipPlaneAttrib, node_state->get_attrib(ClipPlaneAttrib::get_class_slot())),
                                              DCAST(ClipPlaneAttrib, off_clip_planes),
                                              DCAST(OccluderEffect, node_effects->get_effect(OccluderEffect::get_class_type())));
@@ -130,37 +119,40 @@ apply_transform_and_state(CullTraverser *trav,
 ////////////////////////////////////////////////////////////////////
 bool CullTraverserData::
 is_in_view_impl() {
-  CPT(BoundingVolume) node_volume = _node_reader.get_bounds();
-  nassertr(node_volume->is_of_type(GeometricBoundingVolume::get_class_type()), false);
-  const GeometricBoundingVolume *node_gbv =
-    DCAST(GeometricBoundingVolume, node_volume);
+  const GeometricBoundingVolume *node_gbv = NULL;
 
   if (_view_frustum != (GeometricBoundingVolume *)NULL) {
+    DCAST_INTO_R(node_gbv, _node_reader.get_bounds(), false)
+
     int result = _view_frustum->contains(node_gbv);
-    
+
     if (pgraph_cat.is_spam()) {
       pgraph_cat.spam()
         << _node_path << " cull result = " << hex << result << dec << "\n";
     }
-    
+
     if (result == BoundingVolume::IF_no_intersection) {
       // No intersection at all.  Cull.
+#ifdef NDEBUG
+      return false;
+#else
       if (!fake_view_frustum_cull) {
         return false;
       }
-      
+
       // If we have fake view-frustum culling enabled, instead of
       // actually culling an object we simply force it to be drawn in
       // red wireframe.
       _view_frustum = (GeometricBoundingVolume *)NULL;
       CPT(RenderState) fake_state = get_fake_view_frustum_cull_state();
       _state = _state->compose(fake_state);
-      
+#endif
+
     } else if ((result & BoundingVolume::IF_all) != 0) {
       // The node and its descendents are completely enclosed within
       // the frustum.  No need to cull further.
       _view_frustum = (GeometricBoundingVolume *)NULL;
-      
+
     } else {
       // The node is partially, but not completely, within the viewing
       // frustum.
@@ -175,10 +167,14 @@ is_in_view_impl() {
   }
 
   if (!_cull_planes->is_empty()) {
+    if (node_gbv == (const GeometricBoundingVolume *)NULL) {
+      DCAST_INTO_R(node_gbv, _node_reader.get_bounds(), false)
+    }
+
     // Also cull against the current clip planes.
     int result;
     _cull_planes = _cull_planes->do_cull(result, _state, node_gbv);
-    
+
     if (pgraph_cat.is_spam()) {
       pgraph_cat.spam()
         << _node_path << " cull planes cull result = " << hex
@@ -190,23 +186,27 @@ is_in_view_impl() {
       // Even though the node may be partially within the clip planes,
       // do no more culling against them below this node.
       _cull_planes = CullPlanes::make_empty();
-      
+
       if (pgraph_cat.is_spam()) {
         pgraph_cat.spam()
           << _node_path << " is_final, cull planes disabled, state:\n";
         _state->write(pgraph_cat.spam(false), 2);
       }
     }
-    
+
     if (result == BoundingVolume::IF_no_intersection) {
       // No intersection at all.  Cull.
+#ifdef NDEBUG
+      return false;
+#else
       if (!fake_view_frustum_cull) {
         return false;
       }
       _cull_planes = CullPlanes::make_empty();
       CPT(RenderState) fake_state = get_fake_view_frustum_cull_state();
       _state = _state->compose(fake_state);
-      
+#endif
+
     } else if ((result & BoundingVolume::IF_all) != 0) {
       // The node and its descendents are completely in front of all
       // of the clip planes and occluders.  The do_cull() call should
@@ -227,6 +227,9 @@ is_in_view_impl() {
 ////////////////////////////////////////////////////////////////////
 CPT(RenderState) CullTraverserData::
 get_fake_view_frustum_cull_state() {
+#ifdef NDEBUG
+  return NULL;
+#else
   // Once someone asks for this pointer, we hold its reference count
   // and never free it.
   static CPT(RenderState) state = (const RenderState *)NULL;
@@ -238,5 +241,5 @@ get_fake_view_frustum_cull_state() {
        RenderState::get_max_priority());
   }
   return state;
+#endif
 }
-
diff --git a/panda/src/pgraph/cullTraverserData.h b/panda/src/pgraph/cullTraverserData.h
index 1cca501caa..73c1b137c2 100644
--- a/panda/src/pgraph/cullTraverserData.h
+++ b/panda/src/pgraph/cullTraverserData.h
@@ -23,10 +23,10 @@
 #include "geometricBoundingVolume.h"
 #include "pointerTo.h"
 #include "drawMask.h"
-#include "cullTraverser.h"
 #include "pvector.h"
 
 class PandaNode;
+class CullTraverser;
 
 ////////////////////////////////////////////////////////////////////
 //       Class : CullTraverserData
@@ -50,8 +50,8 @@ public:
                            GeometricBoundingVolume *view_frustum,
                            Thread *current_thread);
   INLINE CullTraverserData(const CullTraverserData &copy);
-  INLINE void operator = (const CullTraverserData &copy); 
-  INLINE CullTraverserData(const CullTraverserData &parent, 
+  INLINE void operator = (const CullTraverserData &copy);
+  INLINE CullTraverserData(const CullTraverserData &parent,
                            PandaNode *child);
   INLINE ~CullTraverserData();
 
@@ -63,15 +63,16 @@ public:
   INLINE const PandaNodePipelineReader *node_reader() const;
 
 PUBLISHED:
-  CPT(TransformState) get_modelview_transform(const CullTraverser *trav) const;
+  INLINE CPT(TransformState) get_modelview_transform(const CullTraverser *trav) const;
+  INLINE CPT(TransformState) get_internal_transform(const CullTraverser *trav) const;
   INLINE const TransformState *get_net_transform(const CullTraverser *trav) const;
 
   INLINE bool is_in_view(const DrawMask &camera_mask);
-  INLINE bool is_this_node_hidden(const CullTraverser *trav) const;
+  INLINE bool is_this_node_hidden(const DrawMask &camera_mask) const;
 
   void apply_transform_and_state(CullTraverser *trav);
-  void apply_transform_and_state(CullTraverser *trav, 
-                                 CPT(TransformState) node_transform, 
+  void apply_transform_and_state(CullTraverser *trav,
+                                 CPT(TransformState) node_transform,
                                  CPT(RenderState) node_state,
                                  CPT(RenderEffects) node_effects,
                                  const RenderAttrib *off_clip_planes);
@@ -91,6 +92,8 @@ private:
   static CPT(RenderState) get_fake_view_frustum_cull_state();
 };
 
+#include "cullTraverser.h"
+
 #include "cullTraverserData.I"
 
 #endif
diff --git a/panda/src/pgraph/cullableObject.I b/panda/src/pgraph/cullableObject.I
index a5d7901dce..b2b1a8962a 100644
--- a/panda/src/pgraph/cullableObject.I
+++ b/panda/src/pgraph/cullableObject.I
@@ -12,6 +12,7 @@
 //
 ////////////////////////////////////////////////////////////////////
 
+
 ////////////////////////////////////////////////////////////////////
 //     Function: CullableObject::Constructor
 //       Access: Public
@@ -19,9 +20,7 @@
 //               filled in later.
 ////////////////////////////////////////////////////////////////////
 INLINE CullableObject::
-CullableObject() :
-  _fancy(false)
-{
+CullableObject() {
 #ifdef DO_MEMORY_USAGE
   MemoryUsage::update_type(this, get_class_type());
 #endif
@@ -35,50 +34,20 @@ CullableObject() :
 ////////////////////////////////////////////////////////////////////
 INLINE CullableObject::
 CullableObject(const Geom *geom, const RenderState *state,
-               const TransformState *net_transform,
-               const TransformState *modelview_transform,
-               SceneSetup *scene_setup) :
-  _geom(geom),
-  _state(state),
-  _net_transform(net_transform),
-  _modelview_transform(modelview_transform),
-  _internal_transform(scene_setup->get_cs_transform()->compose(modelview_transform)),
-  _fancy(false)
-{
-#ifdef DO_MEMORY_USAGE
-  MemoryUsage::update_type(this, get_class_type());
-#endif
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: CullableObject::Constructor
-//       Access: Public
-//  Description: Creates a CullableObject based the indicated geom,
-//               with the indicated render state and transform.
-////////////////////////////////////////////////////////////////////
-INLINE CullableObject::
-CullableObject(const Geom *geom, const RenderState *state,
-               const TransformState *net_transform,
-               const TransformState *modelview_transform,
                const TransformState *internal_transform) :
   _geom(geom),
   _state(state),
-  _net_transform(net_transform),
-  _modelview_transform(modelview_transform),
-  _internal_transform(internal_transform),
-  _fancy(false)
+  _internal_transform(internal_transform)
 {
 #ifdef DO_MEMORY_USAGE
   MemoryUsage::update_type(this, get_class_type());
 #endif
 }
-  
 
 ////////////////////////////////////////////////////////////////////
 //     Function: CullableObject::Copy Constructor
 //       Access: Public
-//  Description: Copies the CullableObject, but does not copy its
-//               children (decals).
+//  Description: Copies the CullableObject.
 ////////////////////////////////////////////////////////////////////
 INLINE CullableObject::
 CullableObject(const CullableObject &copy) :
@@ -86,10 +55,7 @@ CullableObject(const CullableObject &copy) :
   _munger(copy._munger),
   _munged_data(copy._munged_data),
   _state(copy._state),
-  _net_transform(copy._net_transform),
-  _modelview_transform(copy._modelview_transform),
-  _internal_transform(copy._internal_transform),
-  _fancy(false)
+  _internal_transform(copy._internal_transform)
 {
 #ifdef DO_MEMORY_USAGE
   MemoryUsage::update_type(this, get_class_type());
@@ -99,42 +65,16 @@ CullableObject(const CullableObject &copy) :
 ////////////////////////////////////////////////////////////////////
 //     Function: CullableObject::Copy Assignment Operator
 //       Access: Public
-//  Description: Copies the CullableObject, but does not copy its
-//               children (decals).
+//  Description: Copies the CullableObject.
 ////////////////////////////////////////////////////////////////////
 INLINE void CullableObject::
 operator = (const CullableObject &copy) {
-  nassertv(!_fancy);
   _geom = copy._geom;
   _munger = copy._munger;
   _munged_data = copy._munged_data;
   _state = copy._state;
-  _net_transform = copy._net_transform;
-  _modelview_transform = copy._modelview_transform;
   _internal_transform = copy._internal_transform;
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: CullableObject::is_fancy
-//       Access: Public
-//  Description: Returns true if the object has something fancy to it:
-//               decals, maybe, or a draw_callback, that prevents it
-//               from being rendered inline.
-////////////////////////////////////////////////////////////////////
-INLINE bool CullableObject::
-is_fancy() const {
-  return _fancy;
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: CullableObject::has_decals
-//       Access: Public
-//  Description: Returns true if the object has decals associated with
-//               it.
-////////////////////////////////////////////////////////////////////
-INLINE bool CullableObject::
-has_decals() const {
-  return _fancy && (_next != (CullableObject *)NULL);
+  _draw_callback = copy._draw_callback;
 }
 
 ////////////////////////////////////////////////////////////////////
@@ -146,8 +86,17 @@ has_decals() const {
 ////////////////////////////////////////////////////////////////////
 INLINE void CullableObject::
 draw(GraphicsStateGuardianBase *gsg, bool force, Thread *current_thread) {
-  if (_fancy) {
-    draw_fancy(gsg, force, current_thread);
+  if (_draw_callback != (CallbackObject *)NULL) {
+    // It has a callback associated.
+    gsg->clear_before_callback();
+    gsg->set_state_and_transform(_state, _internal_transform);
+    GeomDrawCallbackData cbdata(this, gsg, force);
+    _draw_callback->do_callback(&cbdata);
+    if (cbdata.get_lost_state()) {
+      // Tell the GSG to forget its state.
+      gsg->clear_state_and_transform();
+    }
+    // Now the callback has taken care of drawing.
   } else {
     nassertv(_geom != (Geom *)NULL);
     gsg->set_state_and_transform(_state, _internal_transform);
@@ -184,43 +133,7 @@ request_resident() const {
 ////////////////////////////////////////////////////////////////////
 INLINE void CullableObject::
 set_draw_callback(CallbackObject *draw_callback) {
-  make_fancy();
-  if (draw_callback != _draw_callback) {
-    if (_draw_callback != (CallbackObject *)NULL) {
-      unref_delete(_draw_callback);
-    }
-    _draw_callback = draw_callback;
-    if (_draw_callback != (CallbackObject *)NULL) {
-      _draw_callback->ref();
-    }
-  }
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: CullableObject::set_next
-//       Access: Public
-//  Description: Sets the next object in the decal chain.  This next
-//               object will be destructed when this object destructs.
-////////////////////////////////////////////////////////////////////
-INLINE void CullableObject::
-set_next(CullableObject *next) {
-  make_fancy();
-  nassertv(_next == (CullableObject *)NULL);
-  _next = next;
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: CullableObject::get_next
-//       Access: Public
-//  Description: Returns the next object in the decal chain, or NULL
-//               for the end of the chain.
-////////////////////////////////////////////////////////////////////
-INLINE CullableObject *CullableObject::
-get_next() const {
-  if (_fancy) {
-    return _next;
-  }
-  return NULL;
+  _draw_callback = draw_callback;
 }
 
 ////////////////////////////////////////////////////////////////////
@@ -233,23 +146,6 @@ flush_level() {
   _sw_sprites_pcollector.flush_level();
 }
 
-////////////////////////////////////////////////////////////////////
-//     Function: CullableObject::make_fancy
-//       Access: Private
-//  Description: Elevates this object to "fancy" status.  This means
-//               that the additional pointers, like _next and
-//               _draw_callback, have meaningful values and should be
-//               examined.
-////////////////////////////////////////////////////////////////////
-INLINE void CullableObject::
-make_fancy() {
-  if (!_fancy) {
-    _fancy = true;
-    _draw_callback = NULL;
-    _next = NULL;
-  }
-}
-
 ////////////////////////////////////////////////////////////////////
 //     Function: CullableObject::draw_inline
 //       Access: Private
@@ -266,7 +162,7 @@ draw_inline(GraphicsStateGuardianBase *gsg, bool force, Thread *current_thread)
 ////////////////////////////////////////////////////////////////////
 //     Function: CullableObject::SortPoints::Constructor
 //       Access: Public
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 INLINE CullableObject::SortPoints::
 SortPoints(const CullableObject::PointData *array) :
@@ -288,7 +184,7 @@ operator () (unsigned short a, unsigned short b) const {
 ////////////////////////////////////////////////////////////////////
 //     Function: CullableObject::SourceFormat::operator <
 //       Access: Public
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 INLINE bool CullableObject::SourceFormat::
 operator < (const CullableObject::SourceFormat &other) const {
diff --git a/panda/src/pgraph/cullableObject.cxx b/panda/src/pgraph/cullableObject.cxx
index b76fc6b445..14a6bad1d0 100644
--- a/panda/src/pgraph/cullableObject.cxx
+++ b/panda/src/pgraph/cullableObject.cxx
@@ -30,7 +30,6 @@
 #include "geomTriangles.h"
 #include "light.h"
 #include "lightMutexHolder.h"
-#include "geomDrawCallbackData.h"
 
 CullableObject::FormatMap CullableObject::_format_map;
 LightMutex CullableObject::_format_lock;
@@ -39,7 +38,6 @@ PStatCollector CullableObject::_munge_geom_pcollector("*:Munge:Geom");
 PStatCollector CullableObject::_munge_sprites_pcollector("*:Munge:Sprites");
 PStatCollector CullableObject::_munge_sprites_verts_pcollector("*:Munge:Sprites:Verts");
 PStatCollector CullableObject::_munge_sprites_prims_pcollector("*:Munge:Sprites:Prims");
-PStatCollector CullableObject::_munge_light_vector_pcollector("*:Munge:Light Vector");
 PStatCollector CullableObject::_sw_sprites_pcollector("SW Sprites");
 
 TypeHandle CullableObject::_type_handle;
@@ -81,7 +79,7 @@ munge_geom(GraphicsStateGuardianBase *gsg,
 
       geom_rendering = geom_reader.get_geom_rendering();
       geom_rendering = _state->get_geom_rendering(geom_rendering);
-      geom_rendering = _modelview_transform->get_geom_rendering(geom_rendering);
+      geom_rendering = _internal_transform->get_geom_rendering(geom_rendering);
 
       if (geom_rendering & Geom::GR_point_bits) {
         if (geom_reader.get_primitive_type() != Geom::PT_points) {
@@ -124,23 +122,6 @@ munge_geom(GraphicsStateGuardianBase *gsg,
       }
     }
 
-    bool cpu_animated = false;
-
-    if (unsupported_bits & Geom::GR_texcoord_light_vector) {
-      // If we have to compute the light vector, we have to animate
-      // the vertices in the CPU--and we have to do it before we call
-      // munge_geom(), which might lose the tangent and binormal.
-      CPT(GeomVertexData) animated_vertices =
-        _munged_data->animate_vertices(force, current_thread);
-      if (animated_vertices != _munged_data) {
-        cpu_animated = true;
-        _munged_data = animated_vertices;
-      }
-      if (!munge_texcoord_light_vector(traverser, force)) {
-        return false;
-      }
-    }
-
     // Now invoke the munger to ensure the resulting geometry is in
     // a GSG-friendly form.
     if (!munger->munge_geom(_geom, _munged_data, force, current_thread)) {
@@ -151,17 +132,17 @@ munge_geom(GraphicsStateGuardianBase *gsg,
     DCAST_INTO_R(state_munger, munger, false);
     _state = state_munger->munge_state(_state);
 
-    if (!cpu_animated) {
-      // If there is any animation left in the vertex data after it
-      // has been munged--that is, we couldn't arrange to handle the
-      // animation in hardware--then we have to calculate that
-      // animation now.
-      CPT(GeomVertexData) animated_vertices =
-        _munged_data->animate_vertices(force, current_thread);
-      if (animated_vertices != _munged_data) {
-        cpu_animated = true;
-        _munged_data = animated_vertices;
-      }
+    // If there is any animation left in the vertex data after it
+    // has been munged--that is, we couldn't arrange to handle the
+    // animation in hardware--then we have to calculate that
+    // animation now.
+    bool cpu_animated = false;
+
+    CPT(GeomVertexData) animated_vertices =
+      _munged_data->animate_vertices(force, current_thread);
+    if (animated_vertices != _munged_data) {
+      cpu_animated = true;
+      swap(_munged_data, animated_vertices);
     }
 
 #ifndef NDEBUG
@@ -180,41 +161,13 @@ munge_geom(GraphicsStateGuardianBase *gsg,
 #endif
   }
 
-  if (_fancy) {
-    // Only check the _next pointer if the _fancy flag is set.
-    if (_next != (CullableObject *)NULL) {
-      if (_next->_state != (RenderState *)NULL) {
-        _next->munge_geom(gsg, gsg->get_geom_munger(_next->_state, current_thread),
-                          traverser, force);
-      } else {
-        _next->munge_geom(gsg, munger, traverser, force);
-      }
-    }
-  }
-
   return true;
 }
 
-////////////////////////////////////////////////////////////////////
-//     Function: CullableObject::Destructor
-//       Access: Public
-//  Description: Automatically deletes the whole chain of these things.
-////////////////////////////////////////////////////////////////////
-CullableObject::
-~CullableObject() {
-  if (_fancy) {
-    // Only check the _next pointer if the _fancy flag is set.
-    if (_next != (CullableObject *)NULL) {
-      delete _next;
-    }
-    set_draw_callback(NULL);
-  }
-}
-
 ////////////////////////////////////////////////////////////////////
 //     Function: CullableObject::output
 //       Access: Public
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 void CullableObject::
 output(ostream &out) const {
@@ -225,7 +178,6 @@ output(ostream &out) const {
   }
 }
 
-
 ////////////////////////////////////////////////////////////////////
 //     Function: CullableObject::munge_points_to_quads
 //       Access: Private
@@ -285,7 +237,7 @@ munge_points_to_quads(const CullTraverser *traverser, bool force) {
     }
   }
 
-  PN_stdfloat point_size = 1.0f;
+  PN_stdfloat point_size = 1;
   bool perspective = false;
   const RenderModeAttrib *render_mode = DCAST(RenderModeAttrib, _state->get_attrib(RenderModeAttrib::get_class_slot()));
   if (render_mode != (RenderModeAttrib *)NULL) {
@@ -357,11 +309,15 @@ munge_points_to_quads(const CullTraverser *traverser, bool force) {
     }
   }
 
-  const LMatrix4 &modelview = _modelview_transform->get_mat();
+  CoordinateSystem internal_cs = gsg->get_internal_coordinate_system();
+  LMatrix4 internal = _internal_transform->get_mat();
+  PN_stdfloat scale = _internal_transform->get_scale()[1];
 
   SceneSetup *scene = traverser->get_scene();
   const Lens *lens = scene->get_lens();
-  const LMatrix4 &projection = lens->get_projection_mat();
+  LMatrix4 projection =
+    LMatrix4::convert_mat(internal_cs, lens->get_coordinate_system()) *
+                                       lens->get_projection_mat();
 
   int viewport_width = scene->get_viewport_width();
   int viewport_height = scene->get_viewport_height();
@@ -372,10 +328,10 @@ munge_points_to_quads(const CullTraverser *traverser, bool force) {
   if (perspective) {
     height_projection =
       LMatrix4::convert_mat(CS_yup_right, lens->get_coordinate_system()) *
-      projection;
+                                          lens->get_projection_mat();
   }
 
-  LMatrix4 render_transform = modelview * projection;
+  LMatrix4 render_transform = internal * projection;
   LMatrix4 inv_render_transform;
   inv_render_transform.invert_from(render_transform);
 
@@ -405,15 +361,15 @@ munge_points_to_quads(const CullTraverser *traverser, bool force) {
     int vi = 0;
     while (!vertex.is_at_end()) {
       // Get the point in eye-space coordinates.
-      LPoint3 eye = modelview.xform_point(vertex.get_data3());
-      points[vi]._eye = eye;
-      points[vi]._dist = gsg->compute_distance_to(points[vi]._eye);
+      LPoint3 eye = internal.xform_point(vertex.get_data3());
+      PN_stdfloat dist = gsg->compute_distance_to(eye);
+      points[vi]._dist = dist;
 
       // The point in clip coordinates.
       LPoint4 p4 = LPoint4(eye[0], eye[1], eye[2], 1.0f) * projection;
 
       if (has_size) {
-        point_size = size.get_data1f();
+        point_size = size.get_data1();
       }
 
       PN_stdfloat scale_y = point_size;
@@ -422,7 +378,6 @@ munge_points_to_quads(const CullTraverser *traverser, bool force) {
         // height in 3-d units.  To arrange that, we need to figure out
         // the appropriate scaling factor based on the current viewport
         // and projection matrix.
-        PN_stdfloat scale = _modelview_transform->get_scale()[1];
         LVector3 height(0.0f, point_size * scale, scale);
         height = height * height_projection;
         scale_y = height[1] * viewport_height;
@@ -430,7 +385,7 @@ munge_points_to_quads(const CullTraverser *traverser, bool force) {
         // We should then divide the radius by the distance from the
         // camera plane, to emulate the glPointParameters() behavior.
         if (!lens->is_orthographic()) {
-          scale_y /= gsg->compute_distance_to(eye);
+          scale_y /= dist;
         }
       }
 
@@ -440,7 +395,7 @@ munge_points_to_quads(const CullTraverser *traverser, bool force) {
 
       PN_stdfloat scale_x = scale_y;
       if (has_aspect_ratio) {
-        scale_x *= aspect_ratio.get_data1f();
+        scale_x *= aspect_ratio.get_data1();
       }
 
       // Define the first two corners based on the scales in X and Y.
@@ -449,7 +404,7 @@ munge_points_to_quads(const CullTraverser *traverser, bool force) {
 
       if (has_rotate) {
         // If we have a rotate factor, apply it to those two corners.
-        PN_stdfloat r = rotate.get_data1f();
+        PN_stdfloat r = rotate.get_data1();
         LMatrix3 mat = LMatrix3::rotate_mat(r);
         c0 = c0 * mat;
         c1 = c1 * mat;
@@ -522,11 +477,9 @@ munge_points_to_quads(const CullTraverser *traverser, bool force) {
   }
 
   // Determine the format we should use to store the indices.
+  // Don't choose NT_uint8, as Direct3D 9 doesn't support it.
   const GeomVertexArrayFormat *new_prim_format = NULL;
-  if (new_verts < 0xff) {
-    new_prim_format = GeomPrimitive::get_index_format(GeomEnums::NT_uint8);
-
-  } else if (new_verts < 0xffff) {
+  if (new_verts < 0xffff) {
     new_prim_format = GeomPrimitive::get_index_format(GeomEnums::NT_uint16);
 
   } else {
@@ -619,110 +572,12 @@ munge_points_to_quads(const CullTraverser *traverser, bool force) {
   }
 
   _geom = new_geom.p();
+
+#ifdef USE_MOVE_SEMANTICS
+  _munged_data = move(new_data);
+#else
   _munged_data = new_data;
-
-  return true;
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: CullableObject::munge_texcoord_light_vector
-//       Access: Private
-//  Description: Generates the vector from each vertex to the
-//               indicated light as a 3-d texture coordinate.
-//
-//               This may replace _geom, _munged_data, and _state.
-////////////////////////////////////////////////////////////////////
-bool CullableObject::
-munge_texcoord_light_vector(const CullTraverser *traverser, bool force) {
-  Thread *current_thread = traverser->get_current_thread();
-  PStatTimer timer(_munge_light_vector_pcollector, current_thread);
-
-  if (_net_transform->is_singular()) {
-    // If we're under a singular transform, never mind.
-    return true;
-  }
-
-  if (!_munged_data->has_column(InternalName::get_vertex()) || 
-      !_munged_data->has_column(InternalName::get_normal())) {
-    // No vertex or normal; can't compute light vector.
-    return true;
-  }
-
-  CPT(TexGenAttrib) tex_gen = DCAST(TexGenAttrib, _state->get_attrib(TexGenAttrib::get_class_slot()));
-  nassertr(tex_gen != (TexGenAttrib *)NULL, false);
-
-  const TexGenAttrib::LightVectors &light_vectors = tex_gen->get_light_vectors();
-  TexGenAttrib::LightVectors::const_iterator lvi;
-  for (lvi = light_vectors.begin();
-       lvi != light_vectors.end();
-       ++lvi) {
-    TextureStage *stage = (*lvi);
-    NodePath light = tex_gen->get_light(stage);
-    if (light.is_empty()) {
-      // If a particular light isn't specified in the TexGenAttrib,
-      // use the most important light in the current state.
-      CPT(RenderAttrib) attrib = _state->get_attrib(LightAttrib::get_class_slot());
-      if (attrib != (RenderAttrib *)NULL) {
-        CPT(LightAttrib) la = DCAST(LightAttrib, attrib);
-        light = la->get_most_important_light();
-      }
-    }
-    if (!light.is_empty()) {
-      string source_name = tex_gen->get_source_name(stage);
-      Light *light_obj = light.node()->as_light();
-      nassertr(light_obj != (Light *)NULL, false);
-
-      // Determine the names of the tangent and binormal columns
-      // associated with the stage's texcoord name.
-      PT(InternalName) tangent_name = InternalName::get_tangent_name(source_name);
-      PT(InternalName) binormal_name = InternalName::get_binormal_name(source_name);
-
-      PT(InternalName) texcoord_name = stage->get_texcoord_name();
-
-      if (_munged_data->has_column(tangent_name) &&
-          _munged_data->has_column(binormal_name)) {
-
-        if (!force && !_munged_data->request_resident()) {
-          // The data isn't resident; give up.
-          return false;
-        }
-
-        // Create a new column for the new texcoords.
-        PT(GeomVertexData) new_data = _munged_data->replace_column
-          (texcoord_name, 3, Geom::NT_stdfloat, Geom::C_texcoord);
-        _munged_data = new_data;
-
-        // Remove this TexGen stage from the state, since we're handling
-        // it now.
-        _state = _state->add_attrib(tex_gen->remove_stage(stage));
-
-        // Get the transform from the light to the object.
-        CPT(TransformState) light_transform =
-          _net_transform->invert_compose(light.get_net_transform());
-        const LMatrix4 &light_mat = light_transform->get_mat();
-
-        GeomVertexWriter texcoord(new_data, texcoord_name, current_thread);
-        GeomVertexReader vertex(new_data, InternalName::get_vertex(),
-                                current_thread);
-        GeomVertexReader tangent(new_data, tangent_name, current_thread);
-        GeomVertexReader binormal(new_data, binormal_name, current_thread);
-        GeomVertexReader normal(new_data, InternalName::get_normal(),
-                                current_thread);
-
-        while (!vertex.is_at_end()) {
-          LPoint3 p = vertex.get_data3();
-          LVector3 t = tangent.get_data3();
-          LVector3 b = binormal.get_data3();
-          LVector3 n = normal.get_data3();
-
-          LVector3 lv;
-          if (light_obj->get_vector_to_light(lv, p, light_mat)) {
-            texcoord.add_data3(lv.dot(t), lv.dot(b), lv.dot(n));
-          }
-        }
-      }
-    }
-  }
+#endif
 
   return true;
 }
@@ -775,97 +630,15 @@ get_flash_hardware_state() {
   return flash_hardware_state;
 }
 
-////////////////////////////////////////////////////////////////////
-//     Function: CullableObject::draw_fancy
-//       Access: Private
-//  Description: Something fancy about this object.  Draw it properly.
-////////////////////////////////////////////////////////////////////
-void CullableObject::
-draw_fancy(GraphicsStateGuardianBase *gsg, bool force, 
-           Thread *current_thread) {
-  nassertv(_fancy);
-  if (_draw_callback != (CallbackObject *)NULL) {
-    // It has a callback associated.
-    gsg->clear_before_callback();
-    gsg->set_state_and_transform(_state, _internal_transform);
-    GeomDrawCallbackData cbdata(this, gsg, force);
-    _draw_callback->do_callback(&cbdata);
-    if (cbdata.get_lost_state()) {
-      // Tell the GSG to forget its state.
-      gsg->clear_state_and_transform();
-    }
-    // Now the callback has taken care of drawing.
-
-  } else if (_next != (CullableObject *)NULL) {
-    // It has decals.
-    draw_with_decals(gsg, force, current_thread);
-
-  } else {
-    // Huh, nothing fancy after all.  Somehow the _fancy flag got set
-    // incorrectly; that's a bug.
-    gsg->set_state_and_transform(_state, _internal_transform);
-    draw_inline(gsg, force, current_thread);
-    nassertv(false);
-  }
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: CullableObject::draw_with_decals
-//       Access: Private
-//  Description: Draws the current CullableObject, assuming it has
-//               attached decals.
-////////////////////////////////////////////////////////////////////
-void CullableObject::
-draw_with_decals(GraphicsStateGuardianBase *gsg, bool force, 
-                 Thread *current_thread) {
-  nassertv(_fancy && _next != (CullableObject *)NULL);  
-  // We draw with a three-step process.
-
-  // First, render all of the base geometry for the first pass.
-  CPT(RenderState) state = gsg->begin_decal_base_first();
-
-  CullableObject *base = this;
-  while (base != (CullableObject *)NULL && base->_geom != (Geom *)NULL) {
-    gsg->set_state_and_transform(base->_state->compose(state), base->_internal_transform);
-    base->draw_inline(gsg, force, current_thread);
-    
-    base = base->_next;
-  }
-
-  if (base != (CullableObject *)NULL) {
-    // Now, draw all the decals.
-    state = gsg->begin_decal_nested();
-
-    CullableObject *decal = base->_next;
-    while (decal != (CullableObject *)NULL) {
-      gsg->set_state_and_transform(decal->_state->compose(state), decal->_internal_transform);
-      decal->draw_inline(gsg, force, current_thread);
-      decal = decal->_next;
-    }
-  }
-
-  // And now, re-draw the base geometry, if required.
-  state = gsg->begin_decal_base_second();
-  if (state != (const RenderState *)NULL) {
-    base = this;
-    while (base != (CullableObject *)NULL && base->_geom != (Geom *)NULL) {
-      gsg->set_state_and_transform(base->_state->compose(state), base->_internal_transform);
-      base->draw_inline(gsg, force, current_thread);
-      
-      base = base->_next;
-    }
-  }
-}
-
 ////////////////////////////////////////////////////////////////////
 //     Function: CullableObject::SourceFormat::Constructor
 //       Access: Public
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 CullableObject::SourceFormat::
 SourceFormat(const GeomVertexFormat *format, bool sprite_texcoord) :
   _format(format),
-  _sprite_texcoord(sprite_texcoord) 
+  _sprite_texcoord(sprite_texcoord)
 {
   _retransform_sprites = retransform_sprites;
 }
diff --git a/panda/src/pgraph/cullableObject.h b/panda/src/pgraph/cullableObject.h
index 19a8731aca..575ae4c35f 100644
--- a/panda/src/pgraph/cullableObject.h
+++ b/panda/src/pgraph/cullableObject.h
@@ -32,17 +32,17 @@
 #include "sceneSetup.h"
 #include "lightMutex.h"
 #include "callbackObject.h"
+#include "geomDrawCallbackData.h"
 
 class CullTraverser;
 
 ////////////////////////////////////////////////////////////////////
 //       Class : CullableObject
 // Description : The smallest atom of cull.  This is normally just a
-//               Geom and its associated state, but it also represent
-//               a number of Geoms to be drawn together, with a number
-//               of Geoms decalled onto them.
+//               Geom and its associated state, but it also contain
+//               a draw callback.
 ////////////////////////////////////////////////////////////////////
-class EXPCL_PANDA_PGRAPH CullableObject 
+class EXPCL_PANDA_PGRAPH CullableObject
 #ifdef DO_MEMORY_USAGE
   : public ReferenceCount   // We inherit from ReferenceCount just to get the memory type tracking that MemoryUsage provides.
 #endif  // DO_MEMORY_USAGE
@@ -50,20 +50,11 @@ class EXPCL_PANDA_PGRAPH CullableObject
 public:
   INLINE CullableObject();
   INLINE CullableObject(const Geom *geom, const RenderState *state,
-                        const TransformState *net_transform,
-                        const TransformState *modelview_transform,
-                        SceneSetup *scene_setup);
-  INLINE CullableObject(const Geom *geom, const RenderState *state,
-                        const TransformState *net_transform,
-                        const TransformState *modelview_transform,
                         const TransformState *internal_transform);
-    
+
   INLINE CullableObject(const CullableObject &copy);
   INLINE void operator = (const CullableObject &copy);
 
-  INLINE bool is_fancy() const;
-  INLINE bool has_decals() const;
-
   bool munge_geom(GraphicsStateGuardianBase *gsg,
                   GeomMunger *munger, const CullTraverser *traverser,
                   bool force);
@@ -74,11 +65,8 @@ public:
   INLINE static void flush_level();
 
   INLINE void set_draw_callback(CallbackObject *draw_callback);
-  INLINE void set_next(CullableObject *next);
-  INLINE CullableObject *get_next() const;
 
 public:
-  ~CullableObject();
   ALLOC_DELETED_CHAIN(CullableObject);
 
   void output(ostream &out) const;
@@ -88,38 +76,22 @@ public:
   PT(GeomMunger) _munger;
   CPT(GeomVertexData) _munged_data;
   CPT(RenderState) _state;
-  CPT(TransformState) _net_transform;
-  CPT(TransformState) _modelview_transform;
   CPT(TransformState) _internal_transform;
+  PT(CallbackObject) _draw_callback;
 
 private:
-  bool _fancy;
-
-  // Fancy things below.  These pointers are only meaningful if
-  // _fancy, above, is true.
-  CallbackObject *_draw_callback;
-  CullableObject *_next;  // for decals
-
-private:
-  INLINE void make_fancy();
   bool munge_points_to_quads(const CullTraverser *traverser, bool force);
-  bool munge_texcoord_light_vector(const CullTraverser *traverser, bool force);
 
   static CPT(RenderState) get_flash_cpu_state();
   static CPT(RenderState) get_flash_hardware_state();
 
   INLINE void draw_inline(GraphicsStateGuardianBase *gsg,
                           bool force, Thread *current_thread);
-  void draw_fancy(GraphicsStateGuardianBase *gsg, bool force, 
-                  Thread *current_thread);
-  void draw_with_decals(GraphicsStateGuardianBase *gsg, bool force, 
-                        Thread *current_thread);
 
 private:
   // This class is used internally by munge_points_to_quads().
   class PointData {
   public:
-    LPoint3 _eye;
     PN_stdfloat _dist;
   };
   class SortPoints {
@@ -148,7 +120,6 @@ private:
   static PStatCollector _munge_sprites_pcollector;
   static PStatCollector _munge_sprites_verts_pcollector;
   static PStatCollector _munge_sprites_prims_pcollector;
-  static PStatCollector _munge_light_vector_pcollector;
   static PStatCollector _sw_sprites_pcollector;
 
 public:
diff --git a/panda/src/pgraph/eventStorePandaNode.I b/panda/src/pgraph/eventStorePandaNode.I
deleted file mode 100644
index d2b2db4ada..0000000000
--- a/panda/src/pgraph/eventStorePandaNode.I
+++ /dev/null
@@ -1,48 +0,0 @@
-// Filename: eventStorePandaNode.I
-// Created by:  drose (13Sep06)
-//
-////////////////////////////////////////////////////////////////////
-//
-// 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."
-//
-////////////////////////////////////////////////////////////////////
-
-
-////////////////////////////////////////////////////////////////////
-//     Function: EventStorePandaNode::Constructor
-//       Access: Published
-//  Description: 
-////////////////////////////////////////////////////////////////////
-INLINE EventStorePandaNode::
-EventStorePandaNode(const PandaNode *value) : 
-  _value((PandaNode *)value) 
-{
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: EventStorePandaNode::set_value
-//       Access: Published
-//  Description: Changes the value stored in the parameter.  It is
-//               dangerous to do this for a parameter already added to
-//               an event, since the parameters may be shared.
-////////////////////////////////////////////////////////////////////
-INLINE void EventStorePandaNode::
-set_value(const PandaNode *value) {
-  _value = (PandaNode *)value;
-}
-
-
-////////////////////////////////////////////////////////////////////
-//     Function: EventStorePandaNode::get_value
-//       Access: Published
-//  Description: Retrieves the value stored in the parameter.
-////////////////////////////////////////////////////////////////////
-INLINE PandaNode *EventStorePandaNode::
-get_value() const {
-  return _value;
-}
diff --git a/panda/src/pgraph/eventStorePandaNode.cxx b/panda/src/pgraph/eventStorePandaNode.cxx
deleted file mode 100644
index 0bd66804ea..0000000000
--- a/panda/src/pgraph/eventStorePandaNode.cxx
+++ /dev/null
@@ -1,41 +0,0 @@
-// Filename: eventStorePandaNode.cxx
-// Created by:  drose (13Sep06)
-//
-////////////////////////////////////////////////////////////////////
-//
-// 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 "eventStorePandaNode.h"
-
-TypeHandle EventStorePandaNode::_type_handle;
-
-////////////////////////////////////////////////////////////////////
-//     Function: EventStorePandaNode::Destructor
-//       Access: Published, Virtual
-//  Description: 
-////////////////////////////////////////////////////////////////////
-EventStorePandaNode::
-~EventStorePandaNode() {
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: EventStorePandaNode::output
-//       Access: Published, Virtual
-//  Description: 
-////////////////////////////////////////////////////////////////////
-void EventStorePandaNode::
-output(ostream &out) const {
-  if (_value == (PandaNode *)NULL) {
-    out << "(empty)";
-
-  } else {
-    out << *_value;
-  }
-}
diff --git a/panda/src/pgraph/eventStorePandaNode.h b/panda/src/pgraph/eventStorePandaNode.h
deleted file mode 100644
index b71636c79c..0000000000
--- a/panda/src/pgraph/eventStorePandaNode.h
+++ /dev/null
@@ -1,60 +0,0 @@
-// Filename: eventStorePandaNode.h
-// Created by:  drose (13Sep06)
-//
-////////////////////////////////////////////////////////////////////
-//
-// 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 EVENTSTOREPANDANODE_H
-#define EVENTSTOREPANDANODE_H
-
-#include "pandabase.h"
-#include "eventParameter.h"
-#include "pandaNode.h"
-
-////////////////////////////////////////////////////////////////////
-//       Class : EventStorePandaNode
-// Description : A class object for storing specifically objects of
-//               type PandaNode.
-////////////////////////////////////////////////////////////////////
-class EXPCL_PANDA_PGRAPH EventStorePandaNode : public ParamValueBase {
-PUBLISHED:
-  INLINE EventStorePandaNode(const PandaNode *value);
-  virtual ~EventStorePandaNode();
-
-  INLINE void set_value(const PandaNode *value);
-  INLINE PandaNode *get_value() const;
-
-  virtual void output(ostream &out) const;
-
-public:
-  PT(PandaNode) _value;
-
-public:
-  virtual TypeHandle get_type() const {
-    return get_class_type();
-  }
-  virtual TypeHandle force_init_type() {init_type(); return get_class_type();}
-  static TypeHandle get_class_type() {
-    return _type_handle;
-  }
-  static void init_type() {
-    ParamValueBase::init_type();
-    register_type(_type_handle, "EventStorePandaNode",
-                  ParamValueBase::get_class_type());
-  }
-
-private:
-  static TypeHandle _type_handle;
-};
-
-#include "eventStorePandaNode.I"
-
-#endif
diff --git a/panda/src/pgraph/geomNode.I b/panda/src/pgraph/geomNode.I
index 8173ce50ef..cd9a72084b 100644
--- a/panda/src/pgraph/geomNode.I
+++ b/panda/src/pgraph/geomNode.I
@@ -320,6 +320,29 @@ operator = (const GeomNode::Geoms &copy) {
   _geoms = copy._geoms;
 }
 
+#ifdef USE_MOVE_SEMANTICS
+////////////////////////////////////////////////////////////////////
+//     Function: GeomNode::Geoms::Move Constructor
+//       Access: Public
+//  Description:
+////////////////////////////////////////////////////////////////////
+INLINE GeomNode::Geoms::
+Geoms(GeomNode::Geoms &&from) NOEXCEPT :
+  _geoms(move(from._geoms))
+{
+}
+
+////////////////////////////////////////////////////////////////////
+//     Function: GeomNode::Geoms::Move Assignment Operator
+//       Access: Public
+//  Description:
+////////////////////////////////////////////////////////////////////
+INLINE void GeomNode::Geoms::
+operator = (GeomNode::Geoms &&from) NOEXCEPT {
+  _geoms = move(from._geoms);
+}
+#endif  // USE_MOVE_SEMANTICS
+
 ////////////////////////////////////////////////////////////////////
 //     Function: GeomNode::Geoms::get_num_geoms
 //       Access: Public
diff --git a/panda/src/pgraph/geomNode.cxx b/panda/src/pgraph/geomNode.cxx
index d8101fc778..db7bdd42dd 100644
--- a/panda/src/pgraph/geomNode.cxx
+++ b/panda/src/pgraph/geomNode.cxx
@@ -562,9 +562,7 @@ add_for_draw(CullTraverser *trav, CullTraverserData &data) {
   Geoms geoms = get_geoms(trav->get_current_thread());
   int num_geoms = geoms.get_num_geoms();
   trav->_geoms_pcollector.add_level(num_geoms);
-  CPT(TransformState) net_transform = data.get_net_transform(trav);
-  CPT(TransformState) modelview_transform = data.get_modelview_transform(trav);
-  CPT(TransformState) internal_transform = trav->get_scene()->get_cs_transform()->compose(modelview_transform);
+  CPT(TransformState) internal_transform = data.get_internal_transform(trav);
 
   for (int i = 0; i < num_geoms; i++) {
     const Geom *geom = geoms.get_geom(i);
@@ -611,8 +609,7 @@ add_for_draw(CullTraverser *trav, CullTraverserData &data) {
     }
 
     CullableObject *object =
-      new CullableObject(geom, state, net_transform,
-                         modelview_transform, internal_transform);
+      new CullableObject(geom, state, internal_transform);
     trav->get_cull_handler()->record_object(object, trav);
   }
 }
diff --git a/panda/src/pgraph/geomNode.h b/panda/src/pgraph/geomNode.h
index ffedec99c2..285783df99 100644
--- a/panda/src/pgraph/geomNode.h
+++ b/panda/src/pgraph/geomNode.h
@@ -73,6 +73,7 @@ PUBLISHED:
   INLINE CPT(Geom) get_geom(int n) const;
   MAKE_SEQ(get_geoms, get_num_geoms, get_geom);
   INLINE PT(Geom) modify_geom(int n);
+  MAKE_SEQ(modify_geoms, get_num_geoms, modify_geom);
   INLINE const RenderState *get_geom_state(int n) const;
   MAKE_SEQ(get_geom_states, get_num_geoms, get_geom_state);
   INLINE void set_geom_state(int n, const RenderState *state);
@@ -168,6 +169,11 @@ public:
     INLINE Geoms(const Geoms &copy);
     INLINE void operator = (const Geoms &copy);
 
+#ifdef USE_MOVE_SEMANTICS
+    INLINE Geoms(Geoms &&from) NOEXCEPT;
+    INLINE void operator = (Geoms &&from) NOEXCEPT;
+#endif
+
     INLINE int get_num_geoms() const;
     INLINE CPT(Geom) get_geom(int n) const;
     INLINE const RenderState *get_geom_state(int n) const;
diff --git a/panda/src/pgraph/internalNameCollection.cxx b/panda/src/pgraph/internalNameCollection.cxx
index fd4bd74395..f5242e7b21 100644
--- a/panda/src/pgraph/internalNameCollection.cxx
+++ b/panda/src/pgraph/internalNameCollection.cxx
@@ -52,7 +52,7 @@ operator = (const InternalNameCollection &copy) {
 //  Description: Adds a new InternalName to the collection.
 ////////////////////////////////////////////////////////////////////
 void InternalNameCollection::
-add_name(InternalName *name) {
+add_name(const InternalName *name) {
   // If the pointer to our internal array is shared by any other
   // InternalNameCollections, we have to copy the array now so we won't
   // inadvertently modify any of our brethren InternalNameCollection
@@ -75,7 +75,7 @@ add_name(InternalName *name) {
 //               not a member of the collection.
 ////////////////////////////////////////////////////////////////////
 bool InternalNameCollection::
-remove_name(InternalName *name) {
+remove_name(const InternalName *name) {
   int name_index = -1;
   for (int i = 0; name_index == -1 && i < (int)_names.size(); i++) {
     if (_names[i] == name) {
@@ -131,7 +131,7 @@ remove_names_from(const InternalNameCollection &other) {
   InternalNames new_names;
   int num_names = get_num_names();
   for (int i = 0; i < num_names; i++) {
-    PT(InternalName) name = get_name(i);
+    const InternalName *name = get_name(i);
     if (!other.has_name(name)) {
       new_names.push_back(name);
     }
@@ -153,7 +153,7 @@ remove_duplicate_names() {
 
   int num_names = get_num_names();
   for (int i = 0; i < num_names; i++) {
-    PT(InternalName) name = get_name(i);
+    const InternalName *name = get_name(i);
     bool duplicated = false;
 
     for (int j = 0; j < i && !duplicated; j++) {
@@ -175,7 +175,7 @@ remove_duplicate_names() {
 //               this collection, false otherwise.
 ////////////////////////////////////////////////////////////////////
 bool InternalNameCollection::
-has_name(InternalName *name) const {
+has_name(const InternalName *name) const {
   for (int i = 0; i < get_num_names(); i++) {
     if (name == get_name(i)) {
       return true;
@@ -209,7 +209,7 @@ get_num_names() const {
 //       Access: Published
 //  Description: Returns the nth InternalName in the collection.
 ////////////////////////////////////////////////////////////////////
-InternalName *InternalNameCollection::
+const InternalName *InternalNameCollection::
 get_name(int index) const {
   nassertr(index >= 0 && index < (int)_names.size(), NULL);
 
@@ -223,7 +223,7 @@ get_name(int index) const {
 //               the same as get_name(), but it may be a more
 //               convenient way to access it.
 ////////////////////////////////////////////////////////////////////
-InternalName *InternalNameCollection::
+const InternalName *InternalNameCollection::
 operator [] (int index) const {
   nassertr(index >= 0 && index < (int)_names.size(), NULL);
 
diff --git a/panda/src/pgraph/internalNameCollection.h b/panda/src/pgraph/internalNameCollection.h
index 48e0cf443f..fbf59b5bbe 100644
--- a/panda/src/pgraph/internalNameCollection.h
+++ b/panda/src/pgraph/internalNameCollection.h
@@ -21,7 +21,7 @@
 
 ////////////////////////////////////////////////////////////////////
 //       Class : InternalNameCollection
-// Description : 
+// Description :
 ////////////////////////////////////////////////////////////////////
 class EXPCL_PANDA_PGRAPH InternalNameCollection {
 PUBLISHED:
@@ -30,18 +30,18 @@ PUBLISHED:
   void operator = (const InternalNameCollection &copy);
   INLINE ~InternalNameCollection();
 
-  void add_name(InternalName *name);
-  bool remove_name(InternalName *name);
+  void add_name(const InternalName *name);
+  bool remove_name(const InternalName *name);
   void add_names_from(const InternalNameCollection &other);
   void remove_names_from(const InternalNameCollection &other);
   void remove_duplicate_names();
-  bool has_name(InternalName *name) const;
+  bool has_name(const InternalName *name) const;
   void clear();
 
   int get_num_names() const;
-  InternalName *get_name(int index) const;
+  const InternalName *get_name(int index) const;
   MAKE_SEQ(get_names, get_num_names, get_name);
-  InternalName *operator [] (int index) const;
+  const InternalName *operator [] (int index) const;
   int size() const;
   INLINE void operator += (const InternalNameCollection &other);
   INLINE InternalNameCollection operator + (const InternalNameCollection &other) const;
@@ -50,7 +50,7 @@ PUBLISHED:
   void write(ostream &out, int indent_level = 0) const;
 
 private:
-  typedef PTA(PT(InternalName)) InternalNames;
+  typedef PTA(CPT(InternalName)) InternalNames;
   InternalNames _names;
 };
 
diff --git a/panda/src/pgraph/light.cxx b/panda/src/pgraph/light.cxx
index 6612fd4364..3d8ae3822a 100644
--- a/panda/src/pgraph/light.cxx
+++ b/panda/src/pgraph/light.cxx
@@ -59,7 +59,7 @@ fillin(DatagramIterator &scan, BamReader *) {
 ////////////////////////////////////////////////////////////////////
 //     Function: Light::Destructor
 //       Access: Published, Virtual
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 Light::
 ~Light() {
@@ -76,6 +76,45 @@ is_ambient_light() const {
   return false;
 }
 
+////////////////////////////////////////////////////////////////////
+//     Function: Light::get_exponent
+//       Access: Public, Virtual
+//  Description: For spotlights, returns the exponent that controls
+//               the amount of light falloff from the center of the
+//               spotlight.  For other kinds of lights, returns 0.
+////////////////////////////////////////////////////////////////////
+PN_stdfloat Light::
+get_exponent() const {
+  return 0;
+}
+
+////////////////////////////////////////////////////////////////////
+//     Function: Light::get_specular_color
+//       Access: Public, Virtual
+//  Description: Returns the color of specular highlights generated
+//               by the light.  This value is meaningless for ambient
+//               lights.
+////////////////////////////////////////////////////////////////////
+const LColor &Light::
+get_specular_color() const {
+  static const LColor white(1, 1, 1, 1);
+  return white;
+}
+
+////////////////////////////////////////////////////////////////////
+//     Function: Light::get_attenuation
+//       Access: Public, Virtual
+//  Description: Returns the terms of the attenuation equation for the
+//               light.  These are, in order, the constant, linear,
+//               and quadratic terms based on the distance from the
+//               point to the vertex.
+////////////////////////////////////////////////////////////////////
+const LVecBase3 &Light::
+get_attenuation() const {
+  static const LVecBase3 no_atten(1, 0, 0);
+  return no_atten;
+}
+
 ////////////////////////////////////////////////////////////////////
 //     Function: Light::get_vector_to_light
 //       Access: Public, Virtual
diff --git a/panda/src/pgraph/light.h b/panda/src/pgraph/light.h
index 074f3a2f46..f6bab991c2 100644
--- a/panda/src/pgraph/light.h
+++ b/panda/src/pgraph/light.h
@@ -39,11 +39,7 @@ class GraphicsStateGuardianBase;
 //               arbitrary point to define the coordinate system of
 //               effect.
 ////////////////////////////////////////////////////////////////////
-class EXPCL_PANDA_PGRAPH Light : virtual public ReferenceCount {
-  // We inherit from ReferenceCount instead of TypedReferenceCount so
-  // that LightNode does not inherit from TypedObject twice.  Note
-  // that we also inherit virtually from ReferenceCount for the same
-  // reason.
+class EXPCL_PANDA_PGRAPH Light {
 PUBLISHED:
   INLINE Light();
   INLINE Light(const Light &copy);
@@ -55,6 +51,10 @@ PUBLISHED:
   INLINE const LColor &get_color() const;
   INLINE void set_color(const LColor &color);
 
+  virtual PN_stdfloat get_exponent() const;
+  virtual const LColor &get_specular_color() const;
+  virtual const LVecBase3 &get_attenuation() const;
+
   INLINE void set_priority(int priority);
   INLINE int get_priority() const;
   virtual int get_class_priority() const=0;
@@ -66,7 +66,7 @@ public:
                     int light_id)=0;
 
   virtual bool get_vector_to_light(LVector3 &result,
-                                   const LPoint3 &from_object_point, 
+                                   const LPoint3 &from_object_point,
                                    const LMatrix4 &to_object_space);
 
   GeomNode *get_viz();
@@ -76,7 +76,7 @@ public:
 protected:
   virtual void fill_viz_geom(GeomNode *viz_geom);
   INLINE void mark_viz_stale();
-  
+
   // This enumerated class defines the relative class priority of
   // different kinds of lights.  This hierarchy is only used to
   // resolve multiple lights of the same priority specified by
@@ -135,7 +135,7 @@ public:
   virtual TypeHandle get_type() const {
     return get_class_type();
   }
-  
+
 private:
   static TypeHandle _type_handle;
 };
diff --git a/panda/src/pgraph/loader.cxx b/panda/src/pgraph/loader.cxx
index f791b3fc32..440939b945 100644
--- a/panda/src/pgraph/loader.cxx
+++ b/panda/src/pgraph/loader.cxx
@@ -117,7 +117,7 @@ load_bam_stream(istream &in) {
 ////////////////////////////////////////////////////////////////////
 //     Function: Loader::output
 //       Access: Published, Virtual
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 void Loader::
 output(ostream &out) const {
@@ -224,7 +224,7 @@ load_file(const Filename &filename, const LoaderOptions &options) const {
     int num_dirs = model_path.get_num_directories();
     for (int i = 0; i < num_dirs; ++i) {
       Filename pathname(model_path.get_directory(i), this_filename);
-      PT(PandaNode) result = try_load_file(pathname, this_options, 
+      PT(PandaNode) result = try_load_file(pathname, this_options,
                                            requested_type);
       if (result != (PandaNode *)NULL) {
         return result;
@@ -286,15 +286,14 @@ try_load_file(const Filename &pathname, const LoaderOptions &options,
               LoaderFileType *requested_type) const {
   BamCache *cache = BamCache::get_global_ptr();
 
-  bool cache_only = (options.get_flags() & LoaderOptions::LF_cache_only) != 0;
+  bool allow_ram_cache = requested_type->get_allow_ram_cache(options);
 
-  if (requested_type->get_allow_ram_cache(options)) {
+  if (allow_ram_cache) {
     // If we're allowing a RAM cache, use the ModelPool to load the
     // file.
-    if (!cache_only || ModelPool::has_model(pathname)) {
-      PT(PandaNode) node = ModelPool::load_model(pathname, options);
-      if (node != (PandaNode *)NULL &&
-          (options.get_flags() & LoaderOptions::LF_allow_instance) == 0) {
+    PT(PandaNode) node = ModelPool::get_model(pathname, true);
+    if (node != (PandaNode *)NULL) {
+      if ((options.get_flags() & LoaderOptions::LF_allow_instance) == 0) {
         if (loader_cat.is_debug()) {
           loader_cat.debug()
             << "Model " << pathname << " found in ModelPool.\n";
@@ -320,16 +319,27 @@ try_load_file(const Filename &pathname, const LoaderOptions &options,
             << "Model " << pathname << " found in disk cache.\n";
         }
         PT(PandaNode) result = DCAST(PandaNode, record->get_data());
-        if (result->is_of_type(ModelRoot::get_class_type())) {
-          ModelRoot *model_root = DCAST(ModelRoot, result.p());
-          model_root->set_fullpath(pathname);
-          model_root->set_timestamp(record->get_source_timestamp());
-        }
 
         if (premunge_data) {
           SceneGraphReducer sgr;
           sgr.premunge(result, RenderState::make_empty());
         }
+
+        if (result->is_of_type(ModelRoot::get_class_type())) {
+          ModelRoot *model_root = DCAST(ModelRoot, result.p());
+          model_root->set_fullpath(pathname);
+          model_root->set_timestamp(record->get_source_timestamp());
+
+          if (allow_ram_cache) {
+            // Store the loaded model in the RAM cache, and make sure
+            // we return a copy so that this node can be modified
+            // independently from the RAM cached version.
+            ModelPool::add_model(pathname, model_root);
+            if ((options.get_flags() & LoaderOptions::LF_allow_instance) == 0) {
+              return model_root->copy_subgraph();
+            }
+          }
+        }
         return result;
       }
     }
@@ -339,19 +349,32 @@ try_load_file(const Filename &pathname, const LoaderOptions &options,
     loader_cat.debug()
       << "Model " << pathname << " not found in cache.\n";
   }
-  
+
+  bool cache_only = (options.get_flags() & LoaderOptions::LF_cache_only) != 0;
   if (!cache_only) {
+    // Load the model from disk.
     PT(PandaNode) result = requested_type->load_file(pathname, options, record);
-    if (result != (PandaNode *)NULL){ 
+    if (result != (PandaNode *)NULL) {
       if (record != (BamCacheRecord *)NULL) {
+        // Store the loaded model in the model cache.
         record->set_data(result, result);
         cache->store(record);
       }
-      
+
       if (premunge_data) {
         SceneGraphReducer sgr;
         sgr.premunge(result, RenderState::make_empty());
       }
+
+      if (allow_ram_cache && result->is_of_type(ModelRoot::get_class_type())) {
+        // Store the loaded model in the RAM cache, and make sure
+        // we return a copy so that this node can be modified
+        // independently from the RAM cached version.
+        ModelPool::add_model(pathname, DCAST(ModelRoot, result.p()));
+        if ((options.get_flags() & LoaderOptions::LF_allow_instance) == 0) {
+          result = result->copy_subgraph();
+        }
+      }
       return result;
     }
   }
@@ -454,7 +477,7 @@ bool Loader::
 try_save_file(const Filename &pathname, const LoaderOptions &options,
               PandaNode *node, LoaderFileType *requested_type) const {
   bool report_errors = ((options.get_flags() & LoaderOptions::LF_report_errors) != 0 || loader_cat.is_debug());
-  
+
   bool result = requested_type->save_file(pathname, options, node);
   return result;
 }
@@ -493,7 +516,7 @@ load_file_types() {
           loader_cat.debug()
             << "done loading file type module: " << name << endl;
         }
-        
+
       } else if (words.size() > 1) {
         // Multiple words: the first n words are filename extensions,
         // and the last word is the name of the library to load should
@@ -501,13 +524,13 @@ load_file_types() {
         LoaderFileTypeRegistry *registry = LoaderFileTypeRegistry::get_global_ptr();
         size_t num_extensions = words.size() - 1;
         string library_name = words[num_extensions];
-        
+
         for (size_t i = 0; i < num_extensions; i++) {
           string extension = words[i];
           if (extension[0] == '.') {
             extension = extension.substr(1);
           }
-          
+
           registry->register_deferred_type(extension, library_name);
         }
       }
diff --git a/panda/src/pgraph/loader.h b/panda/src/pgraph/loader.h
index 6587a59636..adfd77fd86 100644
--- a/panda/src/pgraph/loader.h
+++ b/panda/src/pgraph/loader.h
@@ -85,16 +85,16 @@ PUBLISHED:
   BLOCKING INLINE void stop_threads();
   INLINE bool remove(AsyncTask *task);
 
-  BLOCKING INLINE PT(PandaNode) load_sync(const Filename &filename, 
+  BLOCKING INLINE PT(PandaNode) load_sync(const Filename &filename,
                                           const LoaderOptions &options = LoaderOptions()) const;
 
-  PT(AsyncTask) make_async_request(const Filename &filename, 
+  PT(AsyncTask) make_async_request(const Filename &filename,
                                    const LoaderOptions &options = LoaderOptions());
   INLINE void load_async(AsyncTask *request);
 
   INLINE bool save_sync(const Filename &filename, const LoaderOptions &options,
                         PandaNode *node) const;
-  PT(AsyncTask) make_async_save_request(const Filename &filename, 
+  PT(AsyncTask) make_async_save_request(const Filename &filename,
                                         const LoaderOptions &options,
                                         PandaNode *node);
   INLINE void save_async(AsyncTask *request);
@@ -140,7 +140,7 @@ public:
     return get_class_type();
   }
   virtual TypeHandle force_init_type() {init_type(); return get_class_type();}
-  
+
 private:
   static TypeHandle _type_handle;
 
diff --git a/panda/src/pgraph/loaderFileTypeBam.cxx b/panda/src/pgraph/loaderFileTypeBam.cxx
index a585dac81f..bce1fb38b9 100644
--- a/panda/src/pgraph/loaderFileTypeBam.cxx
+++ b/panda/src/pgraph/loaderFileTypeBam.cxx
@@ -110,7 +110,7 @@ load_file(const Filename &path, const LoaderOptions &options,
   time_t timestamp = bam_file.get_reader()->get_source()->get_timestamp();
 
   PT(PandaNode) node = bam_file.read_node(report_errors);
-  if (node->is_of_type(ModelRoot::get_class_type())) {
+  if (node != (PandaNode *)NULL && node->is_of_type(ModelRoot::get_class_type())) {
     ModelRoot *model_root = DCAST(ModelRoot, node.p());
     model_root->set_fullpath(path);
     model_root->set_timestamp(timestamp);
diff --git a/panda/src/pgraph/modelPool.I b/panda/src/pgraph/modelPool.I
index 18e4fadf48..252e3e196e 100644
--- a/panda/src/pgraph/modelPool.I
+++ b/panda/src/pgraph/modelPool.I
@@ -17,7 +17,8 @@
 //     Function: ModelPool::has_model
 //       Access: Public, Static
 //  Description: Returns true if the model has ever been loaded,
-//               false otherwise.
+//               false otherwise.  Note that this does not guarantee
+//               that the model is still up-to-date.
 ////////////////////////////////////////////////////////////////////
 INLINE bool ModelPool::
 has_model(const Filename &filename) {
@@ -45,6 +46,20 @@ verify_model(const Filename &filename) {
   return load_model(filename) != (ModelRoot *)NULL;
 }
 
+////////////////////////////////////////////////////////////////////
+//     Function: ModelPool::get_model
+//       Access: Public, Static
+//  Description: Returns the model that has already been previously
+//               loaded, or NULL otherwise.  If verify is true, it
+//               will check if the file is still up-to-date (and
+//               hasn't been modified in the meantime), and if not,
+//               will still return NULL.
+////////////////////////////////////////////////////////////////////
+INLINE ModelRoot *ModelPool::
+get_model(const Filename &filename, bool verify) {
+  return get_ptr()->ns_get_model(filename, verify);
+}
+
 ////////////////////////////////////////////////////////////////////
 //     Function: ModelPool::load_model
 //       Access: Public, Static
diff --git a/panda/src/pgraph/modelPool.cxx b/panda/src/pgraph/modelPool.cxx
index f738f7090f..fedd3c1134 100644
--- a/panda/src/pgraph/modelPool.cxx
+++ b/panda/src/pgraph/modelPool.cxx
@@ -52,13 +52,12 @@ ns_has_model(const Filename &filename) {
 }
 
 ////////////////////////////////////////////////////////////////////
-//     Function: ModelPool::ns_load_model
+//     Function: ModelPool::ns_get_model
 //       Access: Private
-//  Description: The nonstatic implementation of load_model().
+//  Description: The nonstatic implementation of get_model().
 ////////////////////////////////////////////////////////////////////
 ModelRoot *ModelPool::
-ns_load_model(const Filename &filename, const LoaderOptions &options) {
-  VirtualFileSystem *vfs = VirtualFileSystem::get_global_ptr();
+ns_get_model(const Filename &filename, bool verify) {
 
   PT(ModelRoot) cached_model;
   bool got_cached_model = false;
@@ -74,7 +73,7 @@ ns_load_model(const Filename &filename, const LoaderOptions &options) {
     }
   }
 
-  if (got_cached_model) {
+  if (got_cached_model && verify) {
     if (pgraph_cat.is_debug()) {
       pgraph_cat.debug()
         << "ModelPool found " << cached_model << " for " << filename << "\n";
@@ -85,6 +84,7 @@ ns_load_model(const Filename &filename, const LoaderOptions &options) {
       // exist (or the model could not be loaded for some reason).
       if (cache_check_timestamps) {
         // Check to see if there is a file there now.
+        VirtualFileSystem *vfs = VirtualFileSystem::get_global_ptr();
         if (vfs->exists(filename)) {
           // There is, so try to load it.
           got_cached_model = false;
@@ -93,9 +93,10 @@ ns_load_model(const Filename &filename, const LoaderOptions &options) {
     } else {
       // This filename was previously attempted, and successfully
       // loaded.
-      if (cache_check_timestamps && cached_model->get_timestamp() != 0 && 
+      if (cache_check_timestamps && cached_model->get_timestamp() != 0 &&
           !cached_model->get_fullpath().empty()) {
         // Compare the timestamp to the file on-disk.
+        VirtualFileSystem *vfs = VirtualFileSystem::get_global_ptr();
         PT(VirtualFile) vfile = vfs->get_file(cached_model->get_fullpath());
         if (vfile == NULL) {
           // The file has disappeared!  Look further along the model-path.
@@ -116,12 +117,29 @@ ns_load_model(const Filename &filename, const LoaderOptions &options) {
         << "ModelPool returning " << cached_model << " for " << filename << "\n";
     }
     return cached_model;
+  } else {
+    return NULL;
+  }
+}
+
+////////////////////////////////////////////////////////////////////
+//     Function: ModelPool::ns_load_model
+//       Access: Private
+//  Description: The nonstatic implementation of load_model().
+////////////////////////////////////////////////////////////////////
+ModelRoot *ModelPool::
+ns_load_model(const Filename &filename, const LoaderOptions &options) {
+
+  // First check if it has already been loaded and is still current.
+  PT(ModelRoot) cached_model = ns_get_model(filename, true);
+  if (cached_model != (ModelRoot *)NULL) {
+    return cached_model;
   }
 
   // Look on disk for the current file.
   LoaderOptions new_options(options);
   new_options.set_flags((new_options.get_flags() | LoaderOptions::LF_no_ram_cache) &
-                        ~(LoaderOptions::LF_search | LoaderOptions::LF_report_errors));
+                        ~LoaderOptions::LF_search);
 
   Loader *model_loader = Loader::get_global_ptr();
   PT(PandaNode) panda_node = model_loader->load_sync(filename, new_options);
@@ -133,7 +151,7 @@ ns_load_model(const Filename &filename, const LoaderOptions &options) {
   } else {
     if (panda_node->is_of_type(ModelRoot::get_class_type())) {
       node = DCAST(ModelRoot, panda_node);
-      
+
     } else {
       // We have to construct a ModelRoot node to put it under.
       node = new ModelRoot(filename);
@@ -154,10 +172,6 @@ ns_load_model(const Filename &filename, const LoaderOptions &options) {
       return (*ti).second;
     }
 
-    if (pgraph_cat.is_debug()) {
-      pgraph_cat.debug()
-        << "ModelPool storing " << node << " for " << filename << "\n";
-    }
     _models[filename] = node;
   }
 
@@ -172,6 +186,10 @@ ns_load_model(const Filename &filename, const LoaderOptions &options) {
 void ModelPool::
 ns_add_model(const Filename &filename, ModelRoot *model) {
   LightMutexHolder holder(_lock);
+  if (pgraph_cat.is_debug()) {
+    pgraph_cat.debug()
+      << "ModelPool storing " << model << " for " << filename << "\n";
+  }
   // We blow away whatever model was there previously, if any.
   _models[filename] = model;
 }
@@ -270,19 +288,19 @@ ns_list_contents(ostream &out) const {
   LightMutexHolder holder(_lock);
 
   out << "model pool contents:\n";
-  
+
   Models::const_iterator ti;
   int num_models = 0;
   for (ti = _models.begin(); ti != _models.end(); ++ti) {
     if ((*ti).second != NULL) {
       ++num_models;
       out << (*ti).first << "\n"
-          << "  (count = " << (*ti).second->get_model_ref_count() 
+          << "  (count = " << (*ti).second->get_model_ref_count()
           << ")\n";
     }
   }
-  
-  out << "total number of models: " << num_models << " (plus " 
+
+  out << "total number of models: " << num_models << " (plus "
       << _models.size() - num_models << " entries for nonexistent files)\n";
 }
 
diff --git a/panda/src/pgraph/modelPool.h b/panda/src/pgraph/modelPool.h
index 264da21243..55b2379fde 100644
--- a/panda/src/pgraph/modelPool.h
+++ b/panda/src/pgraph/modelPool.h
@@ -49,6 +49,7 @@ class EXPCL_PANDA_PGRAPH ModelPool {
 PUBLISHED:
   INLINE static bool has_model(const Filename &filename);
   INLINE static bool verify_model(const Filename &filename);
+  INLINE static ModelRoot *get_model(const Filename &filename, bool verify);
   BLOCKING INLINE static ModelRoot *load_model(const Filename &filename,
                                                const LoaderOptions &options = LoaderOptions());
 
@@ -70,6 +71,7 @@ private:
   INLINE ModelPool();
 
   bool ns_has_model(const Filename &filename);
+  ModelRoot *ns_get_model(const Filename &filename, bool verify);
   ModelRoot *ns_load_model(const Filename &filename,
                            const LoaderOptions &options);
   void ns_add_model(const Filename &filename, ModelRoot *model);
diff --git a/panda/src/pgraph/nodePath.I b/panda/src/pgraph/nodePath.I
index c5a0ae25ee..ea347495cf 100644
--- a/panda/src/pgraph/nodePath.I
+++ b/panda/src/pgraph/nodePath.I
@@ -109,6 +109,33 @@ operator = (const NodePath &copy) {
   _error_type = copy._error_type;
 }
 
+#ifdef USE_MOVE_SEMANTICS
+////////////////////////////////////////////////////////////////////
+//     Function: NodePath::Move Constructor
+//       Access: Published
+//  Description:
+////////////////////////////////////////////////////////////////////
+INLINE NodePath::
+NodePath(NodePath &&from) NOEXCEPT :
+  _head(move(from._head)),
+  _backup_key(from._backup_key),
+  _error_type(from._error_type)
+{
+}
+
+////////////////////////////////////////////////////////////////////
+//     Function: NodePath::Move Assignment Operator
+//       Access: Published
+//  Description:
+////////////////////////////////////////////////////////////////////
+INLINE void NodePath::
+operator = (NodePath &&from) NOEXCEPT {
+  _head = move(from._head);
+  _backup_key = from._backup_key;
+  _error_type = from._error_type;
+}
+#endif  // USE_MOVE_SEMANTICS
+
 ////////////////////////////////////////////////////////////////////
 //     Function: NodePath::not_found named constructor
 //       Access: Published, Static
@@ -252,7 +279,7 @@ node() const {
 //  Description: Returns an integer that is guaranteed to be the same
 //               for all NodePaths that represent the same node
 //               instance, and different for all NodePaths that
-//               represent a different node instance.  
+//               represent a different node instance.
 //
 //               The same key will be returned for a particular
 //               instance as long as at least one NodePath exists that
@@ -1286,6 +1313,258 @@ get_sa() const {
   return get_color_scale()[3];
 }
 
+////////////////////////////////////////////////////////////////////
+//     Function: NodePath::set_shader_input
+//       Access: Published
+//  Description:
+////////////////////////////////////////////////////////////////////
+INLINE void NodePath::
+set_shader_input(CPT_InternalName id, const PTA_float &v, int priority) {
+  set_shader_input(new ShaderInput(id, v, priority));
+}
+
+////////////////////////////////////////////////////////////////////
+//     Function: NodePath::set_shader_input
+//       Access: Published
+//  Description:
+////////////////////////////////////////////////////////////////////
+INLINE void NodePath::
+set_shader_input(CPT_InternalName id, const PTA_double &v, int priority) {
+  set_shader_input(new ShaderInput(id, v, priority));
+}
+
+////////////////////////////////////////////////////////////////////
+//     Function: NodePath::set_shader_input
+//       Access: Published
+//  Description:
+////////////////////////////////////////////////////////////////////
+INLINE void NodePath::
+set_shader_input(CPT_InternalName id, const PTA_int &v, int priority) {
+  set_shader_input(new ShaderInput(id, v, priority));
+}
+
+////////////////////////////////////////////////////////////////////
+//     Function: NodePath::set_shader_input
+//       Access: Published
+//  Description:
+////////////////////////////////////////////////////////////////////
+INLINE void NodePath::
+set_shader_input(CPT_InternalName id, const PTA_LVecBase4 &v, int priority) {
+  set_shader_input(new ShaderInput(id, v, priority));
+}
+
+////////////////////////////////////////////////////////////////////
+//     Function: NodePath::set_shader_input
+//       Access: Published
+//  Description:
+////////////////////////////////////////////////////////////////////
+INLINE void NodePath::
+set_shader_input(CPT_InternalName id, const PTA_LVecBase3 &v, int priority) {
+  set_shader_input(new ShaderInput(id, v, priority));
+}
+
+
+////////////////////////////////////////////////////////////////////
+//     Function: NodePath::set_shader_input
+//       Access: Published
+//  Description:
+////////////////////////////////////////////////////////////////////
+INLINE void NodePath::
+set_shader_input(CPT_InternalName id, const PTA_LVecBase2 &v, int priority) {
+  set_shader_input(new ShaderInput(id, v, priority));
+}
+
+////////////////////////////////////////////////////////////////////
+//     Function: NodePath::set_shader_input
+//       Access: Published
+//  Description:
+////////////////////////////////////////////////////////////////////
+INLINE void NodePath::
+set_shader_input(CPT_InternalName id, const LVecBase4 &v, int priority) {
+  set_shader_input(new ShaderInput(id, v, priority));
+}
+
+////////////////////////////////////////////////////////////////////
+//     Function: NodePath::set_shader_input
+//       Access: Published
+//  Description:
+////////////////////////////////////////////////////////////////////
+INLINE void NodePath::
+set_shader_input(CPT_InternalName id, const LVecBase3 &v, int priority) {
+  set_shader_input(new ShaderInput(id, v, priority));
+}
+
+////////////////////////////////////////////////////////////////////
+//     Function: NodePath::set_shader_input
+//       Access: Published
+//  Description:
+////////////////////////////////////////////////////////////////////
+INLINE void NodePath::
+set_shader_input(CPT_InternalName id, const LVecBase2 &v, int priority) {
+  set_shader_input(new ShaderInput(id, v, priority));
+}
+
+////////////////////////////////////////////////////////////////////
+//     Function: NodePath::set_shader_input
+//       Access: Published
+//  Description:
+////////////////////////////////////////////////////////////////////
+INLINE void NodePath::
+set_shader_input(CPT_InternalName id, const PTA_LVecBase4i &v, int priority) {
+  set_shader_input(new ShaderInput(id, v, priority));
+}
+
+////////////////////////////////////////////////////////////////////
+//     Function: NodePath::set_shader_input
+//       Access: Published
+//  Description:
+////////////////////////////////////////////////////////////////////
+INLINE void NodePath::
+set_shader_input(CPT_InternalName id, const PTA_LVecBase3i &v, int priority) {
+  set_shader_input(new ShaderInput(id, v, priority));
+}
+
+
+////////////////////////////////////////////////////////////////////
+//     Function: NodePath::set_shader_input
+//       Access: Published
+//  Description:
+////////////////////////////////////////////////////////////////////
+INLINE void NodePath::
+set_shader_input(CPT_InternalName id, const PTA_LVecBase2i &v, int priority) {
+  set_shader_input(new ShaderInput(id, v, priority));
+}
+
+////////////////////////////////////////////////////////////////////
+//     Function: NodePath::set_shader_input
+//       Access: Published
+//  Description:
+////////////////////////////////////////////////////////////////////
+INLINE void NodePath::
+set_shader_input(CPT_InternalName id, const LVecBase4i &v, int priority) {
+  set_shader_input(new ShaderInput(id, v, priority));
+}
+
+////////////////////////////////////////////////////////////////////
+//     Function: NodePath::set_shader_input
+//       Access: Published
+//  Description:
+////////////////////////////////////////////////////////////////////
+INLINE void NodePath::
+set_shader_input(CPT_InternalName id, const LVecBase3i &v, int priority) {
+  set_shader_input(new ShaderInput(id, v, priority));
+}
+
+////////////////////////////////////////////////////////////////////
+//     Function: NodePath::set_shader_input
+//       Access: Published
+//  Description:
+////////////////////////////////////////////////////////////////////
+INLINE void NodePath::
+set_shader_input(CPT_InternalName id, const LVecBase2i &v, int priority) {
+  set_shader_input(new ShaderInput(id, v, priority));
+}
+
+////////////////////////////////////////////////////////////////////
+//     Function: NodePath::set_shader_input
+//       Access: Published
+//  Description:
+////////////////////////////////////////////////////////////////////
+INLINE void NodePath::
+set_shader_input(CPT_InternalName id, const PTA_LMatrix4 &v, int priority) {
+  set_shader_input(new ShaderInput(id, v, priority));
+}
+
+////////////////////////////////////////////////////////////////////
+//     Function: NodePath::set_shader_input
+//       Access: Published
+//  Description:
+////////////////////////////////////////////////////////////////////
+INLINE void NodePath::
+set_shader_input(CPT_InternalName id, const PTA_LMatrix3 &v, int priority) {
+  set_shader_input(new ShaderInput(id, v, priority));
+}
+
+////////////////////////////////////////////////////////////////////
+//     Function: NodePath::set_shader_input
+//       Access: Published
+//  Description:
+////////////////////////////////////////////////////////////////////
+INLINE void NodePath::
+set_shader_input(CPT_InternalName id, const LMatrix4 &v, int priority) {
+  set_shader_input(new ShaderInput(id, v, priority));
+}
+
+////////////////////////////////////////////////////////////////////
+//     Function: NodePath::set_shader_input
+//       Access: Published
+//  Description:
+////////////////////////////////////////////////////////////////////
+INLINE void NodePath::
+set_shader_input(CPT_InternalName id, const LMatrix3 &v, int priority) {
+  set_shader_input(new ShaderInput(id, v, priority));
+}
+
+////////////////////////////////////////////////////////////////////
+//     Function: NodePath::set_shader_input
+//       Access: Published
+//  Description:
+////////////////////////////////////////////////////////////////////
+INLINE void NodePath::
+set_shader_input(CPT_InternalName id, Texture *tex, int priority) {
+  set_shader_input(new ShaderInput(id, tex, priority));
+}
+
+////////////////////////////////////////////////////////////////////
+//     Function: NodePath::set_shader_input
+//       Access: Published
+//  Description:
+////////////////////////////////////////////////////////////////////
+INLINE void NodePath::
+set_shader_input(CPT_InternalName id, Texture *tex, const SamplerState &sampler, int priority) {
+  set_shader_input(new ShaderInput(id, tex, sampler, priority));
+}
+
+////////////////////////////////////////////////////////////////////
+//     Function: NodePath::set_shader_input
+//       Access: Published
+//  Description:
+////////////////////////////////////////////////////////////////////
+INLINE void NodePath::
+set_shader_input(CPT_InternalName id, Texture *tex, bool read, bool write, int z, int n, int priority) {
+  set_shader_input(new ShaderInput(id, tex, read, write, z, n, priority));
+}
+
+////////////////////////////////////////////////////////////////////
+//     Function: NodePath::set_shader_input
+//       Access: Published
+//  Description:
+////////////////////////////////////////////////////////////////////
+INLINE void NodePath::
+set_shader_input(CPT_InternalName id, const NodePath &np, int priority) {
+  set_shader_input(new ShaderInput(id, np, priority));
+}
+
+////////////////////////////////////////////////////////////////////
+//     Function: NodePath::set_shader_input
+//       Access: Published
+//  Description:
+////////////////////////////////////////////////////////////////////
+INLINE void NodePath::
+set_shader_input(CPT_InternalName id, int n1, int n2, int n3, int n4, int priority) {
+  set_shader_input(new ShaderInput(id, LVecBase4i(n1, n2, n3, n4), priority));
+}
+
+////////////////////////////////////////////////////////////////////
+//     Function: NodePath::set_shader_input
+//       Access: Published
+//  Description:
+////////////////////////////////////////////////////////////////////
+INLINE void NodePath::
+set_shader_input(CPT_InternalName id, PN_stdfloat n1, PN_stdfloat n2, PN_stdfloat n3, PN_stdfloat n4, int priority) {
+  set_shader_input(new ShaderInput(id, LVecBase4(n1, n2, n3, n4), priority));
+}
+
 ////////////////////////////////////////////////////////////////////
 //     Function: NodePath::set_tex_offset
 //       Access: Published
@@ -1312,7 +1591,7 @@ set_tex_offset(TextureStage *stage, PN_stdfloat u, PN_stdfloat v) {
 INLINE void NodePath::
 set_tex_offset(TextureStage *stage, const LVecBase2 &uv) {
   nassertv_always(!is_empty());
-  set_tex_transform(stage, 
+  set_tex_transform(stage,
                     get_tex_transform(stage)->set_pos2d(uv));
 }
 
@@ -1329,7 +1608,7 @@ set_tex_offset(TextureStage *stage, const LVecBase2 &uv) {
 INLINE void NodePath::
 set_tex_rotate(TextureStage *stage, PN_stdfloat r) {
   nassertv_always(!is_empty());
-  set_tex_transform(stage, 
+  set_tex_transform(stage,
                     get_tex_transform(stage)->set_rotate2d(r));
 }
 
@@ -1345,7 +1624,7 @@ set_tex_rotate(TextureStage *stage, PN_stdfloat r) {
 INLINE void NodePath::
 set_tex_scale(TextureStage *stage, PN_stdfloat scale) {
   nassertv_always(!is_empty());
-  set_tex_transform(stage, 
+  set_tex_transform(stage,
                     get_tex_transform(stage)->set_scale(scale));
 }
 
@@ -1375,7 +1654,7 @@ set_tex_scale(TextureStage *stage, PN_stdfloat su, PN_stdfloat sv) {
 INLINE void NodePath::
 set_tex_scale(TextureStage *stage, const LVecBase2 &scale) {
   nassertv_always(!is_empty());
-  set_tex_transform(stage, 
+  set_tex_transform(stage,
                     get_tex_transform(stage)->set_scale2d(scale));
 }
 
@@ -1448,7 +1727,7 @@ set_tex_pos(TextureStage *stage, PN_stdfloat u, PN_stdfloat v, PN_stdfloat w) {
 INLINE void NodePath::
 set_tex_pos(TextureStage *stage, const LVecBase3 &uvw) {
   nassertv_always(!is_empty());
-  set_tex_transform(stage, 
+  set_tex_transform(stage,
                     get_tex_transform(stage)->set_pos(uvw));
 }
 
@@ -1478,7 +1757,7 @@ set_tex_hpr(TextureStage *stage, PN_stdfloat h, PN_stdfloat p, PN_stdfloat r) {
 INLINE void NodePath::
 set_tex_hpr(TextureStage *stage, const LVecBase3 &hpr) {
   nassertv_always(!is_empty());
-  set_tex_transform(stage, 
+  set_tex_transform(stage,
                     get_tex_transform(stage)->set_hpr(hpr));
 }
 
@@ -1506,7 +1785,7 @@ set_tex_scale(TextureStage *stage, PN_stdfloat su, PN_stdfloat sv, PN_stdfloat s
 INLINE void NodePath::
 set_tex_scale(TextureStage *stage, const LVecBase3 &scale) {
   nassertv_always(!is_empty());
-  set_tex_transform(stage, 
+  set_tex_transform(stage,
                     get_tex_transform(stage)->set_scale(scale));
 }
 
@@ -1578,7 +1857,7 @@ set_tex_offset(const NodePath &other, TextureStage *stage, PN_stdfloat u, PN_std
 INLINE void NodePath::
 set_tex_offset(const NodePath &other, TextureStage *stage, const LVecBase2 &uv) {
   nassertv_always(!is_empty());
-  set_tex_transform(other, stage, 
+  set_tex_transform(other, stage,
                     get_tex_transform(other, stage)->set_pos2d(uv));
 }
 
@@ -1595,7 +1874,7 @@ set_tex_offset(const NodePath &other, TextureStage *stage, const LVecBase2 &uv)
 INLINE void NodePath::
 set_tex_rotate(const NodePath &other, TextureStage *stage, PN_stdfloat r) {
   nassertv_always(!is_empty());
-  set_tex_transform(other, stage, 
+  set_tex_transform(other, stage,
                     get_tex_transform(other, stage)->set_rotate2d(r));
 }
 
@@ -1611,7 +1890,7 @@ set_tex_rotate(const NodePath &other, TextureStage *stage, PN_stdfloat r) {
 INLINE void NodePath::
 set_tex_scale(const NodePath &other, TextureStage *stage, PN_stdfloat scale) {
   nassertv_always(!is_empty());
-  set_tex_transform(other, stage, 
+  set_tex_transform(other, stage,
                     get_tex_transform(stage)->set_scale(scale));
 }
 
@@ -1641,7 +1920,7 @@ set_tex_scale(const NodePath &other, TextureStage *stage, PN_stdfloat su, PN_std
 INLINE void NodePath::
 set_tex_scale(const NodePath &other, TextureStage *stage, const LVecBase2 &scale) {
   nassertv_always(!is_empty());
-  set_tex_transform(other, stage, 
+  set_tex_transform(other, stage,
                     get_tex_transform(stage)->set_scale2d(scale));
 }
 
@@ -1714,7 +1993,7 @@ set_tex_pos(const NodePath &other, TextureStage *stage, PN_stdfloat u, PN_stdflo
 INLINE void NodePath::
 set_tex_pos(const NodePath &other, TextureStage *stage, const LVecBase3 &uvw) {
   nassertv_always(!is_empty());
-  set_tex_transform(other, stage, 
+  set_tex_transform(other, stage,
                     get_tex_transform(stage)->set_pos(uvw));
 }
 
@@ -1744,7 +2023,7 @@ set_tex_hpr(const NodePath &other, TextureStage *stage, PN_stdfloat h, PN_stdflo
 INLINE void NodePath::
 set_tex_hpr(const NodePath &other, TextureStage *stage, const LVecBase3 &hpr) {
   nassertv_always(!is_empty());
-  set_tex_transform(other, stage, 
+  set_tex_transform(other, stage,
                     get_tex_transform(stage)->set_hpr(hpr));
 }
 
@@ -1772,7 +2051,7 @@ set_tex_scale(const NodePath &other, TextureStage *stage, PN_stdfloat su, PN_std
 INLINE void NodePath::
 set_tex_scale(const NodePath &other, TextureStage *stage, const LVecBase3 &scale) {
   nassertv_always(!is_empty());
-  set_tex_transform(other, stage, 
+  set_tex_transform(other, stage,
                     get_tex_transform(stage)->set_scale(scale));
 }
 
diff --git a/panda/src/pgraph/nodePath.cxx b/panda/src/pgraph/nodePath.cxx
index 1f15c20aec..828179f603 100644
--- a/panda/src/pgraph/nodePath.cxx
+++ b/panda/src/pgraph/nodePath.cxx
@@ -1714,21 +1714,21 @@ set_hpr(const NodePath &other, const LVecBase3 &hpr) {
   CPT(TransformState) rel_transform = get_transform(other);
   nassertv(rel_transform->has_hpr());
 
-  CPT(TransformState) orig_transform = get_transform();
-  if (orig_transform->has_components()) {
+  CPT(TransformState) transform = get_transform();
+  if (transform->has_components()) {
     // If we had a componentwise transform before we started, we
     // should be careful to preserve the other three components.  We
     // wouldn't need to do this, except for the possibility of
     // numerical error or decompose ambiguity.
-    const LVecBase3 &orig_pos = orig_transform->get_pos();
-    const LVecBase3 &orig_scale = orig_transform->get_scale();
-    const LVecBase3 &orig_shear = orig_transform->get_shear();
+    const LVecBase3 &orig_pos = transform->get_pos();
+    const LVecBase3 &orig_scale = transform->get_scale();
+    const LVecBase3 &orig_shear = transform->get_shear();
 
     set_transform(other, rel_transform->set_hpr(hpr));
-    const TransformState *new_transform = get_transform();
-    if (new_transform->has_components()) {
+    transform = get_transform();
+    if (transform->has_components()) {
       set_transform(TransformState::make_pos_hpr_scale_shear
-                    (orig_pos, new_transform->get_hpr(), orig_scale, orig_shear));
+                    (orig_pos, transform->get_hpr(), orig_scale, orig_shear));
     }
 
   } else {
@@ -1787,21 +1787,21 @@ set_quat(const NodePath &other, const LQuaternion &quat) {
   nassertv_always(!is_empty());
   CPT(TransformState) rel_transform = get_transform(other);
 
-  CPT(TransformState) orig_transform = get_transform();
-  if (orig_transform->has_components()) {
+  CPT(TransformState) transform = get_transform();
+  if (transform->has_components()) {
     // If we had a componentwise transform before we started, we
     // should be careful to preserve the other three components.  We
     // wouldn't need to do this, except for the possibility of
     // numerical error or decompose ambiguity.
-    const LVecBase3 &orig_pos = orig_transform->get_pos();
-    const LVecBase3 &orig_scale = orig_transform->get_scale();
-    const LVecBase3 &orig_shear = orig_transform->get_shear();
+    const LVecBase3 &orig_pos = transform->get_pos();
+    const LVecBase3 &orig_scale = transform->get_scale();
+    const LVecBase3 &orig_shear = transform->get_shear();
 
     set_transform(other, rel_transform->set_quat(quat));
-    const TransformState *new_transform = get_transform();
-    if (new_transform->has_components()) {
+    transform = get_transform();
+    if (transform->has_components()) {
       set_transform(TransformState::make_pos_quat_scale_shear
-                    (orig_pos, new_transform->get_quat(), orig_scale, orig_shear));
+                    (orig_pos, transform->get_quat(), orig_scale, orig_shear));
     }
 
   } else {
@@ -1835,21 +1835,21 @@ set_scale(const NodePath &other, const LVecBase3 &scale) {
   nassertv_always(!is_empty());
   CPT(TransformState) rel_transform = get_transform(other);
 
-  CPT(TransformState) orig_transform = get_transform();
-  if (orig_transform->has_components()) {
+  CPT(TransformState) transform = get_transform();
+  if (transform->has_components()) {
     // If we had a componentwise transform before we started, we
     // should be careful to preserve the other three components.  We
     // wouldn't need to do this, except for the possibility of
     // numerical error or decompose ambiguity.
-    const LVecBase3 &orig_pos = orig_transform->get_pos();
-    const LVecBase3 &orig_hpr = orig_transform->get_hpr();
-    const LVecBase3 &orig_shear = orig_transform->get_shear();
+    const LVecBase3 &orig_pos = transform->get_pos();
+    const LVecBase3 &orig_hpr = transform->get_hpr();
+    const LVecBase3 &orig_shear = transform->get_shear();
 
     set_transform(other, rel_transform->set_scale(scale));
-    const TransformState *new_transform = get_transform();
-    if (new_transform->has_components()) {
+    transform = get_transform();
+    if (transform->has_components()) {
       set_transform(TransformState::make_pos_hpr_scale_shear
-                    (orig_pos, orig_hpr, new_transform->get_scale(), orig_shear));
+                    (orig_pos, orig_hpr, transform->get_scale(), orig_shear));
     }
 
   } else {
@@ -1907,21 +1907,21 @@ set_shear(const NodePath &other, const LVecBase3 &shear) {
   nassertv_always(!is_empty());
   CPT(TransformState) rel_transform = get_transform(other);
 
-  CPT(TransformState) orig_transform = get_transform();
-  if (orig_transform->has_components()) {
+  CPT(TransformState) transform = get_transform();
+  if (transform->has_components()) {
     // If we had a componentwise transform before we started, we
     // should be careful to preserve the other three components.  We
     // wouldn't need to do this, except for the possibility of
     // numerical error or decompose ambiguity.
-    const LVecBase3 &orig_pos = orig_transform->get_pos();
-    const LVecBase3 &orig_hpr = orig_transform->get_hpr();
-    const LVecBase3 &orig_scale = orig_transform->get_scale();
+    const LVecBase3 &orig_pos = transform->get_pos();
+    const LVecBase3 &orig_hpr = transform->get_hpr();
+    const LVecBase3 &orig_scale = transform->get_scale();
 
     set_transform(other, rel_transform->set_shear(shear));
-    const TransformState *new_transform = get_transform();
-    if (new_transform->has_components()) {
+    transform = get_transform();
+    if (transform->has_components()) {
       set_transform(TransformState::make_pos_hpr_scale_shear
-                    (orig_pos, orig_hpr, orig_scale, new_transform->get_shear()));
+                    (orig_pos, orig_hpr, orig_scale, transform->get_shear()));
     }
 
   } else {
@@ -1980,20 +1980,20 @@ set_pos_hpr(const NodePath &other, const LVecBase3 &pos,
   nassertv_always(!is_empty());
   CPT(TransformState) rel_transform = get_transform(other);
 
-  CPT(TransformState) orig_transform = get_transform();
-  if (orig_transform->has_components()) {
+  CPT(TransformState) transform = get_transform();
+  if (transform->has_components()) {
     // If we had a componentwise transform before we started, we
     // should be careful to preserve the other two components.  We
     // wouldn't need to do this, except for the possibility of
     // numerical error or decompose ambiguity.
-    const LVecBase3 &orig_scale = orig_transform->get_scale();
-    const LVecBase3 &orig_shear = orig_transform->get_shear();
+    const LVecBase3 &orig_scale = transform->get_scale();
+    const LVecBase3 &orig_shear = transform->get_shear();
 
     set_transform(other, TransformState::make_pos_hpr_scale_shear
                   (pos, hpr, rel_transform->get_scale(), rel_transform->get_shear()));
-    const TransformState *new_transform = get_transform();
-    if (new_transform->has_components()) {
-      set_pos_hpr_scale_shear(new_transform->get_pos(), new_transform->get_hpr(),
+    transform = get_transform();
+    if (transform->has_components()) {
+      set_pos_hpr_scale_shear(transform->get_pos(), transform->get_hpr(),
                               orig_scale, orig_shear);
     }
 
@@ -2018,20 +2018,20 @@ set_pos_quat(const NodePath &other, const LVecBase3 &pos,
   nassertv_always(!is_empty());
   CPT(TransformState) rel_transform = get_transform(other);
 
-  CPT(TransformState) orig_transform = get_transform();
-  if (orig_transform->has_components()) {
+  CPT(TransformState) transform = get_transform();
+  if (transform->has_components()) {
     // If we had a componentwise transform before we started, we
     // should be careful to preserve the other two components.  We
     // wouldn't need to do this, except for the possibility of
     // numerical error or decompose ambiguity.
-    const LVecBase3 &orig_scale = orig_transform->get_scale();
-    const LVecBase3 &orig_shear = orig_transform->get_shear();
+    const LVecBase3 &orig_scale = transform->get_scale();
+    const LVecBase3 &orig_shear = transform->get_shear();
 
     set_transform(other, TransformState::make_pos_quat_scale_shear
                   (pos, quat, rel_transform->get_scale(), rel_transform->get_shear()));
-    const TransformState *new_transform = get_transform();
-    if (new_transform->has_components()) {
-      set_pos_quat_scale_shear(new_transform->get_pos(), new_transform->get_quat(),
+    transform = get_transform();
+    if (transform->has_components()) {
+      set_pos_quat_scale_shear(transform->get_pos(), transform->get_quat(),
                                orig_scale, orig_shear);
     }
 
@@ -3842,7 +3842,7 @@ set_shader_input(const ShaderInput *inp) {
 //  Description:
 ////////////////////////////////////////////////////////////////////
 const ShaderInput *NodePath::
-get_shader_input(const InternalName *id) const {
+get_shader_input(CPT_InternalName id) const {
   nassertr_always(!is_empty(), NULL);
 
   const RenderAttrib *attrib =
@@ -3881,7 +3881,7 @@ get_instance_count() const {
 //  Description:
 ////////////////////////////////////////////////////////////////////
 void NodePath::
-clear_shader_input(const InternalName *id) {
+clear_shader_input(CPT_InternalName id) {
   nassertv_always(!is_empty());
 
   const RenderAttrib *attrib =
@@ -3892,259 +3892,6 @@ clear_shader_input(const InternalName *id) {
   }
 }
 
-
-////////////////////////////////////////////////////////////////////
-//     Function: NodePath::set_shader_input
-//       Access: Published
-//  Description:
-////////////////////////////////////////////////////////////////////
-void NodePath::
-set_shader_input(const InternalName *id, const PTA_float &v, int priority) {
-  set_shader_input(new ShaderInput(id,v,priority));
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: NodePath::set_shader_input
-//       Access: Published
-//  Description:
-////////////////////////////////////////////////////////////////////
-void NodePath::
-set_shader_input(const InternalName *id, const PTA_double &v, int priority) {
-  set_shader_input(new ShaderInput(id,v,priority));
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: NodePath::set_shader_input
-//       Access: Published
-//  Description:
-////////////////////////////////////////////////////////////////////
-void NodePath::
-set_shader_input(const InternalName *id, const PTA_int &v, int priority) {
-  set_shader_input(new ShaderInput(id,v,priority));
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: NodePath::set_shader_input
-//       Access: Published
-//  Description:
-////////////////////////////////////////////////////////////////////
-void NodePath::
-set_shader_input(const InternalName *id, const PTA_LVecBase4 &v, int priority) {
-  set_shader_input(new ShaderInput(id,v,priority));
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: NodePath::set_shader_input
-//       Access: Published
-//  Description:
-////////////////////////////////////////////////////////////////////
-void NodePath::
-set_shader_input(const InternalName *id, const PTA_LVecBase3 &v, int priority) {
-  set_shader_input(new ShaderInput(id,v,priority));
-}
-
-
-////////////////////////////////////////////////////////////////////
-//     Function: NodePath::set_shader_input
-//       Access: Published
-//  Description:
-////////////////////////////////////////////////////////////////////
-void NodePath::
-set_shader_input(const InternalName *id, const PTA_LVecBase2 &v, int priority) {
-  set_shader_input(new ShaderInput(id,v,priority));
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: NodePath::set_shader_input
-//       Access: Published
-//  Description:
-////////////////////////////////////////////////////////////////////
-void NodePath::
-set_shader_input(const InternalName *id, const LVecBase4 &v, int priority) {
-  set_shader_input(new ShaderInput(id,v,priority));
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: NodePath::set_shader_input
-//       Access: Published
-//  Description:
-////////////////////////////////////////////////////////////////////
-void NodePath::
-set_shader_input(const InternalName *id, const LVecBase3 &v, int priority) {
-  set_shader_input(new ShaderInput(id,v,priority));
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: NodePath::set_shader_input
-//       Access: Published
-//  Description:
-////////////////////////////////////////////////////////////////////
-void NodePath::
-set_shader_input(const InternalName *id, const LVecBase2 &v, int priority) {
-  set_shader_input(new ShaderInput(id,v,priority));
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: NodePath::set_shader_input
-//       Access: Published
-//  Description:
-////////////////////////////////////////////////////////////////////
-void NodePath::
-set_shader_input(const InternalName *id, const PTA_LVecBase4i &v, int priority) {
-  set_shader_input(new ShaderInput(id,v,priority));
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: NodePath::set_shader_input
-//       Access: Published
-//  Description:
-////////////////////////////////////////////////////////////////////
-void NodePath::
-set_shader_input(const InternalName *id, const PTA_LVecBase3i &v, int priority) {
-  set_shader_input(new ShaderInput(id,v,priority));
-}
-
-
-////////////////////////////////////////////////////////////////////
-//     Function: NodePath::set_shader_input
-//       Access: Published
-//  Description:
-////////////////////////////////////////////////////////////////////
-void NodePath::
-set_shader_input(const InternalName *id, const PTA_LVecBase2i &v, int priority) {
-  set_shader_input(new ShaderInput(id,v,priority));
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: NodePath::set_shader_input
-//       Access: Published
-//  Description:
-////////////////////////////////////////////////////////////////////
-void NodePath::
-set_shader_input(const InternalName *id, const LVecBase4i &v, int priority) {
-  set_shader_input(new ShaderInput(id,v,priority));
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: NodePath::set_shader_input
-//       Access: Published
-//  Description:
-////////////////////////////////////////////////////////////////////
-void NodePath::
-set_shader_input(const InternalName *id, const LVecBase3i &v, int priority) {
-  set_shader_input(new ShaderInput(id,v,priority));
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: NodePath::set_shader_input
-//       Access: Published
-//  Description:
-////////////////////////////////////////////////////////////////////
-void NodePath::
-set_shader_input(const InternalName *id, const LVecBase2i &v, int priority) {
-  set_shader_input(new ShaderInput(id,v,priority));
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: NodePath::set_shader_input
-//       Access: Published
-//  Description:
-////////////////////////////////////////////////////////////////////
-void NodePath::
-set_shader_input(const InternalName *id, const PTA_LMatrix4 &v, int priority) {
-  set_shader_input(new ShaderInput(id,v,priority));
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: NodePath::set_shader_input
-//       Access: Published
-//  Description:
-////////////////////////////////////////////////////////////////////
-void NodePath::
-set_shader_input(const InternalName *id, const PTA_LMatrix3 &v, int priority) {
-  set_shader_input(new ShaderInput(id,v,priority));
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: NodePath::set_shader_input
-//       Access: Published
-//  Description:
-////////////////////////////////////////////////////////////////////
-void NodePath::
-set_shader_input(const InternalName *id, const LMatrix4 &v, int priority) {
-  set_shader_input(new ShaderInput(id,v,priority));
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: NodePath::set_shader_input
-//       Access: Published
-//  Description:
-////////////////////////////////////////////////////////////////////
-void NodePath::
-set_shader_input(const InternalName *id, const LMatrix3 &v, int priority) {
-  set_shader_input(new ShaderInput(id,v,priority));
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: NodePath::set_shader_input
-//       Access: Published
-//  Description:
-////////////////////////////////////////////////////////////////////
-void NodePath::
-set_shader_input(const InternalName *id, Texture *tex, int priority) {
-  set_shader_input(new ShaderInput(id,tex,priority));
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: NodePath::set_shader_input
-//       Access: Published
-//  Description:
-////////////////////////////////////////////////////////////////////
-void NodePath::
-set_shader_input(const InternalName *id, Texture *tex, const SamplerState &sampler, int priority) {
-  set_shader_input(new ShaderInput(id,tex,sampler,priority));
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: NodePath::set_shader_input
-//       Access: Published
-//  Description:
-////////////////////////////////////////////////////////////////////
-void NodePath::
-set_shader_input(const InternalName *id, Texture *tex, bool read, bool write, int z, int n, int priority) {
-  set_shader_input(new ShaderInput(id,tex,read,write,z,n,priority));
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: NodePath::set_shader_input
-//       Access: Published
-//  Description:
-////////////////////////////////////////////////////////////////////
-void NodePath::
-set_shader_input(const InternalName *id, const NodePath &np, int priority) {
-  set_shader_input(new ShaderInput(id,np,priority));
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: NodePath::set_shader_input
-//       Access: Published
-//  Description:
-////////////////////////////////////////////////////////////////////
-void NodePath::
-set_shader_input(const InternalName *id, int n1, int n2, int n3, int n4, int priority) {
-  set_shader_input(new ShaderInput(id, LVecBase4i(n1, n2, n3, n4), priority));
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: NodePath::set_shader_input
-//       Access: Published
-//  Description:
-////////////////////////////////////////////////////////////////////
-void NodePath::
-set_shader_input(const InternalName *id, PN_stdfloat n1, PN_stdfloat n2, PN_stdfloat n3, PN_stdfloat n4, int priority) {
-  set_shader_input(new ShaderInput(id, LVecBase4(n1, n2, n3, n4), priority));
-}
-
 ////////////////////////////////////////////////////////////////////
 //     Function: NodePath::set_instance_count
 //       Access: Published
@@ -4359,38 +4106,6 @@ set_tex_gen(TextureStage *stage, RenderAttrib::TexGenMode mode, int priority) {
   node()->set_attrib(tga->add_stage(stage, mode), priority);
 }
 
-////////////////////////////////////////////////////////////////////
-//     Function: NodePath::set_tex_gen
-//       Access: Published
-//  Description: Enables automatic texture coordinate generation for
-//               the indicated texture stage.  This version of this
-//               method is useful when setting M_light_vector, which
-//               requires the name of the texture coordinate set that
-//               supplies the tangent and binormal, as well as the
-//               specific light to generate coordinates for.
-////////////////////////////////////////////////////////////////////
-void NodePath::
-set_tex_gen(TextureStage *stage, RenderAttrib::TexGenMode mode,
-            const string &source_name, const NodePath &light, int priority) {
-  nassertv_always(!is_empty());
-
-  const RenderAttrib *attrib =
-    node()->get_attrib(TexGenAttrib::get_class_slot());
-
-  CPT(TexGenAttrib) tga;
-
-  if (attrib != (const RenderAttrib *)NULL) {
-    priority = max(priority,
-                   node()->get_state()->get_override(TextureAttrib::get_class_slot()));
-    tga = DCAST(TexGenAttrib, attrib);
-
-  } else {
-    tga = DCAST(TexGenAttrib, TexGenAttrib::make());
-  }
-
-  node()->set_attrib(tga->add_stage(stage, mode, source_name, light), priority);
-}
-
 ////////////////////////////////////////////////////////////////////
 //     Function: NodePath::set_tex_gen
 //       Access: Published
@@ -4500,28 +4215,6 @@ get_tex_gen(TextureStage *stage) const {
   return TexGenAttrib::M_off;
 }
 
-////////////////////////////////////////////////////////////////////
-//     Function: NodePath::get_tex_gen_light
-//       Access: Published
-//  Description: Returns the particular Light set for the indicated
-//               texgen mode's texture stage, or empty NodePath if no
-//               light is set.  This is only meaningful if the texgen
-//               mode (returned by get_tex_gen()) is M_light_vector.
-////////////////////////////////////////////////////////////////////
-NodePath NodePath::
-get_tex_gen_light(TextureStage *stage) const {
-  nassertr_always(!is_empty(), NodePath::fail());
-
-  const RenderAttrib *attrib =
-    node()->get_attrib(TexGenAttrib::get_class_slot());
-  if (attrib != (const RenderAttrib *)NULL) {
-    const TexGenAttrib *tga = DCAST(TexGenAttrib, attrib);
-    return tga->get_light(stage);
-  }
-
-  return NodePath();
-}
-
 ////////////////////////////////////////////////////////////////////
 //     Function: NodePath::set_tex_projector
 //       Access: Published
@@ -4676,99 +4369,6 @@ project_texture(TextureStage *stage, Texture *tex, const NodePath &projector) {
   set_tex_projector(stage, NodePath(), projector);
 }
 
-
-////////////////////////////////////////////////////////////////////
-//     Function: NodePath::set_normal_map
-//       Access: Published
-//  Description: A convenience function to set up a normal map on this
-//               geometry.  This uses the single highest-priority
-//               light on the object only.  It also requires
-//               multitexture, and consumes at least two texture
-//               stages, in addition to what may already be in use.
-//
-//               The normal_map parameter is the texture that contains
-//               the normal map information (with a 3-d delta vector
-//               encoded into the r,g,b of each texel).  texcoord_name is
-//               the name of the texture coordinate set that contains
-//               the tangent and binormal we wish to use.  If
-//               preserve_color is true, then one additional texture
-//               stage is consumed to blend in the geometry's original
-//               vertex color.
-//
-//               Only one normal map may be in effect through this
-//               interface at any given time.
-////////////////////////////////////////////////////////////////////
-void NodePath::
-set_normal_map(Texture *normal_map, const string &texcoord_name,
-               bool preserve_color) {
-  clear_normal_map();
-
-  // First, we apply the normal map itself, to the bottom layer.
-  PT(TextureStage) normal_map_ts = new TextureStage("__normal_map");
-  normal_map_ts->set_texcoord_name(texcoord_name);
-  normal_map_ts->set_sort(-20);
-  normal_map_ts->set_mode(TextureStage::M_replace);
-  set_texture(normal_map_ts, normal_map);
-
-  // Then, we apply a normalization map, to normalize, per-pixel, the
-  // vector to the light.
-  PT(Texture) normalization_map = TexturePool::get_normalization_cube_map(32);
-  PT(TextureStage) normalization_map_ts = new TextureStage("__normalization_map");
-  normalization_map_ts->set_combine_rgb
-    (TextureStage::CM_dot3_rgb,
-     TextureStage::CS_texture, TextureStage::CO_src_color,
-     TextureStage::CS_previous, TextureStage::CO_src_color);
-  normalization_map_ts->set_texcoord_name("light_vector");
-  normalization_map_ts->set_sort(-15);
-  set_texture(normalization_map_ts, normalization_map);
-
-  // Finally, we enable M_light_vector texture coordinate generation.
-  set_tex_gen(normalization_map_ts, TexGenAttrib::M_light_vector,
-              texcoord_name, NodePath());
-
-  if (preserve_color) {
-    // One more stage to get back the original color.
-    PT(TextureStage) orig_color_ts = new TextureStage("__orig_color");
-    orig_color_ts->set_combine_rgb
-      (TextureStage::CM_modulate,
-       TextureStage::CS_primary_color, TextureStage::CO_src_color,
-       TextureStage::CS_previous, TextureStage::CO_src_color);
-    set_texture(orig_color_ts, normal_map);
-  }
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: NodePath::clear_normal_map
-//       Access: Published
-//  Description: Undoes the effect of a previous call to
-//               set_normal_map().
-////////////////////////////////////////////////////////////////////
-void NodePath::
-clear_normal_map() {
-  // Scan through the TextureStages, and if we find any whose name
-  // matches one of the stages that would have been left by
-  // set_normal_map(), remove it from the state.
-
-  CPT(RenderAttrib) attrib =
-    get_state()->get_attrib(TextureAttrib::get_class_slot());
-  if (attrib != (const RenderAttrib *)NULL) {
-    const TextureAttrib *ta = DCAST(TextureAttrib, attrib);
-    for (int i = 0; i < ta->get_num_on_stages(); i++) {
-      TextureStage *stage = ta->get_on_stage(i);
-      if (stage->get_name() == "__normal_map") {
-        clear_texture(stage);
-
-      } else if (stage->get_name() == "__normalization_map") {
-        clear_texture(stage);
-        clear_tex_gen(stage);
-
-      } else if (stage->get_name() == "__orig_color") {
-        clear_texture(stage);
-      }
-    }
-  }
-}
-
 ////////////////////////////////////////////////////////////////////
 //     Function: NodePath::has_vertex_column
 //       Access: Published
@@ -4825,7 +4425,7 @@ find_all_vertex_columns(const string &name) const {
   InternalNameCollection tc;
   InternalNames::iterator ti;
   for (ti = vertex_columns.begin(); ti != vertex_columns.end(); ++ti) {
-    InternalName *name = (*ti);
+    const InternalName *name = (*ti);
     if (glob.matches(name->get_name())) {
       tc.add_name(name);
     }
@@ -4872,12 +4472,12 @@ find_all_texcoords(const string &name) const {
   r_find_all_vertex_columns(node(), vertex_columns);
 
   GlobPattern glob(name);
-  CPT(InternalName) texcoord_name = InternalName::get_texcoord();
+  CPT_InternalName texcoord_name = InternalName::get_texcoord();
 
   InternalNameCollection tc;
   InternalNames::iterator ti;
   for (ti = vertex_columns.begin(); ti != vertex_columns.end(); ++ti) {
-    InternalName *name = (*ti);
+    const InternalName *name = (*ti);
     if (name->get_top() == texcoord_name) {
       // This is a texture coordinate name.  Figure out the basename
       // of the texture coordinates.
@@ -5360,6 +4960,22 @@ set_render_mode_filled(int priority) {
   node()->set_attrib(RenderModeAttrib::make(RenderModeAttrib::M_filled, thickness, perspective), priority);
 }
 
+////////////////////////////////////////////////////////////////////
+//     Function: NodePath::set_render_mode_filled_wireframe
+//       Access: Published
+//  Description: Sets up the geometry at this level and below (unless
+//               overridden) to render in filled, but overlay the
+//               wireframe on top with a fixed color.  This is useful
+//               for debug visualizations.
+////////////////////////////////////////////////////////////////////
+void NodePath::
+set_render_mode_filled_wireframe(const LColor &wireframe_color, int priority) {
+  nassertv_always(!is_empty());
+  PN_stdfloat thickness = get_render_mode_thickness();
+  bool perspective = get_render_mode_perspective();
+  node()->set_attrib(RenderModeAttrib::make(RenderModeAttrib::M_filled_wireframe, thickness, perspective, wireframe_color), priority);
+}
+
 ////////////////////////////////////////////////////////////////////
 //     Function: NodePath::set_render_mode_perspective
 //       Access: Published
diff --git a/panda/src/pgraph/nodePath.h b/panda/src/pgraph/nodePath.h
index 994f2353e2..f03580f255 100644
--- a/panda/src/pgraph/nodePath.h
+++ b/panda/src/pgraph/nodePath.h
@@ -180,6 +180,11 @@ PUBLISHED:
   INLINE NodePath(const NodePath &copy);
   INLINE void operator = (const NodePath &copy);
 
+#ifdef USE_MOVE_SEMANTICS
+  INLINE NodePath(NodePath &&from) NOEXCEPT;
+  INLINE void operator = (NodePath &&from) NOEXCEPT;
+#endif
+
   EXTENSION(NodePath __copy__() const);
   EXTENSION(PyObject *__deepcopy__(PyObject *self, PyObject *memo) const);
   EXTENSION(PyObject *__reduce__(PyObject *self) const);
@@ -619,39 +624,39 @@ PUBLISHED:
   void clear_shader();
 
   void set_shader_input(const ShaderInput *inp);
-  void set_shader_input(const InternalName *id, Texture *tex, int priority=0);
-  void set_shader_input(const InternalName *id, Texture *tex, const SamplerState &sampler, int priority=0);
-  void set_shader_input(const InternalName *id, Texture *tex, bool read, bool write, int z=-1, int n=0, int priority=0);
-  void set_shader_input(const InternalName *id, const NodePath &np, int priority=0);
-  void set_shader_input(const InternalName *id, const PTA_float &v, int priority=0);
-  void set_shader_input(const InternalName *id, const PTA_double &v, int priority=0);
-  void set_shader_input(const InternalName *id, const PTA_int &v, int priority=0);
-  void set_shader_input(const InternalName *id, const PTA_LVecBase4 &v, int priority=0);
-  void set_shader_input(const InternalName *id, const PTA_LVecBase3 &v, int priority=0);
-  void set_shader_input(const InternalName *id, const PTA_LVecBase2 &v, int priority=0);
-  void set_shader_input(const InternalName *id, const PTA_LMatrix4 &v, int priority=0);
-  void set_shader_input(const InternalName *id, const PTA_LMatrix3 &v, int priority=0);
-  void set_shader_input(const InternalName *id, const LVecBase4 &v, int priority=0);
-  void set_shader_input(const InternalName *id, const LVecBase3 &v, int priority=0);
-  void set_shader_input(const InternalName *id, const LVecBase2 &v, int priority=0);
-  void set_shader_input(const InternalName *id, const LMatrix4 &v, int priority=0);
-  void set_shader_input(const InternalName *id, const LMatrix3 &v, int priority=0);
-  void set_shader_input(const InternalName *id, const PTA_LVecBase4i &v, int priority=0);
-  void set_shader_input(const InternalName *id, const PTA_LVecBase3i &v, int priority=0);
-  void set_shader_input(const InternalName *id, const PTA_LVecBase2i &v, int priority=0);
-  void set_shader_input(const InternalName *id, const LVecBase4i &v, int priority=0);
-  void set_shader_input(const InternalName *id, const LVecBase3i &v, int priority=0);
-  void set_shader_input(const InternalName *id, const LVecBase2i &v, int priority=0);
-  void set_shader_input(const InternalName *id, int n1, int n2=0, int n3=0,
-                                                int n4=0, int priority=0);
-  void set_shader_input(const InternalName *id, PN_stdfloat n1, PN_stdfloat n2=0,
-                        PN_stdfloat n3=0, PN_stdfloat n4=0, int priority=0);
+  INLINE void set_shader_input(CPT_InternalName id, Texture *tex, int priority=0);
+  INLINE void set_shader_input(CPT_InternalName id, Texture *tex, const SamplerState &sampler, int priority=0);
+  INLINE void set_shader_input(CPT_InternalName id, Texture *tex, bool read, bool write, int z=-1, int n=0, int priority=0);
+  INLINE void set_shader_input(CPT_InternalName id, const NodePath &np, int priority=0);
+  INLINE void set_shader_input(CPT_InternalName id, const PTA_float &v, int priority=0);
+  INLINE void set_shader_input(CPT_InternalName id, const PTA_double &v, int priority=0);
+  INLINE void set_shader_input(CPT_InternalName id, const PTA_int &v, int priority=0);
+  INLINE void set_shader_input(CPT_InternalName id, const PTA_LVecBase4 &v, int priority=0);
+  INLINE void set_shader_input(CPT_InternalName id, const PTA_LVecBase3 &v, int priority=0);
+  INLINE void set_shader_input(CPT_InternalName id, const PTA_LVecBase2 &v, int priority=0);
+  INLINE void set_shader_input(CPT_InternalName id, const PTA_LMatrix4 &v, int priority=0);
+  INLINE void set_shader_input(CPT_InternalName id, const PTA_LMatrix3 &v, int priority=0);
+  INLINE void set_shader_input(CPT_InternalName id, const LVecBase4 &v, int priority=0);
+  INLINE void set_shader_input(CPT_InternalName id, const LVecBase3 &v, int priority=0);
+  INLINE void set_shader_input(CPT_InternalName id, const LVecBase2 &v, int priority=0);
+  INLINE void set_shader_input(CPT_InternalName id, const LMatrix4 &v, int priority=0);
+  INLINE void set_shader_input(CPT_InternalName id, const LMatrix3 &v, int priority=0);
+  INLINE void set_shader_input(CPT_InternalName id, const PTA_LVecBase4i &v, int priority=0);
+  INLINE void set_shader_input(CPT_InternalName id, const PTA_LVecBase3i &v, int priority=0);
+  INLINE void set_shader_input(CPT_InternalName id, const PTA_LVecBase2i &v, int priority=0);
+  INLINE void set_shader_input(CPT_InternalName id, const LVecBase4i &v, int priority=0);
+  INLINE void set_shader_input(CPT_InternalName id, const LVecBase3i &v, int priority=0);
+  INLINE void set_shader_input(CPT_InternalName id, const LVecBase2i &v, int priority=0);
+  INLINE void set_shader_input(CPT_InternalName id, int n1, int n2=0, int n3=0,
+                                                    int n4=0, int priority=0);
+  INLINE void set_shader_input(CPT_InternalName id, PN_stdfloat n1, PN_stdfloat n2=0,
+                               PN_stdfloat n3=0, PN_stdfloat n4=0, int priority=0);
 
-  void clear_shader_input(const InternalName *id);
+  void clear_shader_input(CPT_InternalName id);
   void set_instance_count(int instance_count);
 
   const Shader *get_shader() const;
-  const ShaderInput *get_shader_input(const InternalName *id) const;
+  const ShaderInput *get_shader_input(CPT_InternalName id) const;
   int get_instance_count() const;
 
   void set_tex_transform(TextureStage *stage, const TransformState *transform);
@@ -704,9 +709,6 @@ PUBLISHED:
   INLINE LVecBase3 get_tex_scale_3d(const NodePath &other, TextureStage *stage) const;
 
   void set_tex_gen(TextureStage *stage, RenderAttrib::TexGenMode mode, int priority = 0);
-  void set_tex_gen(TextureStage *stage, RenderAttrib::TexGenMode mode,
-                   const string &source_name, const NodePath &light,
-                   int priority = 0);
   void set_tex_gen(TextureStage *stage, RenderAttrib::TexGenMode mode,
                    const LTexCoord3 &constant_value,
                    int priority = 0);
@@ -714,7 +716,6 @@ PUBLISHED:
   void clear_tex_gen(TextureStage *stage);
   bool has_tex_gen(TextureStage *stage) const;
   RenderAttrib::TexGenMode get_tex_gen(TextureStage *stage) const;
-  NodePath get_tex_gen_light(TextureStage *stage) const;
 
   void set_tex_projector(TextureStage *stage, const NodePath &from, const NodePath &to,
                          int lens_index = 0);
@@ -727,10 +728,6 @@ PUBLISHED:
   void project_texture(TextureStage *stage, Texture *tex, const NodePath &projector);
   INLINE void clear_project_texture(TextureStage *stage);
 
-  void set_normal_map(Texture *normal_map, const string &texcoord_name = string(),
-                      bool preserve_color = false);
-  void clear_normal_map();
-
   INLINE bool has_texcoord(const string &texcoord_name) const;
   bool has_vertex_column(const InternalName *name) const;
   InternalNameCollection find_all_vertex_columns() const;
@@ -769,6 +766,7 @@ PUBLISHED:
 
   void set_render_mode_wireframe(int priority = 0);
   void set_render_mode_filled(int priority = 0);
+  void set_render_mode_filled_wireframe(const LColor &wireframe_color, int priority = 0);
   void set_render_mode_thickness(PN_stdfloat thickness, int priority = 0);
   void set_render_mode_perspective(bool perspective, int priority = 0);
   void set_render_mode(RenderModeAttrib::Mode mode, PN_stdfloat thickness, int priority = 0);
@@ -956,7 +954,7 @@ private:
                           CollideMask and_mask, CollideMask or_mask,
                           TypeHandle node_type);
 
-  typedef phash_set<InternalName *, pointer_hash> InternalNames;
+  typedef phash_set<const InternalName *, pointer_hash> InternalNames;
   bool r_has_vertex_column(PandaNode *node, const InternalName *name) const;
   void r_find_all_vertex_columns(PandaNode *node,
                                  InternalNames &vertex_columns) const;
@@ -1010,6 +1008,9 @@ private:
 
 INLINE ostream &operator << (ostream &out, const NodePath &node_path);
 
+// We have to put this down here, to work around a circular include.
+#include "shaderInput.h"
+
 #include "nodePath.I"
 
 #endif
diff --git a/panda/src/pgraph/nodePathCollection.cxx b/panda/src/pgraph/nodePathCollection.cxx
index bd3ddfbcc6..c704543838 100644
--- a/panda/src/pgraph/nodePathCollection.cxx
+++ b/panda/src/pgraph/nodePathCollection.cxx
@@ -20,10 +20,6 @@
 #include "colorAttrib.h"
 #include "indent.h"
 
-#ifdef HAVE_PYTHON
-#include "py_panda.h"
-#endif
-
 ////////////////////////////////////////////////////////////////////
 //     Function: NodePathCollection::Constructor
 //       Access: Published
@@ -54,48 +50,6 @@ operator = (const NodePathCollection &copy) {
   _node_paths = copy._node_paths;
 }
 
-#ifdef HAVE_PYTHON
-////////////////////////////////////////////////////////////////////
-//     Function: NodePathCollection::Constructor
-//       Access: Published
-//  Description: This special constructor accepts a Python list of
-//               NodePaths.  Since this constructor accepts a generic
-//               PyObject *, it should be the last constructor listed
-//               in the class record.
-////////////////////////////////////////////////////////////////////
-NodePathCollection::
-NodePathCollection(PyObject *self, PyObject *sequence) {
-  // We have to pre-initialize self's "this" pointer when we receive
-  // self in the constructor--the caller can't initialize this for us.
-  ((Dtool_PyInstDef *)self)->_ptr_to_object = this;
-
-  if (!PySequence_Check(sequence)) {
-    // If passed with a non-sequence, this isn't the right constructor.
-    PyErr_SetString(PyExc_TypeError, "NodePathCollection constructor requires a sequence");
-    return;
-  }
-
-  int size = PySequence_Size(sequence);
-  for (int i = 0; i < size; ++i) {
-    PyObject *item = PySequence_GetItem(sequence, i);
-    if (item == NULL) {
-      return;
-    }
-    PyObject *result = PyObject_CallMethod(self, (char *)"addPath", (char *)"O", item);
-    Py_DECREF(item);
-    if (result == NULL) {
-      // Unable to add item--probably it wasn't of the appropriate type.
-      ostringstream stream;
-      stream << "Element " << i << " in sequence passed to NodePathCollection constructor could not be added";
-      string str = stream.str();
-      PyErr_SetString(PyExc_TypeError, str.c_str());
-      return;
-    }
-    Py_DECREF(result);
-  }
-}
-#endif  // HAVE_PYTHON
-
 ////////////////////////////////////////////////////////////////////
 //     Function: NodePathCollection::add_path
 //       Access: Published
@@ -244,6 +198,18 @@ clear() {
   _node_paths.clear();
 }
 
+////////////////////////////////////////////////////////////////////
+//     Function: NodePathCollection::reserve
+//       Access: Published
+//  Description: This is a hint to Panda to allocate enough memory
+//               to hold the given number of NodePaths, if you know
+//               ahead of time how many you will be adding.
+////////////////////////////////////////////////////////////////////
+void NodePathCollection::
+reserve(size_t num) {
+  _node_paths.reserve(num);
+}
+
 ////////////////////////////////////////////////////////////////////
 //     Function: NodePathCollection::is_empty
 //       Access: Published
@@ -335,7 +301,7 @@ find_all_matches(const string &path) const {
     if (!is_empty()) {
       FindApproxLevelEntry *level = NULL;
       for (int i = 0; i < get_num_paths(); i++) {
-        FindApproxLevelEntry *start = 
+        FindApproxLevelEntry *start =
           new FindApproxLevelEntry(get_path(i), approx_path);
         start->_next = level;
         level = start;
diff --git a/panda/src/pgraph/nodePathCollection.h b/panda/src/pgraph/nodePathCollection.h
index 6265f85d16..8527db5b5d 100644
--- a/panda/src/pgraph/nodePathCollection.h
+++ b/panda/src/pgraph/nodePathCollection.h
@@ -34,7 +34,7 @@ PUBLISHED:
   INLINE ~NodePathCollection();
 
 #ifdef HAVE_PYTHON
-  NodePathCollection(PyObject *self, PyObject *sequence);
+  EXTENSION(NodePathCollection(PyObject *self, PyObject *sequence));
   EXTENSION(PyObject *__reduce__(PyObject *self) const);
 #endif
 
@@ -45,6 +45,7 @@ PUBLISHED:
   void remove_duplicate_paths();
   bool has_path(const NodePath &path) const;
   void clear();
+  void reserve(size_t num);
 
   bool is_empty() const;
   int get_num_paths() const;
diff --git a/panda/src/pgraph/nodePathCollection_ext.I b/panda/src/pgraph/nodePathCollection_ext.I
deleted file mode 100644
index d88ba08295..0000000000
--- a/panda/src/pgraph/nodePathCollection_ext.I
+++ /dev/null
@@ -1,51 +0,0 @@
-// Filename: nodePathCollection_ext.I
-// Created by:  rdb (09Dec13)
-//
-////////////////////////////////////////////////////////////////////
-//
-// 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 CPPPARSER
-#ifdef STDFLOAT_DOUBLE
-IMPORT_THIS struct Dtool_PyTypedObject Dtool_LPoint3d;
-#else
-IMPORT_THIS struct Dtool_PyTypedObject Dtool_LPoint3f;
-#endif
-#endif
-
-////////////////////////////////////////////////////////////////////
-//     Function: Extension<NodePathCollection>::get_tight_bounds
-//       Access: Published
-//  Description: Returns the tight bounds as a 2-tuple of LPoint3
-//               objects.  This is a convenience function for Python
-//               users, among which the use of calc_tight_bounds
-//               may be confusing.
-//               Returns None if calc_tight_bounds returned false.
-////////////////////////////////////////////////////////////////////
-INLINE PyObject *Extension<NodePathCollection>::
-get_tight_bounds() const {
-  LPoint3 *min_point = new LPoint3;
-  LPoint3 *max_point = new LPoint3;
-
-  if (_this->calc_tight_bounds(*min_point, *max_point)) {
-#ifdef STDFLOAT_DOUBLE
-    PyObject *min_inst = DTool_CreatePyInstance((void*) min_point, Dtool_LPoint3d, true, false);
-    PyObject *max_inst = DTool_CreatePyInstance((void*) max_point, Dtool_LPoint3d, true, false);
-#else
-    PyObject *min_inst = DTool_CreatePyInstance((void*) min_point, Dtool_LPoint3f, true, false);
-    PyObject *max_inst = DTool_CreatePyInstance((void*) max_point, Dtool_LPoint3f, true, false);
-#endif
-    return Py_BuildValue("NN", min_inst, max_inst);
-
-  } else {
-    Py_INCREF(Py_None);
-    return Py_None;
-  }
-}
diff --git a/panda/src/pgraph/nodePathCollection_ext.cxx b/panda/src/pgraph/nodePathCollection_ext.cxx
index 324e746d47..48898fb547 100644
--- a/panda/src/pgraph/nodePathCollection_ext.cxx
+++ b/panda/src/pgraph/nodePathCollection_ext.cxx
@@ -16,6 +16,57 @@
 
 #ifdef HAVE_PYTHON
 
+#ifndef CPPPARSER
+extern struct Dtool_PyTypedObject Dtool_NodePath;
+#ifdef STDFLOAT_DOUBLE
+extern struct Dtool_PyTypedObject Dtool_LPoint3d;
+#else
+extern struct Dtool_PyTypedObject Dtool_LPoint3f;
+#endif
+#endif
+
+////////////////////////////////////////////////////////////////////
+//     Function: NodePathCollection::__init__
+//       Access: Published
+//  Description: This special constructor accepts a Python list of
+//               NodePaths.  Since this constructor accepts a generic
+//               PyObject *, it should be the last constructor listed
+//               in the class record.
+////////////////////////////////////////////////////////////////////
+void Extension<NodePathCollection>::
+__init__(PyObject *self, PyObject *sequence) {
+  PyObject *fast = PySequence_Fast(sequence, "NodePathCollection constructor requires a sequence");
+  if (fast == NULL) {
+    return;
+  }
+
+  Py_ssize_t size = PySequence_Fast_GET_SIZE(fast);
+  _this->reserve(size);
+
+  for (int i = 0; i < size; ++i) {
+    PyObject *item = PySequence_Fast_GET_ITEM(fast, i);
+    if (item == NULL) {
+      return;
+    }
+
+    NodePath *path;
+    DTOOL_Call_ExtractThisPointerForType(item, &Dtool_NodePath, (void **)&path);
+    if (path == (NodePath *)NULL) {
+      // Unable to add item--probably it wasn't of the appropriate type.
+      ostringstream stream;
+      stream << "Element " << i << " in sequence passed to NodePathCollection constructor is not a NodePath";
+      string str = stream.str();
+      PyErr_SetString(PyExc_TypeError, str.c_str());
+      Py_DECREF(fast);
+      return;
+    } else {
+      _this->add_path(*path);
+    }
+  }
+
+  Py_DECREF(fast);
+}
+
 ////////////////////////////////////////////////////////////////////
 //     Function: NodePathCollection::__reduce__
 //       Access: Published
@@ -45,4 +96,34 @@ __reduce__(PyObject *self) const {
   return result;
 }
 
+////////////////////////////////////////////////////////////////////
+//     Function: Extension<NodePathCollection>::get_tight_bounds
+//       Access: Published
+//  Description: Returns the tight bounds as a 2-tuple of LPoint3
+//               objects.  This is a convenience function for Python
+//               users, among which the use of calc_tight_bounds
+//               may be confusing.
+//               Returns None if calc_tight_bounds returned false.
+////////////////////////////////////////////////////////////////////
+PyObject *Extension<NodePathCollection>::
+get_tight_bounds() const {
+  LPoint3 *min_point = new LPoint3;
+  LPoint3 *max_point = new LPoint3;
+
+  if (_this->calc_tight_bounds(*min_point, *max_point)) {
+#ifdef STDFLOAT_DOUBLE
+    PyObject *min_inst = DTool_CreatePyInstance((void*) min_point, Dtool_LPoint3d, true, false);
+    PyObject *max_inst = DTool_CreatePyInstance((void*) max_point, Dtool_LPoint3d, true, false);
+#else
+    PyObject *min_inst = DTool_CreatePyInstance((void*) min_point, Dtool_LPoint3f, true, false);
+    PyObject *max_inst = DTool_CreatePyInstance((void*) max_point, Dtool_LPoint3f, true, false);
 #endif
+    return Py_BuildValue("NN", min_inst, max_inst);
+
+  } else {
+    Py_INCREF(Py_None);
+    return Py_None;
+  }
+}
+
+#endif  // HAVE_PYTHON
diff --git a/panda/src/pgraph/nodePathCollection_ext.h b/panda/src/pgraph/nodePathCollection_ext.h
index 96dc6f9e19..60aa2203ec 100644
--- a/panda/src/pgraph/nodePathCollection_ext.h
+++ b/panda/src/pgraph/nodePathCollection_ext.h
@@ -32,13 +32,13 @@
 template<>
 class Extension<NodePathCollection> : public ExtensionBase<NodePathCollection> {
 public:
+  void __init__(PyObject *self, PyObject *sequence);
+
   PyObject *__reduce__(PyObject *self) const;
 
-  INLINE PyObject *get_tight_bounds() const;
+  PyObject *get_tight_bounds() const;
 };
 
-#include "nodePathCollection_ext.I"
-
 #endif  // HAVE_PYTHON
 
 #endif  // NODEPATHCOLLECTION_EXT_H
diff --git a/panda/src/pgraph/nodePath_ext.I b/panda/src/pgraph/nodePath_ext.I
index 3888d6f8f2..f40acd26d8 100644
--- a/panda/src/pgraph/nodePath_ext.I
+++ b/panda/src/pgraph/nodePath_ext.I
@@ -14,14 +14,6 @@
 
 #include "pandaNode_ext.h"
 
-#ifndef CPPPARSER
-#ifdef STDFLOAT_DOUBLE
-IMPORT_THIS struct Dtool_PyTypedObject Dtool_LPoint3d;
-#else
-IMPORT_THIS struct Dtool_PyTypedObject Dtool_LPoint3f;
-#endif
-#endif
-
 ////////////////////////////////////////////////////////////////////
 //     Function: Extension<NodePath>::get_python_tag_keys
 //       Access: Published
@@ -167,33 +159,3 @@ INLINE bool Extension<NodePath>::
 has_net_python_tag(const string &key) const {
   return !find_net_python_tag(key).is_empty();
 }
-
-////////////////////////////////////////////////////////////////////
-//     Function: Extension<NodePath>::get_tight_bounds
-//       Access: Published
-//  Description: Returns the tight bounds as a 2-tuple of LPoint3
-//               objects.  This is a convenience function for Python
-//               users, among which the use of calc_tight_bounds
-//               may be confusing.
-//               Returns None if calc_tight_bounds returned false.
-////////////////////////////////////////////////////////////////////
-INLINE PyObject *Extension<NodePath>::
-get_tight_bounds() const {
-  LPoint3 *min_point = new LPoint3;
-  LPoint3 *max_point = new LPoint3;
-
-  if (_this->calc_tight_bounds(*min_point, *max_point)) {
-#ifdef STDFLOAT_DOUBLE
-    PyObject *min_inst = DTool_CreatePyInstance((void*) min_point, Dtool_LPoint3d, true, false);
-    PyObject *max_inst = DTool_CreatePyInstance((void*) max_point, Dtool_LPoint3d, true, false);
-#else
-    PyObject *min_inst = DTool_CreatePyInstance((void*) min_point, Dtool_LPoint3f, true, false);
-    PyObject *max_inst = DTool_CreatePyInstance((void*) max_point, Dtool_LPoint3f, true, false);
-#endif
-    return Py_BuildValue("NN", min_inst, max_inst);
-
-  } else {
-    Py_INCREF(Py_None);
-    return Py_None;
-  }
-}
diff --git a/panda/src/pgraph/nodePath_ext.cxx b/panda/src/pgraph/nodePath_ext.cxx
index 4192675f1b..b5cc7dbd51 100644
--- a/panda/src/pgraph/nodePath_ext.cxx
+++ b/panda/src/pgraph/nodePath_ext.cxx
@@ -18,8 +18,13 @@
 #ifdef HAVE_PYTHON
 
 #ifndef CPPPARSER
-extern EXPCL_PANDA_PUTIL Dtool_PyTypedObject Dtool_BamWriter;
-extern EXPCL_PANDA_PUTIL Dtool_PyTypedObject Dtool_BamReader;
+extern struct Dtool_PyTypedObject Dtool_BamWriter;
+extern struct Dtool_PyTypedObject Dtool_BamReader;
+#ifdef STDFLOAT_DOUBLE
+extern struct Dtool_PyTypedObject Dtool_LPoint3d;
+#else
+extern struct Dtool_PyTypedObject Dtool_LPoint3f;
+#endif
 #endif  // CPPPARSER
 
 ////////////////////////////////////////////////////////////////////
@@ -53,7 +58,7 @@ __copy__() const {
 ////////////////////////////////////////////////////////////////////
 PyObject *Extension<NodePath>::
 __deepcopy__(PyObject *self, PyObject *memo) const {
-  IMPORT_THIS struct Dtool_PyTypedObject Dtool_NodePath;
+  extern struct Dtool_PyTypedObject Dtool_NodePath;
 
   // Borrowed reference.
   PyObject *dupe = PyDict_GetItem(memo, self);
@@ -228,5 +233,34 @@ py_decode_NodePath_from_bam_stream_persist(PyObject *unpickler, const string &da
   return NodePath::decode_from_bam_stream(data, reader);
 }
 
-#endif  // HAVE_PYTHON
+////////////////////////////////////////////////////////////////////
+//     Function: Extension<NodePath>::get_tight_bounds
+//       Access: Published
+//  Description: Returns the tight bounds as a 2-tuple of LPoint3
+//               objects.  This is a convenience function for Python
+//               users, among which the use of calc_tight_bounds
+//               may be confusing.
+//               Returns None if calc_tight_bounds returned false.
+////////////////////////////////////////////////////////////////////
+PyObject *Extension<NodePath>::
+get_tight_bounds() const {
+  LPoint3 *min_point = new LPoint3;
+  LPoint3 *max_point = new LPoint3;
 
+  if (_this->calc_tight_bounds(*min_point, *max_point)) {
+#ifdef STDFLOAT_DOUBLE
+    PyObject *min_inst = DTool_CreatePyInstance((void*) min_point, Dtool_LPoint3d, true, false);
+    PyObject *max_inst = DTool_CreatePyInstance((void*) max_point, Dtool_LPoint3d, true, false);
+#else
+    PyObject *min_inst = DTool_CreatePyInstance((void*) min_point, Dtool_LPoint3f, true, false);
+    PyObject *max_inst = DTool_CreatePyInstance((void*) max_point, Dtool_LPoint3f, true, false);
+#endif
+    return Py_BuildValue("NN", min_inst, max_inst);
+
+  } else {
+    Py_INCREF(Py_None);
+    return Py_None;
+  }
+}
+
+#endif  // HAVE_PYTHON
diff --git a/panda/src/pgraph/nodePath_ext.h b/panda/src/pgraph/nodePath_ext.h
index c91a462bff..00983a9de1 100644
--- a/panda/src/pgraph/nodePath_ext.h
+++ b/panda/src/pgraph/nodePath_ext.h
@@ -48,7 +48,7 @@ public:
   INLINE bool has_net_python_tag(const string &key) const;
   NodePath find_net_python_tag(const string &key) const;
 
-  INLINE PyObject *get_tight_bounds() const;
+  PyObject *get_tight_bounds() const;
 };
 
 BEGIN_PUBLISH
diff --git a/panda/src/pgraph/occluderNode.cxx b/panda/src/pgraph/occluderNode.cxx
index 3afecfb25d..543c3eb906 100644
--- a/panda/src/pgraph/occluderNode.cxx
+++ b/panda/src/pgraph/occluderNode.cxx
@@ -164,20 +164,16 @@ bool OccluderNode::
 cull_callback(CullTraverser *trav, CullTraverserData &data) {
   // Normally, an OccluderNode is invisible.  But if someone shows it,
   // we will draw a visualization, a checkerboard-textured polygon.
-  CullableObject *occluder_viz = 
-    new CullableObject(get_occluder_viz(trav, data), get_occluder_viz_state(trav, data), 
-                       data.get_net_transform(trav),
-                       data.get_modelview_transform(trav),
-                       trav->get_scene());
+  CullableObject *occluder_viz =
+    new CullableObject(get_occluder_viz(trav, data), get_occluder_viz_state(trav, data),
+                       data.get_internal_transform(trav));
   trav->get_cull_handler()->record_object(occluder_viz, trav);
 
   // Also get the frame.
   nassertr(_frame_viz != (Geom *)NULL, false);
-  CullableObject *frame_viz = 
-    new CullableObject(_frame_viz, get_frame_viz_state(trav, data), 
-                       data.get_net_transform(trav),
-                       data.get_modelview_transform(trav),
-                       trav->get_scene());
+  CullableObject *frame_viz =
+    new CullableObject(_frame_viz, get_frame_viz_state(trav, data),
+                       data.get_internal_transform(trav));
   trav->get_cull_handler()->record_object(frame_viz, trav);
 
   // Now carry on to render our child nodes.
diff --git a/panda/src/pgraph/p3pgraph_composite2.cxx b/panda/src/pgraph/p3pgraph_composite2.cxx
index a3980ff748..e6407dbd54 100644
--- a/panda/src/pgraph/p3pgraph_composite2.cxx
+++ b/panda/src/pgraph/p3pgraph_composite2.cxx
@@ -13,7 +13,6 @@
 #include "depthTestAttrib.cxx"
 #include "depthWriteAttrib.cxx"
 #include "alphaTestAttrib.cxx"
-#include "eventStorePandaNode.cxx"
 #include "findApproxPath.cxx"
 #include "findApproxLevelEntry.cxx"
 #include "fog.cxx"
diff --git a/panda/src/pgraph/pandaNode.I b/panda/src/pgraph/pandaNode.I
index 6b3e27275c..162f08e03b 100644
--- a/panda/src/pgraph/pandaNode.I
+++ b/panda/src/pgraph/pandaNode.I
@@ -231,7 +231,7 @@ find_stashed(PandaNode *node, Thread *current_thread) const {
 //               level, and has nothing to do with what render
 //               attributes may be inherited from parent nodes.
 ////////////////////////////////////////////////////////////////////
-INLINE const RenderAttrib *PandaNode::
+INLINE CPT(RenderAttrib) PandaNode::
 get_attrib(TypeHandle type) const {
   CDReader cdata(_cycler);
   return cdata->_state->get_attrib(type);
@@ -246,7 +246,7 @@ get_attrib(TypeHandle type) const {
 //               level, and has nothing to do with what render
 //               attributes may be inherited from parent nodes.
 ////////////////////////////////////////////////////////////////////
-INLINE const RenderAttrib *PandaNode::
+INLINE CPT(RenderAttrib) PandaNode::
 get_attrib(int slot) const {
   CDReader cdata(_cycler);
   return cdata->_state->get_attrib(slot);
@@ -299,7 +299,7 @@ clear_attrib(TypeHandle type) {
 //  Description: Returns the render effect of the indicated type,
 //               if it is defined on the node, or NULL if it is not.
 ////////////////////////////////////////////////////////////////////
-INLINE const RenderEffect *PandaNode::
+INLINE CPT(RenderEffect) PandaNode::
 get_effect(TypeHandle type) const {
   CDReader cdata(_cycler);
   int index = cdata->_effects->find_effect(type);
@@ -332,10 +332,10 @@ has_effect(TypeHandle type) const {
 //               particular node, and has nothing to do with state
 //               that might be inherited from above.
 ////////////////////////////////////////////////////////////////////
-INLINE const RenderState *PandaNode::
+INLINE CPT(RenderState) PandaNode::
 get_state(Thread *current_thread) const {
   CDReader cdata(_cycler, current_thread);
-  return cdata->_state;
+  return cdata->_state.p();
 }
 
 ////////////////////////////////////////////////////////////////////
@@ -357,7 +357,7 @@ clear_state(Thread *current_thread) {
 //  Description: Returns the complete RenderEffects that will be
 //               applied to this node.
 ////////////////////////////////////////////////////////////////////
-INLINE const RenderEffects *PandaNode::
+INLINE CPT(RenderEffects) PandaNode::
 get_effects(Thread *current_thread) const {
   CDReader cdata(_cycler, current_thread);
   return cdata->_effects;
@@ -381,10 +381,10 @@ clear_effects(Thread *current_thread) {
 //               the root, but simply the transform on this particular
 //               node.
 ////////////////////////////////////////////////////////////////////
-INLINE const TransformState *PandaNode::
+INLINE CPT(TransformState) PandaNode::
 get_transform(Thread *current_thread) const {
   CDReader cdata(_cycler, current_thread);
-  return cdata->_transform;
+  return cdata->_transform.p();
 }
 
 ////////////////////////////////////////////////////////////////////
@@ -405,10 +405,10 @@ clear_transform(Thread *current_thread) {
 //               node's "previous" position.  See
 //               set_prev_transform().
 ////////////////////////////////////////////////////////////////////
-const TransformState *PandaNode::
+INLINE CPT(TransformState) PandaNode::
 get_prev_transform(Thread *current_thread) const {
   CDReader cdata(_cycler, current_thread);
-  return cdata->_prev_transform;
+  return cdata->_prev_transform.p();
 }
 
 ////////////////////////////////////////////////////////////////////
@@ -632,14 +632,14 @@ get_internal_vertices(Thread *current_thread) const {
 //     Function: PandaNode::is_bounds_stale
 //       Access: Published
 //  Description: Returns true if the bounding volume of this node is
-//                stale and will be implicitly recomputed at the next
-//                call to get_bounds(), or false if it is fresh and
-//                need not be recomputed.
+//               stale and will be implicitly recomputed at the next
+//               call to get_bounds(), or false if it is fresh and
+//               need not be recomputed.
 ////////////////////////////////////////////////////////////////////
 bool PandaNode::
 is_bounds_stale() const {
   CDReader cdata(_cycler);
-  return (cdata->_last_update != cdata->_next_update);
+  return (cdata->_last_bounds_update != cdata->_next_update);
 }
 
 ////////////////////////////////////////////////////////////////////
@@ -726,14 +726,13 @@ mark_bounds_stale(int pipeline_stage, Thread *current_thread) const {
   bool is_stale_bounds;
   {
     CDStageReader cdata(_cycler, pipeline_stage, current_thread);
-    is_stale_bounds = (cdata->_last_update != cdata->_next_update);
+    is_stale_bounds = (cdata->_last_bounds_update != cdata->_next_update);
   }
   if (!is_stale_bounds) {
     ((PandaNode *)this)->force_bounds_stale(pipeline_stage, current_thread);
   }
 }
 
-
 ////////////////////////////////////////////////////////////////////
 //     Function: PandaNode::mark_internal_bounds_stale
 //       Access: Protected
@@ -907,7 +906,7 @@ operator < (const DownConnection &other) const {
 ////////////////////////////////////////////////////////////////////
 //     Function: PandaNode::DownConnection::get_child
 //       Access: Public
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 INLINE PandaNode *PandaNode::DownConnection::
 get_child() const {
@@ -927,7 +926,7 @@ set_child(PandaNode *child) {
 ////////////////////////////////////////////////////////////////////
 //     Function: PandaNode::DownConnection::get_sort
 //       Access: Public
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 INLINE int PandaNode::DownConnection::
 get_sort() const {
@@ -963,7 +962,7 @@ operator < (const UpConnection &other) const {
 ////////////////////////////////////////////////////////////////////
 //     Function: PandaNode::UpConnection::get_parent
 //       Access: Public
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 INLINE PandaNode *PandaNode::UpConnection::
 get_parent() const {
@@ -1130,6 +1129,29 @@ operator = (const PandaNode::Children &copy) {
   _down = copy._down;
 }
 
+#ifdef USE_MOVE_SEMANTICS
+////////////////////////////////////////////////////////////////////
+//     Function: PandaNode::Children::Move Constructor
+//       Access: Public
+//  Description:
+////////////////////////////////////////////////////////////////////
+INLINE PandaNode::Children::
+Children(PandaNode::Children &&from) NOEXCEPT :
+  _down(move(from._down))
+{
+}
+
+////////////////////////////////////////////////////////////////////
+//     Function: PandaNode::Children::Move Assignment Operator
+//       Access: Public
+//  Description:
+////////////////////////////////////////////////////////////////////
+INLINE void PandaNode::Children::
+operator = (PandaNode::Children &&from) NOEXCEPT {
+  _down = move(from._down);
+}
+#endif  // USE_MOVE_SEMANTICS
+
 ////////////////////////////////////////////////////////////////////
 //     Function: PandaNode::Children::get_num_children
 //       Access: Public
@@ -1208,6 +1230,29 @@ operator = (const PandaNode::Stashed &copy) {
   _stashed = copy._stashed;
 }
 
+#ifdef USE_MOVE_SEMANTICS
+////////////////////////////////////////////////////////////////////
+//     Function: PandaNode::Stashed::Move Constructor
+//       Access: Public
+//  Description:
+////////////////////////////////////////////////////////////////////
+INLINE PandaNode::Stashed::
+Stashed(PandaNode::Stashed &&from) NOEXCEPT :
+  _stashed(move(from._stashed))
+{
+}
+
+////////////////////////////////////////////////////////////////////
+//     Function: PandaNode::Stashed::Move Assignment Operator
+//       Access: Public
+//  Description:
+////////////////////////////////////////////////////////////////////
+INLINE void PandaNode::Stashed::
+operator = (PandaNode::Stashed &&from) NOEXCEPT {
+  _stashed = move(from._stashed);
+}
+#endif  // USE_MOVE_SEMANTICS
+
 ////////////////////////////////////////////////////////////////////
 //     Function: PandaNode::Stashed::get_num_stashed
 //       Access: Public
@@ -1286,6 +1331,29 @@ operator = (const PandaNode::Parents &copy) {
   _up = copy._up;
 }
 
+#ifdef USE_MOVE_SEMANTICS
+////////////////////////////////////////////////////////////////////
+//     Function: PandaNode::Parents::Move Constructor
+//       Access: Public
+//  Description:
+////////////////////////////////////////////////////////////////////
+INLINE PandaNode::Parents::
+Parents(PandaNode::Parents &&from) NOEXCEPT :
+  _up(move(from._up))
+{
+}
+
+////////////////////////////////////////////////////////////////////
+//     Function: PandaNode::Parents::Move Assignment Operator
+//       Access: Public
+//  Description:
+////////////////////////////////////////////////////////////////////
+INLINE void PandaNode::Parents::
+operator = (PandaNode::Parents &&from) NOEXCEPT {
+  _up = move(from._up);
+}
+#endif  // USE_MOVE_SEMANTICS
+
 ////////////////////////////////////////////////////////////////////
 //     Function: PandaNode::Parents::get_num_parents
 //       Access: Public
@@ -1876,7 +1944,7 @@ get_parents() const {
 ////////////////////////////////////////////////////////////////////
 //     Function: PandaNode::BamReaderAuxDataDown::Constructor
 //       Access: Public
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 INLINE PandaNode::BamReaderAuxDataDown::
 BamReaderAuxDataDown() :
diff --git a/panda/src/pgraph/pandaNode.cxx b/panda/src/pgraph/pandaNode.cxx
index e1b3b105f2..d4c683f7ad 100644
--- a/panda/src/pgraph/pandaNode.cxx
+++ b/panda/src/pgraph/pandaNode.cxx
@@ -142,8 +142,7 @@ PandaNode::
 ////////////////////////////////////////////////////////////////////
 PandaNode::
 PandaNode(const PandaNode &copy) :
-  ReferenceCount(copy),
-  TypedWritable(copy),
+  TypedWritableReferenceCount(copy),
   Namable(copy),
   _paths_lock("PandaNode::_paths_lock"),
   _dirty_prev_transform(false)
@@ -187,7 +186,7 @@ PandaNode(const PandaNode &copy) :
     ++cdata->_internal_bounds_mark;
     cdata->_final_bounds = copy_cdata->_final_bounds;
     cdata->_fancy_bits = copy_cdata->_fancy_bits;
-    
+
 #ifdef HAVE_PYTHON
     // Copy and increment all of the Python objects held by the other
     // node.
@@ -209,17 +208,6 @@ operator = (const PandaNode &copy) {
   nassertv(false);
 }
 
-////////////////////////////////////////////////////////////////////
-//     Function: PandaNode::as_reference_count
-//       Access: Public, Virtual
-//  Description: Returns the pointer cast to a ReferenceCount pointer,
-//               if it is in fact of that type.
-////////////////////////////////////////////////////////////////////
-ReferenceCount *PandaNode::
-as_reference_count() {
-  return this;
-}
-
 ////////////////////////////////////////////////////////////////////
 //     Function: PandaNode::dupe_for_flatten
 //       Access: Public, Virtual
@@ -681,7 +669,7 @@ add_child(PandaNode *child_node, int sort, Thread *current_thread) {
   OPEN_ITERATE_CURRENT_AND_UPSTREAM(_cycler, current_thread) {
     CDStageWriter cdata(_cycler, pipeline_stage, current_thread);
     CDStageWriter cdata_child(child_node->_cycler, pipeline_stage, current_thread);
-    
+
     cdata->modify_down()->insert(DownConnection(child_node, sort));
     cdata_child->modify_up()->insert(UpConnection(this));
   }
@@ -713,9 +701,9 @@ remove_child(int child_index, Thread *current_thread) {
   CDStageWriter cdata(_cycler, pipeline_stage, current_thread);
   PT(Down) down = cdata->modify_down();
   nassertv(child_index >= 0 && child_index < (int)down->size());
-  
+
   PT(PandaNode) child_node = (*down)[child_index].get_child();
-  CDStageWriter cdata_child(child_node->_cycler, pipeline_stage, 
+  CDStageWriter cdata_child(child_node->_cycler, pipeline_stage,
                                  current_thread);
   PT(Up) up = cdata_child->modify_up();
 
@@ -743,7 +731,7 @@ remove_child(int child_index, Thread *current_thread) {
 bool PandaNode::
 remove_child(PandaNode *child_node, Thread *current_thread) {
   nassertr(child_node != (PandaNode *)NULL, false);
-  
+
   // Make sure the child node is not destructed during the execution
   // of this method.
   PT(PandaNode) keep_child = child_node;
@@ -795,7 +783,7 @@ replace_child(PandaNode *orig_child, PandaNode *new_child,
     // scene graph.
     return false;
   }
-  
+
   // Make sure the orig_child node is not destructed during the
   // execution of this method.
   PT(PandaNode) keep_orig_child = orig_child;
@@ -845,13 +833,13 @@ stash_child(int child_index, Thread *current_thread) {
 
   PT(PandaNode) child_node = get_child(child_index);
   int sort = get_child_sort(child_index);
-  
+
   remove_child(child_index);
 
   {
     CDStageWriter cdata(_cycler, pipeline_stage, current_thread);
     CDStageWriter cdata_child(child_node->_cycler, pipeline_stage, current_thread);
-    
+
     cdata->modify_stashed()->insert(DownConnection(child_node, sort));
     cdata_child->modify_up()->insert(UpConnection(this));
   }
@@ -880,7 +868,7 @@ stash_child(int child_index, Thread *current_thread) {
 //               (i.e. from App).
 ////////////////////////////////////////////////////////////////////
 void PandaNode::
-unstash_child(int stashed_index, Thread *current_thread) { 
+unstash_child(int stashed_index, Thread *current_thread) {
   int pipeline_stage = current_thread->get_pipeline_stage();
   nassertv(pipeline_stage == 0);
   nassertv(stashed_index >= 0 && stashed_index < get_num_stashed());
@@ -893,9 +881,9 @@ unstash_child(int stashed_index, Thread *current_thread) {
 
   PT(PandaNode) child_node = get_stashed(stashed_index);
   int sort = get_stashed_sort(stashed_index);
-  
+
   remove_stashed(stashed_index);
-  
+
   {
     CDWriter cdata(_cycler);
     CDWriter cdata_child(child_node->_cycler);
@@ -945,11 +933,11 @@ add_stashed(PandaNode *child_node, int sort, Thread *current_thread) {
   {
     CDWriter cdata(_cycler);
     CDWriter cdata_child(child_node->_cycler);
-    
+
     cdata->modify_stashed()->insert(DownConnection(child_node, sort));
     cdata_child->modify_up()->insert(UpConnection(this));
   }
-    
+
   new_connection(this, child_node, pipeline_stage, current_thread);
 
   // Call callback hooks.
@@ -972,7 +960,7 @@ remove_stashed(int child_index, Thread *current_thread) {
   CDStageWriter cdata(_cycler, pipeline_stage, current_thread);
   Down &stashed = *cdata->modify_stashed();
   nassertv(child_index >= 0 && child_index < (int)stashed.size());
-  
+
   PT(PandaNode) child_node = stashed[child_index].get_child();
   CDStageWriter cdata_child(child_node->_cycler, pipeline_stage, current_thread);
 
@@ -1010,20 +998,20 @@ remove_all_children(Thread *current_thread) {
       CDStageWriter cdata_child(child_node->_cycler, pipeline_stage,
                                      current_thread);
       cdata_child->modify_up()->erase(UpConnection(this));
-      
+
       sever_connection(this, child_node, pipeline_stage, current_thread);
       child_node->parents_changed();
       child_node->mark_bam_modified();
     }
     down->clear();
-    
+
     Down &stashed = *cdata->modify_stashed();
     for (di = stashed.begin(); di != stashed.end(); ++di) {
       PT(PandaNode) child_node = (*di).get_child();
       CDStageWriter cdata_child(child_node->_cycler, pipeline_stage,
                                      current_thread);
       cdata_child->modify_up()->erase(UpConnection(this));
-      
+
       sever_connection(this, child_node, pipeline_stage, current_thread);
       child_node->parents_changed();
       child_node->mark_bam_modified();
@@ -1123,7 +1111,7 @@ set_attrib(const RenderAttrib *attrib, int override) {
   Thread *current_thread = Thread::get_current_thread();
   OPEN_ITERATE_CURRENT_AND_UPSTREAM(_cycler, current_thread) {
     CDStageWriter cdata(_cycler, pipeline_stage, current_thread);
-    
+
     CPT(RenderState) new_state = cdata->_state->set_attrib(attrib, override);
     if (cdata->_state != new_state) {
       cdata->_state = new_state;
@@ -1156,7 +1144,7 @@ clear_attrib(int slot) {
   Thread *current_thread = Thread::get_current_thread();
   OPEN_ITERATE_CURRENT_AND_UPSTREAM(_cycler, current_thread) {
     CDStageWriter cdata(_cycler, pipeline_stage, current_thread);
-    
+
     CPT(RenderState) new_state = cdata->_state->remove_attrib(slot);
     if (cdata->_state != new_state) {
       cdata->_state = new_state;
@@ -1382,7 +1370,7 @@ reset_all_prev_transform(Thread *current_thread) {
     PandaNode *panda_node = (PandaNode *)list_node;
     nassertv(panda_node->_dirty_prev_transform);
     panda_node->_dirty_prev_transform = false;
-    
+
     CDStageWriter cdata(panda_node->_cycler, 0, current_thread);
     cdata->_prev_transform = cdata->_transform;
 
@@ -1463,7 +1451,7 @@ copy_tags(PandaNode *other) {
   OPEN_ITERATE_CURRENT_AND_UPSTREAM(_cycler, current_thread) {
     CDStageWriter cdataw(_cycler, pipeline_stage, current_thread);
     CDStageReader cdatar(other->_cycler, pipeline_stage, current_thread);
-      
+
     TagData::const_iterator ti;
     for (ti = cdatar->_tag_data.begin();
          ti != cdatar->_tag_data.end();
@@ -1471,7 +1459,7 @@ copy_tags(PandaNode *other) {
       cdataw->_tag_data[(*ti).first] = (*ti).second;
     }
     cdataw->set_fancy_bit(FB_tag, !cdataw->_tag_data.empty());
-    
+
 #ifdef HAVE_PYTHON
     PythonTagData::const_iterator pti;
     for (pti = cdatar->_python_tag_data.begin();
@@ -1480,10 +1468,10 @@ copy_tags(PandaNode *other) {
       const string &key = (*pti).first;
       PyObject *value = (*pti).second;
       Py_XINCREF(value);
-      
+
       pair<PythonTagData::iterator, bool> result;
       result = cdataw->_python_tag_data.insert(PythonTagData::value_type(key, value));
-      
+
       if (!result.second) {
         // The insert was unsuccessful; that means the key was already
         // present in the map.  In this case, we should decrement the
@@ -1703,14 +1691,14 @@ copy_all_properties(PandaNode *other) {
     // important to preserve properties such as the default GeomNode
     // bitmask.
     cdataw->_into_collide_mask |= cdatar->_into_collide_mask;
-      
+
     TagData::const_iterator ti;
     for (ti = cdatar->_tag_data.begin();
          ti != cdatar->_tag_data.end();
          ++ti) {
       cdataw->_tag_data[(*ti).first] = (*ti).second;
     }
-    
+
 #ifdef HAVE_PYTHON
     PythonTagData::const_iterator pti;
     for (pti = cdatar->_python_tag_data.begin();
@@ -1719,10 +1707,10 @@ copy_all_properties(PandaNode *other) {
       const string &key = (*pti).first;
       PyObject *value = (*pti).second;
       Py_XINCREF(value);
-      
+
       pair<PythonTagData::iterator, bool> result;
       result = cdataw->_python_tag_data.insert(PythonTagData::value_type(key, value));
-      
+
       if (!result.second) {
         // The insert was unsuccessful; that means the key was already
         // present in the map.  In this case, we should decrement the
@@ -1772,7 +1760,7 @@ copy_all_properties(PandaNode *other) {
 //  Description: Inserts this node into the scene graph in place of
 //               the other one, and removes the other node.  All scene
 //               graph attributes (TransformState, RenderState, etc.)
-//               are copied to this node.  
+//               are copied to this node.
 //
 //               All children are moved to this node, and removed from
 //               the old node.  The new node is left in the same place
@@ -1947,7 +1935,7 @@ adjust_draw_mask(DrawMask show_mask, DrawMask hide_mask, DrawMask clear_mask) {
   Thread *current_thread = Thread::get_current_thread();
   OPEN_ITERATE_CURRENT_AND_UPSTREAM(_cycler, current_thread) {
     CDStageWriter cdata(_cycler, pipeline_stage, current_thread);
-    
+
     DrawMask draw_control_mask = (cdata->_draw_control_mask | show_mask | hide_mask) & ~clear_mask;
     DrawMask draw_show_mask = (cdata->_draw_show_mask | show_mask) & ~hide_mask;
     // The uncontrolled bits are implicitly on.
@@ -1990,8 +1978,8 @@ get_net_draw_control_mask() const {
   if (cdata->_last_update != cdata->_next_update) {
     // The cache is stale; it needs to be rebuilt.
     PStatTimer timer(_update_bounds_pcollector);
-    CDStageWriter cdataw = 
-      ((PandaNode *)this)->update_bounds(pipeline_stage, cdata); 
+    CDStageWriter cdataw =
+      ((PandaNode *)this)->update_cached(false, pipeline_stage, cdata);
     return cdataw->_net_draw_control_mask;
   }
   return cdata->_net_draw_control_mask;
@@ -2021,8 +2009,8 @@ get_net_draw_show_mask() const {
   if (cdata->_last_update != cdata->_next_update) {
     // The cache is stale; it needs to be rebuilt.
     PStatTimer timer(_update_bounds_pcollector);
-    CDStageWriter cdataw = 
-      ((PandaNode *)this)->update_bounds(pipeline_stage, cdata); 
+    CDStageWriter cdataw =
+      ((PandaNode *)this)->update_cached(false, pipeline_stage, cdata);
     return cdataw->_net_draw_show_mask;
   }
   return cdata->_net_draw_show_mask;
@@ -2031,7 +2019,7 @@ get_net_draw_show_mask() const {
 ////////////////////////////////////////////////////////////////////
 //     Function: PandaNode::set_into_collide_mask
 //       Access: Published
-//  Description: Sets the "into" CollideMask.  
+//  Description: Sets the "into" CollideMask.
 //
 //               This specifies the set of bits that must be shared
 //               with a CollisionNode's "from" CollideMask in order
@@ -2095,8 +2083,8 @@ get_net_collide_mask(Thread *current_thread) const {
   if (cdata->_last_update != cdata->_next_update) {
     // The cache is stale; it needs to be rebuilt.
     PStatTimer timer(_update_bounds_pcollector);
-    CDStageWriter cdataw = 
-      ((PandaNode *)this)->update_bounds(pipeline_stage, cdata); 
+    CDStageWriter cdataw =
+      ((PandaNode *)this)->update_cached(false, pipeline_stage, cdata);
     return cdataw->_net_collide_mask;
   }
   return cdata->_net_collide_mask;
@@ -2116,8 +2104,8 @@ get_off_clip_planes(Thread *current_thread) const {
   if (cdata->_last_update != cdata->_next_update) {
     // The cache is stale; it needs to be rebuilt.
     PStatTimer timer(_update_bounds_pcollector);
-    CDStageWriter cdataw = 
-      ((PandaNode *)this)->update_bounds(pipeline_stage, cdata); 
+    CDStageWriter cdataw =
+      ((PandaNode *)this)->update_cached(false, pipeline_stage, cdata);
     return cdataw->_off_clip_planes;
   }
   return cdata->_off_clip_planes;
@@ -2195,7 +2183,7 @@ is_under_scene_root() const {
 ////////////////////////////////////////////////////////////////////
 //     Function: PandaNode::output
 //       Access: Published, Virtual
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 void PandaNode::
 output(ostream &out) const {
@@ -2205,7 +2193,7 @@ output(ostream &out) const {
 ////////////////////////////////////////////////////////////////////
 //     Function: PandaNode::write
 //       Access: Published, Virtual
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 void PandaNode::
 write(ostream &out, int indent_level) const {
@@ -2352,13 +2340,13 @@ CPT(BoundingVolume) PandaNode::
 get_bounds(Thread *current_thread) const {
   int pipeline_stage = current_thread->get_pipeline_stage();
   CDLockedStageReader cdata(_cycler, pipeline_stage, current_thread);
-  if (cdata->_last_update != cdata->_next_update) {
+  if (cdata->_last_bounds_update != cdata->_next_update) {
     // The cache is stale; it needs to be rebuilt.
     CPT(BoundingVolume) result;
     {
       PStatTimer timer(_update_bounds_pcollector);
-      CDStageWriter cdataw = 
-        ((PandaNode *)this)->update_bounds(pipeline_stage, cdata); 
+      CDStageWriter cdataw =
+        ((PandaNode *)this)->update_cached(true, pipeline_stage, cdata);
       result = cdataw->_external_bounds;
     }
     return result;
@@ -2386,19 +2374,19 @@ CPT(BoundingVolume) PandaNode::
 get_bounds(UpdateSeq &seq, Thread *current_thread) const {
   int pipeline_stage = current_thread->get_pipeline_stage();
   CDLockedStageReader cdata(_cycler, pipeline_stage, current_thread);
-  if (cdata->_last_update != cdata->_next_update) {
+  if (cdata->_last_bounds_update != cdata->_next_update) {
     // The cache is stale; it needs to be rebuilt.
     CPT(BoundingVolume) result;
     {
       PStatTimer timer(_update_bounds_pcollector);
-      CDStageWriter cdataw = 
-        ((PandaNode *)this)->update_bounds(pipeline_stage, cdata); 
+      CDStageWriter cdataw =
+        ((PandaNode *)this)->update_cached(true, pipeline_stage, cdata);
       result = cdataw->_external_bounds;
-      seq = cdataw->_last_update;
+      seq = cdataw->_last_bounds_update;
     }
     return result;
   }
-  seq = cdata->_last_update;
+  seq = cdata->_last_bounds_update;
   return cdata->_external_bounds;
 }
 
@@ -2419,13 +2407,13 @@ int PandaNode::
 get_nested_vertices(Thread *current_thread) const {
   int pipeline_stage = current_thread->get_pipeline_stage();
   CDLockedStageReader cdata(_cycler, pipeline_stage, current_thread);
-  if (cdata->_last_update != cdata->_next_update) {
+  if (cdata->_last_bounds_update != cdata->_next_update) {
     // The cache is stale; it needs to be rebuilt.
     int result;
     {
       PStatTimer timer(_update_bounds_pcollector);
-      CDStageWriter cdataw = 
-        ((PandaNode *)this)->update_bounds(pipeline_stage, cdata); 
+      CDStageWriter cdataw =
+        ((PandaNode *)this)->update_cached(true, pipeline_stage, cdata);
       result = cdataw->_nested_vertices;
     }
     return result;
@@ -2594,7 +2582,7 @@ get_internal_bounds(int pipeline_stage, Thread *current_thread) const {
       if (cdata->_user_bounds != (BoundingVolume *)NULL) {
         return cdata->_user_bounds;
       }
-      
+
       if (cdata->_internal_bounds_mark == cdata->_internal_bounds_computed) {
         return cdata->_internal_bounds;
       }
@@ -2609,7 +2597,7 @@ get_internal_bounds(int pipeline_stage, Thread *current_thread) const {
     compute_internal_bounds(internal_bounds, internal_vertices,
                             pipeline_stage, current_thread);
     nassertr(!internal_bounds.is_null(), NULL);
-    
+
     // Now, acquire the lock, and apply the above-computed bounds.
     CDStageWriter cdataw(((PandaNode *)this)->_cycler, pipeline_stage);
     if (cdataw->_internal_bounds_mark == mark) {
@@ -2656,7 +2644,7 @@ get_internal_vertices(int pipeline_stage, Thread *current_thread) const {
     compute_internal_bounds(internal_bounds, internal_vertices,
                             pipeline_stage, current_thread);
     nassertr(!internal_bounds.is_null(), 0);
-    
+
     // Now, acquire the lock, and apply the above-computed bounds.
     CDStageWriter cdataw(((PandaNode *)this)->_cycler, pipeline_stage);
     if (cdataw->_internal_bounds_mark == mark) {
@@ -2999,7 +2987,7 @@ bool PandaNode::
 stage_remove_child(PandaNode *child_node, int pipeline_stage,
                    Thread *current_thread) {
   CDStageWriter cdata(_cycler, pipeline_stage, current_thread);
-      
+
   // First, look for the parent in the child's up list, to ensure the
   // child is known.
   CDStageWriter cdata_child(child_node->_cycler, pipeline_stage,
@@ -3050,7 +3038,7 @@ stage_replace_child(PandaNode *orig_child, PandaNode *new_child,
     CDStageWriter cdata(_cycler, pipeline_stage, current_thread);
     CDStageWriter cdata_orig_child(orig_child->_cycler, pipeline_stage, current_thread);
     CDStageWriter cdata_new_child(new_child->_cycler, pipeline_stage, current_thread);
-    
+
     // First, look for the parent in the child's up list, to ensure the
     // child is known.
     int parent_index = orig_child->do_find_parent(this, cdata_orig_child);
@@ -3058,12 +3046,12 @@ stage_replace_child(PandaNode *orig_child, PandaNode *new_child,
       // Nope, no relation.
       return false;
     }
-    
+
     if (orig_child == new_child) {
       // Trivial no-op.
       return true;
     }
-    
+
     // Don't let orig_child be destructed yet.
     PT(PandaNode) keep_orig_child = orig_child;
 
@@ -3071,7 +3059,7 @@ stage_replace_child(PandaNode *orig_child, PandaNode *new_child,
     if (stage_remove_child(new_child, pipeline_stage, current_thread)) {
       sever_connection(this, new_child, pipeline_stage, current_thread);
     }
-    
+
     PT(Down) down = cdata->modify_down();
     int child_index = do_find_child(orig_child, down);
     if (child_index >= 0) {
@@ -3079,7 +3067,7 @@ stage_replace_child(PandaNode *orig_child, PandaNode *new_child,
       DownConnection &dc = (*down)[child_index];
       nassertr(dc.get_child() == orig_child, false);
       dc.set_child(new_child);
-      
+
     } else {
       PT(Down) stashed = cdata->modify_stashed();
       int stashed_index = do_find_child(orig_child, stashed);
@@ -3088,7 +3076,7 @@ stage_replace_child(PandaNode *orig_child, PandaNode *new_child,
         DownConnection &dc = (*stashed)[stashed_index];
         nassertr(dc.get_child() == orig_child, false);
         dc.set_child(new_child);
-        
+
       } else {
         // Never heard of this child.  This shouldn't be possible, because
         // the parent was in the child's up list, above.  Must be some
@@ -3097,7 +3085,7 @@ stage_replace_child(PandaNode *orig_child, PandaNode *new_child,
         return false;
       }
     }
-    
+
     // Now adjust the bookkeeping on both children.
     cdata_new_child->modify_up()->insert(UpConnection(this));
     int num_erased = cdata_orig_child->modify_up()->erase(UpConnection(this));
@@ -3134,7 +3122,7 @@ quick_add_new_child(PandaNode *child_node, int sort, Thread *current_thread) {
   OPEN_ITERATE_CURRENT_AND_UPSTREAM(_cycler, current_thread) {
     CDStageWriter cdata(_cycler, pipeline_stage, current_thread);
     CDStageWriter cdata_child(child_node->_cycler, pipeline_stage, current_thread);
-    
+
     cdata->modify_down()->insert(DownConnection(child_node, sort));
     cdata_child->modify_up()->insert(UpConnection(this));
   }
@@ -3150,7 +3138,7 @@ quick_add_new_child(PandaNode *child_node, int sort, Thread *current_thread) {
 void PandaNode::
 report_cycle(PandaNode *child_node) {
   ostringstream strm;
-  strm << "Detected attempt to create a cycle in the scene graph: " 
+  strm << "Detected attempt to create a cycle in the scene graph: "
        << NodePath::any_path(this) << " : " << *child_node;
   nassert_raise(strm.str());
 }
@@ -3196,7 +3184,7 @@ attach(NodePathComponent *parent, PandaNode *child_node, int sort,
   if (parent == (NodePathComponent *)NULL) {
     // Attaching to NULL means to create a new "instance" with no
     // attachments, and no questions asked.
-    PT(NodePathComponent) child = 
+    PT(NodePathComponent) child =
       new NodePathComponent(child_node, (NodePathComponent *)NULL,
                             pipeline_stage, current_thread);
     LightReMutexHolder holder(child_node->_paths_lock);
@@ -3232,7 +3220,7 @@ detach(NodePathComponent *child, int pipeline_stage, Thread *current_thread) {
   nassertv(child != (NodePathComponent *)NULL);
 
   for (int pipeline_stage_i = pipeline_stage;
-       pipeline_stage_i >= 0; 
+       pipeline_stage_i >= 0;
        --pipeline_stage_i) {
     detach_one_stage(child, pipeline_stage_i, current_thread);
   }
@@ -3250,7 +3238,7 @@ detach(NodePathComponent *child, int pipeline_stage, Thread *current_thread) {
 //               stage only.
 ////////////////////////////////////////////////////////////////////
 void PandaNode::
-detach_one_stage(NodePathComponent *child, int pipeline_stage, 
+detach_one_stage(NodePathComponent *child, int pipeline_stage,
                  Thread *current_thread) {
   nassertv(child != (NodePathComponent *)NULL);
   if (child->is_top_node(pipeline_stage, current_thread)) {
@@ -3259,18 +3247,18 @@ detach_one_stage(NodePathComponent *child, int pipeline_stage,
 
   PT(PandaNode) child_node = child->get_node();
   PT(PandaNode) parent_node = child->get_next(pipeline_stage, current_thread)->get_node();
-    
+
   CDStageWriter cdata_parent(parent_node->_cycler, pipeline_stage, current_thread);
   CDStageWriter cdata_child(child_node->_cycler, pipeline_stage, current_thread);
   int parent_index = child_node->do_find_parent(parent_node, cdata_child);
   if (parent_index >= 0) {
     // Now look for the child and break the actual connection.
-    
+
     // First, look for and remove the parent node from the child's up
     // list.
     int num_erased = cdata_child->modify_up()->erase(UpConnection(parent_node));
     nassertv(num_erased == 1);
-    
+
     // Now, look for and remove the child node from the parent's down
     // list.  We also check in the stashed list, in case the child node
     // has been stashed.
@@ -3296,7 +3284,7 @@ detach_one_stage(NodePathComponent *child, int pipeline_stage,
     }
     nassertv(found);
   }
-    
+
   // Finally, break the NodePathComponent connection.
   sever_connection(parent_node, child_node, pipeline_stage, current_thread);
 
@@ -3330,9 +3318,9 @@ reparent(NodePathComponent *new_parent, NodePathComponent *child, int sort,
   }
 
   for (int pipeline_stage_i = pipeline_stage;
-       pipeline_stage_i >= 0; 
+       pipeline_stage_i >= 0;
        --pipeline_stage_i) {
-    if (reparent_one_stage(new_parent, child, sort, as_stashed, 
+    if (reparent_one_stage(new_parent, child, sort, as_stashed,
                            pipeline_stage_i, current_thread)) {
       any_ok = true;
     }
@@ -3362,8 +3350,8 @@ reparent(NodePathComponent *new_parent, NodePathComponent *child, int sort,
 //               stage only.
 ////////////////////////////////////////////////////////////////////
 bool PandaNode::
-reparent_one_stage(NodePathComponent *new_parent, NodePathComponent *child, 
-                   int sort, bool as_stashed, int pipeline_stage, 
+reparent_one_stage(NodePathComponent *new_parent, NodePathComponent *child,
+                   int sort, bool as_stashed, int pipeline_stage,
                    Thread *current_thread) {
   nassertr(child != (NodePathComponent *)NULL, false);
 
@@ -3391,7 +3379,7 @@ reparent_one_stage(NodePathComponent *new_parent, NodePathComponent *child,
 
     // Redirect the connection to the indicated new parent.
     child->set_next(new_parent, pipeline_stage, current_thread);
-    
+
     // Now reattach the child node at the indicated sort position.
     {
       CDStageWriter cdata_parent(parent_node->_cycler, pipeline_stage, current_thread);
@@ -3445,15 +3433,15 @@ get_component(NodePathComponent *parent, PandaNode *child_node,
       return (*pi);
     }
   }
-    
+
   // We don't already have a NodePathComponent referring to this
   // parent-child relationship.  Are they actually related?
   CDStageReader cdata_child(child_node->_cycler, pipeline_stage, current_thread);
   int parent_index = child_node->do_find_parent(parent_node, cdata_child);
-  
+
   if (parent_index >= 0) {
     // They are.  Create and return a new one.
-    PT(NodePathComponent) child = 
+    PT(NodePathComponent) child =
       new NodePathComponent(child_node, parent, pipeline_stage, current_thread);
     child_node->_paths.insert(child);
     return child;
@@ -3478,7 +3466,7 @@ get_component(NodePathComponent *parent, PandaNode *child_node,
 //               there is not already a top component available.
 ////////////////////////////////////////////////////////////////////
 PT(NodePathComponent) PandaNode::
-get_top_component(PandaNode *child_node, bool force, int pipeline_stage, 
+get_top_component(PandaNode *child_node, bool force, int pipeline_stage,
                   Thread *current_thread) {
   LightReMutexHolder holder(child_node->_paths_lock);
 
@@ -3500,7 +3488,7 @@ get_top_component(PandaNode *child_node, bool force, int pipeline_stage,
 
   // We don't already have such a NodePathComponent; create and
   // return a new one.
-  PT(NodePathComponent) child = 
+  PT(NodePathComponent) child =
     new NodePathComponent(child_node, (NodePathComponent *)NULL,
                           pipeline_stage, current_thread);
   child_node->_paths.insert(child);
@@ -3512,7 +3500,7 @@ get_top_component(PandaNode *child_node, bool force, int pipeline_stage,
 //     Function: PandaNode::get_generic_component
 //       Access: Private
 //  Description: Returns a NodePathComponent referencing this node as
-//               a path from the root.  
+//               a path from the root.
 //
 //               Unless accept_ambiguity is true, it is only valid to
 //               call this if there is an unambiguous path from the
@@ -3520,10 +3508,10 @@ get_top_component(PandaNode *child_node, bool force, int pipeline_stage,
 //               path will be chosen arbitrarily.
 ////////////////////////////////////////////////////////////////////
 PT(NodePathComponent) PandaNode::
-get_generic_component(bool accept_ambiguity, int pipeline_stage, 
+get_generic_component(bool accept_ambiguity, int pipeline_stage,
                       Thread *current_thread) {
   bool ambiguity_detected = false;
-  PT(NodePathComponent) result = 
+  PT(NodePathComponent) result =
     r_get_generic_component(accept_ambiguity, ambiguity_detected,
                             pipeline_stage, current_thread);
 
@@ -3551,17 +3539,17 @@ r_get_generic_component(bool accept_ambiguity, bool &ambiguity_detected,
 
   {
     CDStageReader cdata(_cycler, pipeline_stage, current_thread);
-    
+
     int num_parents = cdata->get_up()->size();
     if (num_parents == 0) {
       // No parents; no ambiguity.  This is the root.
       return get_top_component(this, true, pipeline_stage, current_thread);
-    } 
+    }
 
     PT(NodePathComponent) result;
     if (num_parents == 1) {
       // Only one parent; no ambiguity.
-      PT(NodePathComponent) parent = 
+      PT(NodePathComponent) parent =
         get_parent(0)->r_get_generic_component(accept_ambiguity, ambiguity_detected, pipeline_stage, current_thread);
       return get_component(parent, this, pipeline_stage, current_thread);
     }
@@ -3578,7 +3566,7 @@ r_get_generic_component(bool accept_ambiguity, bool &ambiguity_detected,
   }
 
   // Now that the lock is released, it's safe to recurse.
-  PT(NodePathComponent) parent = 
+  PT(NodePathComponent) parent =
     parent_node->r_get_generic_component(accept_ambiguity, ambiguity_detected, pipeline_stage, current_thread);
   return get_component(parent, this, pipeline_stage, current_thread);
 }
@@ -3622,7 +3610,7 @@ sever_connection(PandaNode *parent_node, PandaNode *child_node,
     LightReMutexHolder holder(child_node->_paths_lock);
     Paths::iterator pi;
     for (pi = child_node->_paths.begin(); pi != child_node->_paths.end(); ++pi) {
-      if (!(*pi)->is_top_node(pipeline_stage, current_thread) && 
+      if (!(*pi)->is_top_node(pipeline_stage, current_thread) &&
           (*pi)->get_next(pipeline_stage, current_thread)->get_node() == parent_node) {
         // Sever the component here.
         (*pi)->set_top_node(pipeline_stage, current_thread);
@@ -3687,7 +3675,7 @@ fix_path_lengths(int pipeline_stage, Thread *current_thread) {
       any_wrong = true;
     }
   }
-  
+
   // If any paths were updated, we have to recurse on all of our
   // children, since any one of those paths might be shared by any of
   // our child nodes.  Don't hold any locks while we recurse.
@@ -3760,23 +3748,26 @@ do_find_child(PandaNode *node, const PandaNode::Down *down) const {
 }
 
 ////////////////////////////////////////////////////////////////////
-//     Function: PandaNode::update_bounds
+//     Function: PandaNode::update_cached
 //       Access: Private
 //  Description: Updates the cached values of the node that are
 //               dependent on its children, such as the
-//               external bounding volume, the _net_collide_mask, and
-//               the _off_clip_planes.
+//               external bounding volume, the _net_collide_mask,
+//               and the _off_clip_planes.
+//
+//               If update_bounds is false, it will not update the
+//               bounding volume or vertex count.
 //
 //               The old value should be passed in; it will be
 //               released.  The new value is returned.
 ////////////////////////////////////////////////////////////////////
 PandaNode::CDStageWriter PandaNode::
-update_bounds(int pipeline_stage, PandaNode::CDLockedStageReader &cdata) {
+update_cached(bool update_bounds, int pipeline_stage, PandaNode::CDLockedStageReader &cdata) {
   // We might need to try this a couple of times, in case someone else
   // steps on our result.
   if (drawmask_cat.is_debug()) {
-    drawmask_cat.debug(false) 
-      << *this << "::update_bounds() {\n";
+    drawmask_cat.debug(false)
+      << *this << "::update_cached() {\n";
   }
   Thread *current_thread = cdata.get_current_thread();
 
@@ -3784,7 +3775,10 @@ update_bounds(int pipeline_stage, PandaNode::CDLockedStageReader &cdata) {
     // Grab the last_update counter.
     UpdateSeq last_update = cdata->_last_update;
     UpdateSeq next_update = cdata->_next_update;
-    nassertr(last_update != next_update, CDStageWriter(_cycler, pipeline_stage, cdata));
+    UpdateSeq last_bounds_update = cdata->_last_bounds_update;
+    nassertr(last_update != next_update ||
+             (update_bounds && last_bounds_update != next_update),
+             CDStageWriter(_cycler, pipeline_stage, cdata));
 
     // Start with a clean slate.
     CollideMask net_collide_mask = cdata->_into_collide_mask;
@@ -3825,25 +3819,31 @@ update_bounds(int pipeline_stage, PandaNode::CDLockedStageReader &cdata) {
     // working (since we're not holding a lock on our set of children
     // right now).  But we also need the regular pointers, to pass to
     // BoundingVolume::around().
+    const BoundingVolume **child_volumes;
 #if defined(HAVE_THREADS) && !defined(SIMPLE_THREADS)
     pvector<CPT(BoundingVolume) > child_volumes_ref;
-    child_volumes_ref.reserve(num_children + 1);
+    if (update_bounds) {
+      child_volumes_ref.reserve(num_children + 1);
+    }
 #endif
-    const BoundingVolume **child_volumes = (const BoundingVolume **)alloca(sizeof(BoundingVolume *) * (num_children + 1));
     int child_volumes_i = 0;
-  
-    bool all_box = true;
-    CPT(BoundingVolume) internal_bounds = 
-      get_internal_bounds(pipeline_stage, current_thread);
 
-    if (!internal_bounds->is_empty()) {
+    bool all_box = true;
+    CPT(BoundingVolume) internal_bounds = NULL;
+
+    if (update_bounds) {
+      child_volumes = (const BoundingVolume **)alloca(sizeof(BoundingVolume *) * (num_children + 1));
+      internal_bounds = get_internal_bounds(pipeline_stage, current_thread);
+
+      if (!internal_bounds->is_empty()) {
 #if defined(HAVE_THREADS) && !defined(SIMPLE_THREADS)
-      child_volumes_ref.push_back(internal_bounds);
+        child_volumes_ref.push_back(internal_bounds);
 #endif
-      nassertr(child_volumes_i < num_children + 1, CDStageWriter(_cycler, pipeline_stage, cdata));
-      child_volumes[child_volumes_i++] = internal_bounds;
-      if (internal_bounds->as_bounding_box() == NULL) {
-        all_box = false;
+        nassertr(child_volumes_i < num_children + 1, CDStageWriter(_cycler, pipeline_stage, cdata));
+        child_volumes[child_volumes_i++] = internal_bounds;
+        if (internal_bounds->as_bounding_box() == NULL) {
+          all_box = false;
+        }
       }
     }
 
@@ -3853,12 +3853,17 @@ update_bounds(int pipeline_stage, PandaNode::CDLockedStageReader &cdata) {
       PandaNode *child = children.get_child(i);
 
       const ClipPlaneAttrib *orig_cp = DCAST(ClipPlaneAttrib, off_clip_planes);
-      
+
       CDLockedStageReader child_cdata(child->_cycler, pipeline_stage, current_thread);
-      if (child_cdata->_last_update != child_cdata->_next_update) {
+
+      UpdateSeq last_child_update = update_bounds
+                                  ? child_cdata->_last_bounds_update
+                                  : child_cdata->_last_update;
+
+      if (last_child_update != child_cdata->_next_update) {
         // Child needs update.
-        CDStageWriter child_cdataw = child->update_bounds(pipeline_stage, child_cdata);
-      
+        CDStageWriter child_cdataw = child->update_cached(update_bounds, pipeline_stage, child_cdata);
+
         net_collide_mask |= child_cdataw->_net_collide_mask;
 
         if (drawmask_cat.is_debug()) {
@@ -3877,7 +3882,7 @@ update_bounds(int pipeline_stage, PandaNode::CDLockedStageReader &cdata) {
           // following semantic meaning.  The number on the left
           // represents the pairing of the corresponding bit from the
           // control mask and from the show mask:
-          
+
           //   00 : not a renderable node   (control 0, show 0)
           //   01 : a normally visible node (control 0, show 1)
           //   10 : a hidden node           (control 1, show 0)
@@ -3916,7 +3921,7 @@ update_bounds(int pipeline_stage, PandaNode::CDLockedStageReader &cdata) {
           // Now compute the union, applying the above exception.
           net_draw_control_mask |= child_control_mask;
           net_draw_show_mask |= child_show_mask;
-          
+
           net_draw_control_mask &= ~exception_mask;
           net_draw_show_mask |= exception_mask;
         }
@@ -3929,19 +3934,22 @@ update_bounds(int pipeline_stage, PandaNode::CDLockedStageReader &cdata) {
             << "\nnet_draw_show_mask = " << net_draw_show_mask
             << "\n";
         }
-            
+
         off_clip_planes = orig_cp->compose_off(child_cdataw->_off_clip_planes);
-        if (!child_cdataw->_external_bounds->is_empty()) {
+
+        if (update_bounds) {
+          if (!child_cdataw->_external_bounds->is_empty()) {
 #if defined(HAVE_THREADS) && !defined(SIMPLE_THREADS)
-          child_volumes_ref.push_back(child_cdataw->_external_bounds);
+            child_volumes_ref.push_back(child_cdataw->_external_bounds);
 #endif
-          nassertr(child_volumes_i < num_children + 1, CDStageWriter(_cycler, pipeline_stage, cdata));
-          child_volumes[child_volumes_i++] = child_cdataw->_external_bounds;
-          if (child_cdataw->_external_bounds->as_bounding_box() == NULL) {
-            all_box = false;
+            nassertr(child_volumes_i < num_children + 1, CDStageWriter(_cycler, pipeline_stage, cdata));
+            child_volumes[child_volumes_i++] = child_cdataw->_external_bounds;
+            if (child_cdataw->_external_bounds->as_bounding_box() == NULL) {
+              all_box = false;
+            }
           }
+          num_vertices += child_cdataw->_nested_vertices;
         }
-        num_vertices += child_cdataw->_nested_vertices;
 
       } else {
         // Child is good.
@@ -3968,7 +3976,7 @@ update_bounds(int pipeline_stage, PandaNode::CDLockedStageReader &cdata) {
           // Now compute the union, applying the above exception.
           net_draw_control_mask |= child_control_mask;
           net_draw_show_mask |= child_show_mask;
-          
+
           net_draw_control_mask &= ~exception_mask;
           net_draw_show_mask |= exception_mask;
         }
@@ -3983,24 +3991,27 @@ update_bounds(int pipeline_stage, PandaNode::CDLockedStageReader &cdata) {
         }
 
         off_clip_planes = orig_cp->compose_off(child_cdata->_off_clip_planes);
-        if (!child_cdata->_external_bounds->is_empty()) {
+
+        if (update_bounds) {
+          if (!child_cdata->_external_bounds->is_empty()) {
 #if defined(HAVE_THREADS) && !defined(SIMPLE_THREADS)
-          child_volumes_ref.push_back(child_cdata->_external_bounds);
+            child_volumes_ref.push_back(child_cdata->_external_bounds);
 #endif
-          nassertr(child_volumes_i < num_children + 1, CDStageWriter(_cycler, pipeline_stage, cdata));
-          child_volumes[child_volumes_i++] = child_cdata->_external_bounds;
-          if (child_cdata->_external_bounds->as_bounding_box() == NULL) {
-            all_box = false;
+            nassertr(child_volumes_i < num_children + 1, CDStageWriter(_cycler, pipeline_stage, cdata));
+            child_volumes[child_volumes_i++] = child_cdata->_external_bounds;
+            if (child_cdata->_external_bounds->as_bounding_box() == NULL) {
+              all_box = false;
+            }
           }
+          num_vertices += child_cdata->_nested_vertices;
         }
-        num_vertices += child_cdata->_nested_vertices;
       }
     }
 
     {
       // Now grab the write lock on this node.
       CDStageWriter cdataw(_cycler, pipeline_stage, current_thread);
-      if (last_update == cdataw->_last_update && 
+      if (last_update == cdataw->_last_update &&
           next_update == cdataw->_next_update) {
         // Great, no one has monkeyed with these while we were computing
         // the cache.  Safe to store the computed values and return.
@@ -4013,12 +4024,12 @@ update_bounds(int pipeline_stage, PandaNode::CDLockedStageReader &cdata) {
           DrawMask draw_show_mask = cdataw->_draw_show_mask;
 
           DrawMask show_through_mask = net_draw_control_mask & net_draw_show_mask;
-          
+
           net_draw_control_mask |= draw_control_mask;
           net_draw_show_mask = (net_draw_show_mask & ~draw_control_mask) | (draw_show_mask & draw_control_mask);
 
           net_draw_show_mask |= show_through_mask;
-          
+
           // There are renderable nodes below, so the implicit draw
           // bits are all on.
           cdataw->_net_draw_control_mask = net_draw_control_mask;
@@ -4041,57 +4052,63 @@ update_bounds(int pipeline_stage, PandaNode::CDLockedStageReader &cdata) {
         }
 
         cdataw->_off_clip_planes = off_clip_planes;
-        cdataw->_nested_vertices = num_vertices;
 
-        CPT(TransformState) transform = get_transform(current_thread);
-        PT(GeometricBoundingVolume) gbv;
+        if (update_bounds) {
+          cdataw->_nested_vertices = num_vertices;
 
-        BoundingVolume::BoundsType btype = cdataw->_bounds_type;
-        if (btype == BoundingVolume::BT_default) {
-          btype = bounds_type;
+          CPT(TransformState) transform = get_transform(current_thread);
+          PT(GeometricBoundingVolume) gbv;
+
+          BoundingVolume::BoundsType btype = cdataw->_bounds_type;
+          if (btype == BoundingVolume::BT_default) {
+            btype = bounds_type;
+          }
+
+          if (btype == BoundingVolume::BT_box ||
+              (btype != BoundingVolume::BT_sphere && all_box && transform->is_identity())) {
+            // If all of the child volumes are a BoundingBox, and we
+            // have no transform, then our volume is also a
+            // BoundingBox.
+
+            gbv = new BoundingBox;
+          } else {
+            // Otherwise, it's a sphere.
+            gbv = new BoundingSphere;
+          }
+
+          if (child_volumes_i > 0) {
+            const BoundingVolume **child_begin = &child_volumes[0];
+            const BoundingVolume **child_end = child_begin + child_volumes_i;
+            ((BoundingVolume *)gbv)->around(child_begin, child_end);
+          }
+
+          // If we have a transform, apply it to the bounding volume we
+          // just computed.
+          if (!transform->is_identity()) {
+            gbv->xform(transform->get_mat());
+          }
+
+          cdataw->_external_bounds = gbv;
+          cdataw->_last_bounds_update = next_update;
         }
 
-        if (btype == BoundingVolume::BT_box ||
-            (btype != BoundingVolume::BT_sphere && all_box && transform->is_identity())) {
-          // If all of the child volumes are a BoundingBox, and we
-          // have no transform, then our volume is also a
-          // BoundingBox.
-          
-          gbv = new BoundingBox;
-        } else {
-          // Otherwise, it's a sphere.
-          gbv = new BoundingSphere;
-        }
-        
-        if (child_volumes_i > 0) {
-          const BoundingVolume **child_begin = &child_volumes[0];
-          const BoundingVolume **child_end = child_begin + child_volumes_i;
-          ((BoundingVolume *)gbv)->around(child_begin, child_end);
-        }
-        
-        // If we have a transform, apply it to the bounding volume we
-        // just computed.
-        if (!transform->is_identity()) {
-          gbv->xform(transform->get_mat());
-        }
-
-        cdataw->_external_bounds = gbv;
         cdataw->_last_update = next_update;
 
         if (drawmask_cat.is_debug()) {
           drawmask_cat.debug(false)
-            << "} " << *this << "::update_bounds();\n";
+            << "} " << *this << "::update_cached();\n";
         }
 
         nassertr(cdataw->_last_update == cdataw->_next_update, cdataw);
-    
+
         // Even though implicit bounding volume is not (yet?) part of
         // the bam stream.
         mark_bam_modified();
         return cdataw;
       }
-      
-      if (cdataw->_last_update == cdataw->_next_update) {
+
+      if (cdataw->_last_update == cdataw->_next_update &&
+          (!update_bounds || cdataw->_last_bounds_update == cdataw->_next_update)) {
         // Someone else has computed the cache for us.  OK.
         return cdataw;
       }
@@ -4101,7 +4118,8 @@ update_bounds(int pipeline_stage, PandaNode::CDLockedStageReader &cdata) {
     // the read lock back.
     cdata = CDLockedStageReader(_cycler, pipeline_stage, current_thread);
 
-    if (cdata->_last_update == cdata->_next_update) {
+    if (cdata->_last_update == cdata->_next_update &&
+        (!update_bounds || cdata->_last_bounds_update == cdata->_next_update)) {
       // Someone else has computed the cache for us while we were
       // diddling with the locks.  OK.
       return CDStageWriter(_cycler, pipeline_stage, cdata);
@@ -4298,6 +4316,7 @@ CData(const PandaNode::CData &copy) :
   _external_bounds(copy._external_bounds),
   _last_update(copy._last_update),
   _next_update(copy._next_update),
+  _last_bounds_update(copy._last_bounds_update),
 
   _down(copy._down),
   _stashed(copy._stashed),
@@ -4559,7 +4578,7 @@ dec_py_refs() {
     PyGILState_STATE gstate;
     gstate = PyGILState_Ensure();
 #endif
-    
+
     PythonTagData::const_iterator ti;
     for (ti = _python_tag_data.begin();
          ti != _python_tag_data.end();
@@ -4567,7 +4586,7 @@ dec_py_refs() {
       PyObject *value = (*ti).second;
       Py_XDECREF(value);
     }
-    
+
 #if defined(HAVE_THREADS) && !defined(SIMPLE_THREADS)
     PyGILState_Release(gstate);
 #endif
@@ -4715,7 +4734,7 @@ complete_down_list(PandaNode::Down &down_list, const string &tag,
 
   Down &new_down_list = aux->_down_list;
   for (Down::iterator di = new_down_list.begin();
-       di != new_down_list.end(); 
+       di != new_down_list.end();
        ++di) {
     PandaNode *child_node = DCAST(PandaNode, p_list[pi++]);
     (*di).set_child(child_node);
@@ -4780,14 +4799,19 @@ fillin_down_list(PandaNode::Down &down_list, const string &tag,
 }
 
 ////////////////////////////////////////////////////////////////////
-//     Function: PandaNodePipelineReader::check_bounds
+//     Function: PandaNodePipelineReader::check_cached
 //       Access: Public
-//  Description: Ensures that the bounding volume is properly computed
-//               on this node.
+//  Description: Ensures that the draw masks etc. are properly
+//               computed on this node.  If update_bounds is true,
+//               also checks the bounding volume.
 ////////////////////////////////////////////////////////////////////
 void PandaNodePipelineReader::
-check_bounds() const {
-  if (_cdata->_last_update != _cdata->_next_update) {
+check_cached(bool update_bounds) const {
+  UpdateSeq last_update = update_bounds
+                        ? _cdata->_last_bounds_update
+                        : _cdata->_last_update;
+
+  if (last_update != _cdata->_next_update) {
     // The cache is stale; it needs to be rebuilt.
 
     // We'll need to get a fresh read pointer, since another thread
@@ -4799,7 +4823,8 @@ check_bounds() const {
     ((PandaNodePipelineReader *)this)->_cdata = NULL;
     int pipeline_stage = _current_thread->get_pipeline_stage();
     PandaNode::CDLockedStageReader fresh_cdata(_node->_cycler, pipeline_stage, _current_thread);
-    if (fresh_cdata->_last_update == fresh_cdata->_next_update) {
+    if (fresh_cdata->_last_update == fresh_cdata->_next_update &&
+        (!update_bounds || fresh_cdata->_last_bounds_update == fresh_cdata->_next_update)) {
       // What luck, some other thread has already freshened the
       // cache for us.  Save the new pointer, and let the lock
       // release itself.
@@ -4809,12 +4834,12 @@ check_bounds() const {
         _cdata->node_ref();
 #endif  // DO_PIPELINING
       }
-      
+
     } else {
       // No, the cache is still stale.  We have to do the work of
       // freshening it.
       PStatTimer timer(PandaNode::_update_bounds_pcollector);
-      PandaNode::CDStageWriter cdataw = ((PandaNode *)_node)->update_bounds(pipeline_stage, fresh_cdata);
+      PandaNode::CDStageWriter cdataw = ((PandaNode *)_node)->update_cached(update_bounds, pipeline_stage, fresh_cdata);
       nassertv(cdataw->_last_update == cdataw->_next_update);
       // As above, we save the new pointer, and then let the lock
       // release itself.
@@ -4828,4 +4853,5 @@ check_bounds() const {
   }
 
   nassertv(_cdata->_last_update == _cdata->_next_update);
+  nassertv(!update_bounds || _cdata->_last_bounds_update == _cdata->_next_update);
 }
diff --git a/panda/src/pgraph/pandaNode.h b/panda/src/pgraph/pandaNode.h
index d7d19efba4..c1719a7658 100644
--- a/panda/src/pgraph/pandaNode.h
+++ b/panda/src/pgraph/pandaNode.h
@@ -69,14 +69,13 @@ class GraphicsStateGuardianBase;
 //               is the base class of all specialized nodes, and also
 //               serves as a generic node with no special properties.
 ////////////////////////////////////////////////////////////////////
-class EXPCL_PANDA_PGRAPH PandaNode : public TypedWritable, public Namable, 
-                              public LinkedListNode,
-                              virtual public ReferenceCount {
+class EXPCL_PANDA_PGRAPH PandaNode : public TypedWritableReferenceCount,
+                                     public Namable, public LinkedListNode {
 PUBLISHED:
   PandaNode(const string &name);
   virtual ~PandaNode();
-  //published so that characters can be combined. 
-  virtual PandaNode *combine_with(PandaNode *other); 
+  //published so that characters can be combined.
+  virtual PandaNode *combine_with(PandaNode *other);
 
 protected:
   PandaNode(const PandaNode &copy);
@@ -84,7 +83,6 @@ private:
   void operator = (const PandaNode &copy);
 
 public:
-  virtual ReferenceCount *as_reference_count();
   virtual PandaNode *dupe_for_flatten() const;
 
   virtual bool safe_to_flatten() const;
@@ -105,7 +103,7 @@ public:
                       bool &found_any,
                       const TransformState *transform,
                       Thread *current_thread = Thread::get_current_thread()) const;
-  
+
   virtual bool cull_callback(CullTraverser *trav, CullTraverserData &data);
   virtual bool has_selective_visibility() const;
   virtual int get_first_visible_child() const;
@@ -165,39 +163,39 @@ PUBLISHED:
   void copy_children(PandaNode *other, Thread *current_thread = Thread::get_current_thread());
 
   void set_attrib(const RenderAttrib *attrib, int override = 0);
-  INLINE const RenderAttrib *get_attrib(TypeHandle type) const;
-  INLINE const RenderAttrib *get_attrib(int slot) const;
+  INLINE CPT(RenderAttrib) get_attrib(TypeHandle type) const;
+  INLINE CPT(RenderAttrib) get_attrib(int slot) const;
   INLINE bool has_attrib(TypeHandle type) const;
   INLINE bool has_attrib(int slot) const;
   INLINE void clear_attrib(TypeHandle type);
   void clear_attrib(int slot);
 
   void set_effect(const RenderEffect *effect);
-  INLINE const RenderEffect *get_effect(TypeHandle type) const;
+  INLINE CPT(RenderEffect) get_effect(TypeHandle type) const;
   INLINE bool has_effect(TypeHandle type) const;
   void clear_effect(TypeHandle type);
 
   void set_state(const RenderState *state, Thread *current_thread = Thread::get_current_thread());
-  INLINE const RenderState *get_state(Thread *current_thread = Thread::get_current_thread()) const;
+  INLINE CPT(RenderState) get_state(Thread *current_thread = Thread::get_current_thread()) const;
   INLINE void clear_state(Thread *current_thread = Thread::get_current_thread());
 
   void set_effects(const RenderEffects *effects, Thread *current_thread = Thread::get_current_thread());
-  INLINE const RenderEffects *get_effects(Thread *current_thread = Thread::get_current_thread()) const;
+  INLINE CPT(RenderEffects) get_effects(Thread *current_thread = Thread::get_current_thread()) const;
   INLINE void clear_effects(Thread *current_thread = Thread::get_current_thread());
 
   void set_transform(const TransformState *transform, Thread *current_thread = Thread::get_current_thread());
-  INLINE const TransformState *get_transform(Thread *current_thread = Thread::get_current_thread()) const;
+  INLINE CPT(TransformState) get_transform(Thread *current_thread = Thread::get_current_thread()) const;
   INLINE void clear_transform(Thread *current_thread = Thread::get_current_thread());
 
   void set_prev_transform(const TransformState *transform, Thread *current_thread = Thread::get_current_thread());
-  INLINE const TransformState *get_prev_transform(Thread *current_thread = Thread::get_current_thread()) const;
+  INLINE CPT(TransformState) get_prev_transform(Thread *current_thread = Thread::get_current_thread()) const;
   void reset_prev_transform(Thread *current_thread = Thread::get_current_thread());
   INLINE bool has_dirty_prev_transform() const;
   static void reset_all_prev_transform(Thread *current_thread = Thread::get_current_thread());
 
-  void set_tag(const string &key, const string &value, 
+  void set_tag(const string &key, const string &value,
                Thread *current_thread = Thread::get_current_thread());
-  INLINE string get_tag(const string &key, 
+  INLINE string get_tag(const string &key,
                         Thread *current_thread = Thread::get_current_thread()) const;
   INLINE bool has_tag(const string &key,
                       Thread *current_thread = Thread::get_current_thread()) const;
@@ -393,7 +391,7 @@ private:
 
   // parent-child manipulation for NodePath support.  Don't try to
   // call these directly.
-  static PT(NodePathComponent) attach(NodePathComponent *parent, 
+  static PT(NodePathComponent) attach(NodePathComponent *parent,
                                       PandaNode *child, int sort,
                                       int pipeline_stage, Thread *current_thread);
   static void detach(NodePathComponent *child, int pipeline_stage, Thread *current_thread);
@@ -402,7 +400,7 @@ private:
                        NodePathComponent *child, int sort, bool as_stashed,
                        int pipeline_stage, Thread *current_thread);
   static bool reparent_one_stage(NodePathComponent *new_parent,
-                                 NodePathComponent *child, int sort, 
+                                 NodePathComponent *child, int sort,
                                  bool as_stashed, int pipeline_stage, Thread *current_thread);
   static PT(NodePathComponent) get_component(NodePathComponent *parent,
                                              PandaNode *child,
@@ -411,7 +409,7 @@ private:
                                                  int pipeline_stage, Thread *current_thread);
   PT(NodePathComponent) get_generic_component(bool accept_ambiguity,
                                               int pipeline_stage, Thread *current_thread);
-  PT(NodePathComponent) r_get_generic_component(bool accept_ambiguity, 
+  PT(NodePathComponent) r_get_generic_component(bool accept_ambiguity,
                                                 bool &ambiguity_detected,
                                                 int pipeline_stage, Thread *current_thread);
   void delete_component(NodePathComponent *component);
@@ -421,7 +419,7 @@ private:
                              int pipeline_stage, Thread *current_thread);
   void fix_path_lengths(int pipeline_stage, Thread *current_thread);
   void r_list_descendants(ostream &out, int indent_level) const;
-  
+
   INLINE void do_set_dirty_prev_transform();
   INLINE void do_clear_dirty_prev_transform();
 
@@ -461,14 +459,14 @@ private:
     static TypeHandle get_class_type() {
       return _type_handle;
     }
-    
+
   public:
     static void init_type() {
       BamReaderAuxData::init_type();
       register_type(_type_handle, "BamReaderAuxDataDown",
                     BamReaderAuxData::get_class_type());
     }
-    
+
   private:
     static TypeHandle _type_handle;
   };
@@ -513,8 +511,8 @@ private:
 #ifndef NDEBUG
   unsigned int _unexpected_change_flags;
 #endif // !NDEBUG
-  
-  // This is the data that must be cycled between pipeline stages. 
+
+  // This is the data that must be cycled between pipeline stages.
 
   class EXPCL_PANDA_PGRAPH CData : public BoundsData {
   public:
@@ -524,7 +522,7 @@ private:
     ALLOC_DELETED_CHAIN(CData);
 
     virtual CycleData *make_copy() const;
-    virtual void write_datagram(BamWriter *manager, Datagram &dg) const; 
+    virtual void write_datagram(BamWriter *manager, Datagram &dg) const;
     void update_bam_nested(BamWriter *manager) const;
     virtual int complete_pointers(TypedWritable **plist, BamReader *manager);
     virtual void fillin(DatagramIterator &scan, BamReader *manager);
@@ -545,7 +543,7 @@ private:
     // are less likely to change as often: tags, collide mask.
 
     INLINE void set_fancy_bit(int bits, bool value);
-    
+
 #ifdef HAVE_PYTHON
     void inc_py_refs();
     void dec_py_refs();
@@ -616,6 +614,11 @@ private:
     // When _last_update != _next_update, this cache is stale.
     UpdateSeq _last_update, _next_update;
 
+    // We don't always update the bounding volume and number of
+    // nested vertices.  This indicates the last time they were changed.
+    // It is never higher than _last_update.
+    UpdateSeq _last_bounds_update;
+
   public:
     // This section stores the links to other nodes above and below
     // this node in the graph.
@@ -648,7 +651,7 @@ private:
     COWPT(Down) _down;
     COWPT(Down) _stashed;
     COWPT(Up) _up;
-    
+
   public:
     static TypeHandle get_class_type() {
       return _type_handle;
@@ -656,7 +659,7 @@ private:
     static void init_type() {
       register_type(_type_handle, "PandaNode::CData");
     }
-    
+
   private:
     static TypeHandle _type_handle;
   };
@@ -669,7 +672,8 @@ private:
   typedef CycleDataStageWriter<CData> CDStageWriter;
 
   int do_find_child(PandaNode *node, const Down *down) const;
-  CDStageWriter update_bounds(int pipeline_stage, CDLockedStageReader &cdata);
+  CDStageWriter update_cached(bool update_bounds, int pipeline_stage,
+                              CDLockedStageReader &cdata);
 
   static DrawMask _overall_bit;
 
@@ -691,6 +695,11 @@ public:
     INLINE Children(const Children &copy);
     INLINE void operator = (const Children &copy);
 
+#ifdef USE_MOVE_SEMANTICS
+    INLINE Children(Children &&from) NOEXCEPT;
+    INLINE void operator = (Children &&from) NOEXCEPT;
+#endif
+
     INLINE int get_num_children() const;
     INLINE PandaNode *get_child(int n) const;
     INLINE int get_child_sort(int n) const;
@@ -707,6 +716,11 @@ public:
     INLINE Stashed(const Stashed &copy);
     INLINE void operator = (const Stashed &copy);
 
+#ifdef USE_MOVE_SEMANTICS
+    INLINE Stashed(Stashed &&from) NOEXCEPT;
+    INLINE void operator = (Stashed &&from) NOEXCEPT;
+#endif
+
     INLINE int get_num_stashed() const;
     INLINE PandaNode *get_stashed(int n) const;
     INLINE int get_stashed_sort(int n) const;
@@ -723,6 +737,11 @@ public:
     INLINE Parents(const Parents &copy);
     INLINE void operator = (const Parents &copy);
 
+#ifdef USE_MOVE_SEMANTICS
+    INLINE Parents(Parents &&from) NOEXCEPT;
+    INLINE void operator = (Parents &&from) NOEXCEPT;
+#endif
+
     INLINE int get_num_parents() const;
     INLINE PandaNode *get_parent(int n) const;
 
@@ -750,7 +769,7 @@ protected:
   static TypedWritable *make_from_bam(const FactoryParams &params);
   void fillin(DatagramIterator &scan, BamReader *manager);
   void fillin_recorder(DatagramIterator &scan, BamReader *manager);
-  
+
 public:
   static TypeHandle get_class_type() {
     return _type_handle;
@@ -808,7 +827,7 @@ public:
 
   INLINE void release();
 
-  void check_bounds() const;
+  void check_cached(bool update_bounds) const;
 
   INLINE void compose_draw_mask(DrawMask &running_draw_mask) const;
   INLINE bool compare_draw_mask(DrawMask running_draw_mask,
diff --git a/panda/src/pgraph/pandaNode_ext.cxx b/panda/src/pgraph/pandaNode_ext.cxx
index 515b704574..df251cba44 100644
--- a/panda/src/pgraph/pandaNode_ext.cxx
+++ b/panda/src/pgraph/pandaNode_ext.cxx
@@ -53,7 +53,7 @@ __copy__() const {
 ////////////////////////////////////////////////////////////////////
 PyObject *Extension<PandaNode>::
 __deepcopy__(PyObject *self, PyObject *memo) const {
-  IMPORT_THIS struct Dtool_PyTypedObject Dtool_PandaNode;
+  extern struct Dtool_PyTypedObject Dtool_PandaNode;
 
   // Borrowed reference.
   PyObject *dupe = PyDict_GetItem(memo, self);
diff --git a/panda/src/pgraph/planeNode.cxx b/panda/src/pgraph/planeNode.cxx
index 8e2d25f41e..3dfaa6bb89 100644
--- a/panda/src/pgraph/planeNode.cxx
+++ b/panda/src/pgraph/planeNode.cxx
@@ -99,7 +99,7 @@ PlaneNode(const PlaneNode &copy) :
 ////////////////////////////////////////////////////////////////////
 //     Function: PlaneNode::output
 //       Access: Public, Virtual
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 void PlaneNode::
 output(ostream &out) const {
@@ -166,11 +166,9 @@ cull_callback(CullTraverser *trav, CullTraverserData &data) {
   // Normally, a PlaneNode is invisible.  But if someone shows it, we
   // will draw a visualization, a nice yellow wireframe.
 
-  CullableObject *plane_viz = 
-    new CullableObject(get_viz(trav, data), data._state, 
-                       data.get_net_transform(trav),
-                       data.get_modelview_transform(trav),
-                       trav->get_scene());
+  CullableObject *plane_viz =
+    new CullableObject(get_viz(trav, data), data._state,
+                       data.get_internal_transform(trav));
   trav->get_cull_handler()->record_object(plane_viz, trav);
 
   // Now carry on to render our child nodes.
@@ -219,7 +217,7 @@ compute_internal_bounds(CPT(BoundingVolume) &internal_bounds,
 PT(Geom) PlaneNode::
 get_viz(CullTraverser *trav, CullTraverserData &data) {
   CDLockedReader cdata(_cycler);
-  
+
   // Figure out whether we are looking at the front or the back of the
   // plane.
   const Lens *lens = trav->get_scene()->get_lens();
@@ -273,7 +271,7 @@ get_viz(CullTraverser *trav, CullTraverserData &data) {
   static const int num_segs = 10;
   a *= cdataw->_viz_scale / (num_segs * 2);
   b *= cdataw->_viz_scale / (num_segs * 2);
-  
+
   for (int x = -num_segs; x <= num_segs; ++x) {
     vertex.add_data3(plane.project(a * x - b * num_segs));
     vertex.add_data3(plane.project(a * x + b * num_segs));
diff --git a/panda/src/pgraph/renderAttrib.I b/panda/src/pgraph/renderAttrib.I
index bb12b66e62..a32e666c3c 100644
--- a/panda/src/pgraph/renderAttrib.I
+++ b/panda/src/pgraph/renderAttrib.I
@@ -96,11 +96,7 @@ compare_to(const RenderAttrib &other) const {
 ////////////////////////////////////////////////////////////////////
 INLINE size_t RenderAttrib::
 get_hash() const {
-  size_t hash = get_hash_impl();
-
-  // The type is also added to the hash.
-  hash = int_hash::add_hash(hash, get_type().get_index());
-  return hash;
+  return _hash;
 }
 
 ////////////////////////////////////////////////////////////////////
@@ -143,6 +139,19 @@ get_auto_shader_attrib(const RenderState *state) const {
   return get_auto_shader_attrib_impl(state);
 }
 
+////////////////////////////////////////////////////////////////////
+//     Function: RenderAttrib::calc_hash
+//       Access: Published
+//  Description: Calculates a suitable hash value for phash_map.
+////////////////////////////////////////////////////////////////////
+INLINE void RenderAttrib::
+calc_hash() {
+  size_t hash = get_hash_impl();
+
+  // The type is also added to the hash.
+  _hash = int_hash::add_hash(hash, get_type().get_index());
+}
+
 ////////////////////////////////////////////////////////////////////
 //     Function: RenderAttrib::register_slot
 //       Access: Public, Static
diff --git a/panda/src/pgraph/renderAttrib.cxx b/panda/src/pgraph/renderAttrib.cxx
index fcb5ee7b52..419a9094c9 100644
--- a/panda/src/pgraph/renderAttrib.cxx
+++ b/panda/src/pgraph/renderAttrib.cxx
@@ -143,7 +143,7 @@ cull_callback(CullTraverser *, const CullTraverserData &) const {
 ////////////////////////////////////////////////////////////////////
 //     Function: RenderAttrib::get_auto_shader_attrib_impl
 //       Access: Protected, Virtual
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 CPT(RenderAttrib) RenderAttrib::
 get_auto_shader_attrib_impl(const RenderState *state) const {
@@ -152,7 +152,7 @@ get_auto_shader_attrib_impl(const RenderState *state) const {
 
 ////////////////////////////////////////////////////////////////////
 //     Function: RenderAttrib::unref
-//       Access: Published, Virtual
+//       Access: Published, Virtual, Final
 //  Description: This method overrides ReferenceCount::unref() to
 //               clear the pointer from the global object pool when
 //               its reference count goes to zero.
@@ -191,7 +191,7 @@ unref() const {
 ////////////////////////////////////////////////////////////////////
 //     Function: RenderAttrib::output
 //       Access: Published, Virtual
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 void RenderAttrib::
 output(ostream &out) const {
@@ -201,7 +201,7 @@ output(ostream &out) const {
 ////////////////////////////////////////////////////////////////////
 //     Function: RenderAttrib::write
 //       Access: Published, Virtual
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 void RenderAttrib::
 write(ostream &out, int indent_level) const {
@@ -274,7 +274,7 @@ garbage_collect() {
   }
   num_this_pass = min(num_this_pass, size);
   int stop_at_element = (_garbage_index + num_this_pass) % size;
-  
+
   int num_elements = 0;
   int si = _garbage_index;
   do {
@@ -291,7 +291,7 @@ garbage_collect() {
         attrib->release_new();
         unref_delete(attrib);
       }
-    }      
+    }
 
     si = (si + 1) % size;
   } while (si != stop_at_element);
@@ -328,12 +328,11 @@ validate_attribs() {
       }
       const RenderAttrib *attrib = _attribs->get_key(si);
       cerr << si << ": " << attrib << "\n";
-      attrib->get_hash();
       attrib->write(cerr, 2);
     }
 
     return false;
-  }    
+  }
 
   int size = _attribs->get_size();
   int si = 0;
@@ -391,6 +390,7 @@ CPT(RenderAttrib) RenderAttrib::
 return_new(RenderAttrib *attrib) {
   nassertr(attrib != (RenderAttrib *)NULL, attrib);
   if (!uniquify_attribs) {
+    attrib->calc_hash();
     return attrib;
   }
 
@@ -415,6 +415,8 @@ CPT(RenderAttrib) RenderAttrib::
 return_unique(RenderAttrib *attrib) {
   nassertr(attrib != (RenderAttrib *)NULL, attrib);
 
+  attrib->calc_hash();
+
   if (!state_cache) {
     return attrib;
   }
@@ -442,7 +444,7 @@ return_unique(RenderAttrib *attrib) {
     // There's an equivalent attrib already in the set.  Return it.
     return _attribs->get_key(si);
   }
-  
+
   // Not already in the set; add it.
   if (garbage_collect_states) {
     // If we'll be garbage collecting attribs explicitly, we'll
@@ -656,7 +658,7 @@ change_this(TypedWritable *old_ptr, BamReader *manager) {
     pointer->ref();
     manager->register_finalize(attrib);
   }
-  
+
   // We have to cast the pointer back to non-const, because the bam
   // reader expects that.
   return (RenderAttrib *)pointer.p();
diff --git a/panda/src/pgraph/renderAttrib.h b/panda/src/pgraph/renderAttrib.h
index 0783080a0b..d3d9c67c40 100644
--- a/panda/src/pgraph/renderAttrib.h
+++ b/panda/src/pgraph/renderAttrib.h
@@ -84,7 +84,7 @@ PUBLISHED:
   INLINE CPT(RenderAttrib) get_unique() const;
   INLINE CPT(RenderAttrib) get_auto_shader_attrib(const RenderState *state) const;
 
-  virtual bool unref() const;
+  virtual bool unref() const FINAL;
 
   virtual void output(ostream &out) const;
   virtual void write(ostream &out, int indent_level) const;
@@ -105,7 +105,7 @@ PUBLISHED:
     M_greater,          // incoming > reference_alpha
     M_not_equal,        // incoming != reference_alpha
     M_greater_equal,    // incoming >= reference_alpha
-    M_always            // Always draw.  
+    M_always            // Always draw.
   };
 
   // This is the enumerated type for TexGenAttrib.  It is inherited
@@ -131,7 +131,7 @@ PUBLISHED:
     // Typically, a statically-generated cube map will be in eye
     // space, while a dynamically-generated map will be in world
     // space.
-
+    //
     // Cube mapping is not supported on all hardware.
     M_world_cube_map,
     M_eye_cube_map,
@@ -153,7 +153,7 @@ PUBLISHED:
     // lower-right across the point's face.  Without this, each point
     // will have just a single uniform texture coordinate value across
     // its face.
-
+    //
     // Unfortunately, the generated texture coordinates are inverted
     // (upside-down) from Panda's usual convention, but this is what
     // the graphics card manufacturers decided to use.  You could use
@@ -163,16 +163,12 @@ PUBLISHED:
     // hardware sprites.
     M_point_sprite,
 
-    // M_light_vector generates special 3-d texture coordinates that
-    // represent the vector to a particular Light in the scene graph,
-    // expressed in each vertex's tangent space.  This is used to
-    // implement bumpmapping.  It is always computed on the CPU.
-
-    // This requires a Light to be specified to the TexGenAttrib.  It
-    // also requires each vertex to define a normal, as well as a
-    // tangent and binormal for the particular named texture
-    // coordinate set.
-    M_light_vector,
+    // M_light_vector generated special 3-d texture coordinates that
+    // represented the vector to a particular Light in the scene graph,
+    // expressed in each vertex's tangent space.  This has now been
+    // removed.  We need to reserve the slot in the enum, though, to
+    // make sure the following enum value still has the same value.
+    M_unused2,
 
     // M_constant generates the same fixed texture coordinates at each
     // vertex.  Not terribly useful, of course, except for certain
@@ -181,6 +177,8 @@ PUBLISHED:
   };
 
 protected:
+  INLINE void calc_hash();
+
   static CPT(RenderAttrib) return_new(RenderAttrib *attrib);
   static CPT(RenderAttrib) return_unique(RenderAttrib *attrib);
   virtual int compare_to_impl(const RenderAttrib *other) const;
@@ -212,6 +210,7 @@ private:
   static Attribs *_attribs;
 
   int _saved_entry;
+  size_t _hash;
 
   // This keeps track of our current position through the garbage
   // collection cycle.
@@ -227,7 +226,7 @@ public:
 protected:
   static TypedWritable *new_from_bam(RenderAttrib *attrib, BamReader *manager);
   void fillin(DatagramIterator &scan, BamReader *manager);
-  
+
 public:
   static TypeHandle get_class_type() {
     return _type_handle;
diff --git a/panda/src/pgraph/renderModeAttrib.I b/panda/src/pgraph/renderModeAttrib.I
index b324663d9b..4a7bda8dc1 100644
--- a/panda/src/pgraph/renderModeAttrib.I
+++ b/panda/src/pgraph/renderModeAttrib.I
@@ -21,10 +21,11 @@
 ////////////////////////////////////////////////////////////////////
 INLINE RenderModeAttrib::
 RenderModeAttrib(RenderModeAttrib::Mode mode, PN_stdfloat thickness,
-                 bool perspective) :
+                 bool perspective, const LColor &wireframe_color) :
   _mode(mode),
   _thickness(thickness),
-  _perspective(perspective)
+  _perspective(perspective),
+  _wireframe_color(wireframe_color)
 {
 }
 
@@ -68,6 +69,18 @@ get_perspective() const {
   return _perspective;
 }
 
+////////////////////////////////////////////////////////////////////
+//     Function: RenderModeAttrib::get_wireframe_color
+//       Access: Published
+//  Description: Returns the color that is used in M_filled_wireframe
+//               mode to distinguish the wireframe from the rest of
+//               the geometry.
+////////////////////////////////////////////////////////////////////
+INLINE const LColor &RenderModeAttrib::
+get_wireframe_color() const {
+  return _wireframe_color;
+}
+
 ////////////////////////////////////////////////////////////////////
 //     Function: RenderModeAttrib::get_geom_rendering
 //       Access: Published
diff --git a/panda/src/pgraph/renderModeAttrib.cxx b/panda/src/pgraph/renderModeAttrib.cxx
index 9de256c811..cb91cdcf6e 100644
--- a/panda/src/pgraph/renderModeAttrib.cxx
+++ b/panda/src/pgraph/renderModeAttrib.cxx
@@ -44,10 +44,15 @@ int RenderModeAttrib::_attrib_slot;
 //               it is false, the point thickness is actually a width
 //               in pixels, and points are a uniform screen size
 //               regardless of distance from the camera.
+//
+//               In M_filled_wireframe mode, you should also specify
+//               the wireframe_color, indicating the flat color to
+//               assign to the overlayed wireframe.
 ////////////////////////////////////////////////////////////////////
 CPT(RenderAttrib) RenderModeAttrib::
-make(RenderModeAttrib::Mode mode, PN_stdfloat thickness, bool perspective) {
-  RenderModeAttrib *attrib = new RenderModeAttrib(mode, thickness, perspective);
+make(RenderModeAttrib::Mode mode, PN_stdfloat thickness,
+     bool perspective, const LColor &wireframe_color) {
+  RenderModeAttrib *attrib = new RenderModeAttrib(mode, thickness, perspective, wireframe_color);
   return return_new(attrib);
 }
 
@@ -66,7 +71,7 @@ make_default() {
 ////////////////////////////////////////////////////////////////////
 //     Function: RenderModeAttrib::output
 //       Access: Public, Virtual
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 void RenderModeAttrib::
 output(ostream &out) const {
@@ -91,6 +96,10 @@ output(ostream &out) const {
   case M_filled_flat:
     out << "filled_flat";
     break;
+
+  case M_filled_wireframe:
+    out << "filled_wireframe(" << get_wireframe_color() << ")";
+    break;
   }
 
   if (get_thickness() != 1.0f) {
@@ -130,6 +139,9 @@ compare_to_impl(const RenderAttrib *other) const {
   if (_perspective != ta->_perspective) {
     return (int)_perspective - (int)ta->_perspective;
   }
+  if (_mode == M_filled_wireframe && _wireframe_color != ta->_wireframe_color) {
+    return _wireframe_color.compare_to(ta->_wireframe_color);
+  }
   return 0;
 }
 
@@ -149,6 +161,9 @@ get_hash_impl() const {
   hash = int_hash::add_hash(hash, (int)_mode);
   hash = float_hash().add_hash(hash, _thickness);
   hash = int_hash::add_hash(hash, (int)_perspective);
+  if (_mode == M_filled_wireframe) {
+    hash = _wireframe_color.add_hash(hash);
+  }
   return hash;
 }
 
@@ -180,7 +195,8 @@ compose_impl(const RenderAttrib *other) const {
     mode = get_mode();
   }
 
-  return make(mode, ta->get_thickness(), ta->get_perspective());
+  return make(mode, ta->get_thickness(), ta->get_perspective(),
+              ta->get_wireframe_color());
 }
 
 ////////////////////////////////////////////////////////////////////
@@ -207,6 +223,10 @@ write_datagram(BamWriter *manager, Datagram &dg) {
   dg.add_int8(_mode);
   dg.add_stdfloat(_thickness);
   dg.add_bool(_perspective);
+
+  if (_mode == M_filled_wireframe) {
+    _wireframe_color.write_datagram(dg);
+  }
 }
 
 ////////////////////////////////////////////////////////////////////
@@ -243,4 +263,8 @@ fillin(DatagramIterator &scan, BamReader *manager) {
   _mode = (Mode)scan.get_int8();
   _thickness = scan.get_stdfloat();
   _perspective = scan.get_bool();
+
+  if (_mode == M_filled_wireframe) {
+    _wireframe_color.read_datagram(scan);
+  }
 }
diff --git a/panda/src/pgraph/renderModeAttrib.h b/panda/src/pgraph/renderModeAttrib.h
index 8e0043f8e5..401b1d0152 100644
--- a/panda/src/pgraph/renderModeAttrib.h
+++ b/panda/src/pgraph/renderModeAttrib.h
@@ -44,20 +44,27 @@ PUBLISHED:
     // Filled polygons, without any particular emphasis on perspective
     // correctness (a particularly useful designation for software
     // rendering sprites).
-    M_filled_flat
+    M_filled_flat,
+
+    // Filled polygons with wireframe rendered in front.
+    // The wireframe is given a solid color.
+    M_filled_wireframe
   };
 
 private:
-  INLINE RenderModeAttrib(Mode mode, PN_stdfloat thickness, bool perspective);
+  INLINE RenderModeAttrib(Mode mode, PN_stdfloat thickness, bool perspective,
+                          const LColor &wireframe_color = LColor::zero());
 
 PUBLISHED:
   static CPT(RenderAttrib) make(Mode mode, PN_stdfloat thickness = 1.0f,
-                                bool perspective = false);
+                                bool perspective = false,
+                                const LColor &wireframe_color = LColor::zero());
   static CPT(RenderAttrib) make_default();
 
   INLINE Mode get_mode() const;
   INLINE PN_stdfloat get_thickness() const;
   INLINE bool get_perspective() const;
+  INLINE const LColor &get_wireframe_color() const;
 
   INLINE int get_geom_rendering(int geom_rendering) const;
 
@@ -73,6 +80,7 @@ private:
   Mode _mode;
   PN_stdfloat _thickness;
   bool _perspective;
+  LColor _wireframe_color;
 
 PUBLISHED:
   static int get_class_slot() {
@@ -89,7 +97,7 @@ public:
 protected:
   static TypedWritable *make_from_bam(const FactoryParams &params);
   void fillin(DatagramIterator &scan, BamReader *manager);
-  
+
 public:
   static TypeHandle get_class_type() {
     return _type_handle;
diff --git a/panda/src/pgraph/renderState.I b/panda/src/pgraph/renderState.I
index 8cce7408af..da6679bd7a 100644
--- a/panda/src/pgraph/renderState.I
+++ b/panda/src/pgraph/renderState.I
@@ -51,6 +51,42 @@ has_cull_callback() const {
   return (_flags & F_has_cull_callback) != 0;
 }
 
+////////////////////////////////////////////////////////////////////
+//     Function: RenderState::make_empty
+//       Access: Published, Static
+//  Description: Returns a RenderState with no attributes set.
+////////////////////////////////////////////////////////////////////
+INLINE CPT(RenderState) RenderState::
+make_empty() {
+  // The empty state is asked for so often, we make it a special case
+  // and store a pointer forever once we find it the first time.
+  if (_empty_state == (RenderState *)NULL) {
+    RenderState *state = new RenderState;
+    _empty_state = return_unique(state);
+  }
+
+  return _empty_state;
+}
+
+////////////////////////////////////////////////////////////////////
+//     Function: RenderState::make_full_default
+//       Access: Published, Static
+//  Description: Returns a RenderState with all possible attributes
+//               set to their default value.
+////////////////////////////////////////////////////////////////////
+INLINE CPT(RenderState) RenderState::
+make_full_default() {
+  // The empty state is asked for so often, we make it a special case
+  // and store a pointer forever once we find it the first time.
+  if (_full_default_state == (RenderState *)NULL) {
+    RenderState *state = new RenderState;
+    state->fill_default();
+    _full_default_state = return_unique(state);
+  }
+
+  return _full_default_state;
+}
+
 ////////////////////////////////////////////////////////////////////
 //     Function: RenderState::remove_attrib
 //       Access: Published
diff --git a/panda/src/pgraph/renderState.cxx b/panda/src/pgraph/renderState.cxx
index 03262e26c7..a7cf3ecddc 100644
--- a/panda/src/pgraph/renderState.cxx
+++ b/panda/src/pgraph/renderState.cxx
@@ -281,42 +281,6 @@ cull_callback(CullTraverser *trav, const CullTraverserData &data) const {
   return true;
 }
 
-////////////////////////////////////////////////////////////////////
-//     Function: RenderState::make_empty
-//       Access: Published, Static
-//  Description: Returns a RenderState with no attributes set.
-////////////////////////////////////////////////////////////////////
-CPT(RenderState) RenderState::
-make_empty() {
-  // The empty state is asked for so often, we make it a special case
-  // and store a pointer forever once we find it the first time.
-  if (_empty_state == (RenderState *)NULL) {
-    RenderState *state = new RenderState;
-    _empty_state = return_unique(state);
-  }
-
-  return _empty_state;
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: RenderState::make_full_default
-//       Access: Published, Static
-//  Description: Returns a RenderState with all possible attributes
-//               set to their default value.
-////////////////////////////////////////////////////////////////////
-CPT(RenderState) RenderState::
-make_full_default() {
-  // The empty state is asked for so often, we make it a special case
-  // and store a pointer forever once we find it the first time.
-  if (_full_default_state == (RenderState *)NULL) {
-    RenderState *state = new RenderState;
-    state->fill_default();
-    _full_default_state = return_unique(state);
-  }
-
-  return _full_default_state;
-}
-
 ////////////////////////////////////////////////////////////////////
 //     Function: RenderState::make
 //       Access: Published, Static
diff --git a/panda/src/pgraph/renderState.h b/panda/src/pgraph/renderState.h
index 9b87926045..035ae6fbe9 100644
--- a/panda/src/pgraph/renderState.h
+++ b/panda/src/pgraph/renderState.h
@@ -75,8 +75,8 @@ PUBLISHED:
   INLINE bool has_cull_callback() const;
   bool cull_callback(CullTraverser *trav, const CullTraverserData &data) const;
 
-  static CPT(RenderState) make_empty();
-  static CPT(RenderState) make_full_default();
+  INLINE static CPT(RenderState) make_empty();
+  INLINE static CPT(RenderState) make_full_default();
   static CPT(RenderState) make(const RenderAttrib *attrib, int override = 0);
   static CPT(RenderState) make(const RenderAttrib *attrib1,
                                const RenderAttrib *attrib2, int override = 0);
@@ -215,7 +215,7 @@ public:
   // ShaderAttrib will be synthesized by the runtime and stored here.
   // I can't declare this as a ShaderAttrib because that would create
   // a circular include-file dependency problem.  Aaargh.
-  CPT(RenderAttrib) _generated_shader;
+  mutable CPT(RenderAttrib) _generated_shader;
 
 private:
   // This mutex protects _states.  It also protects any modification
diff --git a/panda/src/pgraph/renderState_ext.cxx b/panda/src/pgraph/renderState_ext.cxx
index 70b214fbb3..3238677bd0 100644
--- a/panda/src/pgraph/renderState_ext.cxx
+++ b/panda/src/pgraph/renderState_ext.cxx
@@ -32,7 +32,7 @@
 ////////////////////////////////////////////////////////////////////
 PyObject *Extension<RenderState>::
 get_composition_cache() const {
-  IMPORT_THIS struct Dtool_PyTypedObject Dtool_RenderState;
+  extern struct Dtool_PyTypedObject Dtool_RenderState;
   LightReMutexHolder holder(*RenderState::_states_lock);
   size_t cache_size = _this->_composition_cache.get_size();
   PyObject *list = PyList_New(cache_size);
@@ -90,7 +90,7 @@ get_composition_cache() const {
 ////////////////////////////////////////////////////////////////////
 PyObject *Extension<RenderState>::
 get_invert_composition_cache() const {
-  IMPORT_THIS struct Dtool_PyTypedObject Dtool_RenderState;
+  extern struct Dtool_PyTypedObject Dtool_RenderState;
   LightReMutexHolder holder(*RenderState::_states_lock);
   size_t cache_size = _this->_invert_composition_cache.get_size();
   PyObject *list = PyList_New(cache_size);
@@ -141,7 +141,7 @@ get_invert_composition_cache() const {
 ////////////////////////////////////////////////////////////////////
 PyObject *Extension<RenderState>::
 get_states() {
-  IMPORT_THIS struct Dtool_PyTypedObject Dtool_RenderState;
+  extern struct Dtool_PyTypedObject Dtool_RenderState;
   if (RenderState::_states == (RenderState::States *)NULL) {
     return PyList_New(0);
   }
diff --git a/panda/src/pgraph/sceneGraphReducer.cxx b/panda/src/pgraph/sceneGraphReducer.cxx
index bebb661148..dbb2de844a 100644
--- a/panda/src/pgraph/sceneGraphReducer.cxx
+++ b/panda/src/pgraph/sceneGraphReducer.cxx
@@ -117,8 +117,8 @@ flatten(PandaNode *root, int combine_siblings_bits) {
       num_pass_nodes += r_flatten(root, child_node, combine_siblings_bits);
     }
 
-    if (combine_siblings_bits != 0 && 
-        root->get_num_children() >= 2 && 
+    if (combine_siblings_bits != 0 &&
+        root->get_num_children() >= 2 &&
         root->safe_to_combine_children()) {
       num_pass_nodes += flatten_siblings(root, combine_siblings_bits);
     }
@@ -381,7 +381,7 @@ r_apply_attribs(PandaNode *node, const AccumulatedAttribs &attribs,
             pgraph_cat.spam()
               << "Duplicated " << *child_node << "\n";
           }
-          
+
           new_node->copy_children(child_node);
           node->replace_child(child_node, new_node);
           child_node = new_node;
@@ -416,10 +416,17 @@ r_flatten(PandaNode *grandparent_node, PandaNode *parent_node,
           int combine_siblings_bits) {
   if (pgraph_cat.is_spam()) {
     pgraph_cat.spam()
-      << "SceneGraphReducer::r_flatten(" << *grandparent_node << ", " 
+      << "SceneGraphReducer::r_flatten(" << *grandparent_node << ", "
       << *parent_node << ", " << hex << combine_siblings_bits << dec
       << ")\n";
   }
+
+  if ((combine_siblings_bits & (CS_geom_node | CS_other | CS_recurse)) != 0) {
+    // Unset CS_within_radius, since we're going to flatten everything
+    // anyway.  This avoids needlessly calculating the bounding volume.
+    combine_siblings_bits &= ~CS_within_radius;
+  }
+
   int num_nodes = 0;
 
   if (!parent_node->safe_to_flatten_below()) {
@@ -428,7 +435,7 @@ r_flatten(PandaNode *grandparent_node, PandaNode *parent_node,
         << "Not traversing further; " << *parent_node
         << " doesn't allow flattening below itself.\n";
     }
-    
+
   } else {
     if ((combine_siblings_bits & CS_within_radius) != 0) {
       CPT(BoundingVolume) bv = parent_node->get_bounds();
@@ -462,16 +469,16 @@ r_flatten(PandaNode *grandparent_node, PandaNode *parent_node,
         num_nodes += r_flatten(parent_node, child_node, combine_siblings_bits);
       }
     }
-    
+
     // Now that the above loop has removed some children, the child
     // list saved above is no longer accurate, so hereafter we must
     // ask the node for its real child list.
-    
+
     // If we have CS_recurse set, then we flatten siblings before
     // trying to flatten children.  Otherwise, we flatten children
     // first, and then flatten siblings, which avoids overly
     // enthusiastic flattening.
-    if ((combine_siblings_bits & CS_recurse) != 0 && 
+    if ((combine_siblings_bits & CS_recurse) != 0 &&
         parent_node->get_num_children() >= 2 &&
         parent_node->safe_to_combine_children()) {
       num_nodes += flatten_siblings(parent_node, combine_siblings_bits);
@@ -482,11 +489,11 @@ r_flatten(PandaNode *grandparent_node, PandaNode *parent_node,
       // out.
       PT(PandaNode) child_node = parent_node->get_child(0);
       int child_sort = parent_node->get_child_sort(0);
-      
+
       if (consider_child(grandparent_node, parent_node, child_node)) {
         // Ok, do it.
         parent_node->remove_child(child_node);
-        
+
         if (do_flatten_child(grandparent_node, parent_node, child_node)) {
           // Done!
           num_nodes++;
@@ -498,7 +505,7 @@ r_flatten(PandaNode *grandparent_node, PandaNode *parent_node,
     }
 
     if ((combine_siblings_bits & CS_recurse) == 0 &&
-        (combine_siblings_bits & ~CS_recurse) != 0 && 
+        (combine_siblings_bits & ~CS_recurse) != 0 &&
         parent_node->get_num_children() >= 2 &&
         parent_node->safe_to_combine_children()) {
       num_nodes += flatten_siblings(parent_node, combine_siblings_bits);
@@ -617,7 +624,7 @@ flatten_siblings(PandaNode *parent_node, int combine_siblings_bits) {
           ++ai2;
 
           if (consider_siblings(parent_node, child1, child2)) {
-            PT(PandaNode) new_node = 
+            PT(PandaNode) new_node =
               do_flatten_siblings(parent_node, child1, child2);
             if (new_node != (PandaNode *)NULL) {
               // We successfully collapsed a node.
@@ -644,7 +651,7 @@ flatten_siblings(PandaNode *parent_node, int combine_siblings_bits) {
 //               node may be removed, false if it should be kept.
 ////////////////////////////////////////////////////////////////////
 bool SceneGraphReducer::
-consider_child(PandaNode *grandparent_node, PandaNode *parent_node, 
+consider_child(PandaNode *grandparent_node, PandaNode *parent_node,
                PandaNode *child_node) {
   if (!parent_node->safe_to_combine() || !child_node->safe_to_combine()) {
     // One or both nodes cannot be safely combined with another node;
@@ -696,7 +703,7 @@ consider_siblings(PandaNode *parent_node, PandaNode *child1,
 //               successfully collapsed, false if we chickened out.
 ////////////////////////////////////////////////////////////////////
 bool SceneGraphReducer::
-do_flatten_child(PandaNode *grandparent_node, PandaNode *parent_node, 
+do_flatten_child(PandaNode *grandparent_node, PandaNode *parent_node,
                  PandaNode *child_node) {
   if (pgraph_cat.is_spam()) {
     pgraph_cat.spam()
@@ -707,7 +714,7 @@ do_flatten_child(PandaNode *grandparent_node, PandaNode *parent_node,
   if (new_parent == (PandaNode *)NULL) {
     if (pgraph_cat.is_spam()) {
       pgraph_cat.spam()
-        << "Decided not to collapse " << *parent_node 
+        << "Decided not to collapse " << *parent_node
         << " and " << *child_node << "\n";
     }
     return false;
@@ -820,7 +827,7 @@ r_remove_column(PandaNode *node, const InternalName *column,
       ++num_changed;
     }
   }
-    
+
   PandaNode::Children children = node->get_children();
   int num_children = children.get_num_children();
   for (int i = 0; i < num_children; ++i) {
@@ -845,7 +852,7 @@ r_make_compatible_state(PandaNode *node, GeomTransformer &transformer) {
       ++num_changed;
     }
   }
-  
+
   PandaNode::Children children = node->get_children();
   int num_children = children.get_num_children();
   for (int i = 0; i < num_children; ++i) {
@@ -890,7 +897,7 @@ r_collect_vertex_data(PandaNode *node, int collect_bits,
     PandaNode::Children children = node->get_children();
     int num_children = children.get_num_children();
     for (int i = 0; i < num_children; ++i) {
-      num_adjusted += 
+      num_adjusted +=
         r_collect_vertex_data(children.get_child(i), collect_bits, new_transformer, format_only);
     }
 
@@ -902,7 +909,7 @@ r_collect_vertex_data(PandaNode *node, int collect_bits,
     if (node->is_geom_node()) {
       num_adjusted += transformer.collect_vertex_data(DCAST(GeomNode, node), collect_bits, format_only);
     }
-    
+
     PandaNode::Children children = node->get_children();
     int num_children = children.get_num_children();
     for (int i = 0; i < num_children; ++i) {
@@ -943,7 +950,7 @@ r_make_nonindexed(PandaNode *node, int nonindexed_bits) {
           geom->get_usage_hint() != Geom::UH_static) {
         this_geom_bits |= MN_avoid_dynamic;
       }
-      
+
       if ((nonindexed_bits & this_geom_bits) == 0) {
         // The geom meets the user's qualifications for making
         // nonindexed, so do it.
@@ -956,10 +963,10 @@ r_make_nonindexed(PandaNode *node, int nonindexed_bits) {
   PandaNode::Children children = node->get_children();
   int num_children = children.get_num_children();
   for (int i = 0; i < num_children; ++i) {
-    num_changed += 
+    num_changed +=
       r_make_nonindexed(children.get_child(i), nonindexed_bits);
   }
-    
+
   return num_changed;
 }
 
diff --git a/panda/src/pgraph/sceneSetup.I b/panda/src/pgraph/sceneSetup.I
index 7099a559f5..75afb67566 100644
--- a/panda/src/pgraph/sceneSetup.I
+++ b/panda/src/pgraph/sceneSetup.I
@@ -28,6 +28,7 @@ SceneSetup() {
   _camera_transform = TransformState::make_identity();
   _world_transform = TransformState::make_identity();
   _cs_transform = TransformState::make_identity();
+  _cs_world_transform = TransformState::make_identity();
 }
 
 ////////////////////////////////////////////////////////////////////
@@ -316,3 +317,27 @@ INLINE const TransformState *SceneSetup::
 get_cs_transform() const {
   return _cs_transform;
 }
+
+////////////////////////////////////////////////////////////////////
+//     Function: SceneSetup::set_cs_world_transform
+//       Access: Published
+//  Description: Specifies the position from the starting node
+//               relative to the camera, in the GSG's internal
+//               coordinate system.
+////////////////////////////////////////////////////////////////////
+INLINE void SceneSetup::
+set_cs_world_transform(const TransformState *cs_world_transform) {
+  _cs_world_transform = cs_world_transform;
+}
+
+////////////////////////////////////////////////////////////////////
+//     Function: SceneSetup::get_cs_world_transform
+//       Access: Published
+//  Description: Returns the position from the starting node
+//               relative to the camera, in the GSG's internal
+//               coordinate system.
+////////////////////////////////////////////////////////////////////
+INLINE const TransformState *SceneSetup::
+get_cs_world_transform() const {
+  return _cs_world_transform;
+}
diff --git a/panda/src/pgraph/sceneSetup.h b/panda/src/pgraph/sceneSetup.h
index f2ba3e6cf3..2dd740edf3 100644
--- a/panda/src/pgraph/sceneSetup.h
+++ b/panda/src/pgraph/sceneSetup.h
@@ -74,6 +74,9 @@ PUBLISHED:
   INLINE void set_cs_transform(const TransformState *cs_transform);
   INLINE const TransformState *get_cs_transform() const;
 
+  INLINE void set_cs_world_transform(const TransformState *cs_world_transform);
+  INLINE const TransformState *get_cs_world_transform() const;
+
 private:
   DisplayRegion *_display_region;
   int _viewport_width;
@@ -87,6 +90,7 @@ private:
   CPT(TransformState) _camera_transform;
   CPT(TransformState) _world_transform;
   CPT(TransformState) _cs_transform;
+  CPT(TransformState) _cs_world_transform;
 
 public:
   static TypeHandle get_class_type() {
diff --git a/panda/src/pgraph/shaderAttrib.I b/panda/src/pgraph/shaderAttrib.I
index 53a5afb68f..420e391d8e 100755
--- a/panda/src/pgraph/shaderAttrib.I
+++ b/panda/src/pgraph/shaderAttrib.I
@@ -17,7 +17,7 @@
 ////////////////////////////////////////////////////////////////////
 //     Function: ShaderAttrib::Constructor
 //       Access: Private
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 INLINE ShaderAttrib::
 ShaderAttrib() :
@@ -32,14 +32,14 @@ ShaderAttrib() :
   _auto_glow_on(false),
   _auto_gloss_on(false),
   _auto_ramp_on(false),
-  _auto_shadow_on(false) 
+  _auto_shadow_on(false)
 {
 }
 
 ////////////////////////////////////////////////////////////////////
 //     Function: ShaderAttrib::Copy Constructor
 //       Access: Private
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 INLINE ShaderAttrib::
 ShaderAttrib(const ShaderAttrib &copy) :
@@ -85,7 +85,7 @@ auto_shader() const {
 ////////////////////////////////////////////////////////////////////
 //     Function: ShaderAttrib::get_shader_priority
 //       Access: Published
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 INLINE int ShaderAttrib::
 get_shader_priority() const {
@@ -106,18 +106,180 @@ get_instance_count() const {
 ////////////////////////////////////////////////////////////////////
 //     Function: ShaderAttrib::get_flag
 //       Access: Published
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 INLINE bool ShaderAttrib::
 get_flag(int index) const {
   return (_flags & (1<<index)) ? true:false;
 }
 
+////////////////////////////////////////////////////////////////////
+//     Function: ShaderAttrib::has_shader_input
+//       Access: Published
+//  Description: Returns true if there is a ShaderInput of the given
+//               name.
+////////////////////////////////////////////////////////////////////
+bool ShaderAttrib::
+has_shader_input(CPT_InternalName id) const {
+  return (_inputs.find(id) != _inputs.end());
+}
+
+////////////////////////////////////////////////////////////////////
+//     Function: ShaderAttrib::set_shader_input
+//       Access: Published
+//  Description:
+////////////////////////////////////////////////////////////////////
+INLINE CPT(RenderAttrib) ShaderAttrib::
+set_shader_input(CPT_InternalName id, const PTA_float &v, int priority) const {
+  return set_shader_input(new ShaderInput(MOVE(id), v, priority));
+}
+
+////////////////////////////////////////////////////////////////////
+//     Function: ShaderAttrib::set_shader_input
+//       Access: Published
+//  Description:
+////////////////////////////////////////////////////////////////////
+INLINE CPT(RenderAttrib) ShaderAttrib::
+set_shader_input(CPT_InternalName id, const PTA_double &v, int priority) const {
+  return set_shader_input(new ShaderInput(MOVE(id), v, priority));
+}
+
+////////////////////////////////////////////////////////////////////
+//     Function: ShaderAttrib::set_shader_input
+//       Access: Published
+//  Description:
+////////////////////////////////////////////////////////////////////
+INLINE CPT(RenderAttrib) ShaderAttrib::
+set_shader_input(CPT_InternalName id, const PTA_LVecBase4 &v, int priority) const {
+  return set_shader_input(new ShaderInput(MOVE(id), v, priority));
+}
+
+////////////////////////////////////////////////////////////////////
+//     Function: ShaderAttrib::set_shader_input
+//       Access: Published
+//  Description:
+////////////////////////////////////////////////////////////////////
+INLINE CPT(RenderAttrib) ShaderAttrib::
+set_shader_input(CPT_InternalName id, const PTA_LVecBase3 &v, int priority) const {
+  return set_shader_input(new ShaderInput(MOVE(id), v, priority));
+}
+
+
+////////////////////////////////////////////////////////////////////
+//     Function: ShaderAttrib::set_shader_input
+//       Access: Published
+//  Description:
+////////////////////////////////////////////////////////////////////
+INLINE CPT(RenderAttrib) ShaderAttrib::
+set_shader_input(CPT_InternalName id, const PTA_LVecBase2 &v, int priority) const {
+  return set_shader_input(new ShaderInput(MOVE(id), v, priority));
+}
+
+////////////////////////////////////////////////////////////////////
+//     Function: ShaderAttrib::set_shader_input
+//       Access: Published
+//  Description:
+////////////////////////////////////////////////////////////////////
+INLINE CPT(RenderAttrib) ShaderAttrib::
+set_shader_input(CPT_InternalName id, const LVecBase4 &v, int priority) const {
+  return set_shader_input(new ShaderInput(MOVE(id), v, priority));
+}
+
+////////////////////////////////////////////////////////////////////
+//     Function: ShaderAttrib::set_shader_input
+//       Access: Published
+//  Description:
+////////////////////////////////////////////////////////////////////
+INLINE CPT(RenderAttrib) ShaderAttrib::
+set_shader_input(CPT_InternalName id, const LVecBase3 &v, int priority) const {
+  return set_shader_input(new ShaderInput(MOVE(id), v, priority));
+}
+
+////////////////////////////////////////////////////////////////////
+//     Function: ShaderAttrib::set_shader_input
+//       Access: Published
+//  Description:
+////////////////////////////////////////////////////////////////////
+INLINE CPT(RenderAttrib) ShaderAttrib::
+set_shader_input(CPT_InternalName id, const LVecBase2 &v, int priority) const {
+  return set_shader_input(new ShaderInput(MOVE(id), v, priority));
+}
+
+////////////////////////////////////////////////////////////////////
+//     Function: ShaderAttrib::set_shader_input
+//       Access: Published
+//  Description:
+////////////////////////////////////////////////////////////////////
+INLINE CPT(RenderAttrib) ShaderAttrib::
+set_shader_input(CPT_InternalName id, const PTA_LMatrix4 &v, int priority) const {
+  return set_shader_input(new ShaderInput(MOVE(id), v, priority));
+}
+
+////////////////////////////////////////////////////////////////////
+//     Function: ShaderAttrib::set_shader_input
+//       Access: Published
+//  Description:
+////////////////////////////////////////////////////////////////////
+INLINE CPT(RenderAttrib) ShaderAttrib::
+set_shader_input(CPT_InternalName id, const PTA_LMatrix3 &v, int priority) const {
+  return set_shader_input(new ShaderInput(MOVE(id), v, priority));
+}
+
+////////////////////////////////////////////////////////////////////
+//     Function: ShaderAttrib::set_shader_input
+//       Access: Published
+//  Description:
+////////////////////////////////////////////////////////////////////
+INLINE CPT(RenderAttrib) ShaderAttrib::
+set_shader_input(CPT_InternalName id, const LMatrix4 &v, int priority) const {
+  return set_shader_input(new ShaderInput(MOVE(id), v, priority));
+}
+
+////////////////////////////////////////////////////////////////////
+//     Function: ShaderAttrib::set_shader_input
+//       Access: Published
+//  Description:
+////////////////////////////////////////////////////////////////////
+INLINE CPT(RenderAttrib) ShaderAttrib::
+set_shader_input(CPT_InternalName id, const LMatrix3 &v, int priority) const {
+  return set_shader_input(new ShaderInput(MOVE(id), v, priority));
+}
+
+////////////////////////////////////////////////////////////////////
+//     Function: ShaderAttrib::set_shader_input
+//       Access: Published
+//  Description:
+////////////////////////////////////////////////////////////////////
+INLINE CPT(RenderAttrib) ShaderAttrib::
+set_shader_input(CPT_InternalName id, Texture *tex, int priority) const {
+  return set_shader_input(new ShaderInput(MOVE(id), tex, priority));
+}
+
+////////////////////////////////////////////////////////////////////
+//     Function: ShaderAttrib::set_shader_input
+//       Access: Published
+//  Description:
+////////////////////////////////////////////////////////////////////
+INLINE CPT(RenderAttrib) ShaderAttrib::
+set_shader_input(CPT_InternalName id, const NodePath &np, int priority) const {
+  return set_shader_input(new ShaderInput(MOVE(id), np, priority));
+}
+
+////////////////////////////////////////////////////////////////////
+//     Function: ShaderAttrib::set_shader_input
+//       Access: Published
+//  Description:
+////////////////////////////////////////////////////////////////////
+INLINE CPT(RenderAttrib) ShaderAttrib::
+set_shader_input(CPT_InternalName id, double n1, double n2, double n3, double n4, int priority) const {
+  return set_shader_input(new ShaderInput(MOVE(id), LVecBase4(n1, n2, n3, n4), priority));
+}
+
 //weifengh
 ////////////////////////////////////////////////////////////////////
 //     Function: ShaderAttrib::auto_normal_on
 //       Access: Published
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 INLINE bool ShaderAttrib::
 auto_normal_on() const {
@@ -127,7 +289,7 @@ auto_normal_on() const {
 ////////////////////////////////////////////////////////////////////
 //     Function: ShaderAttrib::auto_glow_on
 //       Access: Published
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 INLINE bool ShaderAttrib::
 auto_glow_on() const {
@@ -137,7 +299,7 @@ auto_glow_on() const {
 ////////////////////////////////////////////////////////////////////
 //     Function: ShaderAttrib::auto_gloss_on
 //       Access: Published
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 INLINE bool ShaderAttrib::
 auto_gloss_on() const {
@@ -147,7 +309,7 @@ auto_gloss_on() const {
 ////////////////////////////////////////////////////////////////////
 //     Function: ShaderAttrib::auto_ramp_on
 //       Access: Published
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 INLINE bool ShaderAttrib::
 auto_ramp_on() const {
@@ -157,7 +319,7 @@ auto_ramp_on() const {
 ////////////////////////////////////////////////////////////////////
 //     Function: ShaderAttrib::auto_shadow_on
 //       Access: Published
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 INLINE bool ShaderAttrib::
 auto_shadow_on() const {
diff --git a/panda/src/pgraph/shaderAttrib.cxx b/panda/src/pgraph/shaderAttrib.cxx
index 35d29ddf82..f0a3631af4 100755
--- a/panda/src/pgraph/shaderAttrib.cxx
+++ b/panda/src/pgraph/shaderAttrib.cxx
@@ -219,164 +219,13 @@ set_shader_input(const ShaderInput *input) const {
   ShaderAttrib *result = new ShaderAttrib(*this);
   Inputs::iterator i = result->_inputs.find(input->get_name());
   if (i == result->_inputs.end()) {
-    result->_inputs.insert(Inputs::value_type(input->get_name(),input));
+    result->_inputs.insert(Inputs::value_type(input->get_name(), input));
   } else {
     i->second = input;
   }
   return return_new(result);
 }
 
-////////////////////////////////////////////////////////////////////
-//     Function: ShaderAttrib::set_shader_input
-//       Access: Published
-//  Description:
-////////////////////////////////////////////////////////////////////
-CPT(RenderAttrib) ShaderAttrib::
-set_shader_input(const InternalName *id, const PTA_float &v, int priority) const {
-  return set_shader_input(new ShaderInput(id,v,priority));
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: ShaderAttrib::set_shader_input
-//       Access: Published
-//  Description:
-////////////////////////////////////////////////////////////////////
-CPT(RenderAttrib) ShaderAttrib::
-set_shader_input(const InternalName *id, const PTA_double &v, int priority) const {
-  return set_shader_input(new ShaderInput(id,v,priority));
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: ShaderAttrib::set_shader_input
-//       Access: Published
-//  Description:
-////////////////////////////////////////////////////////////////////
-CPT(RenderAttrib) ShaderAttrib::
-set_shader_input(const InternalName *id, const PTA_LVecBase4 &v, int priority) const {
-  return set_shader_input(new ShaderInput(id,v,priority));
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: ShaderAttrib::set_shader_input
-//       Access: Published
-//  Description:
-////////////////////////////////////////////////////////////////////
-CPT(RenderAttrib) ShaderAttrib::
-set_shader_input(const InternalName *id, const PTA_LVecBase3 &v, int priority) const {
-  return set_shader_input(new ShaderInput(id,v,priority));
-}
-
-
-////////////////////////////////////////////////////////////////////
-//     Function: ShaderAttrib::set_shader_input
-//       Access: Published
-//  Description:
-////////////////////////////////////////////////////////////////////
-CPT(RenderAttrib) ShaderAttrib::
-set_shader_input(const InternalName *id, const PTA_LVecBase2 &v, int priority) const {
-  return set_shader_input(new ShaderInput(id,v,priority));
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: ShaderAttrib::set_shader_input
-//       Access: Published
-//  Description:
-////////////////////////////////////////////////////////////////////
-CPT(RenderAttrib) ShaderAttrib::
-set_shader_input(const InternalName *id, const LVecBase4 &v, int priority) const {
-  return set_shader_input(new ShaderInput(id,v,priority));
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: ShaderAttrib::set_shader_input
-//       Access: Published
-//  Description:
-////////////////////////////////////////////////////////////////////
-CPT(RenderAttrib) ShaderAttrib::
-set_shader_input(const InternalName *id, const LVecBase3 &v, int priority) const {
-  return set_shader_input(new ShaderInput(id,v,priority));
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: ShaderAttrib::set_shader_input
-//       Access: Published
-//  Description:
-////////////////////////////////////////////////////////////////////
-CPT(RenderAttrib) ShaderAttrib::
-set_shader_input(const InternalName *id, const LVecBase2 &v, int priority) const {
-  return set_shader_input(new ShaderInput(id,v,priority));
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: ShaderAttrib::set_shader_input
-//       Access: Published
-//  Description:
-////////////////////////////////////////////////////////////////////
-CPT(RenderAttrib) ShaderAttrib::
-set_shader_input(const InternalName *id, const PTA_LMatrix4 &v, int priority) const {
-  return set_shader_input(new ShaderInput(id,v,priority));
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: ShaderAttrib::set_shader_input
-//       Access: Published
-//  Description:
-////////////////////////////////////////////////////////////////////
-CPT(RenderAttrib) ShaderAttrib::
-set_shader_input(const InternalName *id, const PTA_LMatrix3 &v, int priority) const {
-  return set_shader_input(new ShaderInput(id,v,priority));
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: ShaderAttrib::set_shader_input
-//       Access: Published
-//  Description:
-////////////////////////////////////////////////////////////////////
-CPT(RenderAttrib) ShaderAttrib::
-set_shader_input(const InternalName *id, const LMatrix4 &v, int priority) const {
-  return set_shader_input(new ShaderInput(id,v,priority));
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: ShaderAttrib::set_shader_input
-//       Access: Published
-//  Description:
-////////////////////////////////////////////////////////////////////
-CPT(RenderAttrib) ShaderAttrib::
-set_shader_input(const InternalName *id, const LMatrix3 &v, int priority) const {
-  return set_shader_input(new ShaderInput(id,v,priority));
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: ShaderAttrib::set_shader_input
-//       Access: Published
-//  Description:
-////////////////////////////////////////////////////////////////////
-CPT(RenderAttrib) ShaderAttrib::
-set_shader_input(const InternalName *id, Texture *tex, int priority) const {
-  return set_shader_input(new ShaderInput(id,tex,priority));
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: ShaderAttrib::set_shader_input
-//       Access: Published
-//  Description:
-////////////////////////////////////////////////////////////////////
-CPT(RenderAttrib) ShaderAttrib::
-set_shader_input(const InternalName *id, const NodePath &np, int priority) const {
-  return set_shader_input(new ShaderInput(id,np,priority));
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: ShaderAttrib::set_shader_input
-//       Access: Published
-//  Description:
-////////////////////////////////////////////////////////////////////
-CPT(RenderAttrib) ShaderAttrib::
-set_shader_input(const InternalName *id, double n1, double n2, double n3, double n4, int priority) const {
-  return set_shader_input(new ShaderInput(id, LVecBase4(n1,n2,n3,n4), priority));
-}
-
 ////////////////////////////////////////////////////////////////////
 //     Function: ShaderAttrib::set_instance_count
 //       Access: Published
@@ -491,7 +340,7 @@ get_shader_input_nodepath(const InternalName *id) const {
 //  Description: Returns the ShaderInput as a vector.  Assertion
 //               fails if there is none, or if it is not a vector.
 ////////////////////////////////////////////////////////////////////
-const LVecBase4 &ShaderAttrib::
+LVecBase4 ShaderAttrib::
 get_shader_input_vector(InternalName *id) const {
   static LVecBase4 resfail(0,0,0,0);
   Inputs::const_iterator i = _inputs.find(id);
@@ -503,9 +352,34 @@ get_shader_input_vector(InternalName *id) const {
   } else {
     const ShaderInput *p = (*i).second;
 
-    if (p->get_value_type() == ShaderInput::M_numeric) {
+    if (p->get_value_type() == ShaderInput::M_vector) {
       return p->get_vector();
 
+    } else if (p->get_value_type() == ShaderInput::M_numeric && p->get_ptr()._size <= 4) {
+      const Shader::ShaderPtrData &ptr = p->get_ptr();
+
+      switch (ptr._type) {
+      case Shader::SPT_float:
+        {
+          LVector4f vectorf;
+          memcpy(&vectorf[0], ptr._ptr, sizeof(float) * ptr._size);
+          return LCAST(PN_stdfloat, vectorf);
+        }
+      case Shader::SPT_double:
+        {
+          LVector4d vectord;
+          memcpy(&vectord[0], ptr._ptr, sizeof(double) * ptr._size);
+          return LCAST(PN_stdfloat, vectord);
+        }
+      default:
+       {
+          ostringstream strm;
+          strm << "Shader input " << id->get_name() << " does not contain floating-point data.\n";
+          nassert_raise(strm.str());
+          return resfail;
+        }
+      }
+
     } else if (p->get_value_type() == ShaderInput::M_param) {
       // Temporary solution until the new param system
       ParamValueBase *param = p->get_param();
@@ -538,7 +412,8 @@ get_shader_input_ptr(const InternalName *id) const {
     return NULL;
   } else {
     const ShaderInput *p = (*i).second;
-    if (p->get_value_type() != ShaderInput::M_numeric) {
+    if (p->get_value_type() != ShaderInput::M_numeric &&
+        p->get_value_type() != ShaderInput::M_vector) {
       ostringstream strm;
       strm << "Shader input " << id->get_name() << " is not a PTA(float/double) type.\n";
       nassert_raise(strm.str());
diff --git a/panda/src/pgraph/shaderAttrib.h b/panda/src/pgraph/shaderAttrib.h
index 6795adf9dc..c6bb2eb583 100755
--- a/panda/src/pgraph/shaderAttrib.h
+++ b/panda/src/pgraph/shaderAttrib.h
@@ -70,23 +70,22 @@ PUBLISHED:
   // Shader Inputs
   CPT(RenderAttrib) set_shader_input(const ShaderInput *inp) const;
 
-  // InternalName* id
-  CPT(RenderAttrib) set_shader_input(const InternalName *id, Texture *tex,       int priority=0) const;
-  CPT(RenderAttrib) set_shader_input(const InternalName *id, const NodePath &np, int priority=0) const;
-  CPT(RenderAttrib) set_shader_input(const InternalName *id, const PTA_float &v, int priority=0) const;
-  CPT(RenderAttrib) set_shader_input(const InternalName *id, const PTA_double &v, int priority=0) const;
-  CPT(RenderAttrib) set_shader_input(const InternalName *id, const PTA_LMatrix4 &v, int priority=0) const;
-  CPT(RenderAttrib) set_shader_input(const InternalName *id, const PTA_LMatrix3 &v, int priority=0) const;
-  CPT(RenderAttrib) set_shader_input(const InternalName *id, const PTA_LVecBase4 &v, int priority=0) const;
-  CPT(RenderAttrib) set_shader_input(const InternalName *id, const PTA_LVecBase3 &v, int priority=0) const;
-  CPT(RenderAttrib) set_shader_input(const InternalName *id, const PTA_LVecBase2 &v, int priority=0) const;
-  CPT(RenderAttrib) set_shader_input(const InternalName *id, const LVecBase4 &v, int priority=0) const;
-  CPT(RenderAttrib) set_shader_input(const InternalName *id, const LVecBase3 &v, int priority=0) const;
-  CPT(RenderAttrib) set_shader_input(const InternalName *id, const LVecBase2 &v, int priority=0) const;
-  CPT(RenderAttrib) set_shader_input(const InternalName *id, const LMatrix4 &v, int priority=0) const;
-  CPT(RenderAttrib) set_shader_input(const InternalName *id, const LMatrix3 &v, int priority=0) const;
-  CPT(RenderAttrib) set_shader_input(const InternalName *id, double n1=0, double n2=0, double n3=0, double n4=1,
-                                     int priority=0) const;
+  INLINE CPT(RenderAttrib) set_shader_input(CPT_InternalName id, Texture *tex,       int priority=0) const;
+  INLINE CPT(RenderAttrib) set_shader_input(CPT_InternalName id, const NodePath &np, int priority=0) const;
+  INLINE CPT(RenderAttrib) set_shader_input(CPT_InternalName id, const PTA_float &v, int priority=0) const;
+  INLINE CPT(RenderAttrib) set_shader_input(CPT_InternalName id, const PTA_double &v, int priority=0) const;
+  INLINE CPT(RenderAttrib) set_shader_input(CPT_InternalName id, const PTA_LMatrix4 &v, int priority=0) const;
+  INLINE CPT(RenderAttrib) set_shader_input(CPT_InternalName id, const PTA_LMatrix3 &v, int priority=0) const;
+  INLINE CPT(RenderAttrib) set_shader_input(CPT_InternalName id, const PTA_LVecBase4 &v, int priority=0) const;
+  INLINE CPT(RenderAttrib) set_shader_input(CPT_InternalName id, const PTA_LVecBase3 &v, int priority=0) const;
+  INLINE CPT(RenderAttrib) set_shader_input(CPT_InternalName id, const PTA_LVecBase2 &v, int priority=0) const;
+  INLINE CPT(RenderAttrib) set_shader_input(CPT_InternalName id, const LVecBase4 &v, int priority=0) const;
+  INLINE CPT(RenderAttrib) set_shader_input(CPT_InternalName id, const LVecBase3 &v, int priority=0) const;
+  INLINE CPT(RenderAttrib) set_shader_input(CPT_InternalName id, const LVecBase2 &v, int priority=0) const;
+  INLINE CPT(RenderAttrib) set_shader_input(CPT_InternalName id, const LMatrix4 &v, int priority=0) const;
+  INLINE CPT(RenderAttrib) set_shader_input(CPT_InternalName id, const LMatrix3 &v, int priority=0) const;
+  INLINE CPT(RenderAttrib) set_shader_input(CPT_InternalName id, double n1=0, double n2=0, double n3=0, double n4=1,
+                                            int priority=0) const;
 
   CPT(RenderAttrib) set_instance_count(int instance_count) const;
 
@@ -99,13 +98,14 @@ PUBLISHED:
   CPT(RenderAttrib) clear_all_shader_inputs() const;
 
   INLINE bool get_flag(int flag) const;
+  INLINE bool has_shader_input(CPT_InternalName id) const;
 
   const Shader *get_shader() const;
   const ShaderInput *get_shader_input(const InternalName *id) const;
   const ShaderInput *get_shader_input(const string &id) const;
 
   const NodePath &get_shader_input_nodepath(const InternalName *id) const;
-  const LVecBase4 &get_shader_input_vector(InternalName *id) const;
+  LVecBase4 get_shader_input_vector(InternalName *id) const;
   Texture *get_shader_input_texture(const InternalName *id) const;
   const SamplerState &get_shader_input_sampler(const InternalName *id) const;
   const Shader::ShaderPtrData *get_shader_input_ptr(const InternalName *id) const;
@@ -137,7 +137,7 @@ private:
   bool        _auto_ramp_on;
   bool        _auto_shadow_on;
 
-  typedef pmap < CPT(InternalName), CPT(ShaderInput) > Inputs;
+  typedef pmap<CPT_InternalName, CPT(ShaderInput)> Inputs;
   Inputs _inputs;
 
 PUBLISHED:
diff --git a/panda/src/pgraph/shaderInput.I b/panda/src/pgraph/shaderInput.I
index 483febbb9d..b75724abea 100644
--- a/panda/src/pgraph/shaderInput.I
+++ b/panda/src/pgraph/shaderInput.I
@@ -28,8 +28,8 @@ INLINE ShaderInput::
 //  Description:
 ////////////////////////////////////////////////////////////////////
 INLINE ShaderInput::
-ShaderInput(const InternalName *name, int priority) :
-  _name(name),
+ShaderInput(CPT_InternalName name, int priority) :
+  _name(MOVE(name)),
   _type(M_invalid),
   _priority(priority),
   _bind_layer(0),
@@ -44,8 +44,8 @@ ShaderInput(const InternalName *name, int priority) :
 //  Description:
 ////////////////////////////////////////////////////////////////////
 INLINE ShaderInput::
-ShaderInput(const InternalName *name, Texture *tex, int priority) :
-  _name(name),
+ShaderInput(CPT_InternalName name, Texture *tex, int priority) :
+  _name(MOVE(name)),
   _type(M_texture),
   _priority(priority),
   _value(tex),
@@ -61,8 +61,8 @@ ShaderInput(const InternalName *name, Texture *tex, int priority) :
 //  Description:
 ////////////////////////////////////////////////////////////////////
 INLINE ShaderInput::
-ShaderInput(const InternalName *name, Texture *tex, const SamplerState &sampler, int priority) :
-  _name(name),
+ShaderInput(CPT_InternalName name, Texture *tex, const SamplerState &sampler, int priority) :
+  _name(MOVE(name)),
   _type(M_texture_sampler),
   _priority(priority),
   _value(tex),
@@ -79,8 +79,8 @@ ShaderInput(const InternalName *name, Texture *tex, const SamplerState &sampler,
 //  Description:
 ////////////////////////////////////////////////////////////////////
 INLINE ShaderInput::
-ShaderInput(const InternalName *name, Texture *tex, bool read, bool write, int z, int n, int priority) :
-  _name(name),
+ShaderInput(CPT_InternalName name, Texture *tex, bool read, bool write, int z, int n, int priority) :
+  _name(MOVE(name)),
   _type(M_texture),
   _priority(priority),
   _value(tex),
@@ -108,8 +108,8 @@ ShaderInput(const InternalName *name, Texture *tex, bool read, bool write, int z
 //  Description:
 ////////////////////////////////////////////////////////////////////
 INLINE ShaderInput::
-ShaderInput(const InternalName *name, ParamValueBase *param, int priority) :
-  _name(name),
+ShaderInput(CPT_InternalName name, ParamValueBase *param, int priority) :
+  _name(MOVE(name)),
   _type(M_param),
   _priority(priority),
   _value(param),
@@ -125,8 +125,8 @@ ShaderInput(const InternalName *name, ParamValueBase *param, int priority) :
 //  Description:
 ////////////////////////////////////////////////////////////////////
 INLINE ShaderInput::
-ShaderInput(const InternalName *name, const NodePath &np, int priority) :
-  _name(name),
+ShaderInput(CPT_InternalName name, const NodePath &np, int priority) :
+  _name(MOVE(name)),
   _type(M_nodepath),
   _priority(priority),
   _stored_nodepath(np),
@@ -142,8 +142,8 @@ ShaderInput(const InternalName *name, const NodePath &np, int priority) :
 //  Description:
 ////////////////////////////////////////////////////////////////////
 INLINE ShaderInput::
-ShaderInput(const InternalName *name, const PTA_float &ptr, int priority) :
-  _name(name),
+ShaderInput(CPT_InternalName name, const PTA_float &ptr, int priority) :
+  _name(MOVE(name)),
   _type(M_numeric),
   _priority(priority),
   _stored_ptr(ptr),
@@ -159,8 +159,8 @@ ShaderInput(const InternalName *name, const PTA_float &ptr, int priority) :
 //  Description:
 ////////////////////////////////////////////////////////////////////
 INLINE ShaderInput::
-ShaderInput(const InternalName *name, const PTA_LVecBase4f &ptr, int priority) :
-  _name(name),
+ShaderInput(CPT_InternalName name, const PTA_LVecBase4f &ptr, int priority) :
+  _name(MOVE(name)),
   _type(M_numeric),
   _priority(priority),
   _stored_ptr(ptr),
@@ -176,8 +176,8 @@ ShaderInput(const InternalName *name, const PTA_LVecBase4f &ptr, int priority) :
 //  Description:
 ////////////////////////////////////////////////////////////////////
 INLINE ShaderInput::
-ShaderInput(const InternalName *name, const PTA_LVecBase3f &ptr, int priority) :
-  _name(name),
+ShaderInput(CPT_InternalName name, const PTA_LVecBase3f &ptr, int priority) :
+  _name(MOVE(name)),
   _type(M_numeric),
   _priority(priority),
   _stored_ptr(ptr),
@@ -193,8 +193,8 @@ ShaderInput(const InternalName *name, const PTA_LVecBase3f &ptr, int priority) :
 //  Description:
 ////////////////////////////////////////////////////////////////////
 INLINE ShaderInput::
-ShaderInput(const InternalName *name, const PTA_LVecBase2f &ptr, int priority) :
-  _name(name),
+ShaderInput(CPT_InternalName name, const PTA_LVecBase2f &ptr, int priority) :
+  _name(MOVE(name)),
   _type(M_numeric),
   _priority(priority),
   _stored_ptr(ptr),
@@ -210,8 +210,198 @@ ShaderInput(const InternalName *name, const PTA_LVecBase2f &ptr, int priority) :
 //  Description:
 ////////////////////////////////////////////////////////////////////
 INLINE ShaderInput::
-ShaderInput(const InternalName *name, const LVecBase4f &vec, int priority) :
-  _name(name),
+ShaderInput(CPT_InternalName name, const LVecBase4f &vec, int priority) :
+  _name(MOVE(name)),
+  _type(M_vector),
+  _priority(priority),
+  _stored_ptr(vec),
+  _stored_vector(LCAST(PN_stdfloat, vec)),
+  _bind_layer(0),
+  _bind_level(0),
+  _access(A_read)
+{
+}
+
+////////////////////////////////////////////////////////////////////
+//     Function: ShaderInput::Constructor
+//       Access: Published
+//  Description:
+////////////////////////////////////////////////////////////////////
+INLINE ShaderInput::
+ShaderInput(CPT_InternalName name, const LVecBase3f &vec, int priority) :
+  _name(MOVE(name)),
+  _type(M_vector),
+  _priority(priority),
+  _stored_ptr(vec),
+  _stored_vector(vec.get_x(), vec.get_y(), vec.get_z(), 0.0),
+  _bind_layer(0),
+  _bind_level(0),
+  _access(A_read)
+{
+}
+
+////////////////////////////////////////////////////////////////////
+//     Function: ShaderInput::Constructor
+//       Access: Published
+//  Description:
+////////////////////////////////////////////////////////////////////
+INLINE ShaderInput::
+ShaderInput(CPT_InternalName name, const LVecBase2f &vec, int priority) :
+  _name(MOVE(name)),
+  _type(M_vector),
+  _priority(priority),
+  _stored_ptr(vec),
+  _stored_vector(vec.get_x(), vec.get_y(), 0.0, 0.0),
+  _bind_layer(0),
+  _bind_level(0),
+  _access(A_read)
+{
+}
+
+////////////////////////////////////////////////////////////////////
+//     Function: ShaderInput::Constructor
+//       Access: Published
+//  Description:
+////////////////////////////////////////////////////////////////////
+INLINE ShaderInput::
+ShaderInput(CPT_InternalName name, const PTA_LMatrix4f &ptr, int priority) :
+  _name(MOVE(name)),
+  _type(M_numeric),
+  _priority(priority),
+  _stored_ptr(ptr),
+  _bind_layer(0),
+  _bind_level(0),
+  _access(A_read)
+{
+}
+
+////////////////////////////////////////////////////////////////////
+//     Function: ShaderInput::Constructor
+//       Access: Published
+//  Description:
+////////////////////////////////////////////////////////////////////
+INLINE ShaderInput::
+ShaderInput(CPT_InternalName name, const PTA_LMatrix3f &ptr, int priority) :
+  _name(MOVE(name)),
+  _type(M_numeric),
+  _priority(priority),
+  _stored_ptr(ptr),
+  _bind_layer(0),
+  _bind_level(0),
+  _access(A_read)
+{
+}
+
+////////////////////////////////////////////////////////////////////
+//     Function: ShaderInput::Constructor
+//       Access: Published
+//  Description:
+////////////////////////////////////////////////////////////////////
+INLINE ShaderInput::
+ShaderInput(CPT_InternalName name, const LMatrix4f &mat, int priority) :
+  _name(MOVE(name)),
+  _type(M_numeric),
+  _priority(priority),
+  _stored_ptr(mat),
+  _bind_layer(0),
+  _bind_level(0),
+  _access(A_read)
+{
+}
+
+////////////////////////////////////////////////////////////////////
+//     Function: ShaderInput::Constructor
+//       Access: Published
+//  Description:
+////////////////////////////////////////////////////////////////////
+INLINE ShaderInput::
+ShaderInput(CPT_InternalName name, const LMatrix3f &mat, int priority) :
+  _name(MOVE(name)),
+  _type(M_numeric),
+  _priority(priority),
+  _stored_ptr(mat),
+  _bind_layer(0),
+  _bind_level(0),
+  _access(A_read)
+{
+}
+
+////////////////////////////////////////////////////////////////////
+//     Function: ShaderInput::Constructor
+//       Access: Published
+//  Description:
+////////////////////////////////////////////////////////////////////
+INLINE ShaderInput::
+ShaderInput(CPT_InternalName name, const PTA_double &ptr, int priority) :
+  _name(MOVE(name)),
+  _type(M_numeric),
+  _priority(priority),
+  _stored_ptr(ptr),
+  _bind_layer(0),
+  _bind_level(0),
+  _access(A_read)
+{
+}
+
+////////////////////////////////////////////////////////////////////
+//     Function: ShaderInput::Constructor
+//       Access: Published
+//  Description:
+////////////////////////////////////////////////////////////////////
+INLINE ShaderInput::
+ShaderInput(CPT_InternalName name, const PTA_LVecBase4d &ptr, int priority) :
+  _name(MOVE(name)),
+  _type(M_numeric),
+  _priority(priority),
+  _stored_ptr(ptr),
+  _bind_layer(0),
+  _bind_level(0),
+  _access(A_read)
+{
+}
+
+////////////////////////////////////////////////////////////////////
+//     Function: ShaderInput::Constructor
+//       Access: Published
+//  Description:
+////////////////////////////////////////////////////////////////////
+INLINE ShaderInput::
+ShaderInput(CPT_InternalName name, const PTA_LVecBase3d &ptr, int priority) :
+  _name(MOVE(name)),
+  _type(M_numeric),
+  _priority(priority),
+  _stored_ptr(ptr),
+  _bind_layer(0),
+  _bind_level(0),
+  _access(A_read)
+{
+}
+
+////////////////////////////////////////////////////////////////////
+//     Function: ShaderInput::Constructor
+//       Access: Published
+//  Description:
+////////////////////////////////////////////////////////////////////
+INLINE ShaderInput::
+ShaderInput(CPT_InternalName name, const PTA_LVecBase2d &ptr, int priority) :
+  _name(MOVE(name)),
+  _type(M_numeric),
+  _priority(priority),
+  _stored_ptr(ptr),
+  _bind_layer(0),
+  _bind_level(0),
+  _access(A_read)
+{
+}
+
+////////////////////////////////////////////////////////////////////
+//     Function: ShaderInput::Constructor
+//       Access: Published
+//  Description:
+////////////////////////////////////////////////////////////////////
+INLINE ShaderInput::
+ShaderInput(CPT_InternalName name, const LVecBase4d &vec, int priority) :
+  _name(MOVE(name)),
   _type(M_numeric),
   _priority(priority),
   _stored_ptr(vec),
@@ -228,8 +418,8 @@ ShaderInput(const InternalName *name, const LVecBase4f &vec, int priority) :
 //  Description:
 ////////////////////////////////////////////////////////////////////
 INLINE ShaderInput::
-ShaderInput(const InternalName *name, const LVecBase3f &vec, int priority) :
-  _name(name),
+ShaderInput(CPT_InternalName name, const LVecBase3d &vec, int priority) :
+  _name(MOVE(name)),
   _type(M_numeric),
   _priority(priority),
   _stored_ptr(vec),
@@ -246,8 +436,8 @@ ShaderInput(const InternalName *name, const LVecBase3f &vec, int priority) :
 //  Description:
 ////////////////////////////////////////////////////////////////////
 INLINE ShaderInput::
-ShaderInput(const InternalName *name, const LVecBase2f &vec, int priority) :
-  _name(name),
+ShaderInput(CPT_InternalName name, const LVecBase2d &vec, int priority) :
+  _name(MOVE(name)),
   _type(M_numeric),
   _priority(priority),
   _stored_ptr(vec),
@@ -264,8 +454,8 @@ ShaderInput(const InternalName *name, const LVecBase2f &vec, int priority) :
 //  Description:
 ////////////////////////////////////////////////////////////////////
 INLINE ShaderInput::
-ShaderInput(const InternalName *name, const PTA_LMatrix4f &ptr, int priority) :
-  _name(name),
+ShaderInput(CPT_InternalName name, const PTA_LMatrix4d &ptr, int priority) :
+  _name(MOVE(name)),
   _type(M_numeric),
   _priority(priority),
   _stored_ptr(ptr),
@@ -281,8 +471,8 @@ ShaderInput(const InternalName *name, const PTA_LMatrix4f &ptr, int priority) :
 //  Description:
 ////////////////////////////////////////////////////////////////////
 INLINE ShaderInput::
-ShaderInput(const InternalName *name, const PTA_LMatrix3f &ptr, int priority) :
-  _name(name),
+ShaderInput(CPT_InternalName name, const PTA_LMatrix3d &ptr, int priority) :
+  _name(MOVE(name)),
   _type(M_numeric),
   _priority(priority),
   _stored_ptr(ptr),
@@ -298,8 +488,8 @@ ShaderInput(const InternalName *name, const PTA_LMatrix3f &ptr, int priority) :
 //  Description:
 ////////////////////////////////////////////////////////////////////
 INLINE ShaderInput::
-ShaderInput(const InternalName *name, const LMatrix4f &mat, int priority) :
-  _name(name),
+ShaderInput(CPT_InternalName name, const LMatrix4d &mat, int priority) :
+  _name(MOVE(name)),
   _type(M_numeric),
   _priority(priority),
   _stored_ptr(mat),
@@ -315,8 +505,8 @@ ShaderInput(const InternalName *name, const LMatrix4f &mat, int priority) :
 //  Description:
 ////////////////////////////////////////////////////////////////////
 INLINE ShaderInput::
-ShaderInput(const InternalName *name, const LMatrix3f &mat, int priority) :
-  _name(name),
+ShaderInput(CPT_InternalName name, const LMatrix3d &mat, int priority) :
+  _name(MOVE(name)),
   _type(M_numeric),
   _priority(priority),
   _stored_ptr(mat),
@@ -332,8 +522,8 @@ ShaderInput(const InternalName *name, const LMatrix3f &mat, int priority) :
 //  Description:
 ////////////////////////////////////////////////////////////////////
 INLINE ShaderInput::
-ShaderInput(const InternalName *name, const PTA_double &ptr, int priority) :
-  _name(name),
+ShaderInput(CPT_InternalName name, const PTA_int &ptr, int priority) :
+  _name(MOVE(name)),
   _type(M_numeric),
   _priority(priority),
   _stored_ptr(ptr),
@@ -349,8 +539,8 @@ ShaderInput(const InternalName *name, const PTA_double &ptr, int priority) :
 //  Description:
 ////////////////////////////////////////////////////////////////////
 INLINE ShaderInput::
-ShaderInput(const InternalName *name, const PTA_LVecBase4d &ptr, int priority) :
-  _name(name),
+ShaderInput(CPT_InternalName name, const PTA_LVecBase4i &ptr, int priority) :
+  _name(MOVE(name)),
   _type(M_numeric),
   _priority(priority),
   _stored_ptr(ptr),
@@ -366,8 +556,8 @@ ShaderInput(const InternalName *name, const PTA_LVecBase4d &ptr, int priority) :
 //  Description:
 ////////////////////////////////////////////////////////////////////
 INLINE ShaderInput::
-ShaderInput(const InternalName *name, const PTA_LVecBase3d &ptr, int priority) :
-  _name(name),
+ShaderInput(CPT_InternalName name, const PTA_LVecBase3i &ptr, int priority) :
+  _name(MOVE(name)),
   _type(M_numeric),
   _priority(priority),
   _stored_ptr(ptr),
@@ -383,8 +573,8 @@ ShaderInput(const InternalName *name, const PTA_LVecBase3d &ptr, int priority) :
 //  Description:
 ////////////////////////////////////////////////////////////////////
 INLINE ShaderInput::
-ShaderInput(const InternalName *name, const PTA_LVecBase2d &ptr, int priority) :
-  _name(name),
+ShaderInput(CPT_InternalName name, const PTA_LVecBase2i &ptr, int priority) :
+  _name(MOVE(name)),
   _type(M_numeric),
   _priority(priority),
   _stored_ptr(ptr),
@@ -400,198 +590,8 @@ ShaderInput(const InternalName *name, const PTA_LVecBase2d &ptr, int priority) :
 //  Description:
 ////////////////////////////////////////////////////////////////////
 INLINE ShaderInput::
-ShaderInput(const InternalName *name, const LVecBase4d &vec, int priority) :
-  _name(name),
-  _type(M_numeric),
-  _priority(priority),
-  _stored_ptr(vec),
-  _stored_vector(LCAST(PN_stdfloat, vec)),
-  _bind_layer(0),
-  _bind_level(0),
-  _access(A_read)
-{
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: ShaderInput::Constructor
-//       Access: Published
-//  Description:
-////////////////////////////////////////////////////////////////////
-INLINE ShaderInput::
-ShaderInput(const InternalName *name, const LVecBase3d &vec, int priority) :
-  _name(name),
-  _type(M_numeric),
-  _priority(priority),
-  _stored_ptr(vec),
-  _stored_vector(vec.get_x(), vec.get_y(), vec.get_z(), 0.0),
-  _bind_layer(0),
-  _bind_level(0),
-  _access(A_read)
-{
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: ShaderInput::Constructor
-//       Access: Published
-//  Description:
-////////////////////////////////////////////////////////////////////
-INLINE ShaderInput::
-ShaderInput(const InternalName *name, const LVecBase2d &vec, int priority) :
-  _name(name),
-  _type(M_numeric),
-  _priority(priority),
-  _stored_ptr(vec),
-  _stored_vector(vec.get_x(), vec.get_y(), 0.0, 0.0),
-  _bind_layer(0),
-  _bind_level(0),
-  _access(A_read)
-{
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: ShaderInput::Constructor
-//       Access: Published
-//  Description:
-////////////////////////////////////////////////////////////////////
-INLINE ShaderInput::
-ShaderInput(const InternalName *name, const PTA_LMatrix4d &ptr, int priority) :
-  _name(name),
-  _type(M_numeric),
-  _priority(priority),
-  _stored_ptr(ptr),
-  _bind_layer(0),
-  _bind_level(0),
-  _access(A_read)
-{
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: ShaderInput::Constructor
-//       Access: Published
-//  Description:
-////////////////////////////////////////////////////////////////////
-INLINE ShaderInput::
-ShaderInput(const InternalName *name, const PTA_LMatrix3d &ptr, int priority) :
-  _name(name),
-  _type(M_numeric),
-  _priority(priority),
-  _stored_ptr(ptr),
-  _bind_layer(0),
-  _bind_level(0),
-  _access(A_read)
-{
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: ShaderInput::Constructor
-//       Access: Published
-//  Description:
-////////////////////////////////////////////////////////////////////
-INLINE ShaderInput::
-ShaderInput(const InternalName *name, const LMatrix4d &mat, int priority) :
-  _name(name),
-  _type(M_numeric),
-  _priority(priority),
-  _stored_ptr(mat),
-  _bind_layer(0),
-  _bind_level(0),
-  _access(A_read)
-{
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: ShaderInput::Constructor
-//       Access: Published
-//  Description:
-////////////////////////////////////////////////////////////////////
-INLINE ShaderInput::
-ShaderInput(const InternalName *name, const LMatrix3d &mat, int priority) :
-  _name(name),
-  _type(M_numeric),
-  _priority(priority),
-  _stored_ptr(mat),
-  _bind_layer(0),
-  _bind_level(0),
-  _access(A_read)
-{
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: ShaderInput::Constructor
-//       Access: Published
-//  Description:
-////////////////////////////////////////////////////////////////////
-INLINE ShaderInput::
-ShaderInput(const InternalName *name, const PTA_int &ptr, int priority) :
-  _name(name),
-  _type(M_numeric),
-  _priority(priority),
-  _stored_ptr(ptr),
-  _bind_layer(0),
-  _bind_level(0),
-  _access(A_read)
-{
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: ShaderInput::Constructor
-//       Access: Published
-//  Description:
-////////////////////////////////////////////////////////////////////
-INLINE ShaderInput::
-ShaderInput(const InternalName *name, const PTA_LVecBase4i &ptr, int priority) :
-  _name(name),
-  _type(M_numeric),
-  _priority(priority),
-  _stored_ptr(ptr),
-  _bind_layer(0),
-  _bind_level(0),
-  _access(A_read)
-{
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: ShaderInput::Constructor
-//       Access: Published
-//  Description:
-////////////////////////////////////////////////////////////////////
-INLINE ShaderInput::
-ShaderInput(const InternalName *name, const PTA_LVecBase3i &ptr, int priority) :
-  _name(name),
-  _type(M_numeric),
-  _priority(priority),
-  _stored_ptr(ptr),
-  _bind_layer(0),
-  _bind_level(0),
-  _access(A_read)
-{
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: ShaderInput::Constructor
-//       Access: Published
-//  Description:
-////////////////////////////////////////////////////////////////////
-INLINE ShaderInput::
-ShaderInput(const InternalName *name, const PTA_LVecBase2i &ptr, int priority) :
-  _name(name),
-  _type(M_numeric),
-  _priority(priority),
-  _stored_ptr(ptr),
-  _bind_layer(0),
-  _bind_level(0),
-  _access(A_read)
-{
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: ShaderInput::Constructor
-//       Access: Published
-//  Description:
-////////////////////////////////////////////////////////////////////
-INLINE ShaderInput::
-ShaderInput(const InternalName *name, const LVecBase4i &vec, int priority) :
-  _name(name),
+ShaderInput(CPT_InternalName name, const LVecBase4i &vec, int priority) :
+  _name(MOVE(name)),
   _type(M_numeric),
   _priority(priority),
   _stored_ptr(vec),
@@ -608,8 +608,8 @@ ShaderInput(const InternalName *name, const LVecBase4i &vec, int priority) :
 //  Description:
 ////////////////////////////////////////////////////////////////////
 INLINE ShaderInput::
-ShaderInput(const InternalName *name, const LVecBase3i &vec, int priority) :
-  _name(name),
+ShaderInput(CPT_InternalName name, const LVecBase3i &vec, int priority) :
+  _name(MOVE(name)),
   _type(M_numeric),
   _priority(priority),
   _stored_ptr(vec),
@@ -626,8 +626,8 @@ ShaderInput(const InternalName *name, const LVecBase3i &vec, int priority) :
 //  Description:
 ////////////////////////////////////////////////////////////////////
 INLINE ShaderInput::
-ShaderInput(const InternalName *name, const LVecBase2i &vec, int priority) :
-  _name(name),
+ShaderInput(CPT_InternalName name, const LVecBase2i &vec, int priority) :
+  _name(MOVE(name)),
   _type(M_numeric),
   _priority(priority),
   _stored_ptr(vec),
diff --git a/panda/src/pgraph/shaderInput.h b/panda/src/pgraph/shaderInput.h
index 4d289d09ec..fed3aebe5c 100644
--- a/panda/src/pgraph/shaderInput.h
+++ b/panda/src/pgraph/shaderInput.h
@@ -52,48 +52,49 @@ PUBLISHED:
   };
 
   static const ShaderInput *get_blank();
-  INLINE ShaderInput(const InternalName *id, int priority=0);
-  INLINE ShaderInput(const InternalName *id, const NodePath &np, int priority=0);
-  INLINE ShaderInput(const InternalName *id, Texture *tex, int priority=0);
-  INLINE ShaderInput(const InternalName *id, Texture *tex, const SamplerState &sampler, int priority=0);
-  INLINE ShaderInput(const InternalName *id, Texture *tex, bool read, bool write, int z=-1, int n=0, int priority=0);
-  INLINE ShaderInput(const InternalName *id, ParamValueBase *param, int priority=0);
-  INLINE ShaderInput(const InternalName *id, const PTA_float &ptr, int priority=0);
-  INLINE ShaderInput(const InternalName *id, const PTA_LVecBase4f &ptr, int priority=0);
-  INLINE ShaderInput(const InternalName *id, const PTA_LVecBase3f &ptr, int priority=0);
-  INLINE ShaderInput(const InternalName *id, const PTA_LVecBase2f &ptr, int priority=0);
-  INLINE ShaderInput(const InternalName *id, const PTA_LMatrix4f &ptr, int priority=0);
-  INLINE ShaderInput(const InternalName *id, const PTA_LMatrix3f &ptr, int priority=0);
-  INLINE ShaderInput(const InternalName *id, const LVecBase4f &vec, int priority=0);
-  INLINE ShaderInput(const InternalName *id, const LVecBase3f &vec, int priority=0);
-  INLINE ShaderInput(const InternalName *id, const LVecBase2f &vec, int priority=0);
-  INLINE ShaderInput(const InternalName *id, const LMatrix4f &mat, int priority=0);
-  INLINE ShaderInput(const InternalName *id, const LMatrix3f &mat, int priority=0);
+  INLINE ShaderInput(CPT_InternalName name, int priority=0);
+  INLINE ShaderInput(CPT_InternalName name, const NodePath &np, int priority=0);
+  INLINE ShaderInput(CPT_InternalName name, Texture *tex, int priority=0);
+  INLINE ShaderInput(CPT_InternalName name, Texture *tex, const SamplerState &sampler, int priority=0);
+  INLINE ShaderInput(CPT_InternalName name, Texture *tex, bool read, bool write, int z=-1, int n=0, int priority=0);
+  INLINE ShaderInput(CPT_InternalName name, ParamValueBase *param, int priority=0);
+  INLINE ShaderInput(CPT_InternalName name, const PTA_float &ptr, int priority=0);
+  INLINE ShaderInput(CPT_InternalName name, const PTA_LVecBase4f &ptr, int priority=0);
+  INLINE ShaderInput(CPT_InternalName name, const PTA_LVecBase3f &ptr, int priority=0);
+  INLINE ShaderInput(CPT_InternalName name, const PTA_LVecBase2f &ptr, int priority=0);
+  INLINE ShaderInput(CPT_InternalName name, const PTA_LMatrix4f &ptr, int priority=0);
+  INLINE ShaderInput(CPT_InternalName name, const PTA_LMatrix3f &ptr, int priority=0);
+  INLINE ShaderInput(CPT_InternalName name, const LVecBase4f &vec, int priority=0);
+  INLINE ShaderInput(CPT_InternalName name, const LVecBase3f &vec, int priority=0);
+  INLINE ShaderInput(CPT_InternalName name, const LVecBase2f &vec, int priority=0);
+  INLINE ShaderInput(CPT_InternalName name, const LMatrix4f &mat, int priority=0);
+  INLINE ShaderInput(CPT_InternalName name, const LMatrix3f &mat, int priority=0);
 
-  INLINE ShaderInput(const InternalName *id, const PTA_double &ptr, int priority=0);
-  INLINE ShaderInput(const InternalName *id, const PTA_LVecBase4d &ptr, int priority=0);
-  INLINE ShaderInput(const InternalName *id, const PTA_LVecBase3d &ptr, int priority=0);
-  INLINE ShaderInput(const InternalName *id, const PTA_LVecBase2d &ptr, int priority=0);
-  INLINE ShaderInput(const InternalName *id, const PTA_LMatrix4d &ptr, int priority=0);
-  INLINE ShaderInput(const InternalName *id, const PTA_LMatrix3d &ptr, int priority=0);
-  INLINE ShaderInput(const InternalName *id, const LVecBase4d &vec, int priority=0);
-  INLINE ShaderInput(const InternalName *id, const LVecBase3d &vec, int priority=0);
-  INLINE ShaderInput(const InternalName *id, const LVecBase2d &vec, int priority=0);
-  INLINE ShaderInput(const InternalName *id, const LMatrix4d &mat, int priority=0);
-  INLINE ShaderInput(const InternalName *id, const LMatrix3d &mat, int priority=0);
+  INLINE ShaderInput(CPT_InternalName name, const PTA_double &ptr, int priority=0);
+  INLINE ShaderInput(CPT_InternalName name, const PTA_LVecBase4d &ptr, int priority=0);
+  INLINE ShaderInput(CPT_InternalName name, const PTA_LVecBase3d &ptr, int priority=0);
+  INLINE ShaderInput(CPT_InternalName name, const PTA_LVecBase2d &ptr, int priority=0);
+  INLINE ShaderInput(CPT_InternalName name, const PTA_LMatrix4d &ptr, int priority=0);
+  INLINE ShaderInput(CPT_InternalName name, const PTA_LMatrix3d &ptr, int priority=0);
+  INLINE ShaderInput(CPT_InternalName name, const LVecBase4d &vec, int priority=0);
+  INLINE ShaderInput(CPT_InternalName name, const LVecBase3d &vec, int priority=0);
+  INLINE ShaderInput(CPT_InternalName name, const LVecBase2d &vec, int priority=0);
+  INLINE ShaderInput(CPT_InternalName name, const LMatrix4d &mat, int priority=0);
+  INLINE ShaderInput(CPT_InternalName name, const LMatrix3d &mat, int priority=0);
 
-  INLINE ShaderInput(const InternalName *id, const PTA_int &ptr, int priority=0);
-  INLINE ShaderInput(const InternalName *id, const PTA_LVecBase4i &ptr, int priority=0);
-  INLINE ShaderInput(const InternalName *id, const PTA_LVecBase3i &ptr, int priority=0);
-  INLINE ShaderInput(const InternalName *id, const PTA_LVecBase2i &ptr, int priority=0);
-  INLINE ShaderInput(const InternalName *id, const LVecBase4i &vec, int priority=0);
-  INLINE ShaderInput(const InternalName *id, const LVecBase3i &vec, int priority=0);
-  INLINE ShaderInput(const InternalName *id, const LVecBase2i &vec, int priority=0);
+  INLINE ShaderInput(CPT_InternalName name, const PTA_int &ptr, int priority=0);
+  INLINE ShaderInput(CPT_InternalName name, const PTA_LVecBase4i &ptr, int priority=0);
+  INLINE ShaderInput(CPT_InternalName name, const PTA_LVecBase3i &ptr, int priority=0);
+  INLINE ShaderInput(CPT_InternalName name, const PTA_LVecBase2i &ptr, int priority=0);
+  INLINE ShaderInput(CPT_InternalName name, const LVecBase4i &vec, int priority=0);
+  INLINE ShaderInput(CPT_InternalName name, const LVecBase3i &vec, int priority=0);
+  INLINE ShaderInput(CPT_InternalName name, const LVecBase2i &vec, int priority=0);
 
   enum ShaderInputType {
     M_invalid = 0,
     M_texture,
     M_nodepath,
+    M_vector,
     M_numeric,
     M_texture_sampler,
     M_param
@@ -119,7 +120,7 @@ private:
   LVecBase4 _stored_vector;
   NodePath _stored_nodepath;
   Shader::ShaderPtrData _stored_ptr;
-  CPT(InternalName) _name;
+  CPT_InternalName _name;
   PT(TypedWritableReferenceCount) _value;
   int _priority;
 
diff --git a/panda/src/pgraph/shaderPool.cxx b/panda/src/pgraph/shaderPool.cxx
index 59fe4ac61b..1ca9ddbe00 100644
--- a/panda/src/pgraph/shaderPool.cxx
+++ b/panda/src/pgraph/shaderPool.cxx
@@ -74,25 +74,29 @@ ns_load_shader(const Filename &orig_filename) {
     }
   }
 
-/*
-  shader_cat.info()
+  // The shader was not found in the pool.
+  gobj_cat.info()
     << "Loading shader " << filename << "\n";
-*/
 
-  CPT(Shader) shader;
+  Shader::ShaderLanguage lang = Shader::SL_none;
 
-  shader = (CPT(Shader)) NULL;
-  string extension = filename.get_extension();
+  // Do some guesswork to see if we can figure out the shader language
+  // from the file extension.  This is really just guesswork - there are
+  // no standardized extensions for shaders, especially for GLSL.
+  // These are the ones that appear to be closest to "standard".
+  string ext = downcase(filename.get_extension());
+  if (ext == "cg" || ext == "sha") {
+    // "sha" is for historical reasons.
+    lang = Shader::SL_Cg;
 
-  if (extension.empty() || extension == "cg" || extension == "hlsl") {
-    // this does nothing for now
+  } else if (ext == "glsl" || ext == "vert" || ext == "frag" ||
+             ext == "geom" || ext == "tesc" || ext == "tese" ||
+             ext == "comp") {
+    lang = Shader::SL_GLSL;
   }
 
-  if (shader == (CPT(Shader)) NULL) {
-    shader = Shader::load (filename);
-  }
-
-  if (shader == (CPT(Shader)) NULL) {
+  PT(Shader) shader = Shader::load(filename, lang);
+  if (shader == (Shader *)NULL) {
     // This shader was not found or could not be read.
     return NULL;
   }
diff --git a/panda/src/pgraph/texGenAttrib.I b/panda/src/pgraph/texGenAttrib.I
index d8adca1984..d539219fe8 100755
--- a/panda/src/pgraph/texGenAttrib.I
+++ b/panda/src/pgraph/texGenAttrib.I
@@ -22,7 +22,6 @@
 INLINE TexGenAttrib::
 TexGenAttrib() :
   _num_point_sprites(0),
-  _num_light_vectors(0),
   _point_geom_rendering(0),
   _geom_rendering(0)
 {
@@ -39,7 +38,6 @@ TexGenAttrib(const TexGenAttrib &copy) :
   _stages(copy._stages),
   _no_texcoords(copy._no_texcoords),
   _num_point_sprites(copy._num_point_sprites),
-  _num_light_vectors(copy._num_light_vectors),
   _point_geom_rendering(copy._point_geom_rendering),
   _geom_rendering(copy._geom_rendering)
 {
@@ -62,22 +60,10 @@ get_geom_rendering(int geom_rendering) const {
   return geom_rendering | _geom_rendering;
 }
 
-////////////////////////////////////////////////////////////////////
-//     Function: TexGenAttrib::get_light_vectors
-//       Access: Public
-//  Description: Returns the set of TextureStages that have
-//               M_light_vector in effect, as well as the associated
-//               Lights.
-////////////////////////////////////////////////////////////////////
-INLINE const TexGenAttrib::LightVectors &TexGenAttrib::
-get_light_vectors() const {
-  return _light_vectors;
-}
-
 ////////////////////////////////////////////////////////////////////
 //     Function: TexGenAttrib::ModeDef::Constructor
 //       Access: Public
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 INLINE TexGenAttrib::ModeDef::
 ModeDef() :
@@ -88,7 +74,7 @@ ModeDef() :
 ////////////////////////////////////////////////////////////////////
 //     Function: TexGenAttrib::ModeDef::compare_to
 //       Access: Public
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 INLINE int TexGenAttrib::ModeDef::
 compare_to(const TexGenAttrib::ModeDef &other) const {
diff --git a/panda/src/pgraph/texGenAttrib.cxx b/panda/src/pgraph/texGenAttrib.cxx
index 464bb2e783..ca22d7942c 100755
--- a/panda/src/pgraph/texGenAttrib.cxx
+++ b/panda/src/pgraph/texGenAttrib.cxx
@@ -28,7 +28,7 @@ int TexGenAttrib::_attrib_slot;
 ////////////////////////////////////////////////////////////////////
 //     Function: TexGenAttrib::Destructor
 //       Access: Public, Virtual
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 TexGenAttrib::
 ~TexGenAttrib() {
@@ -84,7 +84,7 @@ make_default() {
 ////////////////////////////////////////////////////////////////////
 CPT(RenderAttrib) TexGenAttrib::
 add_stage(TextureStage *stage, TexGenAttrib::Mode mode) const {
-  nassertr(mode != M_light_vector && mode != M_constant, this);
+  nassertr(mode != M_constant, this);
 
   CPT(RenderAttrib) removed = remove_stage(stage);
   TexGenAttrib *attrib = new TexGenAttrib(*DCAST(TexGenAttrib, removed));
@@ -96,34 +96,6 @@ add_stage(TextureStage *stage, TexGenAttrib::Mode mode) const {
   return return_new(attrib);
 }
 
-////////////////////////////////////////////////////////////////////
-//     Function: TexGenAttrib::add_stage
-//       Access: Published, Static
-//  Description: Returns a new TexGenAttrib just like this one,
-//               with the indicated generation mode for the given
-//               stage.  If this stage already exists, its mode is
-//               replaced.
-//
-//               This variant also accepts source_name and light,
-//               which are only meaningful if mode is M_light_vector.
-////////////////////////////////////////////////////////////////////
-CPT(RenderAttrib) TexGenAttrib::
-add_stage(TextureStage *stage, TexGenAttrib::Mode mode, 
-          const string &source_name, const NodePath &light) const {
-  nassertr(mode == M_light_vector, this);
-
-  CPT(RenderAttrib) removed = remove_stage(stage);
-  TexGenAttrib *attrib = new TexGenAttrib(*DCAST(TexGenAttrib, removed));
-
-  ModeDef &mode_def = attrib->_stages[stage];
-  mode_def._mode = mode;
-  mode_def._source_name = source_name;
-  mode_def._light = light;
-  attrib->record_stage(stage, mode_def);
-
-  return return_new(attrib);
-}
-
 ////////////////////////////////////////////////////////////////////
 //     Function: TexGenAttrib::add_stage
 //       Access: Published, Static
@@ -136,7 +108,7 @@ add_stage(TextureStage *stage, TexGenAttrib::Mode mode,
 //               only meaningful if mode is M_constant.
 ////////////////////////////////////////////////////////////////////
 CPT(RenderAttrib) TexGenAttrib::
-add_stage(TextureStage *stage, TexGenAttrib::Mode mode, 
+add_stage(TextureStage *stage, TexGenAttrib::Mode mode,
           const LTexCoord3 &constant_value) const {
   nassertr(mode == M_constant, this);
 
@@ -174,12 +146,6 @@ remove_stage(TextureStage *stage) const {
     if (attrib->_num_point_sprites == 0) {
       attrib->_point_geom_rendering &= ~Geom::GR_point_sprite;
     }
-  } else if (mode == M_light_vector) {
-    attrib->_light_vectors.erase(stage);
-    attrib->_num_light_vectors--;
-    if (attrib->_num_light_vectors == 0) {
-      attrib->_geom_rendering &= ~Geom::GR_texcoord_light_vector;
-    }
   }
   return return_new(attrib);
 }
@@ -238,43 +204,6 @@ has_gen_texcoord_stage(TextureStage *stage) const {
   return (mi != _no_texcoords.end());
 }
 
-////////////////////////////////////////////////////////////////////
-//     Function: TexGenAttrib::get_source_name
-//       Access: Published
-//  Description: Returns the source name associated with the named
-//               texture stage, or the empty string if no name is
-//               associated with the indicated stage.  This is only
-//               meaningful if the mode is M_light_vector, in which
-//               case it indicates the name of the source texture
-//               coordinate set from which the tangent and binormal
-//               are derived.
-////////////////////////////////////////////////////////////////////
-string TexGenAttrib::
-get_source_name(TextureStage *stage) const {
-  Stages::const_iterator mi = _stages.find(stage);
-  if (mi != _stages.end()) {
-    return (*mi).second._source_name;
-  }
-  return string();
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: TexGenAttrib::get_light
-//       Access: Published
-//  Description: Returns the Light associated with the named texture
-//               stage, or the empty NodePath if no light is
-//               associated with the indicated stage.  This is only
-//               meaningful if the mode is M_light_vector.
-////////////////////////////////////////////////////////////////////
-NodePath TexGenAttrib::
-get_light(TextureStage *stage) const {
-  Stages::const_iterator mi = _stages.find(stage);
-  if (mi != _stages.end()) {
-    return (*mi).second._light;
-  }
-  return NodePath();
-}
-
 ////////////////////////////////////////////////////////////////////
 //     Function: TexGenAttrib::get_constant_value
 //       Access: Published
@@ -294,7 +223,7 @@ get_constant_value(TextureStage *stage) const {
 ////////////////////////////////////////////////////////////////////
 //     Function: TexGenAttrib::output
 //       Access: Public, Virtual
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 void TexGenAttrib::
 output(ostream &out) const {
@@ -339,16 +268,12 @@ output(ostream &out) const {
       out << "point_sprite";
       break;
 
-    case M_light_vector:
-      out << "light_vector: \"" << mode_def._source_name << "\", "
-          << mode_def._light;
-      break;
-
     case M_constant:
       out << "constant: " << mode_def._constant_value;
       break;
 
     case M_unused:
+    case M_unused2:
       break;
     }
     out << ")";
@@ -374,7 +299,7 @@ int TexGenAttrib::
 compare_to_impl(const RenderAttrib *other) const {
   const TexGenAttrib *ta;
   DCAST_INTO_R(ta, other, 0);
-  
+
   Stages::const_iterator ai, bi;
   ai = _stages.begin();
   bi = ta->_stages.begin();
@@ -566,7 +491,7 @@ invert_compose_impl(const RenderAttrib *other) const {
 ////////////////////////////////////////////////////////////////////
 //     Function: TexGenAttrib::get_auto_shader_attrib_impl
 //       Access: Protected, Virtual
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 CPT(RenderAttrib) TexGenAttrib::
 get_auto_shader_attrib_impl(const RenderState *state) const {
@@ -608,26 +533,6 @@ record_stage(TextureStage *stage, TexGenAttrib::ModeDef &mode_def) {
     _num_point_sprites++;
     break;
 
-  case M_light_vector:
-    {
-      if (!mode_def._light.is_empty()) {
-        Light *light_obj = mode_def._light.node()->as_light();
-        if (light_obj == (Light *)NULL) {
-#ifndef NDEBUG
-          ostringstream strm;
-          strm << "Not a light: " << mode_def._light;
-          nassert_raise(strm.str());
-#endif
-          mode_def._light = NodePath();
-        }
-      }
-
-      _light_vectors.insert(stage);
-      _geom_rendering |= Geom::GR_texcoord_light_vector;
-      _num_light_vectors++;
-    }
-    break;
-
   case M_off:
     break;
 
diff --git a/panda/src/pgraph/texGenAttrib.h b/panda/src/pgraph/texGenAttrib.h
index 608805a925..71840a83aa 100755
--- a/panda/src/pgraph/texGenAttrib.h
+++ b/panda/src/pgraph/texGenAttrib.h
@@ -54,7 +54,6 @@ PUBLISHED:
   static CPT(RenderAttrib) make_default();
 
   CPT(RenderAttrib) add_stage(TextureStage *stage, Mode mode) const;
-  CPT(RenderAttrib) add_stage(TextureStage *stage, Mode mode, const string &source_name, const NodePath &light) const;
   CPT(RenderAttrib) add_stage(TextureStage *stage, Mode mode, const LTexCoord3 &constant_value) const;
   CPT(RenderAttrib) remove_stage(TextureStage *stage) const;
 
@@ -62,16 +61,11 @@ PUBLISHED:
   bool has_stage(TextureStage *stage) const;
   Mode get_mode(TextureStage *stage) const;
   bool has_gen_texcoord_stage(TextureStage *stage) const;
-  string get_source_name(TextureStage *stage) const;
-  NodePath get_light(TextureStage *stage) const;
   const LTexCoord3 &get_constant_value(TextureStage *stage) const;
 
   INLINE int get_geom_rendering(int geom_rendering) const;
 
 public:
-  typedef pset<TextureStage *> LightVectors;
-  INLINE const LightVectors &get_light_vectors() const;
-
   virtual void output(ostream &out) const;
 
 protected:
@@ -105,16 +99,11 @@ private:
   typedef pset<TextureStage *> NoTexCoordStages;
   NoTexCoordStages _no_texcoords;
 
-  // This is another optimization during rendering; it lists the
-  // texture stages (if any) that use M_light_vector.
-  LightVectors _light_vectors;
-
   // This element is only used during reading from a bam file.  It has
   // no meaningful value any other time.
   pvector<Mode> _read_modes;
 
   int _num_point_sprites;
-  int _num_light_vectors;
 
   // _point_geom_rendering is the GeomRendering bits that are added by
   // the TexGenAttrib if there are any points in the Geom.
@@ -122,7 +111,7 @@ private:
   // regardless of the kind of Geom it is.
   int _point_geom_rendering;
   int _geom_rendering;
-  
+
   static CPT(RenderAttrib) _empty_attrib;
 
 PUBLISHED:
@@ -141,7 +130,7 @@ public:
 protected:
   static TypedWritable *make_from_bam(const FactoryParams &params);
   void fillin(DatagramIterator &scan, BamReader *manager);
-  
+
 public:
   static TypeHandle get_class_type() {
     return _type_handle;
diff --git a/panda/src/pgraph/texMatrixAttrib.cxx b/panda/src/pgraph/texMatrixAttrib.cxx
index 308ff574f2..7afe6f9014 100644
--- a/panda/src/pgraph/texMatrixAttrib.cxx
+++ b/panda/src/pgraph/texMatrixAttrib.cxx
@@ -62,7 +62,7 @@ CPT(RenderAttrib) TexMatrixAttrib::
 make(const LMatrix4 &mat) {
   pgraph_cat.warning()
     << "Using deprecated TexMatrixAttrib interface.\n";
-  if (mat == LMatrix4::ident_mat()) {
+  if (mat.is_identity()) {
     return make();
   }
   CPT(TransformState) transform = TransformState::make_mat(mat);
diff --git a/panda/src/pgraph/textureAttrib.h b/panda/src/pgraph/textureAttrib.h
index 6a0b48928c..0c27a018eb 100644
--- a/panda/src/pgraph/textureAttrib.h
+++ b/panda/src/pgraph/textureAttrib.h
@@ -23,6 +23,7 @@
 #include "updateSeq.h"
 #include "ordered_vector.h"
 #include "vector_int.h"
+#include "epvector.h"
 
 ////////////////////////////////////////////////////////////////////
 //       Class : TextureAttrib
@@ -109,9 +110,9 @@ private:
                      unsigned int implicit_sort = 0,
                      int override = 0);
 
+    SamplerState _sampler;
     PT(TextureStage) _stage;
     PT(Texture) _texture;
-    SamplerState _sampler;
     bool _has_sampler;
     int _ff_tc_index;
     unsigned int _implicit_sort;
@@ -133,7 +134,7 @@ private:
     INLINE bool operator () (const TextureAttrib::StageNode &a, const TextureAttrib::StageNode &b) const;
   };
 
-  typedef ov_set<StageNode, CompareTextureStagePointer> Stages;
+  typedef ov_set<StageNode, CompareTextureStagePointer, epvector<StageNode> > Stages;
   Stages _on_stages;  // set of all "on" stages, indexed by pointer.
 
   typedef pvector<StageNode *> RenderStages;
diff --git a/panda/src/pgraph/transformState.I b/panda/src/pgraph/transformState.I
index 58fe5d1bb3..9f4ff96c90 100644
--- a/panda/src/pgraph/transformState.I
+++ b/panda/src/pgraph/transformState.I
@@ -14,15 +14,13 @@
 
 
 ////////////////////////////////////////////////////////////////////
-//     Function: TransformState::operator <
+//     Function: TransformState::operator !=
 //       Access: Published
-//  Description: Provides an arbitrary ordering among all unique
-//               TransformStates, so we can store the essentially
-//               different ones in a big set and throw away the rest.
+//  Description: Opposite of operator ==.
 ////////////////////////////////////////////////////////////////////
 INLINE bool TransformState::
-operator < (const TransformState &other) const {
-  return compare_to(other) < 0;
+operator != (const TransformState &other) const {
+  return !(operator == (other));
 }
 
 ////////////////////////////////////////////////////////////////////
@@ -31,10 +29,14 @@ operator < (const TransformState &other) const {
 //  Description: Provides an arbitrary ordering among all unique
 //               TransformStates, so we can store the essentially
 //               different ones in a big set and throw away the rest.
+//
+//               Note that if this returns 0, it doesn't necessarily
+//               imply that operator == returns true; it uses a very
+//               slightly different comparison threshold.
 ////////////////////////////////////////////////////////////////////
 INLINE int TransformState::
 compare_to(const TransformState &other) const {
-  return compare_to(other, uniquify_matrix);
+  return compare_to(other, _uniquify_matrix);
 }
 
 ////////////////////////////////////////////////////////////////////
@@ -56,7 +58,7 @@ get_hash() const {
 ////////////////////////////////////////////////////////////////////
 INLINE CPT(TransformState) TransformState::
 make_pos(const LVecBase3 &pos) {
-  return make_pos_hpr_scale(pos, 
+  return make_pos_hpr_scale(pos,
                             LVecBase3(0.0f, 0.0f, 0.0f),
                             LVecBase3(1.0f, 1.0f, 1.0f));
 }
@@ -70,7 +72,7 @@ make_pos(const LVecBase3 &pos) {
 INLINE CPT(TransformState) TransformState::
 make_hpr(const LVecBase3 &hpr) {
   return make_pos_hpr_scale(LVecBase3(0.0f, 0.0f, 0.0f),
-                            hpr, 
+                            hpr,
                             LVecBase3(1.0f, 1.0f, 1.0f));
 }
 
@@ -83,7 +85,7 @@ make_hpr(const LVecBase3 &hpr) {
 INLINE CPT(TransformState) TransformState::
 make_quat(const LQuaternion &quat) {
   return make_pos_quat_scale(LVecBase3(0.0f, 0.0f, 0.0f),
-                             quat, 
+                             quat,
                              LVecBase3(1.0f, 1.0f, 1.0f));
 }
 
@@ -146,7 +148,7 @@ make_shear(const LVecBase3 &shear) {
 //               components.
 ////////////////////////////////////////////////////////////////////
 INLINE CPT(TransformState) TransformState::
-make_pos_hpr_scale(const LVecBase3 &pos, const LVecBase3 &hpr, 
+make_pos_hpr_scale(const LVecBase3 &pos, const LVecBase3 &hpr,
                    const LVecBase3 &scale) {
   return make_pos_hpr_scale_shear(pos, hpr, scale, LVecBase3::zero());
 }
@@ -158,7 +160,7 @@ make_pos_hpr_scale(const LVecBase3 &pos, const LVecBase3 &hpr,
 //               components.
 ////////////////////////////////////////////////////////////////////
 INLINE CPT(TransformState) TransformState::
-make_pos_quat_scale(const LVecBase3 &pos, const LQuaternion &quat, 
+make_pos_quat_scale(const LVecBase3 &pos, const LQuaternion &quat,
                     const LVecBase3 &scale) {
   return make_pos_quat_scale_shear(pos, quat, scale, LVecBase3::zero());
 }
@@ -182,7 +184,7 @@ make_pos2d(const LVecBase2 &pos) {
 ////////////////////////////////////////////////////////////////////
 INLINE CPT(TransformState) TransformState::
 make_rotate2d(PN_stdfloat rotate) {
-  return make_pos_rotate_scale2d(LVecBase2(0.0f, 0.0f), rotate, 
+  return make_pos_rotate_scale2d(LVecBase2(0.0f, 0.0f), rotate,
                                  LVecBase2(1.0f, 1.0f));
 }
 
@@ -229,7 +231,7 @@ make_scale2d(const LVecBase2 &scale) {
 ////////////////////////////////////////////////////////////////////
 INLINE CPT(TransformState) TransformState::
 make_shear2d(PN_stdfloat shear) {
-  return make_pos_rotate_scale_shear2d(LVecBase2(0.0f, 0.0f), 0.0f, 
+  return make_pos_rotate_scale_shear2d(LVecBase2(0.0f, 0.0f), 0.0f,
                                        LVecBase2(1.0f, 1.0f), shear);
 }
 
@@ -240,7 +242,7 @@ make_shear2d(PN_stdfloat shear) {
 //               components.
 ////////////////////////////////////////////////////////////////////
 INLINE CPT(TransformState) TransformState::
-make_pos_rotate_scale2d(const LVecBase2 &pos, PN_stdfloat rotate, 
+make_pos_rotate_scale2d(const LVecBase2 &pos, PN_stdfloat rotate,
                         const LVecBase2 &scale) {
   return make_pos_rotate_scale_shear2d(pos, rotate, scale, 0.0f);
 }
@@ -353,7 +355,7 @@ hpr_given() const {
 ////////////////////////////////////////////////////////////////////
 //     Function: TransformState::quat_given
 //       Access: Published
-//  Description: Returns true if the rotation was specified via a 
+//  Description: Returns true if the rotation was specified via a
 //               quaternion, false otherwise.  If this is true,
 //               get_quat() will be exactly as set; otherwise, it will
 //               return a computed value.
@@ -1142,7 +1144,7 @@ calc_mat() {
 ////////////////////////////////////////////////////////////////////
 INLINE void TransformState::
 check_uniform_scale() {
-  if (IS_NEARLY_EQUAL(_scale[0], _scale[1]) && 
+  if (IS_NEARLY_EQUAL(_scale[0], _scale[1]) &&
       IS_NEARLY_EQUAL(_scale[0], _scale[2])) {
     _flags |= F_uniform_scale;
     if (IS_NEARLY_EQUAL(_scale[0], 1.0f)) {
@@ -1234,7 +1236,7 @@ consider_update_pstats(int old_referenced_bits) const {
 ////////////////////////////////////////////////////////////////////
 //     Function: TransformState::Composition::Constructor
 //       Access: Public
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 INLINE TransformState::Composition::
 Composition() {
@@ -1243,7 +1245,7 @@ Composition() {
 ////////////////////////////////////////////////////////////////////
 //     Function: TransformState::Composition::Copy Constructor
 //       Access: Public
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 INLINE TransformState::Composition::
 Composition(const TransformState::Composition &copy) :
@@ -1254,7 +1256,7 @@ Composition(const TransformState::Composition &copy) :
 ////////////////////////////////////////////////////////////////////
 //     Function: TransformState::CompositionCycleDescEntry::Constructor
 //       Access: Public
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 INLINE TransformState::CompositionCycleDescEntry::
 CompositionCycleDescEntry(const TransformState *obj,
diff --git a/panda/src/pgraph/transformState.cxx b/panda/src/pgraph/transformState.cxx
index a9ec305914..bffa840479 100644
--- a/panda/src/pgraph/transformState.cxx
+++ b/panda/src/pgraph/transformState.cxx
@@ -32,6 +32,7 @@ CPT(TransformState) TransformState::_identity_state;
 CPT(TransformState) TransformState::_invalid_state;
 UpdateSeq TransformState::_last_cycle_detect;
 int TransformState::_garbage_index = 0;
+bool TransformState::_uniquify_matrix = true;
 
 PStatCollector TransformState::_cache_update_pcollector("*:State Cache:Update");
 PStatCollector TransformState::_garbage_collect_pcollector("*:State Cache:Garbage Collect");
@@ -98,7 +99,7 @@ TransformState::
   // We'd better not call the destructor twice on a particular object.
   nassertv(!is_destructing());
   set_destructing();
- 
+
   // Free the inverse matrix computation, if it has been stored.
   if (_inv_mat != (LMatrix4 *)NULL) {
     delete _inv_mat;
@@ -124,6 +125,10 @@ TransformState::
 //               TransformStates, so we can store the essentially
 //               different ones in a big set and throw away the rest.
 //
+//               Note that if this returns 0, it doesn't necessarily
+//               imply that operator == returns true; it uses a very
+//               slightly different comparison threshold.
+//
 //               If uniquify_matrix is true, then matrix-defined
 //               TransformStates are also uniqified.  If
 //               uniquify_matrix is false, then only component-defined
@@ -132,7 +137,7 @@ TransformState::
 ////////////////////////////////////////////////////////////////////
 int TransformState::
 compare_to(const TransformState &other, bool uniquify_matrix) const {
-  static const int significant_flags = 
+  static const int significant_flags =
     (F_is_invalid | F_is_identity | F_components_given | F_hpr_given | F_quat_given | F_is_2d);
 
   int flags = (_flags & significant_flags);
@@ -191,6 +196,73 @@ compare_to(const TransformState &other, bool uniquify_matrix) const {
   }
 }
 
+////////////////////////////////////////////////////////////////////
+//     Function: TransformState::operator ==
+//       Access: Published
+//  Description: Tests equivalence between two transform states.
+//               We use this instead of compare_to since this is
+//               faster, and we don't need an ordering between
+//               TransformStates because we use a hash map.
+//
+//               If uniquify_matrix is true, then matrix-defined
+//               TransformStates are also uniqified.  If
+//               uniquify_matrix is false, then only component-defined
+//               TransformStates are uniquified, which is less
+//               expensive.
+////////////////////////////////////////////////////////////////////
+bool TransformState::
+operator == (const TransformState &other) const {
+  static const int significant_flags =
+    (F_is_invalid | F_is_identity | F_components_given | F_hpr_given | F_quat_given | F_is_2d);
+
+  int flags = (_flags & significant_flags);
+  int other_flags = (other._flags & significant_flags);
+  if (flags != other_flags) {
+    return false;
+  }
+
+  if ((_flags & (F_is_invalid | F_is_identity)) != 0) {
+    // All invalid transforms are equivalent to each other, and all
+    // identity transforms are equivalent to each other.
+    return true;
+  }
+
+  if ((_flags & F_components_given) != 0) {
+    // If the transform was specified componentwise, compare them
+    // componentwise.
+    if (_pos != other._pos) {
+      return false;
+    }
+
+    if ((_flags & F_hpr_given) != 0) {
+      if (_hpr != other._hpr) {
+        return false;
+      }
+    } else if ((_flags & F_quat_given) != 0) {
+      if (_quat != other._quat) {
+        return false;
+      }
+    }
+
+    if (_scale != other._scale) {
+      return false;
+    }
+
+    return (_shear == other._shear);
+  }
+
+  // Otherwise, compare the matrices . . .
+  if (_uniquify_matrix) {
+    // . . . but only if the user thinks that's a worthwhile
+    // comparison.
+    return get_mat().almost_equal(other.get_mat());
+
+  } else {
+    // If not, we just compare the pointers.
+    return (this == &other);
+  }
+}
+
 ////////////////////////////////////////////////////////////////////
 //     Function: TransformState::make_identity
 //       Access: Published, Static
@@ -232,7 +304,7 @@ make_invalid() {
 //               components.
 ////////////////////////////////////////////////////////////////////
 CPT(TransformState) TransformState::
-make_pos_hpr_scale_shear(const LVecBase3 &pos, const LVecBase3 &hpr, 
+make_pos_hpr_scale_shear(const LVecBase3 &pos, const LVecBase3 &hpr,
                          const LVecBase3 &scale, const LVecBase3 &shear) {
   nassertr(!(pos.is_nan() || hpr.is_nan() || scale.is_nan() || shear.is_nan()) , make_invalid());
   // Make a special-case check for the identity transform.
@@ -260,7 +332,7 @@ make_pos_hpr_scale_shear(const LVecBase3 &pos, const LVecBase3 &hpr,
 //               components.
 ////////////////////////////////////////////////////////////////////
 CPT(TransformState) TransformState::
-make_pos_quat_scale_shear(const LVecBase3 &pos, const LQuaternion &quat, 
+make_pos_quat_scale_shear(const LVecBase3 &pos, const LQuaternion &quat,
                           const LVecBase3 &scale, const LVecBase3 &shear) {
   nassertr(!(pos.is_nan() || quat.is_nan() || scale.is_nan() || shear.is_nan()) , make_invalid());
   // Make a special-case check for the identity transform.
@@ -291,7 +363,7 @@ CPT(TransformState) TransformState::
 make_mat(const LMatrix4 &mat) {
   nassertr(!mat.is_nan(), make_invalid());
   // Make a special-case check for the identity matrix.
-  if (mat == LMatrix4::ident_mat()) {
+  if (mat.is_identity()) {
     return make_identity();
   }
 
@@ -301,7 +373,6 @@ make_mat(const LMatrix4 &mat) {
   return return_new(state);
 }
 
-
 ////////////////////////////////////////////////////////////////////
 //     Function: TransformState::make_pos_rotate_scale_shear2d
 //       Access: Published, Static
@@ -356,7 +427,7 @@ CPT(TransformState) TransformState::
 make_mat3(const LMatrix3 &mat) {
   nassertr(!mat.is_nan(), make_invalid());
   // Make a special-case check for the identity matrix.
-  if (mat == LMatrix3::ident_mat()) {
+  if (mat.is_identity()) {
     return make_identity();
   }
 
@@ -529,7 +600,7 @@ set_rotate2d(PN_stdfloat rotate) const {
     }
   }
 
-  return make_pos_rotate_scale_shear2d(get_pos2d(), rotate, get_scale2d(), 
+  return make_pos_rotate_scale_shear2d(get_pos2d(), rotate, get_scale2d(),
                                        get_shear2d());
 }
 
@@ -592,7 +663,7 @@ compose(const TransformState *other) const {
   if (other->is_identity()) {
     return this;
   }
- 
+
   // If either transform is invalid, the result is invalid.
   if (is_invalid()) {
     return this;
@@ -754,7 +825,7 @@ unref() const {
   // it and tries to ref it.
   ((TransformState *)this)->release_new();
   ((TransformState *)this)->remove_cache_pointers();
-  
+
   return false;
 }
 
@@ -821,7 +892,7 @@ validate_composition_cache() const {
 ////////////////////////////////////////////////////////////////////
 //     Function: TransformState::output
 //       Access: Published
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 void TransformState::
 output(ostream &out) const {
@@ -913,7 +984,7 @@ output(ostream &out) const {
 ////////////////////////////////////////////////////////////////////
 //     Function: TransformState::write
 //       Access: Published
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 void TransformState::
 write(ostream &out, int indent_level) const {
@@ -1037,7 +1108,7 @@ get_num_unused_states() {
 
       if (pgraph_cat.is_debug()) {
         pgraph_cat.debug()
-          << "Unused state: " << (void *)state << ":" 
+          << "Unused state: " << (void *)state << ":"
           << state->get_ref_count() << " =\n";
         state->write(pgraph_cat.debug(false), 2);
       }
@@ -1167,7 +1238,7 @@ garbage_collect() {
   }
   num_this_pass = min(num_this_pass, size);
   int stop_at_element = (_garbage_index + num_this_pass) % size;
-  
+
   int num_elements = 0;
   int si = _garbage_index;
   do {
@@ -1197,8 +1268,8 @@ garbage_collect() {
         state->cache_unref();
         delete state;
       }
-    }      
-    
+    }
+
     si = (si + 1) % size;
   } while (si != stop_at_element);
   _garbage_index = si;
@@ -1276,7 +1347,7 @@ list_cycles(ostream &out) {
         if (r_detect_reverse_cycles(state, state, 1, _last_cycle_detect, &cycle_desc)) {
           // This state begins a cycle.
           CompositionCycleDesc::iterator csi;
-          
+
           out << "\nReverse cycle detected of length " << cycle_desc.size() + 1 << ":\n"
               << "state ";
           for (csi = cycle_desc.begin(); csi != cycle_desc.end(); ++csi) {
@@ -1292,7 +1363,7 @@ list_cycles(ostream &out) {
           out << (void *)state << ":"
               << state->get_ref_count() << " =\n";
           state->write(out, 2);
-          
+
           cycle_desc.clear();
         }
       }
@@ -1355,7 +1426,7 @@ validate_states() {
     pgraph_cat.error()
       << "TransformState::_states cache is invalid!\n";
     return false;
-  }    
+  }
 
   int size = _states->get_size();
   int si = 0;
@@ -1376,13 +1447,11 @@ validate_states() {
       return false;
     }
     const TransformState *ssnext = _states->get_key(snext);
-    int c = ssi->compare_to(*ssnext);
-    int ci = ssnext->compare_to(*ssi);
-    if ((ci < 0) != (c > 0) ||
-        (ci > 0) != (c < 0) ||
-        (ci == 0) != (c == 0)) {
+    bool c = (*ssi) == (*ssnext);
+    bool ci = (*ssnext) == (*ssi);
+    if (c != ci) {
       pgraph_cat.error()
-        << "TransformState::compare_to() not defined properly!\n";
+        << "TransformState::operator == () not defined properly!\n";
       pgraph_cat.error(false)
         << "(a, b): " << c << "\n";
       pgraph_cat.error(false)
@@ -1415,6 +1484,18 @@ void TransformState::
 init_states() {
   _states = new States;
 
+  ConfigVariableBool uniquify_matrix
+  ("uniquify-matrix", true,
+   PRC_DESC("Set this true to look up arbitrary 4x4 transform matrices in "
+            "the cache, to ensure that two differently-computed transforms "
+            "that happen to encode the same matrix will be collapsed into "
+            "a single pointer.  Nowadays, with the transforms stored in a "
+            "hashtable, we're generally better off with this set true."));
+
+  // Store this at the beginning, so that we don't have to query this
+  // every time that the comparison operator is invoked.
+  _uniquify_matrix = uniquify_matrix;
+
   // TODO: we should have a global Panda mutex to allow us to safely
   // create _states_lock without a startup race condition.  For the
   // meantime, this is OK because we guarantee that this method is
@@ -1424,7 +1505,7 @@ init_states() {
   _cache_stats.init();
   nassertv(Thread::get_current_thread() == Thread::get_main_thread());
 }
-  
+
 ////////////////////////////////////////////////////////////////////
 //     Function: TransformState::return_new
 //       Access: Private, Static
@@ -1519,8 +1600,8 @@ do_compose(const TransformState *other) const {
   nassertr((_flags & F_is_invalid) == 0, this);
   nassertr((other->_flags & F_is_invalid) == 0, other);
 
-  if (compose_componentwise && 
-      has_uniform_scale() && 
+  if (compose_componentwise &&
+      has_uniform_scale() &&
       !has_nonzero_shear() && !other->has_nonzero_shear() &&
       ((components_given() && other->has_components()) ||
        (other->components_given() && has_components()))) {
@@ -1541,7 +1622,7 @@ do_compose(const TransformState *other) const {
 
       rotate += other->get_rotate2d();
       LVecBase2 new_scale = other->get_scale2d() * scale;
-      
+
       result = make_pos_rotate_scale2d(pos, rotate, new_scale);
 
     } else {
@@ -1549,14 +1630,14 @@ do_compose(const TransformState *other) const {
       LVecBase3 pos = get_pos();
       LQuaternion quat = get_norm_quat();
       PN_stdfloat scale = get_uniform_scale();
-      
+
       pos += quat.xform(other->get_pos()) * scale;
       quat = other->get_norm_quat() * quat;
       LVecBase3 new_scale = other->get_scale() * scale;
-      
+
       result = make_pos_quat_scale(pos, quat, new_scale);
     }
-      
+
 #ifndef NDEBUG
     if (paranoid_compose) {
       // Now verify against the matrix.
@@ -1653,7 +1734,7 @@ store_compose(const TransformState *other, const TransformState *result) {
     // to decrement it again later, when the composition entry is
     // removed from the cache.
     result->cache_ref();
-    
+
     // (If the result was just this again, we still store the
     // result, but we don't increment the reference count, since
     // that would be a self-referential leak.)
@@ -1730,7 +1811,7 @@ store_invert_compose(const TransformState *other, const TransformState *result)
     // to decrement it again later, when the composition entry is
     // removed from the cache.
     result->cache_ref();
-    
+
     // (If the result was just this again, we still store the
     // result, but we don't increment the reference count, since
     // that would be a self-referential leak.)
@@ -1751,8 +1832,8 @@ do_invert_compose(const TransformState *other) const {
   nassertr((_flags & F_is_invalid) == 0, this);
   nassertr((other->_flags & F_is_invalid) == 0, other);
 
-  if (compose_componentwise && 
-      has_uniform_scale() && 
+  if (compose_componentwise &&
+      has_uniform_scale() &&
       !has_nonzero_shear() && !other->has_nonzero_shear() &&
       ((components_given() && other->has_components()) ||
        (other->components_given() && has_components()))) {
@@ -1767,7 +1848,7 @@ do_invert_compose(const TransformState *other) const {
       PN_stdfloat rotate = get_rotate2d();
       LQuaternion quat = get_norm_quat();
       PN_stdfloat scale = get_uniform_scale();
-      
+
       // First, invert our own transform.
       if (scale == 0.0f) {
         ((TransformState *)this)->_flags |= F_is_singular | F_singular_known;
@@ -1779,7 +1860,7 @@ do_invert_compose(const TransformState *other) const {
       LVecBase3 mp = quat.xform(-LVecBase3(pos[0], pos[1], 0.0f));
       pos = LVecBase2(mp[0], mp[1]) * scale;
       LVecBase2 new_scale(scale, scale);
-      
+
       // Now compose the inverted transform with the other transform.
       if (!other->is_identity()) {
         LPoint3 op = quat.xform(other->get_pos());
@@ -1796,7 +1877,7 @@ do_invert_compose(const TransformState *other) const {
       LVecBase3 pos = get_pos();
       LQuaternion quat = get_norm_quat();
       PN_stdfloat scale = get_uniform_scale();
-      
+
       // First, invert our own transform.
       if (scale == 0.0f) {
         ((TransformState *)this)->_flags |= F_is_singular | F_singular_known;
@@ -1806,7 +1887,7 @@ do_invert_compose(const TransformState *other) const {
       quat.invert_in_place();
       pos = quat.xform(-pos) * scale;
       LVecBase3 new_scale(scale, scale, scale);
-      
+
       // Now compose the inverted transform with the other transform.
       if (!other->is_identity()) {
         pos += quat.xform(other->get_pos()) * scale;
@@ -1879,7 +1960,7 @@ do_invert_compose(const TransformState *other) const {
 void TransformState::
 detect_and_break_cycles() {
   PStatTimer timer(_transform_break_cycles_pcollector);
-  
+
   ++_last_cycle_detect;
   if (r_detect_cycles(this, this, 1, _last_cycle_detect, NULL)) {
     // Ok, we have a cycle.  This will be a leak unless we break the
@@ -1888,7 +1969,7 @@ detect_and_break_cycles() {
       pgraph_cat.debug()
         << "Breaking cycle involving " << (*this) << "\n";
     }
-    
+
     remove_cache_pointers();
   } else {
     ++_last_cycle_detect;
@@ -1897,7 +1978,7 @@ detect_and_break_cycles() {
         pgraph_cat.debug()
           << "Breaking cycle involving " << (*this) << "\n";
       }
-      
+
       remove_cache_pointers();
     }
   }
@@ -1936,7 +2017,7 @@ r_detect_cycles(const TransformState *start_state,
     if (current_state->_composition_cache.has_element(i)) {
       const TransformState *result = current_state->_composition_cache.get_data(i)._result;
       if (result != (const TransformState *)NULL) {
-        if (r_detect_cycles(start_state, result, length + 1, 
+        if (r_detect_cycles(start_state, result, length + 1,
                             this_seq, cycle_desc)) {
           // Cycle detected.
           if (cycle_desc != (CompositionCycleDesc *)NULL) {
@@ -2008,7 +2089,7 @@ r_detect_reverse_cycles(const TransformState *start_state,
 
         const TransformState *result = other->_composition_cache.get_data(oi)._result;
         if (result != (const TransformState *)NULL) {
-          if (r_detect_reverse_cycles(start_state, result, length + 1, 
+          if (r_detect_reverse_cycles(start_state, result, length + 1,
                                       this_seq, cycle_desc)) {
             // Cycle detected.
             if (cycle_desc != (CompositionCycleDesc *)NULL) {
@@ -2033,7 +2114,7 @@ r_detect_reverse_cycles(const TransformState *start_state,
 
         const TransformState *result = other->_invert_composition_cache.get_data(oi)._result;
         if (result != (const TransformState *)NULL) {
-          if (r_detect_reverse_cycles(start_state, result, length + 1, 
+          if (r_detect_reverse_cycles(start_state, result, length + 1,
                                       this_seq, cycle_desc)) {
             // Cycle detected.
             if (cycle_desc != (CompositionCycleDesc *)NULL) {
@@ -2065,7 +2146,7 @@ r_detect_reverse_cycles(const TransformState *start_state,
 void TransformState::
 release_new() {
   nassertv(_states_lock->debug_is_locked());
-   
+
   if (_saved_entry != -1) {
     //nassertv(_states->find(this) == _saved_entry);
     _saved_entry = _states->find(this);
@@ -2088,7 +2169,7 @@ release_new() {
 void TransformState::
 remove_cache_pointers() {
   nassertv(_states_lock->debug_is_locked());
-   
+
   // Fortunately, since we added CompositionCache records in pairs, we
   // know exactly the set of TransformState objects that have us in their
   // cache: it's the same set of TransformState objects that we have in
@@ -2150,11 +2231,11 @@ remove_cache_pointers() {
       if (oi != -1) {
         // Hold a copy of the other composition result, too.
         Composition ocomp = other->_composition_cache.get_data(oi);
-        
+
         other->_composition_cache.remove_element(oi);
         _cache_stats.add_total_size(-1);
         _cache_stats.inc_dels();
-        
+
         // It's finally safe to let our held pointers go away.  This may
         // have cascading effects as other TransformState objects are
         // destructed, but there will be no harm done if they destruct
@@ -2213,7 +2294,7 @@ do_calc_hash() {
   PStatTimer timer(_transform_hash_pcollector);
   _hash = 0;
 
-  static const int significant_flags = 
+  static const int significant_flags =
     (F_is_invalid | F_is_identity | F_components_given | F_hpr_given | F_is_2d);
 
   int flags = (_flags & significant_flags);
@@ -2222,7 +2303,7 @@ do_calc_hash() {
   if ((_flags & (F_is_invalid | F_is_identity)) == 0) {
     // Only bother to put the rest of the stuff in the hash if the
     // transform is not invalid or empty.
-    
+
     if ((_flags & F_components_given) != 0) {
       // If the transform was specified componentwise, hash it
       // componentwise.
@@ -2239,7 +2320,7 @@ do_calc_hash() {
 
     } else {
       // Otherwise, hash the matrix . . .
-      if (uniquify_matrix) {
+      if (_uniquify_matrix) {
         // . . . but only if the user thinks that's worthwhile.
         if ((_flags & F_mat_known) == 0) {
           // Calculate the matrix without doubly-locking.
@@ -2556,7 +2637,7 @@ change_this(TypedWritableReferenceCount *old_ptr, BamReader *manager) {
   // First, uniquify the pointer.
   TransformState *state = DCAST(TransformState, old_ptr);
   CPT(TransformState) pointer = return_unique(state);
-  
+
   // We have to cast the pointer back to non-const, because the bam
   // reader expects that.
   return (TransformState *)pointer.p();
diff --git a/panda/src/pgraph/transformState.h b/panda/src/pgraph/transformState.h
index e6e3223cb9..dac1f87da0 100644
--- a/panda/src/pgraph/transformState.h
+++ b/panda/src/pgraph/transformState.h
@@ -59,7 +59,7 @@ class FactoryParams;
 //               instead of modifying a TransformState object, create a
 //               new one.
 ////////////////////////////////////////////////////////////////////
-class EXPCL_PANDA_PGRAPH TransformState : public NodeCachedReferenceCount {
+class EXPCL_PANDA_PGRAPH TransformState FINAL : public NodeCachedReferenceCount {
 protected:
   TransformState();
 
@@ -72,9 +72,10 @@ public:
   ALLOC_DELETED_CHAIN(TransformState);
 
 PUBLISHED:
-  INLINE bool operator < (const TransformState &other) const;
+  INLINE bool operator != (const TransformState &other) const;
   INLINE int compare_to(const TransformState &other) const;
   int compare_to(const TransformState &other, bool uniquify_matrix) const;
+  bool operator == (const TransformState &other) const;
   INLINE size_t get_hash() const;
 
   static CPT(TransformState) make_identity();
@@ -88,17 +89,17 @@ PUBLISHED:
   INLINE static CPT(TransformState) make_scale(const LVecBase3 &scale);
   INLINE static CPT(TransformState) make_shear(const LVecBase3 &shear);
   INLINE static CPT(TransformState) make_pos_hpr_scale(const LVecBase3 &pos,
-                                                       const LVecBase3 &hpr, 
+                                                       const LVecBase3 &hpr,
                                                        const LVecBase3 &scale);
   INLINE static CPT(TransformState) make_pos_quat_scale(const LVecBase3 &pos,
-                                                        const LQuaternion &quat, 
+                                                        const LQuaternion &quat,
                                                         const LVecBase3 &scale);
   static CPT(TransformState) make_pos_hpr_scale_shear(const LVecBase3 &pos,
-                                                      const LVecBase3 &hpr, 
+                                                      const LVecBase3 &hpr,
                                                       const LVecBase3 &scale,
                                                       const LVecBase3 &shear);
   static CPT(TransformState) make_pos_quat_scale_shear(const LVecBase3 &pos,
-                                                       const LQuaternion &quat, 
+                                                       const LQuaternion &quat,
                                                        const LVecBase3 &scale,
                                                        const LVecBase3 &shear);
   static CPT(TransformState) make_mat(const LMatrix4 &mat);
@@ -112,7 +113,7 @@ PUBLISHED:
   INLINE static CPT(TransformState) make_scale2d(const LVecBase2 &scale);
   INLINE static CPT(TransformState) make_shear2d(PN_stdfloat shear);
   INLINE static CPT(TransformState) make_pos_rotate_scale2d(const LVecBase2 &pos,
-                                                            PN_stdfloat rotate, 
+                                                            PN_stdfloat rotate,
                                                             const LVecBase2 &scale);
   static CPT(TransformState) make_pos_rotate_scale_shear2d(const LVecBase2 &pos,
                                                            PN_stdfloat rotate,
@@ -257,7 +258,7 @@ private:
   static LightReMutex *_states_lock;
   class Empty {
   };
-  typedef SimpleHashMap<const TransformState *, Empty, indirect_compare_to_hash<const TransformState *> > States;
+  typedef SimpleHashMap<const TransformState *, Empty, indirect_equals_hash<const TransformState *> > States;
   static States *_states;
   static CPT(TransformState) _identity_state;
   static CPT(TransformState) _invalid_state;
@@ -272,7 +273,7 @@ private:
   // remove the entry if *either* of the input TransformStates destructs.
   // To implement this, we always record Composition entries in pairs,
   // one in each of the two involved TransformState objects.
-    
+
   // The first element of the map is the object we compose with.  This
   // is not reference counted within this map; instead we store a
   // companion pointer in the other object, and remove the references
@@ -299,6 +300,8 @@ private:
   // collection cycle.
   static int _garbage_index;
 
+  static bool _uniquify_matrix;
+
   static PStatCollector _cache_update_pcollector;
   static PStatCollector _garbage_collect_pcollector;
   static PStatCollector _transform_compose_pcollector;
@@ -369,7 +372,7 @@ private:
   LMatrix4 _mat;
   LMatrix4 *_inv_mat;
   size_t _hash;
-  
+
   unsigned int _flags;
 
   // This mutex protects _flags, and all of the above computed values.
@@ -385,7 +388,7 @@ public:
 protected:
   static TypedWritable *make_from_bam(const FactoryParams &params);
   void fillin(DatagramIterator &scan, BamReader *manager);
-  
+
 public:
   static TypeHandle get_class_type() {
     return _type_handle;
diff --git a/panda/src/pgraph/transformState_ext.cxx b/panda/src/pgraph/transformState_ext.cxx
index c66fd87943..a657df7fae 100644
--- a/panda/src/pgraph/transformState_ext.cxx
+++ b/panda/src/pgraph/transformState_ext.cxx
@@ -32,7 +32,7 @@
 ////////////////////////////////////////////////////////////////////
 PyObject *Extension<TransformState>::
 get_composition_cache() const {
-  IMPORT_THIS struct Dtool_PyTypedObject Dtool_TransformState;
+  extern struct Dtool_PyTypedObject Dtool_TransformState;
   LightReMutexHolder holder(*_this->_states_lock);
 
   size_t num_states = _this->_composition_cache.get_num_entries();
@@ -94,7 +94,7 @@ get_composition_cache() const {
 ////////////////////////////////////////////////////////////////////
 PyObject *Extension<TransformState>::
 get_invert_composition_cache() const {
-  IMPORT_THIS struct Dtool_PyTypedObject Dtool_TransformState;
+  extern struct Dtool_PyTypedObject Dtool_TransformState;
   LightReMutexHolder holder(*_this->_states_lock);
 
   size_t num_states = _this->_invert_composition_cache.get_num_entries();
@@ -149,7 +149,7 @@ get_invert_composition_cache() const {
 ////////////////////////////////////////////////////////////////////
 PyObject *Extension<TransformState>::
 get_states() {
-  IMPORT_THIS struct Dtool_PyTypedObject Dtool_TransformState;
+  extern struct Dtool_PyTypedObject Dtool_TransformState;
   if (TransformState::_states == (TransformState::States *)NULL) {
     return PyList_New(0);
   }
@@ -186,7 +186,7 @@ get_states() {
 ////////////////////////////////////////////////////////////////////
 PyObject *Extension<TransformState>::
 get_unused_states() {
-  IMPORT_THIS struct Dtool_PyTypedObject Dtool_TransformState;
+  extern struct Dtool_PyTypedObject Dtool_TransformState;
   if (TransformState::_states == (TransformState::States *)NULL) {
     return PyList_New(0);
   }
diff --git a/panda/src/pgraphnodes/callbackNode.cxx b/panda/src/pgraphnodes/callbackNode.cxx
index 19c959f09f..03405835b0 100644
--- a/panda/src/pgraphnodes/callbackNode.cxx
+++ b/panda/src/pgraphnodes/callbackNode.cxx
@@ -149,7 +149,7 @@ void CallbackNode::
 add_for_draw(CullTraverser *trav, CullTraverserData &data) {
   if (pgraph_cat.is_spam()) {
     pgraph_cat.spam()
-      << "Found " << *this << " in state " << *data._state 
+      << "Found " << *this << " in state " << *data._state
       << " draw_mask = " << data._draw_mask << "\n";
   }
 
@@ -158,11 +158,9 @@ add_for_draw(CullTraverser *trav, CullTraverserData &data) {
   // pass any Geoms, however.
   CallbackObject *cbobj = get_draw_callback();
   if (cbobj != (CallbackObject *)NULL) {
-    CullableObject *object = 
+    CullableObject *object =
       new CullableObject(NULL, data._state,
-                         data.get_net_transform(trav),
-                         data.get_modelview_transform(trav),
-                         trav->get_scene());
+                         data.get_internal_transform(trav));
     object->set_draw_callback(cbobj);
     trav->get_cull_handler()->record_object(object, trav);
   }
diff --git a/panda/src/pgraphnodes/computeNode.I b/panda/src/pgraphnodes/computeNode.I
index 726193e8b1..156657be3c 100644
--- a/panda/src/pgraphnodes/computeNode.I
+++ b/panda/src/pgraphnodes/computeNode.I
@@ -73,7 +73,7 @@ get_num_dispatches() const {
 INLINE const LVecBase3i &ComputeNode::
 get_dispatch(int n) const {
   Dispatcher::CDReader cdata(_dispatcher->_cycler);
-  nassertr(n >= 0 && n < cdata->_dispatches.size(), LVecBase3i::zero());
+  nassertr(n >= 0 && (size_t)n < cdata->_dispatches.size(), LVecBase3i::zero());
   return cdata->_dispatches[n];
 }
 
diff --git a/panda/src/pgraphnodes/computeNode.cxx b/panda/src/pgraphnodes/computeNode.cxx
index bae35b0e85..fd733e62e8 100644
--- a/panda/src/pgraphnodes/computeNode.cxx
+++ b/panda/src/pgraphnodes/computeNode.cxx
@@ -105,7 +105,7 @@ void ComputeNode::
 add_for_draw(CullTraverser *trav, CullTraverserData &data) {
   if (pgraph_cat.is_spam()) {
     pgraph_cat.spam()
-      << "Found " << *this << " in state " << *data._state 
+      << "Found " << *this << " in state " << *data._state
       << " draw_mask = " << data._draw_mask << "\n";
   }
 
@@ -114,9 +114,7 @@ add_for_draw(CullTraverser *trav, CullTraverserData &data) {
   // any Geoms, however.
   CullableObject *object =
     new CullableObject(NULL, data._state,
-                         data.get_net_transform(trav),
-                         data.get_modelview_transform(trav),
-                         trav->get_scene());
+                       data.get_internal_transform(trav));
   object->set_draw_callback(_dispatcher);
   trav->get_cull_handler()->record_object(object, trav);
 }
diff --git a/panda/src/pgraphnodes/directionalLight.I b/panda/src/pgraphnodes/directionalLight.I
index cee022bbcd..06bc1f5fc6 100644
--- a/panda/src/pgraphnodes/directionalLight.I
+++ b/panda/src/pgraphnodes/directionalLight.I
@@ -41,7 +41,7 @@ CData(const DirectionalLight::CData &copy) :
 
 ////////////////////////////////////////////////////////////////////
 //     Function: DirectionalLight::get_specular_color
-//       Access: Public
+//       Access: Public, Final
 //  Description: Returns the color of specular highlights generated by
 //               the light.
 ////////////////////////////////////////////////////////////////////
diff --git a/panda/src/pgraphnodes/directionalLight.h b/panda/src/pgraphnodes/directionalLight.h
index 9a13cfaf98..2a7978bfbb 100644
--- a/panda/src/pgraphnodes/directionalLight.h
+++ b/panda/src/pgraphnodes/directionalLight.h
@@ -37,21 +37,21 @@ public:
   virtual void write(ostream &out, int indent_level) const;
 
   virtual bool get_vector_to_light(LVector3 &result,
-                                   const LPoint3 &from_object_point, 
+                                   const LPoint3 &from_object_point,
                                    const LMatrix4 &to_object_space);
 
 PUBLISHED:
-  INLINE const LColor &get_specular_color() const;
+  INLINE const LColor &get_specular_color() const FINAL;
   INLINE void set_specular_color(const LColor &color);
-  
+
   INLINE const LPoint3 &get_point() const;
   INLINE void set_point(const LPoint3 &point);
-  
+
   INLINE const LVector3 &get_direction() const;
   INLINE void set_direction(const LVector3 &direction);
 
   virtual int get_class_priority() const;
-  
+
 public:
   virtual void bind(GraphicsStateGuardianBase *gsg, const NodePath &light,
                     int light_id);
diff --git a/panda/src/pgraphnodes/nodeCullCallbackData.cxx b/panda/src/pgraphnodes/nodeCullCallbackData.cxx
index f762650b04..d05b76babc 100644
--- a/panda/src/pgraphnodes/nodeCullCallbackData.cxx
+++ b/panda/src/pgraphnodes/nodeCullCallbackData.cxx
@@ -55,11 +55,9 @@ upcall() {
     // to pass any Geoms, however.
     CallbackObject *cbobj = cbnode->get_draw_callback();
     if (cbobj != (CallbackObject *)NULL) {
-      CullableObject *object = 
+      CullableObject *object =
         new CullableObject(NULL, _data._state,
-                           _data.get_net_transform(_trav),
-                           _data.get_modelview_transform(_trav),
-                           _trav->get_scene());
+                           _data.get_internal_transform(_trav));
       object->set_draw_callback(cbobj);
       _trav->get_cull_handler()->record_object(object, _trav);
     }
diff --git a/panda/src/pgraphnodes/pointLight.I b/panda/src/pgraphnodes/pointLight.I
index deb1cabbfe..49410a51a9 100644
--- a/panda/src/pgraphnodes/pointLight.I
+++ b/panda/src/pgraphnodes/pointLight.I
@@ -41,7 +41,7 @@ CData(const PointLight::CData &copy) :
 
 ////////////////////////////////////////////////////////////////////
 //     Function: PointLight::get_specular_color
-//       Access: Public
+//       Access: Public, Final
 //  Description: Returns the color of specular highlights generated by
 //               the light.
 ////////////////////////////////////////////////////////////////////
@@ -65,7 +65,7 @@ set_specular_color(const LColor &color) {
 
 ////////////////////////////////////////////////////////////////////
 //     Function: PointLight::get_attenuation
-//       Access: Public
+//       Access: Public, Final
 //  Description: Returns the terms of the attenuation equation for the
 //               light.  These are, in order, the constant, linear,
 //               and quadratic terms based on the distance from the
diff --git a/panda/src/pgraphnodes/pointLight.h b/panda/src/pgraphnodes/pointLight.h
index 64c71e494e..6427ff6ddc 100644
--- a/panda/src/pgraphnodes/pointLight.h
+++ b/panda/src/pgraphnodes/pointLight.h
@@ -37,21 +37,21 @@ public:
   virtual void write(ostream &out, int indent_level) const;
 
   virtual bool get_vector_to_light(LVector3 &result,
-                                   const LPoint3 &from_object_point, 
+                                   const LPoint3 &from_object_point,
                                    const LMatrix4 &to_object_space);
 
 PUBLISHED:
-  INLINE const LColor &get_specular_color() const;
+  INLINE const LColor &get_specular_color() const FINAL;
   INLINE void set_specular_color(const LColor &color);
-  
-  INLINE const LVecBase3 &get_attenuation() const;
+
+  INLINE const LVecBase3 &get_attenuation() const FINAL;
   INLINE void set_attenuation(const LVecBase3 &attenuation);
-  
+
   INLINE const LPoint3 &get_point() const;
   INLINE void set_point(const LPoint3 &point);
 
   virtual int get_class_priority() const;
-  
+
 public:
   virtual void bind(GraphicsStateGuardianBase *gsg, const NodePath &light,
                     int light_id);
diff --git a/panda/src/pgraphnodes/shaderGenerator.cxx b/panda/src/pgraphnodes/shaderGenerator.cxx
index 7e8dc54040..9e76063177 100644
--- a/panda/src/pgraphnodes/shaderGenerator.cxx
+++ b/panda/src/pgraphnodes/shaderGenerator.cxx
@@ -53,8 +53,8 @@ TypeHandle ShaderGenerator::_type_handle;
 //               which the shader generator belongs.
 ////////////////////////////////////////////////////////////////////
 ShaderGenerator::
-ShaderGenerator(PT(GraphicsStateGuardianBase) gsg, PT(GraphicsOutputBase) host) :
-  _gsg (gsg), _host (host) {
+ShaderGenerator(GraphicsStateGuardianBase *gsg, GraphicsOutputBase *host) :
+  _gsg(gsg), _host(host) {
 }
 
 ////////////////////////////////////////////////////////////////////
@@ -86,35 +86,35 @@ reset_register_allocator() {
 //       Access: Protected
 //  Description: Allocate a vreg.
 ////////////////////////////////////////////////////////////////////
-INLINE char *ShaderGenerator::
+const char *ShaderGenerator::
 alloc_vreg() {
   switch (_vtregs_used) {
-  case  0: _vtregs_used += 1; return (char*)"TEXCOORD0";
-  case  1: _vtregs_used += 1; return (char*)"TEXCOORD1";
-  case  2: _vtregs_used += 1; return (char*)"TEXCOORD2";
-  case  3: _vtregs_used += 1; return (char*)"TEXCOORD3";
-  case  4: _vtregs_used += 1; return (char*)"TEXCOORD4";
-  case  5: _vtregs_used += 1; return (char*)"TEXCOORD5";
-  case  6: _vtregs_used += 1; return (char*)"TEXCOORD6";
-  case  7: _vtregs_used += 1; return (char*)"TEXCOORD7";
+  case  0: _vtregs_used += 1; return "TEXCOORD0";
+  case  1: _vtregs_used += 1; return "TEXCOORD1";
+  case  2: _vtregs_used += 1; return "TEXCOORD2";
+  case  3: _vtregs_used += 1; return "TEXCOORD3";
+  case  4: _vtregs_used += 1; return "TEXCOORD4";
+  case  5: _vtregs_used += 1; return "TEXCOORD5";
+  case  6: _vtregs_used += 1; return "TEXCOORD6";
+  case  7: _vtregs_used += 1; return "TEXCOORD7";
   }
   switch (_vcregs_used) {
-  case  0: _vcregs_used += 1; return (char*)"COLOR0";
-  case  1: _vcregs_used += 1; return (char*)"COLOR1";
+  case  0: _vcregs_used += 1; return "COLOR0";
+  case  1: _vcregs_used += 1; return "COLOR1";
   }
   // These don't exist in arbvp1, though they're reportedly
   // supported by other profiles.
   switch (_vtregs_used) {
-  case  8: _vtregs_used += 1; return (char*)"TEXCOORD8";
-  case  9: _vtregs_used += 1; return (char*)"TEXCOORD9";
-  case 10: _vtregs_used += 1; return (char*)"TEXCOORD10";
-  case 11: _vtregs_used += 1; return (char*)"TEXCOORD11";
-  case 12: _vtregs_used += 1; return (char*)"TEXCOORD12";
-  case 13: _vtregs_used += 1; return (char*)"TEXCOORD13";
-  case 14: _vtregs_used += 1; return (char*)"TEXCOORD14";
-  case 15: _vtregs_used += 1; return (char*)"TEXCOORD15";
+  case  8: _vtregs_used += 1; return "TEXCOORD8";
+  case  9: _vtregs_used += 1; return "TEXCOORD9";
+  case 10: _vtregs_used += 1; return "TEXCOORD10";
+  case 11: _vtregs_used += 1; return "TEXCOORD11";
+  case 12: _vtregs_used += 1; return "TEXCOORD12";
+  case 13: _vtregs_used += 1; return "TEXCOORD13";
+  case 14: _vtregs_used += 1; return "TEXCOORD14";
+  case 15: _vtregs_used += 1; return "TEXCOORD15";
   }
-  return (char*)"UNKNOWN";
+  return "UNKNOWN";
 }
 
 ////////////////////////////////////////////////////////////////////
@@ -122,37 +122,37 @@ alloc_vreg() {
 //       Access: Protected
 //  Description: Allocate a freg.
 ////////////////////////////////////////////////////////////////////
-INLINE char *ShaderGenerator::
+const char *ShaderGenerator::
 alloc_freg() {
   switch (_ftregs_used) {
-  case  0: _ftregs_used += 1; return (char*)"TEXCOORD0";
-  case  1: _ftregs_used += 1; return (char*)"TEXCOORD1";
-  case  2: _ftregs_used += 1; return (char*)"TEXCOORD2";
-  case  3: _ftregs_used += 1; return (char*)"TEXCOORD3";
-  case  4: _ftregs_used += 1; return (char*)"TEXCOORD4";
-  case  5: _ftregs_used += 1; return (char*)"TEXCOORD5";
-  case  6: _ftregs_used += 1; return (char*)"TEXCOORD6";
-  case  7: _ftregs_used += 1; return (char*)"TEXCOORD7";
+  case  0: _ftregs_used += 1; return "TEXCOORD0";
+  case  1: _ftregs_used += 1; return "TEXCOORD1";
+  case  2: _ftregs_used += 1; return "TEXCOORD2";
+  case  3: _ftregs_used += 1; return "TEXCOORD3";
+  case  4: _ftregs_used += 1; return "TEXCOORD4";
+  case  5: _ftregs_used += 1; return "TEXCOORD5";
+  case  6: _ftregs_used += 1; return "TEXCOORD6";
+  case  7: _ftregs_used += 1; return "TEXCOORD7";
   }
   // We really shouldn't rely on COLOR fregs,
   // since the clamping can have unexpected side-effects.
   //switch (_fcregs_used) {
-  //case  0: _fcregs_used += 1; return (char*)"COLOR0";
-  //case  1: _fcregs_used += 1; return (char*)"COLOR1";
+  //case  0: _fcregs_used += 1; return "COLOR0";
+  //case  1: _fcregs_used += 1; return "COLOR1";
   //}
   // These don't exist in arbvp1/arbfp1, though they're
   // reportedly supported by other profiles.
   switch (_ftregs_used) {
-  case  8: _ftregs_used += 1; return (char*)"TEXCOORD8";
-  case  9: _ftregs_used += 1; return (char*)"TEXCOORD9";
-  case 10: _ftregs_used += 1; return (char*)"TEXCOORD10";
-  case 11: _ftregs_used += 1; return (char*)"TEXCOORD11";
-  case 12: _ftregs_used += 1; return (char*)"TEXCOORD12";
-  case 13: _ftregs_used += 1; return (char*)"TEXCOORD13";
-  case 14: _ftregs_used += 1; return (char*)"TEXCOORD14";
-  case 15: _ftregs_used += 1; return (char*)"TEXCOORD15";
+  case  8: _ftregs_used += 1; return "TEXCOORD8";
+  case  9: _ftregs_used += 1; return "TEXCOORD9";
+  case 10: _ftregs_used += 1; return "TEXCOORD10";
+  case 11: _ftregs_used += 1; return "TEXCOORD11";
+  case 12: _ftregs_used += 1; return "TEXCOORD12";
+  case 13: _ftregs_used += 1; return "TEXCOORD13";
+  case 14: _ftregs_used += 1; return "TEXCOORD14";
+  case 15: _ftregs_used += 1; return "TEXCOORD15";
   }
-  return (char*)"UNKNOWN";
+  return "UNKNOWN";
 }
 
 ////////////////////////////////////////////////////////////////////
@@ -509,7 +509,7 @@ clear_analysis() {
 ////////////////////////////////////////////////////////////////////
 CPT(RenderAttrib) ShaderGenerator::
 create_shader_attrib(const string &txt) {
-  PT(Shader) shader = Shader::make(txt);
+  PT(Shader) shader = Shader::make(txt, Shader::SL_Cg);
   CPT(RenderAttrib) shattr = ShaderAttrib::make();
   shattr = DCAST(ShaderAttrib, shattr)->set_shader(shader);
   if (_lighting) {
@@ -566,7 +566,7 @@ update_shadow_buffer(NodePath light_np) {
   }
 
   // See if we already have a buffer. If not, create one.
-  PT(Texture) tex;
+  Texture *tex;
   if (light->_sbuffers.count(_gsg) == 0) {
     // Nope, the light doesn't have a buffer for our GSG. Make one.
     tex = _gsg->make_shadow_buffer(light_np, _host);
@@ -612,7 +612,7 @@ update_shadow_buffer(NodePath light_np) {
 //               - omit attenuation calculations if attenuation off
 //
 ////////////////////////////////////////////////////////////////////
-CPT(RenderAttrib) ShaderGenerator::
+CPT(ShaderAttrib) ShaderGenerator::
 synthesize_shader(const RenderState *rs) {
   analyze_renderstate(rs);
   reset_register_allocator();
@@ -624,18 +624,18 @@ synthesize_shader(const RenderState *rs) {
 
   // These variables will hold the results of register allocation.
 
-  char *tangent_freg = 0;
-  char *binormal_freg = 0;
+  const char *tangent_freg = 0;
+  const char *binormal_freg = 0;
   string tangent_input;
   string binormal_input;
-  pmap<const InternalName *, char *> texcoord_fregs;
-  pvector<char *> dlightcoord_fregs;
-  pvector<char *> slightcoord_fregs;
-  char *world_position_freg = 0;
-  char *world_normal_freg = 0;
-  char *eye_position_freg = 0;
-  char *eye_normal_freg = 0;
-  char *hpos_freg = 0;
+  pmap<const InternalName *, const char *> texcoord_fregs;
+  pvector<const char *> dlightcoord_fregs;
+  pvector<const char *> slightcoord_fregs;
+  const char *world_position_freg = 0;
+  const char *world_normal_freg = 0;
+  const char *eye_position_freg = 0;
+  const char *eye_normal_freg = 0;
+  const char *hpos_freg = 0;
 
   if (_vertex_colors) {
     // Reserve COLOR0
@@ -662,7 +662,7 @@ synthesize_shader(const RenderState *rs) {
       const InternalName *texcoord_name = stage->get_texcoord_name();
 
       if (texcoord_fregs.count(texcoord_name) == 0) {
-        char *freg = alloc_freg();
+        const char *freg = alloc_freg();
         string tcname = texcoord_name->join("_");
         texcoord_fregs[texcoord_name] = freg;
 
@@ -774,7 +774,7 @@ synthesize_shader(const RenderState *rs) {
     text << "\t l_eye_normal.xyz = mul((float3x3)tpose_view_to_model, vtx_normal);\n";
     text << "\t l_eye_normal.w = 0;\n";
   }
-  pmap<const InternalName *, char *>::const_iterator it;
+  pmap<const InternalName *, const char *>::const_iterator it;
   for (it = texcoord_fregs.begin(); it != texcoord_fregs.end(); ++it) {
     // Pass through all texcoord inputs as-is.
     string tcname = it->first->join("_");
@@ -1462,7 +1462,7 @@ synthesize_shader(const RenderState *rs) {
   }
   clear_analysis();
   reset_register_allocator();
-  return shattr;
+  return DCAST(ShaderAttrib, shattr);
 }
 
 ////////////////////////////////////////////////////////////////////
@@ -1636,4 +1636,3 @@ texture_type_as_string(Texture::TextureType ttype) {
       return "2D";
   }
 }
-
diff --git a/panda/src/pgraphnodes/shaderGenerator.h b/panda/src/pgraphnodes/shaderGenerator.h
index d08a3976a8..9a4aa05857 100644
--- a/panda/src/pgraphnodes/shaderGenerator.h
+++ b/panda/src/pgraphnodes/shaderGenerator.h
@@ -63,12 +63,11 @@ class LightAttrib;
 //               Thanks to them!
 //
 ////////////////////////////////////////////////////////////////////
-
-class EXPCL_PANDA_PGRAPHNODES ShaderGenerator : public TypedObject {
+class EXPCL_PANDA_PGRAPHNODES ShaderGenerator : public TypedReferenceCount {
 PUBLISHED:
-  ShaderGenerator(PT(GraphicsStateGuardianBase) gsg, PT(GraphicsOutputBase) host);
+  ShaderGenerator(GraphicsStateGuardianBase *gsg, GraphicsOutputBase *host);
   virtual ~ShaderGenerator();
-  virtual CPT(RenderAttrib) synthesize_shader(const RenderState *rs);
+  virtual CPT(ShaderAttrib) synthesize_shader(const RenderState *rs);
 
 protected:
   CPT(RenderAttrib) create_shader_attrib(const string &txt);
@@ -86,8 +85,8 @@ protected:
   int _vtregs_used;
   int _ftregs_used;
   void reset_register_allocator();
-  char *alloc_vreg();
-  char *alloc_freg();
+  const char *alloc_vreg();
+  const char *alloc_freg();
 
   // RenderState analysis information.  Created by analyze_renderstate:
 
@@ -152,9 +151,9 @@ protected:
   void analyze_renderstate(const RenderState *rs);
   void clear_analysis();
 
-  PT(GraphicsStateGuardianBase) _gsg;
-  PT(GraphicsOutputBase) _host;
-  pmap<WCPT(RenderState), CPT(ShaderAttrib)> _generated_shaders;
+  // This is not a PT() to prevent a circular reference.
+  GraphicsStateGuardianBase *_gsg;
+  GraphicsOutputBase *_host;
 
 public:
   static TypeHandle get_class_type() {
@@ -177,4 +176,3 @@ public:
 #include "shaderGenerator.I"
 
 #endif  // SHADERGENERATOR_H
-
diff --git a/panda/src/pgraphnodes/spotlight.I b/panda/src/pgraphnodes/spotlight.I
index 3696f9be5d..8a81751ea6 100644
--- a/panda/src/pgraphnodes/spotlight.I
+++ b/panda/src/pgraphnodes/spotlight.I
@@ -41,7 +41,7 @@ CData(const Spotlight::CData &copy) :
 
 ////////////////////////////////////////////////////////////////////
 //     Function: Spotlight::get_exponent
-//       Access: Public
+//       Access: Public, Final
 //  Description: Returns the exponent that controls the amount of
 //               light falloff from the center of the spotlight.  See
 //               set_exponent().
@@ -71,7 +71,7 @@ set_exponent(PN_stdfloat exponent) {
 
 ////////////////////////////////////////////////////////////////////
 //     Function: Spotlight::get_specular_color
-//       Access: Public
+//       Access: Public, Final
 //  Description: Returns the color of specular highlights generated by
 //               the light.
 ////////////////////////////////////////////////////////////////////
@@ -95,7 +95,7 @@ set_specular_color(const LColor &color) {
 
 ////////////////////////////////////////////////////////////////////
 //     Function: Spotlight::get_attenuation
-//       Access: Public
+//       Access: Public, Final
 //  Description: Returns the terms of the attenuation equation for the
 //               light.  These are, in order, the constant, linear,
 //               and quadratic terms based on the distance from the
diff --git a/panda/src/pgraphnodes/spotlight.h b/panda/src/pgraphnodes/spotlight.h
index 0cc9b65509..62ffb5f914 100644
--- a/panda/src/pgraphnodes/spotlight.h
+++ b/panda/src/pgraphnodes/spotlight.h
@@ -47,24 +47,24 @@ public:
   virtual void write(ostream &out, int indent_level) const;
 
   virtual bool get_vector_to_light(LVector3 &result,
-                                   const LPoint3 &from_object_point, 
+                                   const LPoint3 &from_object_point,
                                    const LMatrix4 &to_object_space);
 
 PUBLISHED:
-  INLINE PN_stdfloat get_exponent() const;
+  INLINE PN_stdfloat get_exponent() const FINAL;
   INLINE void set_exponent(PN_stdfloat exponent);
-  
-  INLINE const LColor &get_specular_color() const;
+
+  INLINE const LColor &get_specular_color() const FINAL;
   INLINE void set_specular_color(const LColor &color);
-  
-  INLINE const LVecBase3 &get_attenuation() const;
+
+  INLINE const LVecBase3 &get_attenuation() const FINAL;
   INLINE void set_attenuation(const LVecBase3 &attenuation);
 
   virtual int get_class_priority() const;
 
   static PT(Texture) make_spot(int pixel_width, PN_stdfloat full_radius,
                                LColor &fg, LColor &bg);
-  
+
 public:
   virtual void bind(GraphicsStateGuardianBase *gsg, const NodePath &light,
                     int light_id);
diff --git a/panda/src/pgui/pgItem.cxx b/panda/src/pgui/pgItem.cxx
index 8c356618c1..e8832e72fa 100644
--- a/panda/src/pgui/pgItem.cxx
+++ b/panda/src/pgui/pgItem.cxx
@@ -209,7 +209,7 @@ draw_mask_changed() {
 bool PGItem::
 cull_callback(CullTraverser *trav, CullTraverserData &data) {
   LightReMutexHolder holder(_lock);
-  bool this_node_hidden = data.is_this_node_hidden(trav);
+  bool this_node_hidden = data.is_this_node_hidden(trav->get_camera_mask());
   if (!this_node_hidden && has_frame() && get_active()) {
     // The item has a frame, so we want to generate a region for it
     // and update the MouseWatcher.
diff --git a/panda/src/pgui/pgSliderBar.cxx b/panda/src/pgui/pgSliderBar.cxx
index a6ef1e9963..53fed5253b 100755
--- a/panda/src/pgui/pgSliderBar.cxx
+++ b/panda/src/pgui/pgSliderBar.cxx
@@ -717,7 +717,7 @@ reposition() {
   _needs_reposition = false;
 
   PN_stdfloat t = get_ratio();
-  
+
   if (_thumb_button != (PGButton *)NULL) {
     LPoint3 pos = (t * _range_x) * _axis + _thumb_start;
     CPT(TransformState) transform = TransformState::make_pos(pos);
@@ -727,7 +727,7 @@ reposition() {
     // we'll get caught in an update loop.
     if (transform == orig_transform) {
       // No change.
-    } else if (*transform < *orig_transform || *orig_transform < *transform) {
+    } else if (*transform != *orig_transform) {
       _thumb_button->set_transform(transform);
     }
   }
diff --git a/panda/src/pipeline/threadDummyImpl.h b/panda/src/pipeline/threadDummyImpl.h
index 4084f2f181..689e6386e6 100644
--- a/panda/src/pipeline/threadDummyImpl.h
+++ b/panda/src/pipeline/threadDummyImpl.h
@@ -26,7 +26,9 @@
 class Thread;
 
 #ifdef WIN32
-#define WIN32_LEAN_AND_MEAN
+#ifndef WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN 1
+#endif
 #include <windows.h>  // For Sleep().
 #endif
 
diff --git a/panda/src/pipeline/threadSimpleManager.h b/panda/src/pipeline/threadSimpleManager.h
index e839ac2f5a..34314907f5 100644
--- a/panda/src/pipeline/threadSimpleManager.h
+++ b/panda/src/pipeline/threadSimpleManager.h
@@ -31,7 +31,9 @@
 #include <pthread.h>  // for pthread_t, below
 #endif
 #ifdef WIN32
-#define WIN32_LEAN_AND_MEAN
+#ifndef WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN 1
+#endif
 #include <windows.h>  // for DWORD, below
 #endif
 
diff --git a/panda/src/pnmimage/pfmFile_ext.cxx b/panda/src/pnmimage/pfmFile_ext.cxx
index c28ed79b57..29b5949f75 100644
--- a/panda/src/pnmimage/pfmFile_ext.cxx
+++ b/panda/src/pnmimage/pfmFile_ext.cxx
@@ -17,9 +17,9 @@
 #ifdef HAVE_PYTHON
 
 #ifndef CPPPARSER
-IMPORT_THIS struct Dtool_PyTypedObject Dtool_LPoint2f;
-IMPORT_THIS struct Dtool_PyTypedObject Dtool_LPoint3f;
-IMPORT_THIS struct Dtool_PyTypedObject Dtool_LPoint4f;
+extern struct Dtool_PyTypedObject Dtool_LPoint2f;
+extern struct Dtool_PyTypedObject Dtool_LPoint3f;
+extern struct Dtool_PyTypedObject Dtool_LPoint4f;
 #endif
 
 ////////////////////////////////////////////////////////////////////
diff --git a/panda/src/pnmimage/pnmImageHeader.h b/panda/src/pnmimage/pnmImageHeader.h
index 7ae5920a82..d5e6db3b9c 100644
--- a/panda/src/pnmimage/pnmImageHeader.h
+++ b/panda/src/pnmimage/pnmImageHeader.h
@@ -106,7 +106,7 @@ PUBLISHED:
   // Contains a single pixel specification used in compute_histogram()
   // and make_histogram().  Note that pixels are stored by integer
   // value, not by floating-point scaled value.
-  class PixelSpec {
+  class EXPCL_PANDA_PNMIMAGE PixelSpec {
   PUBLISHED:
     INLINE PixelSpec(xelval gray_value);
     INLINE PixelSpec(xelval gray_value, xelval alpha);
@@ -143,7 +143,7 @@ PUBLISHED:
 
   // Associates a pixel specification with an appearance count, for
   // use in Histogram, below.
-  class PixelSpecCount {
+  class EXPCL_PANDA_PNMIMAGE PixelSpecCount {
   public:
     INLINE PixelSpecCount(const PixelSpec &pixel, int count);
     INLINE bool operator < (const PixelSpecCount &other) const;
@@ -157,7 +157,7 @@ PUBLISHED:
   typedef pvector<PixelSpec> Palette;
 
   // Used to return a pixel histogram in PNMImage::get_histogram().
-  class Histogram {
+  class EXPCL_PANDA_PNMIMAGE Histogram {
   PUBLISHED:
     INLINE Histogram();
 
diff --git a/panda/src/pnmimagetypes/pnmFileTypeJPG.h b/panda/src/pnmimagetypes/pnmFileTypeJPG.h
index 8dfa27af9f..936e349568 100644
--- a/panda/src/pnmimagetypes/pnmFileTypeJPG.h
+++ b/panda/src/pnmimagetypes/pnmFileTypeJPG.h
@@ -24,7 +24,9 @@
 #include "pnmWriter.h"
 
 #if defined(_WIN32)
-#define WIN32_LEAN_AND_MEAN
+#ifndef WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN 1
+#endif
 #include <windows.h>  // we need to include this before jpeglib.
 #endif
 
diff --git a/panda/src/pnmimagetypes/pnmFileTypePNM.cxx b/panda/src/pnmimagetypes/pnmFileTypePNM.cxx
index 45f1888371..8a080fc953 100644
--- a/panda/src/pnmimagetypes/pnmFileTypePNM.cxx
+++ b/panda/src/pnmimagetypes/pnmFileTypePNM.cxx
@@ -136,8 +136,8 @@ pm_allocarray(int const cols, int const rows, int const size )  {
     /* We couldn't get the whole heap in one block, so try fragmented
        format.
     */
-    unsigned int row;
-        
+    int row;
+
     rowIndex[rows] = NULL;   /* Declare it fragmented format */
 
     for (row = 0; row < rows; ++row) {
@@ -149,7 +149,7 @@ pm_allocarray(int const cols, int const rows, int const size )  {
     }
   } else {
     /* It's unfragmented format */
-    unsigned int row;
+    int row;
     rowIndex[rows] = rowheap;  /* Declare it unfragmented format */
 
     for (row = 0; row < rows; ++row)
@@ -159,17 +159,18 @@ pm_allocarray(int const cols, int const rows, int const size )  {
 }
 
 void
-pm_freearray(char ** const rowIndex, 
+pm_freearray(char ** const rowIndex,
              int     const rows) {
 
   void * const rowheap = rowIndex[rows];
 
-  if (rowheap != NULL)
+  if (rowheap != NULL) {
     PANDA_FREE_ARRAY(rowheap);
-  else {
-    unsigned int row;
-    for (row = 0; row < rows; ++row)
+  } else {
+    int row;
+    for (row = 0; row < rows; ++row) {
       pm_freerow(rowIndex[row]);
+    }
   }
   PANDA_FREE_ARRAY(rowIndex);
 }
@@ -191,7 +192,7 @@ pm_getuint(istream * const ifP) {
     -----------------------------------------------------------------------------*/
   char ch;
   unsigned int i;
-    
+
   // skip whitespace
   do {
     ch = ifP->get();
@@ -400,7 +401,7 @@ pgm_readpgmrow(istream* const file, gray* const grayrow,
     }
   }
     break;
-    
+
   case PBM_FORMAT:
   case RPBM_FORMAT:
     {
@@ -414,22 +415,22 @@ pgm_readpgmrow(istream* const file, gray* const grayrow,
       pbm_freerow(bitrow);
     }
     break;
-        
+
   default:
     pm_error( "can't happen" );
   }
 }
 
 static void
-ppm_readppmrow(istream*  const fileP, 
-               pixel* const pixelrow, 
-               int    const cols, 
-               pixval const maxval, 
+ppm_readppmrow(istream*  const fileP,
+               pixel* const pixelrow,
+               int    const cols,
+               pixval const maxval,
                int    const format) {
 
   switch (format) {
   case PPM_FORMAT: {
-    unsigned int col;
+    int col;
     for (col = 0; col < cols; ++col) {
       pixval const r = pm_getuint(fileP);
       pixval const g = pm_getuint(fileP);
@@ -440,7 +441,7 @@ ppm_readppmrow(istream*  const fileP,
     break;
 
   case RPPM_FORMAT: {
-    unsigned int col;
+    int col;
     for (col = 0; col < cols; ++col) {
       pixval const r = pgm_getrawsample(fileP, maxval);
       pixval const g = pgm_getrawsample(fileP, maxval);
@@ -453,7 +454,7 @@ ppm_readppmrow(istream*  const fileP,
   case PGM_FORMAT:
   case RPGM_FORMAT: {
     gray * const grayrow = pgm_allocrow(cols);
-    unsigned int col;
+    int col;
 
     pgm_readpgmrow(fileP, grayrow, cols, maxval, format);
     for (col = 0; col < cols; ++col) {
@@ -467,7 +468,7 @@ ppm_readppmrow(istream*  const fileP,
   case PBM_FORMAT:
   case RPBM_FORMAT: {
     bit * const bitrow = pbm_allocrow(cols);
-    unsigned int col;
+    int col;
 
     pbm_readpbmrow(fileP, bitrow, cols, format);
     for (col = 0; col < cols; ++col) {
@@ -626,7 +627,7 @@ packBitsGeneric(ostream *          const fileP,
 
     Don't use any special CPU facilities to do the packing.
     -----------------------------------------------------------------------------*/
-  unsigned int col;
+  int col;
 
 #define iszero(x) ((x) == 0 ? 0 : 1)
 
@@ -653,7 +654,7 @@ writePackedRawRow(ostream *                const fileP,
   fileP->write((const char *)packed_bits, pbm_packed_bytes(cols));
   if (fileP->fail())
     pm_error("I/O error writing packed row to raw PBM file.");
-} 
+}
 
 static void
 writePbmRowRaw(ostream *      const fileP,
@@ -900,24 +901,24 @@ ppm_writeppmrow(ostream *  const fileP,
 }
 
 static void
-pnm_writepnmrow(ostream * const fileP, 
-                xel *  const xelrow, 
-                int    const cols, 
-                xelval const maxval, 
-                int    const format, 
+pnm_writepnmrow(ostream * const fileP,
+                xel *  const xelrow,
+                int    const cols,
+                xelval const maxval,
+                int    const format,
                 int    const forceplain) {
 
   bool const plainFormat = forceplain || pm_plain_output;
-    
+
   switch (PNM_FORMAT_TYPE(format)) {
   case PPM_TYPE:
-    ppm_writeppmrow(fileP, (pixel*) xelrow, cols, (pixval) maxval, 
+    ppm_writeppmrow(fileP, (pixel*) xelrow, cols, (pixval) maxval,
                     plainFormat);
     break;
 
   case PGM_TYPE: {
     gray* grayrow;
-    unsigned int col;
+    int col;
 
     grayrow = pgm_allocrow(cols);
 
@@ -932,7 +933,7 @@ pnm_writepnmrow(ostream * const fileP,
 
   case PBM_TYPE: {
     bit* bitrow;
-    unsigned int col;
+    int col;
 
     bitrow = pbm_allocrow(cols);
 
@@ -942,12 +943,12 @@ pnm_writepnmrow(ostream * const fileP,
     pbm_writepbmrow(fileP, bitrow, cols, plainFormat);
 
     pbm_freerow(bitrow);
-  }    
+  }
     break;
-    
+
   default:
     pm_error("invalid format argument received by pnm_writepnmrow(): %d"
-             "PNM_FORMAT_TYPE(format) must be %d, %d, or %d", 
+             "PNM_FORMAT_TYPE(format) must be %d, %d, or %d",
              format, PBM_TYPE, PGM_TYPE, PPM_TYPE);
   }
 }
diff --git a/panda/src/pnmimagetypes/pnmFileTypeTIFF.cxx b/panda/src/pnmimagetypes/pnmFileTypeTIFF.cxx
index 1461ed2f98..e16b857d61 100644
--- a/panda/src/pnmimagetypes/pnmFileTypeTIFF.cxx
+++ b/panda/src/pnmimagetypes/pnmFileTypeTIFF.cxx
@@ -589,7 +589,7 @@ PNMFileTypeTIFF::Reader::
 ////////////////////////////////////////////////////////////////////
 bool PNMFileTypeTIFF::Reader::
 is_floating_point() {
-  return sample_format = SAMPLEFORMAT_IEEEFP;
+  return (sample_format == SAMPLEFORMAT_IEEEFP);
 }
 
 ////////////////////////////////////////////////////////////////////
@@ -988,7 +988,7 @@ write_pfm(const PfmFile &pfm) {
   const vector_float &table = pfm.get_table();
   for (int yi = 0; yi < y_size; ++yi) {
     const float *row = &table[(yi * x_size) * _num_channels];
-    
+
     if (TIFFWriteScanline(tif, (tdata_t)row, yi, 0 ) < 0) {
       pnmimage_tiff_cat.error()
         << "failed a scanline write on row " << yi << "\n";
diff --git a/panda/src/pstatclient/pStatClient.cxx b/panda/src/pstatclient/pStatClient.cxx
index fa526afd69..0cd70c5d96 100644
--- a/panda/src/pstatclient/pStatClient.cxx
+++ b/panda/src/pstatclient/pStatClient.cxx
@@ -720,6 +720,10 @@ is_started(int collector_index, int thread_index) const {
 ////////////////////////////////////////////////////////////////////
 void PStatClient::
 start(int collector_index, int thread_index) {
+  if (!client_is_connected()) {
+    return;
+  }
+
 #ifdef _DEBUG
   nassertv(collector_index >= 0 && collector_index < AtomicAdjust::get(_num_collectors));
   nassertv(thread_index >= 0 && thread_index < AtomicAdjust::get(_num_threads));
@@ -728,7 +732,7 @@ start(int collector_index, int thread_index) {
   Collector *collector = get_collector_ptr(collector_index);
   InternalThread *thread = get_thread_ptr(thread_index);
 
-  if (client_is_connected() && collector->is_active() && thread->_is_active) {
+  if (collector->is_active() && thread->_is_active) {
     LightMutexHolder holder(thread->_thread_lock);
     if (collector->_per_thread[thread_index]._nested_count == 0) {
       // This collector wasn't already started in this thread; record
@@ -750,6 +754,10 @@ start(int collector_index, int thread_index) {
 ////////////////////////////////////////////////////////////////////
 void PStatClient::
 start(int collector_index, int thread_index, double as_of) {
+  if (!client_is_connected()) {
+    return;
+  }
+
 #ifdef _DEBUG
   nassertv(collector_index >= 0 && collector_index < AtomicAdjust::get(_num_collectors));
   nassertv(thread_index >= 0 && thread_index < AtomicAdjust::get(_num_threads));
@@ -758,7 +766,7 @@ start(int collector_index, int thread_index, double as_of) {
   Collector *collector = get_collector_ptr(collector_index);
   InternalThread *thread = get_thread_ptr(thread_index);
 
-  if (client_is_connected() && collector->is_active() && thread->_is_active) {
+  if (collector->is_active() && thread->_is_active) {
     LightMutexHolder holder(thread->_thread_lock);
     if (collector->_per_thread[thread_index]._nested_count == 0) {
       // This collector wasn't already started in this thread; record
@@ -780,6 +788,10 @@ start(int collector_index, int thread_index, double as_of) {
 ////////////////////////////////////////////////////////////////////
 void PStatClient::
 stop(int collector_index, int thread_index) {
+  if (!client_is_connected()) {
+    return;
+  }
+
 #ifdef _DEBUG
   nassertv(collector_index >= 0 && collector_index < AtomicAdjust::get(_num_collectors));
   nassertv(thread_index >= 0 && thread_index < AtomicAdjust::get(_num_threads));
@@ -788,7 +800,7 @@ stop(int collector_index, int thread_index) {
   Collector *collector = get_collector_ptr(collector_index);
   InternalThread *thread = get_thread_ptr(thread_index);
 
-  if (client_is_connected() && collector->is_active() && thread->_is_active) {
+  if (collector->is_active() && thread->_is_active) {
     LightMutexHolder holder(thread->_thread_lock);
     if (collector->_per_thread[thread_index]._nested_count == 0) {
       if (pstats_cat.is_debug()) {
@@ -821,6 +833,10 @@ stop(int collector_index, int thread_index) {
 ////////////////////////////////////////////////////////////////////
 void PStatClient::
 stop(int collector_index, int thread_index, double as_of) {
+  if (!client_is_connected()) {
+    return;
+  }
+
 #ifdef _DEBUG
   nassertv(collector_index >= 0 && collector_index < AtomicAdjust::get(_num_collectors));
   nassertv(thread_index >= 0 && thread_index < AtomicAdjust::get(_num_threads));
@@ -829,7 +845,7 @@ stop(int collector_index, int thread_index, double as_of) {
   Collector *collector = get_collector_ptr(collector_index);
   InternalThread *thread = get_thread_ptr(thread_index);
 
-  if (client_is_connected() && collector->is_active() && thread->_is_active) {
+  if (collector->is_active() && thread->_is_active) {
     LightMutexHolder holder(thread->_thread_lock);
     if (collector->_per_thread[thread_index]._nested_count == 0) {
       if (pstats_cat.is_debug()) {
diff --git a/panda/src/pstatclient/pStatProperties.cxx b/panda/src/pstatclient/pStatProperties.cxx
index f14047732d..ff8cfa0052 100644
--- a/panda/src/pstatclient/pStatProperties.cxx
+++ b/panda/src/pstatclient/pStatProperties.cxx
@@ -17,6 +17,7 @@
 #include "pStatClient.h"
 #include "config_pstats.h"
 #include "configVariableBool.h"
+#include "configVariableColor.h"
 #include "configVariableDouble.h"
 #include "configVariableInt.h"
 #include "configVariableString.h"
@@ -339,8 +340,8 @@ initialize_collector_def(const PStatClient *client, PStatCollectorDef *def) {
     ("pstats-units-" + config_name, def->_level_units, "", ConfigVariable::F_dynamic);
   ConfigVariableDouble pstats_factor
     ("pstats-factor-" + config_name, 1.0, "", ConfigVariable::F_dynamic);
-  ConfigVariableDouble pstats_color
-    ("pstats-color-" + config_name, 0.0, "", ConfigVariable::F_dynamic);
+  ConfigVariableColor pstats_color
+    ("pstats-color-" + config_name, LColor::zero(), "", ConfigVariable::F_dynamic);
 
   if (pstats_active.has_value()) {
     def->_is_active = pstats_active;
diff --git a/panda/src/putil/Sources.pp b/panda/src/putil/Sources.pp
index e36adb2670..7dc82eb5f4 100644
--- a/panda/src/putil/Sources.pp
+++ b/panda/src/putil/Sources.pp
@@ -61,6 +61,7 @@
     pbitops.I pbitops.h \
     portalMask.h \
     pta_ushort.h \
+    pythonCallbackObject.cxx \
     pythonCallbackObject.h pythonCallbackObject.I \
     simpleHashMap.I simpleHashMap.h \
     sparseArray.I sparseArray.h \
@@ -111,7 +112,6 @@
     paramValue.cxx \
     pbitops.cxx \
     pta_ushort.cxx \
-    pythonCallbackObject.cxx \
     simpleHashMap.cxx \
     sparseArray.cxx \
     timedCycle.cxx typedWritable.cxx \
diff --git a/panda/src/putil/bam.h b/panda/src/putil/bam.h
index aa07af2c2f..55916dd228 100644
--- a/panda/src/putil/bam.h
+++ b/panda/src/putil/bam.h
@@ -33,7 +33,7 @@ static const unsigned short _bam_major_ver = 6;
 // Bumped to major version 6 on 2/11/06 to factor out PandaNode::CData.
 
 static const unsigned short _bam_first_minor_ver = 14;
-static const unsigned short _bam_minor_ver = 36;
+static const unsigned short _bam_minor_ver = 37;
 // Bumped to minor version 14 on 12/19/07 to change default ColorAttrib.
 // Bumped to minor version 15 on 4/9/08 to add TextureAttrib::_implicit_sort.
 // Bumped to minor version 16 on 5/13/08 to add Texture::_quality_level.
@@ -57,5 +57,6 @@ static const unsigned short _bam_minor_ver = 36;
 // Bumped to minor version 34 on 9/16/14 to add ScissorAttrib::_off.
 // Bumped to minor version 35 on 12/3/14 to change StencilAttrib.
 // Bumped to minor version 36 on 12/9/14 to add samplers and lod settings.
+// Bumped to minor version 37 on 1/22/15 to add GeomVertexArrayFormat::_divisor.
 
 #endif
diff --git a/panda/src/putil/bitMask.I b/panda/src/putil/bitMask.I
index 723df90513..89a2ca37e6 100644
--- a/panda/src/putil/bitMask.I
+++ b/panda/src/putil/bitMask.I
@@ -503,7 +503,7 @@ get_next_higher_different_bit(int low_bit) const {
   // Mask out all of the bits below low_bit.  Since we already know
   // that low_bit is 0, we can use (1 << low_bit) instead of (1 <<
   // (low_bit + 1)), which becomes undefined when (low_bit + 1) == 32.
-  w &= ~((1 << low_bit) - 1);
+  w &= ~(((WordType)1 << low_bit) - 1);
 
   if (w == 0) {
     // All higher bits in the word have the same value.  Since every
diff --git a/panda/src/putil/bitMask.h b/panda/src/putil/bitMask.h
index 1c9d27cf2c..95c8ea0a6e 100644
--- a/panda/src/putil/bitMask.h
+++ b/panda/src/putil/bitMask.h
@@ -159,8 +159,12 @@ INLINE ostream &operator << (ostream &out, const BitMask<WType, nbits> &bitmask)
 
 // We need to define this temporary macro so we can pass a parameter
 // containing a comma through the macro.
+#define BITMASK16_DEF BitMask<PN_uint16, 16>
 #define BITMASK32_DEF BitMask<PN_uint32, 32>
+#define BITMASK64_DEF BitMask<PN_uint64, 64>
+EXPORT_TEMPLATE_CLASS(EXPCL_PANDA_PUTIL, EXPTP_PANDA_PUTIL, BITMASK16_DEF);
 EXPORT_TEMPLATE_CLASS(EXPCL_PANDA_PUTIL, EXPTP_PANDA_PUTIL, BITMASK32_DEF);
+EXPORT_TEMPLATE_CLASS(EXPCL_PANDA_PUTIL, EXPTP_PANDA_PUTIL, BITMASK64_DEF);
 
 typedef BitMask<PN_uint16, 16> BitMask16;
 typedef BitMask<PN_uint32, 32> BitMask32;
diff --git a/panda/src/putil/config_util.N b/panda/src/putil/config_util.N
index 18bd636362..eb48a5c511 100644
--- a/panda/src/putil/config_util.N
+++ b/panda/src/putil/config_util.N
@@ -14,3 +14,6 @@ forcetype PointerToBase<ReferenceCountedVector<ushort> >
 forcetype PointerToArrayBase<ushort>
 forcetype PTA_ushort
 forcetype CPTA_ushort
+
+# This is so the extensions for PTA_ushort are made available.
+forceinclude "pointerToArray_ext.h"
diff --git a/panda/src/putil/config_util.cxx b/panda/src/putil/config_util.cxx
index a6ef2bcb70..ea690e423b 100644
--- a/panda/src/putil/config_util.cxx
+++ b/panda/src/putil/config_util.cxx
@@ -35,7 +35,6 @@
 #include "namable.h"
 #include "nodeCachedReferenceCount.h"
 #include "paramValue.h"
-#include "pythonCallbackObject.h"
 #include "referenceCount.h"
 #include "sparseArray.h"
 #include "typedObject.h"
@@ -216,9 +215,6 @@ init_libputil() {
   ParamVecBase4d::init_type("ParamVecBase4d");
   ParamVecBase4i::init_type("ParamVecBase4i");
   ParamWstring::init_type("ParamWstring");
-#ifdef HAVE_PYTHON
-  PythonCallbackObject::init_type();
-#endif
   QuadBitMaskNative::init_type();
   ReferenceCount::init_type();
   SparseArray::init_type();
diff --git a/panda/src/putil/copyOnWritePointer.I b/panda/src/putil/copyOnWritePointer.I
index d36558fbbd..d9c81d9de5 100644
--- a/panda/src/putil/copyOnWritePointer.I
+++ b/panda/src/putil/copyOnWritePointer.I
@@ -81,6 +81,37 @@ INLINE CopyOnWritePointer::
   }
 }
 
+#ifdef USE_MOVE_SEMANTICS
+////////////////////////////////////////////////////////////////////
+//     Function: CopyOnWritePointer::Move Constructor
+//       Access: Public
+//  Description:
+////////////////////////////////////////////////////////////////////
+INLINE CopyOnWritePointer::
+CopyOnWritePointer(CopyOnWritePointer &&move) NOEXCEPT :
+  _cow_object(move._cow_object)
+{
+  // Steal the other's reference count.
+  move._cow_object = (CopyOnWriteObject *)NULL;
+}
+
+////////////////////////////////////////////////////////////////////
+//     Function: CopyOnWritePointer::Move Assignment Operator
+//       Access: Public
+//  Description:
+////////////////////////////////////////////////////////////////////
+INLINE void CopyOnWritePointer::
+operator = (CopyOnWritePointer &&move) NOEXCEPT {
+  CopyOnWriteObject *old_object = _cow_object;
+  _cow_object = move._cow_object;
+  move._cow_object = NULL;
+
+  if (old_object != (CopyOnWriteObject *)NULL) {
+    cache_unref_delete(old_object);
+  }
+}
+#endif  // USE_MOVE_SEMANTICS
+
 ////////////////////////////////////////////////////////////////////
 //     Function: CopyOnWritePointer::operator == 
 //       Access: Public
@@ -272,6 +303,35 @@ operator = (To *object) {
 }
 #endif  // CPPPARSER
 
+#ifdef USE_MOVE_SEMANTICS
+#ifndef CPPPARSER
+////////////////////////////////////////////////////////////////////
+//     Function: CopyOnWritePointerTo::Move Constructor
+//       Access: Public
+//  Description:
+////////////////////////////////////////////////////////////////////
+template<class T>
+INLINE CopyOnWritePointerTo<T>::
+CopyOnWritePointerTo(CopyOnWritePointerTo<T> &&move) NOEXCEPT :
+  CopyOnWritePointer((CopyOnWritePointer &&)move)
+{
+}
+#endif  // CPPPARSER
+
+#ifndef CPPPARSER
+////////////////////////////////////////////////////////////////////
+//     Function: CopyOnWritePointerTo::Move Assignment Operator
+//       Access: Public
+//  Description:
+////////////////////////////////////////////////////////////////////
+template<class T>
+INLINE void CopyOnWritePointerTo<T>::
+operator = (CopyOnWritePointerTo<T> &&move) NOEXCEPT {
+  CopyOnWritePointer::operator = ((CopyOnWritePointer &&)move);
+}
+#endif  // CPPPARSER
+#endif  // USE_MOVE_SEMANTICS
+
 #ifndef CPPPARSER
 #ifdef COW_THREADED
 ////////////////////////////////////////////////////////////////////
diff --git a/panda/src/putil/copyOnWritePointer.h b/panda/src/putil/copyOnWritePointer.h
index eb985250a3..20e2f42f50 100644
--- a/panda/src/putil/copyOnWritePointer.h
+++ b/panda/src/putil/copyOnWritePointer.h
@@ -40,6 +40,11 @@ public:
   INLINE void operator = (CopyOnWriteObject *object);
   INLINE ~CopyOnWritePointer();
 
+#ifdef USE_MOVE_SEMANTICS
+  INLINE CopyOnWritePointer(CopyOnWritePointer &&move) NOEXCEPT;
+  INLINE void operator = (CopyOnWritePointer &&move) NOEXCEPT;
+#endif
+
   INLINE bool operator == (const CopyOnWritePointer &other) const;
   INLINE bool operator != (const CopyOnWritePointer &other) const;
   INLINE bool operator < (const CopyOnWritePointer &other) const;
@@ -83,6 +88,11 @@ public:
   INLINE void operator = (const CopyOnWritePointerTo<T> &copy);
   INLINE void operator = (To *object);
 
+#ifdef USE_MOVE_SEMANTICS
+  INLINE CopyOnWritePointerTo(CopyOnWritePointerTo &&move) NOEXCEPT;
+  INLINE void operator = (CopyOnWritePointerTo &&move) NOEXCEPT;
+#endif
+
 #ifdef COW_THREADED
   INLINE CPT(To) get_read_pointer() const;
   INLINE PT(To) get_write_pointer();
diff --git a/panda/src/putil/doubleBitMask.h b/panda/src/putil/doubleBitMask.h
index bed4fa19ef..2e9b768428 100644
--- a/panda/src/putil/doubleBitMask.h
+++ b/panda/src/putil/doubleBitMask.h
@@ -34,7 +34,7 @@ public:
   typedef BMType BitMaskType;
   typedef TYPENAME BMType::WordType WordType;
 #ifndef CPPPARSER  // interrogate has a problem with these lines.
-  enum { 
+  enum {
     half_bits = BitMaskType::num_bits,
     num_bits = BitMaskType::num_bits * 2,
   };
@@ -142,7 +142,10 @@ INLINE ostream &operator << (ostream &out, const DoubleBitMask<BMType> &doubleBi
   return out;
 }
 
+EXPORT_TEMPLATE_CLASS(EXPCL_PANDA_PUTIL, EXPTP_PANDA_PUTIL, DoubleBitMask<BitMaskNative>);
 typedef DoubleBitMask<BitMaskNative> DoubleBitMaskNative;
+
+EXPORT_TEMPLATE_CLASS(EXPCL_PANDA_PUTIL, EXPTP_PANDA_PUTIL, DoubleBitMask<DoubleBitMaskNative>);
 typedef DoubleBitMask<DoubleBitMaskNative> QuadBitMaskNative;
 
 // Tell GCC that we'll take care of the instantiation explicitly here.
diff --git a/panda/src/putil/p3putil_composite2.cxx b/panda/src/putil/p3putil_composite2.cxx
index bb0b5fea5a..36c9062c16 100644
--- a/panda/src/putil/p3putil_composite2.cxx
+++ b/panda/src/putil/p3putil_composite2.cxx
@@ -15,7 +15,6 @@
 #include "paramValue.cxx"
 #include "pbitops.cxx"
 #include "pta_ushort.cxx"
-#include "pythonCallbackObject.cxx"
 #include "simpleHashMap.cxx"
 #include "sparseArray.cxx"
 #include "timedCycle.cxx"
diff --git a/panda/src/putil/pythonCallbackObject.cxx b/panda/src/putil/pythonCallbackObject.cxx
index 1160877901..48b0bbbbe3 100644
--- a/panda/src/putil/pythonCallbackObject.cxx
+++ b/panda/src/putil/pythonCallbackObject.cxx
@@ -15,15 +15,21 @@
 #include "pythonCallbackObject.h"
 
 #ifdef HAVE_PYTHON
-#include "py_panda.h"  
+
+#include "py_panda.h"
 #include "thread.h"
 #include "callbackData.h"
 #include "config_util.h"
 
 TypeHandle PythonCallbackObject::_type_handle;
 
+Configure(config_pythonCallbackObject);
+ConfigureFn(config_pythonCallbackObject) {
+  PythonCallbackObject::init_type();
+}
+
 #ifndef CPPPARSER
-IMPORT_THIS struct Dtool_PyTypedObject Dtool_TypedObject;
+extern struct Dtool_PyTypedObject Dtool_TypedObject;
 #endif
 
 ////////////////////////////////////////////////////////////////////
@@ -126,13 +132,13 @@ do_python_callback(CallbackData *cbdata) {
 
   // Wrap the cbdata up in a Python object, then put it in a tuple,
   // for the argument list.
-  PyObject *pycbdata = 
+  PyObject *pycbdata =
     DTool_CreatePyInstanceTyped(cbdata, Dtool_TypedObject,
                                 false, false, cbdata->get_type_index());
   PyObject *args = Py_BuildValue("(O)", pycbdata);
   Py_DECREF(pycbdata);
 
-  PyObject *result = 
+  PyObject *result =
     Thread::get_current_thread()->call_python_func(_function, args);
   Py_DECREF(args);
 
diff --git a/panda/src/putil/pythonCallbackObject.h b/panda/src/putil/pythonCallbackObject.h
index 4e1c03889f..44e45ab19d 100644
--- a/panda/src/putil/pythonCallbackObject.h
+++ b/panda/src/putil/pythonCallbackObject.h
@@ -28,7 +28,7 @@
 //               a callback to directly call an arbitarary Python
 //               function.  Powerful!  But use with caution.
 ////////////////////////////////////////////////////////////////////
-class EXPCL_PANDA_PUTIL PythonCallbackObject : public CallbackObject {
+class PythonCallbackObject : public CallbackObject {
 PUBLISHED:
   PythonCallbackObject(PyObject *function = Py_None);
   virtual ~PythonCallbackObject();
diff --git a/panda/src/putil/simpleHashMap.I b/panda/src/putil/simpleHashMap.I
index 8670600a7b..d605d22235 100644
--- a/panda/src/putil/simpleHashMap.I
+++ b/panda/src/putil/simpleHashMap.I
@@ -16,7 +16,7 @@
 ////////////////////////////////////////////////////////////////////
 //     Function: SimpleHashMap::Constructor
 //       Access: Public
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 template<class Key, class Value, class Compare>
 INLINE SimpleHashMap<Key, Value, Compare>::
@@ -32,7 +32,7 @@ SimpleHashMap(const Compare &comp) :
 ////////////////////////////////////////////////////////////////////
 //     Function: SimpleHashMap::Destructor
 //       Access: Public
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 template<class Key, class Value, class Compare>
 INLINE SimpleHashMap<Key, Value, Compare>::
@@ -417,7 +417,7 @@ is_empty() const {
 ////////////////////////////////////////////////////////////////////
 //     Function: SimpleHashMap::output
 //       Access: Public
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 template<class Key, class Value, class Compare>
 void SimpleHashMap<Key, Value, Compare>::
@@ -443,7 +443,7 @@ output(ostream &out) const {
 ////////////////////////////////////////////////////////////////////
 //     Function: SimpleHashMap::write
 //       Access: Public
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 template<class Key, class Value, class Compare>
 void SimpleHashMap<Key, Value, Compare>::
@@ -575,9 +575,9 @@ void SimpleHashMap<Key, Value, Compare>::
 new_table() {
   nassertv(_table_size == 0 && _num_entries == 0);
 
-  // Pick a good initial table size.  For now, we make it as small as
-  // possible.  Maybe that's the right answer.
-  _table_size = 2;
+  // Pick a good initial table size.  For now, we make it really
+  // small.  Maybe that's the right answer.
+  _table_size = 4;
 
   // We allocate enough bytes for _table_size elements of TableEntry,
   // plus _table_size more bytes at the end (for the exists array).
@@ -618,7 +618,9 @@ expand_table() {
   SimpleHashMap<Key, Value, Compare> old_map(_comp);
   swap(old_map);
 
-  _table_size = (old_map._table_size << 1);
+  // Double the table size.
+  size_t old_table_size = old_map._table_size;
+  _table_size = (old_table_size << 1);
   nassertv(_table == NULL);
 
   // We allocate enough bytes for _table_size elements of TableEntry,
@@ -626,15 +628,30 @@ expand_table() {
   size_t alloc_size = _table_size * sizeof(TableEntry) + _table_size;
   _deleted_chain = memory_hook->get_deleted_chain(alloc_size);
   _table = (TableEntry *)_deleted_chain->allocate(alloc_size, TypeHandle::none());
-  memset(get_exists_array(), 0, _table_size);
+  unsigned char *exists_array = get_exists_array();
+  memset(exists_array, 0, _table_size);
   nassertv(_num_entries == 0);
 
   // Now copy the entries from the old table into the new table.
   int num_added = 0;
-  for (size_t i = 0; i < old_map._table_size; ++i) {
+  for (size_t i = 0; i < old_table_size; ++i) {
     if (old_map.has_element(i)) {
-      store(old_map._table[i]._key, old_map._table[i]._data);
-      ++num_added;
+      size_t new_index = get_hash(old_map._table[i]._key);
+
+      while (exists_array[new_index] != 0) {
+        // Hash conflict;  look for a better spot.  This has to succeed.
+        new_index = (new_index + 1) & (_table_size - 1);
+      }
+
+#ifdef USE_MOVE_SEMANTICS
+      // Use C++11 rvalue references to invoke the move constructor,
+      // which may be more efficient.
+      new(&_table[new_index]) TableEntry(move(old_map._table[i]));
+#else
+      new(&_table[new_index]) TableEntry(old_map._table[i]);
+#endif
+      exists_array[new_index] = true;
+      ++_num_entries;
     }
   }
 
diff --git a/panda/src/putil/simpleHashMap.h b/panda/src/putil/simpleHashMap.h
index 9f72450ee5..b9b690ffc7 100644
--- a/panda/src/putil/simpleHashMap.h
+++ b/panda/src/putil/simpleHashMap.h
@@ -79,6 +79,14 @@ private:
     INLINE TableEntry(const Key &key, const Value &data) :
       _key(key),
       _data(data) {}
+    INLINE TableEntry(const TableEntry &copy) :
+      _key(copy._key),
+      _data(copy._data) {}
+#ifdef USE_MOVE_SEMANTICS
+    INLINE TableEntry(TableEntry &&from) NOEXCEPT :
+      _key(move(from._key)),
+      _data(move(from._data)) {}
+#endif
     Key _key;
     Value _data;
   };
@@ -103,4 +111,3 @@ inline ostream &operator << (ostream &out, const SimpleHashMap<Key, Value, Compa
 #endif  // CPPPARSER
 
 #endif
-
diff --git a/panda/src/putil/typedWritable_ext.cxx b/panda/src/putil/typedWritable_ext.cxx
index 1cf11e0852..80e3ea2d47 100644
--- a/panda/src/putil/typedWritable_ext.cxx
+++ b/panda/src/putil/typedWritable_ext.cxx
@@ -17,7 +17,7 @@
 #ifdef HAVE_PYTHON
 
 #ifndef CPPPARSER
-extern EXPCL_PANDA_PUTIL Dtool_PyTypedObject Dtool_BamWriter;
+extern Dtool_PyTypedObject Dtool_BamWriter;
 #endif  // CPPPARSER
 
 ////////////////////////////////////////////////////////////////////
diff --git a/panda/src/recorder/mouseRecorder.cxx b/panda/src/recorder/mouseRecorder.cxx
index a71031409c..ec1475fbde 100644
--- a/panda/src/recorder/mouseRecorder.cxx
+++ b/panda/src/recorder/mouseRecorder.cxx
@@ -26,14 +26,16 @@ TypeHandle MouseRecorder::_type_handle;
 //  Description:
 ////////////////////////////////////////////////////////////////////
 MouseRecorder::
-MouseRecorder(const string &name) : 
-  DataNode(name) 
+MouseRecorder(const string &name) :
+  DataNode(name)
 {
   _pixel_xy_input = define_input("pixel_xy", EventStoreVec2::get_class_type());
+  _pixel_size_input = define_input("pixel_size", EventStoreVec2::get_class_type());
   _xy_input = define_input("xy", EventStoreVec2::get_class_type());
   _button_events_input = define_input("button_events", ButtonEventList::get_class_type());
 
   _pixel_xy_output = define_output("pixel_xy", EventStoreVec2::get_class_type());
+  _pixel_size_output = define_output("pixel_size", EventStoreVec2::get_class_type());
   _xy_output = define_output("xy", EventStoreVec2::get_class_type());
   _button_events_output = define_output("button_events", ButtonEventList::get_class_type());
 
@@ -127,7 +129,7 @@ write(ostream &out, int indent_level) const {
 //               calls.
 ////////////////////////////////////////////////////////////////////
 void MouseRecorder::
-do_transmit_data(DataGraphTraverser *, const DataNodeTransmit &input, 
+do_transmit_data(DataGraphTraverser *, const DataNodeTransmit &input,
                  DataNodeTransmit &output) {
   bool has_mouse = false;
   LPoint2 mouse_xy;
@@ -157,7 +159,7 @@ do_transmit_data(DataGraphTraverser *, const DataNodeTransmit &input,
       mouse_pixel_xy = xy->get_value();
       has_mouse = true;
     }
-    
+
     // Look for button events.
     if (input.has_data(_button_events_input)) {
       const ButtonEventList *button_events;
@@ -165,7 +167,7 @@ do_transmit_data(DataGraphTraverser *, const DataNodeTransmit &input,
       _live_button_events->add_events(*button_events);
     }
   }
-    
+
   // Now rebuild the output data for our children.
 
   if (has_mouse) {
@@ -187,8 +189,10 @@ do_transmit_data(DataGraphTraverser *, const DataNodeTransmit &input,
     _mouse_pixel_xy = mouse_pixel_xy;
     _save_button_events->add_events(*_live_button_events);
   }
-}
 
+  // We always pass the pixel_size data through.
+  output.set_data(_pixel_size_output, input.get_data(_pixel_size_input));
+}
 
 ////////////////////////////////////////////////////////////////////
 //     Function: MouseRecorder::register_with_read_factory
diff --git a/panda/src/recorder/mouseRecorder.h b/panda/src/recorder/mouseRecorder.h
index 9e95405d27..503d8eb8cd 100644
--- a/panda/src/recorder/mouseRecorder.h
+++ b/panda/src/recorder/mouseRecorder.h
@@ -57,11 +57,13 @@ protected:
 private:
   // inputs
   int _pixel_xy_input;
+  int _pixel_size_input;
   int _xy_input;
   int _button_events_input;
 
   // outputs
   int _pixel_xy_output;
+  int _pixel_size_output;
   int _xy_output;
   int _button_events_output;
 
@@ -79,6 +81,9 @@ public:
   virtual void write_datagram(BamWriter *manager, Datagram &dg);
   virtual void write_recorder(BamWriter *manager, Datagram &dg);
 
+  INLINE virtual void ref() const FINAL { ReferenceCount::ref(); };
+  INLINE virtual bool unref() const FINAL { return ReferenceCount::unref(); };
+
 protected:
   static TypedWritable *make_from_bam(const FactoryParams &params);
   static RecorderBase *make_recorder(const FactoryParams &params);
@@ -106,4 +111,3 @@ private:
 };
 
 #endif
-
diff --git a/panda/src/recorder/recorderBase.h b/panda/src/recorder/recorderBase.h
index 43df358776..922f751a65 100644
--- a/panda/src/recorder/recorderBase.h
+++ b/panda/src/recorder/recorderBase.h
@@ -46,8 +46,13 @@ class TypedWritable;
 //               write_recorder() to do exactly the same thing as
 //               write_datagram(), or they may choose to write
 //               something slightly different.
+//
+//               Most types of recorders should derive from Recorder,
+//               as it derives from ReferenceCount, except for
+//               MouseRecorder, which would otherwise doubly inherit
+//               from ReferenceCount.
 ////////////////////////////////////////////////////////////////////
-class EXPCL_PANDA_RECORDER RecorderBase : virtual public ReferenceCount {
+class EXPCL_PANDA_RECORDER RecorderBase {
 protected:
   RecorderBase();
 
@@ -63,6 +68,11 @@ public:
 
   virtual void write_recorder(BamWriter *manager, Datagram &dg);
 
+  // We can't let RecorderBase inherit from ReferenceCount, so we
+  // define these so we can still manage the reference count.
+  virtual void ref() const=0;
+  virtual bool unref() const=0;
+
 protected:
   void fillin_recorder(DatagramIterator &scan, BamReader *manager);
 
@@ -72,7 +82,7 @@ private:
     F_playing   = 0x0002,
   };
   short _flags;
-  
+
 public:
   static TypeHandle get_class_type() {
     return _type_handle;
@@ -90,9 +100,9 @@ private:
   static TypeHandle _type_handle;
 
   friend class RecorderController;
+  friend class RecorderTable;
 };
 
 #include "recorderBase.I"
 
 #endif
-
diff --git a/panda/src/recorder/recorderController.cxx b/panda/src/recorder/recorderController.cxx
index 0495bf0ef2..712fe1c5ac 100644
--- a/panda/src/recorder/recorderController.cxx
+++ b/panda/src/recorder/recorderController.cxx
@@ -93,17 +93,11 @@ begin_record(const Filename &filename) {
   _user_table_modified = true;
 
   // Tell all of our recorders that they're live now.
-  RecorderTable::Recorders::iterator ri;
-  for (ri = _user_table->_recorders.begin(); 
-       ri != _user_table->_recorders.end(); 
-       ++ri) {
-    RecorderBase *recorder = (*ri).second;
-    recorder->_flags |= RecorderBase::F_recording;
-  }
+  _user_table->set_flags(RecorderBase::F_recording);
 
-  recorder_cat.info() 
+  recorder_cat.info()
     << "Recording session to " << _filename << "\n";
-    
+
   return true;
 }
 
@@ -150,7 +144,7 @@ begin_playback(const Filename &filename) {
   // Start out by reading the RecorderHeader.
   TypedWritable *object = _reader->read_object();
 
-  if (object == (TypedWritable *)NULL || 
+  if (object == (TypedWritable *)NULL ||
       !object->is_of_type(RecorderHeader::get_class_type())) {
     recorder_cat.error()
       << _filename << " does not contain a recorded session.\n";
@@ -176,7 +170,7 @@ begin_playback(const Filename &filename) {
     return false;
   }
 
-  recorder_cat.info() 
+  recorder_cat.info()
     << "Playing back session from " << _filename << "\n";
 
   return true;
@@ -194,26 +188,14 @@ close() {
     _writer = NULL;
 
     // Tell all of our recorders that they're no longer recording.
-    RecorderTable::Recorders::iterator ri;
-    for (ri = _user_table->_recorders.begin(); 
-         ri != _user_table->_recorders.end(); 
-         ++ri) {
-      RecorderBase *recorder = (*ri).second;
-      recorder->_flags &= ~RecorderBase::F_recording;
-    }
+    _user_table->clear_flags(RecorderBase::F_recording);
   }
   if (_reader != (BamReader *)NULL) {
     delete _reader;
     _reader = NULL;
 
     // Tell all of our recorders that they're no longer playing.
-    RecorderTable::Recorders::iterator ri;
-    for (ri = _active_table->_recorders.begin(); 
-         ri != _active_table->_recorders.end(); 
-         ++ri) {
-      RecorderBase *recorder = (*ri).second;
-      recorder->_flags &= ~RecorderBase::F_playing;
-    }
+    _active_table->clear_flags(RecorderBase::F_playing);
   }
   _dout.close();
   _din.close();
@@ -244,7 +226,7 @@ record_frame() {
 
     RecorderFrame data(now, frame, _user_table_modified, _user_table);
     _user_table_modified = false;
-    
+
     _writer->write_object(&data);
   }
 }
@@ -300,27 +282,15 @@ play_frame() {
       if (_next_frame->_table_changed || _user_table_modified) {
         // We're about to change the active table.  Temporarily
         // disable the playing flag on the currently-active recorders.
-        RecorderTable::Recorders::iterator ri;
-        for (ri = _active_table->_recorders.begin(); 
-             ri != _active_table->_recorders.end(); 
-             ++ri) {
-          RecorderBase *recorder = (*ri).second;
-          recorder->_flags &= ~RecorderBase::F_playing;
-        }
-
+        _active_table->clear_flags(RecorderBase::F_playing);
         delete _active_table;
         _active_table = new RecorderTable(*_file_table);
         _active_table->merge_from(*_user_table);
         _user_table_modified = false;
-        
+
         // Now reenable the playing flag on the newly-active
         // recorders.
-        for (ri = _active_table->_recorders.begin(); 
-             ri != _active_table->_recorders.end(); 
-             ++ri) {
-          RecorderBase *recorder = (*ri).second;
-          recorder->_flags |= RecorderBase::F_playing;
-        }
+        _active_table->set_flags(RecorderBase::F_playing);
       }
 
       _next_frame->_table = _active_table;
@@ -353,7 +323,7 @@ RecorderFrame *RecorderController::
 read_frame() {
   TypedWritable *object = _reader->read_object();
 
-  if (object == (TypedWritable *)NULL || 
+  if (object == (TypedWritable *)NULL ||
       !object->is_of_type(RecorderFrame::get_class_type())) {
     return NULL;
   }
diff --git a/panda/src/recorder/recorderFrame.cxx b/panda/src/recorder/recorderFrame.cxx
index 35697d0852..f2b95cae2b 100644
--- a/panda/src/recorder/recorderFrame.cxx
+++ b/panda/src/recorder/recorderFrame.cxx
@@ -30,14 +30,7 @@ TypeHandle RecorderFrame::_type_handle;
 void RecorderFrame::
 play_frame(BamReader *manager) {
   DatagramIterator scan(_data, _data_pos);
-
-  RecorderTable::Recorders::iterator ri;
-  for (ri = _table->_recorders.begin(); 
-       ri != _table->_recorders.end(); 
-       ++ri) {
-    RecorderBase *recorder = (*ri).second;
-    recorder->play_frame(scan, manager);
-  }
+  _table->play_frame(scan, manager);
 
   // We expect to use up all of the data in the datagram.
   nassertv(scan.get_remaining_size() == 0);
@@ -77,14 +70,8 @@ write_datagram(BamWriter *manager, Datagram &dg) {
     _local_table = *_table;
     manager->write_pointer(dg, &_local_table);
   }
-  
-  RecorderTable::Recorders::iterator ri;
-  for (ri = _table->_recorders.begin(); 
-       ri != _table->_recorders.end(); 
-       ++ri) {
-    RecorderBase *recorder = (*ri).second;
-    recorder->record_frame(manager, dg);
-  }
+
+  _table->record_frame(manager, dg);
 }
 
 ////////////////////////////////////////////////////////////////////
diff --git a/panda/src/recorder/recorderTable.I b/panda/src/recorder/recorderTable.I
index e14812213b..95c364f26f 100644
--- a/panda/src/recorder/recorderTable.I
+++ b/panda/src/recorder/recorderTable.I
@@ -29,10 +29,8 @@ RecorderTable() {
 //  Description:
 ////////////////////////////////////////////////////////////////////
 INLINE RecorderTable::
-RecorderTable(const RecorderTable &copy) :
-  _recorders(copy._recorders),
-  _error(copy._error)
-{
+RecorderTable(const RecorderTable &copy) {
+  *this = copy;
 }
 
 ////////////////////////////////////////////////////////////////////
@@ -44,13 +42,62 @@ INLINE void RecorderTable::
 operator = (const RecorderTable &copy) {
   _recorders = copy._recorders;
   _error = copy._error;
+
+  Recorders::iterator ri;
+  for (ri = _recorders.begin(); ri != _recorders.end(); ++ri) {
+    ri->second->ref();
+  }
 }
 
 ////////////////////////////////////////////////////////////////////
-//     Function: RecorderTable::Destructor
+//     Function: RecorderTable::add_recorder
 //       Access: Published
-//  Description:
+//  Description: Adds the named recorder to the set of recorders.
 ////////////////////////////////////////////////////////////////////
-INLINE RecorderTable::
-~RecorderTable() {
+INLINE void RecorderTable::
+add_recorder(const string &name, RecorderBase *recorder) {
+  nassertv(recorder != (RecorderBase *)NULL);
+  recorder->ref();
+
+  std::pair<Recorders::iterator, bool> result =
+    _recorders.insert(Recorders::value_type(name, recorder));
+
+  if (!result.second) {
+    // Take out the previous one first.
+    unref_delete(result.first->second);
+    result.first->second = recorder;
+  }
+}
+
+////////////////////////////////////////////////////////////////////
+//     Function: RecorderTable::get_recorder
+//       Access: Published
+//  Description: Returns the recorder with the indicated name, or NULL
+//               if there is no such recorder.
+////////////////////////////////////////////////////////////////////
+INLINE RecorderBase *RecorderTable::
+get_recorder(const string &name) const {
+  Recorders::const_iterator ri = _recorders.find(name);
+  if (ri != _recorders.end()) {
+    return (*ri).second;
+  }
+  return NULL;
+}
+
+////////////////////////////////////////////////////////////////////
+//     Function: RecorderTable::remove_recorder
+//       Access: Published
+//  Description: Removes the named recorder from the table.  Returns
+//               true if successful, false if there was no such
+//               recorder.
+////////////////////////////////////////////////////////////////////
+INLINE bool RecorderTable::
+remove_recorder(const string &name) {
+  Recorders::iterator ri = _recorders.find(name);
+  if (ri != _recorders.end()) {
+    unref_delete(ri->second);
+    _recorders.erase(ri);
+    return true;
+  }
+  return false;
 }
diff --git a/panda/src/recorder/recorderTable.cxx b/panda/src/recorder/recorderTable.cxx
index ee58ec4734..25b74c42e8 100644
--- a/panda/src/recorder/recorderTable.cxx
+++ b/panda/src/recorder/recorderTable.cxx
@@ -21,6 +21,19 @@
 
 TypeHandle RecorderTable::_type_handle;
 
+////////////////////////////////////////////////////////////////////
+//     Function: RecorderTable::Destructor
+//       Access: Published
+//  Description:
+////////////////////////////////////////////////////////////////////
+RecorderTable::
+~RecorderTable() {
+  Recorders::iterator ri;
+  for (ri = _recorders.begin(); ri != _recorders.end(); ++ri) {
+    unref_delete(ri->second);
+  }
+}
+
 ////////////////////////////////////////////////////////////////////
 //     Function: RecorderTable::merge_from
 //       Access: Public
@@ -47,12 +60,16 @@ merge_from(const RecorderTable &other) {
     } else if ((*ri).second->get_type() == recorder->get_type()) {
       // If we already had a recorder by that name with the same type,
       // throw it away (otherwise, keep the one we had before).
-      (*ri).second = recorder;
+      if ((*ri).second != recorder) {
+        recorder->ref();
+        unref_delete((*ri).second);
+        (*ri).second = recorder;
+      }
 
     } else {
       recorder_cat.warning()
-        << "Keeping recorder " << name << " of type " 
-        << (*ri).second->get_type() << " instead of recorder of type " 
+        << "Keeping recorder " << name << " of type "
+        << (*ri).second->get_type() << " instead of recorder of type "
         << recorder->get_type() << "\n";
     }
   }
@@ -71,51 +88,73 @@ merge_from(const RecorderTable &other) {
 }
 
 ////////////////////////////////////////////////////////////////////
-//     Function: RecorderTable::add_recorder
+//     Function: RecorderTable::record_frame
 //       Access: Published
-//  Description: Adds the named recorder to the set of recorders.
+//  Description: Calls record_frame on all recorders.
 ////////////////////////////////////////////////////////////////////
 void RecorderTable::
-add_recorder(const string &name, RecorderBase *recorder) {
-  _recorders[name] = recorder;
+record_frame(BamWriter *manager, Datagram &dg) {
+  Recorders::iterator ri;
+  for (ri = _recorders.begin();
+       ri != _recorders.end();
+       ++ri) {
+    RecorderBase *recorder = (*ri).second;
+    recorder->record_frame(manager, dg);
+  }
 }
 
 ////////////////////////////////////////////////////////////////////
-//     Function: RecorderTable::get_recorder
+//     Function: RecorderTable::play_frame
 //       Access: Published
-//  Description: Returns the recorder with the indicated name, or NULL
-//               if there is no such recorder.
+//  Description: Calls play_frame on all recorders.
 ////////////////////////////////////////////////////////////////////
-RecorderBase *RecorderTable::
-get_recorder(const string &name) const {
-  Recorders::const_iterator ri = _recorders.find(name);
-  if (ri != _recorders.end()) {
-    return (*ri).second;
+void RecorderTable::
+play_frame(DatagramIterator &scan, BamReader *manager) {
+  Recorders::iterator ri;
+  for (ri = _recorders.begin();
+       ri != _recorders.end();
+       ++ri) {
+    RecorderBase *recorder = (*ri).second;
+    recorder->play_frame(scan, manager);
   }
-  return NULL;
 }
 
 ////////////////////////////////////////////////////////////////////
-//     Function: RecorderTable::remove_recorder
+//     Function: RecorderTable::set_flags
 //       Access: Published
-//  Description: Removes the named recorder from the table.  Returns
-//               true if successful, false if there was no such
-//               recorder.
+//  Description: Sets the given flags on all recorders.
 ////////////////////////////////////////////////////////////////////
-bool RecorderTable::
-remove_recorder(const string &name) {
-  Recorders::iterator ri = _recorders.find(name);
-  if (ri != _recorders.end()) {
-    _recorders.erase(ri);
-    return true;
+void RecorderTable::
+set_flags(short flags) {
+  Recorders::iterator ri;
+  for (ri = _recorders.begin();
+       ri != _recorders.end();
+       ++ri) {
+    RecorderBase *recorder = (*ri).second;
+    recorder->_flags |= flags;
+  }
+}
+
+////////////////////////////////////////////////////////////////////
+//     Function: RecorderTable::clear_flags
+//       Access: Published
+//  Description: Clears the given flags on all recorders.
+////////////////////////////////////////////////////////////////////
+void RecorderTable::
+clear_flags(short flags) {
+  Recorders::iterator ri;
+  for (ri = _recorders.begin();
+       ri != _recorders.end();
+       ++ri) {
+    RecorderBase *recorder = (*ri).second;
+    recorder->_flags &= ~flags;
   }
-  return false;
 }
 
 ////////////////////////////////////////////////////////////////////
 //     Function: RecorderTable::write
 //       Access: Published
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 void RecorderTable::
 write(ostream &out, int indent_level) const {
@@ -203,7 +242,7 @@ fillin(DatagramIterator &scan, BamReader *manager) {
     FactoryParams fparams;
     fparams.add_param(new BamReaderParam(scan, manager));
 
-    PT(RecorderBase) recorder = 
+    RecorderBase *recorder =
       RecorderController::get_factory()->make_instance_more_general(type, fparams);
     if (recorder == (RecorderBase *)NULL) {
       recorder_cat.error()
@@ -211,6 +250,7 @@ fillin(DatagramIterator &scan, BamReader *manager) {
       _error = true;
 
     } else {
+      recorder->ref();
       bool inserted =
         _recorders.insert(Recorders::value_type(name, recorder)).second;
       nassertv(inserted);
diff --git a/panda/src/recorder/recorderTable.h b/panda/src/recorder/recorderTable.h
index 50de33e199..f742717406 100644
--- a/panda/src/recorder/recorderTable.h
+++ b/panda/src/recorder/recorderTable.h
@@ -37,18 +37,25 @@ public:
   INLINE RecorderTable();
   INLINE RecorderTable(const RecorderTable &copy);
   INLINE void operator = (const RecorderTable &copy);
-  INLINE ~RecorderTable();
+  ~RecorderTable();
 
   void merge_from(const RecorderTable &other);
 
-  void add_recorder(const string &name, RecorderBase *recorder);
-  RecorderBase *get_recorder(const string &name) const;
-  bool remove_recorder(const string &name);
+  INLINE void add_recorder(const string &name, RecorderBase *recorder);
+  INLINE RecorderBase *get_recorder(const string &name) const;
+  INLINE bool remove_recorder(const string &name);
+
+  void record_frame(BamWriter *manager, Datagram &dg);
+  void play_frame(DatagramIterator &scan, BamReader *manager);
+  void set_flags(short flags);
+  void clear_flags(short flags);
 
   void write(ostream &out, int indent_level) const;
 
-
-  typedef pmap<string, PT(RecorderBase) > Recorders;
+  // RecorderBase itself doesn't inherit from ReferenceCount, so
+  // we can't put a PT() around it.  Instead, we manage the reference
+  // count using calls to ref() and unref().
+  typedef pmap<string, RecorderBase*> Recorders;
   Recorders _recorders;
 
   bool _error;
@@ -60,7 +67,7 @@ public:
 protected:
   static TypedWritable *make_from_bam(const FactoryParams &params);
   void fillin(DatagramIterator &scan, BamReader *manager);
-  
+
 public:
   static TypeHandle get_class_type() {
     return _type_handle;
diff --git a/panda/src/recorder/socketStreamRecorder.h b/panda/src/recorder/socketStreamRecorder.h
index b7df26475d..1ad7af2b4e 100644
--- a/panda/src/recorder/socketStreamRecorder.h
+++ b/panda/src/recorder/socketStreamRecorder.h
@@ -42,7 +42,8 @@ class DatagramIterator;
 //               straight through to the socket if it is connected, or
 //               silently ignored if it is not.
 ////////////////////////////////////////////////////////////////////
-class EXPCL_PANDA_RECORDER SocketStreamRecorder : public RecorderBase {
+class EXPCL_PANDA_RECORDER SocketStreamRecorder : public RecorderBase,
+                                                  public ReferenceCount {
 PUBLISHED:
   INLINE SocketStreamRecorder();
   INLINE SocketStreamRecorder(SocketStream *stream, bool owns_stream);
@@ -78,6 +79,9 @@ public:
   static void register_with_read_factory();
   virtual void write_recorder(BamWriter *manager, Datagram &dg);
 
+  INLINE virtual void ref() const FINAL { ReferenceCount::ref(); };
+  INLINE virtual bool unref() const FINAL { return ReferenceCount::unref(); };
+
 protected:
   static RecorderBase *make_recorder(const FactoryParams &params);
   void fillin_recorder(DatagramIterator &scan, BamReader *manager);
diff --git a/panda/src/rocket/rocketInputHandler.cxx b/panda/src/rocket/rocketInputHandler.cxx
index 4abb0366d2..58408ae08e 100644
--- a/panda/src/rocket/rocketInputHandler.cxx
+++ b/panda/src/rocket/rocketInputHandler.cxx
@@ -259,6 +259,15 @@ do_transmit_data(DataGraphTraverser *trav, const DataNodeTransmit &input,
 
       case ButtonEvent::T_move:
         break;
+
+      case ButtonEvent::T_candidate:
+        break;
+
+      case ButtonEvent::T_raw_down:
+        break;
+
+      case ButtonEvent::T_raw_up:
+        break;
       }
     }
   }
diff --git a/panda/src/rocket/rocketRenderInterface.cxx b/panda/src/rocket/rocketRenderInterface.cxx
index fe62db3c70..2813b89d5c 100644
--- a/panda/src/rocket/rocketRenderInterface.cxx
+++ b/panda/src/rocket/rocketRenderInterface.cxx
@@ -123,14 +123,13 @@ render_geom(const Geom* geom, const RenderState* state, const Rocket::Core::Vect
       << *state << ", translation (" << offset << ")\n";
   }
 
-  CPT(TransformState) net_transform, modelview_transform;
-  net_transform = _net_transform->compose(TransformState::make_pos(offset));
-  modelview_transform = _trav->get_world_transform()->compose(net_transform);
+  CPT(TransformState) internal_transform =
+    _trav->get_scene()->get_cs_world_transform()->compose(
+      _net_transform->compose(TransformState::make_pos(offset)));
 
   CullableObject *object =
     new CullableObject(geom, _net_state->compose(state),
-                       net_transform, modelview_transform,
-                       _trav->get_scene());
+                       internal_transform);
   _trav->get_cull_handler()->record_object(object, _trav);
 }
 
diff --git a/panda/src/rocket/rocketSystemInterface.cxx b/panda/src/rocket/rocketSystemInterface.cxx
index c417c60339..2f0d3acce6 100644
--- a/panda/src/rocket/rocketSystemInterface.cxx
+++ b/panda/src/rocket/rocketSystemInterface.cxx
@@ -51,6 +51,10 @@ LogMessage(Rocket::Core::Log::Type type, const Rocket::Core::String& message) {
     return true;
   case Rocket::Core::Log::LT_DEBUG:
     rocket_cat->debug() << message.CString() << "\n";
+    return true;
+  case Rocket::Core::Log::LT_MAX:
+    // Not really sent; just to keep compiler happy
+    break;
   }
   return true;
 }
diff --git a/panda/src/speedtree/config_speedtree.cxx b/panda/src/speedtree/config_speedtree.cxx
index 6f2eed9d30..8f4c69a075 100644
--- a/panda/src/speedtree/config_speedtree.cxx
+++ b/panda/src/speedtree/config_speedtree.cxx
@@ -116,11 +116,11 @@ ConfigVariableDouble speedtree_fog_distance
  PRC_DESC("Specifies the nearest and farthest distance of the fog on trees "
           "and terrain."));
 
-ConfigVariableDouble speedtree_fog_color
+ConfigVariableColor speedtree_fog_color
 ("speedtree-fog-color", "1.0 1.0 1.0",
  PRC_DESC("Specifies the r g b color of SpeedTree fog."));
 
-ConfigVariableDouble speedtree_sky_color
+ConfigVariableColor speedtree_sky_color
 ("speedtree-sky-color", "0.2 0.3 0.5",
  PRC_DESC("Specifies the r g b color of the SpeedTree sky, when the sky "
           "is enabled.  Currently unused."));
@@ -129,7 +129,7 @@ ConfigVariableDouble speedtree_sky_fog
 ("speedtree-sky-fog", "-0.5 1.0",
  PRC_DESC("Specifies the range of fog in the sky.  -1 is down, 1 is up."));
 
-ConfigVariableDouble speedtree_sun_color
+ConfigVariableColor speedtree_sun_color
 ("speedtree-sun-color", "1.0 1.0 0.85",
  PRC_DESC("Specifies the r g b color of the SpeedTree sun, when the sun "
           "is enabled.  Currently unused."));
@@ -146,12 +146,12 @@ ConfigVariableDouble speedtree_sun_fog_bloom
 ("speedtree-sun-fog-bloom", 0.0,
  PRC_DESC("Undocumented SpeedTree parameter."));
 
-ConfigVariableDouble speedtree_specular_color
+ConfigVariableColor speedtree_specular_color
 ("speedtree-specular-color", "1 1 1",
  PRC_DESC("Specifies the r g b color of the specular reflections on SpeedTree "
           "surfaces."));
 
-ConfigVariableDouble speedtree_emissive_color
+ConfigVariableColor speedtree_emissive_color
 ("speedtree-emissive-color", "0 0 0",
  PRC_DESC("Specifies the r g b color of the emissive light effect on SpeedTree "
           "surfaces."));
diff --git a/panda/src/speedtree/config_speedtree.h b/panda/src/speedtree/config_speedtree.h
index 852b3f2775..3d75e36a50 100644
--- a/panda/src/speedtree/config_speedtree.h
+++ b/panda/src/speedtree/config_speedtree.h
@@ -22,6 +22,7 @@
 #include "configVariableString.h"
 #include "configVariableInt.h"
 #include "configVariableFilename.h"
+#include "configVariableColor.h"
 
 NotifyCategoryDecl(speedtree, EXPCL_PANDASPEEDTREE, EXPTP_PANDASPEEDTREE);
 
@@ -43,16 +44,16 @@ extern ConfigVariableBool speedtree_detail_normal_mapping;
 extern ConfigVariableBool speedtree_ambient_contrast;
 extern ConfigVariableDouble speedtree_transmission_scalar;
 extern ConfigVariableDouble speedtree_fog_distance;
-extern ConfigVariableDouble speedtree_fog_color;
-extern ConfigVariableDouble speedtree_sky_color;
+extern ConfigVariableColor speedtree_fog_color;
+extern ConfigVariableColor speedtree_sky_color;
 extern ConfigVariableDouble speedtree_sky_fog_min;
 extern ConfigVariableDouble speedtree_sky_fog_max;
-extern ConfigVariableDouble speedtree_sun_color;
+extern ConfigVariableColor speedtree_sun_color;
 extern ConfigVariableDouble speedtree_sun_size;
 extern ConfigVariableDouble speedtree_sun_spread_exponent;
 extern ConfigVariableDouble speedtree_sun_fog_bloom;
-extern ConfigVariableDouble speedtree_specular_color;
-extern ConfigVariableDouble speedtree_emissive_color;
+extern ConfigVariableColor speedtree_specular_color;
+extern ConfigVariableColor speedtree_emissive_color;
 extern ConfigVariableInt speedtree_shadow_map_resolution;
 extern ConfigVariableDouble speedtree_cascading_shadow_splits;
 extern ConfigVariableBool speedtree_smooth_shadows;
diff --git a/panda/src/speedtree/speedTreeNode.cxx b/panda/src/speedtree/speedTreeNode.cxx
index 0b7639eb7e..c95cf43d42 100644
--- a/panda/src/speedtree/speedTreeNode.cxx
+++ b/panda/src/speedtree/speedTreeNode.cxx
@@ -332,7 +332,7 @@ add_instances_from(const SpeedTreeNode *other) {
     const InstanceList &other_instance_list = other->get_instance_list(ti);
     const STTree *tree = other_instance_list.get_tree();
     InstanceList &this_instance_list = add_tree(tree);
-    
+
     int num_instances = other_instance_list.get_num_instances();
     for (int i = 0; i < num_instances; ++i) {
       STTransform other_trans = other_instance_list.get_instance(i);
@@ -356,7 +356,7 @@ add_instances_from(const SpeedTreeNode *other, const TransformState *transform)
     const InstanceList &other_instance_list = other->get_instance_list(ti);
     const STTree *tree = other_instance_list.get_tree();
     InstanceList &this_instance_list = add_tree(tree);
-    
+
     int num_instances = other_instance_list.get_num_instances();
     for (int i = 0; i < num_instances; ++i) {
       CPT(TransformState) other_trans = other_instance_list.get_instance(i);
@@ -388,8 +388,8 @@ add_instances_from(const SpeedTreeNode *other, const TransformState *transform)
 //               slope_min and slope_max are ignored.
 ////////////////////////////////////////////////////////////////////
 void SpeedTreeNode::
-add_random_instances(const STTree *tree, int quantity, 
-                     PN_stdfloat x_min, PN_stdfloat x_max, 
+add_random_instances(const STTree *tree, int quantity,
+                     PN_stdfloat x_min, PN_stdfloat x_max,
                      PN_stdfloat y_min, PN_stdfloat y_max,
                      PN_stdfloat scale_min, PN_stdfloat scale_max,
                      PN_stdfloat height_min, PN_stdfloat height_max,
@@ -417,7 +417,7 @@ add_random_instances(const STTree *tree, int quantity,
         }
       }
       transform._pos[2] = _terrain->get_height(transform._pos[0], transform._pos[1]);
-      
+
     } else {
       // No terrain; just pick a random height.
       transform._pos[2] = randomizer.random_real(height_max - height_min) + height_min;
@@ -484,7 +484,7 @@ add_from_stf(const Filename &stf_filename, const LoaderOptions &options) {
 //               NULL, the default global Loader is used instead.
 ////////////////////////////////////////////////////////////////////
 bool SpeedTreeNode::
-add_from_stf(istream &in, const Filename &pathname, 
+add_from_stf(istream &in, const Filename &pathname,
              const LoaderOptions &options, Loader *loader) {
   if (loader == NULL) {
     loader = Loader::get_global_ptr();
@@ -701,7 +701,7 @@ reload_config() {
   int num_shadow_maps = speedtree_cascading_shadow_splits.get_num_words();
   if (num_shadow_maps > SpeedTree::c_nMaxNumShadowMaps) {
     speedtree_cat.warning()
-      << "SpeedTree is current compiled to support a maximum of " 
+      << "SpeedTree is current compiled to support a maximum of "
       << SpeedTree::c_nMaxNumShadowMaps << " shadow maps.\n";
     num_shadow_maps = SpeedTree::c_nMaxNumShadowMaps;
   }
@@ -719,8 +719,8 @@ reload_config() {
   render_info.m_nMaxBillboardImagesByBase = speedtree_max_billboard_images_by_base;
   render_info.m_fVisibility = speedtree_visibility;
   render_info.m_fGlobalLightScalar = speedtree_global_light_scalar;
-  render_info.m_sLightMaterial.m_vSpecular = SpeedTree::Vec4(speedtree_specular_color[0], speedtree_specular_color[1], speedtree_specular_color[2], 1.0f);
-  render_info.m_sLightMaterial.m_vEmissive = SpeedTree::Vec4(speedtree_emissive_color[0], speedtree_emissive_color[1], speedtree_emissive_color[2], 1.0f);
+  render_info.m_sLightMaterial.m_vSpecular = SpeedTree::Vec4(speedtree_specular_color[0], speedtree_specular_color[1], speedtree_specular_color[2], speedtree_specular_color[3]);
+  render_info.m_sLightMaterial.m_vEmissive = SpeedTree::Vec4(speedtree_emissive_color[0], speedtree_emissive_color[1], speedtree_emissive_color[2], speedtree_emissive_color[3]);
   render_info.m_bSpecularLighting = speedtree_specular_lighting;
   render_info.m_bTransmissionLighting = speedtree_transmission_lighting;
   render_info.m_bDetailLayer = speedtree_detail_layer;
@@ -747,7 +747,7 @@ reload_config() {
   _forest_render.SetRenderInfo(render_info);
 
   _terrain_render.SetMaxAnisotropy(speedtree_max_anisotropy);
-  _terrain_render.SetHint(SpeedTree::CTerrain::HINT_MAX_NUM_VISIBLE_CELLS, 
+  _terrain_render.SetHint(SpeedTree::CTerrain::HINT_MAX_NUM_VISIBLE_CELLS,
                           speedtree_max_num_visible_cells);
   _visible_terrain.Reserve(speedtree_max_num_visible_cells);
 
@@ -787,12 +787,12 @@ authorize(const string &license) {
         SpeedTree::CCore::Authorize(speedtree_license.c_str());
       }
     }
-                                                             
+
     _authorized = SpeedTree::CCore::IsAuthorized();
 
     SpeedTree::CCore::SetTextureFlip(true);
   }
-  
+
   return _authorized;
 }
 
@@ -821,7 +821,7 @@ SpeedTreeNode(const SpeedTreeNode &copy) :
 
   // No way to copy these parameters, so we just re-assign them.
   _terrain_render.SetMaxAnisotropy(speedtree_max_anisotropy);
-  _terrain_render.SetHint(SpeedTree::CTerrain::HINT_MAX_NUM_VISIBLE_CELLS, 
+  _terrain_render.SetHint(SpeedTree::CTerrain::HINT_MAX_NUM_VISIBLE_CELLS,
                           speedtree_max_num_visible_cells);
   _visible_terrain.Reserve(speedtree_max_num_visible_cells);
 
@@ -848,7 +848,7 @@ SpeedTreeNode(const SpeedTreeNode &copy) :
 ////////////////////////////////////////////////////////////////////
 //     Function: SpeedTreeNode::Destructor
 //       Access: Published, Virtual
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 SpeedTreeNode::
 ~SpeedTreeNode() {
@@ -980,7 +980,7 @@ cull_callback(CullTraverser *trav, CullTraverserData &data) {
   ClockObject *clock = ClockObject::get_global_clock();
   _forest_render.SetGlobalTime(clock->get_frame_time() + _time_delta + _global_time_delta);
   _forest_render.AdvanceGlobalWind();
-  
+
   // Compute the modelview and camera transforms, to pass to the
   // SpeedTree CView structure.
   CPT(TransformState) orig_modelview = data.get_modelview_transform(trav);
@@ -989,11 +989,11 @@ cull_callback(CullTraverser *trav, CullTraverserData &data) {
   LMatrix4f modelview_mat = LCAST(float, modelview->get_mat());
   const LPoint3 &camera_pos = camera_transform->get_pos();
   const Lens *lens = trav->get_scene()->get_lens();
-  
+
   LMatrix4f projection_mat =
     LCAST(float, LMatrix4::convert_mat(gsg->get_internal_coordinate_system(), lens->get_coordinate_system()) *
           lens->get_projection_mat());
-  
+
   _view.Set(SpeedTree::Vec3(camera_pos[0], camera_pos[1], camera_pos[2]),
             SpeedTree::Mat4x4(projection_mat.get_data()),
             SpeedTree::Mat4x4(modelview_mat.get_data()),
@@ -1041,7 +1041,7 @@ cull_callback(CullTraverser *trav, CullTraverserData &data) {
       }
     }
   }
-    
+
   if (dlight != (DirectionalLight *)NULL) {
     CPT(TransformState) transform = dlight_np.get_transform(trav->get_scene()->get_scene_root().get_parent());
     LVector3 dir = dlight->get_direction() * transform->get_mat();
@@ -1118,11 +1118,9 @@ add_for_draw(CullTraverser *trav, CullTraverserData &data) {
     // We create a CullableObject that has an explicit draw_callback
     // into this node, so that we can make the appropriate calls into
     // SpeedTree to render the forest during the actual draw.
-    CullableObject *object = 
+    CullableObject *object =
       new CullableObject(NULL, data._state,
-                         TransformState::make_identity(),
-                         TransformState::make_identity(),
-                         trav->get_scene());
+                         TransformState::make_identity());
     object->set_draw_callback(new DrawCallback(this));
     trav->get_cull_handler()->record_object(object, trav);
   }
@@ -1208,7 +1206,7 @@ output(ostream &out) const {
 ////////////////////////////////////////////////////////////////////
 //     Function: SpeedTreeNode::write
 //       Access: Public, Virtual
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 void SpeedTreeNode::
 write(ostream &out, int indent_level) const {
@@ -1219,7 +1217,7 @@ write(ostream &out, int indent_level) const {
   Trees::const_iterator ti;
   for (ti = _trees.begin(); ti != _trees.end(); ++ti) {
     InstanceList *instance_list = (*ti);
-    indent(out, indent_level + 2) 
+    indent(out, indent_level + 2)
       << *instance_list << "\n";
   }
   */
@@ -1254,7 +1252,7 @@ set_transparent_texture_mode(SpeedTree::ETextureAlphaRenderMode eMode) const {
   SpeedTree::CRenderState::SetBlending(false);
   SpeedTree::CRenderState::SetAlphaTesting(false);
   SpeedTree::CRenderState::SetAlphaToCoverage(false);
-  
+
   switch (eMode) {
   case SpeedTree::TRANS_TEXTURE_ALPHA_TESTING:
     SpeedTree::CRenderState::SetAlphaTesting(true);
@@ -1291,7 +1289,7 @@ init_node() {
     return;
   }
 
-  _forest_render.SetHint(SpeedTree::CForest::HINT_MAX_NUM_VISIBLE_CELLS, 
+  _forest_render.SetHint(SpeedTree::CForest::HINT_MAX_NUM_VISIBLE_CELLS,
                          speedtree_max_num_visible_cells);
 
   _forest_render.SetCullCellSize(speedtree_cull_cell_size);
@@ -1354,7 +1352,7 @@ repopulate() {
       write_error(speedtree_cat.warning());
     }
   }
-  
+
   _forest_render.GetPopulationStats(_population_stats);
   print_forest_stats(_population_stats);
 
@@ -1379,8 +1377,8 @@ repopulate() {
   }
 
   _visible_trees.Reserve(_forest_render.GetBaseTrees(),
-                         _forest_render.GetBaseTrees().size(), 
-                         speedtree_max_num_visible_cells, 
+                         _forest_render.GetBaseTrees().size(),
+                         speedtree_max_num_visible_cells,
                          max_instances_by_cell,
                          speedtree_horizontal_billboards);
 }
@@ -1401,8 +1399,8 @@ update_terrain_cells() {
   PN_stdfloat cell_size = _terrain_render.GetCellSize();
 
   // A temporary vertex data object for populating terrain.
-  PT(GeomVertexData) vertex_data = 
-    new GeomVertexData("terrain", _terrain->get_vertex_format(), 
+  PT(GeomVertexData) vertex_data =
+    new GeomVertexData("terrain", _terrain->get_vertex_format(),
                        GeomEnums::UH_static);
   int num_vertices = num_tile_res * num_tile_res;
   vertex_data->set_num_rows(num_vertices);
@@ -1428,7 +1426,7 @@ update_terrain_cells() {
     nassertv(vbo->NumVertices() == num_tile_res * num_tile_res);
     nassertv(vbo->NumVertices() * vbo->VertexSize() == handle->get_data_size_bytes());
     vbo->OverwriteVertices(data_pointer, num_vertices, 0);
-  }    
+  }
 }
 
 ////////////////////////////////////////////////////////////////////
@@ -1501,12 +1499,12 @@ draw_callback(CallbackData *data) {
       << "Couldn't set view parameters\n";
     write_error(speedtree_cat.warning());
   }
-  
+
   if (has_terrain()) {
     PStatTimer timer1(_draw_speedtree_terrain_pcollector);
     // Is this needed for terrain?
     _terrain_render.UploadShaderConstants
-      (&_forest_render, _light_dir, 
+      (&_forest_render, _light_dir,
        _forest_render.GetRenderInfo().m_sLightMaterial);
 
     // set terrain render states
@@ -1515,14 +1513,14 @@ draw_callback(CallbackData *data) {
     // render actual terrain
     bool terrain = _terrain_render.Render
       (&_forest_render, _visible_terrain, SpeedTree::RENDER_PASS_STANDARD,
-       _light_dir, _forest_render.GetRenderInfo().m_sLightMaterial, 
+       _light_dir, _forest_render.GetRenderInfo().m_sLightMaterial,
        &_forest_render.GetRenderStats());
 
     if (!terrain) {
       speedtree_cat.warning()
         << "Failed to render terrain\n";
       write_error(speedtree_cat.warning());
-      
+
       // Clear the terrain so we don't keep spamming error messages.
       _terrain = NULL;
     }
@@ -1537,7 +1535,7 @@ draw_callback(CallbackData *data) {
     //SpeedTree::ETextureAlphaRenderMode mode = SpeedTree::TRANS_TEXTURE_BLENDING;
     //SpeedTree::ETextureAlphaRenderMode mode = SpeedTree::TRANS_TEXTURE_NOTHING;
     set_transparent_texture_mode(SpeedTree::ETextureAlphaRenderMode(mode));
-    
+
     bool branches = _forest_render.RenderBranches(_visible_trees, SpeedTree::RENDER_PASS_STANDARD);
     bool fronds = _forest_render.RenderFronds(_visible_trees, SpeedTree::RENDER_PASS_STANDARD);
     bool leaf_meshes = _forest_render.RenderLeafMeshes(_visible_trees, SpeedTree::RENDER_PASS_STANDARD);
@@ -1548,7 +1546,7 @@ draw_callback(CallbackData *data) {
     // disabled; but the billboards appear to have been rendered
     // successfully.  Weird.  Just removing this test from the
     // condition.
-    
+
     if (!branches || !fronds || !leaf_meshes || !leaf_cards /* || !billboards */) {
       speedtree_cat.warning()
         << "Failed to render forest completely: "
@@ -1592,27 +1590,27 @@ render_forest_into_shadow_maps() {
   for (int smi = 0; smi < (int)_shadow_infos.size(); ++smi) {
     const SpeedTree::CView &light_view = _shadow_infos[smi]._light_view;
     const SpeedTree::SForestCullResults &light_cull = _shadow_infos[smi]._light_cull;
-    
+
     if (_forest_render.BeginShadowMap(smi, light_view)) {
       success &= _forest_render.UploadViewShaderParameters(light_view);
-      
+
       // branch geometry can be rendered with backfacing triangle
       // removed, so a closer tolerance can be used
       SpeedTree::CRenderState::SetPolygonOffset(1.0f, 0.125f);
-      
+
       success &= _forest_render.RenderBranches(light_cull, SpeedTree::RENDER_PASS_SHADOW);
-      
+
       // the remaining geometry types cannot be backface culled, so we
       // need a much more aggressive offset
       SpeedTree::CRenderState::SetPolygonOffset(10.0f, 1.0f);
-      
+
       success &= _forest_render.RenderFronds(light_cull, SpeedTree::RENDER_PASS_SHADOW);
       success &= _forest_render.RenderLeafMeshes(light_cull, SpeedTree::RENDER_PASS_SHADOW);
       success &= _forest_render.RenderLeafCards(light_cull, SpeedTree::RENDER_PASS_SHADOW, light_view);
-      
+
       // We don't bother to render billboard geometry into the shadow
       // map(s).
-      
+
       success &= _forest_render.EndShadowMap(smi);
     }
   }
@@ -1640,7 +1638,7 @@ setup_for_render(GraphicsStateGuardian *gsg) {
     // This is the first time we have entered the draw callback since
     // creating any SpeedTreeNode.  Now we have an opportunity to do
     // any initial setup that requires a graphics context.
-    
+
 #ifdef SPEEDTREE_OPENGL
     // For OpenGL, we have to ensure GLEW has been initialized.
     // (SpeedTree uses it, though Panda doesn't.)
@@ -1684,7 +1682,7 @@ setup_for_render(GraphicsStateGuardian *gsg) {
       if (instances.empty()) {
         continue;
       }
-      
+
       int max_instances = 2;
       SpeedTree::CMap<const SpeedTree::CTree*, SpeedTree::st_int32>::const_iterator si;
       si = _population_stats.m_mMaxNumInstancesPerCellPerBase.find(tree->get_tree());
@@ -1708,7 +1706,7 @@ setup_for_render(GraphicsStateGuardian *gsg) {
 #endif
       }
 
-      if (!_forest_render.InitTreeGraphics((SpeedTree::CTreeRender *)tree->get_tree(), 
+      if (!_forest_render.InitTreeGraphics((SpeedTree::CTreeRender *)tree->get_tree(),
                                            max_instances, speedtree_horizontal_billboards,
                                            os_textures_dir.c_str())) {
         if (speedtree_cat.is_debug()) {
@@ -1735,7 +1733,7 @@ setup_for_render(GraphicsStateGuardian *gsg) {
 
     if (has_terrain()) {
       // Now initialize the terrain.
-      if (!_terrain_render.Init(speedtree_terrain_num_lods, 
+      if (!_terrain_render.Init(speedtree_terrain_num_lods,
                                 speedtree_terrain_resolution,
                                 speedtree_terrain_cell_size,
                                 _terrain->get_st_vertex_format())) {
@@ -1780,9 +1778,9 @@ cull_forest() {
       SpeedTree::SForestCullResultsRender &light_cull = _shadow_infos[smi]._light_cull;
 
       _forest_render.ComputeLightView
-        (_forest_render.GetLightDir(), _view.GetFrustumPoints(), smi, 
+        (_forest_render.GetLightDir(), _view.GetFrustumPoints(), smi,
          light_view, 0.0f);
-      
+
       light_view.SetLodRefPoint(_view.GetCameraPos());
       _forest_render.CullAndComputeLOD(light_view, light_cull, false);
     }
@@ -1793,7 +1791,7 @@ cull_forest() {
 ////////////////////////////////////////////////////////////////////
 //     Function: SpeedTreeNode::print_forest_stats
 //       Access: Private
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 void SpeedTreeNode::
 print_forest_stats(const SpeedTree::CForest::SPopulationStats &forest_stats) const {
@@ -1894,7 +1892,7 @@ fillin(DatagramIterator &scan, BamReader *manager) {
 ////////////////////////////////////////////////////////////////////
 //     Function: SpeedTreeNode::InstanceList::output
 //       Access: Published
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 void SpeedTreeNode::InstanceList::
 output(ostream &out) const {
@@ -1904,7 +1902,7 @@ output(ostream &out) const {
 ////////////////////////////////////////////////////////////////////
 //     Function: SpeedTreeNode::InstanceList::write
 //       Access: Published
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 void SpeedTreeNode::InstanceList::
 write(ostream &out, int indent_level) const {
diff --git a/panda/src/text/config_text.h b/panda/src/text/config_text.h
index fb0a0f674c..279f05d083 100644
--- a/panda/src/text/config_text.h
+++ b/panda/src/text/config_text.h
@@ -36,9 +36,9 @@ extern ConfigVariableInt text_texture_margin;
 extern ConfigVariableDouble text_poly_margin;
 extern ConfigVariableInt text_page_size;
 extern ConfigVariableBool text_small_caps;
-extern ConfigVariableDouble text_small_caps_scale;
+extern EXPCL_PANDA_TEXT ConfigVariableDouble text_small_caps_scale;
 extern ConfigVariableFilename text_default_font;
-extern ConfigVariableDouble text_tab_width;
+extern EXPCL_PANDA_TEXT ConfigVariableDouble text_tab_width;
 extern ConfigVariableInt text_push_properties_key;
 extern ConfigVariableInt text_pop_properties_key;
 extern ConfigVariableInt text_soft_hyphen_key;
@@ -48,7 +48,7 @@ extern wstring get_text_soft_hyphen_output();
 extern ConfigVariableDouble text_hyphen_ratio;
 extern wstring get_text_never_break_before();
 extern ConfigVariableInt text_max_never_break;
-extern ConfigVariableDouble text_default_underscore_height;
+extern EXPCL_PANDA_TEXT ConfigVariableDouble text_default_underscore_height;
 
 extern ConfigVariableEnum<SamplerState::FilterType> text_minfilter;
 extern ConfigVariableEnum<SamplerState::FilterType> text_magfilter;
diff --git a/panda/src/tform/Sources.pp b/panda/src/tform/Sources.pp
index 4758570edc..d57c054cc2 100644
--- a/panda/src/tform/Sources.pp
+++ b/panda/src/tform/Sources.pp
@@ -7,7 +7,7 @@
     p3grutil p3dgraph p3pgraph p3linmath p3display p3event p3putil p3gobj p3gsgbase \
     p3mathutil p3device
 
-  #define COMBINED_SOURCES $[TARGET]_composite1.cxx $[TARGET]_composite2.cxx 
+  #define COMBINED_SOURCES $[TARGET]_composite1.cxx $[TARGET]_composite2.cxx
 
   #define SOURCES  \
     buttonThrower.I buttonThrower.h \
@@ -16,12 +16,12 @@
     mouseInterfaceNode.I mouseInterfaceNode.h \
     mouseSubregion.I mouseSubregion.h \
     mouseWatcher.I mouseWatcher.h \
-    mouseWatcherGroup.h \
+    mouseWatcherBase.h mouseWatcherGroup.h \
     mouseWatcherParameter.I mouseWatcherParameter.h \
     mouseWatcherRegion.I mouseWatcherRegion.h \
     trackball.h \
-    transform2sg.h  
-     
+    transform2sg.h
+
   #define INCLUDED_SOURCES  \
     buttonThrower.cxx \
     config_tform.cxx \
@@ -29,10 +29,12 @@
     mouseInterfaceNode.cxx \
     mouseSubregion.cxx \
     mouseWatcher.cxx \
+    mouseWatcherBase.cxx \
     mouseWatcherGroup.cxx \
-    mouseWatcherParameter.cxx mouseWatcherRegion.cxx  \
+    mouseWatcherParameter.cxx
+    mouseWatcherRegion.cxx \
     trackball.cxx \
-    transform2sg.cxx 
+    transform2sg.cxx
 
   #define INSTALL_HEADERS \
     buttonThrower.I buttonThrower.h \
@@ -40,7 +42,7 @@
     mouseInterfaceNode.I mouseInterfaceNode.h \
     mouseSubregion.I mouseSubregion.h \
     mouseWatcher.I mouseWatcher.h \
-    mouseWatcherGroup.h \
+    mouseWatcherBase.h mouseWatcherGroup.h \
     mouseWatcherParameter.I mouseWatcherParameter.h \
     mouseWatcherRegion.I mouseWatcherRegion.h \
     trackball.h \
diff --git a/panda/src/tform/config_tform.cxx b/panda/src/tform/config_tform.cxx
index fbe2e3b988..b5bcaf7ae0 100644
--- a/panda/src/tform/config_tform.cxx
+++ b/panda/src/tform/config_tform.cxx
@@ -18,6 +18,7 @@
 #include "buttonThrower.h"
 #include "mouseSubregion.h"
 #include "mouseWatcher.h"
+#include "mouseWatcherBase.h"
 #include "mouseWatcherGroup.h"
 #include "mouseWatcherRegion.h"
 #include "trackball.h"
@@ -67,6 +68,7 @@ ConfigureFn(config_tform) {
   MouseInterfaceNode::init_type();
   MouseSubregion::init_type();
   MouseWatcher::init_type();
+  MouseWatcherBase::init_type();
   MouseWatcherGroup::init_type();
   MouseWatcherRegion::init_type();
   Trackball::init_type();
diff --git a/panda/src/tform/mouseWatcher.cxx b/panda/src/tform/mouseWatcher.cxx
index f0b5f9d34e..8bc19ca2d7 100644
--- a/panda/src/tform/mouseWatcher.cxx
+++ b/panda/src/tform/mouseWatcher.cxx
@@ -44,7 +44,7 @@ TypeHandle MouseWatcher::_type_handle;
 //  Description:
 ////////////////////////////////////////////////////////////////////
 MouseWatcher::
-MouseWatcher(const string &name) : 
+MouseWatcher(const string &name) :
   DataNode(name)
 {
   _pixel_xy_input = define_input("pixel_xy", EventStoreVec2::get_class_type());
@@ -73,24 +73,24 @@ MouseWatcher(const string &name) :
   _button_down_display_region = (DisplayRegion *)NULL;
 
   _frame.set(-1.0f, 1.0f, -1.0f, 1.0f);
-  
+
   _inactivity_timeout = inactivity_timeout;
   _has_inactivity_timeout = !IS_NEARLY_ZERO(_inactivity_timeout);
-  
+
   _num_trail_recent = 0;
   _trail_log_duration = 0.0;
   _trail_log = new PointerEventList();
-  
+
   _inactivity_timeout_event = "inactivity_timeout";
   _last_activity = 0.0;
   _inactivity_state = IS_active;
-  
+
   // When this flag is true, the mouse pointer is allowed to be
   // "entered" into multiple regions simultaneously; when false, it
   // will only be "within" multiple regions, but "entered" into the
   // topmost of those.
   _enter_multiple = false;
-  
+
   // When this flag is true, moving the pointer into a region is
   // enough to click it.  The click is simulated with mouse button
   // one.
@@ -128,7 +128,7 @@ remove_region(MouseWatcherRegion *region) {
     _preferred_button_down_region = (MouseWatcherRegion *)NULL;
   }
 
-  return MouseWatcherGroup::do_remove_region(region);
+  return MouseWatcherBase::do_remove_region(region);
 }
 
 ////////////////////////////////////////////////////////////////////
@@ -156,7 +156,7 @@ get_over_region(const LPoint2 &pos) const {
 //               regions the MouseWatcher will monitor each frame.
 //
 //               Since the MouseWatcher itself inherits from
-//               MouseWatcherGroup, this operation is normally not
+//               MouseWatcherBase, this operation is normally not
 //               necessary--you can simply add the Regions you care
 //               about one at a time.  Adding a complete group is
 //               useful when you may want to explicitly remove the
@@ -171,7 +171,7 @@ add_group(MouseWatcherGroup *group) {
 
   // See if the group is in the set/vector already
   PT(MouseWatcherGroup) pt = group;
-  Groups::const_iterator gi = 
+  Groups::const_iterator gi =
     find(_groups.begin(), _groups.end(), pt);
   if (gi != _groups.end()) {
     // Already in the set, return false
@@ -228,7 +228,7 @@ remove_group(MouseWatcherGroup *group) {
 
   // See if the group is in the set/vector
   PT(MouseWatcherGroup) pt = group;
-  Groups::iterator gi = 
+  Groups::iterator gi =
     find(_groups.begin(), _groups.end(), pt);
   if (gi != _groups.end()) {
     // Found it, now erase it
@@ -270,7 +270,7 @@ replace_group(MouseWatcherGroup *old_group, MouseWatcherGroup *new_group) {
 #ifndef NDEBUG
   if (!_show_regions_render2d.is_empty()) {
     old_group->do_hide_regions();
-    new_group->do_show_regions(_show_regions_render2d, _show_regions_bin_name, 
+    new_group->do_show_regions(_show_regions_render2d, _show_regions_bin_name,
                                _show_regions_draw_order);
   }
 #endif  // NDEBUG
@@ -327,7 +327,7 @@ replace_group(MouseWatcherGroup *old_group, MouseWatcherGroup *new_group) {
 
   // Add the new group, if it's not already there.
   PT(MouseWatcherGroup) pt = new_group;
-  Groups::iterator gi = 
+  Groups::iterator gi =
     find(_groups.begin(), _groups.end(), pt);
   if (gi == _groups.end()) {
     _groups.push_back(new_group);
@@ -338,7 +338,7 @@ replace_group(MouseWatcherGroup *old_group, MouseWatcherGroup *new_group) {
     new_group->do_update_regions();
   }
 #endif  // NDEBUG
-    
+
   // Remove the old group, if it is already there.
   pt = old_group;
   gi = find(_groups.begin(), _groups.end(), pt);
@@ -476,17 +476,17 @@ update_trail_node() {
   if (_trail_log->get_num_events() < 2) {
     return;
   }
-  
+
   PT(GeomVertexData) data = new GeomVertexData
     ("mouseTrailSegs", GeomVertexFormat::get_v3(), Geom::UH_static);
-  
+
   GeomVertexWriter vertex(data, InternalName::get_vertex());
-    
+
   PT(GeomLinestrips) lines = new GeomLinestrips(Geom::UH_static);
-  
+
   double xscale = 2.0 / _pixel_size->get_value().get_x();
   double yscale = 2.0 / _pixel_size->get_value().get_y();
-  
+
   for (int i=0; i<(int)_trail_log->get_num_events(); i++) {
     double x = (_trail_log->get_xpos(i) * xscale) - 1.0;
     double y = (_trail_log->get_ypos(i) * yscale) - 1.0;
@@ -565,7 +565,7 @@ void MouseWatcher::
 write(ostream &out, int indent_level) const {
   indent(out, indent_level)
     << "MouseWatcher " << get_name() << ":\n";
-  MouseWatcherGroup::write(out, indent_level + 2);
+  MouseWatcherBase::write(out, indent_level + 2);
 
   LightMutexHolder holder(_lock);
   if (!_groups.empty()) {
@@ -620,11 +620,11 @@ get_over_regions(MouseWatcher::Regions &regions, const LPoint2 &pos) const {
     for (ri = group->_regions.begin(); ri != group->_regions.end(); ++ri) {
       MouseWatcherRegion *region = (*ri);
       const LVecBase4 &frame = region->get_frame();
-      
+
       if (region->get_active() &&
           mx >= frame[0] && mx <= frame[1] &&
           my >= frame[2] && my <= frame[3]) {
-        
+
         regions.push_back(region);
       }
     }
@@ -750,9 +750,9 @@ set_current_regions(MouseWatcher::Regions &regions) {
     // Determine which is the "preferred region", if any.  This is the
     // topmost region that the mouse cursor is over, and the one that
     // we are considered "entered" into.
-    MouseWatcherRegion *new_preferred_region = 
+    MouseWatcherRegion *new_preferred_region =
       get_preferred_region(_current_regions);
-    
+
     if (_button_down && new_preferred_region != _preferred_button_down_region) {
       // If the button's being held down, we're only allowed to select
       // the preferred button down region.
@@ -786,9 +786,9 @@ clear_current_regions() {
     MouseWatcherParameter param;
     param.set_modifier_buttons(_mods);
     param.set_mouse(_mouse);
-    
+
     Regions::const_iterator old_ri = _current_regions.begin();
-    
+
     while (old_ri != _current_regions.end()) {
       // Here's a region we don't have any more.
       MouseWatcherRegion *old_region = (*old_ri);
@@ -796,7 +796,7 @@ clear_current_regions() {
       throw_event_pattern(_leave_pattern, old_region, ButtonHandle::none());
       ++old_ri;
     }
-    
+
     _current_regions.clear();
 
     if (_preferred_region != (MouseWatcherRegion *)NULL) {
@@ -815,9 +815,9 @@ clear_current_regions() {
 //               assumes the lock is already held.
 ////////////////////////////////////////////////////////////////////
 void MouseWatcher::
-do_show_regions(const NodePath &render2d, const string &bin_name, 
+do_show_regions(const NodePath &render2d, const string &bin_name,
                 int draw_order) {
-  MouseWatcherGroup::do_show_regions(render2d, bin_name, draw_order);
+  MouseWatcherBase::do_show_regions(render2d, bin_name, draw_order);
   _show_regions_render2d = render2d;
   _show_regions_bin_name = bin_name;
   _show_regions_draw_order = draw_order;
@@ -839,7 +839,7 @@ do_show_regions(const NodePath &render2d, const string &bin_name,
 ////////////////////////////////////////////////////////////////////
 void MouseWatcher::
 do_hide_regions() {
-  MouseWatcherGroup::do_hide_regions();
+  MouseWatcherBase::do_hide_regions();
   _show_regions_render2d = NodePath();
   _show_regions_bin_name = string();
   _show_regions_draw_order = 0;
@@ -1027,7 +1027,7 @@ press(ButtonHandle button, bool keyrepeat) {
 
   if (MouseButton::is_mouse_button(button)) {
     // Mouse buttons are inextricably linked to the mouse position.
-    
+
     if (!_button_down) {
       _preferred_button_down_region = _preferred_region;
     }
@@ -1043,7 +1043,7 @@ press(ButtonHandle button, bool keyrepeat) {
                             _preferred_button_down_region, button);
       }
     }
-    
+
   } else {
     // It's a keyboard button; therefore, send the event to every
     // region that wants keyboard buttons, regardless of the mouse
@@ -1084,7 +1084,7 @@ release(ButtonHandle button) {
   if (MouseButton::is_mouse_button(button)) {
     // Button up.  Send the up event associated with the region(s) we
     // were over when the button went down.
-    
+
     // There is some danger of losing button-up events here.  If
     // more than one button goes down together, we won't detect
     // both of the button-up events properly.
@@ -1097,7 +1097,7 @@ release(ButtonHandle button) {
 
     _button_down = false;
     _preferred_button_down_region = (MouseWatcherRegion *)NULL;
-    
+
   } else {
     // It's a keyboard button; therefore, send the event to every
     // region that wants keyboard buttons, regardless of the mouse
@@ -1105,7 +1105,7 @@ release(ButtonHandle button) {
     if (_preferred_region != (MouseWatcherRegion *)NULL) {
       _preferred_region->release(param);
     }
-    
+
     param.set_outside(true);
     global_keyboard_release(param);
   }
@@ -1166,7 +1166,7 @@ keystroke(int keycode) {
 //               highlighted in the IME.
 ////////////////////////////////////////////////////////////////////
 void MouseWatcher::
-candidate(const wstring &candidate_string, size_t highlight_start, 
+candidate(const wstring &candidate_string, size_t highlight_start,
           size_t highlight_end, size_t cursor_pos) {
   nassertv(_lock.debug_is_locked());
 
@@ -1275,7 +1275,7 @@ global_keyboard_release(const MouseWatcherParameter &param) {
 ////////////////////////////////////////////////////////////////////
 //     Function: MouseWatcher::enter_region
 //       Access: Protected
-//  Description: Called internally to indicate the mouse pointer is 
+//  Description: Called internally to indicate the mouse pointer is
 //               favoring the indicated region.
 ////////////////////////////////////////////////////////////////////
 void MouseWatcher::
@@ -1326,7 +1326,7 @@ set_no_mouse() {
       _geometry->set_overall_hidden(true);
     }
   }
-  
+
   _has_mouse = false;
   clear_current_regions();
 }
@@ -1350,11 +1350,11 @@ set_mouse(const LVecBase2 &xy, const LVecBase2 &pixel_xy) {
       _geometry->set_overall_hidden(false);
     }
   }
-  
+
   _has_mouse = true;
   _mouse = xy;
   _mouse_pixel = pixel_xy;
-    
+
   Regions regions;
   get_over_regions(regions, _mouse);
   set_current_regions(regions);
@@ -1366,7 +1366,7 @@ set_mouse(const LVecBase2 &xy, const LVecBase2 &pixel_xy) {
 //  Description: If we send any keyboard events to a region that has
 //               the SF_other_button suppress flag set, that means we
 //               should not send the keyboard event along the data
-//               graph.  
+//               graph.
 //
 //               This method is called as each keyboard event is sent
 //               to a region; it should update the internal
@@ -1436,7 +1436,7 @@ do_transmit_data(DataGraphTraverser *trav, const DataNodeTransmit &input,
         // The mouse is outside the display region, even though it's
         // within the window.  This is considered not having a mouse.
         set_no_mouse();
-        
+
         // This also means we should suppress mouse button events below us.
         _internal_suppress |= MouseWatcherRegion::SF_mouse_button;
       }
@@ -1469,7 +1469,7 @@ do_transmit_data(DataGraphTraverser *trav, const DataNodeTransmit &input,
   if (_num_trail_recent > _trail_log->get_num_events()) {
     _num_trail_recent = _trail_log->get_num_events();
   }
-  
+
   // If the mouse is over a particular region, or still considered
   // owned by a region because of a recent button-down event, that
   // region determines whether we suppress events below us.
@@ -1561,7 +1561,7 @@ do_transmit_data(DataGraphTraverser *trav, const DataNodeTransmit &input,
   if (_has_inactivity_timeout) {
     if (activity) {
       note_activity();
-      
+
     } else {
       double now = ClockObject::get_global_clock()->get_frame_time();
       double elapsed = now - _last_activity;
@@ -1575,10 +1575,10 @@ do_transmit_data(DataGraphTraverser *trav, const DataNodeTransmit &input,
 
         case IS_inactive:
           break;
-          
+
         case IS_active_to_inactive:
           break;
-          
+
         case IS_inactive_to_active:
           _inactivity_state = IS_inactive;
           break;
@@ -1591,7 +1591,7 @@ do_transmit_data(DataGraphTraverser *trav, const DataNodeTransmit &input,
   case IS_active:
   case IS_inactive:
     break;
-    
+
   case IS_active_to_inactive:
     // "Release" all of the currently-held buttons.
     if (tform_cat.is_debug()) {
@@ -1610,7 +1610,7 @@ do_transmit_data(DataGraphTraverser *trav, const DataNodeTransmit &input,
     _inactivity_state = IS_inactive;
     throw_event(_inactivity_timeout_event);
     break;
-    
+
   case IS_inactive_to_active:
     // "Press" all of the buttons we "released" before.
     {
@@ -1643,20 +1643,20 @@ do_transmit_data(DataGraphTraverser *trav, const DataNodeTransmit &input,
   for (int i = 0; i < num_events; i++) {
     const ButtonEvent &be = new_button_events.get_event(i);
     bool suppress = true;
-    
-    if (be._type != ButtonEvent::T_keystroke && 
+
+    if (be._type != ButtonEvent::T_keystroke &&
         MouseButton::is_mouse_button(be._button)) {
       suppress = ((suppress_buttons & MouseWatcherRegion::SF_mouse_button) != 0);
     } else {
       suppress = ((suppress_buttons & MouseWatcherRegion::SF_other_button) != 0);
     }
-    
+
     if (!suppress || be._type == ButtonEvent::T_up) {
       // Don't suppress this button event; pass it through.
       _button_events->add_event(be);
     }
   }
-  
+
   if (_button_events->get_num_events() != 0) {
     output.set_data(_button_events_output, EventParameter(_button_events));
   }
@@ -1673,7 +1673,7 @@ do_transmit_data(DataGraphTraverser *trav, const DataNodeTransmit &input,
 //               leaves f and p unchanged, and returns false.
 ////////////////////////////////////////////////////////////////////
 bool MouseWatcher::
-constrain_display_region(DisplayRegion *display_region, 
+constrain_display_region(DisplayRegion *display_region,
                          LVecBase2 &f, LVecBase2 &p,
                          Thread *current_thread) {
   if (!_button_down) {
@@ -1700,7 +1700,7 @@ constrain_display_region(DisplayRegion *display_region,
   DisplayRegionPipelineReader dr_reader(display_region, current_thread);
   PN_stdfloat left, right, bottom, top;
   dr_reader.get_dimensions(left, right, bottom, top);
-  
+
   // Need to translate this into DisplayRegion [0, 1] space
   PN_stdfloat x = (f[0] + 1.0f) / 2.0f;
   PN_stdfloat y = (f[1] + 1.0f) / 2.0f;
@@ -1715,18 +1715,18 @@ constrain_display_region(DisplayRegion *display_region,
   if (_button_down) {
     _button_down_display_region = display_region;
   }
-  
+
   // Scale in DR space
   PN_stdfloat xp = (x - left) / (right - left);
   // Translate back into [-1, 1] space
   PN_stdfloat xpp = (xp * 2.0f) - 1.0f;
-  
+
   PN_stdfloat yp = (y - bottom) / (top - bottom);
   PN_stdfloat ypp = (yp * 2.0f) - 1.0f;
-  
+
   int xo, yo, w, h;
   dr_reader.get_region_pixels_i(xo, yo, w, h);
-  
+
   f.set(xpp, ypp);
   p.set(p[0] - xo, p[1] - yo);
   return true;
diff --git a/panda/src/tform/mouseWatcher.h b/panda/src/tform/mouseWatcher.h
index 447114498f..c5e8c145e1 100644
--- a/panda/src/tform/mouseWatcher.h
+++ b/panda/src/tform/mouseWatcher.h
@@ -61,11 +61,11 @@ class DisplayRegion;
 //               it took to get there.  This information is mainly useful
 //               for gesture-recognition code.  To use trail logging,
 //               you need to enable the generation of pointer events
-//               in the GraphicsWindowInputDevice and set the trail 
+//               in the GraphicsWindowInputDevice and set the trail
 //               log duration in the MouseWatcher. Otherwise, the
 //               trail log will be empty.
 ////////////////////////////////////////////////////////////////////
-class EXPCL_PANDA_TFORM MouseWatcher : public DataNode, public MouseWatcherGroup {
+class EXPCL_PANDA_TFORM MouseWatcher : public DataNode, public MouseWatcherBase {
 PUBLISHED:
   MouseWatcher(const string &name = "");
   ~MouseWatcher();
@@ -143,14 +143,14 @@ PUBLISHED:
 
   INLINE void set_inactivity_timeout_event(const string &event);
   INLINE const string &get_inactivity_timeout_event() const;
-  
+
   INLINE CPT(PointerEventList) get_trail_log() const;
   INLINE int   num_trail_recent() const;
   void         set_trail_log_duration(double duration);
   PT(GeomNode) get_trail_node();
   void         clear_trail_node();
   INLINE void  clear_trail_log();
-  
+
   void note_activity();
 
 public:
@@ -179,7 +179,7 @@ protected:
                                  MouseWatcherRegion *region);
   static bool has_region_in(const Regions &regions,
                             MouseWatcherRegion *region);
-    
+
   void throw_event_pattern(const string &pattern,
                            const MouseWatcherRegion *region,
                            const ButtonHandle &button);
@@ -188,9 +188,9 @@ protected:
   void press(ButtonHandle button, bool keyrepeat);
   void release(ButtonHandle button);
   void keystroke(int keycode);
-  void candidate(const wstring &candidate, size_t highlight_start, 
+  void candidate(const wstring &candidate, size_t highlight_start,
                  size_t highlight_end, size_t cursor_pos);
-                 
+
   void global_keyboard_press(const MouseWatcherParameter &param);
   void global_keyboard_release(const MouseWatcherParameter &param);
 
@@ -207,10 +207,10 @@ private:
   void discard_excess_trail_log();
   void update_trail_node();
 
-  bool constrain_display_region(DisplayRegion *display_region, 
+  bool constrain_display_region(DisplayRegion *display_region,
                                 LVecBase2 &f, LVecBase2 &p,
                                 Thread *current_thread);
-  
+
 private:
   // This wants to be a set, but because you cannot export sets across
   // dlls in windows, we will make it a vector instead
@@ -230,7 +230,7 @@ private:
   int _num_trail_recent;
   double _trail_log_duration;
   PT(GeomNode) _trail_node;
-  
+
   Regions _current_regions;
   PT(MouseWatcherRegion) _preferred_region;
   PT(MouseWatcherRegion) _preferred_button_down_region;
@@ -248,7 +248,7 @@ private:
   string _without_pattern;
 
   PT(PandaNode) _geometry;
-  
+
   EventHandler *_eh;
   ModifierButtons _mods;
   DisplayRegion *_display_region;
diff --git a/panda/src/tform/mouseWatcherBase.cxx b/panda/src/tform/mouseWatcherBase.cxx
new file mode 100644
index 0000000000..6a5a92aa4c
--- /dev/null
+++ b/panda/src/tform/mouseWatcherBase.cxx
@@ -0,0 +1,443 @@
+// Filename: mouseWatcherBase.cxx
+// Created by:  rdb (13Jan14)
+//
+////////////////////////////////////////////////////////////////////
+//
+// 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 "mouseWatcherBase.h"
+#include "lineSegs.h"
+#include "indent.h"
+#include "lightMutexHolder.h"
+
+TypeHandle MouseWatcherBase::_type_handle;
+
+////////////////////////////////////////////////////////////////////
+//     Function: MouseWatcherBase::Constructor
+//       Access: Public
+//  Description:
+////////////////////////////////////////////////////////////////////
+MouseWatcherBase::
+MouseWatcherBase() :
+  _lock("MouseWatcherBase")
+{
+  _sorted = true;
+#ifndef NDEBUG
+  _show_regions = false;
+  _color.set(0.4, 0.6f, 1.0f, 1.0f);
+#endif  // NDEBUG
+}
+
+////////////////////////////////////////////////////////////////////
+//     Function: MouseWatcherBase::Destructor
+//       Access: Public, Virtual
+//  Description:
+////////////////////////////////////////////////////////////////////
+MouseWatcherBase::
+~MouseWatcherBase() {
+}
+
+////////////////////////////////////////////////////////////////////
+//     Function: MouseWatcherBase::add_region
+//       Access: Published
+//  Description: Adds the indicated region to the set of regions in
+//               the group.  It is an error to add the same region to
+//               the set more than once.
+////////////////////////////////////////////////////////////////////
+void MouseWatcherBase::
+add_region(MouseWatcherRegion *region) {
+  PT(MouseWatcherRegion) pt = region;
+
+  LightMutexHolder holder(_lock);
+
+  // We will only bother to check for duplicates in the region list if
+  // we are building a development Panda.  The overhead for doing this
+  // may be too high if we have many regions.
+#ifdef _DEBUG
+  // See if the region is in the set/vector already
+  Regions::const_iterator ri =
+    find(_regions.begin(), _regions.end(), pt);
+  nassertv(ri == _regions.end());
+#endif  // _DEBUG
+
+#ifndef NDEBUG
+  // Also add it to the vizzes if we have them.
+  if (_show_regions) {
+    nassertv(_vizzes.size() == _regions.size());
+    _vizzes.push_back(make_viz_region(pt));
+  }
+#endif  // NDEBUG
+
+  _regions.push_back(pt);
+  _sorted = false;
+}
+
+////////////////////////////////////////////////////////////////////
+//     Function: MouseWatcherBase::has_region
+//       Access: Published
+//  Description: Returns true if the indicated region has already been
+//               added to the MouseWatcherBase, false otherwise.
+////////////////////////////////////////////////////////////////////
+bool MouseWatcherBase::
+has_region(MouseWatcherRegion *region) const {
+  LightMutexHolder holder(_lock);
+
+  PT(MouseWatcherRegion) ptr = region;
+
+  if (_sorted) {
+    // If the vector is already sorted, we can do this the quick way.
+    Regions::const_iterator ri = lower_bound(_regions.begin(), _regions.end(), ptr);
+    return (ri != _regions.end() && (*ri) == ptr);
+  }
+
+  // If the vector isn't sorted, do a linear scan.
+  Regions::const_iterator ri = find(_regions.begin(), _regions.end(), ptr);
+  return (ri != _regions.end());
+}
+
+////////////////////////////////////////////////////////////////////
+//     Function: MouseWatcherBase::remove_region
+//       Access: Published
+//  Description: Removes the indicated region from the group.
+//               Returns true if it was successfully removed, or false
+//               if it wasn't there in the first place.
+////////////////////////////////////////////////////////////////////
+bool MouseWatcherBase::
+remove_region(MouseWatcherRegion *region) {
+  LightMutexHolder holder(_lock);
+  return do_remove_region(region);
+}
+
+////////////////////////////////////////////////////////////////////
+//     Function: MouseWatcherBase::find_region
+//       Access: Published
+//  Description: Returns a pointer to the first region found with the
+//               indicated name.  If multiple regions share the same
+//               name, the one that is returned is indeterminate.
+////////////////////////////////////////////////////////////////////
+MouseWatcherRegion *MouseWatcherBase::
+find_region(const string &name) const {
+  LightMutexHolder holder(_lock);
+
+  Regions::const_iterator ri;
+  for (ri = _regions.begin(); ri != _regions.end(); ++ri) {
+    MouseWatcherRegion *region = (*ri);
+    if (region->get_name() == name) {
+      return region;
+    }
+  }
+
+  return (MouseWatcherRegion *)NULL;
+}
+
+////////////////////////////////////////////////////////////////////
+//     Function: MouseWatcherBase::clear_regions
+//       Access: Published
+//  Description: Removes all the regions from the group.
+////////////////////////////////////////////////////////////////////
+void MouseWatcherBase::
+clear_regions() {
+  LightMutexHolder holder(_lock);
+
+  _regions.clear();
+  _sorted = true;
+
+#ifndef NDEBUG
+  if (_show_regions) {
+    _show_regions_root.node()->remove_all_children();
+    _vizzes.clear();
+  }
+#endif  // NDEBUG
+}
+
+////////////////////////////////////////////////////////////////////
+//     Function: MouseWatcherBase::sort_regions
+//       Access: Published
+//  Description: Sorts all the regions in this group into pointer
+//               order.
+////////////////////////////////////////////////////////////////////
+void MouseWatcherBase::
+sort_regions() {
+  LightMutexHolder holder(_lock);
+  do_sort_regions();
+}
+
+////////////////////////////////////////////////////////////////////
+//     Function: MouseWatcherBase::is_sorted
+//       Access: Published
+//  Description: Returns true if the group has already been sorted,
+//               false otherwise.
+////////////////////////////////////////////////////////////////////
+bool MouseWatcherBase::
+is_sorted() const {
+  LightMutexHolder holder(_lock);
+
+  return _sorted;
+}
+
+////////////////////////////////////////////////////////////////////
+//     Function: MouseWatcherBase::get_num_regions
+//       Access: Published
+//  Description: Returns the number of regions in the group.
+////////////////////////////////////////////////////////////////////
+int MouseWatcherBase::
+get_num_regions() const {
+  LightMutexHolder holder(_lock);
+
+  return _regions.size();
+}
+
+////////////////////////////////////////////////////////////////////
+//     Function: MouseWatcherBase::get_region
+//       Access: Published
+//  Description: Returns the nth region of the group; returns NULL if
+//               there is no nth region.  Note that this is not
+//               thread-safe; another thread might have removed the
+//               nth region before you called this method.
+////////////////////////////////////////////////////////////////////
+MouseWatcherRegion *MouseWatcherBase::
+get_region(int n) const {
+  LightMutexHolder holder(_lock);
+  if (n >= 0 && n < (int)_regions.size()) {
+    return _regions[n];
+  }
+  return NULL;
+}
+
+////////////////////////////////////////////////////////////////////
+//     Function: MouseWatcherBase::output
+//       Access: Published
+//  Description:
+////////////////////////////////////////////////////////////////////
+void MouseWatcherBase::
+output(ostream &out) const {
+  out << "MouseWatcherBase (" << _regions.size() << " regions)";
+}
+
+////////////////////////////////////////////////////////////////////
+//     Function: MouseWatcherBase::write
+//       Access: Published
+//  Description:
+////////////////////////////////////////////////////////////////////
+void MouseWatcherBase::
+write(ostream &out, int indent_level) const {
+  LightMutexHolder holder(_lock);
+
+  Regions::const_iterator ri;
+  for (ri = _regions.begin(); ri != _regions.end(); ++ri) {
+    MouseWatcherRegion *region = (*ri);
+    region->write(out, indent_level);
+  }
+}
+
+#ifndef NDEBUG
+////////////////////////////////////////////////////////////////////
+//     Function: MouseWatcherBase::show_regions
+//       Access: Published
+//  Description: Enables the visualization of all of the regions
+//               handled by this MouseWatcherBase.  The supplied
+//               NodePath should be the root of the 2-d scene graph
+//               for the window.
+////////////////////////////////////////////////////////////////////
+void MouseWatcherBase::
+show_regions(const NodePath &render2d, const string &bin_name, int draw_order) {
+  LightMutexHolder holder(_lock);
+  do_show_regions(render2d, bin_name, draw_order);
+}
+#endif  // NDEBUG
+
+#ifndef NDEBUG
+////////////////////////////////////////////////////////////////////
+//     Function: MouseWatcherBase::set_color
+//       Access: Published
+//  Description: Specifies the color used to draw the region
+//               rectangles for the regions visualized by
+//               show_regions().
+////////////////////////////////////////////////////////////////////
+void MouseWatcherBase::
+set_color(const LColor &color) {
+  LightMutexHolder holder(_lock);
+
+  _color = color;
+  do_update_regions();
+}
+#endif  // NDEBUG
+
+#ifndef NDEBUG
+////////////////////////////////////////////////////////////////////
+//     Function: MouseWatcherBase::hide_regions
+//       Access: Published
+//  Description: Stops the visualization created by a previous call to
+//               show_regions().
+////////////////////////////////////////////////////////////////////
+void MouseWatcherBase::
+hide_regions() {
+  LightMutexHolder holder(_lock);
+  do_hide_regions();
+}
+#endif  // NDEBUG
+
+#ifndef NDEBUG
+////////////////////////////////////////////////////////////////////
+//     Function: MouseWatcherBase::update_regions
+//       Access: Published
+//  Description: Refreshes the visualization created by
+//               show_regions().
+////////////////////////////////////////////////////////////////////
+void MouseWatcherBase::
+update_regions() {
+  LightMutexHolder holder(_lock);
+  do_update_regions();
+}
+#endif  // NDEBUG
+
+
+////////////////////////////////////////////////////////////////////
+//     Function: MouseWatcherBase::do_sort_regions
+//       Access: Protected
+//  Description: Sorts all the regions in this group into pointer
+//               order.  Assumes the lock is already held.
+////////////////////////////////////////////////////////////////////
+void MouseWatcherBase::
+do_sort_regions() {
+  if (!_sorted) {
+    sort(_regions.begin(), _regions.end());
+    _sorted = true;
+  }
+}
+
+////////////////////////////////////////////////////////////////////
+//     Function: MouseWatcherBase::do_remove_region
+//       Access: Protected
+//  Description: The internal implementation of remove_region();
+//               assumes the lock is already held.
+////////////////////////////////////////////////////////////////////
+bool MouseWatcherBase::
+do_remove_region(MouseWatcherRegion *region) {
+  // See if the region is in the vector.
+  PT(MouseWatcherRegion) ptr = region;
+  Regions::iterator ri;
+
+  if (_sorted) {
+    // Faster, binary search
+    ri = lower_bound(_regions.begin(), _regions.end(), ptr);
+  } else {
+    // Unsorted, so use slower linear scan
+    ri = find(_regions.begin(), _regions.end(), ptr);
+  }
+
+  if (ri != _regions.end() && (*ri) == ptr) {
+    // Found it, now erase it
+#ifndef NDEBUG
+    // Also remove it from the vizzes.
+    if (_show_regions) {
+      nassertr(_vizzes.size() == _regions.size(), false);
+      size_t index = ri - _regions.begin();
+      Vizzes::iterator vi = _vizzes.begin() + index;
+      _show_regions_root.node()->remove_child(*vi);
+      _vizzes.erase(vi);
+    }
+#endif  // NDEBUG
+
+    _regions.erase(ri);
+    return true;
+  }
+
+  // Did not find the region to erase
+  return false;
+}
+
+#ifndef NDEBUG
+////////////////////////////////////////////////////////////////////
+//     Function: MouseWatcherBase::do_show_regions
+//       Access: Protected, Virtual
+//  Description: The protected implementation of show_regions().  This
+//               assumes the lock is already held.
+////////////////////////////////////////////////////////////////////
+void MouseWatcherBase::
+do_show_regions(const NodePath &render2d, const string &bin_name,
+                int draw_order) {
+  do_hide_regions();
+  _show_regions = true;
+  _show_regions_root = render2d.attach_new_node("show_regions");
+  _show_regions_root.set_bin(bin_name, draw_order);
+  do_update_regions();
+}
+#endif  // NDEBUG
+
+#ifndef NDEBUG
+////////////////////////////////////////////////////////////////////
+//     Function: MouseWatcherBase::do_hide_regions
+//       Access: Protected, Virtual
+//  Description: The protected implementation of hide_regions().  This
+//               assumes the lock is already held.
+////////////////////////////////////////////////////////////////////
+void MouseWatcherBase::
+do_hide_regions() {
+  _show_regions_root.remove_node();
+  _show_regions = false;
+  _vizzes.clear();
+}
+#endif  // NDEBUG
+
+#ifndef NDEBUG
+////////////////////////////////////////////////////////////////////
+//     Function: MouseWatcherBase::do_update_regions
+//       Access: Protected
+//  Description: Internally regenerates the show_regions()
+//               visualization.  Assumes the lock is already held.
+////////////////////////////////////////////////////////////////////
+void MouseWatcherBase::
+do_update_regions() {
+  nassertv(_lock.debug_is_locked());
+
+  if (_show_regions) {
+    _show_regions_root.node()->remove_all_children();
+    _vizzes.clear();
+    _vizzes.reserve(_regions.size());
+
+    Regions::const_iterator ri;
+    for (ri = _regions.begin(); ri != _regions.end(); ++ri) {
+      _vizzes.push_back(make_viz_region(*ri));
+    }
+  }
+}
+#endif  // NDEBUG
+
+
+#ifndef NDEBUG
+////////////////////////////////////////////////////////////////////
+//     Function: MouseWatcherBase::make_viz_region
+//       Access: Private
+//  Description: Creates a node to represent the indicated region, and
+//               attaches it to the _show_regions_root.  Does not add
+//               it to _vizzes.  Assumes the lock is already held.
+////////////////////////////////////////////////////////////////////
+PandaNode *MouseWatcherBase::
+make_viz_region(MouseWatcherRegion *region) {
+  nassertr(_lock.debug_is_locked(), NULL);
+
+  LineSegs ls("show_regions");
+  ls.set_color(_color);
+
+  const LVecBase4 &f = region->get_frame();
+
+  ls.move_to(LVector3::rfu(f[0], 0.0f, f[2]));
+  ls.draw_to(LVector3::rfu(f[1], 0.0f, f[2]));
+  ls.draw_to(LVector3::rfu(f[1], 0.0f, f[3]));
+  ls.draw_to(LVector3::rfu(f[0], 0.0f, f[3]));
+  ls.draw_to(LVector3::rfu(f[0], 0.0f, f[2]));
+
+  PT(PandaNode) node = ls.create();
+  _show_regions_root.attach_new_node(node);
+
+  return node;
+}
+#endif  // NDEBUG
diff --git a/panda/src/tform/mouseWatcherBase.h b/panda/src/tform/mouseWatcherBase.h
new file mode 100644
index 0000000000..c99ac726d1
--- /dev/null
+++ b/panda/src/tform/mouseWatcherBase.h
@@ -0,0 +1,113 @@
+// Filename: mouseWatcherBase.h
+// Created by:  rdb (13Jan14)
+//
+////////////////////////////////////////////////////////////////////
+//
+// 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 MOUSEWATCHERBASE_H
+#define MOUSEWATCHERBASE_H
+
+#include "pandabase.h"
+#include "mouseWatcherRegion.h"
+
+#include "pointerTo.h"
+#include "pvector.h"
+#include "nodePath.h"
+#include "lightMutex.h"
+
+////////////////////////////////////////////////////////////////////
+//       Class : MouseWatcherBase
+// Description : This represents a collection of MouseWatcherRegions
+//               that may be managed as a group.  This is the base
+//               class for both MouseWatcherGroup and MouseWatcher,
+//               and exists so that we don't have to make MouseWatcher
+//               inherit from ReferenceCount more than once.
+////////////////////////////////////////////////////////////////////
+class EXPCL_PANDA_TFORM MouseWatcherBase {
+public:
+  MouseWatcherBase();
+  virtual ~MouseWatcherBase();
+
+PUBLISHED:
+  void add_region(MouseWatcherRegion *region);
+  bool has_region(MouseWatcherRegion *region) const;
+  bool remove_region(MouseWatcherRegion *region);
+  MouseWatcherRegion *find_region(const string &name) const;
+  void clear_regions();
+
+  void sort_regions();
+  bool is_sorted() const;
+
+  int get_num_regions() const;
+  MouseWatcherRegion *get_region(int n) const;
+  MAKE_SEQ(get_regions, get_num_regions, get_region);
+
+  void output(ostream &out) const;
+  void write(ostream &out, int indent_level = 0) const;
+
+#ifndef NDEBUG
+  void show_regions(const NodePath &render2d,
+                    const string &bin_name, int draw_order);
+  void set_color(const LColor &color);
+  void hide_regions();
+
+  void update_regions();
+#endif  // NDEBUG
+
+protected:
+  void do_sort_regions();
+  bool do_remove_region(MouseWatcherRegion *region);
+
+#ifndef NDEBUG
+  virtual void do_show_regions(const NodePath &render2d,
+                               const string &bin_name, int draw_order);
+  virtual void do_hide_regions();
+  void do_update_regions();
+#endif  // NDEBUG
+
+protected:
+  typedef pvector< PT(MouseWatcherRegion) > Regions;
+  Regions _regions;
+  bool _sorted;
+
+  // This mutex protects the above list of regions, as well as the
+  // below list of vizzes.  It is also referenced directly by
+  // MouseWatcher, a derived class.
+  LightMutex _lock;
+
+private:
+#ifndef NDEBUG
+  PandaNode *make_viz_region(MouseWatcherRegion *region);
+
+  typedef pvector< PT(PandaNode) > Vizzes;
+  Vizzes _vizzes;
+
+  bool _show_regions;
+  NodePath _show_regions_root;
+  LColor _color;
+#endif  // NDEBUG
+
+public:
+  static TypeHandle get_class_type() {
+    return _type_handle;
+  }
+  static void init_type() {
+    register_type(_type_handle, "MouseWatcherBase");
+  }
+
+private:
+  static TypeHandle _type_handle;
+
+  friend class MouseWatcher;
+  friend class BlobWatcher;
+};
+
+#endif
diff --git a/panda/src/tform/mouseWatcherGroup.cxx b/panda/src/tform/mouseWatcherGroup.cxx
index 414820b24d..60629bb1f1 100644
--- a/panda/src/tform/mouseWatcherGroup.cxx
+++ b/panda/src/tform/mouseWatcherGroup.cxx
@@ -13,432 +13,5 @@
 ////////////////////////////////////////////////////////////////////
 
 #include "mouseWatcherGroup.h"
-#include "lineSegs.h"
-#include "indent.h"
-#include "lightMutexHolder.h"
 
 TypeHandle MouseWatcherGroup::_type_handle;
-
-////////////////////////////////////////////////////////////////////
-//     Function: MouseWatcherGroup::Constructor
-//       Access: Public
-//  Description: 
-////////////////////////////////////////////////////////////////////
-MouseWatcherGroup::
-MouseWatcherGroup() :
-  _lock("MouseWatcherGroup")
-{
-  _sorted = true;
-#ifndef NDEBUG
-  _show_regions = false;
-  _color.set(0.4, 0.6f, 1.0f, 1.0f);
-#endif  // NDEBUG
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: MouseWatcherGroup::Destructor
-//       Access: Public, Virtual
-//  Description: 
-////////////////////////////////////////////////////////////////////
-MouseWatcherGroup::
-~MouseWatcherGroup() {
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: MouseWatcherGroup::add_region
-//       Access: Published
-//  Description: Adds the indicated region to the set of regions in
-//               the group.  It is an error to add the same region to
-//               the set more than once.
-////////////////////////////////////////////////////////////////////
-void MouseWatcherGroup::
-add_region(MouseWatcherRegion *region) {
-  PT(MouseWatcherRegion) pt = region;
-
-  LightMutexHolder holder(_lock);
-
-  // We will only bother to check for duplicates in the region list if
-  // we are building a development Panda.  The overhead for doing this
-  // may be too high if we have many regions.
-#ifdef _DEBUG
-  // See if the region is in the set/vector already
-  Regions::const_iterator ri = 
-    find(_regions.begin(), _regions.end(), pt);
-  nassertv(ri == _regions.end());
-#endif  // _DEBUG
-
-#ifndef NDEBUG
-  // Also add it to the vizzes if we have them.
-  if (_show_regions) {
-    nassertv(_vizzes.size() == _regions.size());
-    _vizzes.push_back(make_viz_region(pt));
-  }
-#endif  // NDEBUG
-
-  _regions.push_back(pt);
-  _sorted = false;
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: MouseWatcherGroup::has_region
-//       Access: Published
-//  Description: Returns true if the indicated region has already been
-//               added to the MouseWatcherGroup, false otherwise.
-////////////////////////////////////////////////////////////////////
-bool MouseWatcherGroup::
-has_region(MouseWatcherRegion *region) const {
-  LightMutexHolder holder(_lock);
-
-  PT(MouseWatcherRegion) ptr = region;
-
-  if (_sorted) {
-    // If the vector is already sorted, we can do this the quick way.
-    Regions::const_iterator ri = lower_bound(_regions.begin(), _regions.end(), ptr);
-    return (ri != _regions.end() && (*ri) == ptr);
-  }
-
-  // If the vector isn't sorted, do a linear scan.
-  Regions::const_iterator ri = find(_regions.begin(), _regions.end(), ptr);
-  return (ri != _regions.end());
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: MouseWatcherGroup::remove_region
-//       Access: Published
-//  Description: Removes the indicated region from the group.
-//               Returns true if it was successfully removed, or false
-//               if it wasn't there in the first place.
-////////////////////////////////////////////////////////////////////
-bool MouseWatcherGroup::
-remove_region(MouseWatcherRegion *region) {
-  LightMutexHolder holder(_lock);
-  return do_remove_region(region);
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: MouseWatcherGroup::find_region
-//       Access: Published
-//  Description: Returns a pointer to the first region found with the
-//               indicated name.  If multiple regions share the same
-//               name, the one that is returned is indeterminate.
-////////////////////////////////////////////////////////////////////
-MouseWatcherRegion *MouseWatcherGroup::
-find_region(const string &name) const {
-  LightMutexHolder holder(_lock);
-
-  Regions::const_iterator ri;
-  for (ri = _regions.begin(); ri != _regions.end(); ++ri) {
-    MouseWatcherRegion *region = (*ri);
-    if (region->get_name() == name) {
-      return region;
-    }
-  }
-
-  return (MouseWatcherRegion *)NULL;
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: MouseWatcherGroup::clear_regions
-//       Access: Published
-//  Description: Removes all the regions from the group.
-////////////////////////////////////////////////////////////////////
-void MouseWatcherGroup::
-clear_regions() {
-  LightMutexHolder holder(_lock);
-
-  _regions.clear();
-  _sorted = true;
-
-#ifndef NDEBUG
-  if (_show_regions) {
-    _show_regions_root.node()->remove_all_children();
-    _vizzes.clear();
-  }
-#endif  // NDEBUG
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: MouseWatcherGroup::sort_regions
-//       Access: Published
-//  Description: Sorts all the regions in this group into pointer
-//               order.
-////////////////////////////////////////////////////////////////////
-void MouseWatcherGroup::
-sort_regions() {
-  LightMutexHolder holder(_lock);
-  do_sort_regions();
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: MouseWatcherGroup::is_sorted
-//       Access: Published
-//  Description: Returns true if the group has already been sorted,
-//               false otherwise.
-////////////////////////////////////////////////////////////////////
-bool MouseWatcherGroup::
-is_sorted() const {
-  LightMutexHolder holder(_lock);
-
-  return _sorted;
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: MouseWatcherGroup::get_num_regions
-//       Access: Published
-//  Description: Returns the number of regions in the group.
-////////////////////////////////////////////////////////////////////
-int MouseWatcherGroup::
-get_num_regions() const {
-  LightMutexHolder holder(_lock);
-
-  return _regions.size();
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: MouseWatcherGroup::get_region
-//       Access: Published
-//  Description: Returns the nth region of the group; returns NULL if
-//               there is no nth region.  Note that this is not
-//               thread-safe; another thread might have removed the
-//               nth region before you called this method.
-////////////////////////////////////////////////////////////////////
-MouseWatcherRegion *MouseWatcherGroup::
-get_region(int n) const {
-  LightMutexHolder holder(_lock);
-  if (n >= 0 && n < (int)_regions.size()) {
-    return _regions[n];
-  }
-  return NULL;
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: MouseWatcherGroup::output
-//       Access: Published
-//  Description:
-////////////////////////////////////////////////////////////////////
-void MouseWatcherGroup::
-output(ostream &out) const {
-  out << "MouseWatcherGroup (" << _regions.size() << " regions)";
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: MouseWatcherGroup::write
-//       Access: Published
-//  Description:
-////////////////////////////////////////////////////////////////////
-void MouseWatcherGroup::
-write(ostream &out, int indent_level) const {
-  LightMutexHolder holder(_lock);
-
-  Regions::const_iterator ri;
-  for (ri = _regions.begin(); ri != _regions.end(); ++ri) {
-    MouseWatcherRegion *region = (*ri);
-    region->write(out, indent_level);
-  }
-}
-
-#ifndef NDEBUG
-////////////////////////////////////////////////////////////////////
-//     Function: MouseWatcherGroup::show_regions
-//       Access: Published
-//  Description: Enables the visualization of all of the regions
-//               handled by this MouseWatcherGroup.  The supplied
-//               NodePath should be the root of the 2-d scene graph
-//               for the window.
-////////////////////////////////////////////////////////////////////
-void MouseWatcherGroup::
-show_regions(const NodePath &render2d, const string &bin_name, int draw_order) {
-  LightMutexHolder holder(_lock);
-  do_show_regions(render2d, bin_name, draw_order);
-}
-#endif  // NDEBUG
-
-#ifndef NDEBUG
-////////////////////////////////////////////////////////////////////
-//     Function: MouseWatcherGroup::set_color
-//       Access: Published
-//  Description: Specifies the color used to draw the region
-//               rectangles for the regions visualized by
-//               show_regions().
-////////////////////////////////////////////////////////////////////
-void MouseWatcherGroup::
-set_color(const LColor &color) {
-  LightMutexHolder holder(_lock);
-
-  _color = color;
-  do_update_regions();
-}
-#endif  // NDEBUG
-
-#ifndef NDEBUG
-////////////////////////////////////////////////////////////////////
-//     Function: MouseWatcherGroup::hide_regions
-//       Access: Published
-//  Description: Stops the visualization created by a previous call to
-//               show_regions().
-////////////////////////////////////////////////////////////////////
-void MouseWatcherGroup::
-hide_regions() {
-  LightMutexHolder holder(_lock);
-  do_hide_regions();
-}
-#endif  // NDEBUG
-
-#ifndef NDEBUG
-////////////////////////////////////////////////////////////////////
-//     Function: MouseWatcherGroup::update_regions
-//       Access: Published
-//  Description: Refreshes the visualization created by
-//               show_regions().
-////////////////////////////////////////////////////////////////////
-void MouseWatcherGroup::
-update_regions() {
-  LightMutexHolder holder(_lock);
-  do_update_regions();
-}
-#endif  // NDEBUG
-
-
-////////////////////////////////////////////////////////////////////
-//     Function: MouseWatcherGroup::do_sort_regions
-//       Access: Protected
-//  Description: Sorts all the regions in this group into pointer
-//               order.  Assumes the lock is already held.
-////////////////////////////////////////////////////////////////////
-void MouseWatcherGroup::
-do_sort_regions() {
-  if (!_sorted) {
-    sort(_regions.begin(), _regions.end());
-    _sorted = true;
-  }
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: MouseWatcherGroup::do_remove_region
-//       Access: Protected
-//  Description: The internal implementation of remove_region();
-//               assumes the lock is already held.
-////////////////////////////////////////////////////////////////////
-bool MouseWatcherGroup::
-do_remove_region(MouseWatcherRegion *region) {
-  // See if the region is in the vector.
-  PT(MouseWatcherRegion) ptr = region;
-  Regions::iterator ri;
-
-  if (_sorted) {
-    // Faster, binary search
-    ri = lower_bound(_regions.begin(), _regions.end(), ptr);
-  } else {
-    // Unsorted, so use slower linear scan
-    ri = find(_regions.begin(), _regions.end(), ptr);
-  }
-
-  if (ri != _regions.end() && (*ri) == ptr) {
-    // Found it, now erase it
-#ifndef NDEBUG
-    // Also remove it from the vizzes.
-    if (_show_regions) {
-      nassertr(_vizzes.size() == _regions.size(), false);
-      size_t index = ri - _regions.begin();
-      Vizzes::iterator vi = _vizzes.begin() + index;
-      _show_regions_root.node()->remove_child(*vi);
-      _vizzes.erase(vi);
-    }
-#endif  // NDEBUG    
-
-    _regions.erase(ri);
-    return true;
-  }
-
-  // Did not find the region to erase
-  return false;
-}
-
-#ifndef NDEBUG
-////////////////////////////////////////////////////////////////////
-//     Function: MouseWatcherGroup::do_show_regions
-//       Access: Protected, Virtual
-//  Description: The protected implementation of show_regions().  This
-//               assumes the lock is already held.
-////////////////////////////////////////////////////////////////////
-void MouseWatcherGroup::
-do_show_regions(const NodePath &render2d, const string &bin_name, 
-                int draw_order) {
-  do_hide_regions();
-  _show_regions = true;
-  _show_regions_root = render2d.attach_new_node("show_regions");
-  _show_regions_root.set_bin(bin_name, draw_order);
-  do_update_regions();
-}
-#endif  // NDEBUG
-
-#ifndef NDEBUG
-////////////////////////////////////////////////////////////////////
-//     Function: MouseWatcherGroup::do_hide_regions
-//       Access: Protected, Virtual
-//  Description: The protected implementation of hide_regions().  This
-//               assumes the lock is already held.
-////////////////////////////////////////////////////////////////////
-void MouseWatcherGroup::
-do_hide_regions() {
-  _show_regions_root.remove_node();
-  _show_regions = false;
-  _vizzes.clear();
-}
-#endif  // NDEBUG
-
-
-#ifndef NDEBUG
-////////////////////////////////////////////////////////////////////
-//     Function: MouseWatcherGroup::do_update_regions
-//       Access: Protected
-//  Description: Internally regenerates the show_regions()
-//               visualization.  Assumes the lock is already held.
-////////////////////////////////////////////////////////////////////
-void MouseWatcherGroup::
-do_update_regions() {
-  nassertv(_lock.debug_is_locked());
-
-  if (_show_regions) {
-    _show_regions_root.node()->remove_all_children();
-    _vizzes.clear();
-    _vizzes.reserve(_regions.size());
-    
-    Regions::const_iterator ri;
-    for (ri = _regions.begin(); ri != _regions.end(); ++ri) {
-      _vizzes.push_back(make_viz_region(*ri));
-    }
-  }
-}
-#endif  // NDEBUG
-
-
-#ifndef NDEBUG
-////////////////////////////////////////////////////////////////////
-//     Function: MouseWatcherGroup::make_viz_region
-//       Access: Private
-//  Description: Creates a node to represent the indicated region, and
-//               attaches it to the _show_regions_root.  Does not add
-//               it to _vizzes.  Assumes the lock is already held.
-////////////////////////////////////////////////////////////////////
-PandaNode *MouseWatcherGroup::
-make_viz_region(MouseWatcherRegion *region) {
-  nassertr(_lock.debug_is_locked(), NULL);
-
-  LineSegs ls("show_regions");
-  ls.set_color(_color);
-
-  const LVecBase4 &f = region->get_frame();
-
-  ls.move_to(LVector3::rfu(f[0], 0.0f, f[2]));
-  ls.draw_to(LVector3::rfu(f[1], 0.0f, f[2]));
-  ls.draw_to(LVector3::rfu(f[1], 0.0f, f[3]));
-  ls.draw_to(LVector3::rfu(f[0], 0.0f, f[3]));
-  ls.draw_to(LVector3::rfu(f[0], 0.0f, f[2]));
-
-  PT(PandaNode) node = ls.create();
-  _show_regions_root.attach_new_node(node);
-
-  return node;
-}
-#endif  // NDEBUG
diff --git a/panda/src/tform/mouseWatcherGroup.h b/panda/src/tform/mouseWatcherGroup.h
index 30b4f4d419..d07994581d 100644
--- a/panda/src/tform/mouseWatcherGroup.h
+++ b/panda/src/tform/mouseWatcherGroup.h
@@ -16,82 +16,20 @@
 #define MOUSEWATCHERGROUP_H
 
 #include "pandabase.h"
-#include "mouseWatcherRegion.h"
-
-#include "pointerTo.h"
+#include "mouseWatcherBase.h"
 #include "referenceCount.h"
-#include "pvector.h"
-#include "nodePath.h"
-#include "lightMutex.h"
 
 ////////////////////////////////////////////////////////////////////
 //       Class : MouseWatcherGroup
 // Description : This represents a collection of MouseWatcherRegions
-//               that may be managed as a group.
+//               that may be managed as a group.  The implementation
+//               for this is in MouseWatcherBase; this class exists
+//               so that we can inherit from ReferenceCount.
 ////////////////////////////////////////////////////////////////////
-class EXPCL_PANDA_TFORM MouseWatcherGroup : virtual public ReferenceCount {
+class EXPCL_PANDA_TFORM MouseWatcherGroup : public MouseWatcherBase,
+                                            public ReferenceCount {
 public:
-  MouseWatcherGroup();
-  virtual ~MouseWatcherGroup();
-
-PUBLISHED:
-  void add_region(MouseWatcherRegion *region);
-  bool has_region(MouseWatcherRegion *region) const;
-  bool remove_region(MouseWatcherRegion *region);
-  MouseWatcherRegion *find_region(const string &name) const;
-  void clear_regions();
-
-  void sort_regions();
-  bool is_sorted() const;
-
-  int get_num_regions() const;
-  MouseWatcherRegion *get_region(int n) const;
-  MAKE_SEQ(get_regions, get_num_regions, get_region);
-
-  void output(ostream &out) const;
-  void write(ostream &out, int indent_level = 0) const;
-
-#ifndef NDEBUG
-  void show_regions(const NodePath &render2d, 
-                    const string &bin_name, int draw_order);
-  void set_color(const LColor &color);
-  void hide_regions();
-
-  void update_regions();
-#endif  // NDEBUG
-
-protected:
-  void do_sort_regions();
-  bool do_remove_region(MouseWatcherRegion *region);
-
-#ifndef NDEBUG
-  virtual void do_show_regions(const NodePath &render2d, 
-                               const string &bin_name, int draw_order);
-  virtual void do_hide_regions();
-  void do_update_regions();
-#endif  // NDEBUG
-
-protected:
-  typedef pvector< PT(MouseWatcherRegion) > Regions;
-  Regions _regions;
-  bool _sorted;
-
-  // This mutex protects the above list of regions, as well as the
-  // below list of vizzes.  It is also referenced directly by
-  // MouseWatcher, a derived class.
-  LightMutex _lock;
-
-private:
-#ifndef NDEBUG
-  PandaNode *make_viz_region(MouseWatcherRegion *region);
-
-  typedef pvector< PT(PandaNode) > Vizzes;
-  Vizzes _vizzes;
-
-  bool _show_regions;
-  NodePath _show_regions_root;
-  LColor _color;
-#endif  // NDEBUG
+  INLINE MouseWatcherGroup() {};
 
 public:
   static TypeHandle get_class_type() {
@@ -105,9 +43,6 @@ public:
 
 private:
   static TypeHandle _type_handle;
-
-  friend class MouseWatcher;
-  friend class BlobWatcher;
 };
 
 #endif
diff --git a/panda/src/tform/p3tform_composite2.cxx b/panda/src/tform/p3tform_composite2.cxx
index 03ea6280c7..862c698071 100644
--- a/panda/src/tform/p3tform_composite2.cxx
+++ b/panda/src/tform/p3tform_composite2.cxx
@@ -1,4 +1,5 @@
 #include "mouseWatcher.cxx"
+#include "mouseWatcherBase.cxx"
 #include "mouseWatcherGroup.cxx"
 #include "mouseWatcherParameter.cxx"
 #include "mouseWatcherRegion.cxx"
diff --git a/panda/src/tinydisplay/tinyWinGraphicsWindow.cxx b/panda/src/tinydisplay/tinyWinGraphicsWindow.cxx
index b7a508c4ab..3f45a741c5 100755
--- a/panda/src/tinydisplay/tinyWinGraphicsWindow.cxx
+++ b/panda/src/tinydisplay/tinyWinGraphicsWindow.cxx
@@ -33,7 +33,7 @@ TypeHandle TinyWinGraphicsWindow::_type_handle;
 //  Description:
 ////////////////////////////////////////////////////////////////////
 TinyWinGraphicsWindow::
-TinyWinGraphicsWindow(GraphicsEngine *engine, GraphicsPipe *pipe, 
+TinyWinGraphicsWindow(GraphicsEngine *engine, GraphicsPipe *pipe,
                       const string &name,
                       const FrameBufferProperties &fb_prop,
                       const WindowProperties &win_prop,
@@ -85,7 +85,7 @@ begin_frame(FrameMode mode, Thread *current_thread) {
 
   tinygsg->_current_frame_buffer = _frame_buffer;
   tinygsg->reset_if_new();
-  
+
   _gsg->set_current_properties(&get_fb_properties());
   return _gsg->begin_frame(current_thread);
 }
@@ -152,7 +152,7 @@ end_flip() {
                bmdc, 0, 0,fb_xsize, fb_ysize,
                SRCCOPY);
   }
-    
+
   DeleteDC(bmdc);
   DeleteObject(bm);
   GdiFlush();
@@ -220,7 +220,7 @@ open_window() {
   } else {
     DCAST_INTO_R(tinygsg, _gsg, false);
   }
-  
+
   _hdc = GetDC(_hWnd);
 
   create_frame_buffer();
@@ -231,7 +231,7 @@ open_window() {
   }
 
   tinygsg->_current_frame_buffer = _frame_buffer;
-  
+
   tinygsg->reset_if_new();
   if (!tinygsg->is_valid()) {
     close_window();
@@ -251,8 +251,10 @@ open_window() {
 void TinyWinGraphicsWindow::
 handle_reshape() {
   WinGraphicsWindow::handle_reshape();
-  ZB_resize(_frame_buffer, NULL, _properties.get_x_size(), _properties.get_y_size());
-  setup_bitmap_info();
+  if (_frame_buffer != NULL) {
+    ZB_resize(_frame_buffer, NULL, _properties.get_x_size(), _properties.get_y_size());
+    setup_bitmap_info();
+  }
 }
 
 ////////////////////////////////////////////////////////////////////
diff --git a/panda/src/tinydisplay/zbuffer.cxx b/panda/src/tinydisplay/zbuffer.cxx
index a3b5c67343..fa5677398d 100644
--- a/panda/src/tinydisplay/zbuffer.cxx
+++ b/panda/src/tinydisplay/zbuffer.cxx
@@ -107,6 +107,8 @@ void
 ZB_resize(ZBuffer * zb, void *frame_buffer, int xsize, int ysize) {
   int size;
 
+  nassertv(zb != NULL);
+
   /* xsize must be a multiple of 4 */
   xsize = (xsize + 3) & ~3;
 
diff --git a/panda/src/tinydisplay/zgl.h b/panda/src/tinydisplay/zgl.h
index 05aec50ce1..c18cafa8b7 100644
--- a/panda/src/tinydisplay/zgl.h
+++ b/panda/src/tinydisplay/zgl.h
@@ -1,6 +1,8 @@
 #ifndef _tgl_zgl_h_
 #define _tgl_zgl_h_
 
+#include "dtoolbase.h"
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <math.h>
diff --git a/panda/src/vision/webcamVideoDS.cxx b/panda/src/vision/webcamVideoDS.cxx
index 66743387e0..bdbdc8d798 100644
--- a/panda/src/vision/webcamVideoDS.cxx
+++ b/panda/src/vision/webcamVideoDS.cxx
@@ -31,7 +31,9 @@
 
 #if defined(HAVE_DIRECTCAM) && !defined(CPPPARSER)
 
-#define WIN32_LEAN_AND_MEAN
+#ifndef WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN 1
+#endif
 
 #undef Configure
 
diff --git a/panda/src/wgldisplay/wglGraphicsBuffer.h b/panda/src/wgldisplay/wglGraphicsBuffer.h
index 72aac1247b..6e4fb286e8 100644
--- a/panda/src/wgldisplay/wglGraphicsBuffer.h
+++ b/panda/src/wgldisplay/wglGraphicsBuffer.h
@@ -22,7 +22,9 @@
 // This must be included after we have included glgsg.h (which
 // includes gl.h).
 #include "wglext.h"
-#define WIN32_LEAN_AND_MEAN
+#ifndef WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN 1
+#endif
 #include <windows.h>
 
 ////////////////////////////////////////////////////////////////////
diff --git a/panda/src/windisplay/Sources.pp b/panda/src/windisplay/Sources.pp
index 2496806250..cd450ca1b9 100644
--- a/panda/src/windisplay/Sources.pp
+++ b/panda/src/windisplay/Sources.pp
@@ -6,14 +6,14 @@
 
 #define BUILDING_DLL BUILDING_PANDAWIN
 
-#define USE_PACKAGES dx8 dx9
+#define USE_PACKAGES dx9
 
 #begin lib_target
   #define TARGET p3windisplay
   #define LOCAL_LIBS \
     p3display p3putil
     
-  #define COMBINED_SOURCES $[TARGET]_composite1.cxx winDetectDx9.cxx winDetectDx8.cxx
+  #define COMBINED_SOURCES $[TARGET]_composite1.cxx winDetectDx9.cxx
 
   #define SOURCES \
      config_windisplay.h \
@@ -30,7 +30,7 @@
   #define INCLUDED_SOURCES \
      config_windisplay.cxx winGraphicsPipe.cxx \
      winGraphicsWindow.cxx \
-     winDetectDx9.cxx winDetectDx8.cxx
+     winDetectDx9.cxx
 
   #define WIN_SYS_LIBS Imm32.lib winmm.lib kernel32.lib oldnames.lib user32.lib gdi32.lib
 
diff --git a/panda/src/windisplay/config_windisplay.cxx b/panda/src/windisplay/config_windisplay.cxx
index 5011101eb6..fe1919a6c9 100644
--- a/panda/src/windisplay/config_windisplay.cxx
+++ b/panda/src/windisplay/config_windisplay.cxx
@@ -57,10 +57,13 @@ ConfigVariableBool ime_hide
  PRC_DESC("Set this true to hide ime windows."));
 
 ConfigVariableBool request_dxdisplay_information
-("request-dxdisplay-information", true,
- PRC_DESC("Setting this to false skips some display information discovery "
-          "routines that can speed up initialization when DX support is "
-          "present."));
+("request-dxdisplay-information", false,
+ PRC_DESC("Setting this to true enables lumberingly slow and evil code at "
+          "start-up that creates a Direct3D window and subsequently fills up "
+          "up the video memory with dummy textures in order to find out how "
+          "much video memory there actually is.  Leave this disabled unless "
+          "you have a specific need for this information and don't mind "
+          "having a slow start-up."));
 
 ConfigVariableBool swapbuffer_framelock
 ("swapbuffer-framelock", false,
diff --git a/panda/src/windisplay/winDetectDx.h b/panda/src/windisplay/winDetectDx.h
index 58827aa570..f04d468090 100644
--- a/panda/src/windisplay/winDetectDx.h
+++ b/panda/src/windisplay/winDetectDx.h
@@ -38,10 +38,7 @@ static DISPLAY_FORMAT display_format_array [ ] = {
   D3DFMT_R5G6B5,      16, FALSE,
   D3DFMT_X1R5G5B5,    16, FALSE,
 
-#if DX8 
-#else
   D3DFMT_A2R10G10B10, 32, TRUE,
-#endif
 
   // terminator
   D3DFMT_UNKNOWN,      0, FALSE,
@@ -226,7 +223,7 @@ static int get_display_information (DisplaySearchParameters &display_search_para
           get_adapter_display_mode_state = true;
         }
         else {
-          get_adapter_display_mode_state = false;    
+          get_adapter_display_mode_state = false;
         }
 
         flags = 0;
@@ -234,10 +231,7 @@ static int get_display_information (DisplaySearchParameters &display_search_para
           // print adapter info
           d3d_adapter_identifier.Driver;
           d3d_adapter_identifier.Description;
-          #if DX8 
-          #else
           d3d_adapter_identifier.DeviceName;
-          #endif
           d3d_adapter_identifier.DriverVersion;
           d3d_adapter_identifier.VendorId;
           d3d_adapter_identifier.DeviceId;
@@ -245,12 +239,12 @@ static int get_display_information (DisplaySearchParameters &display_search_para
           d3d_adapter_identifier.Revision;
           d3d_adapter_identifier.DeviceIdentifier;
           d3d_adapter_identifier.WHQLLevel;
-          
+
           if (debug) {
             printf ("Driver: %s\n", d3d_adapter_identifier.Driver);
             printf ("Description: %s\n", d3d_adapter_identifier.Description);
           }
-          
+
           char system_directory [MAX_PATH];
           char dll_file_path [MAX_PATH];
 
@@ -338,9 +332,6 @@ static int get_display_information (DisplaySearchParameters &display_search_para
 
         if (direct_3d -> GetDeviceCaps (adapter, device_type, &d3d_caps) == D3D_OK) {
 
-#if DX8
-          // shaders not supported in DX8
-#else
           int vertex_shader_version_major;
           int vertex_shader_version_minor;
           int pixel_shader_version_major;
@@ -374,7 +365,6 @@ static int get_display_information (DisplaySearchParameters &display_search_para
               shader_model = GraphicsStateGuardian::SM_40;
               break;
           }
-#endif
 
           if (debug) {
             printf ("shader_model = %d \n", shader_model);
@@ -394,35 +384,26 @@ static int get_display_information (DisplaySearchParameters &display_search_para
         format_index = 0;
         maximum_display_modes = 0;
 
-        while (display_format_array [format_index].d3d_format != D3DFMT_UNKNOWN) {      
+        while (display_format_array [format_index].d3d_format != D3DFMT_UNKNOWN) {
           d3d_format = display_format_array [format_index].d3d_format;
 
-#if DX8
-          display_mode_count = direct_3d -> GetAdapterModeCount (adapter);
-#else
           display_mode_count = direct_3d -> GetAdapterModeCount (adapter, d3d_format);
-#endif
           if (display_mode_count > 0) {
             UINT mode_index;
             D3DDISPLAYMODE d3d_display_mode;
 
             for (mode_index = 0; mode_index < display_mode_count; mode_index++) {
-#if DX8
-              if (direct_3d -> EnumAdapterModes (adapter, mode_index, &d3d_display_mode) == D3D_OK)
-#else
-              if (direct_3d -> EnumAdapterModes (adapter, d3d_format, mode_index, &d3d_display_mode) == D3D_OK)
-#endif          
-              {
+              if (direct_3d -> EnumAdapterModes (adapter, d3d_format, mode_index, &d3d_display_mode) == D3D_OK) {
                 if (d3d_display_mode.Width >= minimum_width && d3d_display_mode.Height >= minimum_height &&
-                    d3d_display_mode.Width <= maximum_width && d3d_display_mode.Height <= maximum_height) {                  
+                    d3d_display_mode.Width <= maximum_width && d3d_display_mode.Height <= maximum_height) {
                   if (display_format_array [format_index].bits_per_pixel >= minimum_bits_per_pixel &&
-                      display_format_array [format_index].bits_per_pixel <= maximum_bits_per_pixel) {                
+                      display_format_array [format_index].bits_per_pixel <= maximum_bits_per_pixel) {
                     if (d3d_format == d3d_display_mode.Format) {
-                      maximum_display_modes++;                
+                      maximum_display_modes++;
                     }
                   }
                 }
-              }            
+              }
             }
           }
 
@@ -436,26 +417,17 @@ static int get_display_information (DisplaySearchParameters &display_search_para
         display_mode_array = new DisplayMode [maximum_display_modes];
 
         format_index = 0;
-        while (display_format_array [format_index].d3d_format != D3DFMT_UNKNOWN) {      
+        while (display_format_array [format_index].d3d_format != D3DFMT_UNKNOWN) {
           d3d_format = display_format_array [format_index].d3d_format;
-#if DX8
-          display_mode_count = direct_3d -> GetAdapterModeCount (adapter);
-#else
           display_mode_count = direct_3d -> GetAdapterModeCount (adapter, d3d_format);
-#endif      
           if (display_mode_count > 0) {
             UINT mode_index;
             D3DDISPLAYMODE d3d_display_mode;
 
             for (mode_index = 0; mode_index < display_mode_count; mode_index++) {
-#if DX8
-              if (direct_3d -> EnumAdapterModes (adapter, mode_index, &d3d_display_mode) == D3D_OK)
-#else
-              if (direct_3d -> EnumAdapterModes (adapter, d3d_format, mode_index, &d3d_display_mode) == D3D_OK)
-#endif          
-              {
+              if (direct_3d -> EnumAdapterModes (adapter, d3d_format, mode_index, &d3d_display_mode) == D3D_OK) {
                 if (d3d_display_mode.Width >= minimum_width && d3d_display_mode.Height >= minimum_height &&
-                    d3d_display_mode.Width <= maximum_width && d3d_display_mode.Height <= maximum_height) {                  
+                    d3d_display_mode.Width <= maximum_width && d3d_display_mode.Height <= maximum_height) {
                   if (display_format_array [format_index].bits_per_pixel >= minimum_bits_per_pixel &&
                       display_format_array [format_index].bits_per_pixel <= maximum_bits_per_pixel) {
                     if (debug) {
@@ -515,7 +487,7 @@ static int get_display_information (DisplaySearchParameters &display_search_para
           direct_3d_device = 0;
           memset (&present_parameters, 0, sizeof (D3DPRESENT_PARAMETERS));
 
-          present_parameters.BackBufferWidth = width; 
+          present_parameters.BackBufferWidth = width;
           present_parameters.BackBufferHeight = height;
           present_parameters.BackBufferFormat = D3DFMT_X8R8G8B8;
           present_parameters.BackBufferCount = 1;
@@ -528,11 +500,7 @@ static int get_display_information (DisplaySearchParameters &display_search_para
           present_parameters.AutoDepthStencilFormat = D3DFMT_D24S8;
 
           present_parameters.FullScreen_RefreshRateInHz;
-
-#if DX8
-#else
           present_parameters.PresentationInterval = D3DPRESENT_INTERVAL_IMMEDIATE;
-#endif
 
           if (d3d_caps.DevCaps & D3DDEVCAPS_HWTRANSFORMANDLIGHT) {
             behavior_flags = D3DCREATE_HARDWARE_VERTEXPROCESSING;
@@ -546,32 +514,18 @@ static int get_display_information (DisplaySearchParameters &display_search_para
           HRESULT result;
 
           result = direct_3d -> CreateDevice (adapter, device_type, window_handle, behavior_flags, &present_parameters, &direct_3d_device);
-          if (result == D3D_OK) {  
+          if (result == D3D_OK) {
 
-            // allocate 512x512 32-bit textures (1MB size) until we run out or hit the limit            
+            // allocate 512x512 32-bit textures (1MB size) until we run out or hit the limit
             #define MAXIMUM_TEXTURES (2048 - 1)
-            
+
             int total_textures;
-            HRESULT texture_result; 
-            #if DX8
-            IDirect3DTexture8 *texture_array [MAXIMUM_TEXTURES];
-            #else
+            HRESULT texture_result;
             IDirect3DTexture9 *texture_array [MAXIMUM_TEXTURES];
-            #endif
-            
+
             total_textures = 0;
             while (total_textures < MAXIMUM_TEXTURES) {
 
-              #if DX8
-              texture_result = direct_3d_device -> CreateTexture (
-                512,
-                512,
-                1,
-                D3DUSAGE_RENDERTARGET,
-                D3DFMT_A8R8G8B8,
-                D3DPOOL_DEFAULT,
-                &texture_array [total_textures]);
-              #else
               texture_result = direct_3d_device -> CreateTexture (
                 512,
                 512,
@@ -581,28 +535,27 @@ static int get_display_information (DisplaySearchParameters &display_search_para
                 D3DPOOL_DEFAULT,
                 &texture_array [total_textures],
                 NULL);
-              #endif
-              if (texture_result == D3D_OK) {                
+              if (texture_result == D3D_OK) {
                 total_textures++;
               }
               else {
                 if (texture_result == D3DERR_OUTOFVIDEOMEMORY) {
                   if (debug) {
                     printf ("D3DERR_OUTOFVIDEOMEMORY \n");
-                  }                
-                }                
+                  }
+                }
                 break;
-              }               
+              }
             }
 
             // free all allocated textures
-            int index;           
+            int index;
             for (index = 0; index < total_textures; index++) {
-              texture_array [index] -> Release ( );            
+              texture_array [index] -> Release ( );
             }
 
             video_memory = (total_textures * 1024 * 1024);
-            
+
             if (debug) {
               printf ("video_memory = %d \n", video_memory);
             }
@@ -612,9 +565,9 @@ static int get_display_information (DisplaySearchParameters &display_search_para
               printf ("texture_memory = %d \n", texture_memory);
             }
 
-            direct_3d_device -> Release ( );    
+            direct_3d_device -> Release ( );
 
-            state = DisplayInformation::DS_success;    
+            state = DisplayInformation::DS_success;
             success = true;
           }
           else
@@ -623,7 +576,7 @@ static int get_display_information (DisplaySearchParameters &display_search_para
               printf ("CreateDevice failed.\n");
             }
 
-            state = DisplayInformation::DS_create_device_error;    
+            state = DisplayInformation::DS_create_device_error;
             success = true;
           }
 
@@ -641,7 +594,7 @@ static int get_display_information (DisplaySearchParameters &display_search_para
       }
     }
     else {
-      state = DisplayInformation::DS_direct_3d_create_error;  
+      state = DisplayInformation::DS_direct_3d_create_error;
     }
 
     FreeLibrary (d3d_dll);
diff --git a/panda/src/windisplay/winDetectDx8.cxx b/panda/src/windisplay/winDetectDx8.cxx
deleted file mode 100644
index ceca2e7840..0000000000
--- a/panda/src/windisplay/winDetectDx8.cxx
+++ /dev/null
@@ -1,48 +0,0 @@
-// Filename: winDetectDx8.cxx
-// Created by:  aignacio (18Jan07)
-//
-////////////////////////////////////////////////////////////////////
-//
-// 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 "pandabase.h"
-
-#ifdef HAVE_DX8
-
-#define WIN32_LEAN_AND_MEAN
-#include <d3d8.h>
-#include "graphicsStateGuardian.h"
-#include "graphicsPipe.h"
-#include "displaySearchParameters.h"
-
-
-#define DX8 1
-#define Direct3DCreate Direct3DCreate8
-
-typedef LPDIRECT3D8 (WINAPI *DIRECT3DCREATE8)(UINT SDKVersion);
-typedef LPDIRECT3D8 DIRECT_3D;
-typedef D3DCAPS8 D3DCAPS;
-typedef D3DADAPTER_IDENTIFIER8 D3DADAPTER_IDENTIFIER;
-typedef LPDIRECT3DDEVICE8 DIRECT_3D_DEVICE;
-typedef DIRECT3DCREATE8 DIRECT_3D_CREATE;
-
-static char *d3d_dll_name = "d3d8.dll";
-static char *direct_3d_create_function_name = "Direct3DCreate8";
-
-
-// include common source code
-#include "winDetectDx.h"
-
-
-int dx8_display_information (DisplaySearchParameters &display_search_parameters, DisplayInformation *display_information) {
-  return get_display_information (display_search_parameters, display_information);
-}
-
-#endif
diff --git a/panda/src/windisplay/winDetectDx9.cxx b/panda/src/windisplay/winDetectDx9.cxx
index c1556ee289..3a592331ed 100644
--- a/panda/src/windisplay/winDetectDx9.cxx
+++ b/panda/src/windisplay/winDetectDx9.cxx
@@ -16,13 +16,14 @@
 
 #ifdef HAVE_DX9
 
-#define WIN32_LEAN_AND_MEAN
+#ifndef WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN 1
+#endif
 #include <d3d9.h>
 #include "graphicsStateGuardian.h"
 #include "graphicsPipe.h"
 #include "displaySearchParameters.h"
 
-#define DX8 0
 #define Direct3DCreate Direct3DCreate9
 
 typedef LPDIRECT3D9 (WINAPI *DIRECT3DCREATE9)(UINT SDKVersion);
diff --git a/panda/src/windisplay/winGraphicsPipe.cxx b/panda/src/windisplay/winGraphicsPipe.cxx
index 46864162f7..1fd25e52e1 100644
--- a/panda/src/windisplay/winGraphicsPipe.cxx
+++ b/panda/src/windisplay/winGraphicsPipe.cxx
@@ -25,21 +25,20 @@
 #include <intrin.h>
 #endif
 
-
 TypeHandle WinGraphicsPipe::_type_handle;
 
+#ifndef MAXIMUM_PROCESSORS
 #define MAXIMUM_PROCESSORS 32
+#endif
 
-typedef struct _PROCESSOR_POWER_INFORMATION 
-{  
-  ULONG Number;  
-  ULONG MaxMhz;  
-  ULONG CurrentMhz;  
-  ULONG MhzLimit;  
-  ULONG MaxIdleState;  
+typedef struct _PROCESSOR_POWER_INFORMATION {
+  ULONG Number;
+  ULONG MaxMhz;
+  ULONG CurrentMhz;
+  ULONG MhzLimit;
+  ULONG MaxIdleState;
   ULONG CurrentIdleState;
-} 
-PROCESSOR_POWER_INFORMATION,  *PPROCESSOR_POWER_INFORMATION;
+} PROCESSOR_POWER_INFORMATION, *PPROCESSOR_POWER_INFORMATION;
 
 typedef BOOL (WINAPI *GetProcessMemoryInfoType) (HANDLE Process, PROCESS_MEMORY_COUNTERS *ppsmemCounters, DWORD cb);
 typedef BOOL (WINAPI *GlobalMemoryStatusExType) (LPMEMORYSTATUSEX lpBuffer);
@@ -758,7 +757,7 @@ count_number_of_cpus(DisplayInformation *display_information) {
       if (buffer != NULL) {
         PANDA_FREE_ARRAY(buffer);
       }
-      
+
       buffer = (PSYSTEM_LOGICAL_PROCESSOR_INFORMATION)PANDA_MALLOC_ARRAY(buffer_length);
       nassertv(buffer != NULL);
     } else {
@@ -777,7 +776,7 @@ count_number_of_cpus(DisplayInformation *display_information) {
   while (ptr < end) {
     if (ptr->Relationship == RelationProcessorCore) {
       num_cpu_cores++;
-      
+
       // A hyperthreaded core supplies more than one logical processor.
       num_logical_cpus += count_bits_in_word((PN_uint64)(ptr->ProcessorMask));
     }
@@ -798,14 +797,14 @@ count_number_of_cpus(DisplayInformation *display_information) {
 ////////////////////////////////////////////////////////////////////
 //     Function: WinGraphicsPipe::Constructor
 //       Access: Public
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 WinGraphicsPipe::
 WinGraphicsPipe() {
 
   bool state;
   char string [512];
-  
+
   state = false;
   _supported_types = OT_window | OT_fullscreen_window;
 
@@ -815,7 +814,7 @@ WinGraphicsPipe() {
 
   _hUser32 = (HINSTANCE)LoadLibrary("user32.dll");
   if (_hUser32 != NULL) {
-    _pfnTrackMouseEvent = 
+    _pfnTrackMouseEvent =
       (PFN_TRACKMOUSEEVENT)GetProcAddress(_hUser32, "TrackMouseEvent");
   }
 
@@ -830,17 +829,6 @@ WinGraphicsPipe() {
   }
 #endif
 
-#ifdef HAVE_DX8
-  if (request_dxdisplay_information){
-    DisplaySearchParameters display_search_parameters_dx8;
-    int dx8_display_information (DisplaySearchParameters &display_search_parameters_dx8, DisplayInformation *display_information);
-    
-    if (state == false && dx8_display_information (display_search_parameters_dx8, _display_information)) {
-      state = true;    
-    }
-  }
-#endif
-
   if (auto_cpu_data) {
     lookup_cpu_data();
   }
@@ -852,32 +840,32 @@ WinGraphicsPipe() {
     sprintf (string, "OS version: %d.%d.%d.%d \n", version_info.dwMajorVersion, version_info.dwMinorVersion, version_info.dwPlatformId, version_info.dwBuildNumber);
     windisplay_cat.info() << string;
     windisplay_cat.info() << "  " << version_info.szCSDVersion << "\n";
-    
+
     _display_information -> _os_version_major = version_info.dwMajorVersion;
     _display_information -> _os_version_minor = version_info.dwMinorVersion;
-    _display_information -> _os_version_build = version_info.dwBuildNumber;     
+    _display_information -> _os_version_build = version_info.dwBuildNumber;
     _display_information -> _os_platform_id = version_info.dwPlatformId;
   }
   // Screen size
   _display_width = GetSystemMetrics(SM_CXSCREEN);
   _display_height = GetSystemMetrics(SM_CYSCREEN);
-  
+
   HMODULE power_dll;
 
   power_dll = LoadLibrary ("PowrProf.dll");
-  if (power_dll) {    
+  if (power_dll) {
     CallNtPowerInformationFunction = (CallNtPowerInformationType) GetProcAddress (power_dll, "CallNtPowerInformation");
-    if (CallNtPowerInformationFunction) {    
-    
+    if (CallNtPowerInformationFunction) {
+
       _display_information -> _update_cpu_frequency_function = update_cpu_frequency_function;
       update_cpu_frequency_function(0, _display_information);
 
-      sprintf (string, "max Mhz %I64d, current Mhz %I64d \n", _display_information -> _maximum_cpu_frequency, _display_information -> _current_cpu_frequency);     
+      sprintf (string, "max Mhz %I64d, current Mhz %I64d \n", _display_information -> _maximum_cpu_frequency, _display_information -> _current_cpu_frequency);
 
-      windisplay_cat.info() << string;    
+      windisplay_cat.info() << string;
     }
   }
-  
+
   if (state) {
 
   }
diff --git a/panda/src/windisplay/winGraphicsWindow.cxx b/panda/src/windisplay/winGraphicsWindow.cxx
index 1e65e6ce69..99d4c9629e 100644
--- a/panda/src/windisplay/winGraphicsWindow.cxx
+++ b/panda/src/windisplay/winGraphicsWindow.cxx
@@ -26,8 +26,6 @@
 
 #include <tchar.h>
 
-
-
 TypeHandle WinGraphicsWindow::_type_handle;
 TypeHandle WinGraphicsWindow::WinWindowHandle::_type_handle;
 
@@ -86,7 +84,7 @@ WinGraphicsWindow(GraphicsEngine *engine, GraphicsPipe *pipe,
                   const WindowProperties &win_prop,
                   int flags,
                   GraphicsStateGuardian *gsg,
-                  GraphicsOutput *host) : 
+                  GraphicsOutput *host) :
   GraphicsWindow(engine, pipe, name, fb_prop, win_prop, flags, gsg, host)
 {
   initialize_input_devices();
@@ -124,7 +122,7 @@ WinGraphicsWindow::
 //     Function: WinGraphicsWindow::move_pointer
 //       Access: Published, Virtual
 //  Description: Forces the pointer to the indicated position within
-//               the window, if possible.  
+//               the window, if possible.
 //
 //               Returns true if successful, false on failure.  This
 //               may fail if the mouse is not currently within the
@@ -142,7 +140,7 @@ move_pointer(int device, int x, int y) {
   if (device == 0) {
     // Move the system mouse pointer.
     if (!_properties.get_foreground() )
-      //      !_input_devices[0].get_pointer().get_in_window()) 
+      //      !_input_devices[0].get_pointer().get_in_window())
       {
         // If the window doesn't have input focus, or the mouse isn't
         // currently within the window, forget it.
@@ -151,7 +149,7 @@ move_pointer(int device, int x, int y) {
 
     RECT view_rect;
     get_client_rect_screen(_hWnd, &view_rect);
-    
+
     SetCursorPos(view_rect.left + x, view_rect.top + y);
     _input_devices[0].set_pointer_in_window(x, y);
     return true;
@@ -235,11 +233,11 @@ process_events() {
       }
       _return_control_to_app = false;
 
-  } else 
+  } else
   */
 
   MSG msg;
-    
+
   // Handle all the messages on the queue in a row.  Some of these
   // might be for another window, but they will get dispatched
   // appropriately.
@@ -314,18 +312,18 @@ set_properties_now(WindowProperties &properties) {
     WindowProperties::ZOrder last_z_order = _properties.get_z_order();
     _properties.set_z_order(properties.get_z_order());
     adjust_z_order(last_z_order, properties.get_z_order());
-    
+
     properties.clear_z_order();
   }
 
   if (properties.has_foreground() && properties.get_foreground()) {
     if (!SetActiveWindow(_hWnd)) {
-      windisplay_cat.warning()  
+      windisplay_cat.warning()
         << "SetForegroundWindow() failed!\n";
     } else {
       _properties.set_foreground(true);
     }
-    
+
     properties.clear_foreground();
   }
 
@@ -446,11 +444,11 @@ open_window() {
   // Now that we have a window handle, store it in our global map, so
   // future messages for this window can be routed properly.
   _window_handles.insert(WindowHandles::value_type(_hWnd, this));
-  
+
   // move window to top of zorder.
-  SetWindowPos(_hWnd, HWND_TOP, 0,0,0,0, 
+  SetWindowPos(_hWnd, HWND_TOP, 0,0,0,0,
                SWP_NOMOVE | SWP_NOSENDCHANGING | SWP_NOSIZE);
-  
+
   // need to do twice to override any minimized flags in StartProcessInfo
   if (want_minimized) {
     ShowWindow(_hWnd, SW_MINIMIZE);
@@ -492,8 +490,8 @@ open_window() {
   // Registers to receive the WM_INPUT messages
   if ((pRegisterRawInputDevices)&&(_input_devices.size() > 1)) {
     RAWINPUTDEVICE Rid;
-    Rid.usUsagePage = 0x01; 
-    Rid.usUsage = 0x02; 
+    Rid.usUsagePage = 0x01;
+    Rid.usUsage = 0x02;
     Rid.dwFlags = 0;// RIDEV_NOLEGACY;   // adds HID mouse and also ignores legacy mouse messages
     Rid.hwndTarget = _hWnd;
     pRegisterRawInputDevices(&Rid, 1, sizeof (Rid));
@@ -517,7 +515,7 @@ open_window() {
 #ifdef HAVE_WIN_TOUCHINPUT
   RegisterTouchWindow(_hWnd, 0);
 #endif
-  
+
   return true;
 }
 
@@ -537,13 +535,13 @@ initialize_input_devices() {
   PRAWINPUTDEVICELIST pRawInputDeviceList;
 
   nassertv(_input_devices.size() == 0);
-  
+
   // Clear the handle array, and set up the system keyboard/mouse
   memset(_input_device_handle, 0, sizeof(_input_device_handle));
   GraphicsWindowInputDevice device =
     GraphicsWindowInputDevice::pointer_and_keyboard(this, "keyboard_mouse");
   add_input_device(device);
-  
+
   // Try initializing the Raw Input function pointers.
   if (pRegisterRawInputDevices==0) {
     HMODULE user32 = LoadLibrary("user32.dll");
@@ -554,7 +552,7 @@ initialize_input_devices() {
       pGetRawInputData         = (tGetRawInputData)        GetProcAddress(user32,"GetRawInputData");
     }
   }
-  
+
   if (pRegisterRawInputDevices==0) return;
   if (pGetRawInputDeviceList==0) return;
   if (pGetRawInputDeviceInfoA==0) return;
@@ -563,7 +561,7 @@ initialize_input_devices() {
   // Get the number of devices.
   if (pGetRawInputDeviceList(NULL, &nInputDevices, sizeof(RAWINPUTDEVICELIST)) != 0)
     return;
-  
+
   // Allocate the array to hold the DeviceList
   pRawInputDeviceList = (PRAWINPUTDEVICELIST)alloca(sizeof(RAWINPUTDEVICELIST) * nInputDevices);
   if (pRawInputDeviceList==0) return;
@@ -571,7 +569,7 @@ initialize_input_devices() {
   // Fill the Array
   if (pGetRawInputDeviceList(pRawInputDeviceList, &nInputDevices, sizeof(RAWINPUTDEVICELIST)) == -1)
     return;
-  
+
   // Loop through all raw devices and find the raw mice
   for (int i = 0; i < (int)nInputDevices; i++) {
     if (pRawInputDeviceList[i].dwType == RIM_TYPEMOUSE) {
@@ -668,7 +666,7 @@ do_reshape_request(int x_origin, int y_origin, bool has_origin,
         has_origin = false;
       }
     }
-    
+
     // Compute the appropriate size and placement for the window,
     // including decorations.
     RECT view_rect;
@@ -725,7 +723,7 @@ handle_reshape() {
 
   // But in practice, GetClientRect() doesn't really fail, but just
   // returns all zeroes.  Ignore this too.
-  if (view_rect.left == 0 && view_rect.right == 0 && 
+  if (view_rect.left == 0 && view_rect.right == 0 &&
       view_rect.bottom == 0 && view_rect.top == 0) {
     if (windisplay_cat.is_debug()) {
       windisplay_cat.debug()
@@ -746,17 +744,17 @@ handle_reshape() {
     }
     return;
   }
-  
+
   WindowProperties properties;
-  properties.set_size((view_rect.right - view_rect.left), 
+  properties.set_size((view_rect.right - view_rect.left),
                       (view_rect.bottom - view_rect.top));
 
   // _props origin should reflect upper left of view rectangle
   properties.set_origin(view_rect.left, view_rect.top);
-  
-  if (windisplay_cat.is_spam()) {
-    windisplay_cat.spam()
-      << "reshape to origin: (" << properties.get_x_origin() << "," 
+
+  if (windisplay_cat.is_debug()) {
+    windisplay_cat.debug()
+      << "reshape to origin: (" << properties.get_x_origin() << ","
       << properties.get_y_origin() << "), size: (" << properties.get_x_size()
       << "," << properties.get_y_size() << ")\n";
   }
@@ -788,22 +786,22 @@ do_fullscreen_resize(int x_size, int y_size) {
   if (!find_acceptable_display_mode(x_size, y_size,
                                     dwFullScreenBitDepth, dm)) {
     windisplay_cat.error()
-      << "window resize(" << x_size << ", " << y_size 
+      << "window resize(" << x_size << ", " << y_size
       << ") failed, no compatible fullscreen display mode found!\n";
     return false;
   }
 
   // this causes WM_SIZE msg to be produced
-  SetWindowPos(_hWnd, NULL, 0,0, x_size, y_size, 
+  SetWindowPos(_hWnd, NULL, 0,0, x_size, y_size,
                SWP_NOZORDER | SWP_NOMOVE | SWP_NOSENDCHANGING);
   int chg_result = ChangeDisplaySettings(&dm, CDS_FULLSCREEN);
 
   if (chg_result != DISP_CHANGE_SUCCESSFUL) {
     windisplay_cat.error()
-      << "resize ChangeDisplaySettings failed (error code: " 
+      << "resize ChangeDisplaySettings failed (error code: "
       << chg_result << ") for specified res: "
       << dm.dmPelsWidth << " x " << dm.dmPelsHeight
-      << " x " << dm.dmBitsPerPel << ", " 
+      << " x " << dm.dmBitsPerPel << ", "
       << dm.dmDisplayFrequency << " Hz\n";
     return false;
   }
@@ -811,7 +809,7 @@ do_fullscreen_resize(int x_size, int y_size) {
   _fullscreen_display_mode = dm;
 
   windisplay_cat.info()
-    << "Resized fullscreen window to " << x_size << ", " << y_size 
+    << "Resized fullscreen window to " << x_size << ", " << y_size
     << " bitdepth " << dwFullScreenBitDepth << ", "
     << dm.dmDisplayFrequency << "Hz\n";
 
@@ -866,7 +864,7 @@ do_windowed_switch() {
   if (!calculate_metrics(false, window_style, metrics, has_origin)){
     return false;
   }
-  
+
   // We send SWP_FRAMECHANGED so that the new styles are taken into account.
   // Also, we place the Windows at 0,0 to play safe until we decide how to
   // get Panda to remember the windowed origin.
@@ -950,7 +948,7 @@ calculate_metrics(bool fullscreen, DWORD window_style, WINDOW_METRICS &metrics,
   if (!fullscreen && has_origin) {
     metrics.x = _properties.get_x_origin();
     metrics.y = _properties.get_y_origin();
-    
+
     // A coordinate of -2 means to center the window in its client area.
     if (metrics.x == -2) {
       metrics.x = 0.5 * (_pipe->get_display_width() - _properties.get_x_size());
@@ -974,7 +972,7 @@ calculate_metrics(bool fullscreen, DWORD window_style, WINDOW_METRICS &metrics,
     RECT win_rect;
     SetRect(&win_rect, metrics.x, metrics.y,
             metrics.x + metrics.width, metrics.y + metrics.height);
-    
+
     // Compute window size based on desired client area size
     if (!AdjustWindowRect(&win_rect, window_style, FALSE)) {
       windisplay_cat.error()
@@ -1004,7 +1002,7 @@ calculate_metrics(bool fullscreen, DWORD window_style, WINDOW_METRICS &metrics,
 bool WinGraphicsWindow::
 open_graphic_window(bool fullscreen) {
   DWORD window_style = make_style(fullscreen);
-  
+
   wstring title;
   if (_properties.has_title()) {
     TextEncoder encoder;
@@ -1026,7 +1024,7 @@ open_graphic_window(bool fullscreen) {
   HINSTANCE hinstance = GetModuleHandle(NULL);
 
   _hparent = NULL;
-  
+
   if (!fullscreen){
     WindowHandle *window_handle = _properties.get_parent_window();
     if (window_handle != NULL) {
@@ -1036,7 +1034,7 @@ open_graphic_window(bool fullscreen) {
       if (os_handle != NULL) {
         windisplay_cat.info()
           << "os_handle type " << os_handle->get_type() << "\n";
-        
+
         if (os_handle->is_of_type(NativeWindowHandle::WinHandle::get_class_type())) {
           NativeWindowHandle::WinHandle *win_handle = DCAST(NativeWindowHandle::WinHandle, os_handle);
           _hparent = win_handle->get_handle();
@@ -1052,7 +1050,7 @@ open_graphic_window(bool fullscreen) {
   }
 
   if (!_hparent) { // This can be a regular window or a fullscreen window
-    _hWnd = CreateWindowW(wclass._name.c_str(), title.c_str(), window_style, 
+    _hWnd = CreateWindowW(wclass._name.c_str(), title.c_str(), window_style,
                           metrics.x, metrics.y,
                           metrics.width,
                           metrics.height,
@@ -1060,18 +1058,18 @@ open_graphic_window(bool fullscreen) {
   } else { // This is a regular window with a parent
     int x_origin = 0;
     int y_origin = 0;
-    
+
     if (!fullscreen && has_origin) {
       x_origin = _properties.get_x_origin();
       y_origin = _properties.get_y_origin();
     }
 
-    _hWnd = CreateWindowW(wclass._name.c_str(), title.c_str(), 
+    _hWnd = CreateWindowW(wclass._name.c_str(), title.c_str(),
                           WS_CHILD | WS_VISIBLE | WS_CLIPCHILDREN | WS_CLIPSIBLINGS ,
                           x_origin, y_origin,
                           _properties.get_x_size(), _properties.get_y_size(),
                           _hparent, NULL, hinstance, 0);
-    
+
     if (_hWnd) {
       // join our keyboard state with the parents
 
@@ -1079,13 +1077,13 @@ open_graphic_window(bool fullscreen) {
       // It causes problems with the browser plugin--it deadlocks when
       // the parent process is waiting on the child process.
       //AttachThreadInput(GetWindowThreadProcessId(_hparent,NULL), GetCurrentThreadId(),TRUE);
-      
+
       WindowProperties properties;
       properties.set_foreground(true);
       system_changed_properties(properties);
     }
   }
-  
+
   if (!_hWnd) {
     windisplay_cat.error()
       << "CreateWindow() failed!" << endl;
@@ -1123,7 +1121,7 @@ do_fullscreen_enable() {
   //  DWORD cur_scrnwidth = GetDeviceCaps(scrnDC, HORZRES);
   //  DWORD cur_scrnheight = GetDeviceCaps(scrnDC, VERTRES);
   ReleaseDC(hDesktopWindow, scrnDC);
-  
+
   DWORD dwWidth = _properties.get_x_size();
   DWORD dwHeight = _properties.get_y_size();
   DWORD dwFullScreenBitDepth = cur_bitdepth;
@@ -1131,7 +1129,7 @@ do_fullscreen_enable() {
   DEVMODE dm;
   reconsider_fullscreen_size(dwWidth, dwHeight, dwFullScreenBitDepth);
   if (!find_acceptable_display_mode(dwWidth, dwHeight, dwFullScreenBitDepth, dm)) {
-    windisplay_cat.error() 
+    windisplay_cat.error()
       << "Videocard has no supported display resolutions at specified res ("
       << dwWidth << " x " << dwHeight << " x " << dwFullScreenBitDepth <<")\n";
     return false;
@@ -1147,7 +1145,7 @@ do_fullscreen_enable() {
       << "ChangeDisplaySettings failed (error code: "
       << chg_result << ") for specified res: "
       << dm.dmPelsWidth << " x " << dm.dmPelsHeight
-      << " x " << dm.dmBitsPerPel << ", " 
+      << " x " << dm.dmBitsPerPel << ", "
       << dm.dmDisplayFrequency << " Hz\n";
     return false;
   }
@@ -1202,13 +1200,13 @@ adjust_z_order(WindowProperties::ZOrder last_z_order,
                WindowProperties::ZOrder this_z_order) {
   HWND order;
   bool do_change = false;
-  
+
   switch (this_z_order) {
   case WindowProperties::Z_bottom:
     order = HWND_BOTTOM;
     do_change = true;
     break;
-    
+
   case WindowProperties::Z_normal:
     if ((last_z_order != WindowProperties::Z_normal) &&
         // If we aren't changing the window order, don't move it to
@@ -1223,14 +1221,14 @@ adjust_z_order(WindowProperties::ZOrder last_z_order,
       do_change = true;
     }
     break;
-    
+
   case WindowProperties::Z_top:
     order = HWND_TOPMOST;
     do_change = true;
     break;
   }
   if (do_change) {
-    BOOL result = SetWindowPos(_hWnd, order, 0,0,0,0, 
+    BOOL result = SetWindowPos(_hWnd, order, 0,0,0,0,
                                SWP_NOMOVE | SWP_NOSENDCHANGING | SWP_NOSIZE);
     if (!result) {
       windisplay_cat.warning()
@@ -1265,13 +1263,13 @@ track_mouse_leaving(HWND hwnd) {
     };
 
     // tell win32 to post WM_MOUSELEAVE msgs
-    BOOL bSucceeded = winpipe->_pfnTrackMouseEvent(&tme);  
-    
+    BOOL bSucceeded = winpipe->_pfnTrackMouseEvent(&tme);
+
     if ((!bSucceeded) && windisplay_cat.is_debug()) {
       windisplay_cat.debug()
         << "TrackMouseEvent failed!, LastError=" << GetLastError() << endl;
     }
-    
+
     _tracking_mouse_leaving = true;
   }
 }
@@ -1331,7 +1329,7 @@ LONG WinGraphicsWindow::
 window_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) {
   if (windisplay_cat.is_spam()) {
     windisplay_cat.spam()
-      << ClockObject::get_global_clock()->get_real_time() 
+      << ClockObject::get_global_clock()->get_real_time()
       << " window_proc(" << (void *)this << ", " << hwnd << ", "
       << msg << ", " << wparam << ", " << lparam << ")\n";
   }
@@ -1339,7 +1337,7 @@ window_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) {
   int button = -1;
 
   switch (msg) {
-  case WM_MOUSEMOVE: 
+  case WM_MOUSEMOVE:
     if (!_tracking_mouse_leaving) {
       // need to re-call TrackMouseEvent every time mouse re-enters window
       track_mouse_leaving(hwnd);
@@ -1348,22 +1346,22 @@ window_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) {
     if(handle_mouse_motion(translate_mouse(LOWORD(lparam)), translate_mouse(HIWORD(lparam))))
       return 0;
     break;
-    
+
   case WM_INPUT:
     handle_raw_input((HRAWINPUT)lparam);
     break;
-      
+
   case WM_MOUSELEAVE:
     _tracking_mouse_leaving = false;
     handle_mouse_exit();
     set_cursor_out_of_window();
     break;
-    
-  case WM_CREATE: 
+
+  case WM_CREATE:
     {
       track_mouse_leaving(hwnd);
       ClearToBlack(hwnd, _properties);
-          
+
       POINT cpos;
       GetCursorPos(&cpos);
       ScreenToClient(hwnd, &cpos);
@@ -1399,7 +1397,7 @@ window_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) {
     }
     break;
     */
-        
+
   case WM_CLOSE:
     // This is a message from the system indicating that the user
     // has requested to close the window (e.g. alt-f4).
@@ -1410,14 +1408,14 @@ window_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) {
         // the request and process it directly.
         throw_event(close_request_event);
         return 0;
-            
+
       } else {
         // In this case, the default case, the app does not intend
         // to service the request, so we do by closing the window.
         close_window();
         properties.set_open(false);
         system_changed_properties(properties);
-            
+
         // TODO: make sure we release the GSG properly.
       }
     }
@@ -1429,17 +1427,17 @@ window_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) {
         << "WM_CHILDACTIVATE: " << hwnd << "\n";
     }
     break;
-    
+
   case WM_ACTIVATE:
     if (windisplay_cat.is_debug()) {
       windisplay_cat.debug()
         << "WM_ACTIVATE: " << hwnd << ", " << wparam << ", " << lparam << "\n";
     }
     properties.set_minimized((wparam & 0xffff0000) != 0);
-    if ((wparam & 0xffff) != WA_INACTIVE) 
+    if ((wparam & 0xffff) != WA_INACTIVE)
       {
         properties.set_foreground(true);
-        if (is_fullscreen()) 
+        if (is_fullscreen())
           {
             // When a fullscreen window goes active, it automatically gets
             // un-minimized.
@@ -1448,10 +1446,10 @@ window_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) {
             if (chg_result != DISP_CHANGE_SUCCESSFUL) {
               const DEVMODE &dm = _fullscreen_display_mode;
               windisplay_cat.error()
-                << "restore ChangeDisplaySettings failed (error code: " 
+                << "restore ChangeDisplaySettings failed (error code: "
                 << chg_result << ") for specified res: "
                 << dm.dmPelsWidth << " x " << dm.dmPelsHeight
-                << " x " << dm.dmBitsPerPel << ", " 
+                << " x " << dm.dmBitsPerPel << ", "
                 << dm.dmDisplayFrequency << " Hz\n";
             }
 
@@ -1460,10 +1458,10 @@ window_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) {
             fullscreen_restored(properties);
           }
       }
-    else 
+    else
       {
         properties.set_foreground(false);
-        if (is_fullscreen()) 
+        if (is_fullscreen())
           {
             // When a fullscreen window goes inactive, it automatically
             // gets minimized.
@@ -1489,7 +1487,10 @@ window_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) {
         << "WM_SIZE: " << hwnd << ", " << wparam << "\n";
     }
 
-    handle_reshape();
+    // Resist calling handle_reshape before the window has opened.
+    if (_hWnd != NULL) {
+      handle_reshape();
+    }
     break;
 
   case WM_EXITSIZEMOVE:
@@ -1524,7 +1525,7 @@ window_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) {
     // A button-click in the window means to grab the keyboard focus.
     set_focus();
     return 0;
-        
+
   case WM_MBUTTONDOWN:
     if (_lost_keypresses) {
       resend_lost_keypresses();
@@ -1562,7 +1563,7 @@ window_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) {
       }
     }
     return 0;
-    
+
   case WM_LBUTTONUP:
     if (_lost_keypresses) {
       resend_lost_keypresses();
@@ -1628,7 +1629,7 @@ window_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) {
     }
     break;
 
-        
+
   case WM_IME_SETCONTEXT:
     if (!ime_hide)
       break;
@@ -1640,15 +1641,15 @@ window_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) {
       windisplay_cat.debug() << "SendMessage failed for " << _ime_hWnd << endl;
     else
       windisplay_cat.debug() << "SendMessage Succeeded for " << _ime_hWnd << endl;
-        
+
     windisplay_cat.debug() << "wparam is " << wparam << ", lparam is " << lparam << endl;
     lparam &= ~ISC_SHOWUIALL;
     if (ImmIsUIMessage(_ime_hWnd, msg, wparam, lparam))
       windisplay_cat.debug() << "wparam is " << wparam << ", lparam is " << lparam << endl;
-        
+
     break;
 
-        
+
   case WM_IME_NOTIFY:
     if (wparam == IMN_SETOPENSTATUS) {
       HIMC hIMC = ImmGetContext(hwnd);
@@ -1663,20 +1664,20 @@ window_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) {
         CANDIDATEFORM canf;
         ImmGetCompositionWindow(hIMC, &comf);
         ImmGetCandidateWindow(hIMC, 0, &canf);
-        windisplay_cat.debug() << 
-          "comf style " << comf.dwStyle << 
+        windisplay_cat.debug() <<
+          "comf style " << comf.dwStyle <<
           " comf point: x" << comf.ptCurrentPos.x << ",y " << comf.ptCurrentPos.y <<
           " comf rect: l " << comf.rcArea.left << ",t " << comf.rcArea.top << ",r " <<
           comf.rcArea.right << ",b " << comf.rcArea.bottom << endl;
-        windisplay_cat.debug() << 
-          "canf style " << canf.dwStyle << 
+        windisplay_cat.debug() <<
+          "canf style " << canf.dwStyle <<
           " canf point: x" << canf.ptCurrentPos.x << ",y " << canf.ptCurrentPos.y <<
           " canf rect: l " << canf.rcArea.left << ",t " << canf.rcArea.top << ",r " <<
           canf.rcArea.right << ",b " << canf.rcArea.bottom << endl;
         comf.dwStyle = CFS_POINT;
         comf.ptCurrentPos.x = 2000;
         comf.ptCurrentPos.y = 2000;
-            
+
         canf.dwStyle = CFS_EXCLUDE;
         canf.dwIndex = 0;
         canf.ptCurrentPos.x = 0;
@@ -1685,14 +1686,14 @@ window_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) {
         canf.rcArea.top = 0;
         canf.rcArea.right = 640;
         canf.rcArea.bottom = 480;
-            
+
 #if 0
         comf.rcArea.left = 200;
         comf.rcArea.top = 200;
         comf.rcArea.right = 0;
         comf.rcArea.bottom = 0;
 #endif
-            
+
         if (ImmSetCompositionWindow(hIMC, &comf))
           windisplay_cat.debug() << "set composition form: success\n";
         for (int i=0; i<3; ++i) {
@@ -1705,12 +1706,12 @@ window_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) {
       ImmReleaseContext(hwnd, hIMC);
     }
     break;
-        
+
   case WM_IME_STARTCOMPOSITION:
     support_overlay_window(true);
     _ime_active = true;
     break;
-        
+
   case WM_IME_ENDCOMPOSITION:
     support_overlay_window(false);
     _ime_active = false;
@@ -1719,9 +1720,9 @@ window_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) {
       wstring ws;
       _input_devices[0].candidate(ws, 0, 0, 0);
     }
-          
+
     break;
-        
+
   case WM_IME_COMPOSITION:
     if (ime_aware) {
 
@@ -1736,13 +1737,13 @@ window_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) {
 
       HIMC hIMC = ImmGetContext(hwnd);
       nassertr(hIMC != 0, 0);
-          
+
       DWORD result_size = 0;
       static const int ime_buffer_size = 256;
       static const int ime_buffer_size_bytes = ime_buffer_size / sizeof(wchar_t);
       wchar_t ime_buffer[ime_buffer_size];
       size_t cursor_pos, delta_start;
-          
+
       if (lparam & GCS_RESULTSTR) {
         result_size = ImmGetCompositionStringW(hIMC, GCS_RESULTSTR,
                                                ime_buffer, ime_buffer_size_bytes);
@@ -1755,21 +1756,21 @@ window_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) {
       if (lparam & GCS_COMPSTR) {
         result_size = ImmGetCompositionStringW(hIMC, GCS_CURSORPOS, NULL, 0);
         cursor_pos = result_size & 0xffff;
-              
+
         result_size = ImmGetCompositionStringW(hIMC, GCS_DELTASTART, NULL, 0);
         delta_start = result_size & 0xffff;
         result_size = ImmGetCompositionStringW(hIMC, GCS_COMPSTR, ime_buffer, ime_buffer_size);
         size_t num_chars = result_size / sizeof(wchar_t);
-              
-        _input_devices[0].candidate(wstring(ime_buffer, num_chars), 
-                                    min(cursor_pos, delta_start), 
-                                    max(cursor_pos, delta_start), 
+
+        _input_devices[0].candidate(wstring(ime_buffer, num_chars),
+                                    min(cursor_pos, delta_start),
+                                    max(cursor_pos, delta_start),
                                     cursor_pos);
       }
       ImmReleaseContext(hwnd, hIMC);
     }
     break;
-        
+
   case WM_CHAR:
     // Ignore WM_CHAR messages if we have the IME open, since
     // everything will come in through WM_IME_COMPOSITION.  (It's
@@ -1786,8 +1787,8 @@ window_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) {
       _input_devices[0].keystroke(wparam);
     }
     break;
-    
-  case WM_SYSKEYDOWN: 
+
+  case WM_SYSKEYDOWN:
     if (_lost_keypresses) {
       resend_lost_keypresses();
     }
@@ -1802,7 +1803,7 @@ window_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) {
       POINT point;
       GetCursorPos(&point);
       ScreenToClient(hwnd, &point);
-      handle_keypress(lookup_key(wparam), point.x, point.y, 
+      handle_keypress(lookup_key(wparam), point.x, point.y,
                       get_message_time());
 
       if ((lparam & 0x40000000) == 0) {
@@ -1836,7 +1837,7 @@ window_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) {
       }
     }
     break;
-    
+
   case WM_SYSCOMMAND:
     if (wparam == SC_KEYMENU) {
       // if Alt is released (alone w/o other keys), defwindproc will
@@ -1850,8 +1851,8 @@ window_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) {
       return 0;
     }
     break;
-        
-  case WM_KEYDOWN: 
+
+  case WM_KEYDOWN:
     if (_lost_keypresses) {
       resend_lost_keypresses();
     }
@@ -1905,7 +1906,7 @@ window_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) {
           !_input_devices.empty()) {
         HGLOBAL hglb;
         char *lptstr;
-    
+
         if (IsClipboardFormatAvailable(CF_TEXT) && OpenClipboard(NULL)) {
           // Maybe we should support CF_UNICODETEXT if it is available
           // too?
@@ -1985,7 +1986,7 @@ window_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) {
       }
     }
     break;
-    
+
   case WM_SYSKEYUP:
   case WM_KEYUP:
     if (_lost_keypresses) {
@@ -2031,8 +2032,8 @@ window_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) {
       }
     }
     break;
-    
-  case WM_KILLFOCUS: 
+
+  case WM_KILLFOCUS:
     if (windisplay_cat.is_debug()) {
       windisplay_cat.debug()
         << "killfocus\n";
@@ -2042,8 +2043,8 @@ window_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) {
     properties.set_foreground(false);
     system_changed_properties(properties);
     break;
-    
-  case WM_SETFOCUS: 
+
+  case WM_SETFOCUS:
     // You would think that this would be a good time to call
     // resend_lost_keypresses(), but it turns out that we get
     // WM_SETFOCUS slightly before Windows starts resending key
@@ -2196,9 +2197,9 @@ update_cursor_window(WinGraphicsWindow *to_window) {
     // We are leaving a graphics window; we should restore the Win2000
     // effects.
     if (_got_saved_params) {
-      SystemParametersInfo(SPI_SETMOUSETRAILS, NULL, 
+      SystemParametersInfo(SPI_SETMOUSETRAILS, NULL,
                            (PVOID)_saved_mouse_trails, NULL);
-      SystemParametersInfo(SPI_SETCURSORSHADOW, NULL, 
+      SystemParametersInfo(SPI_SETCURSORSHADOW, NULL,
                            (PVOID)_saved_cursor_shadow, NULL);
       SystemParametersInfo(SPI_SETMOUSEVANISH, NULL,
                            (PVOID)_saved_mouse_vanish, NULL);
@@ -2216,11 +2217,11 @@ update_cursor_window(WinGraphicsWindow *to_window) {
     // These parameters are only defined for Win2000/XP, but they
     // should just cause a silent error on earlier OS's, which is OK.
     if (!_got_saved_params) {
-      SystemParametersInfo(SPI_GETMOUSETRAILS, NULL, 
+      SystemParametersInfo(SPI_GETMOUSETRAILS, NULL,
                            &_saved_mouse_trails, NULL);
-      SystemParametersInfo(SPI_GETCURSORSHADOW, NULL, 
+      SystemParametersInfo(SPI_GETCURSORSHADOW, NULL,
                            &_saved_cursor_shadow, NULL);
-      SystemParametersInfo(SPI_GETMOUSEVANISH, NULL, 
+      SystemParametersInfo(SPI_GETMOUSEVANISH, NULL,
                            &_saved_mouse_vanish, NULL);
       _got_saved_params = true;
 
@@ -2231,7 +2232,7 @@ update_cursor_window(WinGraphicsWindow *to_window) {
 
     SetCursor(to_window->_cursor);
   }
-  
+
   hide_or_show_cursor(hide_cursor);
 
   _cursor_window = to_window;
@@ -2280,18 +2281,18 @@ find_acceptable_display_mode(DWORD dwWidth, DWORD dwHeight, DWORD bpp,
   while (1) {
     ZeroMemory(&dm, sizeof(dm));
     dm.dmSize = sizeof(dm);
-    
+
     if (!EnumDisplaySettings(NULL, modenum, &dm)) {
       break;
     }
-    
+
     if ((dm.dmPelsWidth == dwWidth) && (dm.dmPelsHeight == dwHeight) &&
         (dm.dmBitsPerPel == bpp)) {
       return true;
     }
     modenum++;
   }
-  
+
   return false;
 }
 
@@ -2309,7 +2310,7 @@ show_error_message(DWORD message_id) {
   if (message_id == 0) {
     message_id = GetLastError();
   }
-  
+
   FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM,
                 NULL, message_id,
                 MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), //The user default language
@@ -2681,26 +2682,26 @@ handle_raw_input(HRAWINPUT hraw) {
   if (pGetRawInputData(hraw, RID_INPUT, NULL, &dwSize, sizeof(RAWINPUTHEADER)) == -1) {
     return;
   }
-  
+
   lpb = (LPBYTE)alloca(sizeof(LPBYTE) * dwSize);
   if (lpb == NULL) {
     return;
   }
-  
+
   if (pGetRawInputData(hraw, RID_INPUT, lpb, &dwSize, sizeof(RAWINPUTHEADER)) != dwSize) {
     return;
   }
-  
+
   RAWINPUT *raw = (RAWINPUT *)lpb;
   if (raw->header.hDevice == 0) {
     return;
   }
-  
+
   for (int i = 1; i < (int)(_input_devices.size()); ++i) {
     if (_input_device_handle[i] == raw->header.hDevice) {
       int adjx = raw->data.mouse.lLastX;
       int adjy = raw->data.mouse.lLastY;
-      
+
       if (raw->data.mouse.usFlags & MOUSE_MOVE_ABSOLUTE) {
         _input_devices[i].set_pointer_in_window(adjx, adjy);
       } else {
@@ -2708,7 +2709,7 @@ handle_raw_input(HRAWINPUT hraw) {
         int oldy = _input_devices[i].get_raw_pointer().get_y();
         _input_devices[i].set_pointer_in_window(oldx + adjx, oldy + adjy);
       }
-      
+
       if (raw->data.mouse.usButtonFlags & RI_MOUSE_BUTTON_1_DOWN) {
         _input_devices[i].button_down(MouseButton::button(0), get_message_time());
       }
@@ -2871,7 +2872,7 @@ get_cursor(const Filename &filename) {
 }
 
 static HCURSOR get_cursor(const Filename &filename);
-  
+
 ////////////////////////////////////////////////////////////////////
 //     Function: WinGraphicsWindow::register_window_class
 //       Access: Private, Static
@@ -2912,7 +2913,7 @@ register_window_class(const WindowProperties &props) {
   wc.hbrBackground = (HBRUSH)GetStockObject(BLACK_BRUSH);
   wc.lpszMenuName = NULL;
   wc.lpszClassName = wclass._name.c_str();
-  
+
   if (!RegisterClassW(&wc)) {
     windisplay_cat.error()
       << "could not register window class " << wclass._name << "!" << endl;
@@ -2925,7 +2926,7 @@ register_window_class(const WindowProperties &props) {
 ////////////////////////////////////////////////////////////////////
 //     Function: WinGraphicsWindow::WinWindowHandle::Constructor
 //       Access: Public
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 WinGraphicsWindow::WinWindowHandle::
 WinWindowHandle(WinGraphicsWindow *window, const WindowHandle &copy) :
@@ -3033,7 +3034,7 @@ void get_client_rect_screen(HWND hwnd, RECT *view_rect) {
 //       Access: Public, Virtual
 //  Description: Adds the specified Windows proc event handler to be called
 //               whenever a Windows event occurs.
-//               
+//
 ////////////////////////////////////////////////////////////////////
 void WinGraphicsWindow::add_window_proc( const GraphicsWindowProc* wnd_proc ){
   nassertv(wnd_proc != NULL);
@@ -3044,7 +3045,7 @@ void WinGraphicsWindow::add_window_proc( const GraphicsWindowProc* wnd_proc ){
 //     Function: WinGraphicsWindow::remove_window_proc
 //       Access: Public, Virtual
 //  Description: Removes the specified Windows proc event handler.
-//               
+//
 ////////////////////////////////////////////////////////////////////
 void WinGraphicsWindow::remove_window_proc( const GraphicsWindowProc* wnd_proc ){
   nassertv(wnd_proc != NULL);
@@ -3055,7 +3056,7 @@ void WinGraphicsWindow::remove_window_proc( const GraphicsWindowProc* wnd_proc )
 //     Function: WinGraphicsWindow::clear_window_procs
 //       Access: Public, Virtual
 //  Description: Removes all Windows proc event handlers.
-//               
+//
 ////////////////////////////////////////////////////////////////////
 void WinGraphicsWindow::clear_window_procs(){
   _window_proc_classes.clear();
@@ -3065,7 +3066,7 @@ void WinGraphicsWindow::clear_window_procs(){
 //     Function: WinGraphicsWindow::supports_window_procs
 //       Access: Public, Virtual
 //  Description: Returns whether this window supports adding of windows proc handlers.
-//               
+//
 ////////////////////////////////////////////////////////////////////
 bool WinGraphicsWindow::supports_window_procs() const{
   return true;
@@ -3075,7 +3076,7 @@ bool WinGraphicsWindow::supports_window_procs() const{
 //     Function: WinGraphicsWindow::is_touch_event
 //       Access: Public, Virtual
 //  Description: Returns whether the specified event msg is a touch message.
-//               
+//
 ////////////////////////////////////////////////////////////////////
 bool WinGraphicsWindow::
 is_touch_event(GraphicsWindowProcCallbackData* callbackData){
@@ -3090,7 +3091,7 @@ is_touch_event(GraphicsWindowProcCallbackData* callbackData){
 //     Function: WinGraphicsWindow::get_num_touches
 //       Access: Public, Virtual
 //  Description: Returns the current number of touches on this window.
-//               
+//
 ////////////////////////////////////////////////////////////////////
 int WinGraphicsWindow::
 get_num_touches(){
@@ -3105,7 +3106,7 @@ get_num_touches(){
 //     Function: WinGraphicsWindow::get_touch_info
 //       Access: Public, Virtual
 //  Description: Returns the TouchInfo object describing the specified touch.
-//               
+//
 ////////////////////////////////////////////////////////////////////
 TouchInfo WinGraphicsWindow::
 get_touch_info(int index){
diff --git a/panda/src/x11display/x11GraphicsWindow.cxx b/panda/src/x11display/x11GraphicsWindow.cxx
index 80c1c884c7..7f090ecd5c 100644
--- a/panda/src/x11display/x11GraphicsWindow.cxx
+++ b/panda/src/x11display/x11GraphicsWindow.cxx
@@ -47,6 +47,7 @@ static int xcursor_read(XcursorFile *file, unsigned char *buf, int len) {
 static int xcursor_write(XcursorFile *file, unsigned char *buf, int len) {
   // Not implemented, we don't need it.
   nassertr_always(false, 0);
+  return 0;
 }
 
 static int xcursor_seek(XcursorFile *file, long offset, int whence) {
@@ -263,6 +264,12 @@ process_events() {
   XKeyEvent keyrelease_event;
   bool got_keyrelease_event = false;
 
+  XConfigureEvent configure_event;
+  bool got_configure_event = false;
+
+  WindowProperties properties;
+  bool changed_properties = false;
+
   while (XCheckIfEvent(_display, &event, check_event, (char *)this)) {
     if (XFilterEvent(&event, None)) {
       continue;
@@ -295,7 +302,6 @@ process_events() {
       }
     }
 
-    WindowProperties properties;
     ButtonHandle button;
 
     switch (event.type) {
@@ -303,38 +309,11 @@ process_events() {
       break;
 
     case ConfigureNotify:
-      _awaiting_configure = false;
-
-      // Is this the inner corner or the outer corner?  The Xlib docs
-      // say it should be the outer corner, but it appears to be the
-      // inner corner on my own implementation, which is inconsistent
-      // with XConfigureWindow.  (Panda really wants to work with the
-      // inner corner, anyway, but that means we need to fix
-      // XConfigureWindow too.)
-      properties.set_origin(event.xconfigure.x, event.xconfigure.y);
-
-      if (_properties.get_fixed_size()) {
-        // If the window properties indicate a fixed size only, undo
-        // any attempt by the user to change them.  In X, there
-        // doesn't appear to be a way to universally disallow this
-        // directly (although we do set the min_size and max_size to
-        // the same value, which seems to work for most window
-        // managers.)
-        WindowProperties current_props = get_properties();
-        if (event.xconfigure.width != current_props.get_x_size() ||
-            event.xconfigure.height != current_props.get_y_size()) {
-          XWindowChanges changes;
-          changes.width = current_props.get_x_size();
-          changes.height = current_props.get_y_size();
-          int value_mask = (CWWidth | CWHeight);
-          XConfigureWindow(_display, _xwindow, value_mask, &changes);
-        }
-
-      } else {
-        // A normal window may be resized by the user at will.
-        properties.set_size(event.xconfigure.width, event.xconfigure.height);
-      }
-      system_changed_properties(properties);
+      // When resizing or moving the window, multiple ConfigureNotify
+      // events may be sent in rapid succession.  We only respond to
+      // the last one.
+      configure_event = event.xconfigure;
+      got_configure_event = true;
       break;
 
     case ButtonPress:
@@ -391,23 +370,23 @@ process_events() {
 
     case FocusIn:
       properties.set_foreground(true);
-      system_changed_properties(properties);
+      changed_properties = true;
       break;
 
     case FocusOut:
       _input_devices[0].focus_lost();
       properties.set_foreground(false);
-      system_changed_properties(properties);
+      changed_properties = true;
       break;
 
     case UnmapNotify:
       properties.set_minimized(true);
-      system_changed_properties(properties);
+      changed_properties = true;
       break;
 
     case MapNotify:
       properties.set_minimized(false);
-      system_changed_properties(properties);
+      changed_properties = true;
 
       // Auto-focus the window when it is mapped.
       XSetInputFocus(_display, _xwindow, RevertToPointerRoot, CurrentTime);
@@ -449,6 +428,47 @@ process_events() {
     }
   }
 
+  if (got_configure_event) {
+    // Now handle the last configure event we found.
+    _awaiting_configure = false;
+
+    // Is this the inner corner or the outer corner?  The Xlib docs
+    // say it should be the outer corner, but it appears to be the
+    // inner corner on my own implementation, which is inconsistent
+    // with XConfigureWindow.  (Panda really wants to work with the
+    // inner corner, anyway, but that means we need to fix
+    // XConfigureWindow too.)
+    properties.set_origin(configure_event.x, configure_event.y);
+
+    if (_properties.get_fixed_size()) {
+      // If the window properties indicate a fixed size only, undo
+      // any attempt by the user to change them.  In X, there
+      // doesn't appear to be a way to universally disallow this
+      // directly (although we do set the min_size and max_size to
+      // the same value, which seems to work for most window
+      // managers.)  Incidentally, this also works to force my
+      // tiling window manager into 'floating' mode.
+      WindowProperties current_props = get_properties();
+      if (configure_event.width != current_props.get_x_size() ||
+          configure_event.height != current_props.get_y_size()) {
+        XWindowChanges changes;
+        changes.width = current_props.get_x_size();
+        changes.height = current_props.get_y_size();
+        int value_mask = (CWWidth | CWHeight);
+        XConfigureWindow(_display, _xwindow, value_mask, &changes);
+      }
+
+    } else {
+      // A normal window may be resized by the user at will.
+      properties.set_size(configure_event.width, configure_event.height);
+    }
+    changed_properties = true;
+  }
+
+  if (changed_properties) {
+    system_changed_properties(properties);
+  }
+
   if (got_keyrelease_event) {
     // This keyrelease event is not immediately followed by a
     // matching keypress event, so it's a genuine release.
diff --git a/pandatool/src/bam/bamInfo.cxx b/pandatool/src/bam/bamInfo.cxx
index b220025e3b..1839c09347 100644
--- a/pandatool/src/bam/bamInfo.cxx
+++ b/pandatool/src/bam/bamInfo.cxx
@@ -34,6 +34,7 @@
 ////////////////////////////////////////////////////////////////////
 BamInfo::
 BamInfo() {
+  set_program_brief("describe the contents of .bam files");
   set_program_description
     ("This program scans one or more Bam files--Panda's Binary Animation "
      "and Models native binary format--and describes their contents.");
diff --git a/pandatool/src/bam/bamToEgg.cxx b/pandatool/src/bam/bamToEgg.cxx
index 4239a05f42..eb2f652a3b 100644
--- a/pandatool/src/bam/bamToEgg.cxx
+++ b/pandatool/src/bam/bamToEgg.cxx
@@ -28,6 +28,7 @@ BamToEgg::
 BamToEgg() :
   SomethingToEgg("bam", ".bam")
 {
+  set_program_brief("convert a native Panda .bam file to an .egg file");
   set_program_description
     ("This program converts native Panda bam files to egg.  The conversion "
      "is somewhat incomplete; running egg2bam followed by bam2egg should not "
diff --git a/pandatool/src/bam/eggToBam.cxx b/pandatool/src/bam/eggToBam.cxx
index d10257c6ed..4c1587fc99 100644
--- a/pandatool/src/bam/eggToBam.cxx
+++ b/pandatool/src/bam/eggToBam.cxx
@@ -43,6 +43,7 @@ EggToBam::
 EggToBam() :
   EggToSomething("Bam", ".bam", true, false)
 {
+  set_program_brief("convert .egg files to .bam files");
   set_program_description
     ("This program reads Egg files and outputs Bam files, the binary format "
      "suitable for direct loading of animation and models into Panda.  Bam "
diff --git a/pandatool/src/bam/ptsToBam.cxx b/pandatool/src/bam/ptsToBam.cxx
index e914faa178..c45dd6e1a3 100755
--- a/pandatool/src/bam/ptsToBam.cxx
+++ b/pandatool/src/bam/ptsToBam.cxx
@@ -32,6 +32,7 @@
 PtsToBam::
 PtsToBam() : WithOutputFile(true, false, true)
 {
+  set_program_brief("convert point cloud data into a .bam file");
   set_program_description
     ("This program reads a point clound in a pts file and outputs a bam files, "
      "suitable for viewing in Panda.");
diff --git a/pandatool/src/cvscopy/testCopy.cxx b/pandatool/src/cvscopy/testCopy.cxx
index ec0e5844be..23b0ba4cfa 100644
--- a/pandatool/src/cvscopy/testCopy.cxx
+++ b/pandatool/src/cvscopy/testCopy.cxx
@@ -23,6 +23,7 @@
 ////////////////////////////////////////////////////////////////////
 TestCopy::
 TestCopy() {
+  set_program_brief("copy files into a CVS source hierarchy");
   set_program_description
     ("This program copies one or more files into a CVS source hierarchy.  "
      "Rather than copying the named files immediately into the current "
diff --git a/pandatool/src/daeegg/daeMaterials.cxx b/pandatool/src/daeegg/daeMaterials.cxx
index 57dc424449..4790c3bfc2 100755
--- a/pandatool/src/daeegg/daeMaterials.cxx
+++ b/pandatool/src/daeegg/daeMaterials.cxx
@@ -158,7 +158,7 @@ process_texture_bucket(const string semantic, const FCDEffectStandard* effect_co
         string uvset_semantic (FROM_FSTRING(uvset->GetSemantic()));
 
         // Only set the UV name if this UV set actually exists.
-        for (int i = 0; i < _materials[semantic]->_uvsets.size(); ++i) {
+        for (size_t i = 0; i < _materials[semantic]->_uvsets.size(); ++i) {
           if (_materials[semantic]->_uvsets[i]->_semantic == uvset_semantic) {
             egg_texture->set_uv_name(uvset_semantic);
             break;
@@ -273,7 +273,7 @@ get_uvset_name(const string semantic, FUDaeGeometryInput::Semantic input_semanti
     if (input_set == -1 && _materials[semantic]->_uvsets.size() == 1) {
       return _materials[semantic]->_uvsets[0]->_semantic;
     } else {
-      for (int i = 0; i < _materials[semantic]->_uvsets.size(); ++i) {
+      for (size_t i = 0; i < _materials[semantic]->_uvsets.size(); ++i) {
         if (_materials[semantic]->_uvsets[i]->_input_set == input_set &&
             _materials[semantic]->_uvsets[i]->_input_semantic == input_semantic) {
           return _materials[semantic]->_uvsets[i]->_semantic;
@@ -283,7 +283,7 @@ get_uvset_name(const string semantic, FUDaeGeometryInput::Semantic input_semanti
       // input_semantic this time. The reason for this is that some tools
       // export textangents and texbinormals bound to a uvset with input
       // semantic TEXCOORD.
-      for (int i = 0; i < _materials[semantic]->_uvsets.size(); ++i) {
+      for (size_t i = 0; i < _materials[semantic]->_uvsets.size(); ++i) {
         if (_materials[semantic]->_uvsets[i]->_input_set == input_set) {
           daeegg_cat.debug() << "Using uv set with non-matching input semantic " << _materials[semantic]->_uvsets[i]->_semantic << "\n";
           return _materials[semantic]->_uvsets[i]->_semantic;
diff --git a/pandatool/src/daeprogs/daeToEgg.cxx b/pandatool/src/daeprogs/daeToEgg.cxx
index 49606788d5..503d1af33a 100755
--- a/pandatool/src/daeprogs/daeToEgg.cxx
+++ b/pandatool/src/daeprogs/daeToEgg.cxx
@@ -37,6 +37,7 @@ DAEToEgg():
      "that export models with inverted transparency, such as Google SketchUp.",
      &SomethingToEgg::dispatch_none, &_invert_transparency);
 
+  set_program_brief("convert COLLADA assets into .egg files");
   set_program_description
     ("This program converts .dae files (COLLADA Digital Asset Exchange) to .egg.");
 
diff --git a/pandatool/src/daeprogs/eggToDAE.cxx b/pandatool/src/daeprogs/eggToDAE.cxx
index cb119a5d28..d5f042ec9e 100755
--- a/pandatool/src/daeprogs/eggToDAE.cxx
+++ b/pandatool/src/daeprogs/eggToDAE.cxx
@@ -40,6 +40,7 @@ EggToDAE() :
   EggToSomething("COLLADA", ".dae", true, false)
 {
   set_binary_output(false);
+  set_program_brief("convert .egg files into COLLADA asset files");
   set_program_description
     ("This program converts files from the egg format to the COLLADA "
      ".dae (Digital Asset Exchange) format.");
diff --git a/pandatool/src/dxfprogs/dxfPoints.cxx b/pandatool/src/dxfprogs/dxfPoints.cxx
index ceef87f9d9..14f50bb696 100644
--- a/pandatool/src/dxfprogs/dxfPoints.cxx
+++ b/pandatool/src/dxfprogs/dxfPoints.cxx
@@ -28,6 +28,7 @@ DXFPoints() :
   // output files.
   _preferred_extension = ".txt";
 
+  set_program_brief("extract points from AutoCAD .dxf files");
   set_program_description
     ("This program reads an AutoCAD .dxf file and generates a simple "
      "list of all the points contained within it, one per line, to a "
diff --git a/pandatool/src/dxfprogs/dxfToEgg.cxx b/pandatool/src/dxfprogs/dxfToEgg.cxx
index 7ce2b5e167..9f2cc149f2 100644
--- a/pandatool/src/dxfprogs/dxfToEgg.cxx
+++ b/pandatool/src/dxfprogs/dxfToEgg.cxx
@@ -30,6 +30,7 @@ DXFToEgg() :
   add_normals_options();
   add_transform_options();
 
+  set_program_brief("convert AutoCAD .dxf files to .egg files");
   set_program_description
     ("This program converts DXF (AutoCAD interchange format) to egg.  It "
      "only converts polygon data, with no fancy tricks.  DXF does not support "
diff --git a/pandatool/src/dxfprogs/eggToDXF.cxx b/pandatool/src/dxfprogs/eggToDXF.cxx
index 13e9f4d64b..e2404b2007 100644
--- a/pandatool/src/dxfprogs/eggToDXF.cxx
+++ b/pandatool/src/dxfprogs/eggToDXF.cxx
@@ -27,6 +27,7 @@ EggToDXF() :
   EggToSomething("DXF", ".dxf", true, false)
 {
   set_binary_output(true);
+  set_program_brief("convert .egg files to AutoCAD .dxf files");
   set_program_description
     ("This program converts files from egg format to AutoCAD DXF format.  "
      "Since DXF does not support nested hierarchies, vertex normals, or any "
diff --git a/pandatool/src/egg-mkfont/eggMakeFont.cxx b/pandatool/src/egg-mkfont/eggMakeFont.cxx
index 36a5e04acc..68403c5e62 100644
--- a/pandatool/src/egg-mkfont/eggMakeFont.cxx
+++ b/pandatool/src/egg-mkfont/eggMakeFont.cxx
@@ -41,6 +41,7 @@
 ////////////////////////////////////////////////////////////////////
 EggMakeFont::
 EggMakeFont() : EggWriter(true, false) {
+  set_program_brief("generates .egg files with rasterized font glyphs");
   set_program_description
     ("egg-mkfont uses the FreeType library to generate an egg file "
      "and a series of texture images from a font file "
diff --git a/pandatool/src/egg-optchar/eggOptchar.cxx b/pandatool/src/egg-optchar/eggOptchar.cxx
index 840d8bcdf2..cf22dbe394 100644
--- a/pandatool/src/egg-optchar/eggOptchar.cxx
+++ b/pandatool/src/egg-optchar/eggOptchar.cxx
@@ -49,6 +49,7 @@ EggOptchar() {
   add_transform_options();
   add_fixrest_option();
 
+  set_program_brief("optimizes character models and animations in .egg files");
   set_program_description
     ("egg-optchar performs basic optimizations of a character model "
      "and its associated animations, primarily by analyzing the "
diff --git a/pandatool/src/egg-palettize/eggPalettize.cxx b/pandatool/src/egg-palettize/eggPalettize.cxx
index d34179c676..07f0ab49ed 100644
--- a/pandatool/src/egg-palettize/eggPalettize.cxx
+++ b/pandatool/src/egg-palettize/eggPalettize.cxx
@@ -35,6 +35,7 @@
 ////////////////////////////////////////////////////////////////////
 EggPalettize::
 EggPalettize() : EggMultiFilter(true) {
+  set_program_brief("pack textures from various .egg models into palette images");
   set_program_description
     ("egg-palettize attempts to pack several texture maps from various models "
      "together into one or more palette images, for improved rendering performance "
diff --git a/pandatool/src/egg-qtess/eggQtess.cxx b/pandatool/src/egg-qtess/eggQtess.cxx
index 5cb300c6b0..50ae8544dd 100644
--- a/pandatool/src/egg-qtess/eggQtess.cxx
+++ b/pandatool/src/egg-qtess/eggQtess.cxx
@@ -26,9 +26,10 @@ EggQtess::
 EggQtess() {
   add_normals_options();
 
+  set_program_brief("tesselate NURBS surfaces in .egg files");
   set_program_description
-    ("egg-qtess reads an egg file, tesselates all of its NURBS surfaces "
-     "using a simple uniform tesselation, and outputs a polygonal "
+    ("egg-qtess reads an egg file, tessellates all of its NURBS surfaces "
+     "using a simple uniform tessellation, and outputs a polygonal "
      "egg file.\n\n"
 
      "Characters are supported, soft-skinned and otherwise; joint "
@@ -62,12 +63,12 @@ EggQtess() {
      "Specify an approximate number of triangles to produce.  This "
      "is the total number of triangles for the entire egg file, "
      "including those surfaces that have already been given an "
-     "explicit tesselation by a parameter file.",
+     "explicit tessellation by a parameter file.",
      &EggQtess::dispatch_int, NULL, &_total_tris);
 
   add_option
     ("ap", "", 0,
-     "Attempt to automatically place tesselation lines where they'll "
+     "Attempt to automatically place tessellation lines where they'll "
      "do the most good on each surface (once the number of polygons "
      "for the surface has already been determined).",
      &EggQtess::dispatch_none, &QtessGlobals::_auto_place);
@@ -93,7 +94,7 @@ EggQtess() {
      "Respect subdivision parameters given in the egg file.  If this "
      "is specified, the egg file may define the effective number of "
      "patches of each NURBS entry.  This can be used alone or in "
-     "conjunction with -u or -t to fine-tune the uniform tesselation "
+     "conjunction with -u or -t to fine-tune the uniform tessellation "
      "on a per-surface basis.  (This is ignored if -ad is in effect.)",
      &EggQtess::dispatch_none, &QtessGlobals::_respect_egg);
 
diff --git a/pandatool/src/eggprogs/eggCrop.cxx b/pandatool/src/eggprogs/eggCrop.cxx
index 83786130c1..73a623298c 100644
--- a/pandatool/src/eggprogs/eggCrop.cxx
+++ b/pandatool/src/eggprogs/eggCrop.cxx
@@ -27,6 +27,7 @@
 ////////////////////////////////////////////////////////////////////
 EggCrop::
 EggCrop() {
+  set_program_brief("crop geometry in an .egg file");
   set_program_description
     ("egg-crop strips out all parts of an egg file that fall outside of an "
      "arbitrary bounding volume, specified with a minimum and maximum point "
diff --git a/pandatool/src/eggprogs/eggListTextures.cxx b/pandatool/src/eggprogs/eggListTextures.cxx
index b26758678c..bc1af8161f 100644
--- a/pandatool/src/eggprogs/eggListTextures.cxx
+++ b/pandatool/src/eggprogs/eggListTextures.cxx
@@ -24,6 +24,7 @@
 ////////////////////////////////////////////////////////////////////
 EggListTextures::
 EggListTextures() {
+  set_program_brief("list textures referenced by an .egg file");
   set_program_description
     ("egg-list-textures reads an egg file and writes a list of the "
      "textures it references.  It is particularly useful for building "
diff --git a/pandatool/src/eggprogs/eggMakeTube.cxx b/pandatool/src/eggprogs/eggMakeTube.cxx
index 20a0b770b8..3b8eddb5c8 100644
--- a/pandatool/src/eggprogs/eggMakeTube.cxx
+++ b/pandatool/src/eggprogs/eggMakeTube.cxx
@@ -29,6 +29,7 @@
 EggMakeTube::
 EggMakeTube() {
 
+  set_program_brief("generate a tube or sphere from geometry in an .egg file");
   set_program_description
     ("egg-make-tube generates an egg file representing a \"tube\" model, "
      "a cylinder capped on both ends by hemispheres.  This is similar "
diff --git a/pandatool/src/eggprogs/eggRename.cxx b/pandatool/src/eggprogs/eggRename.cxx
index 4dec65368f..a497671c79 100755
--- a/pandatool/src/eggprogs/eggRename.cxx
+++ b/pandatool/src/eggprogs/eggRename.cxx
@@ -22,6 +22,7 @@
 ////////////////////////////////////////////////////////////////////
 EggRename::
 EggRename() {
+  set_program_brief("rename nodes in .egg files");
   set_program_description
     ("egg-rename reads one or more egg files and writes back with modified"
      "node names. ie. suppressing prefix from all the nodes' names. ");
diff --git a/pandatool/src/eggprogs/eggRetargetAnim.cxx b/pandatool/src/eggprogs/eggRetargetAnim.cxx
index bc189d48fd..ff26b8f686 100644
--- a/pandatool/src/eggprogs/eggRetargetAnim.cxx
+++ b/pandatool/src/eggprogs/eggRetargetAnim.cxx
@@ -34,6 +34,7 @@ EggRetargetAnim() {
   add_path_replace_options();
   add_path_store_options();
 
+  set_program_brief("remove transformations from animation data in .egg files");
   set_program_description
     ("egg-retarget-anim reads a character model and its associated animation "
      "files, and removes the translations and scales from the animation "
diff --git a/pandatool/src/eggprogs/eggTextureCards.cxx b/pandatool/src/eggprogs/eggTextureCards.cxx
index 90fe0adb3a..b30c480059 100644
--- a/pandatool/src/eggprogs/eggTextureCards.cxx
+++ b/pandatool/src/eggprogs/eggTextureCards.cxx
@@ -31,6 +31,7 @@
 ////////////////////////////////////////////////////////////////////
 EggTextureCards::
 EggTextureCards() : EggWriter(true, true) {
+  set_program_brief("generate an .egg file containing texture cards");
   set_program_description
     ("egg-texture-cards generates an egg file consisting of several "
      "square polygons, one for each texture name that appears on the "
diff --git a/pandatool/src/eggprogs/eggToC.cxx b/pandatool/src/eggprogs/eggToC.cxx
index 66131adee8..4b7fc2bae1 100644
--- a/pandatool/src/eggprogs/eggToC.cxx
+++ b/pandatool/src/eggprogs/eggToC.cxx
@@ -33,6 +33,7 @@ EggToC::
 EggToC() :
   EggToSomething("C", ".c", true, true)
 {
+  set_program_brief("convert .egg geometry into compilable C tables");
   set_program_description
     ("This program reads Egg files and outputs code that will almost "
      "compile as a C or C++ program.  You get to define the data structures "
diff --git a/pandatool/src/eggprogs/eggTopstrip.cxx b/pandatool/src/eggprogs/eggTopstrip.cxx
index 9ddabdedba..2b833ce40d 100644
--- a/pandatool/src/eggprogs/eggTopstrip.cxx
+++ b/pandatool/src/eggprogs/eggTopstrip.cxx
@@ -34,6 +34,7 @@ EggTopstrip() {
   add_path_replace_options();
   add_path_store_options();
 
+  set_program_brief("unapplies animation from a joint in an .egg file");
   set_program_description
     ("egg-topstrip reads a character model and its associated animation "
      "files, and unapplies the animation from one of the top joints.  "
diff --git a/pandatool/src/eggprogs/eggTrans.cxx b/pandatool/src/eggprogs/eggTrans.cxx
index 7202b6b2af..99481020db 100644
--- a/pandatool/src/eggprogs/eggTrans.cxx
+++ b/pandatool/src/eggprogs/eggTrans.cxx
@@ -30,6 +30,7 @@ EggTrans() {
   add_texture_options();
   add_delod_options();
 
+  set_program_brief("apply transformations and optimizations to an .egg file");
   set_program_description
     ("egg-trans reads an egg file and writes an essentially equivalent "
      "egg file to the standard output, or to the file specified with -o.  "
diff --git a/pandatool/src/fltprogs/eggToFlt.cxx b/pandatool/src/fltprogs/eggToFlt.cxx
index f47d8b221f..d771f8d826 100644
--- a/pandatool/src/fltprogs/eggToFlt.cxx
+++ b/pandatool/src/fltprogs/eggToFlt.cxx
@@ -47,6 +47,7 @@ EggToFlt() :
   EggToSomething("MultiGen", ".flt", true, false)
 {
   set_binary_output(true);
+  set_program_brief("convert files from .egg format to MultiGen .flt");
   set_program_description
     ("egg2lt converts files from egg format to MultiGen .flt "
      "format.  It attempts to be as robust as possible, and matches "
diff --git a/pandatool/src/fltprogs/fltCopy.cxx b/pandatool/src/fltprogs/fltCopy.cxx
index a5457b6c75..d2c117d176 100644
--- a/pandatool/src/fltprogs/fltCopy.cxx
+++ b/pandatool/src/fltprogs/fltCopy.cxx
@@ -29,6 +29,7 @@
 ////////////////////////////////////////////////////////////////////
 FltCopy::
 FltCopy() {
+  set_program_brief("copy MultiGen .flt files into a CVS source hierarchy");
   set_program_description
     ("fltcopy copies one or more MultiGen .flt files into a "
      "CVS source hierarchy.  "
diff --git a/pandatool/src/fltprogs/fltInfo.cxx b/pandatool/src/fltprogs/fltInfo.cxx
index 730967c0ad..ab83af6705 100644
--- a/pandatool/src/fltprogs/fltInfo.cxx
+++ b/pandatool/src/fltprogs/fltInfo.cxx
@@ -25,6 +25,7 @@
 ////////////////////////////////////////////////////////////////////
 FltInfo::
 FltInfo() {
+  set_program_brief("describe the contents of a MultiGen .flt file");
   set_program_description
     ("This program reads a MultiGen OpenFlight (.flt) file and reports "
      "some interesting things about its contents.");
diff --git a/pandatool/src/fltprogs/fltToEgg.cxx b/pandatool/src/fltprogs/fltToEgg.cxx
index e41e84fcbd..ab22aedc5c 100644
--- a/pandatool/src/fltprogs/fltToEgg.cxx
+++ b/pandatool/src/fltprogs/fltToEgg.cxx
@@ -34,6 +34,7 @@ FltToEgg() :
   add_transform_options();
   add_merge_externals_options();
 
+  set_program_brief("convert a MultiGen .flt file to .egg");
   set_program_description
     ("This program converts MultiGen OpenFlight (.flt) files to egg.  Most "
      "features of MultiGen that are also recognized by egg are supported.");
diff --git a/pandatool/src/fltprogs/fltTrans.cxx b/pandatool/src/fltprogs/fltTrans.cxx
index 8a54272d1b..8c9d095edc 100644
--- a/pandatool/src/fltprogs/fltTrans.cxx
+++ b/pandatool/src/fltprogs/fltTrans.cxx
@@ -30,6 +30,7 @@ FltTrans() :
   // output files.
   _preferred_extension = ".flt";
 
+  set_program_brief("apply various operations to a MultiGen .flt file");
   set_program_description
     ("This program reads a MultiGen OpenFlight (.flt) file and writes an "
      "essentially equivalent .flt file, to the file specified with -o (or "
diff --git a/pandatool/src/imageprogs/imageFixHiddenColor.cxx b/pandatool/src/imageprogs/imageFixHiddenColor.cxx
index f8622843ae..682cc8dd1b 100644
--- a/pandatool/src/imageprogs/imageFixHiddenColor.cxx
+++ b/pandatool/src/imageprogs/imageFixHiddenColor.cxx
@@ -23,6 +23,7 @@
 ////////////////////////////////////////////////////////////////////
 ImageFixHiddenColor::
 ImageFixHiddenColor() : ImageFilter(true) {
+  set_program_brief("change the color of transparent pixels in an image");
   set_program_description
     ("This program is designed to fix the color channels of an "
      "alpha-cutout image, making the \"color\" of the invisible part of the "
diff --git a/pandatool/src/imageprogs/imageInfo.cxx b/pandatool/src/imageprogs/imageInfo.cxx
index 4d9d2a348b..ea2954315b 100755
--- a/pandatool/src/imageprogs/imageInfo.cxx
+++ b/pandatool/src/imageprogs/imageInfo.cxx
@@ -23,6 +23,7 @@
 ////////////////////////////////////////////////////////////////////
 ImageInfo::
 ImageInfo() {
+  set_program_brief("report the size of image files");
   set_program_description
     ("This program reads the headers of a series of one or more "
      "image files and reports the image sizes to standard output.");
diff --git a/pandatool/src/imageprogs/imageResize.cxx b/pandatool/src/imageprogs/imageResize.cxx
index f37edeba40..d10356f0fc 100755
--- a/pandatool/src/imageprogs/imageResize.cxx
+++ b/pandatool/src/imageprogs/imageResize.cxx
@@ -23,6 +23,7 @@
 ////////////////////////////////////////////////////////////////////
 ImageResize::
 ImageResize() : ImageFilter(true) {
+  set_program_brief("resize an image file");
   set_program_description
     ("This program reads an image file and resizes it to a larger or smaller "
      "image file.");
diff --git a/pandatool/src/imageprogs/imageTrans.cxx b/pandatool/src/imageprogs/imageTrans.cxx
index 58e1329d1c..94b8bcf4d3 100644
--- a/pandatool/src/imageprogs/imageTrans.cxx
+++ b/pandatool/src/imageprogs/imageTrans.cxx
@@ -23,6 +23,7 @@
 ////////////////////////////////////////////////////////////////////
 ImageTrans::
 ImageTrans() : ImageFilter(true) {
+  set_program_brief("apply transformations to an image file");
   set_program_description
     ("This program reads an image file and writes a similar "
      "image file to the output.  It can implicitly convert from one image "
diff --git a/pandatool/src/imageprogs/imageTransformColors.cxx b/pandatool/src/imageprogs/imageTransformColors.cxx
index 5e1b73b060..118ef0f5c1 100644
--- a/pandatool/src/imageprogs/imageTransformColors.cxx
+++ b/pandatool/src/imageprogs/imageTransformColors.cxx
@@ -25,6 +25,7 @@
 ////////////////////////////////////////////////////////////////////
 ImageTransformColors::
 ImageTransformColors() {
+  set_program_brief("transform colors in an image file");
   set_program_description
     ("This program can apply a global color transform to all of the "
      "pixels in an image, or in a series of images.  This can be used, "
diff --git a/pandatool/src/lwoprogs/lwoScan.cxx b/pandatool/src/lwoprogs/lwoScan.cxx
index 13bcf141db..f8866ee75c 100644
--- a/pandatool/src/lwoprogs/lwoScan.cxx
+++ b/pandatool/src/lwoprogs/lwoScan.cxx
@@ -29,6 +29,7 @@ LwoScan() {
   clear_runlines();
   add_runline("[opts] input.lwo");
 
+  set_program_brief("describe the contents of a Lightwave object file");
   set_program_description
     ("This program simply reads a Lightwave object file and dumps its "
      "contents to standard output.  It's mainly useful for debugging "
diff --git a/pandatool/src/lwoprogs/lwoToEgg.cxx b/pandatool/src/lwoprogs/lwoToEgg.cxx
index de16c822de..dfaf1cb7fd 100644
--- a/pandatool/src/lwoprogs/lwoToEgg.cxx
+++ b/pandatool/src/lwoprogs/lwoToEgg.cxx
@@ -35,6 +35,7 @@ LwoToEgg() :
   add_normals_options();
   add_transform_options();
 
+  set_program_brief("convert a Lightwave Object file to .egg");
   set_program_description
     ("This program converts Lightwave Object (.lwo) files to egg.  Many "
      "rendering characteristics of Lightwave (like layered shaders, etc.) "
diff --git a/pandatool/src/mayaprogs/eggToMaya.cxx b/pandatool/src/mayaprogs/eggToMaya.cxx
index a91be286e3..4410145745 100755
--- a/pandatool/src/mayaprogs/eggToMaya.cxx
+++ b/pandatool/src/mayaprogs/eggToMaya.cxx
@@ -40,6 +40,7 @@ EggToMaya() :
   add_units_options();
 
   set_binary_output(true);
+  set_program_brief("convert .egg files to Maya .mb or .ma files");
   set_program_description
     ("egg2maya converts files from egg format to Maya .mb or .ma "
      "format.  It contains support for basic geometry (polygons with textures)."
diff --git a/pandatool/src/mayaprogs/mayaCopy.cxx b/pandatool/src/mayaprogs/mayaCopy.cxx
index 5421cac22a..5d6520da63 100644
--- a/pandatool/src/mayaprogs/mayaCopy.cxx
+++ b/pandatool/src/mayaprogs/mayaCopy.cxx
@@ -43,6 +43,7 @@
 ////////////////////////////////////////////////////////////////////
 MayaCopy::
 MayaCopy() {
+  set_program_brief("copy Maya .mb files into a CVS source hierarchy");
   set_program_description
     ("mayacopy copies one or more Maya .mb files into a "
      "CVS source hierarchy.  "
diff --git a/pandatool/src/mayaprogs/mayaToEgg.cxx b/pandatool/src/mayaprogs/mayaToEgg.cxx
index 35a1b201b7..a6497c46cd 100644
--- a/pandatool/src/mayaprogs/mayaToEgg.cxx
+++ b/pandatool/src/mayaprogs/mayaToEgg.cxx
@@ -64,6 +64,7 @@ MayaToEgg() :
   add_normals_options();
   add_transform_options();
 
+  set_program_brief("convert Maya model files to .egg");
   set_program_description
     ("This program converts Maya model files to egg.  Static and animatable "
      "models can be converted, with polygon or NURBS output.  Animation tables "
diff --git a/pandatool/src/mayaprogs/mayaToEgg_server.cxx b/pandatool/src/mayaprogs/mayaToEgg_server.cxx
index ac4aad600c..15a063fa6e 100755
--- a/pandatool/src/mayaprogs/mayaToEgg_server.cxx
+++ b/pandatool/src/mayaprogs/mayaToEgg_server.cxx
@@ -40,6 +40,7 @@ MayaToEggServer() :
   add_normals_options();
   add_transform_options();
 
+  set_program_brief("convert Maya model files to .egg");
   set_program_description
     ("This program converts Maya model files to egg.  Static and animatable "
      "models can be converted, with polygon or NURBS output.  Animation tables "
diff --git a/pandatool/src/miscprogs/binToC.cxx b/pandatool/src/miscprogs/binToC.cxx
index 40eb02145e..947c6e3022 100644
--- a/pandatool/src/miscprogs/binToC.cxx
+++ b/pandatool/src/miscprogs/binToC.cxx
@@ -33,6 +33,7 @@ BinToC() :
   add_runline("input -o output.c");
   add_runline("input >output.c");
 
+  set_program_brief("convert binary data to a compilable C table");
   set_program_description
     ("bin2c is a simple utility program to read a disk file, presumably "
      "one with binary contents, and output a table that can be "
diff --git a/pandatool/src/objprogs/eggToObj.cxx b/pandatool/src/objprogs/eggToObj.cxx
index fd18a1c375..8bfbe67790 100644
--- a/pandatool/src/objprogs/eggToObj.cxx
+++ b/pandatool/src/objprogs/eggToObj.cxx
@@ -28,6 +28,7 @@ EggToObj::
 EggToObj() :
   EggToSomething("Obj", ".obj", true, false)
 {
+  set_program_brief("convert .egg files to .obj");
   set_program_description
     ("This program converts egg files to obj.  It "
      "only converts polygon data, with no fancy tricks.  "
diff --git a/pandatool/src/objprogs/objToEgg.cxx b/pandatool/src/objprogs/objToEgg.cxx
index cc1261afbb..e670bf7ea5 100755
--- a/pandatool/src/objprogs/objToEgg.cxx
+++ b/pandatool/src/objprogs/objToEgg.cxx
@@ -31,6 +31,7 @@ ObjToEgg() :
   add_normals_options();
   add_transform_options();
 
+  set_program_brief("convert .obj files to .egg");
   set_program_description
     ("This program converts obj files to egg.  It "
      "only converts polygon data, with no fancy tricks.  "
diff --git a/pandatool/src/palettizer/paletteImage.cxx b/pandatool/src/palettizer/paletteImage.cxx
index 8676ec1409..247948c947 100644
--- a/pandatool/src/palettizer/paletteImage.cxx
+++ b/pandatool/src/palettizer/paletteImage.cxx
@@ -322,7 +322,7 @@ place(TexturePlacement *placement) {
     // [gjeon] create swappedImages
     TexturePlacement::TextureSwaps::iterator tsi;
     for (tsi = placement->_textureSwaps.begin(); tsi != placement->_textureSwaps.end(); ++tsi) {
-      if ((tsi - placement->_textureSwaps.begin()) >= _swappedImages.size()) {
+      if ((tsi - placement->_textureSwaps.begin()) >= (int)_swappedImages.size()) {
         PaletteImage *swappedImage = new PaletteImage(_page, _swappedImages.size(), tsi - placement->_textureSwaps.begin() + 1);
         swappedImage->_masterPlacements = &_placements;
         _swappedImages.push_back(swappedImage);
@@ -1010,10 +1010,11 @@ get_swapped_image(int index) {
   Placements::iterator pi;
   for (pi = _masterPlacements->begin(); pi != _masterPlacements->end(); ++pi) {
     TexturePlacement *placement = (*pi);
-    if (placement->_textureSwaps.size() > index)
+    if ((int)placement->_textureSwaps.size() > index) {
       placement->fill_swapped_image(_image, index);
-    else
+    } else {
       placement->fill_image(_image);
+    }
   }
 }
 
diff --git a/pandatool/src/pfmprogs/pfmBba.cxx b/pandatool/src/pfmprogs/pfmBba.cxx
index 3f15b08b96..382768c964 100755
--- a/pandatool/src/pfmprogs/pfmBba.cxx
+++ b/pandatool/src/pfmprogs/pfmBba.cxx
@@ -24,6 +24,7 @@
 ////////////////////////////////////////////////////////////////////
 PfmBba::
 PfmBba() {
+  set_program_brief("generate .bba files from .pfm files");
   set_program_description
     ("pfm-bba generates a .bba file from a .pfm file that lists the "
      "planar bounding volume of the pfm's internal data.");
diff --git a/pandatool/src/pfmprogs/pfmTrans.cxx b/pandatool/src/pfmprogs/pfmTrans.cxx
index 5e7e3cf8e7..db5ea973b3 100755
--- a/pandatool/src/pfmprogs/pfmTrans.cxx
+++ b/pandatool/src/pfmprogs/pfmTrans.cxx
@@ -37,6 +37,7 @@ PfmTrans() {
 
   add_transform_options();
 
+  set_program_brief("transform .pfm files");
   set_program_description
     ("pfm-trans reads an pfm file and transforms it, filters it, "
      "operates on it, writing the output to another pfm file.  A pfm "
diff --git a/pandatool/src/progbase/programBase.cxx b/pandatool/src/progbase/programBase.cxx
index 46736055ba..94bcb0e13b 100644
--- a/pandatool/src/progbase/programBase.cxx
+++ b/pandatool/src/progbase/programBase.cxx
@@ -27,6 +27,7 @@
 #include "configVariableBool.h"
 #include "panda_getopt_long.h"
 #include "preprocess_argv.h"
+#include "pandaVersion.h"
 
 #include <stdlib.h>
 #include <algorithm>
@@ -80,7 +81,7 @@ static ConfigVariableBool use_terminal_width
 //  Description:
 ////////////////////////////////////////////////////////////////////
 ProgramBase::
-ProgramBase() {
+ProgramBase(const string &name) : _name(name) {
   // Set up Notify to write output to our own formatted stream.
   Notify::ptr()->set_ostream_ptr(new WordWrapStream(this), true);
 
@@ -141,7 +142,7 @@ void ProgramBase::
 show_usage() {
   nout << "\rUsage:\n";
   Runlines::const_iterator ri;
-  string prog = "  " +_program_name.get_basename_wo_extension();
+  string prog = "  " + _program_name.get_basename_wo_extension();
 
   for (ri = _runlines.begin(); ri != _runlines.end(); ++ri) {
     show_text(prog, prog.length() + 1, *ri);
@@ -189,6 +190,92 @@ show_text(const string &prefix, int indent_width, string text) {
               prefix, indent_width, text, _terminal_width);
 }
 
+////////////////////////////////////////////////////////////////////
+//     Function: ProgramBase::write_man_page
+//       Access: Public
+//  Description: Generates a man page in nroff syntax based on the
+//               description and options.  This is useful when
+//               creating a man page for this utility.
+////////////////////////////////////////////////////////////////////
+void ProgramBase::
+write_man_page(ostream &out) {
+  string prog = _program_name.get_basename_wo_extension();
+  out << ".\\\" Automatically generated by " << prog << " -write-man\n";
+
+  // Format the man page title as the uppercase version of the program name,
+  // as per the UNIX manual conventions.
+  out << ".TH ";
+  string::const_iterator si;
+  for (si = _name.begin(); si != _name.end(); ++si) {
+    out << (char)toupper(*si);
+  }
+
+  // Generate a date string for inclusion into the footer.
+  char date_str[256];
+  date_str[0] = 0;
+  time_t current_time = time(NULL);
+
+  if (current_time != (time_t) -1) {
+    tm *today = localtime(&current_time);
+    if (today == NULL || 0 == strftime(date_str, 256, "%d %B %Y", today)) {
+      date_str[0] = 0;
+    }
+  }
+
+  out << " 1 \"" << date_str << "\" \"" PANDA_VERSION_STR "\" Panda3D\n";
+
+  out << ".SH NAME\n";
+  if (_brief.empty()) {
+    out << _name << "\n";
+  } else {
+    out << _name << " \\- " << _brief << "\n";
+  }
+
+  out << ".SH SYNOPSIS\n";
+  Runlines::const_iterator ri = _runlines.begin();
+  if (ri != _runlines.end()) {
+    out << "\\fB" << prog << "\\fR " << *ri << "\n";
+    ++ri;
+  }
+
+  for (; ri != _runlines.end(); ++ri) {
+    out << ".br\n";
+    out << "\\fB" << prog << "\\fR " << *ri << "\n";
+  }
+
+  out << ".SH DESCRIPTION\n";
+  string::const_iterator di;
+  char prev = 0;
+  for (di = _description.begin(); di != _description.end(); ++di) {
+    if ((*di) == '-') {
+      // We have to escape hyphens.
+      out << "\\-";
+    } else if (prev == '\n' && (*di) == '\n') {
+      // Indicate the start of a new paragraph.
+      out << ".PP\n";
+    } else {
+      out << (char)(*di);
+    }
+    prev = (*di);
+  }
+  out << "\n";
+
+  out << ".SH OPTIONS\n";
+  sort_options();
+  OptionsByIndex::const_iterator oi;
+  for (oi = _options_by_index.begin(); oi != _options_by_index.end(); ++oi) {
+    const Option &opt = *(*oi);
+    out << ".TP\n";
+
+    if (opt._parm_name.empty()) {
+      out << ".B \\-" << opt._option << "\n";
+    } else {
+      out << ".BI \"\\-" << opt._option << " \" \"" << opt._parm_name << "\"\n";
+    }
+    out << opt._description << "\n";
+  }
+}
+
 ////////////////////////////////////////////////////////////////////
 //     Function: ProgramBase::parse_command_line
 //       Access: Public, Virtual
@@ -208,13 +295,41 @@ parse_command_line(int argc, char **argv) {
   extern int optind;
   optind = 0;
 
-
   _program_name = Filename::from_os_specific(argv[0]);
   int i;
   for (i = 1; i < argc; i++) {
     _program_args.push_back(argv[i]);
   }
 
+  if (_name.empty()) {
+    _name = _program_name.get_basename_wo_extension();
+  }
+
+  // Catch a special hidden option: -write-man, which causes the tool
+  // to generate a manual page.
+  if (argc > 1 && strcmp(argv[1], "-write-man") == 0) {
+    if (argc == 2) {
+      write_man_page(cout);
+
+    } else if (argc == 3) {
+      if (strlen(argv[2]) == 1 && argv[2][0] == '-') {
+        write_man_page(cout);
+
+      } else {
+        pofstream man_out(argv[2], ios::out | ios::trunc);
+        if (!man_out) {
+          cerr << "Failed to open output file " << argv[2] << "!\n";
+        }
+        write_man_page(man_out);
+        man_out.close();
+      }
+    } else {
+      cerr << "Invalid number of options for -write-man!\n";
+      exit(1);
+    }
+    exit(0);
+  }
+
   // Build up the long options list and the short options string for
   // getopt_long_only().
   pvector<struct option> long_options;
@@ -438,6 +553,21 @@ post_command_line() {
   return true;
 }
 
+////////////////////////////////////////////////////////////////////
+//     Function: ProgramBase::set_program_brief
+//       Access: Protected
+//  Description: Sets a brief synopsis of the program's function.
+//               This is currently only used for generating the
+//               synopsis of the program's man page.
+//
+//               This should be of the format:
+//               "perform operation foo on bar files"
+////////////////////////////////////////////////////////////////////
+void ProgramBase::
+set_program_brief(const string &brief) {
+  _brief = brief;
+}
+
 ////////////////////////////////////////////////////////////////////
 //     Function: ProgramBase::set_program_description
 //       Access: Protected
diff --git a/pandatool/src/progbase/programBase.h b/pandatool/src/progbase/programBase.h
index 1f2ddcb664..dc58d98e01 100644
--- a/pandatool/src/progbase/programBase.h
+++ b/pandatool/src/progbase/programBase.h
@@ -36,7 +36,7 @@
 ////////////////////////////////////////////////////////////////////
 class ProgramBase {
 public:
-  ProgramBase();
+  ProgramBase(const string &name = string());
   virtual ~ProgramBase();
 
   void show_description();
@@ -46,6 +46,8 @@ public:
   INLINE void show_text(const string &text);
   void show_text(const string &prefix, int indent_width, string text);
 
+  void write_man_page(ostream &out);
+
   virtual void parse_command_line(int argc, char **argv);
 
   string get_exec_command() const;
@@ -61,6 +63,7 @@ protected:
   virtual bool handle_args(Args &args);
   virtual bool post_command_line();
 
+  void set_program_brief(const string &brief);
   void set_program_description(const string &description);
   void clear_runlines();
   void add_runline(const string &runline);
@@ -137,6 +140,8 @@ private:
     bool operator () (const Option *a, const Option *b) const;
   };
 
+  string _name;
+  string _brief;
   string _description;
   typedef vector_string Runlines;
   Runlines _runlines;
diff --git a/pandatool/src/progbase/test_prog.cxx b/pandatool/src/progbase/test_prog.cxx
index a2841141e0..b64c4ffac7 100644
--- a/pandatool/src/progbase/test_prog.cxx
+++ b/pandatool/src/progbase/test_prog.cxx
@@ -28,6 +28,7 @@ public:
 
 TestProgram::
 TestProgram() {
+  set_program_brief("test program for ProgramBase class");
   set_program_description
     ("This is a simple test program to verify the effectiveness of the "
      "ProgramBase base class as a base class for simple programs.  It "
diff --git a/pandatool/src/scripts/builder.cshrc b/pandatool/src/scripts/builder.cshrc
index 06f29f9918..e79489ad78 100644
--- a/pandatool/src/scripts/builder.cshrc
+++ b/pandatool/src/scripts/builder.cshrc
@@ -38,7 +38,6 @@ alias setbrowseinfo1 setenv CL_MAKE_BROWSE_INFO 1
 alias setbrowseinfo0 setenv CL_MAKE_BROWSE_INFO 0
 
 setenv HAVE_GL yes
-setenv HAVE_DX8 yes
 setenv HAVE_DX9 yes
 setenv USE_NSPR t
 
diff --git a/pandatool/src/softprogs/softCVS.cxx b/pandatool/src/softprogs/softCVS.cxx
index d25d061af1..cff45eac57 100644
--- a/pandatool/src/softprogs/softCVS.cxx
+++ b/pandatool/src/softprogs/softCVS.cxx
@@ -29,6 +29,7 @@ SoftCVS::
 SoftCVS() {
   _cvs_binary = "cvs";
 
+  set_program_brief("prepare a SoftImage database directory for adding to CVS");
   set_program_description
     ("softcvs is designed to prepare a directory hierarchy "
      "representing a SoftImage database for adding to CVS.  "
diff --git a/pandatool/src/text-stats/textStats.cxx b/pandatool/src/text-stats/textStats.cxx
index 0a34978552..0e53212246 100644
--- a/pandatool/src/text-stats/textStats.cxx
+++ b/pandatool/src/text-stats/textStats.cxx
@@ -36,6 +36,7 @@ static void signal_handler(int) {
 ////////////////////////////////////////////////////////////////////
 TextStats::
 TextStats() {
+  set_program_brief("text-based PStats client");
   set_program_description
     ("This is a simple PStats server that listens on a TCP port for a "
      "connection from a PStatClient in a Panda player.  It will then report "
diff --git a/pandatool/src/vrmlprogs/vrmlToEgg.cxx b/pandatool/src/vrmlprogs/vrmlToEgg.cxx
index a52111f1cc..8ade53d2e0 100644
--- a/pandatool/src/vrmlprogs/vrmlToEgg.cxx
+++ b/pandatool/src/vrmlprogs/vrmlToEgg.cxx
@@ -30,6 +30,7 @@ VRMLToEgg() :
   add_normals_options();
   add_transform_options();
 
+  set_program_brief("convert VRML 2.0 model files to .egg");
   set_program_description
     ("This program converts VRML 2.0 model files to egg.  Animated files, "
      "and VRML 1.0 files, are not supported.");
diff --git a/pandatool/src/vrmlprogs/vrmlTrans.cxx b/pandatool/src/vrmlprogs/vrmlTrans.cxx
index 21a27abe62..acf226978e 100644
--- a/pandatool/src/vrmlprogs/vrmlTrans.cxx
+++ b/pandatool/src/vrmlprogs/vrmlTrans.cxx
@@ -29,6 +29,7 @@ VRMLTrans() :
   // output files.
   _preferred_extension = ".wrl";
 
+  set_program_brief("reads and writes VRML 2.0 files");
   set_program_description
     ("This program reads a VRML 2.0 file (.wrl) and writes an "
      "essentially equivalent .wrl file.  It is primarily useful for "
diff --git a/pandatool/src/xfileprogs/eggToX.cxx b/pandatool/src/xfileprogs/eggToX.cxx
index f0507906f7..244da4405e 100644
--- a/pandatool/src/xfileprogs/eggToX.cxx
+++ b/pandatool/src/xfileprogs/eggToX.cxx
@@ -26,6 +26,7 @@ EggToX() : EggToSomething("DirectX", ".x", true, false) {
   add_texture_options();
   add_delod_options(0.0);
 
+  set_program_brief("convert an .egg file into a DirectX .x file");
   set_program_description
     ("This program reads an Egg file and outputs an equivalent, "
      "or nearly equivalent, DirectX-style .x file.  Only simple "
diff --git a/pandatool/src/xfileprogs/xFileToEgg.cxx b/pandatool/src/xfileprogs/xFileToEgg.cxx
index 18bc458b25..046761e409 100644
--- a/pandatool/src/xfileprogs/xFileToEgg.cxx
+++ b/pandatool/src/xfileprogs/xFileToEgg.cxx
@@ -32,6 +32,7 @@ XFileToEgg() :
   add_normals_options();
   add_transform_options();
 
+  set_program_brief("convert a DirectX .x file to an .egg file");
   set_program_description
     ("This program converts DirectX retained-mode (.x) files to egg.  "
      "Polygon meshes, materials, and textures, as well as skeleton "
diff --git a/pandatool/src/xfileprogs/xFileTrans.cxx b/pandatool/src/xfileprogs/xFileTrans.cxx
index 92333e5c54..8e1b406df4 100644
--- a/pandatool/src/xfileprogs/xFileTrans.cxx
+++ b/pandatool/src/xfileprogs/xFileTrans.cxx
@@ -29,6 +29,7 @@ XFileTrans() :
   // output files.
   _preferred_extension = ".x";
 
+  set_program_brief("reads and writes DirectX .x files");
   set_program_description
     ("This program reads a DirectX retained-mode file (.x) and writes an "
      "essentially equivalent .x file.  It is primarily useful for "