Skip to content

Commit 163c923

Browse files
rdbrdb
committed
Backport various fixes for 1.9.4
1 parent bf919e4 commit 163c923

35 files changed

+130
-75
lines changed

‎README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ are included as part of the Windows 7.1 SDK.
3131
You will also need to have the third-party dependency libraries available for
3232
the build scripts to use. These are available from one of these two URLs,
3333
depending on whether you are on a 32-bit or 64-bit system:
34-
https://www.panda3d.org/download/panda3d-1.9.2/panda3d-1.9.2-tools-win32.zip
35-
https://www.panda3d.org/download/panda3d-1.9.2/panda3d-1.9.2-tools-win64.zip
34+
https://www.panda3d.org/download/panda3d-1.9.4/panda3d-1.9.4-tools-win32.zip
35+
https://www.panda3d.org/download/panda3d-1.9.4/panda3d-1.9.4-tools-win64.zip
3636

3737
After acquiring these dependencies, you may simply build Panda3D from the
3838
command prompt using the following command:

‎direct/src/directtools/DirectCameraControl.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -413,7 +413,7 @@ def spawnMouseRotateTask(self):
413413
np = NodePath('temp')
414414
np.setPos(base.direct.camera, hitPt)
415415
self.coaMarkerPos = np.getPos()
416-
np.remove()
416+
np.removeNode()
417417
self.coaMarker.setPos(self.coaMarkerPos)
418418

419419
iRay.collisionNodePath.removeNode()

‎direct/src/fsm/FourState.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,7 @@ def __init__(self, names, durations = [0, 1, None, 1, 1]):
9191
off (and so is state 2 which is oposite of 4 and therefore
9292
oposite of 'on').
9393
"""
94+
self.stateIndex = 0
9495
assert self.debugPrint("FourState(names=%s)"%(names))
9596
self.track = None
9697
self.stateTime = 0.0
@@ -121,7 +122,6 @@ def __init__(self, names, durations = [0, 1, None, 1, 1]):
121122
self.exitState4,
122123
[names[1]]),
123124
}
124-
self.stateIndex = 0
125125
self.fsm = ClassicFSM.ClassicFSM('FourState',
126126
self.states.values(),
127127
# Initial State

‎direct/src/fsm/FourStateAI.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,11 +93,11 @@ def __init__(self, names, durations = [0, 1, None, 1, 1]):
9393
off (and so is state 2 which is oposite of state 4 and therefore
9494
oposite of 'on').
9595
"""
96+
self.stateIndex = 0
9697
assert self.debugPrint(
9798
"FourStateAI(names=%s, durations=%s)"
9899
%(names, durations))
99100
self.doLaterTask = None
100-
self.stateIndex = 0
101101
assert len(names) == 5
102102
assert len(names) == len(durations)
103103
self.names = names

‎direct/src/plugin/p3dInstance.cxx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3699,8 +3699,8 @@ paint_window_osx_port() {
36993699
int y_size = min(_wparams.get_win_height(), _swbuffer->get_y_size());
37003700
size_t rowsize = _swbuffer->get_row_size();
37013701

3702-
Rect src_rect = {0, 0, y_size, x_size};
3703-
Rect ddrc_rect = {0, 0, y_size, x_size};
3702+
Rect src_rect = {0, 0, (short)y_size, (short)x_size};
3703+
Rect ddrc_rect = {0, 0, (short)y_size, (short)x_size};
37043704

37053705
QDErr err;
37063706

@@ -3754,7 +3754,7 @@ paint_window_osx_cgcontext(CGContextRef context) {
37543754
int y_size = min(_wparams.get_win_height(), _swbuffer->get_y_size());
37553755

37563756
if (_buffer_image != NULL) {
3757-
CGRect region = { { 0, 0 }, { x_size, y_size } };
3757+
CGRect region = { { 0, 0 }, { (CGFloat)x_size, (CGFloat)y_size } };
37583758
CGContextDrawImage(context, region, _buffer_image);
37593759
}
37603760
}
@@ -3794,7 +3794,7 @@ handle_event_osx_event_record(const P3D_event_data &event) {
37943794
// First, convert the coordinates from screen coordinates to
37953795
// browser window coordinates.
37963796
WindowRef window = handle._handle._osx_cgcontext._window;
3797-
CGPoint cgpt = { pt.h, pt.v };
3797+
CGPoint cgpt = { (CGFloat)pt.h, (CGFloat)pt.v };
37983798
HIPointConvert(&cgpt, kHICoordSpaceScreenPixel, NULL,
37993799
kHICoordSpaceWindow, window);
38003800

‎direct/src/plugin/p3dOsxSplashWindow.cxx

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -290,7 +290,7 @@ refresh() {
290290
return;
291291
}
292292
if (_toplevel_window != NULL) {
293-
Rect r = { 0, 0, _win_height, _win_width };
293+
Rect r = { 0, 0, (short)_win_height, (short)_win_width };
294294
InvalWindowRect(_toplevel_window, &r);
295295

296296
} else {
@@ -374,7 +374,7 @@ paint_window_osx_cgcontext(CGContextRef context) {
374374
CGColorSpaceRef rgb_space = CGColorSpaceCreateDeviceRGB();
375375
CGColorRef bg = CGColorCreate(rgb_space, bg_components);
376376

377-
CGRect region = { { 0, 0 }, { _win_width, _win_height } };
377+
CGRect region = { { 0, 0 }, { (CGFloat)_win_width, (CGFloat)_win_height } };
378378
CGContextSetFillColorWithColor(context, bg);
379379
CGContextFillRect(context, region);
380380

@@ -440,7 +440,7 @@ handle_event_osx_event_record(const P3D_event_data &event) {
440440
// First, convert the coordinates from screen coordinates to
441441
// browser window coordinates.
442442
WindowRef window = handle._handle._osx_cgcontext._window;
443-
CGPoint cgpt = { pt.h, pt.v };
443+
CGPoint cgpt = { (CGFloat)pt.h, (CGFloat)pt.v };
444444
HIPointConvert(&cgpt, kHICoordSpaceScreenPixel, NULL,
445445
kHICoordSpaceWindow, window);
446446

@@ -662,7 +662,7 @@ paint_progress_bar(CGContextRef context) {
662662
int bar_x, bar_y, bar_width, bar_height;
663663
get_bar_placement(bar_x, bar_y, bar_width, bar_height);
664664

665-
CGRect bar_rect = { { bar_x, bar_y }, { bar_width, bar_height } };
665+
CGRect bar_rect = { { (CGFloat)bar_x, (CGFloat)bar_y }, { (CGFloat)bar_width, (CGFloat)bar_height } };
666666

667667
// Clear the entire progress bar to white (or the background color).
668668
CGContextSetFillColorWithColor(context, bar_bg);
@@ -672,7 +672,7 @@ paint_progress_bar(CGContextRef context) {
672672
if (_progress_known) {
673673
int progress_width = (int)(bar_width * _install_progress + 0.5);
674674
if (progress_width != 0) {
675-
CGRect prog = { { bar_x, bar_y }, { progress_width, bar_height } };
675+
CGRect prog = { { (CGFloat)bar_x, (CGFloat)bar_y }, { (CGFloat)progress_width, (CGFloat)bar_height } };
676676
CGContextSetFillColorWithColor(context, bar);
677677
CGContextFillRect(context, prog);
678678
}
@@ -687,7 +687,7 @@ paint_progress_bar(CGContextRef context) {
687687
progress = block_travel * 2 - progress;
688688
}
689689

690-
CGRect prog = { { bar_x + progress, bar_y }, { block_width, bar_height } };
690+
CGRect prog = { { (CGFloat)(bar_x + progress), (CGFloat)bar_y }, { (CGFloat)block_width, (CGFloat)bar_height } };
691691
CGContextSetFillColorWithColor(context, bar);
692692
CGContextFillRect(context, prog);
693693
}
@@ -697,8 +697,8 @@ paint_progress_bar(CGContextRef context) {
697697
// We offset the border by half a pixel, so we'll be drawing the
698698
// one-pixel line through the middle of a pixel, and it won't try to
699699
// antialias itself into a half-black two-pixel line.
700-
CGRect border_rect = { { bar_x - 0.5, bar_y - 0.5 },
701-
{ bar_width + 1, bar_height + 1 } };
700+
CGRect border_rect = { { (CGFloat)(bar_x - 0.5), (CGFloat)(bar_y - 0.5) },
701+
{ (CGFloat)(bar_width + 1), (CGFloat)(bar_height + 1) } };
702702

703703
CGContextBeginPath(context);
704704
CGContextSetLineWidth(context, 1);

‎direct/src/tkwidgets/MemoryExplorer.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -282,6 +282,9 @@ def addChild(self, child):
282282
def getNumChildren(self):
283283
return len(self.children)
284284

285+
def getChildren(self):
286+
return self.children
287+
285288
def getChildrenAsList(self):
286289
return self.children
287290

‎doc/ReleaseNotes

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,18 @@
1+
------------------------ RELEASE 1.9.4 ------------------------
2+
3+
One of the bugfixes in the last 1.9.3 release introduced a regression,
4+
therefore it was decided to make another 1.9.x release.
5+
6+
* Fix 1.9.3 regression with generating geometry in threaded pipeline
7+
* Various compile warning fixes
8+
* Fix occasional crash in PNMImage::quick_filter_from()
9+
* Fix issue taking screenshots from an OpenGL FBO buffer
10+
* Fix various issues with MeshDrawer
11+
* Fix issue with collision sphere generation in bam2egg
12+
* Fix compile errors with more obscure Python configurations
13+
* Fix assert when using Texture.load_sub_image to load whole image
14+
* Fix fsm FourState
15+
116
------------------------ RELEASE 1.9.3 ------------------------
217

318
This issue fixes several bugs that were still found in 1.9.2.

‎dtool/PandaVersion.pp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
// ppremake scripts for Panda.
44

55
// Use spaces to separate the major, minor, and sequence numbers here.
6-
#define PANDA_VERSION 1 9 3
6+
#define PANDA_VERSION 1 9 4
77

88
// This variable will be defined to false in the CVS repository, but
99
// scripts that generate source tarballs and/or binary releases for

‎dtool/src/cppparser/cppBison.yxx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1075,6 +1075,7 @@ function_operator:
10751075
more_template_declaration:
10761076
type_like_declaration
10771077
| template_declaration
1078+
| friend_declaration
10781079
;
10791080

10801081
template_declaration:

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