hedgewars/uPhysFSLayer.pas
author koda
Fri, 11 Oct 2013 17:43:13 +0200
branchwebgl
changeset 9521 8054d9d775fd
parent 9264 21df1a0ec9ed
parent 9466 8b48c27201af
child 9950 2759212a27de
permissions -rw-r--r--
merge with latest defaul, fixing compiling with fpc, parsing and rendering with pas2c, some minor problems with compiling with clang
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
7959
644b757d20e6 Start work on physfs support in engine
unc0rr
parents:
diff changeset
     1
unit uPhysFSLayer;
8063
06efc1ea6a40 linking phsyfs on osx
koda
parents: 8062
diff changeset
     2
7959
644b757d20e6 Start work on physfs support in engine
unc0rr
parents:
diff changeset
     3
interface
8077
2ea5cde93abc Fix build
unc0rr
parents: 8073
diff changeset
     4
uses SDLh, LuaPas;
7959
644b757d20e6 Start work on physfs support in engine
unc0rr
parents:
diff changeset
     5
9204
1c233176fffd drop the '_'
koda
parents: 9202
diff changeset
     6
const PhysfsLibName = {$IFDEF PHYSFS_INTERNAL}'libhwphysfs'{$ELSE}'libphysfs'{$ENDIF};
8540
cf808329bb6f this should hijack the linker name and always pick the bundled physfs when another version is already prsent
koda
parents: 8533
diff changeset
     7
const PhyslayerLibName = 'libphyslayer';
8073
5a289ef40fdb physfs compilation on windows
koda
parents: 8067
diff changeset
     8
8540
cf808329bb6f this should hijack the linker name and always pick the bundled physfs when another version is already prsent
koda
parents: 8533
diff changeset
     9
{$IFNDEF WIN32}
cf808329bb6f this should hijack the linker name and always pick the bundled physfs when another version is already prsent
koda
parents: 8533
diff changeset
    10
    {$linklib physfs}
cf808329bb6f this should hijack the linker name and always pick the bundled physfs when another version is already prsent
koda
parents: 8533
diff changeset
    11
    {$linklib physlayer}
8533
2d7703d6bc22 this should make physfs happy to link on windows too, forcing every function in its proper dll and skipping linklib
koda
parents: 8528
diff changeset
    12
{$ENDIF}
2d7703d6bc22 this should make physfs happy to link on windows too, forcing every function in its proper dll and skipping linklib
koda
parents: 8528
diff changeset
    13
7959
644b757d20e6 Start work on physfs support in engine
unc0rr
parents:
diff changeset
    14
procedure initModule;
644b757d20e6 Start work on physfs support in engine
unc0rr
parents:
diff changeset
    15
procedure freeModule;
644b757d20e6 Start work on physfs support in engine
unc0rr
parents:
diff changeset
    16
8028
dc30104660d3 Engine loads fine with basic config
unc0rr
parents: 8025
diff changeset
    17
type PFSFile = pointer;
dc30104660d3 Engine loads fine with basic config
unc0rr
parents: 8025
diff changeset
    18
8025
07862ab415c8 Get rid of Pathz and UserPathz
unc0rr
parents: 8022
diff changeset
    19
function rwopsOpenRead(fname: shortstring): PSDL_RWops;
07862ab415c8 Get rid of Pathz and UserPathz
unc0rr
parents: 8022
diff changeset
    20
function rwopsOpenWrite(fname: shortstring): PSDL_RWops;
8022
10b3b93c1f56 - Add physfsrwops library
unc0rr
parents: 7963
diff changeset
    21
8028
dc30104660d3 Engine loads fine with basic config
unc0rr
parents: 8025
diff changeset
    22
function pfsOpenRead(fname: shortstring): PFSFile;
dc30104660d3 Engine loads fine with basic config
unc0rr
parents: 8025
diff changeset
    23
function pfsClose(f: PFSFile): boolean;
dc30104660d3 Engine loads fine with basic config
unc0rr
parents: 8025
diff changeset
    24
dc30104660d3 Engine loads fine with basic config
unc0rr
parents: 8025
diff changeset
    25
procedure pfsReadLn(f: PFSFile; var s: shortstring);
8107
ee21b816394f Bring ansistrings back
unc0rr
parents: 8080
diff changeset
    26
procedure pfsReadLnA(f: PFSFile; var s: ansistring);
8031
fc40b343c45c Script loading via physfs which doesn't work:
unc0rr
parents: 8028
diff changeset
    27
function pfsBlockRead(f: PFSFile; buf: pointer; size: Int64): Int64;
fc40b343c45c Script loading via physfs which doesn't work:
unc0rr
parents: 8028
diff changeset
    28
function pfsEOF(f: PFSFile): boolean;
fc40b343c45c Script loading via physfs which doesn't work:
unc0rr
parents: 8028
diff changeset
    29
fc40b343c45c Script loading via physfs which doesn't work:
unc0rr
parents: 8028
diff changeset
    30
function pfsExists(fname: shortstring): boolean;
8028
dc30104660d3 Engine loads fine with basic config
unc0rr
parents: 8025
diff changeset
    31
9264
21df1a0ec9ed engine links
unc0rr
parents: 9260
diff changeset
    32
{$IFNDEF PAS2C}
8533
2d7703d6bc22 this should make physfs happy to link on windows too, forcing every function in its proper dll and skipping linklib
koda
parents: 8528
diff changeset
    33
function  physfsReader(L: Plua_State; f: PFSFile; sz: Psize_t) : PChar; cdecl; external PhyslayerLibName;
2d7703d6bc22 this should make physfs happy to link on windows too, forcing every function in its proper dll and skipping linklib
koda
parents: 8528
diff changeset
    34
procedure physfsReaderSetBuffer(buf: pointer); cdecl; external PhyslayerLibName;
8978
e6ef8fe314bd suggestion of unc0rr's to fix issue w/ random maps in campaign. load sidecar packages in physfs for lua. should be useful also for lua that does custom layouts
nemo
parents: 8927
diff changeset
    35
procedure hedgewarsMountPackage(filename: PChar); cdecl; external PhyslayerLibName;
9264
21df1a0ec9ed engine links
unc0rr
parents: 9260
diff changeset
    36
{$ENDIF}
8077
2ea5cde93abc Fix build
unc0rr
parents: 8073
diff changeset
    37
7959
644b757d20e6 Start work on physfs support in engine
unc0rr
parents:
diff changeset
    38
implementation
9260
64718974158f Reduce number of link errors
unc0rr
parents: 9236
diff changeset
    39
uses uUtils, uVariables;
7959
644b757d20e6 Start work on physfs support in engine
unc0rr
parents:
diff changeset
    40
8105
d088be5ecdcb ok at least pas2c now parses allnots.......
koda
parents: 8099
diff changeset
    41
{$IFNDEF PAS2C}
8073
5a289ef40fdb physfs compilation on windows
koda
parents: 8067
diff changeset
    42
function PHYSFS_init(argv0: PChar) : LongInt; cdecl; external PhysfsLibName;
5a289ef40fdb physfs compilation on windows
koda
parents: 8067
diff changeset
    43
function PHYSFS_deinit() : LongInt; cdecl; external PhysfsLibName;
8839
caa57115d7ea Fixes to make pas2c parse this
unc0rr
parents: 8833
diff changeset
    44
function PHYSFSRWOPS_openRead(fname: PChar): PSDL_RWops; cdecl; external PhyslayerLibName;
8533
2d7703d6bc22 this should make physfs happy to link on windows too, forcing every function in its proper dll and skipping linklib
koda
parents: 8528
diff changeset
    45
function PHYSFSRWOPS_openWrite(fname: PChar): PSDL_RWops; cdecl; external PhyslayerLibName;
7959
644b757d20e6 Start work on physfs support in engine
unc0rr
parents:
diff changeset
    46
8073
5a289ef40fdb physfs compilation on windows
koda
parents: 8067
diff changeset
    47
function PHYSFS_mount(newDir, mountPoint: PChar; appendToPath: LongBool) : LongInt; cdecl; external PhysfsLibName;
5a289ef40fdb physfs compilation on windows
koda
parents: 8067
diff changeset
    48
function PHYSFS_openRead(fname: PChar): PFSFile; cdecl; external PhysfsLibName;
5a289ef40fdb physfs compilation on windows
koda
parents: 8067
diff changeset
    49
function PHYSFS_eof(f: PFSFile): LongBool; cdecl; external PhysfsLibName;
5a289ef40fdb physfs compilation on windows
koda
parents: 8067
diff changeset
    50
function PHYSFS_readBytes(f: PFSFile; buffer: pointer; len: Int64): Int64; cdecl; external PhysfsLibName;
5a289ef40fdb physfs compilation on windows
koda
parents: 8067
diff changeset
    51
function PHYSFS_close(f: PFSFile): LongBool; cdecl; external PhysfsLibName;
5a289ef40fdb physfs compilation on windows
koda
parents: 8067
diff changeset
    52
function PHYSFS_exists(fname: PChar): LongBool; cdecl; external PhysfsLibName;
7959
644b757d20e6 Start work on physfs support in engine
unc0rr
parents:
diff changeset
    53
8533
2d7703d6bc22 this should make physfs happy to link on windows too, forcing every function in its proper dll and skipping linklib
koda
parents: 8528
diff changeset
    54
procedure hedgewarsMountPackages(); cdecl; external PhyslayerLibName;
8105
d088be5ecdcb ok at least pas2c now parses allnots.......
koda
parents: 8099
diff changeset
    55
{$ENDIF}
d088be5ecdcb ok at least pas2c now parses allnots.......
koda
parents: 8099
diff changeset
    56
8099
a7f02b902b6f throw in some 'nots' trying to restore pas2c functionality
koda
parents: 8080
diff changeset
    57
(*****************************************************************)
8052
845b5ae03841 Mount .hwt files found in Data folder
unc0rr
parents: 8046
diff changeset
    58
8025
07862ab415c8 Get rid of Pathz and UserPathz
unc0rr
parents: 8022
diff changeset
    59
function rwopsOpenRead(fname: shortstring): PSDL_RWops;
07862ab415c8 Get rid of Pathz and UserPathz
unc0rr
parents: 8022
diff changeset
    60
begin
07862ab415c8 Get rid of Pathz and UserPathz
unc0rr
parents: 8022
diff changeset
    61
    exit(PHYSFSRWOPS_openRead(Str2PChar(fname)));
07862ab415c8 Get rid of Pathz and UserPathz
unc0rr
parents: 8022
diff changeset
    62
end;
07862ab415c8 Get rid of Pathz and UserPathz
unc0rr
parents: 8022
diff changeset
    63
07862ab415c8 Get rid of Pathz and UserPathz
unc0rr
parents: 8022
diff changeset
    64
function rwopsOpenWrite(fname: shortstring): PSDL_RWops;
7959
644b757d20e6 Start work on physfs support in engine
unc0rr
parents:
diff changeset
    65
begin
8025
07862ab415c8 Get rid of Pathz and UserPathz
unc0rr
parents: 8022
diff changeset
    66
    exit(PHYSFSRWOPS_openWrite(Str2PChar(fname)));
07862ab415c8 Get rid of Pathz and UserPathz
unc0rr
parents: 8022
diff changeset
    67
end;
8022
10b3b93c1f56 - Add physfsrwops library
unc0rr
parents: 7963
diff changeset
    68
8028
dc30104660d3 Engine loads fine with basic config
unc0rr
parents: 8025
diff changeset
    69
function pfsOpenRead(fname: shortstring): PFSFile;
dc30104660d3 Engine loads fine with basic config
unc0rr
parents: 8025
diff changeset
    70
begin
dc30104660d3 Engine loads fine with basic config
unc0rr
parents: 8025
diff changeset
    71
    exit(PHYSFS_openRead(Str2PChar(fname)));
dc30104660d3 Engine loads fine with basic config
unc0rr
parents: 8025
diff changeset
    72
end;
dc30104660d3 Engine loads fine with basic config
unc0rr
parents: 8025
diff changeset
    73
dc30104660d3 Engine loads fine with basic config
unc0rr
parents: 8025
diff changeset
    74
function pfsEOF(f: PFSFile): boolean;
dc30104660d3 Engine loads fine with basic config
unc0rr
parents: 8025
diff changeset
    75
begin
dc30104660d3 Engine loads fine with basic config
unc0rr
parents: 8025
diff changeset
    76
    exit(PHYSFS_eof(f))
dc30104660d3 Engine loads fine with basic config
unc0rr
parents: 8025
diff changeset
    77
end;
dc30104660d3 Engine loads fine with basic config
unc0rr
parents: 8025
diff changeset
    78
dc30104660d3 Engine loads fine with basic config
unc0rr
parents: 8025
diff changeset
    79
function pfsClose(f: PFSFile): boolean;
dc30104660d3 Engine loads fine with basic config
unc0rr
parents: 8025
diff changeset
    80
begin
dc30104660d3 Engine loads fine with basic config
unc0rr
parents: 8025
diff changeset
    81
    exit(PHYSFS_close(f))
dc30104660d3 Engine loads fine with basic config
unc0rr
parents: 8025
diff changeset
    82
end;
dc30104660d3 Engine loads fine with basic config
unc0rr
parents: 8025
diff changeset
    83
8031
fc40b343c45c Script loading via physfs which doesn't work:
unc0rr
parents: 8028
diff changeset
    84
function pfsExists(fname: shortstring): boolean;
fc40b343c45c Script loading via physfs which doesn't work:
unc0rr
parents: 8028
diff changeset
    85
begin
fc40b343c45c Script loading via physfs which doesn't work:
unc0rr
parents: 8028
diff changeset
    86
    exit(PHYSFS_exists(Str2PChar(fname)))
fc40b343c45c Script loading via physfs which doesn't work:
unc0rr
parents: 8028
diff changeset
    87
end;
fc40b343c45c Script loading via physfs which doesn't work:
unc0rr
parents: 8028
diff changeset
    88
8028
dc30104660d3 Engine loads fine with basic config
unc0rr
parents: 8025
diff changeset
    89
dc30104660d3 Engine loads fine with basic config
unc0rr
parents: 8025
diff changeset
    90
procedure pfsReadLn(f: PFSFile; var s: shortstring);
dc30104660d3 Engine loads fine with basic config
unc0rr
parents: 8025
diff changeset
    91
var c: char;
dc30104660d3 Engine loads fine with basic config
unc0rr
parents: 8025
diff changeset
    92
begin
dc30104660d3 Engine loads fine with basic config
unc0rr
parents: 8025
diff changeset
    93
s[0]:= #0;
dc30104660d3 Engine loads fine with basic config
unc0rr
parents: 8025
diff changeset
    94
8034
fc032c0f7b23 Implement reader in C ffs
unc0rr
parents: 8031
diff changeset
    95
while (PHYSFS_readBytes(f, @c, 1) = 1) and (c <> #10) do
8028
dc30104660d3 Engine loads fine with basic config
unc0rr
parents: 8025
diff changeset
    96
    if (c <> #13) and (s[0] < #255) then
dc30104660d3 Engine loads fine with basic config
unc0rr
parents: 8025
diff changeset
    97
        begin
dc30104660d3 Engine loads fine with basic config
unc0rr
parents: 8025
diff changeset
    98
        inc(s[0]);
dc30104660d3 Engine loads fine with basic config
unc0rr
parents: 8025
diff changeset
    99
        s[byte(s[0])]:= c
dc30104660d3 Engine loads fine with basic config
unc0rr
parents: 8025
diff changeset
   100
        end
dc30104660d3 Engine loads fine with basic config
unc0rr
parents: 8025
diff changeset
   101
end;
dc30104660d3 Engine loads fine with basic config
unc0rr
parents: 8025
diff changeset
   102
8107
ee21b816394f Bring ansistrings back
unc0rr
parents: 8080
diff changeset
   103
procedure pfsReadLnA(f: PFSFile; var s: ansistring);
ee21b816394f Bring ansistrings back
unc0rr
parents: 8080
diff changeset
   104
var c: char;
ee21b816394f Bring ansistrings back
unc0rr
parents: 8080
diff changeset
   105
    b: shortstring;
ee21b816394f Bring ansistrings back
unc0rr
parents: 8080
diff changeset
   106
begin
ee21b816394f Bring ansistrings back
unc0rr
parents: 8080
diff changeset
   107
s:= '';
ee21b816394f Bring ansistrings back
unc0rr
parents: 8080
diff changeset
   108
b[0]:= #0;
ee21b816394f Bring ansistrings back
unc0rr
parents: 8080
diff changeset
   109
ee21b816394f Bring ansistrings back
unc0rr
parents: 8080
diff changeset
   110
while (PHYSFS_readBytes(f, @c, 1) = 1) and (c <> #10) do
ee21b816394f Bring ansistrings back
unc0rr
parents: 8080
diff changeset
   111
    if (c <> #13) then
ee21b816394f Bring ansistrings back
unc0rr
parents: 8080
diff changeset
   112
        begin
ee21b816394f Bring ansistrings back
unc0rr
parents: 8080
diff changeset
   113
        inc(b[0]);
ee21b816394f Bring ansistrings back
unc0rr
parents: 8080
diff changeset
   114
        b[byte(b[0])]:= c;
ee21b816394f Bring ansistrings back
unc0rr
parents: 8080
diff changeset
   115
        if b[0] = #255 then
ee21b816394f Bring ansistrings back
unc0rr
parents: 8080
diff changeset
   116
            begin
ee21b816394f Bring ansistrings back
unc0rr
parents: 8080
diff changeset
   117
            s:= s + b;
ee21b816394f Bring ansistrings back
unc0rr
parents: 8080
diff changeset
   118
            b[0]:= #0
ee21b816394f Bring ansistrings back
unc0rr
parents: 8080
diff changeset
   119
            end
ee21b816394f Bring ansistrings back
unc0rr
parents: 8080
diff changeset
   120
        end;
8330
aaefa587e277 update branch with default
koda
parents: 8105 8310
diff changeset
   121
8107
ee21b816394f Bring ansistrings back
unc0rr
parents: 8080
diff changeset
   122
s:= s + b
ee21b816394f Bring ansistrings back
unc0rr
parents: 8080
diff changeset
   123
end;
ee21b816394f Bring ansistrings back
unc0rr
parents: 8080
diff changeset
   124
8031
fc40b343c45c Script loading via physfs which doesn't work:
unc0rr
parents: 8028
diff changeset
   125
function pfsBlockRead(f: PFSFile; buf: pointer; size: Int64): Int64;
fc40b343c45c Script loading via physfs which doesn't work:
unc0rr
parents: 8028
diff changeset
   126
var r: Int64;
fc40b343c45c Script loading via physfs which doesn't work:
unc0rr
parents: 8028
diff changeset
   127
begin
8034
fc032c0f7b23 Implement reader in C ffs
unc0rr
parents: 8031
diff changeset
   128
    r:= PHYSFS_readBytes(f, buf, size);
8031
fc40b343c45c Script loading via physfs which doesn't work:
unc0rr
parents: 8028
diff changeset
   129
fc40b343c45c Script loading via physfs which doesn't work:
unc0rr
parents: 8028
diff changeset
   130
    if r <= 0 then
fc40b343c45c Script loading via physfs which doesn't work:
unc0rr
parents: 8028
diff changeset
   131
        pfsBlockRead:= 0
fc40b343c45c Script loading via physfs which doesn't work:
unc0rr
parents: 8028
diff changeset
   132
    else
fc40b343c45c Script loading via physfs which doesn't work:
unc0rr
parents: 8028
diff changeset
   133
        pfsBlockRead:= r
fc40b343c45c Script loading via physfs which doesn't work:
unc0rr
parents: 8028
diff changeset
   134
end;
fc40b343c45c Script loading via physfs which doesn't work:
unc0rr
parents: 8028
diff changeset
   135
8025
07862ab415c8 Get rid of Pathz and UserPathz
unc0rr
parents: 8022
diff changeset
   136
procedure initModule;
07862ab415c8 Get rid of Pathz and UserPathz
unc0rr
parents: 8022
diff changeset
   137
var i: LongInt;
8310
a98c349bc06b minor adjustments to libengine, moc is correctly created as definitions are set before calling it, params are better numbered and we don't subclass qthread but rather use moveToThread()
koda
parents: 8283
diff changeset
   138
    cPhysfsId: shortstring;
8025
07862ab415c8 Get rid of Pathz and UserPathz
unc0rr
parents: 8022
diff changeset
   139
begin
8310
a98c349bc06b minor adjustments to libengine, moc is correctly created as definitions are set before calling it, params are better numbered and we don't subclass qthread but rather use moveToThread()
koda
parents: 8283
diff changeset
   140
{$IFDEF HWLIBRARY}
a98c349bc06b minor adjustments to libengine, moc is correctly created as definitions are set before calling it, params are better numbered and we don't subclass qthread but rather use moveToThread()
koda
parents: 8283
diff changeset
   141
    //TODO: http://icculus.org/pipermail/physfs/2011-August/001006.html
9378
2be457289e60 update physlayer and sdl bindings to the new rwops interface
koda
parents: 9224
diff changeset
   142
    cPhysfsId:= GetCurrentDir() + {$IFDEF DARWIN}{$IFNDEF IPHONEOS}'/Hedgewars.app/Contents/MacOS/' + {$ENDIF}{$ENDIF} ' hedgewars';
8310
a98c349bc06b minor adjustments to libengine, moc is correctly created as definitions are set before calling it, params are better numbered and we don't subclass qthread but rather use moveToThread()
koda
parents: 8283
diff changeset
   143
{$ELSE}
a98c349bc06b minor adjustments to libengine, moc is correctly created as definitions are set before calling it, params are better numbered and we don't subclass qthread but rather use moveToThread()
koda
parents: 8283
diff changeset
   144
    cPhysfsId:= ParamStr(0);
a98c349bc06b minor adjustments to libengine, moc is correctly created as definitions are set before calling it, params are better numbered and we don't subclass qthread but rather use moveToThread()
koda
parents: 8283
diff changeset
   145
{$ENDIF}
a98c349bc06b minor adjustments to libengine, moc is correctly created as definitions are set before calling it, params are better numbered and we don't subclass qthread but rather use moveToThread()
koda
parents: 8283
diff changeset
   146
a98c349bc06b minor adjustments to libengine, moc is correctly created as definitions are set before calling it, params are better numbered and we don't subclass qthread but rather use moveToThread()
koda
parents: 8283
diff changeset
   147
    i:= PHYSFS_init(Str2PChar(cPhysfsId));
8025
07862ab415c8 Get rid of Pathz and UserPathz
unc0rr
parents: 8022
diff changeset
   148
    AddFileLog('[PhysFS] init: ' + inttostr(i));
07862ab415c8 Get rid of Pathz and UserPathz
unc0rr
parents: 8022
diff changeset
   149
8714
ab201a62d115 Prepend, not append
unc0rr
parents: 8558
diff changeset
   150
    i:= PHYSFS_mount(Str2PChar(PathPrefix), nil, false);
8025
07862ab415c8 Get rid of Pathz and UserPathz
unc0rr
parents: 8022
diff changeset
   151
    AddFileLog('[PhysFS] mount ' + PathPrefix + ': ' + inttostr(i));
9466
8b48c27201af - Load default binds from settings.ini
unc0rr
parents: 9407
diff changeset
   152
    i:= PHYSFS_mount(Str2PChar(UserPathPrefix + '/'), '/', false);
8b48c27201af - Load default binds from settings.ini
unc0rr
parents: 9407
diff changeset
   153
    AddFileLog('[PhysFS] mount ' + UserPathPrefix + '/: ' + inttostr(i));
8052
845b5ae03841 Mount .hwt files found in Data folder
unc0rr
parents: 8046
diff changeset
   154
845b5ae03841 Mount .hwt files found in Data folder
unc0rr
parents: 8046
diff changeset
   155
    hedgewarsMountPackages;
7959
644b757d20e6 Start work on physfs support in engine
unc0rr
parents:
diff changeset
   156
end;
644b757d20e6 Start work on physfs support in engine
unc0rr
parents:
diff changeset
   157
644b757d20e6 Start work on physfs support in engine
unc0rr
parents:
diff changeset
   158
procedure freeModule;
644b757d20e6 Start work on physfs support in engine
unc0rr
parents:
diff changeset
   159
begin
644b757d20e6 Start work on physfs support in engine
unc0rr
parents:
diff changeset
   160
    PHYSFS_deinit;
644b757d20e6 Start work on physfs support in engine
unc0rr
parents:
diff changeset
   161
end;
644b757d20e6 Start work on physfs support in engine
unc0rr
parents:
diff changeset
   162
644b757d20e6 Start work on physfs support in engine
unc0rr
parents:
diff changeset
   163
end.