Merge changes requires to get 3DMM building on VC++2.1 ontop of WIndows 11

.gitignore

@@ -346,3 +346,11 @@ MigrationBackup/
 
 # Ionide (cross platform F# VS Code tools) working folder
 .ionide/
+
+*.exe
+*.obj
+*.lnk
+*.lib
+*.res
+*.map
+*.I

BREN/BWLD.CPP

@@ -636,7 +636,7 @@ void BWLD::_CleanWorkingBuffers(void)
 	Callback for when a BACT is rendered.  Need to union with dirty
 	region.
 ***************************************************************************/
-void BWLD::_ActorRendered(PBACT pbact, PBMDL pbmdl, PBMTL pbmtl,
+void BWLD::_ActorRendered(PBACT pbact, PBMDL pbmdl, PBMTL pbmtl, void* render_data,
 	br_uint_8 bStyle, br_matrix4 *pbmat4ModelToScreen, br_int_32 bounds[4])
 {
 	AssertVarMem(pbact);

BREN/INC/ACTOR.H

@@ -1,7 +1,7 @@
 /*
  * Copyright (c) 1993-1995 by Argonaut Technologies Limited. All rights reserved.
  *
- * $Id: actor.h 1.14 1995/05/25 13:37:23 sam Exp $
+ * $Id: actor.h 1.15 1995/08/31 16:36:10 sam Exp $
  * $Locker:  $
  *
  * Definitons for an Actor
@@ -103,6 +103,12 @@ typedef struct br_actor {
 	 */
 	br_uint_8 render_style;
 
+	/*
+	 * Reference to renderer specific data associated with this actor - NULL will
+	 * inherit from parent (root inherits default data)
+	 */
+	void *render_data;
+
 	/*
 	 * Postiton of this actor within parent space
 	 */

BREN/INC/ANGLES.H

@@ -1,7 +1,7 @@
 /*
  * Copyright (c) 1992,1993-1995 by Argonaut Technologies Limited. All rights reserved.
  *
- * $Id: angles.h 1.9 1995/05/25 13:37:24 sam Exp $
+ * $Id: angles.h 1.10 1995/08/31 16:36:11 sam Exp $
  * $Locker:  $
  *
  */
@@ -17,8 +17,8 @@ extern "C" {
  */
 typedef br_fixed_luf br_angle;
 
-#define BR_ANGLE_DEG(deg) ((br_angle)((deg)*182))
-#define BR_ANGLE_RAD(rad) ((br_angle)((rad)*10430))
+#define BR_ANGLE_DEG(deg) ((br_angle)(long)((deg)*182))
+#define BR_ANGLE_RAD(rad) ((br_angle)(long)((rad)*10430))
 
 
 #if BASED_FIXED
@@ -31,7 +31,7 @@ typedef br_fixed_luf br_angle;
 #define BrRadianToDegree(r) (BR_MUL((r),BR_SCALAR(180.0/PI)))
 
 #define BrAngleToScalar(a) ((br_scalar)(a))
-#define BrScalarToAngle(s) ((br_angle)(s))
+#define BrScalarToAngle(s) ((br_angle)(long)(s))
 
 #define BR_SIN(a)					BrFixedSin(a)
 #define BR_COS(a)					BrFixedCos(a)
@@ -44,22 +44,22 @@ typedef br_fixed_luf br_angle;
 
 #if BASED_FLOAT
 
-#define BrAngleToDegree(a) ((a) * (180.0/32768.0))
-#define BrDegreeToAngle(d) ((br_angle)((d) * (32768.0/180.0)))
-#define BrAngleToRadian(a) ((a) * (PI/32768.0))
-#define BrRadianToAngle(r) ((br_angle)((r)*(32768.0/PI)))
-#define BrDegreeToRadian(d) ((d)*(PI/180.0))
-#define BrRadianToDegree(r) ((r)*(180.0/PI))
+#define BrAngleToDegree(a) ((br_scalar)((a) * (180.0/32768.0)))
+#define BrDegreeToAngle(d) ((br_angle)(long)((d) * (32768.0/180.0)))
+#define BrAngleToRadian(a) ((br_scalar)((a) * (PI/32768.0)))
+#define BrRadianToAngle(r) ((br_angle)(long)((r)*(32768.0/PI)))
+#define BrDegreeToRadian(d) ((br_scalar)((d)*(PI/180.0)))
+#define BrRadianToDegree(r) ((br_scalar)((r)*(180.0/PI)))
 
-#define BrAngleToScalar(a) ((a)*(1.0/(float)BR_ONE_LS))
-#define BrScalarToAngle(s) ((br_angle)((s)*(float)BR_ONE_LS))
+#define BrAngleToScalar(a) ((br_scalar)((a)*(1.0/(float)BR_ONE_LS)))
+#define BrScalarToAngle(s) ((br_angle)(long)((s)*(float)BR_ONE_LS))
 
-#define BR_SIN(a)					sin(BrAngleToRadian(a))
-#define BR_COS(a)					cos(BrAngleToRadian(a))
+#define BR_SIN(a)					((br_scalar)sin(BrAngleToRadian(a)))
+#define BR_COS(a)					((br_scalar)cos(BrAngleToRadian(a)))
 #define BR_ASIN(a)					BrRadianToAngle(asin(a))
 #define BR_ACOS(a)					BrRadianToAngle(acos(a))
 #define BR_ATAN2(a,b)				BrRadianToAngle(atan2((a),(b)))
-#define BR_ATAN2FAST(a,b)			RBradianToAngle(atan2((a),(b)))
+#define BR_ATAN2FAST(a,b)			BrRadianToAngle(atan2((a),(b)))
 
 #endif
 

BREN/INC/BRDIAG.H

@@ -21,18 +21,18 @@ typedef void BR_CALLBACK br_diag_warning_cbfn(char * message);
 typedef void BR_CALLBACK br_diag_failure_cbfn(char * message);
 
 typedef struct br_diaghandler {
-    char *identifier;
-    br_diag_warning_cbfn *warning;
-    br_diag_failure_cbfn *failure;
+	char *identifier;
+	br_diag_warning_cbfn *warning;
+	br_diag_failure_cbfn *failure;
 } br_diaghandler;
 
 /*
  * For backwards compatibility
  */
 typedef struct br_errorhandler {
-    char *identifier;
-    br_diag_warning_cbfn *message;
-    br_diag_failure_cbfn *error;
+	char *identifier;
+	br_diag_warning_cbfn *message;
+	br_diag_failure_cbfn *error;
 
 } br_errorhandler;
 
@@ -92,3 +92,4 @@ typedef struct br_errorhandler {
 };
 #endif
 #endif
+

BREN/INC/BRENDER.H

@@ -1,8 +1,8 @@
 /*
  * Copyright (c) 1993-1995 by Argonaut Technologies Limited. All rights reserved.
  *
- * $Id: brender.h 1.17 1995/03/01 16:08:11 sam Exp $
- * $Locker: sam $
+ * $Id: brender.h 1.19 1995/08/31 16:36:12 sam Exp $
+ * $Locker:  $
  *
  * Master include file for BRender
  *
@@ -14,9 +14,7 @@
 	extern "C" {
 #endif
 
-#ifndef _COMPILER_H_
 #include "compiler.h"
-#endif		   
 
 #ifndef _BRLIMITS_H_
 #include "brlimits.h"
@@ -54,6 +52,10 @@
 #include "transfrm.h"
 #endif
 
+#ifndef _ORDER_H_
+#include "order.h"
+#endif
+
 #ifndef _PIXELMAP_H_
 #include "pixelmap.h"
 #endif
@@ -94,14 +96,14 @@
 #include "brfile.h"
 #endif
 
-#ifndef _BRMEM_H_
-#include "brmem.h"
-#endif
-
 #ifndef _BRDIAG_H_
 #include "brdiag.h"
 #endif
 
+#ifndef _BRMEM_H_
+#include "brmem.h"
+#endif
+
 #ifndef _BRERR_H_
 #include "brerr.h"
 #endif
@@ -122,6 +124,10 @@
 #include "zbproto.h"
 #endif
 
+#ifndef _ZSPROTO_H_
+#include "zsproto.h"
+#endif
+
 #ifndef _FWPEXTRA_H_
 #include "fwpextra.h"
 #endif
@@ -138,8 +144,11 @@
 #endif
 #endif
 
+#include "compend.h"
+
 #ifdef __cplusplus
 };
 #endif
 #endif
 
+

BREN/INC/BRERR.H

@@ -1,8 +1,8 @@
 /*
  * Copyright (c) 1993-1995 Argonaut Technologies Limited. All rights reserved.
  *
- * $Id: fwiproto.h 1.27 1995/06/30 16:01:14 sam Exp $
- * $Locker: sam $
+ * $Id: brerr.h 1.4 1995/07/28 18:57:02 sam Exp $
+ * $Locker:  $
  *
  * Error type
  */

BREN/INC/BRMEM.H

@@ -1,8 +1,8 @@
 /*
  * Copyright (c) 1993-1995 by Argonaut Technologies Limited. All rights reserved.
  *
- * $Id: brmem.h 1.13 1995/05/25 13:37:26 sam Exp $
- * $Locker: sam $
+ * $Id: brmem.h 1.15 1995/08/31 16:36:13 sam Exp $
+ * $Locker:  $
  *
  * Brender's interface to memory allocation
  */
@@ -81,6 +81,7 @@ enum br_memory_classes {
 	BR_MEMORY_IMAGE_SECTIONS,
 	BR_MEMORY_IMAGE_NAMES,
 	BR_MEMORY_EXCEPTION_HANDLER,
+	BR_MEMORY_RENDER_DATA,
 
 	/*
 	 * Application classes

BREN/INC/BWLD.H

@@ -76,7 +76,7 @@ protected:
 		BVEC3 *pbvec3RayPos, BVEC3 *pbvec3RayDir, BRS dzpNear, BRS dzpFar, 
 		void *pbwld);
 	static void BR_CALLBACK _ActorRendered(PBACT pbact, PBMDL pbmdl, 
-		PBMTL pbmtl, br_uint_8 bStyle, br_matrix4 *pbmat4ModelToScreen,
+		PBMTL pbmtl, void* render_data, br_uint_8 bStyle, br_matrix4 *pbmat4ModelToScreen,
 		br_int_32 bounds[4]);
 
 public:

BREN/INC/COLOUR.H

@@ -1,7 +1,7 @@
 /*
  * Copyright (c) 1993-1995 by Argonaut Technologies Limited. All rights reserved.
  *
- * $Id: colour.h 1.3 1995/02/22 21:37:03 sam Exp $
+ * $Id: colour.h 1.4 1995/08/31 16:36:14 sam Exp $
  * $Locker:  $
  *
  * Colour type and macros
@@ -23,7 +23,7 @@ typedef unsigned long int br_colour;
 
 #define BR_COLOUR_RGBA(r,g,b,a) \
 		((((unsigned int)(a))<<24) |\
-		((((unsigned int)(r))<<16) |\
+		(((unsigned int)(r))<<16) |\
 		(((unsigned int)(g))<<8) |\
 		((unsigned int)(b)))
 

BREN/INC/COMPEND.H

@@ -0,0 +1,83 @@
+/*
+ * Copyright (c) 1993-1995 by Argonaut Technologies Limited. All rights reserved.
+ *
+ * $Id: compend.h 1.1 1995/08/31 16:36:45 sam Exp $
+ * $Locker:  $
+ *
+ * Included at end of BRender includes - undoes any compiler specific pragmas
+ */
+#ifndef _COMPEND_H_
+#define _COMPEND_H_
+
+#ifdef __cplusplus
+	extern "C" {
+#endif
+
+/*
+ * WATCOM C/C++ 32
+ */
+#if defined(__WATCOMC__)
+
+#ifndef __H2INC__
+#pragma pack()
+#endif
+
+/*
+ * Zortech C++
+ */
+#elif defined(__ZTC__)
+
+/*
+ * GNU C
+ */
+#elif defined (__GNUC__)
+
+
+/*
+ * Apple MPW C
+ */
+#elif defined (__MPW__)
+
+/*
+ * Intel Proton
+ */
+#elif defined (__PROTONC__)
+
+/*
+ * Microsoft Visual C++
+ */
+#elif defined (_MSC_VER)
+
+#ifndef __H2INC__
+#pragma pack()
+#endif
+
+/*
+ * Metaware High-C Version 1
+ */
+#elif defined (__HIGHC_V1__)
+
+/*
+ * Metaware High-C Version 3
+ */
+#elif defined (__HIGHC__)
+
+/*
+ * Borland BC 4
+ */
+#elif defined (__BORLANDC__)
+
+/*
+ * IBM CSet++
+ */
+#elif defined (__IBMC__)
+
+#endif
+
+#ifdef __cplusplus
+	};
+#endif
+#endif
+
+
+