- Got rid of the prefix header in favour of directly including it in every file that needs it (though some files still need the include yet apparently work fine; perhaps a clean build would catch that)

- Replaced all occurrences of FillCRect with the new tileImage, to get away from 'ppat' resources. - Fixed a minor error in the character editor where part of a text string was off the window. - With the prefix header gone, libticpp.dylib has been removed; TinyXML++ is now compiled right into the program. - The scenario editor splash screen is now loaded from a file. - The pc editor title has its transparency problem fixed. - Added an overload of tileImage that takes a RgnHandle instead of a Rect in order to replace the single occurrence of FillCRgn. - Removed an unused function in boe.graphics.cpp - Changed loading of patterns. Instead of loading each pattern individually from a resource, a single file containing all of them is loading. The arrays that formerly contained the actual patterns now contain the source rects of the patterns. - Fixed the cursor hotspots (the coordinates were reversed) - Removed the useless flip_pict that was written when I didn't know what I was doing. - Fixed error in tileImage in which vrep and hrep were switched. - Added code to tileImage to ensure that the pattern will line up with anything already onscreen, regardless of the rect to fill. - Two images were altered: pcedtitle.png to fix the transparenct problem, and pixpats.png to add one pattern that had been missed (and also rearrange the smaller patterns a little) git-svn-id: http://openexile.googlecode.com/svn/trunk@91 4ebdad44-0ea0-11de-aab3-ff745001d230
2009-06-10 04:01:15 +00:00
parent 78cd213972
commit 7cd4a618b4
45 changed files with 318 additions and 338 deletions
--- a/osx/tools/dlglowlevel.cpp
+++ b/osx/tools/dlglowlevel.cpp
@@ -6,6 +6,7 @@
 *
 */

+#include <Carbon/Carbon.h>
 #include <cstdio>
 #include <cstring>

@@ -17,8 +18,9 @@
 #include "graphtool.h"
 #include "mathutil.h"

-extern PixPatHandle bg[];
+extern Rect bg[];

+extern GWorldPtr bg_gworld;
 extern GWorldPtr dlg_buttons_gworld[NUM_BUTTONS][2];
 extern map<char*,GWorldPtr*> dlg_gworlds;

@@ -326,7 +328,7 @@ void draw_dialog_graphic(GrafPtr hDlg, Rect rect, short which_g, short type_g, b
 	if (type_g == PICT_BLANK) { // Empty. Maybe clear space.
 		if (win_or_gworld == 0) {
 			InsetRect(&rect, -3, -3);
-			FillCRect(&rect,bg[dlg_bg]);
+			tileImage(rect,bg_gworld,bg[dlg_bg]);
 		}	
 		return;
 	}
--- a/osx/tools/dlgtool.cpp
+++ b/osx/tools/dlgtool.cpp
@@ -6,6 +6,7 @@
 *
 */

+#include <Carbon/Carbon.h>
 #include <cstdio>
 #include <cstring>
 #include <vector>
@@ -26,7 +27,8 @@ extern WindowPtr mainPtr;
 extern bool modeless_exists[18];
 extern DialogPtr modeless_dialogs[18];

-extern PixPatHandle bg[];
+extern GWorldPtr bg_gworld;
+extern Rect bg[];
 extern short geneva_font_num;//, sword_curs;

 GWorldPtr dlg_buttons_gworld[NUM_BUTTONS][2];
@@ -849,7 +851,7 @@ void cd_erase_item(short dlog_num, short item_num, bool just_label){
 	}
 	GetPort(&old_port);
 	SetPortWindowPort(dlgs[dlg_index].win);
-	FillCRect(&to_fry,bg[dlg_bg]);
+	tileImage(to_fry,bg_gworld,bg[dlg_bg]);
 	SetPort(old_port);
 }

@@ -864,7 +866,7 @@ void cd_erase_rect(short dlog_num,Rect to_fry){
 	
 	GetPort(&old_port);
 	SetPortWindowPort(dlgs[dlg_index].win);
-	FillCRect(&to_fry,bg[dlg_bg]);
+	tileImage(to_fry,bg_gworld,bg[dlg_bg]);
 	SetPort(old_port);
 }

--- a/osx/tools/dlgutil.cpp
+++ b/osx/tools/dlgutil.cpp
@@ -6,6 +6,7 @@
 *
 */

+#include <Carbon/Carbon.h>
 #include "location.h"
 #include "dlgconsts.h"
 #include "dlgtool.h"
--- a/osx/tools/fileio.cpp
+++ b/osx/tools/fileio.cpp
@@ -6,6 +6,7 @@
 *
 */

+#include <Carbon/Carbon.h>
 #include <string>
 #include <vector>
 #include <map>
--- a/osx/tools/graphtool.cpp
+++ b/osx/tools/graphtool.cpp
@@ -7,6 +7,7 @@
 */

 #define GRAPHTOOL_CPP
+#include <Carbon/Carbon.h>
 #include <Quicktime/Quicktime.h>
 #include "graphtool.h"
 #include "cursors.h"
@@ -24,7 +25,9 @@ CursorRef cursors[24] = {
 };
 void (*redraw_screen)();
 Point* offset;
-PixPatHandle bg[21];
+Rect bg[21];
+Rect map_pat[30];
+GWorldPtr bg_gworld;
 short geneva_font_num, dungeon_font_num;
 bool use_win_graphics = false;
 CursorRef GetCursorFromPath(std::string filename, Point hotspot);
@@ -40,11 +43,27 @@ void init_graph_tool(void (*redraw_callback)(), Point* p){
 	redraw_screen = redraw_callback;
 	int i,j;
 	static const Point cursor_hs[24] = {
-		{ 4,1}, {1,14}, { 5,13}, {8,8}, {8,8}, {8,8}, {8,8}, {14,0},
-		{12,3}, {13,7}, {12, 3},
-		{9, 3}, {8, 8}, {8, 3},
-		{12,3}, {13, 7},{12, 3},
-		{ 1,1}, {3, 7}, {14, 0}, {8,8}, {7,6}, {2,3}, {6,7}
+		{ 1, 4}, {14, 1}, {13, 5}, {8,8}, {8,8}, {8,8}, {8,8}, {0,14},
+		{ 3,12}, { 7,13}, { 3,12},
+		{ 3, 9}, { 8, 8}, { 8, 3},
+		{ 3,12}, { 7,13}, { 3,12},
+		{ 1, 1}, { 7, 3}, { 0,14}, {8,8}, {6,7}, {3,2}, {7,6}
+	};
+	static const Point pat_offs[17] = {
+		{3,0}, {1,1}, {1,2}, {0,2},
+		{0,3}, {1,3}, {3,1}, {0,0},
+		{2,0}, {2,1}, {1,0}, {2,2},
+		{3,2}, {2,3}, {0,1}, {0,4}, {3,3}
+	};
+	static const int pat_i[17] = {
+		2, 3, 4, 5, 6, 8, 9, 10,
+		11,12,13,14,15,16,17,19,20
+	};
+	static const int map_i[26] = {
+		0, 1, 2, 3, 4, 5, 6, 9,
+		10,11,12,13,14,15,16,17,
+		18,19,20,21,22,24,25,27,
+		28,29
 	};
 	static const char*const edit_cursor_files[8] = {
 		"wand.gif","eyedropper.gif","brush.gif","spraycan.gif",
@@ -68,8 +87,45 @@ void init_graph_tool(void (*redraw_callback)(), Point* p){
 		for (i = 17; i < 24; i++)
 			cursors[i] = GetCursorFromPath(game_cursor_files[i - 17],cursor_hs[i]);
 	}
-	for (i = 0; i < 21; i++) 
-	    bg[i] = GetPixPat(128 + i);
+//	for (i = 0; i < 21; i++) 
+//	    bg[i] = GetPixPat(128 + i);
+	for(i = 0; i < 17; i++){
+		SetRect(&bg[pat_i[i]],0,0,64,64);
+		OffsetRect(&bg[pat_i[i]],64 * pat_offs[i].h,64 * pat_offs[i].v);
+	}
+	Rect tmp_rect = bg[19];
+	OffsetRect(&tmp_rect, 0, 64);
+	bg[0] = bg[1] = bg[18] = map_pat[7] = tmp_rect;
+	bg[0].right -= 32;
+	bg[0].bottom -= 32;
+	bg[1].left -= 32;
+	bg[1].bottom -= 32;
+	bg[18].right -= 32;
+	bg[18].top -= 32;
+	map_pat[7].left -= 32;
+	map_pat[7].top -= 32;
+	OffsetRect(&tmp_rect, 0, 64);
+	map_pat[8] = map_pat[23] = map_pat[26] = tmp_rect;
+	map_pat[8].right -= 32;
+	map_pat[8].bottom -= 32;
+	map_pat[23].left -= 32;
+	map_pat[23].right -= 16;
+	map_pat[23].bottom -= 32;
+	map_pat[26].left -= 32 + 16;
+	map_pat[26].bottom -= 32;
+	OffsetRect(&tmp_rect, 0, 64);
+	bg[7] = tmp_rect;
+	bg[7].bottom = bg[7].top + 16;
+	OffsetRect(&tmp_rect, 0, -32);
+	tmp_rect.right = tmp_rect.left + 8;
+	tmp_rect.bottom = tmp_rect.top + 8;
+	for(i = 0; i < 26; i++){
+		map_pat[map_i[i]] = tmp_rect;
+		OffsetRect(&map_pat[map_i[i]],8 * (i % 8),8 * (i / 8));
+		// Note: 8 * (i / 8) != i, despite appearances, due to integer rounding
+	}
+	bg_gworld = load_pict("pixpats.png");
+	// TODO: Try to deprecate these font things
 	Str255 fn1 = "\pGeneva";
 	Str255 fn2 = "\pDungeon Bold";
 	Str255 fn3 = "\pPalatino";
@@ -324,7 +380,7 @@ void rect_draw_some_item (GWorldPtr src_gworld,Rect src_rect,GWorldPtr targ_gwor
 					   (masked == 10) ? addOver : 0, NULL);
 	}
 	UnlockPixels(test1);
-	if (main_win == 2) 
+	//if (main_win == 2) 
 		RGBBackColor(&store_color);
 	SetPort(cur_port);
 }
@@ -481,23 +537,6 @@ short string_length(const char *str){ // Why not just use strlen?
 	return total_width;
 }

-/*OSStatus flip_pict(OSType domain, OSType type, short id, void *ptr, UInt32 size, bool isNative, void *refcon){
-	//PicHandle
-	PicPtr toFlip = (PicPtr) ptr;
-	
-	if(!isNative){
-		printf("PICT %i Before: %i\t",id,toFlip->picFrame.bottom - toFlip->picFrame.top);
-		toFlip->picSize = Endian16_Swap(toFlip->picSize);
-		toFlip->picFrame.top = Endian16_Swap(toFlip->picFrame.top);
-		toFlip->picFrame.left = Endian16_Swap(toFlip->picFrame.left);
-		toFlip->picFrame.bottom = Endian16_Swap(toFlip->picFrame.bottom);
-		toFlip->picFrame.right = Endian16_Swap(toFlip->picFrame.right);
-		printf("After: %i\n",toFlip->picFrame.bottom - toFlip->picFrame.top);
-	}
-	
-	return noErr;
-}
-*/
 /*
 void draw_terrain(){
 	short q,r,x,y,i,small_i;
@@ -1055,11 +1094,13 @@ void tileImage(Rect area, GWorldPtr img, short mode){
 	
 	int imgWidth=imgRect.right-imgRect.left;
 	int imgHeight=imgRect.bottom-imgRect.top;
+	area.left -= area.left % imgWidth;
+	area.top -= area.top % imgHeight;
 	int x,y;
 	unsigned int hrep = (int)((double(area.right-area.left)/imgWidth)+0.5);
 	unsigned int vrep = (int)((double(area.bottom-area.top)/imgHeight)+0.5);
-	for(unsigned int i=0; i<vrep; i++){
-		for(unsigned int j=0; j<hrep; j++){
+	for(unsigned int i=0; i<=hrep; i++){
+		for(unsigned int j=0; j<=vrep; j++){
 			x=area.left+i*imgWidth;
 			y=area.top+j*imgHeight;
 			Rect targetRect={y,x,y+imgHeight,x+imgWidth};
@@ -1080,11 +1121,13 @@ void tileImage(Rect area, GWorldPtr img, Rect srcRect, short mode){
 	
 	int srcWidth=srcRect.right-srcRect.left;
 	int srcHeight=srcRect.bottom-srcRect.top;
+	area.left -= area.left % srcWidth;
+	area.top -= area.top % srcHeight;
 	int x,y;
 	unsigned int hrep = (int)((double(area.right-area.left)/srcWidth)+0.5);
 	unsigned int vrep = (int)((double(area.bottom-area.top)/srcHeight)+0.5);
-	for(unsigned int i=0; i<vrep; i++){
-		for(unsigned int j=0; j<hrep; j++){
+	for(unsigned int i=0; i<=hrep; i++){
+		for(unsigned int j=0; j<=vrep; j++){
 			x=area.left+i*srcWidth;
 			y=area.top+j*srcHeight;
 			Rect targetRect={y,x,y+srcHeight,x+srcWidth};
@@ -1093,3 +1136,56 @@ void tileImage(Rect area, GWorldPtr img, Rect srcRect, short mode){
 	}
 	DisposeRgn(clip);
 }
+
+void tileImage(RgnHandle area, GWorldPtr img, short mode){
+	GrafPtr cur_port;
+	GetPort(&cur_port);
+	const BitMap* drawDest = GetPortBitMapForCopyBits(cur_port);
+	PixMapHandle drawSource = GetPortPixMap(img);
+	
+	Rect imgRect;
+	GetPortBounds(img, &imgRect);
+	
+	int imgWidth=imgRect.right-imgRect.left;
+	int imgHeight=imgRect.bottom-imgRect.top;
+	int x,y;
+	Rect bounds;
+	GetRegionBounds(area, &bounds);
+	bounds.left -= bounds.left % imgWidth;
+	bounds.top -= bounds.top % imgHeight;
+	unsigned int hrep = (int)((double(bounds.right-bounds.left)/imgWidth)+0.5);
+	unsigned int vrep = (int)((double(bounds.bottom-bounds.top)/imgHeight)+0.5);
+	for(unsigned int i=0; i<=hrep; i++){
+		for(unsigned int j=0; j<=vrep; j++){
+			x=bounds.left+i*imgWidth;
+			y=bounds.top+j*imgHeight;
+			Rect targetRect={y,x,y+imgHeight,x+imgWidth};
+			CopyBits((BitMap*)*drawSource, drawDest,&imgRect,&targetRect,mode,area);
+		}
+	}
+}
+
+void tileImage(RgnHandle area, GWorldPtr img, Rect srcRect, short mode){
+	GrafPtr cur_port;
+	GetPort(&cur_port);
+	const BitMap* drawDest = GetPortBitMapForCopyBits(cur_port);
+	PixMapHandle drawSource = GetPortPixMap(img);
+	
+	int srcWidth=srcRect.right-srcRect.left;
+	int srcHeight=srcRect.bottom-srcRect.top;
+	int x,y;
+	Rect bounds;
+	GetRegionBounds(area, &bounds);
+	bounds.left -= bounds.left % srcWidth;
+	bounds.top -= bounds.top % srcHeight;
+	unsigned int hrep = (int)((double(bounds.right-bounds.left)/srcWidth)+0.5);
+	unsigned int vrep = (int)((double(bounds.bottom-bounds.top)/srcHeight)+0.5);
+	for(unsigned int i=0; i<=hrep; i++){
+		for(unsigned int j=0; j<=vrep; j++){
+			x=bounds.left+i*srcWidth;
+			y=bounds.top+j*srcHeight;
+			Rect targetRect={y,x,y+srcHeight,x+srcWidth};
+			CopyBits((BitMap*)*drawSource, drawDest,&srcRect,&targetRect,mode,area);
+		}
+	}
+}
--- a/osx/tools/graphtool.h
+++ b/osx/tools/graphtool.h
@@ -8,6 +8,7 @@

 #ifndef GRAPHTOOL_H
 #define GRAPHTOOL_H
+#include <Carbon/Carbon.h>
 #include <string>
 #define  LINES_IN_TEXT_WIN	11

@@ -64,14 +65,16 @@ short get_custom_rect (short which_rect, Rect& store_rect);
 void get_str(Str255 str,short i, short j);
 GWorldPtr importPictureFileToGWorld(const FSSpec *fileSpec);
 void writeGWorldToPNGFile(GWorldPtr gw, const FSSpec *fileSpec);
-void tileImage(Rect area, GWorldPtr img, short mode=0);
-void tileImage(Rect area, GWorldPtr img, Rect srcRect, short mode=0);
+void tileImage(Rect area, GWorldPtr img, short mode = srcCopy);
+void tileImage(Rect area, GWorldPtr img, Rect srcRect, short mode = srcCopy);
+void tileImage(RgnHandle area, GWorldPtr img, short mode = srcCopy);
+void tileImage(RgnHandle area, GWorldPtr img, Rect srcRect, short mode = srcCopy);

 #ifndef GRAPHTOOL_CPP
 extern cursor_type arrow_curs[3][3];
 extern cursor_type current_cursor;
 extern m_pic_index_t m_pic_index[200];
-extern PixPatHandle bg[14];
+extern Rect bg[];
 extern short geneva_font_num,dungeon_font_num;
 #endif

--- a/osx/tools/mathutil.cpp
+++ b/osx/tools/mathutil.cpp
@@ -6,8 +6,8 @@
 *
 */

+#include <cstdlib>
 #include "mathutil.h"
-#include <cmath>

 short get_ran (short times,short  min,short  max){
 	long int store;
--- a/osx/tools/mathutil.h
+++ b/osx/tools/mathutil.h
@@ -6,6 +6,8 @@
 *
 */

+#include <cmath>
+using std::abs;
 short get_ran (short times,short  min,short  max);
 short s_pow(short x,short y);
 short s_sqrt(short val);
--- a/osx/tools/porting.cpp
+++ b/osx/tools/porting.cpp
@@ -6,6 +6,7 @@
 *
 */

+#include <Carbon/Carbon.h>
 #include "porting.h"

 extern bool cur_scen_is_mac, mac_is_intel;
--- a/osx/tools/soundtool.cpp
+++ b/osx/tools/soundtool.cpp
@@ -6,6 +6,7 @@
 *
 */

+#include <Carbon/Carbon.h>
 #include "soundtool.h"

 Handle sound_handles[NUM_SOUNDS];