mirror of
https://github.com/panda3d/panda3d.git
synced 2025-10-02 18:03:56 -04:00
build on msvs2010
This commit is contained in:
parent
ac0a33e65c
commit
c7adc6246f
@ -16,6 +16,7 @@
|
||||
#include "filename.h"
|
||||
|
||||
#include <algorithm>
|
||||
#include <iterator>
|
||||
|
||||
////////////////////////////////////////////////////////////////////
|
||||
// Function: DSearchPath::Results::Constructor
|
||||
|
@ -1366,7 +1366,7 @@ cull_to_bins(const GraphicsEngine::Windows &wlist, Thread *current_thread) {
|
||||
DisplayRegionPipelineReader *dr_reader =
|
||||
new DisplayRegionPipelineReader(dr, current_thread);
|
||||
NodePath camera = dr_reader->get_camera();
|
||||
AlreadyCulled::iterator aci = already_culled.insert(AlreadyCulled::value_type(camera, NULL)).first;
|
||||
AlreadyCulled::iterator aci = already_culled.insert(AlreadyCulled::value_type(camera, (DisplayRegion *)NULL)).first;
|
||||
if ((*aci).second == NULL) {
|
||||
// We have not used this camera already in this thread.
|
||||
// Perform the cull operation.
|
||||
|
@ -24,6 +24,7 @@
|
||||
#include "virtualFile.h"
|
||||
|
||||
#include <algorithm>
|
||||
#include <iterator>
|
||||
#include <time.h>
|
||||
|
||||
// This sequence of bytes begins each Multifile to identify it as a
|
||||
|
@ -17,6 +17,7 @@
|
||||
#include "virtualFileList.h"
|
||||
#include "config_express.h"
|
||||
#include "pvector.h"
|
||||
#include <iterator>
|
||||
|
||||
TypeHandle VirtualFile::_type_handle;
|
||||
|
||||
|
@ -21,6 +21,7 @@
|
||||
#include "datagramIterator.h"
|
||||
#include "config_pgraph.h"
|
||||
#include "attribNodeRegistry.h"
|
||||
#include <iterator>
|
||||
|
||||
CPT(RenderAttrib) ClipPlaneAttrib::_empty_attrib;
|
||||
CPT(RenderAttrib) ClipPlaneAttrib::_all_off_attrib;
|
||||
|
@ -23,6 +23,7 @@
|
||||
#include "config_pgraph.h"
|
||||
#include "attribNodeRegistry.h"
|
||||
#include "indent.h"
|
||||
#include <iterator>
|
||||
|
||||
CPT(RenderAttrib) LightAttrib::_empty_attrib;
|
||||
int LightAttrib::_attrib_slot;
|
||||
|
@ -27,6 +27,7 @@
|
||||
#include "lightReMutexHolder.h"
|
||||
#include "lightMutexHolder.h"
|
||||
#include "thread.h"
|
||||
#include <iterator>
|
||||
|
||||
LightReMutex *RenderEffects::_states_lock = NULL;
|
||||
RenderEffects::States *RenderEffects::_states = NULL;
|
||||
|
@ -1625,7 +1625,7 @@ finalize() {
|
||||
// Move the NULL data to the new table; remove the rest.
|
||||
AuxDataTable new_aux_data;
|
||||
AuxDataTable::iterator nti =
|
||||
new_aux_data.insert(AuxDataTable::value_type(NULL, AuxDataNames())).first;
|
||||
new_aux_data.insert(AuxDataTable::value_type((TypedWritable *)NULL, AuxDataNames())).first;
|
||||
(*nti).second.swap((*ti).second);
|
||||
_aux_data.swap(new_aux_data);
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user