Celtic Minstrel
c413d292a9
(PC Editor and Scenario Editor are unaffected by this commit.)
Things removed:
- All references to Carbon and QuickDraw are gone.
- No more Resource Manager; the game no longer relies on old resource files at all
- The old dialog framework (from dlogtool.c, functions usually prefixed with cd_) is no longer used.
- Files that weren't being compiled
- Boost libraries that are now in the C++ library (function, shared_ptr)
- Obsolete build settings
Replacement dependencies:
- Boost Filesystem replaces references to things like FSSpec
- SFML replaces all the QuickDraw code and most window management
- Cocoa replaces AppleEvent management, menu management, and some window management
- I wrote a resource manager interface to mimick the important aspects of the behaviour of the Mac Resource Manager
- I had to rewrite some functions that QuickDraw provided natively, such as clipping regions; not all of these are tested
Things added:
- Every referenced dialog has been converted from a DITL resource into the new XML-based dialog format.
- All referenced STR# resources have been extracted into simple text files
- Now compiles against Mac OSX 10.7 SDK and libc++
- The first item in the Help menu opens the docs on Sylae's website
- It seems all the constants for soundtool vanished somewhere, so I added them back from the original Mac source
Other changes:
- Updated to XCode 4(?) project format
- Added the xcschemes created by XCode 4; I'm not sure how important these are, but they seem like they might be important
- Added document on converting dialogs to the XML format.
- Make string formatting mismatches into errors instead of warnings
- Disable error limit
- Graphics sheets that previously used masking now have alpha transparency
- Converted all graphics sheets to 8-bit PNG
- Trimmed white border from intro image
- Converted dialogs in the resource file have their resource name set to the name of the XML file of the converted version
- Referenced string resources in the resource file have their resource name set to the name of the text file of the extracted version
- Add the black-and-white patterns from the PAT resources to the pixpats.png; at least one of them is used somewhere in the game
- Recreated the menu.xib as a Cocoa xib file instead of a Carbon xib file
- Disable GNU C++ extensions; maybe this'll make it easier to compile with cl.exe later
- Add marks to the enormous handle_action function to make it easier to navigate\
- A build step to validate the XML dialogs using xmllint (doesn't quite work properly yet but does at least catch dialogs that are not well-formed)- Fix a lot of warnings about assigning string constants to non-const char pointers
- Fixed the file and application icons (which had somehow become corrupted at some point)
- Lots of additional functions in the custom location and rectangle classes, including implicit conversion to and from SFML rects and vectors; also they now store coordinates as int instead of char
- A new enum for encounter note types
- Much tweaking of the encounter note recording mechanisms
- To ease porting, I added a simple function that converts from classic Mac ticks (about 1/60 of a second) to the SFML time type
- Python script to convert STR# resources to txt files, replacing newlines with vertical bars
- Extracted the Mac font (Dungeon Bold) from the resource file and also added the Windows font (MaidenWord)
XML Dialog Framework changes:
- Remove the static initialization object in favour of manually calling cDialog::init()
- {set,get}Format() no longer used for colour; there's a dedicated {set,get}Colour() instead
- draw() methods unprotected in the control classes so that controls can be drawn in the main window
- There's no longer a friend relationship between the dialogs and the controls
- Fixed buttons duplicating the "depressed" boolean
- Buttons now properly offset the label for tiny and push buttons, and for LEDs
- Buttons no longer assume that either none or both of "width" and "height" are given in the XML
- Add {get,set}BtnType() to cButton
- cLedGroup now overrides handleClick(), which has also been made virtual; this was necessary for LEDs within a group to properly hilite while being clicked
- Add addChoice() to cLedGroup to insert additional LED choices
- Moved the key enums and cKey to a separate file
- Add a method to get a control's attached key
- Add methods to get and set a control's rect and position
- Controls can now directly take a window as a parent rather than a dialog
- Add addLabelFor() method to cDialog which adds a static text control as a label for another control
- Remove hack for storing a dialog result of arbitrary type in favour of boost::any
- Add method to get default text colour for a dialog
- Add method to get a dialog's rect
- Add method to add the same event handler to multiple controls in a dialog
- Add concept of default button to dialogs
- Add enum for text field type (currently either number or text)
- Implement the text field without use of native controls, including somewhat decent text input and a flashing insertion point
- cPict no longer stores references to every sheet; it fetches them as needed from the resource manager
- The many draw functions in cPict are no longer static, since they need to access the window containing the pict (before they could only be static due to QuickDraw's global state)
- Add setPict() without a type argument to change the graphic without changing the type, which is a common operation
- Add a scrollbar control; the specifics aren't implemented yet
- Change signature of the record callback for cStrDlog; it will no longer be passed the strings
- Publicize the no-button constructor of cChoiceDlog; it'll assume "okay" is the only button
- Add operator-> to cPictChoice for accessing the underlying dialog
- Add constructor to cPictChoice that takes a starting and ending pic num
- Remove err parameter from giveError
- Many more keys handled, plus support for catching copy, paste, cut, and select all keyboard shortcuts
- Text input fields take priority, overriding any other keyboard shortcuts in the dialog, but they never catch help (F1), escape, or enter
- Some changes to the format itself:
-> keys go in the "def-key" attribute, but modifiers go in "key-mod"
-> "clickable" is no longer a recognized attribute
-> "title" is now a recognized text size (18pt, even larger than "large" at 12pt)
-> "defbtn" attribute on the root element
114 lines
3.4 KiB
C++
114 lines
3.4 KiB
C++
/*
|
|
* graphtool.h
|
|
* BoE
|
|
*
|
|
* Created by Celtic Minstrel on 16/04/09.
|
|
*
|
|
*/
|
|
|
|
#ifndef GRAPHTOOL_H
|
|
#define GRAPHTOOL_H
|
|
|
|
#include <SFML/Graphics.hpp>
|
|
#include <boost/filesystem/path.hpp>
|
|
#include <string>
|
|
#include "location.h"
|
|
|
|
namespace fs = boost::filesystem;
|
|
|
|
#define LINES_IN_TEXT_WIN 11
|
|
#define NUM_TER_SHEETS 7
|
|
#define NUM_MONST_SHEETS 11
|
|
|
|
enum cursor_type {
|
|
wand_curs = 0,
|
|
eyedropper_curs = 1,
|
|
brush_curs = 2,
|
|
spray_curs = 3,
|
|
eraser_curs = 4,
|
|
topleft_curs = 5,
|
|
bottomright_curs = 6,
|
|
hand_curs = 7,
|
|
NW_curs = 8,
|
|
N_curs = 9,
|
|
NE_curs = 10,
|
|
W_curs = 11,
|
|
wait_curs = 12,
|
|
E_curs = 13,
|
|
SW_curs = 14,
|
|
S_curs = 15,
|
|
SE_curs = 16,
|
|
sword_curs = 17,
|
|
boot_curs = 18,
|
|
drop_curs = 19,
|
|
target_curs = 20,
|
|
talk_curs = 21,
|
|
key_curs = 22,
|
|
look_curs = 23,
|
|
};
|
|
|
|
struct m_pic_index_t {
|
|
unsigned char i, x, y;
|
|
};
|
|
|
|
struct TextStyle {
|
|
int style;
|
|
std::string font;
|
|
int pointSize;
|
|
sf::Color colour;
|
|
void applyTo(sf::Text& text);
|
|
};
|
|
|
|
class Region {
|
|
std::vector<std::shared_ptr<sf::Shape>> shapes;
|
|
void setStencil(sf::RenderTarget& where);
|
|
friend void clip_region(sf::RenderTarget& where, Region& region);
|
|
public:
|
|
void addEllipse(RECT frame);
|
|
void addRect(RECT rect);
|
|
void clear();
|
|
void offset(int x, int y);
|
|
Region& operator-=(Region& other);
|
|
};
|
|
|
|
typedef unsigned short pic_num_t;
|
|
void init_graph_tool(void (*redraw_callback)());
|
|
void clean_up_graphtool();
|
|
void set_cursor(cursor_type which_curs);
|
|
void restore_cursor();
|
|
void rect_draw_some_item(sf::RenderTarget& targ_gworld,RECT targ_rect);
|
|
void rect_draw_some_item(const sf::Texture& src_gworld,RECT src_rect,sf::RenderTarget& targ_gworld,RECT targ_rect,sf::BlendMode mode = sf::BlendNone);
|
|
void rect_draw_some_item(const sf::Texture& src_gworld,RECT src_rect,RECT targ_rect,location offset,sf::BlendMode mode = sf::BlendNone);
|
|
void win_draw_string(sf::RenderTarget& dest_window,RECT dest_rect,const char* str,short mode,short line_height,location offset = {0,0});
|
|
short string_length(const char *str);
|
|
//OSStatus flip_pict(OSType domain, OSType type, short id, void *ptr, UInt32 size, bool isNative, void *refcon);
|
|
//void draw_terrain();
|
|
RECT calc_rect(short i, short j);
|
|
RECT get_custom_rect (short which_rect);
|
|
short get_custom_rect (short which_rect, RECT& store_rect);
|
|
void setActiveRenderTarget(sf::RenderTarget& where);
|
|
void tileImage(sf::RenderTarget& target, RECT area, sf::Texture& img, sf::BlendMode mode = sf::BlendNone);
|
|
void tileImage(sf::RenderTarget& target, RECT area, sf::Texture& img, RECT srcRect, sf::BlendMode mode = sf::BlendNone);
|
|
void fill_rect(sf::RenderTarget& target, RECT rect, sf::Color colour);
|
|
void frame_rect(sf::RenderTarget& target, RECT rect, sf::Color colour);
|
|
void fill_circle(sf::RenderTarget& target, RECT rect, sf::Color colour);
|
|
void frame_circle(sf::RenderTarget& target, RECT rect, sf::Color colour);
|
|
void fill_roundrect(sf::RenderTarget& target, RECT rect, int rad, sf::Color colour);
|
|
void frame_roundrect(sf::RenderTarget& target, RECT rect, int rad, sf::Color colour);
|
|
void fill_region(sf::RenderTarget& target, Region& region, sf::Color colour);
|
|
void frame_region(sf::RenderTarget& target, Region& region, sf::Color colour);
|
|
|
|
void clip_rect(sf::RenderTarget& where, RECT rect);
|
|
void clip_region(sf::RenderTarget& where, Region& region);
|
|
void undo_clip(sf::RenderTarget& where);
|
|
|
|
#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 RECT bg[];
|
|
extern TextStyle TEXT;
|
|
#endif
|
|
|
|
#endif
|