Skip to content

Commit 70bfe21

Browse files
rdbrdb
committed
Merge branch 'master' into input-overhaul
2 parents 357b6d3 + b8ed9b1 commit 70bfe21

File tree

91 files changed

+2241
-2193
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

91 files changed

+2241
-2193
lines changed

‎.travis.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ matrix:
1111
before_install:
1212
- export CC=gcc-4.7
1313
- export CXX=g++-4.7
14+
- compiler: clang
15+
env: PYTHONV=python3 FLAGS=--no-python SKIP_TESTS=1
1416
addons:
1517
apt:
1618
sources:
@@ -42,8 +44,8 @@ install:
4244
- $PYTHONV -m pip install pytest
4345
script:
4446
- $PYTHONV makepanda/makepanda.py --everything --git-commit $TRAVIS_COMMIT $FLAGS --threads 4
45-
- LD_LIBRARY_PATH=built/lib PYTHONPATH=built $PYTHONV makepanda/test_imports.py
46-
- LD_LIBRARY_PATH=built/lib PYTHONPATH=built $PYTHONV -m pytest -v tests
47+
- test -n "$SKIP_TESTS" || LD_LIBRARY_PATH=built/lib PYTHONPATH=built $PYTHONV makepanda/test_imports.py
48+
- test -n "$SKIP_TESTS" || LD_LIBRARY_PATH=built/lib PYTHONPATH=built $PYTHONV -m pytest -v tests
4749
notifications:
4850
irc:
4951
channels:

‎direct/src/configfiles/direct.init

Lines changed: 0 additions & 9 deletions
This file was deleted.

‎direct/src/distributed/DistributedSmoothNode.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@
66
from . import DistributedNode
77
from . import DistributedSmoothNodeBase
88
from direct.task.Task import cont
9-
10-
config = get_config_showbase()
9+
from direct.showbase import DConfig as config
1110

1211
# This number defines our tolerance for out-of-sync telemetry packets.
1312
# If a packet appears to have originated from more than MaxFuture

‎direct/src/showbase/DConfig.py

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
"This module contains a deprecated shim emulating the old DConfig API."
2+
3+
__all__ = []
4+
5+
from panda3d.core import (ConfigFlags, ConfigVariableBool, ConfigVariableInt,
6+
ConfigVariableDouble, ConfigVariableString)
7+
8+
9+
def GetBool(sym, default=False):
10+
return ConfigVariableBool(sym, default, "DConfig", ConfigFlags.F_dconfig).value
11+
12+
13+
def GetInt(sym, default=0):
14+
return ConfigVariableInt(sym, default, "DConfig", ConfigFlags.F_dconfig).value
15+
16+
17+
def GetDouble(sym, default=0.0):
18+
return ConfigVariableDouble(sym, default, "DConfig", ConfigFlags.F_dconfig).value
19+
20+
21+
def GetString(sym, default=""):
22+
return ConfigVariableString(sym, default, "DConfig", ConfigFlags.F_dconfig).value
23+
24+
25+
GetFloat = GetDouble

‎direct/src/showbase/ShowBase.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,9 @@
1010
#import VerboseImport
1111

1212
from panda3d.core import *
13-
from panda3d.direct import get_config_showbase, throw_new_frame, init_app_for_gui
13+
from panda3d.direct import throw_new_frame, init_app_for_gui
1414
from panda3d.direct import storeAccessibilityShortcutKeys, allowAccessibilityShortcutKeys
15+
from . import DConfig
1516

1617
# Register the extension methods for NodePath.
1718
from direct.extensions_native import NodePath_extensions
@@ -22,7 +23,7 @@
2223
import builtins
2324
else:
2425
import __builtin__ as builtins
25-
builtins.config = get_config_showbase()
26+
builtins.config = DConfig
2627

2728
from direct.directnotify.DirectNotifyGlobal import directNotify, giveNotify
2829
from .MessengerGlobal import messenger
@@ -57,7 +58,7 @@ def exitfunc():
5758
# *seem* to cause anyone any problems.
5859
class ShowBase(DirectObject.DirectObject):
5960

60-
config = get_config_showbase()
61+
config = DConfig
6162
notify = directNotify.newCategory("ShowBase")
6263

6364
def __init__(self, fStartDirect = True, windowType = None):

‎direct/src/showbase/ShowBaseGlobal.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,8 @@
1212
from panda3d.core import VirtualFileSystem, Notify, ClockObject, PandaSystem
1313
from panda3d.core import ConfigPageManager, ConfigVariableManager
1414
from panda3d.core import NodePath, PGTop
15-
from panda3d.direct import get_config_showbase
15+
from . import DConfig as config
1616

17-
config = get_config_showbase()
1817
__dev__ = config.GetBool('want-dev', __debug__)
1918

2019
vfs = VirtualFileSystem.getGlobalPtr()

‎direct/src/showbase/showBase.cxx

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -61,14 +61,6 @@ throw_new_frame() {
6161
throw_event("NewFrame");
6262
}
6363

64-
// Returns the configure object for accessing config variables from a
65-
// scripting language.
66-
DConfig &
67-
get_config_showbase() {
68-
static DConfig config_showbase;
69-
return config_showbase;
70-
}
71-
7264
// Initialize the application for making a Gui-based app, such as wx. At the
7365
// moment, this is a no-op except on Mac.
7466
void

‎direct/src/showbase/showBase.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ EXPCL_DIRECT_SHOWBASE ConfigVariableSearchPath &get_particle_path();
3838

3939
EXPCL_DIRECT_SHOWBASE void throw_new_frame();
4040

41-
EXPCL_DIRECT_SHOWBASE DConfig &get_config_showbase();
4241
EXPCL_DIRECT_SHOWBASE void init_app_for_gui();
4342

4443
// klunky interface since we cant pass array from python->C++

‎dtool/src/dconfig/config_dconfig.cxx

Lines changed: 0 additions & 21 deletions
This file was deleted.

‎dtool/src/dconfig/config_dconfig.h

Lines changed: 0 additions & 29 deletions
This file was deleted.

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy