RomanNum3ral
/
open_toontown_panda3d
mirror of https://github.com/open-toontown/panda3d.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into deploy-ng

This commit is contained in:
Mitchell Stokes 2018-07-15 12:42:51 -07:00
parent 0fd1250142 47f7d3f297
commit c33ae8a95f
99 changed files with 238 additions and 220 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
dtool/src/cppparser/cppEnumType.cxx
View File

@ -224,12 +224,24 @@ substitute_decl(CPPDeclaration::SubstDecl &subst,
bool any_changed = false;
for (size_t i = 0; i < _elements.size(); ++i) {
CPPInstance *elem_rep =
_elements[i]->substitute_decl(subst, current_scope, global_scope)
->as_instance();
// We don't just do substitute_decl on the instance, which could lead to
// an infinite recursion.
CPPInstance *element = _elements[i];
CPPExpression *value = element->_initializer->
substitute_decl(subst, current_scope, global_scope)->as_expression();
if (elem_rep != _elements[i]) {
rep->_elements[i] = elem_rep;
if (is_scoped()) {
// For a strong enum, we consider the elements to be of this type.
if (value != element->_initializer) {
rep->_elements[i] = new CPPInstance(rep, element->_ident);
rep->_elements[i]->_initializer = value;
any_changed = true;
}
} else if (value != element->_initializer ||
rep->get_underlying_type() != get_underlying_type()) {
// In an unscoped enum, the elements are integers.
rep->_elements[i] = new CPPInstance(rep->get_underlying_type(), element->_ident);
rep->_elements[i]->_initializer = value;
any_changed = true;
}
}

8
dtool/src/cppparser/cppExpression.cxx
View File

@ -81,7 +81,7 @@ as_integer() const {
case RT_pointer:
// We don't mind if this loses precision.
return (int)reinterpret_cast<long>(_u._pointer);
return (int)(intptr_t)(_u._pointer);
default:
cerr << "Invalid type\n";
@ -104,7 +104,7 @@ as_real() const {
case RT_pointer:
// We don't mind if this loses precision.
return (double)reinterpret_cast<long>(_u._pointer);
return (double)(uintptr_t)(_u._pointer);
default:
cerr << "Invalid type\n";
@ -120,10 +120,10 @@ void *CPPExpression::Result::
as_pointer() const {
switch (_type) {
case RT_integer:
return reinterpret_cast<void*>((long)_u._integer);
return (void *)(intptr_t)_u._integer;
case RT_real:
return reinterpret_cast<void*>((long)_u._real);
return (void *)(uintptr_t)_u._real;
case RT_pointer:
return _u._pointer;

2
makepanda/installer.nsi
View File

@ -366,7 +366,7 @@ SectionGroup "Python support"
SetOutPath $INSTDIR\pandac\input
File /r "${BUILT}\pandac\input\*"
SetOutPath $INSTDIR\Pmw
File /r /x CVS "${BUILT}\Pmw\*"
File /nonfatal /r /x CVS "${BUILT}\Pmw\*"
SetOutPath $INSTDIR\panda3d.dist-info
File /nonfatal /r "${BUILT}\panda3d.dist-info\*"

6
makepanda/makepanda.py
View File

@ -3765,6 +3765,7 @@ if (not RUNTIME):
OPTS=['DIR:panda/src/putil', 'ZLIB', 'PYTHON']
IGATEFILES=GetDirectoryContents('panda/src/putil', ["*.h", "*_composite*.cxx"])
IGATEFILES.remove("test_bam.h")
IGATEFILES.remove("config_util.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"])
@ -3891,6 +3892,7 @@ if (not RUNTIME):
OPTS=['DIR:panda/src/pstatclient', 'PYTHON']
IGATEFILES=GetDirectoryContents('panda/src/pstatclient', ["*.h", "*_composite*.cxx"])
IGATEFILES.remove("config_pstats.h")
TargetAdd('libp3pstatclient.in', opts=OPTS, input=IGATEFILES)
TargetAdd('libp3pstatclient.in', opts=['IMOD:panda3d.core', 'ILIB:libp3pstatclient', 'SRCDIR:panda/src/pstatclient'])
TargetAdd('libp3pstatclient_igate.obj', input='libp3pstatclient.in', opts=["DEPENDENCYONLY"])
@ -6207,9 +6209,9 @@ if not PkgSkip("PANDATOOL"):
TargetAdd('pfm-trans.exe', opts=['ADVAPI'])
TargetAdd('pfm-bba_pfmBba.obj', opts=OPTS, input='pfmBba.cxx')
TargetAdd('pfm-bba_config_pfm.obj', opts=OPTS, input='config_pfm.cxx')
TargetAdd('pfm-bba_config_pfmprogs.obj', opts=OPTS, input='config_pfmprogs.cxx')
TargetAdd('pfm-bba.exe', input='pfm-bba_pfmBba.obj')
TargetAdd('pfm-bba.exe', input='pfm-bba_config_pfm.obj')
TargetAdd('pfm-bba.exe', input='pfm-bba_config_pfmprogs.obj')
TargetAdd('pfm-bba.exe', input='libp3progbase.lib')
TargetAdd('pfm-bba.exe', input='libp3pandatoolbase.lib')
TargetAdd('pfm-bba.exe', input=COMMON_PANDA_LIBS)

8
makepanda/makepanda.vcproj
View File

@ -1228,7 +1228,7 @@
<File RelativePath="..\panda\src\putil\pta_double.h"></File>
<File RelativePath="..\panda\src\putil\copyOnWritePointer.cxx"></File>
<File RelativePath="..\panda\src\putil\bitMask.cxx"></File>
<File RelativePath="..\panda\src\putil\config_util.h"></File>
<File RelativePath="..\panda\src\putil\config_putil.h"></File>
<File RelativePath="..\panda\src\putil\clockObject.h"></File>
<File RelativePath="..\panda\src\putil\lineStream.h"></File>
<File RelativePath="..\panda\src\putil\datagramInputFile.cxx"></File>
@ -1307,7 +1307,7 @@
<File RelativePath="..\panda\src\putil\bamCacheRecord.I"></File>
<File RelativePath="..\panda\src\putil\animInterface.cxx"></File>
<File RelativePath="..\panda\src\putil\lineStreamBuf.h"></File>
<File RelativePath="..\panda\src\putil\config_util.cxx"></File>
<File RelativePath="..\panda\src\putil\config_putil.cxx"></File>
<File RelativePath="..\panda\src\putil\cachedTypedWritableReferenceCount.cxx"></File>
<File RelativePath="..\panda\src\putil\pythonCallbackObject.cxx"></File>
<File RelativePath="..\panda\src\putil\test_linestream.cxx"></File>
@ -2322,8 +2322,8 @@
<File RelativePath="..\panda\src\pstatclient\pStatCollectorForward.h"></File>
<File RelativePath="..\panda\src\pstatclient\pStatClientControlMessage.h"></File>
<File RelativePath="..\panda\src\pstatclient\pStatServerControlMessage.h"></File>
<File RelativePath="..\panda\src\pstatclient\config_pstats.h"></File>
<File RelativePath="..\panda\src\pstatclient\config_pstats.cxx"></File>
<File RelativePath="..\panda\src\pstatclient\config_pstatclient.h"></File>
<File RelativePath="..\panda\src\pstatclient\config_pstatclient.cxx"></File>
<File RelativePath="..\panda\src\pstatclient\pStatClient.cxx"></File>
<File RelativePath="..\panda\src\pstatclient\pStatFrameData.I"></File>
<File RelativePath="..\panda\src\pstatclient\test_client.cxx"></File>

2
panda/metalibs/panda/panda.cxx
View File

@ -11,7 +11,7 @@
#include "config_display.h"
#include "config_pgraph.h"
#ifdef DO_PSTATS
#include "config_pstats.h"
#include "config_pstatclient.h"
#endif
// By including checkPandaVersion.h, we guarantee that runtime attempts to

2
panda/src/android/android_main.cxx
View File

@ -12,7 +12,7 @@
*/
#include "config_android.h"
#include "config_util.h"
#include "config_putil.h"
#include "virtualFileMountAndroidAsset.h"
#include "virtualFileSystem.h"
#include "filename.h"

2
panda/src/audio/audioManager.cxx
View File

@ -18,7 +18,7 @@
#include "nullAudioManager.h"
#include "windowsRegistry.h"
#include "virtualFileSystem.h"
#include "config_util.h"
#include "config_putil.h"
#include "load_dso.h"
#ifdef WIN32

2
panda/src/audiotraits/fmodAudioManager.cxx
View File

@ -20,7 +20,7 @@
// Panda headers.
#include "config_audio.h"
#include "config_util.h"
#include "config_putil.h"
#include "fmodAudioManager.h"
#include "fmodAudioSound.h"
#include "filename.h"

2
panda/src/audiotraits/milesAudioManager.cxx
View File

@ -21,7 +21,7 @@
#include "milesAudioStream.h"
#include "globalMilesManager.h"
#include "config_audio.h"
#include "config_util.h"
#include "config_putil.h"
#include "config_express.h"
#include "virtualFileSystem.h"
#include "nullAudioSound.h"

2
panda/src/audiotraits/openalAudioManager.cxx
View File

@ -14,7 +14,7 @@
// Panda headers.
#include "config_audio.h"
#include "config_util.h"
#include "config_putil.h"
#include "config_express.h"
#include "config_openalAudio.h"
#include "openalAudioManager.h"

2
panda/src/collada/load_collada_file.cxx
View File

@ -16,7 +16,7 @@
#include "config_collada.h"
#include "sceneGraphReducer.h"
#include "virtualFileSystem.h"
#include "config_util.h"
#include "config_putil.h"
#include "bamCacheRecord.h"
static PT(PandaNode)

2
panda/src/display/graphicsPipeSelection.cxx
View File

@ -19,7 +19,7 @@
#include "config_display.h"
#include "typeRegistry.h"
#include "pset.h"
#include "config_util.h"
#include "config_putil.h"
#include <algorithm>

2
panda/src/display/graphicsStateGuardian.cxx
View File

@ -58,7 +58,7 @@
#include "colorScaleAttrib.h"
#include "clipPlaneAttrib.h"
#include "fogAttrib.h"
#include "config_pstats.h"
#include "config_pstatclient.h"
#include <algorithm>
#include <limits.h>

2
panda/src/display/pStatGPUTimer.h
View File

@ -17,7 +17,7 @@
#include "pandabase.h"
#include "pStatTimer.h"
#include "pStatCollector.h"
#include "config_pstats.h"
#include "config_pstatclient.h"
#include "timerQueryContext.h"
class Thread;

2
panda/src/egg/eggData.cxx
View File

@ -18,7 +18,7 @@
#include "eggComment.h"
#include "eggPoolUniquifier.h"
#include "config_egg.h"
#include "config_util.h"
#include "config_putil.h"
#include "config_express.h"
#include "string_utils.h"
#include "dSearchPath.h"

2
panda/src/egg2pg/load_egg_file.cxx
View File

@ -16,7 +16,7 @@
#include "config_egg2pg.h"
#include "sceneGraphReducer.h"
#include "virtualFileSystem.h"
#include "config_util.h"
#include "config_putil.h"
#include "bamCacheRecord.h"
static PT(PandaNode)

2
panda/src/egg2pg/save_egg_file.cxx
View File

@ -17,7 +17,7 @@
#include "modelRoot.h"
#include "sceneGraphReducer.h"
#include "virtualFileSystem.h"
#include "config_util.h"
#include "config_putil.h"
/**
* A convenience function; converts the indicated scene graph to an egg file

2
panda/src/glstuff/glGraphicsStateGuardian_src.cxx
View File

@ -14,7 +14,7 @@
* get_supports_cg_profile)
*/
#include "config_util.h"
#include "config_putil.h"
#include "displayRegion.h"
#include "renderBuffer.h"
#include "geom.h"

2
panda/src/gobj/config_gobj.cxx
View File

@ -13,7 +13,7 @@
#include "animateVerticesRequest.h"
#include "bufferContext.h"
#include "config_util.h"
#include "config_putil.h"
#include "config_gobj.h"
#include "geom.h"
#include "geomCacheEntry.h"

2
panda/src/gobj/shader.cxx
View File

@ -19,7 +19,7 @@
#include "shader.h"
#include "preparedGraphicsObjects.h"
#include "virtualFileSystem.h"
#include "config_util.h"
#include "config_putil.h"
#include "bamCache.h"
#include "string_utils.h"

2
panda/src/gobj/texture.cxx
View File

@ -16,7 +16,7 @@
#include "pandabase.h"
#include "texture.h"
#include "config_gobj.h"
#include "config_util.h"
#include "config_putil.h"
#include "texturePool.h"
#include "textureContext.h"
#include "bamCache.h"

2
panda/src/gobj/texturePool.cxx
View File

@ -15,7 +15,7 @@
#include "texturePool.h"
#include "config_gobj.h"
#include "config_util.h"
#include "config_putil.h"
#include "config_express.h"
#include "string_utils.h"
#include "virtualFileSystem.h"

2
panda/src/iphonedisplay/iPhoneGraphicsWindow.mm
View File

@ -31,7 +31,7 @@
#include "throw_event.h"
#include "pnmImage.h"
#include "virtualFileSystem.h"
#include "config_util.h"
#include "config_putil.h"
#include "pset.h"
#include "pmutex.h"

2
panda/src/movies/movieTypeRegistry.cxx
View File

@ -14,7 +14,7 @@
#include "movieTypeRegistry.h"
#include "string_utils.h"
#include "config_movies.h"
#include "config_util.h"
#include "config_putil.h"
#include "load_dso.h"
MovieTypeRegistry *MovieTypeRegistry::_global_ptr = NULL;

2
panda/src/osxdisplay/osxGraphicsWindow.mm
View File

@ -36,7 +36,7 @@
#include "throw_event.h"
#include "pnmImage.h"
#include "virtualFileSystem.h"
#include "config_util.h"
#include "config_putil.h"
#include "pset.h"
#include "pmutex.h"

2
panda/src/pgraph/bamFile.cxx
View File

@ -16,7 +16,7 @@
#include "bam.h"
#include "bamCacheRecord.h"
#include "config_util.h"
#include "config_putil.h"
#include "bamReader.h"
#include "bamWriter.h"
#include "filename.h"

2
panda/src/pgraph/loader.cxx
View File

@ -19,7 +19,7 @@
#include "modelLoadRequest.h"
#include "modelSaveRequest.h"
#include "config_express.h"
#include "config_util.h"
#include "config_putil.h"
#include "virtualFileSystem.h"
#include "filename.h"
#include "load_dso.h"

2
panda/src/pgraph/shaderPool.cxx
View File

@ -12,7 +12,7 @@
*/
#include "shaderPool.h"
#include "config_util.h"
#include "config_putil.h"
#include "config_express.h"
#include "virtualFileSystem.h"
#include "loader.h"

2
panda/src/physx/physxEnums.cxx
View File

@ -14,7 +14,7 @@
#include "physxEnums.h"
#include "string_utils.h"
#include "config_util.h"
#include "config_putil.h"
ostream &
operator << (ostream &out, PhysxEnums::PhysxUpAxis axis) {

2
panda/src/pnmtext/freetypeFont.cxx
View File

@ -16,7 +16,7 @@
#ifdef HAVE_FREETYPE
#include "config_pnmtext.h"
#include "config_util.h"
#include "config_putil.h"
#include "config_express.h"
#include "virtualFileSystem.h"
#include "nurbsCurveEvaluator.h"

8
panda/src/pstatclient/config_pstats.cxx → panda/src/pstatclient/config_pstatclient.cxx
View File

@ -6,12 +6,12 @@
* license. You should have received a copy of this license along
* with this source code in a file named "LICENSE."
*
* @file config_pstats.cxx
* @file config_pstatclient.cxx
* @author drose
* @date 2000-07-09
*/
#include "config_pstats.h"
#include "config_pstatclient.h"
#include "dconfig.h"
@ -19,10 +19,10 @@
#error Buildsystem error: BUILDING_PANDA_PSTATCLIENT not defined
#endif
ConfigureDef(config_pstats);
ConfigureDef(config_pstatclient);
NotifyCategoryDef(pstats, "");
ConfigureFn(config_pstats) {
ConfigureFn(config_pstatclient) {
init_libpstatclient();
}

50
panda/src/pstatclient/config_pstatclient.h Normal file
View File

@ -0,0 +1,50 @@
/**
* PANDA 3D SOFTWARE
* Copyright (c) Carnegie Mellon University. All rights reserved.
*
* All use of this software is subject to the terms of the revised BSD
* license. You should have received a copy of this license along
* with this source code in a file named "LICENSE."
*
* @file config_pstatclient.h
* @author drose
* @date 2000-07-09
*/
#ifndef CONFIG_PSTATS_H
#define CONFIG_PSTATS_H
#include "pandabase.h"
#include "notifyCategoryProxy.h"
#include "dconfig.h"
#include "configVariableString.h"
#include "configVariableInt.h"
#include "configVariableDouble.h"
#include "configVariableBool.h"
// Configure variables for pstats package.
ConfigureDecl(config_pstatclient, EXPCL_PANDA_PSTATCLIENT, EXPTP_PANDA_PSTATCLIENT);
NotifyCategoryDecl(pstats, EXPCL_PANDA_PSTATCLIENT, EXPTP_PANDA_PSTATCLIENT);
extern EXPCL_PANDA_PSTATCLIENT ConfigVariableString pstats_name;
extern EXPCL_PANDA_PSTATCLIENT ConfigVariableDouble pstats_max_rate;
extern EXPCL_PANDA_PSTATCLIENT ConfigVariableBool pstats_threaded_write;
extern EXPCL_PANDA_PSTATCLIENT ConfigVariableInt pstats_max_queue_size;
extern EXPCL_PANDA_PSTATCLIENT ConfigVariableDouble pstats_tcp_ratio;
extern EXPCL_PANDA_PSTATCLIENT ConfigVariableString pstats_host;
extern EXPCL_PANDA_PSTATCLIENT ConfigVariableInt pstats_port;
extern EXPCL_PANDA_PSTATCLIENT ConfigVariableDouble pstats_target_frame_rate;
extern EXPCL_PANDA_PSTATCLIENT ConfigVariableBool pstats_gpu_timing;
extern EXPCL_PANDA_PSTATCLIENT ConfigVariableBool pstats_scroll_mode;
extern EXPCL_PANDA_PSTATCLIENT ConfigVariableDouble pstats_history;
extern EXPCL_PANDA_PSTATCLIENT ConfigVariableDouble pstats_average_time;
extern EXPCL_PANDA_PSTATCLIENT ConfigVariableBool pstats_mem_other;
extern EXPCL_PANDA_PSTATCLIENT void init_libpstatclient();
#endif

52
panda/src/pstatclient/config_pstats.h
View File

@ -1,50 +1,2 @@
/**
* PANDA 3D SOFTWARE
* Copyright (c) Carnegie Mellon University. All rights reserved.
*
* All use of this software is subject to the terms of the revised BSD
* license. You should have received a copy of this license along
* with this source code in a file named "LICENSE."
*
* @file config_pstats.h
* @author drose
* @date 2000-07-09
*/
#ifndef CONFIG_PSTATS_H
#define CONFIG_PSTATS_H
#include "pandabase.h"
#include "notifyCategoryProxy.h"
#include "dconfig.h"
#include "configVariableString.h"
#include "configVariableInt.h"
#include "configVariableDouble.h"
#include "configVariableBool.h"
// Configure variables for pstats package.
ConfigureDecl(config_pstats, EXPCL_PANDA_PSTATCLIENT, EXPTP_PANDA_PSTATCLIENT);
NotifyCategoryDecl(pstats, EXPCL_PANDA_PSTATCLIENT, EXPTP_PANDA_PSTATCLIENT);
extern EXPCL_PANDA_PSTATCLIENT ConfigVariableString pstats_name;
extern EXPCL_PANDA_PSTATCLIENT ConfigVariableDouble pstats_max_rate;
extern EXPCL_PANDA_PSTATCLIENT ConfigVariableBool pstats_threaded_write;
extern EXPCL_PANDA_PSTATCLIENT ConfigVariableInt pstats_max_queue_size;
extern EXPCL_PANDA_PSTATCLIENT ConfigVariableDouble pstats_tcp_ratio;
extern EXPCL_PANDA_PSTATCLIENT ConfigVariableString pstats_host;
extern EXPCL_PANDA_PSTATCLIENT ConfigVariableInt pstats_port;
extern EXPCL_PANDA_PSTATCLIENT ConfigVariableDouble pstats_target_frame_rate;
extern EXPCL_PANDA_PSTATCLIENT ConfigVariableBool pstats_gpu_timing;
extern EXPCL_PANDA_PSTATCLIENT ConfigVariableBool pstats_scroll_mode;
extern EXPCL_PANDA_PSTATCLIENT ConfigVariableDouble pstats_history;
extern EXPCL_PANDA_PSTATCLIENT ConfigVariableDouble pstats_average_time;
extern EXPCL_PANDA_PSTATCLIENT ConfigVariableBool pstats_mem_other;
extern EXPCL_PANDA_PSTATCLIENT void init_libpstatclient();
#endif
// This file to remain during the whole 1.10.x cycle; remove after that.
#error config_pstats.h has been renamed to config_pstatclient.h - please update your project.

2
panda/src/pstatclient/p3pstatclient_composite1.cxx
View File

@ -1,5 +1,5 @@
#include "config_pstats.cxx"
#include "config_pstatclient.cxx"
#include "pStatClient.cxx"
#include "pStatClientImpl.cxx"
#include "pStatClientVersion.cxx"

2
panda/src/pstatclient/pStatClient.cxx
View File

@ -21,7 +21,7 @@
#include "pStatServerControlMessage.h"
#include "pStatCollector.h"
#include "pStatThread.h"
#include "config_pstats.h"
#include "config_pstatclient.h"
#include "pStatProperties.h"
#include "thread.h"
#include "clockObject.h"

2
panda/src/pstatclient/pStatClientControlMessage.cxx
View File

@ -11,7 +11,7 @@
* @date 2000-07-09
*/
#include "config_pstats.h"
#include "config_pstatclient.h"
#include "pStatClientControlMessage.h"
#include "pStatClientVersion.h"

2
panda/src/pstatclient/pStatClientImpl.cxx
View File

@ -21,7 +21,7 @@
#include "pStatServerControlMessage.h"
#include "pStatCollector.h"
#include "pStatThread.h"
#include "config_pstats.h"
#include "config_pstatclient.h"
#include "pStatProperties.h"
#include "cmath.h"

2
panda/src/pstatclient/pStatFrameData.cxx
View File

@ -13,7 +13,7 @@
#include "pStatFrameData.h"
#include "pStatClientVersion.h"
#include "config_pstats.h"
#include "config_pstatclient.h"
#include "datagram.h"
#include "datagramIterator.h"

2
panda/src/pstatclient/pStatProperties.cxx
View File

@ -14,7 +14,7 @@
#include "pStatProperties.h"
#include "pStatCollectorDef.h"
#include "pStatClient.h"
#include "config_pstats.h"
#include "config_pstatclient.h"
#include "configVariableBool.h"
#include "configVariableColor.h"
#include "configVariableDouble.h"

2
panda/src/pstatclient/pStatServerControlMessage.cxx
View File

@ -11,7 +11,7 @@
* @date 2000-07-09
*/
#include "config_pstats.h"
#include "config_pstatclient.h"
#include "pStatServerControlMessage.h"
#include "datagram.h"

2
panda/src/pstatclient/test_client.cxx
View File

@ -11,7 +11,7 @@
* @date 2000-07-09
*/
#include "config_pstats.h"
#include "config_pstatclient.h"
#include "pStatClient.h"
#include "pStatCollector.h"
#include "thread.h"

2
panda/src/putil/autoTextureScale.cxx
View File

@ -13,7 +13,7 @@
#include "autoTextureScale.h"
#include "string_utils.h"
#include "config_util.h"
#include "config_putil.h"
ostream &
operator << (ostream &out, AutoTextureScale ats) {

2
panda/src/putil/bamCache.cxx
View File

@ -18,7 +18,7 @@
#include "hashVal.h"
#include "datagramInputFile.h"
#include "datagramOutputFile.h"
#include "config_util.h"
#include "config_putil.h"
#include "bam.h"
#include "typeRegistry.h"
#include "string_utils.h"

2
panda/src/putil/bamCacheIndex.cxx
View File

@ -14,7 +14,7 @@
#include "bamCacheIndex.h"
#include "bamReader.h"
#include "bamWriter.h"
#include "config_util.h" // util_cat
#include "config_putil.h" // util_cat
#include "indent.h"
#include <algorithm>

2
panda/src/putil/bamCacheRecord.cxx
View File

@ -17,7 +17,7 @@
#include "virtualFileSystem.h"
#include "virtualFile.h"
#include "indent.h"
#include "config_util.h" // util_cat
#include "config_putil.h" // util_cat
TypeHandle BamCacheRecord::_type_handle;

2
panda/src/putil/bamEnums.cxx
View File

@ -13,7 +13,7 @@
#include "bamEnums.h"
#include "string_utils.h"
#include "config_util.h"
#include "config_putil.h"
ostream &
operator << (ostream &out, BamEnums::BamEndian be) {

2
panda/src/putil/bamReader.cxx
View File

@ -17,7 +17,7 @@
#include "bam.h"
#include "bamReader.h"
#include "datagramIterator.h"
#include "config_util.h"
#include "config_putil.h"
#include "pipelineCyclerBase.h"
TypeHandle BamReaderAuxData::_type_handle;

2
panda/src/putil/bamReader_ext.cxx
View File

@ -12,7 +12,7 @@
*/
#include "bamReader_ext.h"
#include "config_util.h"
#include "config_putil.h"
#include "pythonThread.h"
#ifdef HAVE_PYTHON

2
panda/src/putil/bamWriter.cxx
View File

@ -15,7 +15,7 @@
#include "pnotify.h"
#include "typedWritable.h"
#include "config_util.h"
#include "config_putil.h"
#include "bam.h"
#include "bamWriter.h"
#include "bamReader.h"

2
panda/src/putil/buttonRegistry.cxx
View File

@ -12,7 +12,7 @@
*/
#include "buttonRegistry.h"
#include "config_util.h"
#include "config_putil.h"
#include <stdio.h>

2
panda/src/putil/clockObject.cxx
View File

@ -12,7 +12,7 @@
*/
#include "clockObject.h"
#include "config_util.h"
#include "config_putil.h"
#include "configVariableEnum.h"
#include "string_utils.h"
#include "thread.h"

2
panda/src/putil/colorSpace.cxx
View File

@ -12,7 +12,7 @@
*/
#include "colorSpace.h"
#include "config_util.h"
#include "config_putil.h"
#include "configVariableEnum.h"
#include "string_utils.h"

0
panda/src/putil/config_util.N → panda/src/putil/config_putil.N
View File

8
panda/src/putil/config_util.cxx → panda/src/putil/config_putil.cxx
View File

@ -6,12 +6,12 @@
* license. You should have received a copy of this license along
* with this source code in a file named "LICENSE."
*
* @file config_util.cxx
* @file config_putil.cxx
* @author cary
* @date 2000-01-04
*/
#include "config_util.h"
#include "config_putil.h"
#include "animInterface.h"
#include "bamCacheIndex.h"
#include "bamCacheRecord.h"
@ -51,7 +51,7 @@
#error Buildsystem error: BUILDING_PANDA_PUTIL not defined
#endif
ConfigureDef(config_util);
ConfigureDef(config_putil);
NotifyCategoryDef(util, "");
NotifyCategoryDef(bam, util_cat);
@ -88,7 +88,7 @@ ConfigVariableEnum<BamEnums::BamTextureMode> bam_texture_mode
PRC_DESC("Set this to specify how textures should be written into Bam files."
"See the panda source or documentation for available options."));
ConfigureFn(config_util) {
ConfigureFn(config_putil) {
init_libputil();
}

55
panda/src/putil/config_putil.h Normal file
View File

@ -0,0 +1,55 @@
/**
* PANDA 3D SOFTWARE
* Copyright (c) Carnegie Mellon University. All rights reserved.
*
* All use of this software is subject to the terms of the revised BSD
* license. You should have received a copy of this license along
* with this source code in a file named "LICENSE."
*
* @file config_putil.h
* @author cary
* @date 2000-01-04
*/
#ifndef __CONFIG_UTIL_H__
#define __CONFIG_UTIL_H__
#include "pandabase.h"
#include "notifyCategoryProxy.h"
#include "configVariableSearchPath.h"
#include "configVariableEnum.h"
#include "configVariableDouble.h"
#include "bamEnums.h"
#include "dconfig.h"
class DSearchPath;
ConfigureDecl(config_putil, EXPCL_PANDA_PUTIL, EXPTP_PANDA_PUTIL);
NotifyCategoryDecl(util, EXPCL_PANDA_PUTIL, EXPTP_PANDA_PUTIL);
NotifyCategoryDecl(bam, EXPCL_PANDA_PUTIL, EXPTP_PANDA_PUTIL);
// Actually, we can't determine this config variable the normal way, because
// we must be able to access it at static init time. Instead of declaring it
// a global constant, we'll make it a member of MemoryUsage. extern
// EXPCL_PANDA_PUTIL const bool track_memory_usage;
extern EXPCL_PANDA_PUTIL ConfigVariableInt bam_version;
extern EXPCL_PANDA_PUTIL ConfigVariableEnum<BamEnums::BamEndian> bam_endian;
extern EXPCL_PANDA_PUTIL ConfigVariableBool bam_stdfloat_double;
extern EXPCL_PANDA_PUTIL ConfigVariableEnum<BamEnums::BamTextureMode> bam_texture_mode;
BEGIN_PUBLISH
EXPCL_PANDA_PUTIL ConfigVariableSearchPath &get_model_path();
EXPCL_PANDA_PUTIL ConfigVariableSearchPath &get_plugin_path();
END_PUBLISH
extern ConfigVariableDouble sleep_precision;
extern EXPCL_PANDA_PUTIL ConfigVariableBool preload_textures;
extern EXPCL_PANDA_PUTIL ConfigVariableBool preload_simple_textures;
extern EXPCL_PANDA_PUTIL ConfigVariableBool compressed_textures;
extern EXPCL_PANDA_PUTIL ConfigVariableBool cache_check_timestamps;
extern EXPCL_PANDA_PUTIL void init_libputil();
#endif /* __CONFIG_UTIL_H__ */

57
panda/src/putil/config_util.h
View File

@ -1,55 +1,2 @@
/**
* PANDA 3D SOFTWARE
* Copyright (c) Carnegie Mellon University. All rights reserved.
*
* All use of this software is subject to the terms of the revised BSD
* license. You should have received a copy of this license along
* with this source code in a file named "LICENSE."
*
* @file config_util.h
* @author cary
* @date 2000-01-04
*/
#ifndef __CONFIG_UTIL_H__
#define __CONFIG_UTIL_H__
#include "pandabase.h"
#include "notifyCategoryProxy.h"
#include "configVariableSearchPath.h"
#include "configVariableEnum.h"
#include "configVariableDouble.h"
#include "bamEnums.h"
#include "dconfig.h"
class DSearchPath;
ConfigureDecl(config_util, EXPCL_PANDA_PUTIL, EXPTP_PANDA_PUTIL);
NotifyCategoryDecl(util, EXPCL_PANDA_PUTIL, EXPTP_PANDA_PUTIL);
NotifyCategoryDecl(bam, EXPCL_PANDA_PUTIL, EXPTP_PANDA_PUTIL);
// Actually, we can't determine this config variable the normal way, because
// we must be able to access it at static init time. Instead of declaring it
// a global constant, we'll make it a member of MemoryUsage. extern
// EXPCL_PANDA_PUTIL const bool track_memory_usage;
extern EXPCL_PANDA_PUTIL ConfigVariableInt bam_version;
extern EXPCL_PANDA_PUTIL ConfigVariableEnum<BamEnums::BamEndian> bam_endian;
extern EXPCL_PANDA_PUTIL ConfigVariableBool bam_stdfloat_double;
extern EXPCL_PANDA_PUTIL ConfigVariableEnum<BamEnums::BamTextureMode> bam_texture_mode;
BEGIN_PUBLISH
EXPCL_PANDA_PUTIL ConfigVariableSearchPath &get_model_path();
EXPCL_PANDA_PUTIL ConfigVariableSearchPath &get_plugin_path();
END_PUBLISH
extern ConfigVariableDouble sleep_precision;
extern EXPCL_PANDA_PUTIL ConfigVariableBool preload_textures;
extern EXPCL_PANDA_PUTIL ConfigVariableBool preload_simple_textures;
extern EXPCL_PANDA_PUTIL ConfigVariableBool compressed_textures;
extern EXPCL_PANDA_PUTIL ConfigVariableBool cache_check_timestamps;
extern EXPCL_PANDA_PUTIL void init_libputil();
#endif /* __CONFIG_UTIL_H__ */
// This file to remain during the whole 1.10.x cycle; remove after that.
#error config_util.h has been renamed to config_putil.h - please update your project.

2
panda/src/putil/copyOnWritePointer.cxx
View File

@ -12,7 +12,7 @@
*/
#include "copyOnWritePointer.h"
#include "config_util.h"
#include "config_putil.h"
#include "config_pipeline.h"
#ifdef COW_THREADED

2
panda/src/putil/datagramInputFile.cxx
View File

@ -16,7 +16,7 @@
#include "numeric_types.h"
#include "datagramIterator.h"
#include "profileTimer.h"
#include "config_util.h"
#include "config_putil.h"
#include "config_express.h"
#include "virtualFileSystem.h"
#include "streamReader.h"

2
panda/src/putil/datagramOutputFile.h
View File

@ -21,7 +21,7 @@
#include "fileReference.h"
#include "virtualFile.h"
#include "virtualFileSystem.h"
#include "config_util.h"
#include "config_putil.h"
/**
* This class can be used to write a binary file that consists of an arbitrary

2
panda/src/putil/factoryBase.cxx
View File

@ -13,7 +13,7 @@
#include "factoryBase.h"
#include "indent.h"
#include "config_util.h"
#include "config_putil.h"
/**
*

2
panda/src/putil/globalPointerRegistry.cxx
View File

@ -12,7 +12,7 @@
*/
#include "globalPointerRegistry.h"
#include "config_util.h"
#include "config_putil.h"
// In general, we use the util_cat->info() syntax in this file (instead of
// util_cat.info()), because much of this work is done at static init time,

2
panda/src/putil/keyboardButton.cxx
View File

@ -84,7 +84,7 @@ DEFINE_KEYBD_BUTTON_HANDLE(rmeta)
/**
* This is intended to be called only once, by the static initialization
* performed in config_util.cxx.
* performed in config_putil.cxx.
*/
void KeyboardButton::
init_keyboard_buttons() {

2
panda/src/putil/load_prc_file.cxx
View File

@ -16,7 +16,7 @@
#include "configVariableManager.h"
#include "virtualFileSystem.h"
#include "config_express.h"
#include "config_util.h"
#include "config_putil.h"
#include "hashVal.h"
/**

4
panda/src/putil/loaderOptions.cxx
View File

@ -12,7 +12,7 @@
*/
#include "loaderOptions.h"
#include "config_util.h"
#include "config_putil.h"
#include "indent.h"
/**
@ -25,7 +25,7 @@ LoaderOptions(int flags) :
_texture_num_views(0),
_auto_texture_scale(ATS_unspecified)
{
// Shadowing the variables in config_util for static init ordering issues.
// Shadowing the variables in config_putil for static init ordering issues.
static ConfigVariableBool *preload_textures;
static ConfigVariableBool *preload_simple_textures;
static ConfigVariableBool *compressed_textures;

2
panda/src/putil/mouseButton.cxx
View File

@ -129,7 +129,7 @@ is_mouse_button(ButtonHandle button) {
/**
* This is intended to be called only once, by the static initialization
* performed in config_util.cxx.
* performed in config_putil.cxx.
*/
void MouseButton::
init_mouse_buttons() {

2
panda/src/putil/p3putil_composite1.cxx
View File

@ -17,7 +17,7 @@
#include "callbackObject.cxx"
#include "clockObject.cxx"
#include "colorSpace.cxx"
#include "config_util.cxx"
#include "config_putil.cxx"
#include "configurable.cxx"
#include "copyOnWriteObject.cxx"
#include "copyOnWritePointer.cxx"

2
panda/src/putil/pythonCallbackObject.cxx
View File

@ -18,7 +18,7 @@
#include "py_panda.h"
#include "pythonThread.h"
#include "callbackData.h"
#include "config_util.h"
#include "config_putil.h"
TypeHandle PythonCallbackObject::_type_handle;

2
panda/src/putil/simpleHashMap.h
View File

@ -16,7 +16,7 @@
#include "pandabase.h"
#include "pvector.h"
#include "config_util.h"
#include "config_putil.h"
/**
* Entry in the SimpleHashMap.

2
panda/src/putil/test_filename.cxx
View File

@ -12,7 +12,7 @@
*/
#include "filename.h"
#include "config_util.h"
#include "config_putil.h"
#include "dSearchPath.h"

2
panda/src/putil/weakKeyHashMap.h
View File

@ -16,7 +16,7 @@
#include "pandabase.h"
#include "pvector.h"
#include "config_util.h"
#include "config_putil.h"
#include "weakPointerTo.h"
/**

2
panda/src/speedtree/speedTreeNode.cxx
View File

@ -15,7 +15,7 @@
#include "speedTreeNode.h"
#include "stBasicTerrain.h"
#include "virtualFileSystem.h"
#include "config_util.h"
#include "config_putil.h"
#include "cullTraverser.h"
#include "cullableObject.h"
#include "cullHandler.h"

2
panda/src/text/dynamicTextFont.cxx
View File

@ -28,7 +28,7 @@
#endif
#include "config_text.h"
#include "config_util.h"
#include "config_putil.h"
#include "config_express.h"
#include "virtualFileSystem.h"
#include "geomVertexData.h"

2
panda/src/text/fontPool.cxx
View File

@ -14,7 +14,7 @@
#include "fontPool.h"
#include "staticTextFont.h"
#include "dynamicTextFont.h"
#include "config_util.h"
#include "config_putil.h"
#include "config_express.h"
#include "virtualFileSystem.h"
#include "nodePath.h"

2
panda/src/tinydisplay/tinyOsxGraphicsWindow.mm
View File

@ -26,7 +26,7 @@
#include "throw_event.h"
#include "pnmImage.h"
#include "virtualFileSystem.h"
#include "config_util.h"
#include "config_putil.h"
#include <ApplicationServices/ApplicationServices.h>

2
panda/src/windisplay/winGraphicsWindow.cxx
View File

@ -19,7 +19,7 @@
#include "keyboardButton.h"
#include "mouseButton.h"
#include "clockObject.h"
#include "config_util.h"
#include "config_putil.h"
#include "throw_event.h"
#include "nativeWindowHandle.h"

2
pandatool/src/bam/eggToBam.cxx
View File

@ -13,7 +13,7 @@
#include "eggToBam.h"
#include "config_util.h"
#include "config_putil.h"
#include "bamFile.h"
#include "load_egg_file.h"
#include "config_egg2pg.h"

2
pandatool/src/bam/ptsToBam.cxx
View File

@ -13,7 +13,7 @@
#include "ptsToBam.h"
#include "config_util.h"
#include "config_putil.h"
#include "geomPoints.h"
#include "bamFile.h"
#include "pandaNode.h"

2
pandatool/src/converter/somethingToEggConverter.h
View File

@ -17,7 +17,7 @@
#include "pandatoolbase.h"
#include "filename.h"
#include "config_util.h" // for get_model_path()
#include "config_putil.h" // for get_model_path()
#include "animationConvert.h"
#include "pathReplace.h"
#include "pointerTo.h"

2
pandatool/src/egg-palettize/txaFileFilter.cxx
View File

@ -20,7 +20,7 @@
#include "dconfig.h"
#include "configVariableFilename.h"
#include "virtualFileSystem.h"
#include "config_util.h"
#include "config_putil.h"
NotifyCategoryDeclNoExport(txafile);
NotifyCategoryDef(txafile, "");

2
pandatool/src/eggbase/eggReader.cxx
View File

@ -14,7 +14,7 @@
#include "eggReader.h"
#include "pnmImage.h"
#include "config_util.h"
#include "config_putil.h"
#include "eggTextureCollection.h"
#include "eggGroup.h"
#include "eggGroupNode.h"

2
pandatool/src/eggbase/somethingToEgg.cxx
View File

@ -14,7 +14,7 @@
#include "somethingToEgg.h"
#include "somethingToEggConverter.h"
#include "config_util.h"
#include "config_putil.h"
/**
* The first parameter to the constructor should be the one-word name of the

2
pandatool/src/flt/fltTexture.cxx
View File

@ -16,7 +16,7 @@
#include "fltRecordWriter.h"
#include "fltHeader.h"
#include "pathReplace.h"
#include "config_util.h"
#include "config_putil.h"
TypeHandle FltTexture::_type_handle;

2
pandatool/src/gtk-stats/gtkStats.cxx
View File

@ -14,7 +14,7 @@
#include "pandatoolbase.h"
#include "gtkStats.h"
#include "gtkStatsServer.h"
#include "config_pstats.h"
#include "config_pstatclient.h"
GtkWidget *main_window;
static GtkStatsServer *server = NULL;

2
pandatool/src/maxegg/maxToEggConverter.cxx
View File

@ -25,7 +25,7 @@
*/
#include "maxEgg.h"
#include "config_util.h"
#include "config_putil.h"
/**
*

2
pandatool/src/mayaprogs/mayaPview.cxx
View File

@ -19,7 +19,7 @@
#include "mayaToEggConverter.h"
#include "eggData.h"
#include "load_egg_file.h"
#include "config_util.h"
#include "config_putil.h"
#include "config_chan.h"
#include "config_gobj.h"
#include "textNode.h"

2
pandatool/src/pandatoolbase/pathReplace.cxx
View File

@ -12,7 +12,7 @@
*/
#include "pathReplace.h"
#include "config_util.h"
#include "config_putil.h"
#include "config_pandatoolbase.h"
#include "indent.h"
#include "virtualFileSystem.h"

8
pandatool/src/pfmprogs/config_pfm.cxx → pandatool/src/pfmprogs/config_pfmprogs.cxx
View File

@ -6,16 +6,16 @@
* license. You should have received a copy of this license along
* with this source code in a file named "LICENSE."
*
* @file config_pfm.cxx
* @file config_pfmprogs.cxx
* @author drose
* @date 2010-12-23
*/
#include "config_pfm.h"
#include "config_pfmprogs.h"
#include "dconfig.h"
Configure(config_pfm);
Configure(config_pfmprogs);
NotifyCategoryDef(pfm, "");
ConfigVariableDouble pfm_bba_dist
@ -23,7 +23,7 @@ ConfigVariableDouble pfm_bba_dist
PRC_DESC("Specifies the point_dist and sample_radius, in UV space, for "
"compute bba files with pfm_trans."));
ConfigureFn(config_pfm) {
ConfigureFn(config_pfmprogs) {
init_libpfm();
}

2
pandatool/src/pfmprogs/config_pfm.h → pandatool/src/pfmprogs/config_pfmprogs.h
View File

@ -6,7 +6,7 @@
* license. You should have received a copy of this license along
* with this source code in a file named "LICENSE."
*
* @file config_pfm.h
* @file config_pfmprogs.h
* @author drose
* @date 2010-12-23
*/

2
pandatool/src/pfmprogs/pfmBba.cxx
View File

@ -12,7 +12,7 @@
*/
#include "pfmBba.h"
#include "config_pfm.h"
#include "config_pfmprogs.h"
#include "pfmFile.h"
/**

2
pandatool/src/pfmprogs/pfmTrans.cxx
View File

@ -12,7 +12,7 @@
*/
#include "pfmTrans.h"
#include "config_pfm.h"
#include "config_pfmprogs.h"
#include "pfmFile.h"
#include "pfmVizzer.h"
#include "texture.h"

2
pandatool/src/pstatserver/pStatGraph.cxx
View File

@ -16,7 +16,7 @@
#include "pStatFrameData.h"
#include "pStatCollectorDef.h"
#include "string_utils.h"
#include "config_pstats.h"
#include "config_pstatclient.h"
#include <stdio.h> // for sprintf

2
pandatool/src/pstatserver/pStatPianoRoll.cxx
View File

@ -16,7 +16,7 @@
#include "pStatFrameData.h"
#include "pStatCollectorDef.h"
#include "string_utils.h"
#include "config_pstats.h"
#include "config_pstatclient.h"
#include <algorithm>

2
pandatool/src/pstatserver/pStatServer.cxx
View File

@ -14,7 +14,7 @@
#include "pStatServer.h"
#include "pStatReader.h"
#include "thread.h"
#include "config_pstats.h"
#include "config_pstatclient.h"
/**
*

2
pandatool/src/pstatserver/pStatStripChart.cxx
View File

@ -18,7 +18,7 @@
#include "pStatFrameData.h"
#include "pStatCollectorDef.h"
#include "string_utils.h"
#include "config_pstats.h"
#include "config_pstatclient.h"
#include <algorithm>

2
pandatool/src/pstatserver/pStatThreadData.cxx
View File

@ -15,7 +15,7 @@
#include "pStatFrameData.h"
#include "pStatCollectorDef.h"
#include "config_pstats.h"
#include "config_pstatclient.h"
PStatFrameData PStatThreadData::_null_frame;

2
pandatool/src/ptloader/loaderFileTypePandatool.cxx
View File

@ -15,7 +15,7 @@
#include "config_ptloader.h"
#include "somethingToEggConverter.h"
#include "eggToSomethingConverter.h"
#include "config_util.h"
#include "config_putil.h"
#include "load_egg_file.h"
#include "save_egg_file.h"
#include "eggData.h"

2
pandatool/src/text-stats/textStats.cxx
View File

@ -15,7 +15,7 @@
#include "textMonitor.h"
#include "pStatServer.h"
#include "config_pstats.h"
#include "config_pstatclient.h"
#include <signal.h>

2
pandatool/src/win-stats/winStats.cxx
View File

@ -14,7 +14,7 @@
#include "pandatoolbase.h"
#include "winStatsServer.h"
#include "config_pstats.h"
#include "config_pstatclient.h"
#include <windows.h>