Fix RCDATA resources to work in Win9x.

Author: Travis Cobbs

CUI/CUIWindow.cpp

@@ -2611,13 +2611,14 @@ void CUIWindow::setMenuCheck(
 	bool radio)
 {
 	MENUITEMINFO itemInfo;
-	char title[256];
+	//char title[256];
 
 	memset(&itemInfo, 0, sizeof(MENUITEMINFO));
 	itemInfo.cbSize = sizeof(MENUITEMINFO);
-	itemInfo.fMask = MIIM_STATE | MIIM_TYPE;
-	itemInfo.dwTypeData = title;
-	itemInfo.cch = 256;
+	itemInfo.fMask = MIIM_STATE;// | MIIM_TYPE;
+	//itemInfo.fType = MFT_STRING;
+	//itemInfo.dwTypeData = title;
+	//itemInfo.cch = 256;
 	GetMenuItemInfo(hParentMenu, uItem, FALSE, &itemInfo);
 	if (checked)
 	{

ChangeHistory.html

@@ -89,6 +89,13 @@ <h2>Change history</h2>
 <b>Additions</b>
 <ul>
 <li>Added ability to randomize colors (useful for part authoring).</li>
+<li>Added toolbar customization, along with the ability to put a lot of LDView
+functionality on the toolbar.</li>
+</ul>
+<b>Updates</b>
+<ul>
+<li>Removed BFC and Show Axes from the default toolbar.</li>
+<li>Updated examine/fly-through status bar icons.</li>
 </ul>
 <b>Bug Fixes</b>
 <ul>

Icons/toolbar_zoom2fit.png

@@ -1700,8 +1700,8 @@ IDB_ERROR_LOOP_MASK     BITMAP  DISCARDABLE     "icons\\error_loop_mask.bmp"
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 4,0,1,6
- PRODUCTVERSION 4,0,1,6
+ FILEVERSION 4,0,1,7
+ PRODUCTVERSION 4,0,1,7
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x9L
@@ -1719,14 +1719,14 @@ BEGIN
             VALUE "Comments", "3D Lego Model Viewer for models in LDraw format.\0"
             VALUE "CompanyName", "\0"
             VALUE "FileDescription", "LDView\0"
-            VALUE "FileVersion", "4.0.1f test build\0"
+            VALUE "FileVersion", "4.0.1g test build\0"
             VALUE "InternalName", "LDView\0"
             VALUE "LegalCopyright", "Copyright � 2009 Travis Cobbs & Peter Bartfai\0"
             VALUE "LegalTrademarks", "\0"
             VALUE "OriginalFilename", "LDView.exe\0"
             VALUE "PrivateBuild", "\0"
             VALUE "ProductName", "LDView\0"
-            VALUE "ProductVersion", "4.0.1f test build\0"
+            VALUE "ProductVersion", "4.0.1g test build\0"
             VALUE "SpecialBuild", "\0"
         END
     END
@@ -1754,27 +1754,30 @@ IDC_SHOW_AXES           RCDATA  DISCARDABLE     "Icons\\toolbar_axes.png"
 IDC_BFC                 RCDATA  DISCARDABLE     "Icons\\toolbar_bfc.png"
 IDC_CONDITIONAL_CONTROLS RCDATA  DISCARDABLE     "Icons\\toolbar_cond_ctrl.png"
 IDC_HIGHLIGHTS          RCDATA  DISCARDABLE     "Icons\\toolbar_edge.png"
-ID_TOOLS_ERRORS         RCDATA  DISCARDABLE     "Icons\\toolbar_errors.png"
+IDR_TB_ERRORS           RCDATA  DISCARDABLE     "Icons\\toolbar_errors.png"
+IDR_TB_EXAMINE          RCDATA  DISCARDABLE     "Icons\\toolbar_examine.png"
 IDC_FLAT_SHADING        RCDATA  DISCARDABLE     "Icons\\toolbar_flat.png"
-ID_VIEW_FULLSCREEN      RCDATA  DISCARDABLE     "Icons\\toolbar_fullscreen.png"
+IDR_TB_FLYTHROUGH       RCDATA  DISCARDABLE     "Icons\\toolbar_fly.png"
+IDR_TB_FULLSCREEN       RCDATA  DISCARDABLE     "Icons\\toolbar_fullscreen.png"
 IDC_LIGHTING            RCDATA  DISCARDABLE     "Icons\\toolbar_light.png"
 IDC_STUD_QUALITY        RCDATA  DISCARDABLE     "Icons\\toolbar_low_studs.png"
-ID_FILE_OPEN            RCDATA  DISCARDABLE     "Icons\\toolbar_open.png"
+IDR_TB_OPEN             RCDATA  DISCARDABLE     "Icons\\toolbar_open.png"
 IDC_PART_BOUNDING_BOXES RCDATA  DISCARDABLE     "Icons\\toolbar_part_bbox.png"
-ID_EDIT_PREFERENCES     RCDATA  DISCARDABLE     "Icons\\toolbar_preferences.png"
+IDR_TB_PREFERENCES      RCDATA  DISCARDABLE     "Icons\\toolbar_preferences.png"
 IDC_PRIMITIVE_SUBSTITUTION RCDATA  DISCARDABLE     "Icons\\toolbar_primsubs.png"
 IDC_RANDOM_COLORS       RCDATA  DISCARDABLE     "Icons\\toolbar_random.png"
-ID_FILE_RELOAD          RCDATA  DISCARDABLE     "Icons\\toolbar_reload.png"
+IDR_TB_RELOAD           RCDATA  DISCARDABLE     "Icons\\toolbar_reload.png"
 IDC_SEAMS               RCDATA  DISCARDABLE     "Icons\\toolbar_seams.png"
 IDC_SMOOTH_CURVES       RCDATA  DISCARDABLE     "Icons\\toolbar_smooth.png"
-ID_FILE_SAVE            RCDATA  DISCARDABLE     "Icons\\toolbar_snapshot.png"
+IDR_TB_SAVE             RCDATA  DISCARDABLE     "Icons\\toolbar_snapshot.png"
 IDC_TRANS_DEFAULT_COLOR RCDATA  DISCARDABLE     "Icons\\toolbar_trans_default.png"
 ID_VIEWANGLE            RCDATA  DISCARDABLE     "Icons\\toolbar_view.png"
 IDC_WIREFRAME           RCDATA  DISCARDABLE     "Icons\\toolbar_wireframe.png"
-ID_FIRST_STEP           RCDATA  DISCARDABLE     "Icons\\toolbar_step_first.png"
-ID_LAST_STEP            RCDATA  DISCARDABLE     "Icons\\toolbar_step_last.png"
-ID_NEXT_STEP            RCDATA  DISCARDABLE     "Icons\\toolbar_step_next.png"
-ID_PREV_STEP            RCDATA  DISCARDABLE     "Icons\\toolbar_step_prev.png"
+IDR_TB_ZOOMTOFIT        RCDATA  DISCARDABLE     "Icons\\toolbar_zoom2fit.png"
+IDR_TB_FIRST_STEP       RCDATA  DISCARDABLE     "Icons\\toolbar_step_first.png"
+IDR_TB_LAST_STEP        RCDATA  DISCARDABLE     "Icons\\toolbar_step_last.png"
+IDR_TB_NEXT_STEP        RCDATA  DISCARDABLE     "Icons\\toolbar_step_next.png"
+IDR_TB_PREV_STEP        RCDATA  DISCARDABLE     "Icons\\toolbar_step_prev.png"
 
 /////////////////////////////////////////////////////////////////////////////
 //

LDView.rc

@@ -611,6 +611,8 @@ PrevStep =Previous Step
 NextStep =Next Step
 Errors&Warnings =Errors and Warnings
 FullScreen =Full Screen
+ZoomToFit =Zoom to Fit
+ViewMode =View Mode
 ShowAllConditionals =Show All Conditional Lines
 ShowConditionalControls =Show Conditional Control Points
 FlatShading =Flat Shading

LDViewMessages.ini

@@ -187,10 +187,13 @@ mpdDialog(NULL)
 		extraSearchDirs = new TCStringArray;
 		populateExtraSearchDirs();
 	}
-	hExamineIcon = (HICON)LoadImage(hInstance, MAKEINTRESOURCE(IDI_EXAMINE),
-		IMAGE_ICON, 32, 16, LR_DEFAULTCOLOR);
-	hFlythroughIcon = (HICON)LoadImage(hInstance,
-		MAKEINTRESOURCE(IDI_FLYTHROUGH), IMAGE_ICON, 32, 16, LR_DEFAULTCOLOR);
+	hExamineIcon = TCImage::loadIconFromPngResource(hInstance, IDR_TB_EXAMINE);
+	hFlythroughIcon = TCImage::loadIconFromPngResource(hInstance,
+		IDR_TB_FLYTHROUGH);
+	//hExamineIcon = (HICON)LoadImage(hInstance, MAKEINTRESOURCE(IDI_EXAMINE),
+	//	IMAGE_ICON, 32, 16, LR_DEFAULTCOLOR);
+	//hFlythroughIcon = (HICON)LoadImage(hInstance,
+	//	MAKEINTRESOURCE(IDI_FLYTHROUGH), IMAGE_ICON, 32, 16, LR_DEFAULTCOLOR);
 	TCAlertManager::registerHandler(TCProgressAlert::alertClass(), this,
 		(TCAlertCallback)&LDViewWindow::progressAlertCallback);
 	char userAgent[256];
@@ -210,6 +213,8 @@ LDViewWindow::~LDViewWindow(void)
 
 void LDViewWindow::dealloc(void)
 {
+	DestroyIcon(hExamineIcon);
+	DestroyIcon(hFlythroughIcon);
 	TCAlertManager::unregisterHandler(this);
 	TCObject::release(modelTreeDialog);
 	TCObject::release(boundingBoxDialog);
@@ -662,7 +667,7 @@ void LDViewWindow::updateStatusParts(void)
 		RECT rect;
 		int numParts = 3;
 		bool latLon = inLatLonMode();
-		int rightMargin = 32;
+		int rightMargin = 20;
 		int latLonWidth = 100;
 
 		if (latLon)
@@ -2485,8 +2490,12 @@ LRESULT LDViewWindow::switchToExamineMode(bool saveSetting)
 	setMenuRadioCheck(hViewMenu, ID_VIEW_FLYTHROUGH, false);
 	modelWindow->setViewMode(LDInputHandler::VMExamine, examineLatLong,
 		saveSetting);
-	showStatusIcon(true);
+	updateStatusParts();
 	setMenuCheck(hViewMenu, ID_VIEW_EXAMINE_LAT_LONG, examineLatLong);
+	if (toolbarStrip)
+	{
+		toolbarStrip->viewModeReflect();
+	}
 	return 0;
 }
 
@@ -2496,7 +2505,11 @@ LRESULT LDViewWindow::switchToFlythroughMode(bool saveSetting)
 	setMenuRadioCheck(hViewMenu, ID_VIEW_FLYTHROUGH, true);
 	modelWindow->setViewMode(LDInputHandler::VMFlyThrough, examineLatLong,
 		saveSetting);
-	showStatusIcon(false);
+	updateStatusParts();
+	if (toolbarStrip)
+	{
+		toolbarStrip->viewModeReflect();
+	}
 	return 0;
 }
 

LDViewWindow.cpp

@@ -112,6 +112,7 @@ class LDViewWindow: public CUIWindow
 			bool redraw = true);
 		virtual void stopAnimation(void);
 		virtual void switchModes(void);
+		virtual void zoomToFit(void);
 
 		static char* getLDrawDir(void);
 		char* lastOpenPath(char* pathKey = NULL);
@@ -200,7 +201,6 @@ class LDViewWindow: public CUIWindow
 		virtual LRESULT windowProc(HWND, UINT, WPARAM, LPARAM);
 		virtual void resetView(LDVAngle viewAngle = LDVAngleDefault);
 		virtual void saveDefaultView(void);
-		virtual void zoomToFit(void);
 		virtual void resetDefaultView(void);
 		virtual int getMenuItemIndex(HMENU hMenu, UINT itemID);
 		virtual int clearRecentFileMenuItems(void);

LDViewWindow.h

@@ -91,6 +91,19 @@
 #define IDD_LAT_LON                     188
 #define IDD_MPD                         189
 #define IDD_STEP                        190
+#define IDR_TB_ERRORS					500
+#define IDR_TB_EXAMINE					501
+#define IDR_TB_FLYTHROUGH				502
+#define IDR_TB_FULLSCREEN				503
+#define IDR_TB_OPEN						504
+#define IDR_TB_PREFERENCES				505
+#define IDR_TB_RELOAD					506
+#define IDR_TB_SAVE						507
+#define IDR_TB_ZOOMTOFIT				508
+#define IDR_TB_FIRST_STEP				509
+#define IDR_TB_LAST_STEP				510
+#define IDR_TB_NEXT_STEP				511
+#define IDR_TB_PREV_STEP				512
 #define IDC_LIGHTING_QUALITY            1001
 #define IDC_FRAME_RATE                  1002
 #define IDC_STUD_QUALITY                1002
@@ -353,7 +366,7 @@
 #define IDC_DEFAULT                     1284
 #define IDC_CURRENT                     1285
 #define IDC_HIGHLIGHT                   1286
-#define IDC_PRINT_BACKGROUND            1300
+#define IDC_PRINT_BACKGROUND            1287
 #define PRINTDLGORD                     1538
 #define PAGESETUPDLGORD                 1546
 #define IDD_PRIMITIVES_PREFS            1547

Resource.h

@@ -490,6 +490,7 @@ TCImageOptions *TCImage::getCompressionOptions(void)
 }
 
 #ifdef WIN32
+
 // Note: static method
 TCImage *TCImage::createFromResource(
 	HMODULE hModule,
@@ -531,4 +532,132 @@ TCImage *TCImage::createFromResource(
 	}
 	return retVal;
 }
+
+// Note: static method.
+HBITMAP TCImage::createDIBSection(
+	HDC hBitmapDC,
+	int bitmapWidth,
+	int bitmapHeight,
+	int hDPI,
+	int vDPI,
+	BYTE **bmBuffer)
+{
+	BITMAPINFO bmi;
+
+	bmi.bmiHeader.biSize = sizeof(bmi.bmiHeader);
+	bmi.bmiHeader.biWidth = bitmapWidth;
+	bmi.bmiHeader.biHeight = bitmapHeight;
+	bmi.bmiHeader.biPlanes = 1;
+	bmi.bmiHeader.biBitCount = 24;
+	bmi.bmiHeader.biCompression = BI_RGB;
+	bmi.bmiHeader.biSizeImage = 0;//roundUp(bitmapWidth * 3, 4) * bitmapHeight;
+	bmi.bmiHeader.biXPelsPerMeter = (long)(hDPI * 39.37);
+	bmi.bmiHeader.biYPelsPerMeter = (long)(vDPI * 39.37);
+	bmi.bmiHeader.biClrUsed = 0;
+	bmi.bmiHeader.biClrImportant = 0;
+	bmi.bmiColors[0].rgbRed = 0;
+	bmi.bmiColors[0].rgbGreen = 0;
+	bmi.bmiColors[0].rgbBlue = 0;
+	bmi.bmiColors[0].rgbReserved = 0;
+	return CreateDIBSection(hBitmapDC, &bmi, DIB_RGB_COLORS,
+		(void**)bmBuffer, NULL, 0);
+}
+
+HBITMAP TCImage::createMask(bool updateSource /*= false*/)
+{
+	TCByte *dstData;
+	int dstBytesPerLine;
+	int srcBytesPerLine = getRowSize();
+	HBITMAP hNewBitmap = NULL;
+	int maskSize;
+
+	dstBytesPerLine = roundUp((width + 7) / 8, 2);
+	maskSize = dstBytesPerLine * height;
+	dstData = new TCByte[maskSize];
+	memset(dstData, 0, maskSize);
+	for (int y = 0; y < height; y++)
+	{
+		int srcYOffset = flipped ? srcBytesPerLine * (height - y - 1) :
+			srcBytesPerLine * y;
+		int dstYOffset = dstBytesPerLine * y;
+
+		for (int x = 0; x < width; x++)
+		{
+			TCByte alpha = imageData[srcYOffset + x * 4 + 3];
+
+			if (alpha < 128)
+			{
+				int byteOffset = dstYOffset + x / 8;
+				int bitOffset = 7 - (x % 8);
+
+				dstData[byteOffset] |= (1 << bitOffset);
+				if (updateSource)
+				{
+					imageData[srcYOffset + x * 4 + 0] = 0;
+					imageData[srcYOffset + x * 4 + 1] = 0;
+					imageData[srcYOffset + x * 4 + 2] = 0;
+				}
+			}
+		}
+	}
+	hNewBitmap = CreateBitmap(width, height, 1, 1, dstData);
+	delete dstData;
+	return hNewBitmap;
+}
+
+void TCImage::getBmpAndMask(
+	HBITMAP &hBitmap,
+	HBITMAP &hMask,
+	bool updateSource /*= false*/)
+{
+	HDC hdc = CreateCompatibleDC(NULL);
+	BYTE *bmBuffer = NULL;
+	int srcBytesPerLine = getRowSize();
+	int dstBytesPerLine = roundUp(width * 3, 4);
+
+	hBitmap = createDIBSection(hdc, width, height, 0, 0, &bmBuffer);
+	hMask = createMask(updateSource);
+	for (int y = 0; y < height; y++)
+	{
+		int srcYOffset = srcBytesPerLine * y;
+		int dstYOffset = dstBytesPerLine * y;
+
+		for (int x = 0; x < width; x++)
+		{
+			bmBuffer[dstYOffset + x * 3 + 0] =
+				imageData[srcYOffset + x * 4 + 2];
+			bmBuffer[dstYOffset + x * 3 + 1] =
+				imageData[srcYOffset + x * 4 + 1];
+			bmBuffer[dstYOffset + x * 3 + 2] =
+				imageData[srcYOffset + x * 4 + 0];
+		}
+	}
+	DeleteDC(hdc);
+}
+
+HICON TCImage::loadIconFromPngResource(HMODULE hModule, int resourceId)
+{
+	TCImage *image = TCImage::createFromResource(hModule, resourceId, 4, true);
+
+	if (image != NULL)
+	{
+		HBITMAP hBitmap;
+		HBITMAP hMask;
+		ICONINFO ii;
+		HICON hIcon;
+
+		image->getBmpAndMask(hBitmap, hMask, true);
+		image->release();
+		memset(&ii, 0, sizeof(ii));
+		ii.fIcon = FALSE;
+		ii.hbmMask = hMask;
+		ii.hbmColor = hBitmap;
+		hIcon = CreateIconIndirect(&ii);
+		DeleteObject(hBitmap);
+		DeleteObject(hMask);
+		return hIcon;
+	}
+	return NULL;
+}
+
 #endif // WIN32

TCFoundation/TCImage.cpp

@@ -65,6 +65,13 @@ class TCExport TCImage : public TCObject
 #ifdef WIN32
 	static TCImage *createFromResource(HMODULE hModule, int resourceId,
 		int lineAlignment = 1, bool flipped = false);
+	static HBITMAP createDIBSection(HDC hBitmapDC, int bitmapWidth,
+		int bitmapHeight, int hDPI, int vDPI, BYTE **bmBuffer);
+	static HICON loadIconFromPngResource(HMODULE hModule, int resourceId);
+
+	void getBmpAndMask(HBITMAP &hBitmap, HBITMAP &hMask,
+		bool updateSource = false);
+	HBITMAP createMask(bool updateSource = false);
 #endif // WIN32
 protected:
 	virtual ~TCImage(void);

TCFoundation/TCImage.h

@@ -10,7 +10,8 @@ TbButtonInfo::TbButtonInfo(void)
 	:m_commandId(-1),
 	m_bmpIndex(-1),
 	m_state(TBSTATE_ENABLED),
-	m_style(TBSTYLE_BUTTON)
+	m_style(TBSTYLE_BUTTON),
+	m_selection(0)
 {
 }
 
@@ -26,5 +27,7 @@ TbButtonInfo &TbButtonInfo::operator=(const TbButtonInfo &other)
 	m_bmpIndex = other.m_bmpIndex;
 	m_state = other.m_state;
 	m_style = other.m_style;
+	m_selection = other.m_selection;
+	m_otherCommandIds = other.m_otherCommandIds;
 	return *this;
 }